Commit Graph

561 Commits

Author SHA1 Message Date
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
Mehul Mehta (OpenERP) 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
Paramjit Singh Sahota 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
chm@openerp.com 7298130f31 [MERGE] from trunk
bzr revid: chm@openerp.com-20140410152925-ndajhnyh4rt8pkgu
2014-04-10 17:29:25 +02:00
chm@openerp.com db080813df [FIX] website_sale: checkout prefix
bzr revid: chm@openerp.com-20140410151330-md9fq3zg8e6bliok
2014-04-10 17:13:30 +02:00
chm@openerp.com 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
Paramjit Singh Sahota 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
Christophe Simonis 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
Kersten Jeremy 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
Denis Ledoux 368afae722 [FIX] website_sale: order data refresh problem
bzr revid: dle@openerp.com-20140404102512-72x74ys4k6whk8ss
2014-04-04 12:25:12 +02:00
Thibault Delavallée 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
Thibault Delavallée ec318c33e1 [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20140404082228-g7g3b2ju06meqvq4
2014-04-04 10:22:28 +02:00
Denis Ledoux 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
chm@openerp.com 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
Christophe Simonis 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
Kersten Jeremy 356e4f595a [FIX] Redirect user to /web/login and not /web. The redirect is now compatible with the rev web:3983 (needto be retrocompatible), but the good practice should be to always redirect to login. It is to login controller to redirect if user is alreayd logged.
bzr revid: jke@openerp.com-20140321115524-j3vk6lovuphnaods
2014-03-21 12:55:24 +01:00
Thibault Delavallée 38ae695d00 [IMP] payment modules: added provider selection field that is different
from the name. This allows to distinguish name and provider. Provider is a more
technical field, used to call some specific methods (<provider>_method_name). The
name field is used for display on the website.

Code and views udpated accordingly.

bzr revid: tde@openerp.com-20140319144608-0i4rv520l0bh53f0
2014-03-19 15:46:08 +01:00
Denis Ledoux b245af63b5 [FIX] website_sale: do not display product categories with no products
bzr revid: dle@openerp.com-20140319141130-dease119j9b2l2fh
2014-03-19 15:11:30 +01:00
chm@openerp.com ed2743f755 merge upstream
bzr revid: chm@openerp.com-20140318161114-4t331xpt4xeitgxo
2014-03-18 17:11:14 +01:00
Christophe Simonis 99a3c45976 [MERGE] forward port of branch saas-3 up to revid 9328 chs@openerp.com-20140318120024-mcxmkncn1xktjs7v
bzr revid: chs@openerp.com-20140318132741-aur3q1k7t9iympri
2014-03-18 14:27:41 +01:00
chm@openerp.com abe8e7208e [MERGE] from trunk
bzr revid: chm@openerp.com-20140318102102-ug0ny6q360i4o1e6
2014-03-18 11:21:02 +01:00
chm@openerp.com 363bbd00db [FIX] website_sale: display empty message for public user and allow admin to edit 'no product found' message
bzr revid: chm@openerp.com-20140317141749-vmsx9x1kkmygnc61
2014-03-17 15:17:49 +01:00
chm@openerp.com 34b6fac77a [FIX] website_sale: test tour shop_buy_product (step: 'select ipod 32Go'): remove teminal backslash in products grid view
bzr revid: chm@openerp.com-20140317094118-5gsddsfhmisi7xs3
2014-03-17 10:41:18 +01:00
chm@openerp.com 6fc418883e [FIX] website: route and redirect: remove all backslash from url
bzr revid: chm@openerp.com-20140317080145-6l5mk4q05uf639li
2014-03-17 09:01:45 +01:00
chm@openerp.com 353bbdc2c3 [FIX] website: route and redirect: remove all backslash from url
bzr revid: chm@openerp.com-20140314162346-25vohj6ayp65tgiy
2014-03-14 17:23:46 +01:00
chm@openerp.com 0bae967baa [MERGE] from trunk
bzr revid: chm@openerp.com-20140312154854-gtq7v1dxfnunkcz6
2014-03-12 16:48:54 +01:00
chm@openerp.com 384f398090 [IMP] website: publish button use action for url to backend
bzr revid: chm@openerp.com-20140311171941-1fwhholwlsuncjyh
2014-03-11 18:19:41 +01:00
chm@openerp.com f75f09db92 [FIX] website_sale: set height for empty cell in grid
bzr revid: chm@openerp.com-20140311160419-a9d4dylm0spt4rf3
2014-03-11 17:04:19 +01:00
Christophe Simonis d504764eff [MERGE] forward port of branch saas-3 up to revid 9298 chm@openerp.com-20140311130852-3ft0v1mc9ht1any6
bzr revid: chs@openerp.com-20140311145205-s56fj113fsrnisc3
2014-03-11 15:52:05 +01:00
chm@openerp.com 3353305a6f [FIX] website_sale: remove filter of rows process grid, layout need to create empty tr for rowspan
bzr revid: chm@openerp.com-20140311093050-4p75rrdh5bg8mpqy
2014-03-11 10:30:50 +01:00
chm@openerp.com d41ea1cfdc [FIX] website_sale: grid view remove rowspan if colspan=4
bzr revid: chm@openerp.com-20140310163329-nglj6dxpulzcl5qn
2014-03-10 17:33:29 +01:00
chm@openerp.com 832e6ad2d6 [FIX] website_sale: resize big image if size 1x1 for loading faster; (don't use image_medium who break some layout customisation like 'image full'
bzr revid: chm@openerp.com-20140310152847-xjilnu4cxhs3c73b
2014-03-10 16:28:47 +01:00
chm@openerp.com 3195913272 [FIX] website_sale: grid view don't display empty cells
bzr revid: chm@openerp.com-20140307153718-2nlw8mtntfkm7ehu
2014-03-07 16:37:18 +01:00
chm@openerp.com dfc428a6a1 [FIX] website_sale: Remove the oe_shadow from product Description; fix description editing; fix resize shopping cart.
bzr revid: chm@openerp.com-20140307134551-kxxp703sgep5eacv
2014-03-07 14:45:51 +01:00
chm@openerp.com c0d20af756 [FIX] Fix bug where button with contenteditable does not work in cross browser. Fix : replace tag 'button' by 'a' with class 'a-submit'; forgotten part
bzr revid: chm@openerp.com-20140307125141-gfvnwq0rnjyqbbvp
2014-03-07 13:51:41 +01:00
chm@openerp.com 23eca80556 [MERGE] from trunk
bzr revid: chm@openerp.com-20140307104233-fqz4jwzf5yj6jtm2
2014-03-07 11:42:33 +01:00
chm@openerp.com 0b92d30081 [FIX] Replace t-esc in t-field for amount_untaxed in checkout of website_sale. Else display monetary does not work
bzr revid: chm@openerp.com-20140307103702-lsfj0iehm5kg4z29
2014-03-07 11:37:02 +01:00
Christophe Simonis 47c4728f43 [FIX] mail,website_sale: rename file_type to file_type_icon to avoid name conflict with file_type field added by document module
bzr revid: chs@openerp.com-20140228142233-i0mm9lav0czbydkk
2014-02-28 15:22:33 +01:00
Christophe Matthieu b994ae4938 [FIX] website_sale: search filter with multi values for one attribute does not work. (and fix slider)
bzr revid: chm@openerp.com-20140227160519-eakqgm2zwrxseya7
2014-02-27 17:05:19 +01:00
Christophe Matthieu 6a9d3326db [FIX] website_sale: 'Ship to a different address' not translatable
bzr revid: chm@openerp.com-20140227135120-drw0jha7gzqptdog
2014-02-27 14:51:20 +01:00
Denis Ledoux 70d3f251a3 [REVERT] rev 8788.1.1769: The exchange rate of the currency of the pricelist should not be applied as this price computation method does not depends of any pricelist
bzr revid: dle@openerp.com-20140226172300-z2okr3vpjuwxs4mz
2014-02-26 18:23:00 +01:00
Christophe Matthieu 07b5cb38a0 [IMP] website_sale: refactoring: website_event_sale: fix for refactoring
bzr revid: chm@openerp.com-20140225125736-dni507i8xpz1b61j
2014-02-25 13:57:36 +01:00
Christophe Matthieu a5ca54fd5b [IMP] website_sale: fixed and refactored until shop/payment
bzr revid: chm@openerp.com-20140225100934-74v930kb4suxb9x4
2014-02-25 11:09:34 +01:00
Christophe Matthieu 91f64613ae [FIX] website_sale: int(category)
bzr revid: chm@openerp.com-20140224100050-eyye9p5oug3cnq87
2014-02-24 11:00:50 +01:00
Christophe Matthieu 1d4f8783b5 [IMP] website_sale: some fix and imp
bzr revid: chm@openerp.com-20140221172816-5bb5l9z2xsvswz8u
2014-02-21 18:28:16 +01:00
Christophe Matthieu 758aa20c75 [MERGE] from trunk
bzr revid: chm@openerp.com-20140221112742-nq2g1l3emoa2q9cz
2014-02-21 12:27:42 +01:00
Christophe Matthieu bfeb2b9631 [MERGE] from trunk
bzr revid: chm@openerp.com-20140221094343-s1oh3iq07zi2jo0x
2014-02-21 10:43:43 +01:00
Christophe Simonis 4b72678bc7 [MERGE] forward port of branch saas-2 up to revid 9195 chs@openerp.com-20140220154517-6y531n1mqtnfnsmr
bzr revid: chs@openerp.com-20140220163815-69sza1kclnh5mavs
2014-02-20 17:38:15 +01:00
Christophe Matthieu 1e2a5ddfa6 [FIX] website: fix for ie: add bootstrap class in website_sale and bind click for editor
bzr revid: chm@openerp.com-20140225162136-5xdt7n498qxf9myw
2014-02-25 17:21:36 +01:00
Christophe Matthieu a7e5025f29 [FIX]website_sale: crappy fix for view product: branding error => can't edit guarantee part when the product_attributes inherit is apply
bzr revid: chm@openerp.com-20140212152842-6ymg8kund5l2v7yk
2014-02-12 16:28:42 +01:00
Christophe Matthieu ed785f0783 [FIX] website_sale: pager and breadcrum keep search and filter. Filter keep search and category. Links for category
bzr revid: chm@openerp.com-20140212115516-3izdv7cszgh2n3l4
2014-02-12 12:55:16 +01:00
Christophe Matthieu 5b8ea0803a [FIX] website: crappy layout when use click on edit in the shop. Microforma error. Don't use meta tag in page content: ckeditor bug report 8117.
bzr revid: chm@openerp.com-20140211135610-0xhf2yiuwfc8k0ss
2014-02-11 14:56:10 +01:00
Antony Lesuisse 87172d90d2 [MERGE] saas-3
bzr revid: al@openerp.com-20140209140315-ukqlf90ngy6ycu2k
2014-02-09 15:03:15 +01:00
Christophe Matthieu b21bb08c22 [ADD] website: test login, backend, go back, branding, edit, logout
bzr revid: chm@openerp.com-20140207125231-3zd0i1axdwuht5g4
2014-02-07 13:52:31 +01:00
Christophe Matthieu 22a27ed953 [MERGE] Microformats (microdata) support for improved SEO.
Supported formats:
 - Organization
   https://support.google.com/webmasters/answer/146861?hl=en&ref_topic=1088474
   http://schema.org/Organization
 - Event
   https://support.google.com/webmasters/answer/164506?hl=en&ref_topic=1088474
   http://schema.org/Event
 - Product+Offer
   https://support.google.com/webmasters/answer/146750#offer_properties
   http://schema.org/Product
   http://schema.org/Offer

Tested with http://www.google.com/webmasters/tools/richsnippets

bzr revid: chm@openerp.com-20140207113721-klunj6bf9qp4b2cx
2014-02-07 12:37:21 +01:00
Christophe Matthieu 052bcacd5f [FIX] website_sale template; snippet editor
bzr revid: chm@openerp.com-20140206140258-l3hriceuksx0c061
2014-02-06 15:02:58 +01:00
Christophe Matthieu d819d494f1 [IMP] website: add debugger template used to create nex tours/tests (display in customize menu in debug mode)
bzr revid: chm@openerp.com-20140206135036-geq8fubtz39pxp20
2014-02-06 14:50:36 +01:00
Fabien Pinckaers 4dbcf24f19 [IMP] Empty product page
bzr revid: fp@tinyerp.com-20140205212452-ktjjx4qcufzlmlqc
2014-02-05 22:24:52 +01:00
ddm@openerp.com 706881ab38 [FIX] Proper ticket price micodata
bzr revid: ddm@openerp.com-20140205075141-xxedwfwf3lz2v0ej
2014-02-05 08:51:41 +01:00
ddm@openerp.com af2db3b19d [IMP] Microdata for product
bzr revid: ddm@openerp.com-20140203174422-tah5bx94y9mctlei
2014-02-03 18:44:22 +01:00
ddm@openerp.com 9e12243350 [IMP] Microdata for product list (+description)
bzr revid: ddm@openerp.com-20140203165853-g3nt28nzbe59gbvl
2014-02-03 17:58:53 +01:00
ddm@openerp.com 2d4d872300 [IMP] Microdata for product list
bzr revid: ddm@openerp.com-20140203165536-5wxskybc50fdd8x3
2014-02-03 17:55:36 +01:00
jke-openerp c18d350468 [FIX] Fix bug where button with contenteditable does not work in cross browser. Fix : replace tag 'button' by 'a' with class 'a-submit'
bzr revid: jke@openerp.com-20140201204741-ygdxaauq0m5axttg
2014-02-01 21:47:41 +01:00
jke-openerp 6abf20906e [Typo] Replace t-esc in t-field for amount_untaxed in checkout of website_sale. Else display monetary does not work
bzr revid: jke@openerp.com-20140201200413-zww5pcobl6vmvqe1
2014-02-01 21:04:13 +01:00
Antony Lesuisse ff37d0ebca website sale refactor
bzr revid: al@openerp.com-20140130233951-55ttup4ohmp4i0nf
2014-01-31 00:39:51 +01:00
Antony Lesuisse c1739bfb8d [IMP] product rename suggested to accessory, add alternative to replace recommend
bzr revid: al@openerp.com-20140130233240-p0wcs2s57qp9nwp2
2014-01-31 00:32:40 +01:00
Antony Lesuisse 4aa8eadf5f [REN] rename product characterisic into attributes
bzr revid: al@openerp.com-20140130221710-nf2ircxgx3vr1spy
2014-01-30 23:17:10 +01:00
jke-openerp fd6d4d8303 [FIX] Set the good url redirect in "Sign In" button from the cart
bzr revid: jke@openerp.com-20140130104937-6rjt51rg3o9bz90k
2014-01-30 11:49:37 +01:00
jke-openerp ab8ee396ec [TYPO] Add space between icon and button in cart "Continue Shopping"
bzr revid: jke@openerp.com-20140130094927-44b8szwtb602e180
2014-01-30 10:49:27 +01:00
jke-openerp 7027ce6eda [REF] website_sale : Add missing widget option in recommanded product, to display image
bzr revid: jke@openerp.com-20140130091813-hko16qlm4t8tmq37
2014-01-30 10:18:13 +01:00
Denis Ledoux 255fe082bd [FIX] website_membership: membership displayed order depending on website_sequence
bzr revid: dle@openerp.com-20140129171554-h76n4579xquhdxxv
2014-01-29 18:15:54 +01:00
Christophe Matthieu 911d95eabd [FIX] website_sale: display the line name in my cart
bzr revid: chm@openerp.com-20140129095900-iux7i0flrtg1qj2t
2014-01-29 10:59:00 +01:00
Christophe Matthieu 5b54fa0061 [IMP] website_event_sale: don't display reduction for product event in my cart
bzr revid: chm@openerp.com-20140129094220-alhq9n8eevc3fvbt
2014-01-29 10:42:20 +01:00
Antony Lesuisse d4bbe13963 [REM] t-href is now t-attf-href
bzr revid: al@openerp.com-20140128205017-47rxm2xbb84dmjas
2014-01-28 21:50:17 +01:00
Fabien Meghazi 326c35aecd [IMP] Merge bananas and cumcumbers in order to prepare the t-href|t-action removal
bzr revid: fme@openerp.com-20140128201417-1elmttz8qen9q3ws
2014-01-28 21:14:17 +01:00
Christophe Matthieu b25a34ea94 [FIX] website_sale: payment if free
bzr revid: chm@openerp.com-20140128163815-ksds4a7zox84glv8
2014-01-28 17:38:15 +01:00
Fabien Meghazi 40c7ce4b1c [REV] Revert t-href and t-action removal
bzr revid: fme@openerp.com-20140128161531-t0m0hqpk5u871rwg
2014-01-28 17:15:31 +01:00
Fabien Meghazi 4a9d1489b3 [CHG] Make templates less readable by removing t-href and t-action
bzr revid: fme@openerp.com-20140128154909-oau6aq702rw062gy
2014-01-28 16:49:09 +01:00
Christophe Matthieu 316745250b [FIX] website: public user; website_sale
bzr revid: chm@openerp.com-20140128152136-pqh7oqj4drpjk09z
2014-01-28 16:21:36 +01:00
Antony Lesuisse d54ce03f69 [FIX] remove some colgroups, 2 left as they factorize html and all browsers tolerate them
bzr revid: al@openerp.com-20140128151359-rtn0d2edyjf8ajk1
2014-01-28 16:13:59 +01:00
Christophe Matthieu 07adc071df [IMP] website_event: split module: remove depends with sale and move event's ticket form into a bridge: website_event_sale
bzr revid: chm@openerp.com-20140128113101-aon81actmpahyn58
2014-01-28 12:31:01 +01:00
Fabien Pinckaers deddf20919 [FIX] bug in modifying quantities
bzr revid: fp@tinyerp.com-20140125204107-jri8u2ucbyuhvzfc
2014-01-25 21:41:07 +01:00
Thibault Delavallée 47d8864dc8 [IMP] website_sale: improved manual payment management in checkout process
bzr revid: tde@openerp.com-20140124145713-z30chcqg2n32j1g6
2014-01-24 15:57:13 +01:00
Thibault Delavallée aff2b4973f [IMP] payment: distinguish manual from automatic payment acquirers.
Improved validation (manual/automatic) management in ecommerce.

bzr revid: tde@openerp.com-20140124144355-6aqhocw0nfo7212a
2014-01-24 15:43:55 +01:00
Christophe Matthieu 70090a12ba [FIX] website_sale
bzr revid: chm@openerp.com-20140123152542-6vtsx2by65281sr4
2014-01-23 16:25:42 +01:00
Christophe Matthieu dea946f3dc [IMP] website_sale: breadcrup
bzr revid: chm@openerp.com-20140123130801-ngs1die8rrsakc57
2014-01-23 14:08:01 +01:00
Christophe Matthieu 4e68fff52e [FIX] website_sale: demo data, test, delivery, context pricelist
bzr revid: chm@openerp.com-20140123104705-679zt0odq0pseu7p
2014-01-23 11:47:05 +01:00
Thibault Delavallée 3a359f0ef4 [REV] website_sale: reverted changes in shop
bzr revid: tde@openerp.com-20140122171429-rb6g4zpyl8cw6fvv
2014-01-22 18:14:29 +01:00
Thibault Delavallée 46c55500ff [MERGE] Sync with website-al
bzr revid: tde@openerp.com-20140122171321-6r2q42p7ebfv3kb9
2014-01-22 18:13:21 +01:00
Christophe Matthieu d724f00198 [FIX] website_sale: promo code
bzr revid: chm@openerp.com-20140122124809-9xha1jsnnxaod65z
2014-01-22 13:48:09 +01:00
Thibault Delavallée d944a652dc [FIX] product: when computing lst_price, that is the public price
computed based on the template price + margin and extra, use the
pricelist currency if a pricelist has been given. This alows for
example to have 'promo' prices on the ecommerce that are in the
same currency.

bzr revid: tde@openerp.com-20140122120042-ovh2mi70q0beeqwq
2014-01-22 13:00:42 +01:00
Thibault Delavallée 363f8561af [MERGE] Sync with website-al
bzr revid: tde@openerp.com-20140122095911-ufqs8cj827dxkajy
2014-01-22 10:59:11 +01:00
Christophe Matthieu ec0f811bd1 [WIP] website_sale: test tour: try to find errors
bzr revid: chm@openerp.com-20140121194714-ln6jc2ibqabx3t1l
2014-01-21 20:47:14 +01:00
Christophe Matthieu 4ff1af4d01 [FIX] website: display or not editor edit button; website_sale: test tour; website: contact qweb widget
bzr revid: chm@openerp.com-20140121123912-0ya4ziusj09efti3
2014-01-21 13:39:12 +01:00
Thibault Delavallée 93711b0f91 [MERGE] Sync with website-al main branch
bzr revid: tde@openerp.com-20140121105805-msfn6i901v7kr2o3
2014-01-21 11:58:05 +01:00
Darshan Kalola (OpenERP) 9ce241349f [MERGE] with lp:~openerp-dev/openobject-addons/trunk-website-al and removed temporary solution.
bzr revid: dka@tinyerp.com-20140121054638-b7hbckj39vsk93tm
2014-01-21 11:16:38 +05:30
Christophe Matthieu 53d8280f1d [IMP] website: test class with test for website_sale sale process
bzr revid: chm@openerp.com-20140120182643-tw65rig4qqi3sqqf
2014-01-20 19:26:43 +01:00
Christophe Matthieu cbbf6f5940 [FIX] website_sale: highlight category
bzr revid: chm@openerp.com-20140121101529-2cseit2mq5w1d2z2
2014-01-21 11:15:29 +01:00
Fabien Pinckaers a83f1282fa [IMP] CSS for logo, one pixel better
bzr revid: fp@tinyerp.com-20140119193527-8e7oc1umebqkqxgx
2014-01-19 20:35:27 +01:00
Christophe Matthieu 379f3fa3ff [FIX] website_sale: auto set or remove carrier in function of product (service or not)
bzr revid: chm@openerp.com-20140117173836-s5mpospo9g5xifew
2014-01-17 18:38:36 +01:00
Christophe Matthieu bcc307560c [FIX] website_sale: update price in payement when the user change the delivery method
bzr revid: chm@openerp.com-20140117150602-0rdmf0pd2eiocg66
2014-01-17 16:06:02 +01:00
Darshan Kalola (OpenERP) 86ec8bd39a [IMP]removed unnecessary code.
bzr revid: dka@tinyerp.com-20140117082647-6aoiouidtl06r3vk
2014-01-17 13:56:47 +05:30
Darshan Kalola (OpenERP) effa6b282e [IMP]product: removed attrs from variants in form view.
bzr revid: dka@tinyerp.com-20140117075805-r5k1epe8vzj36tzm
2014-01-17 13:28:05 +05:30
Darshan Kalola (OpenERP) f75f2eccef [IMP]improved template view in website_sale.
bzr revid: dka@tinyerp.com-20140117073308-wcyg4q60aj187wek
2014-01-17 13:03:08 +05:30
Darshan Kalola (OpenERP) 21c54c95a2 [MERGE]with lp:~openerp-dev/openobject-addons/trunk-imp-product-variant-another-amb and remove unnecessary changes.
bzr revid: dka@tinyerp.com-20140117070028-9xglu0v31hjid18f
2014-01-17 12:30:28 +05:30
Christophe Matthieu 4ff74cbf99 [IMP] website: editor menus is displayed in function of users groups (event, blog...)
bzr revid: chm@openerp.com-20140116180535-c736cuxn12qghiea
2014-01-16 19:05:35 +01:00
Darshan Kalola (OpenERP) fcf6109d16 [MERGE] with lp:~openerp-dev/openobject-addons/trunk-website-al.
bzr revid: dka@tinyerp.com-20140116120607-rkfs8qysinmegp54
2014-01-16 17:36:07 +05:30
Darshan Kalola (OpenERP) 4e3bed270e [IMP]improved product template in website_sale.
bzr revid: dka@tinyerp.com-20140116120100-m305tam84zvjh0fw
2014-01-16 17:31:00 +05:30
Christophe Matthieu 52e4cb3f99 [IMP] website_job: no job offer found message, better template, and fix type
bzr revid: chm@openerp.com-20140115160219-mqh0sx869zfwk1g7
2014-01-15 17:02:19 +01:00
Darshan Kalola (OpenERP) 90248025a4 [MERGE]with lp:~openerp-dev/openobject-addons/trunk-website-al.
bzr revid: dka@tinyerp.com-20140115144940-srkv28a758ov0xx8
2014-01-15 20:19:40 +05:30
Christophe Matthieu 3487d36fc2 [FIX] website_sale: fix boostrap row
bzr revid: chm@openerp.com-20140115143139-dieh48j9t1tbh4w3
2014-01-15 15:31:39 +01:00
Christophe Matthieu c7bf7ad759 [FIX] website_sale: shiping and invoicing data in red (required) are agressive even the first time
bzr revid: chm@openerp.com-20140115131716-zj38n7pl3pnmdzpd
2014-01-15 14:17:16 +01:00
Christophe Matthieu 320a0bc28c [IMP] website/website_sale: Use group to display shipping address in frontend like the backend. Use group for product facet caracteristique (backend/frontend). Customize templates is displayed function of groups of ir.ui.view templates.
bzr revid: chm@openerp.com-20140115110547-v0nllq0f800tlhpg
2014-01-15 12:05:47 +01:00
Darshan Kalola (OpenERP) 67f6f54e73 [MERGE] with lp:~openerp-dev/openobject-addons/trunk-website-al.
bzr revid: dka@tinyerp.com-20140113130212-4f17b0inc4u3s5k3
bzr revid: dka@tinyerp.com-20140115052550-15ulprts5fo6s30r
2014-01-15 10:55:50 +05:30
Fabien Pinckaers d73c8f15b6 [IMP] cleaned CSS, removed CSS
bzr revid: fp@tinyerp.com-20140114212533-iz4oleo0opads01l
2014-01-14 22:25:33 +01:00
Christophe Matthieu 45feba1f86 [IMP]website_sale: no product message for public users
bzr revid: chm@openerp.com-20140114162925-z1gcl5h2rkxb7crx
2014-01-14 17:29:25 +01:00
Christophe Matthieu 057184bb64 [FIX] website_sale: if I add a suggested product to the card: Page not found wrong url
bzr revid: chm@openerp.com-20140114095721-xjj4keju12znfoky
2014-01-14 10:57:21 +01:00
Christophe Matthieu 4998764d40 [IMP] website_sale: website_sequence with push to top, push up, push down, push to bottom
bzr revid: chm@openerp.com-20140110112442-kmjx97tk6zz5zpwa
2014-01-10 12:24:42 +01:00
Christophe Matthieu 8749e13a75 [FIX] website_sale: delivery and payment views
bzr revid: chm@openerp.com-20140110102858-57v9dk3hk75c5uu3
2014-01-10 11:28:58 +01:00