Commit Graph

910 Commits

Author SHA1 Message Date
Dharmraj Jhala a8497e07c9 [ADD] added instantclick library to load data faster in anonymous mode 2014-06-16 16:00:06 +05:30
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
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
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
Richard Mathot e137a7713b [FIX] website_sale: test did not load js properly and failed 2014-05-26 16:58:14 +02:00
Mitesh Savani daba406886 [IMP]Move assetss to frontend template. 2014-05-23 18:31:01 +05:30
--global 13ac3865d5 [CLEAN] Use none or false, but not both on two lines ... 2014-05-22 15:40:29 +02:00
--global 15e874b5c8 [FIX] website_sale: still cleaning lost references to deleted code in website_sale ...
Fixed checkout redirection that was meant to clean the session (incorrect sale order or transaction) that may happen
when having issues with the payment.
2014-05-22 15:34:09 +02:00
Martin Trigaux 35a07975de [FIX] website_sale: add the parameter _mail_post_access on product.template
This parameter gives the possibility to post messages en product.template to
people having a read access. The website_sale giving the possibility to post
comments, people not belonging to the 'Sale Manager' group were not able to
post messages.
2014-05-22 12:15:45 +02:00
Fabien Meghazi 35efb5bf5f [MERGE] upstream 2014-05-19 12:12:46 +02:00
Thibault Delavallée 721a3d4ed2 [MERGE] [IMP] Added a website salesteam, used to handle ecommerce quotations and
contact leads. Also added use_opportunities and use_quotations boolean fields on
sales team, like use_leads to ease the salesteam customization.

Also removed some dead code in website_sale_crm and website_sale_delivery.
2014-05-15 10:02:02 +02:00
Thibault Delavallée 37ccbada84 [FIX] website_sale, website_crm: website salesteam value in correct
module.
2014-05-14 17:34:43 +02:00
Thibault Delavallée 9b0b918ed6 [FIX] website_sale: removed now unnecessary dependency
towards crm for website-sale, as sales_team module is a dependancy of sale.

Also reverted some changes in comments.
2014-05-14 17:34:17 +02:00
Thibault Delavallée ae89496bbc [MERGE] Sync with trunk 2014-05-14 17:21:54 +02:00
Thibault Delavallée 28b20d312d [FIX] Re-added code removed by al at rev 9421: website quotation email was not sent anymore. 2014-05-13 12:32:53 +02:00
Thibault Delavallée e53c7748a0 [IMP] website_sale: toggle multi salesteam mode 2014-05-13 12:21:00 +02:00