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
Christophe Matthieu
0492e59314
[FIX] website_sale: rounding price; typo and search sequence of membership
2014-06-16 10:53:34 +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
1e9c72f308
[MERGE] from master
2014-06-13 12:35:23 +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
Fabien Meghazi
faa09da325
Removed version="7.0" from form views
2014-06-12 09:09:59 +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
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 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
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
Richard Mathot
e137a7713b
[FIX] website_sale: test did not load js properly and failed
2014-05-26 16:58:14 +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
3385300cb7
[IMP] website: sale_order: display acquirer only when set. The purpose is to
...
avoid maanging it from the sale order view; the website will set the acquirer
for ecommerce related orders. This way the acquirer and tx will be displayed
on the sale order linked to ecommerce sales, and not on other orders.
2014-05-13 11:01:18 +02:00
Thibault Delavallée
7ef0d94d6e
[IMP] website_sale: sale_order: add acquirer/tx data (to be improved)
2014-05-12 18:14:42 +02:00
Thibault Delavallée
2b8739cf8b
[IMP] website sales salesteam: refactored implementation
...
- now having a website sales sales team in website_sale;
- temporarily crm accepted as a dependency of website_sale (will be improved when sales team are
taken out of crm);
- removed website_sale_crm unnecessary module + dead code
- removed shopping cart state + its management
- added acquirer and transaction fields on sale order
- azdded use_opportunities and use_quotations fields on sales team like use_leads
2014-05-12 17:52:10 +02:00
Paramjit Singh Sahota
f1dd083521
[MERGE] Merged lp:openobject-addons.
2014-05-08 18:41:39 +05:30
Antony Lesuisse
56eeefdfda
[MERGE] trunk-websit-al-refactor by chm
...
- allow fiscal position change on sale orders
- public user on website
- simplify website_sale sale.order and shopping cart code
- remove preprocess_request
bzr revid: al@openerp.com-20140507153223-q73u5lhyrfw98o3a
2014-05-07 17:32:23 +02:00
Fabien Meghazi
ee1fbd17c8
[FIX] jQuery.ui - boostrap conflict
...
bzr revid: fme@openerp.com-20140506153335-x2fwpajvthcru1cv
2014-05-06 17:33:35 +02:00
chm@openerp.com
5b839bea89
[IMP] website_sale: attribute's filters template unactive by default
...
bzr revid: chm@openerp.com-20140505092730-pxsdxlhxwuxoc3fr
2014-05-05 11:27:30 +02:00
chm@openerp.com
c10800f2f1
[FIX] website_event_sale: multi tickets
...
bzr revid: chm@openerp.com-20140502140152-hx7ktaf0cg2m7ija
2014-05-02 16:01:52 +02:00
chm@openerp.com
ee16b014b1
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140502095132-kfx40xou73mukr2y
2014-05-02 11:51:32 +02:00
Paramjit Singh Sahota
b1d3b2e524
[MERGE] Merged lp:openobject-addons.
2014-05-01 12:59:19 +05:30
chm@openerp.com
1199b60d70
[IMP] website_sale: use street 2 to set company_name
...
bzr revid: chm@openerp.com-20140428134632-v3w7imtz7j3u3tp0
2014-04-28 15:46:32 +02:00
chm@openerp.com
cee3cabaa8
[IMP] website_sale: create new shipping address; company_name field; fix acquierer image
...
bzr revid: chm@openerp.com-20140425132049-kg4w68qn07eof47q
2014-04-25 15:20:49 +02:00
Fabien Meghazi
4f16d15120
[IMP] rename editor assets
...
bzr revid: fme@openerp.com-20140425101753-gz6c8q9huw9c04yp
2014-04-25 12:17:53 +02:00
Fabien Meghazi
1c4e2cfd22
[IMP] bundlify addons (except website)
...
bzr revid: fme@openerp.com-20140424172129-ze74eaz2eaidmxhm
2014-04-24 19:21:29 +02:00
Xavier Morel
74d4d1f58d
[CHG] bundlify website
...
CKEDITOR_BASEPATH has to be defined, by default ckeditor will load its files
relative to "itself" (the file which executes it). After bundling, the path is
incorrect and ckeditor looks for its files (e.g. en.js) in the wrong place.
bzr revid: xmo@openerp.com-20140418121503-4nsja7enutney2vn
2014-04-18 14:15:03 +02:00
Paramjit Singh Sahota
be8a180bc5
[ADD] Added a search view for the shopping_cart menu.
2014-04-16 17:09:32 +05:30
Paramjit Singh Sahota
79fb080c0e
[REM] REmoveD the shopping cart fliter from the quotations search view bcz itz not need their.
2014-04-16 15:40:52 +05:30
Mehul Mehta (OpenERP)
7927f34339
[IMP] remove quotation domain in shopping cart state
2014-04-16 11:21:14 +05:30