FalcoBolger
c0dce6ac1e
[FIX] website_sale perfomance on public categories
...
Use a domain instead of python filtering when loading root categories.
Closes #4324
2014-12-19 17:48:50 +01:00
Christophe Matthieu
b0ae5eac57
[FIX] website_sale: compute base price from default company currency to user currency to display the good lst_price or price extra
2014-12-19 11:59:45 +01:00
Denis Ledoux
cf4c826aa7
[FIX] website_sale: set partner lang according to website lang
...
On ecommerce checkout, the language of the partner wasn't set according to the language in which he is visiting the website.
Therefore, its partner was set with the default language (English in most cases), and any emails sent to him were not translated in his own language (in the email templates, such as the quotation email he received on order confirmation)
2014-12-08 17:50:34 +01:00
Christophe Matthieu
d3c562d4e8
[FIX] product: keep attribute on a variant with only one attribute
...
When adding informational attribute, with only one possible value, it used to be skipped.
Instead keep it and add it on every variant.
To avoid dropping and recreating product (and lose eventual customisations), the attributes with only one possible value are set on every product.
This makes sure that in following test, these are not considered in variants_inactive variable.
Fixes #3204
2014-11-26 14:35:08 +01:00
Tymoteusz Motylewski
856eba1de0
[IMP] website_sale: performance on category page
...
public_categ_ids field was moved to product.template object
2014-11-26 12:09:37 +01:00
Christophe Matthieu
76080efdbc
[FIX] website_sale: Discussion not working on product; issue: #3495
2014-11-26 10:38:38 +01:00
Denis Ledoux
7a2ba5ca47
[FIX] website_sale: apply reduction code
...
The line being deleted in this revision looks to have been useful when it was introduced in this commit:
36fc910
As the sale order was updated right away through the update_pricelist method
But since this rev. 22f4c31
, the sale order is updated later, and reset the sale_order_code_pricelist_id value in the session right after setting it prevent to apply the pricelist of the promotional code...
2014-11-21 15:56:37 +01:00
Olivier Dony
a6d24db305
[I18N] Update translations from Launchpad 8.0 branches
2014-11-19 17:49:12 +01:00
Julien Legros
aecb24ad6b
[FIX] website_sale: don't carry over tx details on SO duplication
...
opw-617319
2014-11-19 11:43:02 +01:00
Denis Ledoux
1561a528a5
[FIX] website_sale: product website description must be translatable
2014-11-18 11:41:27 +01:00
Jeremy Kersten
d978c78246
[FIX] website_sale: browse category to slugify. Because slug of an id will generate a tb 'need more than 1 value to unpack'
2014-11-13 14:48:30 +01:00
Christophe Simonis
c825d0552d
[MERGE] forward port of branch saas-3 up to ec27773
2014-11-05 21:46:42 +01:00
Christophe Simonis
ec277732fe
[MERGE] forward port of branch 7.0 up to 3e3e35e
2014-11-05 21:10:15 +01:00
Will Stott
9bc156a32c
[FIX] website_sale: typo in help string.
2014-11-04 13:57:52 +01:00
Jorge
93e4e7da6e
[FIX] website_sale: don't display twice some products
...
In list view, the 10 last products of a page were the 10 first products of the next page.
Fixes #3373
2014-10-30 12:04:42 +01:00
Simon Lejeune
a03e5c42ec
[FIX] website_sale: usability fixes in the checkout/address form
...
* `disabled` on the country select tag instead of `readonly`
* `create a new address` selected when the user set an invalid shipping
address and must correct it. Else the user was correcting the shipping
address but the option "ship to the same address" was selected.
2014-10-29 16:06:10 +01:00
Simon Lejeune
a644bbaec8
[FIX] website_sale: don't apply the company name as street logic in shipping address
2014-10-29 16:06:03 +01:00
Simon Lejeune
ced8c3cf3f
[FIX] website_sale: remove spurious print
2014-10-29 16:05:50 +01:00
Christophe Matthieu
59cda06b00
[FIX] website.sale: Double / triple digits do not get displayed correctly on ecommerce quantity selector
2014-10-27 10:24:13 +01:00
Christophe Matthieu
d8e67d647f
[FIX] website_sale_options: only one optional product is added to the cart and the quantity of the optional product don't change in the cart when we click on more or less. Fix the number of items displayed in the modal options.
2014-10-27 10:24:13 +01:00
Christophe Matthieu
4a46fce95a
[FIX] website_sale: Postal Code is required during checkout for countries without postal codes; Zip must be not required.
2014-10-27 10:24:13 +01:00
Christophe Matthieu
23f9736372
[FIX] website_event_sale: display the discounted price in website.
...
Add price_reduce compute method on ticket and sale order line
2014-10-24 14:16:16 +02:00
David Monjoie
76824b4248
[FIX] website_sale: check the first product variant radio button in variants list by default to avoid users to click on Add to Cart without choosing any variant
2014-10-23 15:20:51 +02:00
Denis Ledoux
8521e701fa
[FIX] website_sale: right number of products in the page
...
The goal is to fill the page with at least 20 products and to fill all grid lines
Thus, the page should be filled with products until there are 20 products and all lines of the grid are full.
2014-10-23 14:14:50 +02:00
Denis Ledoux
bfb61cd5e9
[FIX] website_sale: image doesn't change when the user select a product (for product variant list). website_sale_options: image dones't change in modal with the selection
2014-10-20 18:40:06 +02:00
Simon Lejeune
258a4cac82
[FIX] website_sale: trigger the change event on the right node
2014-10-20 10:44:24 +02:00
Denis Ledoux
ba272ad69a
[FIX] website_sale: no need to specific to a selection field that it is of type char
...
Besides, if set, the field will appear as a simple char field in the form view & editable lists
+ADD the type in the editable view
2014-10-17 14:48:45 +02:00
Olivier Dony
9b67a483df
[FIX] website_sale: better fiscal position detection + support update during checkout
...
The customer can change the country and tax
number in the billing information during
checkout, and the taxes should be properly
updated according to the re-detected fiscal
position.
The fiscal position detection also depends
on the `vat_subjected` flag, which we now assume
to be implicit as soon as the customer filled
in a valid Tax Identification Number.
2014-10-10 21:02:33 +02:00
Olivier Dony
7439421ad2
[I18N] Update translations from Launchpad 8.0 branches
2014-10-08 17:52:25 +02:00
Denis Ledoux
38668fd404
[FIX] website_sale*: handle no delivery methods in website
...
Display a user friendly message instead of crashing when there is not delivery method available for a specific order
2014-10-08 15:38:16 +02:00
Jeremy Kersten
8ff6299d9d
[FIX] website_sale: save the company in street and the street in street2.
...
The old behaviour was not better, because when we print the invoice, the order was ugly:
Name
Street
Company name
Country
Now we will have:
Name
Company name
Street
Country
This patch is not retro-compatible:
Old partners will see the address in company name and vice-versa.
Need to update view and switch street field and street2 field
2014-10-07 19:00:45 +02:00
Denis Ledoux
6d509c0c6b
[REF] website*: set spinner style in class, instead of inline
...
This fix is related to:
8298cf6510
51e399d9ac
9056c58cb8
2014-10-02 20:33:53 +02:00
Wolfgang Taferner
51e399d9ac
[FIX] website_sale: shopping cart quantity width (qty > 9)
2014-10-02 18:45:14 +02:00
Denis Ledoux
8298cf6510
[FIX] website_sale: too tiny quantity input (if qty > 9)
2014-10-02 10:58:14 +02:00
Olivier Dony
59f77103cc
[FIX] website_sale: checkout: do not reset address country every time
...
Once the value is set it can be modified by the user
(e.g. if geoip detection was wrong), so should not be reset.
2014-10-01 15:16:00 +02:00
Denis Ledoux
eaa0f29094
[FIX] website*sale: product_id_change qty is 0 by default
...
Thus, need to pass the actual quantity to product_id_change in order to set values correctly
2014-09-30 17:20:28 +02:00
Thibault Delavallée
dce983dea0
[IMP] website_sale: confirm quotation only when the payment is done, not directly when hitting 'pay now'.
2014-09-29 11:12:37 +02:00
Olivier Dony
dd2f229153
[FIX] website_sale: avoid subscribing the website user (Public) to all shop orders
...
Especially as this user does not have a valid email, which
could prevent notifications to reach other followers.
2014-09-26 16:13:56 +02:00
Olivier Dony
b2b3d629f9
[FIX] website_sale: auto-confirm free orders upon cart validation
...
Orders are normally confirmed when the payment transaction
is processed, but there is no transaction for free orders.
This caused them to stay in draft until manually cancelled.
2014-09-26 14:36:59 +02:00
Denis Ledoux
c8f1bebcc5
[FIX] website_sale: free carts were not confirmed
2014-09-25 16:25:43 +02:00
Jamin Shah
ff5e7a749c
[IMP] website_sale : avoid duplicated order lines
...
Add line id to while calling _cart_update() from sale_get_order()
The missing line_id parametre was making the _cart_find_product_line() call to fail as it was linked to an option while searching for lines without options (making the method recreate new lines).
Fixes #2573
2014-09-25 11:31:49 +02:00
Olivier Dony
b74d830eb2
[I18N] Update translation templates with latest term changes
2014-09-23 19:13:50 +02:00
Olivier Dony
1c5b5e4290
[I18N] Update translations from Launchpad 8.0 branches
...
server: rev. 26 rev-id launchpad_translations_on_behalf_of_openerp-20140923072744-tkfs0yinu8msjh09
addons: rev. 39 rev-id launchpad_translations_on_behalf_of_openerp-20140923072715-5j7qvnuvmmb1zzy1
web: rev. 23 rev-id launchpad_translations_on_behalf_of_openerp-20140923072757-jvh9l6r2x0vfcyhb
2014-09-23 13:42:05 +02:00
Christophe Matthieu
8afa1b6062
[FIX] website_sale: displayed price doesn't change for 'List View of Variants' customize template
2014-09-19 11:07:33 +02:00
Olivier Dony
53aa92d3c9
[I18N] Update translations from Launchpad branches
2014-09-18 11:47:16 +02:00
Denis Ledoux
8d773dcd23
[FIX] website_sale: only display payment method from the same company as the order
2014-09-18 10:51:57 +02:00
Fabien Meghazi
51477fb4f6
[IMP] Brought back /website/image route w/filename hinted in headers
...
Also added support for this route in widget Image#from_html()
2014-09-17 16:54:08 +02:00
Olivier Dony
e5bff82aff
[MERGE] Forward-port saas-5 up to f9bcd67
2014-09-17 16:39:06 +02:00
Fabien Meghazi
8d08e06758
[FIX] Bundlification remains ( Fixes #2463 )
2014-09-17 14:50:12 +02:00
Martin Trigaux
e04a87e11f
[IMP] website_sale: do not show transaction on sale order
...
This object is quite technical and has not purpose to be displayed on a sale order.
2014-09-17 12:59:06 +02:00
Martin Trigaux
46efc164d6
Forward port of branch saas-3 up to rev 2ee1843
2014-09-17 12:58:08 +02:00
Martin Trigaux
2ee1843757
[FIX] website_sale: retrieve transactions as superuser
...
Due to additional security rules, the transactions made as public user will have a new partner_id. The transaction needs to be retrieved as admin to be set in the context.
The operations in payment_get_status are made as superuser but the session_id is checked in the assert above to avoid url manipulation.
2014-09-17 12:52:28 +02:00
Fabien Meghazi
847093a4b0
[REM] unused class attribute
2014-09-16 22:27:52 +02:00
Fabien Meghazi
bc5e6fa2cb
[ADD] Helper for /website/image (allows to use aggressive cache)
2014-09-16 19:54:59 +02:00
Fabien Meghazi
6402bcbd92
[IMP] Move website_sale_tracking.js in front-end bundle
2014-09-16 19:54:59 +02:00
Christophe Simonis
780dd9891f
[MERGE] forward port of branch saas-5 up to 7eab880
2014-09-15 14:00:02 +02:00
Denis Ledoux
d3ba8a840d
[FIX] website_sale: the order of the attribute list doesn't matter
2014-09-10 15:08:34 +02:00
Christophe Matthieu
a57ebb2c58
[FIX] website_sale: The product breadcrumbs in shop not working. Internal Server Error appears
2014-09-10 13:24:56 +02:00
Christophe Matthieu
b2f3de6da7
[FIX] website_sale: Price of accessory product are all time null. Need to use new api to send the context.
2014-09-10 11:22:04 +02:00
Jeremy Kersten
b6fb02a331
[FIX] website_sale: typo in tour
2014-09-09 16:50:42 +02:00
Olivier Dony
fac96241df
[I18N] Update 8.0 translations with latest changes from Launchpad
2014-09-08 19:04:25 +02:00
Christophe Matthieu
c9a134b541
[FIX] website_sale: customer write on public user and the sale order is apply to public user if the public user is active=True; the checkout layout display state_id field twice
2014-09-04 13:31:44 +02:00
Josse Colpaert
77b1f2bf29
Merge pull request #2021 from odoo-dev/8.0-wmsbomtasks-jco
...
8.0 wmsbomtasks jco
2014-09-03 21:13:44 +02:00
Josse Colpaert
9b34358196
[IMP] Adapt mrp workflow and moves + Differ between Bose speakers and Custom Computer
2014-09-03 19:18:17 +02:00
Thibault Delavallée
2ad607feec
[FIX] website_sale: pay now button should be translatable
2014-09-02 11:31:03 +02:00
Antony Lesuisse
2d296cb779
[MERGE] ir-ui-view split active and show_customize
...
Split the ternary field application in active and show_customize, all four
possible value are now needed for the customize theme popup.
2014-08-31 16:56:44 +02:00
Christophe Simonis
8046b7367d
[MERGE] forward port of branch saas-5 up to 7e117b1
2014-08-28 16:51:11 +02:00
Fabien Meghazi
5e6e1303e3
[IMP] pretty urls for /website/image
2014-08-28 16:37:38 +02:00
Fabien Pinckaers
8aca457e34
[IMP] Updated website urls on modules and info page
2014-08-26 21:40:18 +02:00
Martin Trigaux
231a478ca9
[FIX] website_sale: pager in product list
...
Keep the reference to category and search view in pager.
Update the search template to include form and keep correct reference to the category (as a slug and not a parameter).
Fixes #688
2014-08-25 17:43:03 +02:00
Fabien Pinckaers
1e4501076d
[FIX] bad link
2014-08-20 10:31:25 +02:00
Olivier Dony
50ef63881a
[I18N] Update 8.0 translation with latest source code
2014-08-14 17:01:54 +02:00
Fabien Pinckaers
f43e349d85
[IMP] Footer message according to installed apps
2014-08-12 13:06:08 +02:00
Christophe Simonis
8c7519ccad
[FIX] website_sale: partially revert 086cfd5
.
...
Use less specific css selectors in "buy product" tour.
2014-08-12 12:16:36 +02:00
Fabien Pinckaers
ef944dcd55
[IMP] Maifest for Github README.md on main apps
2014-08-12 11:33:15 +02:00
Christophe Simonis
086cfd5c92
[FIX] website_sale: correct "buy product" tour to search the product before selecting it
2014-08-12 11:26:32 +02:00
Martin Trigaux
e4c0940e9f
[FIX] website_sale: avoid displaying inactive products in shops
...
The domains in the form ('o2m_field', operator, False) do not use the orm but convert the domain to ('id', 'invert operator', [list of ids]). This means that the orm is not used and implicit filter (active=True) or access rights are not checked.
A proper fix in master should be done to use the orm instead of an SQL query.
This patch force a search to be made on product.product and then exclude the products where active=False (opw 607602).
2014-08-07 18:15:37 +02:00
Denis Ledoux
1bb219907f
[MERGE] forward port of branch saas-5 up to 655a5b9
2014-08-04 16:56:10 +02:00
Christophe Matthieu
ce7212d5d7
[FIX] website_sale: everytime you want to change both billing & delivery address, any change creates duplicates in the backend
2014-08-01 17:11:20 +02:00
Denis Ledoux
0023955074
[FIX] website_sale: confirm sale order on payment_confirmation
...
Same behavior than in saas-5
2014-08-01 14:48:16 +02:00
Christophe Matthieu
87a20d1cc3
[FIX] website_sale: can't click on confirm order in mobile view
2014-07-31 15:22:51 +02:00
Martin Trigaux
6dc94f0c4e
Forward port of branch saas-5 up to eda2f06
2014-07-28 16:37:56 +02:00
Jeremy Kersten
451d2de355
[FIX] website_sale: fix error in tracking_last_order which was using the field is_delivery from module delivery
2014-07-24 11:07:46 +02:00
Olivier Dony
ef53a831c6
[MERGE] Forward-port saas-5 up to a5f7891
2014-07-23 16:58:00 +02:00
Denis Ledoux
a5f7891b68
[MERGE] forward port of branch saas-4 up to 5739aebfb1
2014-07-23 13:18:30 +02:00
Denis Ledoux
5739aebfb1
[MERGE] forward port of branch saas-3 up to 474eae9a43
2014-07-23 12:14:14 +02:00
Denis Ledoux
474eae9a43
[FIX] website_sale: translated terms payment status
...
Payment status (website_sale confirmation page) inject a status message, which was not set to be translatable. It should be the case.
2014-07-23 12:00:09 +02:00
Denis Ledoux
586b0e2f5d
[FIX] website_sale: _rec_name product.attribute.line
...
Set the _rec_name for product.attribute.line model, as its column name wasn't defined, and therefore search on it wasn't possible (For instance, do an advanced search on product.product with "Product Attributes" "Contains" "Something" wasn't possible).
2014-07-23 08:56:36 +02:00
rlu-odoo
8b67a7202d
[REF] OpenERP --> Odoo in various UI texts
...
Rebranding has been done in:
- data/demo files
- html templates
- help notices
- comments
- logger messages
- and other various messages
(Commit taken from odoo-dev:8.0-improve-openerp-odoo-rlu at rev 7deaa08)
Closes #1260
2014-07-18 13:45:41 +02:00
Denis Ledoux
49c203d6b9
[FIX] website_sale: do not set t-field in option
...
t-field in option input (select > option) is not supported
2014-07-17 17:22:43 +02:00
Martin Trigaux
f9170a04fb
[FIX] website_sale: make the 'Ship to a different address' always available
...
In the backend the option 'Allow a different address for delivery and invoicing' will set the group sale.group_delivery_invoice_address to employees. However the public user is not an employee (and we don't want to change that) so does not get this group. As we don't have similar group mechanism for public user, we have no other choice than always displaying the option to have different address. opw 610118
2014-07-17 16:09:52 +02:00
Christophe Matthieu
f8d8179a92
[FIX] website_sale: add shop/pricelist controller
2014-07-16 10:51:02 +02:00
Christophe Matthieu
9b8e307eb1
Merge pull request #1143 from odoo-dev/8.0-fix-website_sale-chm
...
[FIX] website_sale: fiscal_position is undefined; website: add user into the tour logs
2014-07-14 12:10:03 +02:00
Christophe Matthieu
5f25cb9244
[FIX] website_sale: install website_event_sale click on event to make a registration, error because fiscal_position is undefined
2014-07-11 15:29:22 +02:00
Christophe Simonis
f654a7719b
[MERGE] forward port of branch saas-5 up to 73d39a0
2014-07-10 22:49:53 +02:00
Fabien Pinckaers
b333457ca3
CSS Fix: /shop
2014-07-09 18:51:07 +02:00
Fabien Pinckaers
ac7f1d9e0e
CSS Fix for Products in /shop
2014-07-09 18:48:25 +02:00
Jeremy Kersten
8eb97cc082
[IMP] website_sale: Add google analytics on checkout process
2014-07-09 17:45:40 +02:00
Christophe Matthieu
928f4fbf76
merge from 8.0
2014-07-09 16:10:08 +02:00
Christophe Matthieu
4117c9c3ed
[FIX] product: add menu item to attributes and attribute values. Adding constraint to prevent deleting attributes with references to products.
2014-07-08 09:12:17 +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
Fabien Pinckaers
0c702bdfa7
Merge pull request #885 from odoo-dev/master-shop-fp
...
Fixes for perf issues /shop + cleaning pricelists & currencies
2014-07-02 20:34:21 +02:00
Fabien Pinckaers
c0307f37d2
FIX
2014-07-02 19:20:30 +02:00
Fabien Pinckaers
1ce0b70a02
Speed Improvements
2014-07-02 19:03:10 +02:00
Fabien Pinckaers
5cc81dd64f
Fixes
2014-07-02 18:18:29 +02:00
Christophe Matthieu
21615e6b2b
[FIX] website_sale: change picture in function of the product selected
2014-07-02 14:45:37 +02:00
Christophe Matthieu
8914453a50
[FIX] website: enable test for blog, event...
2014-07-02 14:09:57 +02:00
Christophe Matthieu
78f87dce34
[FIX] website_sale_options: tour and filter by attributes
2014-07-02 13:00:13 +02:00
Antony Lesuisse
5a73fb7500
[FIX] tour.js: tour shop
...
wait that the snippets are loaded before clicking on the picture and open the media editor.
2014-07-01 10:57:38 +02:00
Christophe Matthieu
162ee61d4f
[FIX] website_sale: discount price is never hide
2014-06-30 13:53:25 +02:00
Antony Lesuisse
22f4c315a3
[IMP] automatic fiscal positions for simple cases
...
Add group of countries res.country.group
Add get_fiscal_position method a method to compute a fiscal position based on company_id, partner_id, delivery_id
The meaning of res.partner.fiscal_position is now a forced a fiscal position.
The default implementation should handle simple cases, like VAT in UE and sales
tax in the US, but the method can be overriden to handle more complex ficals
rules.
2014-06-30 02:12:41 +02:00
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
Christophe Simonis
1f57528bc6
[MERGE] forward port of branch saas-5 up to 8dfd5ea
2014-06-27 16:14:40 +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
Denis Ledoux
368936df7c
[FIX] product, website_sale: Go in GB (Go is fr)
2014-06-26 23:31:57 +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
95c7cf8a68
[FIX] website_sale_options: tour for test use the modal
2014-06-25 12:39:21 +02:00
Christophe Matthieu
216456127d
[IMP] website_sale_options: clean code; add ondelete cascade for optional product on sale order
2014-06-25 12:00:27 +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
1d68662fb9
[IMP] website_sale: use geoip session key insead of import GeoIP
2014-06-24 11:02:52 +02:00
Christophe Matthieu
34815021b8
merge upstream
2014-06-24 10:13:11 +02:00
Christophe Matthieu
518feee650
[FIX] merge error
2014-06-24 08:17:12 +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 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 Simonis
5206eb16d5
merge upstream
2014-06-19 13:13:27 +02:00
Christophe Matthieu
54605acc65
[FIX] website_sale: demo data must set website_sequence insead of sequence
2014-06-19 13:12:09 +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
40840436f4
[FIX] website_sale: add shop/pricelist controller
2014-06-19 13:12:07 +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
bc3fc54fac
[IMP] Tour: add tour in web module; tour became available in backend.
2014-06-18 12:25:13 +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
25c564d635
[FIX] website_sale: check ipod product insead of ipad because demo data of ipad was changed
2014-06-17 14:27:26 +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