87a20d1cc3
[FIX] website_sale: can't click on confirm order in mobile view
2014-07-31 15:22:51 +02:00
ef53a831c6
[MERGE] Forward-port saas-5 up to a5f7891
2014-07-23 16:58:00 +02:00
a5f7891b68
[MERGE] forward port of branch saas-4 up to 5739aebfb1
2014-07-23 13:18:30 +02:00
5739aebfb1
[MERGE] forward port of branch saas-3 up to 474eae9a43
2014-07-23 12:14:14 +02:00
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
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
f654a7719b
[MERGE] forward port of branch saas-5 up to 73d39a0
2014-07-10 22:49:53 +02:00
8eb97cc082
[IMP] website_sale: Add google analytics on checkout process
2014-07-09 17:45:40 +02:00
928f4fbf76
merge from 8.0
2014-07-09 16:10:08 +02:00
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
5cc81dd64f
Fixes
2014-07-02 18:18:29 +02:00
162ee61d4f
[FIX] website_sale: discount price is never hide
2014-06-30 13:53:25 +02:00
25d0a3ecb1
[FIX] phantomjs test remove injection
...
It's now deprecated, assets bundles should be used instead.
2014-06-28 19:59:59 +02:00
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
a7816a827f
[FIX] website_sale: assets xml id and jquery selector (unbind click for login page)
2014-06-25 15:05:48 +02:00
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
412a7593be
[IMP] website_sale_options
2014-06-25 11:31:39 +02:00
7505cce2e9
[WIP]
2014-06-24 17:37:13 +02:00
204a62499a
[IMP] website_sale_options
2014-06-24 15:11:53 +02:00
34815021b8
merge upstream
2014-06-24 10:13:11 +02:00
1d1b6e79b5
[FIX] website_sale: user can't edit the price.
2014-06-23 16:38:04 +02:00
e75d9525bb
merge upstream
2014-06-20 10:09:16 +02:00
eef6330c55
[MERGE] forward port of branch saas-5 up to adf07a9
2014-06-19 16:23:32 +02:00
5206eb16d5
merge upstream
2014-06-19 13:13:27 +02:00
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
43ca22d10c
[FIX] website_sale: access right for currency for public user
2014-06-19 13:12:07 +02:00
a6185caa18
[FIX] website_sale: display in currency of the user
2014-06-19 13:12:06 +02:00
7295a07c4a
[FIX] website_sale: display price with user curencie.
2014-06-19 13:12:06 +02:00
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
c3c922f84e
[IMP] website_sale: convert comma to dashed for url attrib
2014-06-19 13:12:05 +02:00
86c6cf7a68
[FIX] website_sale: display discount only if the price is lower than the standard price
2014-06-19 13:12:04 +02:00
7ae7a5315f
[FIX] website_sale: modal layout
2014-06-17 15:58:13 +02:00
0d9f3af113
[IMP] website_sale: optional product + fix forgotten line_id in website_event_sale
2014-06-17 15:49:48 +02:00
9f77cb9d1f
[IMP] website_sale: optional product have all time the same quantity of the liked product.
2014-06-17 14:23:15 +02:00
9867d63b5d
[IMP] website_sale: add demo data for optional products
2014-06-17 12:01:36 +02:00
0ac338ea0a
[IMP] website_sale: display state function of selected country
2014-06-17 11:33:28 +02:00
dcce993958
[FIX] website_sale: typo and preview display all time in modal
2014-06-17 10:54:47 +02:00
474d63d6b9
[FIX] website_sale: fix keep query and clean code
2014-06-17 09:44:32 +02:00
a8497e07c9
[ADD] added instantclick library to load data faster in anonymous mode
2014-06-16 16:00:06 +05:30
0492e59314
[FIX] website_sale: rounding price; typo and search sequence of membership
2014-06-16 10:53:34 +02:00
98d9901c17
[FIX] website_sale: retur the browse record of category insead of int
2014-06-13 16:17:51 +02:00
8fdfc68074
[IMP] website_sale: display variants choice in confirm dialog box
2014-06-13 13:59:28 +02:00
d8516bcfd8
[IMP] website_sale: optional quantity in product form
2014-06-13 12:47:54 +02:00
1e9c72f308
[MERGE] from master
2014-06-13 12:35:23 +02:00
57c59ddfac
[IMP] website_sale: confirm/options dialog box have same layout of my cart
2014-06-13 12:31:41 +02:00
8a24171996
[IMP] website_sale: display 'Product not available' message in product selector
2014-06-13 09:32:28 +02:00
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
f62673c266
[IMP] website_sale: Optional product with variant suggestion
2014-06-12 16:58:44 +02:00
faa09da325
Removed version="7.0" from form views
2014-06-12 09:09:59 +02:00
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
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
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
a5908c5812
[MERGE] forward port of branch saas-5 up to b1c0bc0
2014-06-03 20:02:00 +02:00
c5ab412acc
[FIX] website_sale: change template for product and variant selector (type color)
2014-06-03 15:38:11 +02:00
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
960b86611e
[FIX] website_sale: remove invalid (and stupid) function field
2014-05-31 14:05:48 +02:00
fb650ee92e
[MERGE] product: refactoring of product variants.
...
close PR #222
2014-05-30 10:22:36 +02:00
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
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
04211015fc
[MERGE] Forward-port of latest saas-4 fixes, up to 0452851
2014-05-27 20:49:49 +02:00
585511d36e
[FIX] website_sale: inherit_option_id must be convert in optional='enabled'
2014-05-27 18:56:58 +02:00
abab5c2e94
[MERGE] from trunk
2014-05-27 18:28:40 +02:00
e987cd6c75
[FIX] website_sale: fix the product attribute templates to display the comma
2014-05-27 18:07:26 +02:00
e06f5b414b
[IMP] inherit_option_id -> application
2014-05-27 12:13:51 +02:00
b5833591dc
[IMP] website_sale: add vat field on checkout
2014-05-27 12:05:41 +02:00
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
e137a7713b
[FIX] website_sale: test did not load js properly and failed
2014-05-26 16:58:14 +02:00
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
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
7ef0d94d6e
[IMP] website_sale: sale_order: add acquirer/tx data (to be improved)
2014-05-12 18:14:42 +02:00
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
f1dd083521
[MERGE] Merged lp:openobject-addons.
2014-05-08 18:41:39 +05:30
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
ee1fbd17c8
[FIX] jQuery.ui - boostrap conflict
...
bzr revid: fme@openerp.com-20140506153335-x2fwpajvthcru1cv
2014-05-06 17:33:35 +02:00
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
c10800f2f1
[FIX] website_event_sale: multi tickets
...
bzr revid: chm@openerp.com-20140502140152-hx7ktaf0cg2m7ija
2014-05-02 16:01:52 +02:00
ee16b014b1
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140502095132-kfx40xou73mukr2y
2014-05-02 11:51:32 +02:00
b1d3b2e524
[MERGE] Merged lp:openobject-addons.
2014-05-01 12:59:19 +05:30
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
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
4f16d15120
[IMP] rename editor assets
...
bzr revid: fme@openerp.com-20140425101753-gz6c8q9huw9c04yp
2014-04-25 12:17:53 +02:00
1c4e2cfd22
[IMP] bundlify addons (except website)
...
bzr revid: fme@openerp.com-20140424172129-ze74eaz2eaidmxhm
2014-04-24 19:21:29 +02:00
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
be8a180bc5
[ADD] Added a search view for the shopping_cart menu.
2014-04-16 17:09:32 +05:30
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
7927f34339
[IMP] remove quotation domain in shopping cart state
2014-04-16 11:21:14 +05:30
6925bdad96
[ADD] Added a menu for 'Shopping Cart' which is available after installing website_sale and all the quotations generated in shop are directly accessable through this menu.
2014-04-15 11:14:05 +05:30
fdc61b6e60
[IMP] Highlight the confirm order button while the quotation in shopping cart state and added a Shopping Cart in search view.
2014-04-14 15:43:14 +05:30
7298130f31
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140410152925-ndajhnyh4rt8pkgu
2014-04-10 17:29:25 +02:00
db080813df
[FIX] website_sale: checkout prefix
...
bzr revid: chm@openerp.com-20140410151330-md9fq3zg8e6bliok
2014-04-10 17:13:30 +02:00
81cfa028e5
[FIX] website_sale: checkout shipping address; remove url terminal slash
...
bzr revid: chm@openerp.com-20140410143524-zrrsh6zvvrg9ntgz
2014-04-10 16:35:24 +02:00
e5229ee8c3
[IMP] Improved code by shifting the complete code to website_sale rather than doing in sale.
2014-04-10 14:26:13 +05:30
0fad8159f3
[MERGE] forward port of branch saas-3 up to revid 9380 chs@openerp.com-20140407144439-10n8fs6zovodwwtx
...
bzr revid: chs@openerp.com-20140407163318-hh3jwfkj3o2c83lk
2014-04-07 18:33:18 +02:00
9226642436
[FIX] Ecomm - login to post a comment if not logged
...
bzr revid: jke@openerp.com-20140404135005-4uz7qtzyke58sgy2
2014-04-04 15:50:05 +02:00
368afae722
[FIX] website_sale: order data refresh problem
...
bzr revid: dle@openerp.com-20140404102512-72x74ys4k6whk8ss
2014-04-04 12:25:12 +02:00
0e7d514a3e
[ADD] website_sale: added inherit of the transaction
...
form view to display the sale_order_id field.
bzr revid: tde@openerp.com-20140404084420-hhe0yd9npf8vox5h
2014-04-04 10:44:20 +02:00
ec318c33e1
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20140404082228-g7g3b2ju06meqvq4
2014-04-04 10:22:28 +02:00
ad680380b8
[FIX] website_sale*: not possible to process order if no delivery methods available
...
bzr revid: dle@openerp.com-20140402144520-ulfex2r3q9wwd3ig
2014-04-02 16:45:20 +02:00
13d7cfe86c
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140324082341-d6gqyloc7822aen2
bzr revid: chm@openerp.com-20140325084852-i1yomuyhyen4ss95
2014-03-25 09:48:52 +01:00
d93b79e6f4
[MERGE] forward port of branch saas-3 up to revid 9345 dle@openerp.com-20140324110349-e82t1bmmtjqbl85k
...
bzr revid: chs@openerp.com-20140324133811-4az1kvbznd26seow
2014-03-24 14:38:11 +01:00
Christophe Matthieu
Olivier Dony
Denis Ledoux
Martin Trigaux
Christophe Simonis
Jeremy Kersten
Fabien Pinckaers
Antony Lesuisse
Simon Lejeune
Dharmraj Jhala
Fabien Meghazi
Denis Ledoux
Christophe Simonis
Xavier Morel
Richard Mathot
Thibault Delavallée
Paramjit Singh Sahota
chm@openerp.com
Mehul Mehta (OpenERP)
Christophe Simonis
Kersten Jeremy