Commit Graph

406 Commits

Author SHA1 Message Date
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 f62673c266 [IMP] website_sale: Optional product with variant suggestion 2014-06-12 16:58:44 +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
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 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
Olivier Dony fd21abd847 [MERGE] Forward-port latest saas-3 bugfixes, up to 30f43da 2014-05-27 17:18:43 +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
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
Christophe Matthieu b5833591dc [IMP] website_sale: add vat field on checkout 2014-05-27 12:05:41 +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
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
--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
Fabien Meghazi 35efb5bf5f [MERGE] upstream 2014-05-19 12:12:46 +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
Fabien Meghazi 8eed143112 [IMP] Invert multilang logic in route decorator. True by default, can be set to False explicitlty 2014-05-13 11:35:45 +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 2ac1156925 [MERGE] Merged lp:openobject-addons. 2014-05-12 10:31:53 +05:30
Paramjit Singh Sahota fe9b88a3ba [REVERT] Reverted the changes of rev 9219. 2014-05-12 10:25:20 +05:30
Fabien Pinckaers 54d30d5194 [IMP] clean sitemap, enumerate pages + fixes
bzr revid: fp@tinyerp.com-20140511115231-g8ke14r9iepyypv4
2014-05-11 13:52:31 +02:00
Paramjit Singh Sahota 2fe8beac28 Missed while merging. 2014-05-08 18:51:17 +05:30
Paramjit Singh Sahota f1dd083521 [MERGE] Merged lp:openobject-addons. 2014-05-08 18:41:39 +05:30
chm@openerp.com d3678bf521 [FIX] website_sale: don't rewrite sale order partner_id with the public user
bzr revid: chm@openerp.com-20140505124702-cq6tvb6h3lgyst99
2014-05-05 14:47:02 +02:00
chm@openerp.com 41ade23b09 [FIX] website_sale & website_event: create product (redirect with slug)
bzr revid: chm@openerp.com-20140505095724-mc9k6d2yf68ln9nq
2014-05-05 11:57:24 +02:00
chm@openerp.com 06c63594be [FIX] website_sale: message confirmation
bzr revid: chm@openerp.com-20140505093423-nrmou02ov1txod3k
2014-05-05 11:34:23 +02:00
chm@openerp.com 1fd1114c69 [FIX] website_sale: access to the webite partner_id
bzr revid: chm@openerp.com-20140502160628-nbwzx28j4daj1ua8
2014-05-02 18:06:28 +02:00
chm@openerp.com bbfdc57ad9 [FIX] website_sale: add to cart product => quantity + 1
bzr revid: chm@openerp.com-20140502150842-nitu8tsxd02e6dnh
2014-05-02 17:08:42 +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
Paramjit Singh Sahota 5e3eb59d0f [MERGE] Merged lp:openobject-addons. 2014-05-02 16:22:26 +05:30
Denis Ledoux 79d4c57877 [MERGE] Forward-port of latest saas-3 bugfixes, up to rev. 9439 revid:dle@openerp.com-20140429112147-hqfqd0y487s817n7
bzr revid: dle@openerp.com-20140429112738-y2el246dmd2o2zy9
2014-04-29 13:27:38 +02:00
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 bb2ebf7cb9 [FIX] website_sale: apply fiscal position on change product id and update cart.
[IMP] sale: apply fiscal position of the partner if they are not fiscal position defined

bzr revid: chm@openerp.com-20140428093609-8z8my9vj322shcll
2014-04-28 11:36:09 +02:00
Denis Ledoux b54e49b291 [FIX] website_sale, website_sale_delivery, delivery: price computation on quantity change
bzr revid: dle@openerp.com-20140425152541-qiabb4sa7y2skgql
2014-04-25 17:25:41 +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
chm@openerp.com 3b49850d1a [FIX] website_sale: filter redirect to 404 error if a category is selected. (url: /shopcategory/?filters=...). Add slash between shop and category
bzr revid: chm@openerp.com-20140425075304-qnlyb6n6hpyvttv1
2014-04-25 09:53:04 +02:00
Mehul Mehta (OpenERP) 3ef529f1a1 [MERGE] merged with lp:openobject-addons 2014-04-16 10:34:53 +05:30
Christophe Simonis 61da3f4aba [MERGE] forward port of branch saas-3 up to revid 9409 dle@openerp.com-20140415101427-a6r7lgy50x9bdah3
bzr revid: chs@openerp.com-20140415142934-rlka4vkxd34fkil8
2014-04-15 16:29:34 +02:00
Mehul Mehta (OpenERP) a8c1649423 [MERGE] merged with lp:openobject-addons 2014-04-15 19:01:17 +05:30
Mehul Mehta (OpenERP) 7ceaefb106 [IMP] draft state replace with shopping_cart state and remove the condition of pending which convert a draft quotation into quotation sent 2014-04-15 18:55:12 +05:30
chm@openerp.com 9932aa3b45 [FIX] website_sale: checkout_parse
bzr revid: chm@openerp.com-20140410153746-kp8rw92j89x0c7vp
2014-04-10 17:37:46 +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
Paramjit Singh Sahota 7751334d97 Fixed order.state 2014-04-10 20:42:29 +05:30
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
Kersten Jeremy a3016b4d95 [FIX] Remove double return
bzr revid: jke@openerp.com-20140410114048-hw26q9x0dm11wbqc
2014-04-10 13:40:48 +02:00
Kersten Jeremy 986b445fed [FIX] Website - Fix quantity not refresh when you add a product in your cart
bzr revid: jke@openerp.com-20140410113952-g0nvc9nfjma2t614
2014-04-10 13:39:52 +02:00
Christophe Simonis 3a7e003656 [MERGE] forward port of branch saas-3 up to revid 9394 chs@openerp.com-20140410103638-x7vajn70ewsfp0ck
bzr revid: chs@openerp.com-20140410110424-enhdg6pufhii56ni
2014-04-10 13:04:24 +02:00
Denis Ledoux 9c074a67a5 [FIX] website_sale: Do not search and associate a company to the partner when an order is validated
This can be regarded as a security leak: You can associate your partner to an existing company, which you maybe do not really belong, and therefore potentially access data which you are not authorized to see

Use street for the company name, street2 for the actual street, meanwhile

bzr revid: dle@openerp.com-20140410105804-am2xjmr09u3jk36r
2014-04-10 12:58:04 +02:00
Denis Ledoux 694fb63dda [FIX] website_sale: use commercial_partner_id instead of parent_id to have the company name of the artner in the checkout form
If the user is portal, its partner is a company and has a parent: a security rule prevent to read the parent_id
and the company which should be displayed is the closest company of the partner in the hierarchy, and, in this case, itself.

bzr revid: dle@openerp.com-20140410095814-x7hqymfelspvjdsw
2014-04-10 11:58:14 +02:00
Paramjit Singh Sahota dfffd7cef1 [MERGE] MErged lp:openobject-addons. 2014-04-10 15:09:17 +05:30
Paramjit Singh Sahota 2df2f77818 Test commit 2014-04-09 18:39:42 +05:30
Paramjit Singh Sahota 3ae307003a [IMP] Improved code for confirm_order state in shopping_cart. 2014-04-09 12:27:12 +05:30
Kersten Jeremy bd7a58adb3 [FIX] Website sale : cast quantity as flaot when forced by post input.
bzr revid: jke@openerp.com-20140408162432-21vbw3of9jd4c1sz
2014-04-08 18:24:32 +02:00
Kersten Jeremy 2cf1dad2a9 [FIX] Allow to pass qty in add_to_cart button (number and set_numer)
bzr revid: jke@openerp.com-20140408161107-0x7uxn68olvsjnnt
2014-04-08 18:11:07 +02:00
Paramjit Singh Sahota e627f1da63 [MERGE] Merged lp:openobject-addons. 2014-04-08 14:31:51 +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
Paramjit Singh Sahota 171dd23fa9 [MERGE] Merged lp:openobject-addons. 2014-04-07 10:34:00 +05:30
Thibault Delavallée 045a12c5c2 [FIX] website_sale: fixed post_msg, display only when having it (may have False, None, ..)
bzr revid: tde@openerp.com-20140404104918-cyszi1l333173d1t
2014-04-04 12:49:18 +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
Denis Ledoux b5c0c3a5d2 [FIX] website_sale: order categories according to their sequence
bzr revid: dle@openerp.com-20140403112511-h4yi8jimf9hjucyl
2014-04-03 13:25:11 +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
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 8db7982726 [IMP] website_sale: remove print
bzr revid: chm@openerp.com-20140319083054-x10c4m7ecxk9202o
2014-03-19 09:30:54 +01:00
chm@openerp.com ed2743f755 merge upstream
bzr revid: chm@openerp.com-20140318161114-4t331xpt4xeitgxo
2014-03-18 17:11:14 +01:00
chm@openerp.com 42ba805cc8 [WIP] rev me
bzr revid: chm@openerp.com-20140318153456-gwz47zs8il23rwii
2014-03-18 16:34:56 +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 d5ddf5152c [FIX] website: remove backslash from redirect with enable_editor
bzr revid: chm@openerp.com-20140314180029-iaeq4i6735pcw100
2014-03-14 19:00:29 +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 ba63094b9b [FIX] website_sale,website_event: can't create product and event. Why: controller and route are strict mode, remove / at the end of the route
bzr revid: chm@openerp.com-20140313132013-2foflswtdd5fp8hb
2014-03-13 14:20:13 +01:00
Denis Ledoux 2b762083a3 [FIX] website_sale: only display payment acquirers of the company of the quotation, or payment acquirers not linked to any company
bzr revid: dle@openerp.com-20140313085107-ie4ptew82p4rq9cy
2014-03-13 09:51:07 +01:00
chm@openerp.com 0bae967baa [MERGE] from trunk
bzr revid: chm@openerp.com-20140312154854-gtq7v1dxfnunkcz6
2014-03-12 16:48:54 +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 2b7298fbf6 [FIX] website_sale: grid must display last empty cell and not chacked empty cell
bzr revid: chm@openerp.com-20140307165239-qzawwm7vrob9fnxd
2014-03-07 17:52:39 +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
Kersten Jeremy e8e1cf2d2f [FIX] Fix route of controller to post a comment from a product page
bzr revid: jke@openerp.com-20140307103038-rc5rdaa7ottpjgz1
2014-03-07 11:30:38 +01:00
Paramjit Singh Sahota b6c748ffe6 [IMP]Added the 'Shopping Carts' sales team and improved code accordingly 2014-03-05 12:30:24 +05:30
Thibault Delavallée 6924171964 [FIX] website_sale: effectively send the email of a draft
or confirmed quotation on the ecommerce. Having the action is not sufficient
we have to trigger it manually.

bzr revid: tde@openerp.com-20140304154433-t9mo6bzsesx7z613
2014-03-04 16:44:33 +01:00
Thibault Delavallée 1802496c9f [FIX] website_sale: fixed wrong method name, sale_reset_order is not defined anymore
bzr revid: tde@openerp.com-20140304143426-0eaec0sr6y4ogta9
2014-03-04 15:34:26 +01:00
Christophe Simonis c8971214f9 [FIX] website_sale: allow validation of free orders (amount = 0) without payment transaction
bzr revid: chs@openerp.com-20140228123414-4chmuemyi72rpwgf
2014-02-28 13:34:14 +01:00
Christophe Matthieu 5e509d07df [FIX] website_sale: search filter with multi values for one attribute does not work. (and fix slider)
bzr revid: chm@openerp.com-20140227164756-846ezfa36fz3v4d9
2014-02-27 17:47:56 +01:00
Christophe Simonis 3e2c1b1be3 [FIX] website_sale: do not write on public user
bzr revid: chs@openerp.com-20140227164000-owh6217y3t5iyiow
2014-02-27 17:40:00 +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 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
Fabien Meghazi 2ab61cf001 [IMP] Rename request.httprequest.session -> request.session
bzr revid: fme@openerp.com-20140225090506-4rnku48yg7ruvv8p
2014-02-25 10:05:06 +01:00
Christophe Matthieu 73853f0744 [IMP] website_sale: checkout_values, checkout_parse and checkout_form_validate
bzr revid: chm@openerp.com-20140224162041-rii00m5hs1e4jadz
2014-02-24 17:20:41 +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 bfeb2b9631 [MERGE] from trunk
bzr revid: chm@openerp.com-20140221094343-s1oh3iq07zi2jo0x
2014-02-21 10:43:43 +01:00
Christophe Matthieu 5a134745e8 [FIX] website_sale: search category with int for saas updating without -u
bzr revid: chm@openerp.com-20140212141713-j9cagak2z2j4s20x
2014-02-12 15:17:13 +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 a3664a8924 [FIX] website: create event, product
bzr revid: chm@openerp.com-20140206154711-vwvw7g1wo1fd1h1y
2014-02-06 16:47:11 +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 3124343f04 [IMP] product style model renames, add user_id on website to be used in multiwebsite
bzr revid: al@openerp.com-20140130225853-6fgpmtaa8v1vr25x
2014-01-30 23:58:53 +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
Olivier Dony e6e8bb3789 [IMP] website_*: remove useless % chars surrounding ilike operand, this is the default
bzr revid: odo@openerp.com-20140129163557-0bb86mx8it57mcvi
2014-01-29 17:35:57 +01:00
Denis Ledoux 0306adbfe3 [FIX] *: using werkzeug.url_encode instead of urllib.urlencode because urliblib.encode does not accept unicode
bzr revid: dle@openerp.com-20140129121316-b5f5e4r6fz9l80kq
2014-01-29 13:13:16 +01:00
Christophe Simonis adac86d0ce [FIX] website_sale: redirect to shop when trying to pay an empty cart
bzr revid: chs@openerp.com-20140128201258-nq4t5axsz3vmrjiw
2014-01-28 21:12:58 +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
Christophe Matthieu 316745250b [FIX] website: public user; website_sale
bzr revid: chm@openerp.com-20140128152136-pqh7oqj4drpjk09z
2014-01-28 16:21:36 +01:00
Christophe Matthieu d7ab648c20 [FIX] website_sale: checkout don't overwrite public partner
bzr revid: chm@openerp.com-20140128145246-ruoa5nhmwk00ss3c
2014-01-28 15:52:46 +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
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
Thibault Delavallée cc793480fc [IMP] payment: renamed message in pre_msg, msg displayed before
payment. Added post_msg, message displayed after payment.
[IMP] payment_transfer: added a default value (generated at create) for
post_msg, that contains bank accounts details. bank accounts linked to the
current company and used in report footer are shown.
[FIX] payment_*: make the buttons noupdate.
[IMP] payment: portal_published -> website_published + propagation
[IMP] payment: added process selection field that will be used for some
control in the website, telling w hether we want to refresh a payment
validation page or not.

bzr revid: tde@openerp.com-20140124134652-cc0nz08znnlmftw4
2014-01-24 14:46:52 +01:00
Christophe Matthieu 33eeff4448 [IMP] website_crm, website_sale: add a Website sale team and new lead and order to this sale team
[FIX] website_sale: remove auto assignation to administrator from website lead and order

bzr revid: chm@openerp.com-20140124114224-w80wd2ea0bx20ldk
2014-01-24 12:42:24 +01:00
Fabien Meghazi d6690455e9 [REM] Removed preload_records
This feature will be stripped down and moved to server's ir.http#_dispatch()

bzr revid: fme@openerp.com-20140123150448-3hhlj4vytr82k88n
2014-01-23 16:04:48 +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
Christophe Matthieu 91f44259b6 [FIX] website_sale: ecommerce_change_pricelist context
bzr revid: chm@openerp.com-20140122151852-ia7x4sd5l2h7oskx
2014-01-22 16:18:52 +01:00
Christophe Matthieu 0c5b6caa10 [FIX] website: payment get pricelist
bzr revid: chm@openerp.com-20140122145328-5xjhu5uublljqdkx
2014-01-22 15:53:28 +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
Christophe Matthieu cbbf6f5940 [FIX] website_sale: highlight category
bzr revid: chm@openerp.com-20140121101529-2cseit2mq5w1d2z2
2014-01-21 11:15:29 +01:00
Fabien Meghazi 14bb6060d7 [REM] Removed @website.route() decorator
Need trunk-website-al Rev#5151

bzr revid: fme@openerp.com-20140120153733-ve3dn2kwvha7n3yl
2014-01-20 16:37:33 +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 cf79ae7635 [FIX] website: access for portal user
bzr revid: chm@openerp.com-20140117154648-sxfisxqcv8o3fvzt
2014-01-17 16:46:48 +01:00
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
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
Christophe Matthieu 4e94761a8e [IMP] product: category and website_sale controllers
bzr revid: chm@openerp.com-20140114142940-xpshp8e6trio5mxc
2014-01-14 15:29:40 +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
Christophe Matthieu 3f0f6b820b [FIX] website: Access rights and Access for: website_crm_partner_assign, website_customer, website_event, website_event_track, website_membership, website_partner, website_sale
bzr revid: chm@openerp.com-20140107135933-h622wxwfhwoulg7q
2014-01-07 14:59:33 +01:00
Thibault Delavallée 0b2d085c1b [IMP] shop: added openchatter on product shop
- product.template now inherits from mail.thread
- added opencahtter on product.template form view
- added discussion thread + attachments in product website view
- added file_type field on ir_attachment, that replaces the javascript thing
from mail.js
- added a controller to comment a product.template

bzr revid: tde@openerp.com-20140106135727-uf0zaxav28pdx4sv
2014-01-06 14:57:27 +01:00
Thibault Delavallée dfd52bfc2c [FIX] website_sale: fixed several access rights issue related to public user + billing / shipping partner_id of sale order badly set, retrieved and displayed in the checkout process
bzr revid: tde@openerp.com-20131224145845-q6255ll7n8wy0syv
2013-12-24 15:58:45 +01:00
Thibault Delavallée 348a2bda96 [FIX] website_sale: get_total_quantity -> get_number_of_products
[FIX] website_sale: fixed domain to find the shipping_partner_id

bzr revid: tde@openerp.com-20131219103732-84nrt5xlqyqbwsns
2013-12-19 11:37:32 +01:00
Thibault Delavallée 7a564f261e [IMP] [FIX] [ADD] website_sale, website_sale_delivery: delivery + ecommerce code cleaning
- added a website_order_line on sale.order model, that are the lines to display
and use in the front-end. This allows to display only products (and not delivery
costs), and to have a correct badge for the number od products.
- cleaned ecommerce website code and method name. Still some cleaning to do
I think.
- fixed some issues in partner and shipping info management, now using CheckoutInfo
more cleanly
- fixed the process of choosing the carrier

bzr revid: tde@openerp.com-20131218132150-f4br0099p2caf43i
2013-12-18 14:21:50 +01:00
Thibault Delavallée 3805a86302 [IMP] website_sale_delivery: make the module effectively works.
- added JS / HTML to handle the choice of the carrier
- added override of payment controller in website_sale_delivery to handle the carrier
and recompute the amount and details
- some code cleaning
- added amount_delivery field in sale.order, that is the amount related to the
delivery

bzr revid: tde@openerp.com-20131217152605-0xoulnnlo0nn7j9o
2013-12-17 16:26:05 +01:00
Christophe Matthieu aca3b51bf3 [IMP] website_sale: layout for all theme and mobile view
bzr revid: chm@openerp.com-20131213161642-e1ltxlidm9apg3l4
2013-12-13 17:16:42 +01:00
Christophe Matthieu fbf71a27c5 [FIX] website_sale: checkout default partner is not the public user
bzr revid: chm@openerp.com-20131212122543-hcc53zjn6wlw5l80
2013-12-12 13:25:43 +01:00
Christophe Matthieu 796b8bf362 [FIX] website_sale: layout; add push to top in grid
bzr revid: chm@openerp.com-20131212114731-9ivgwupic064o3x0
2013-12-12 12:47:31 +01:00
Christophe Matthieu 6aface1bd0 [FIX] product.supplierinfo: product_id is a product.product fields. Rename fields into product_tmpl_id for many2one to product.template model
bzr revid: chm@openerp.com-20131209151135-q54g17zcq1vnshsl
2013-12-09 16:11:35 +01:00
Christophe Matthieu 1a88541ec5 [FIX] website_sale: filters and partner controller
bzr revid: chm@openerp.com-20131205162240-33wfteow79zlbdrn
2013-12-05 17:22:40 +01:00
Fabien Meghazi 7a3b490f46 [IMP] preload records and throw 404 if not exists for blog, event, product
bzr revid: fme@openerp.com-20131205155450-y6joi29l2cn9amkn
2013-12-05 16:54:50 +01:00
Thibault Delavallée dbcdddd3d4 [MERGE] Sync with website-al, because sale was broken
bzr revid: tde@openerp.com-20131204130704-fa3pu4gnpku0frsj
bzr revid: tde@openerp.com-20131204144838-vu66z2lsybqtp4hm
2013-12-04 15:48:38 +01:00
Christophe Matthieu edee3e5da3 [FIX] website_sale: shop/confirm_order: from_partner
bzr revid: chm@openerp.com-20131204141056-f4u5rqbbqfka95ka
2013-12-04 15:10:56 +01:00
Thibault Delavallée 9f0b5a7c53 [IMP] website_sale: improved the choice of acquirer.
Now all acquirer are displayed using a small icon; a Pay Now button is located on the right that
is the next step for the payment.
All acquirers are rendered with a Pay Now button, but only the currently chosen one is
displayed. This allows to display several acquirers without having to do javascript-based
hacks to tune the form, its action or content.

bzr revid: tde@openerp.com-20131204130628-eeqpfhoqaavhv6nk
2013-12-04 14:06:28 +01:00