Commit Graph

828 Commits

Author SHA1 Message Date
Christophe Matthieu 4fe9f90495 [FIX] website_event: create sale order and pricelist init
bzr revid: chm@openerp.com-20131125160358-bxj3tx90bru3mywz
2013-11-25 17:03:58 +01:00
ddm 1a0b6a55e5 [FIX] Fixed product tour
bzr revid: ddm@openerp.com-20131125154953-9vyfdtrnmws6qm32
2013-11-25 16:49:53 +01:00
Christophe Matthieu 1ae1c0b170 [FIX] website_sale_delivery: inherit view
bzr revid: chm@openerp.com-20131125151405-f9k1lzu91ep48hwx
2013-11-25 16:14:05 +01:00
ddm e18fafb8a8 [FIX] Tour: various fixes (leaks etc.)
bzr revid: ddm@openerp.com-20131125134754-i3j9qgovrqc22qn9
2013-11-25 14:47:54 +01:00
Xavier Morel e997c622d4 [FIX] remove apparently pointless parameter
bzr revid: xmo@openerp.com-20131125123717-ahyzg4e682qtmwy6
2013-11-25 13:37:17 +01:00
ddm 0bda85949a [IMP] Various tour imps
bzr revid: ddm@openerp.com-20131122173038-s9dfq8lxau3fadfl
2013-11-22 18:30:38 +01:00
ddm 6a307069b4 [IMP] Blog tour
bzr revid: ddm@openerp.com-20131122110154-fsjeahreh7skk0fj
2013-11-22 12:01:54 +01:00
Darshan Kalola (OpenERP) 9f2dce4fe0 [IMP]improve product template view and change necessary xpath
bzr revid: dka@tinyerp.com-20131122054850-8sfin7rypnyf17ip
2013-11-22 11:18:50 +05:30
Xavier Morel 14d15b95a5 [FIX] crap
* (1, '=', 1) is a noop domain section

* list.append. A thing.

* converting an int to an int is not useful

* search_count avoids having to fetch all product.template ids from
  the database just to call len() on the result when it's not
  necessary

* when using a dict value 5 times in a row, it's simpler to get it
  just once and refer a local variable thereafter

bzr revid: xmo@openerp.com-20131121141647-2w9z2a7b8p5sek22
2013-11-21 15:16:47 +01:00
Thibault Delavallée 32897bf4ee [MERGE] Sync with website-al
bzr revid: tde@openerp.com-20131121132413-lyngpz4c23kocmye
2013-11-21 14:24:13 +01:00
Christophe Matthieu dc8ef4da30 [FIX] website_sale: fix product editor and move edit code in website_sale.editor.js
bzr revid: chm@openerp.com-20131121132317-ysa25sdqqx8dg1wo
2013-11-21 14:23:17 +01:00
Christophe Matthieu 07819834bb [FIX] website_sale: filter controller and shop/?category=37 --> shop/category/37
bzr revid: chm@openerp.com-20131121130529-1zs3ioih5156ceit
2013-11-21 14:05:29 +01:00
Thibault Delavallée bc726e4da7 [MERGE] Sync with website-al
bzr revid: tde@openerp.com-20131121120935-srk3s4qhxar0k5l5
2013-11-21 13:09:35 +01:00
Thibault Delavallée 2693636989 [IMP] website_sale: improved checkout process
- confirmation is now a page displaying a sale order, which polls on the
related transaction to have its status
- when receiving an incoming notification thorugh the acquirer controller
the sale order is updated, then the confirmation page is displayed
- this allows to have a confirmation page that is independant from the 
rest of the checkout process
- cleaned confirmation page, removed order details

bzr revid: tde@openerp.com-20131121120902-fm8b7u94gmepohgi
2013-11-21 13:09:02 +01:00
ddm 56e19c374f [FIX] Avoid reserved keywords as method names
bzr revid: ddm@openerp.com-20131121114922-w731pvjnnvqzxu42
2013-11-21 12:49:22 +01:00
ddm 77c60a94be [IMP] Tour: method names
bzr revid: ddm@openerp.com-20131121112312-2n8kd2tja6upji3i
2013-11-21 12:23:12 +01:00
ddm ec4372ac23 [IMP] Tour: better defaults
bzr revid: ddm@openerp.com-20131121111102-l66jzdysdkqm7fje
2013-11-21 12:11:02 +01:00
Thibault Delavallée 04818e7584 [FIX] website_sale: fixed some 'add cart' buttons not working
bzr revid: tde@openerp.com-20131121094816-w8ulontnt9kv5zbf
2013-11-21 10:48:16 +01:00
Thibault Delavallée d5ac601823 [MERGE] Sync with website-al
bzr revid: tde@openerp.com-20131120140414-zf1qiepxueyrhn4j
2013-11-20 15:04:14 +01:00
Thibault Delavallée 5dcb10fc01 [IMP] website_sale: end of checkout process improvements
- added a controller that validates the payment: confirm the quotation (if paid)
and send it by email
- some fixes in payment routes
- some cleaning in payment template, removed unnecessary code, added a class on a
div to ease the submit button management

bzr revid: tde@openerp.com-20131120140321-mderltwy8xp2vfn4
2013-11-20 15:03:21 +01:00
Christophe Matthieu 6b10be15b2 [IMP] website snippet: add group for styles snippets, add custom picture with style snippet, mouseover and mouseout preview, fix dark css class in demo data
bzr revid: chm@openerp.com-20131120115250-etqv5ofqguze0zsj
2013-11-20 12:52:50 +01:00
ddm c706db9b79 [IMP] Tour code cleanup
bzr revid: ddm@openerp.com-20131120110757-lq4gnmxj9nf1e7p0
2013-11-20 12:07:57 +01:00
ddm e8858b02a6 [IMP] Simplify tour declaration II
bzr revid: ddm@openerp.com-20131120110233-1hoc40q2wrs0739d
2013-11-20 12:02:33 +01:00
ddm 10e7a76ae4 [IMP] Simplify tour declaration
bzr revid: ddm@openerp.com-20131120105205-u5w4167rposrfazd
2013-11-20 11:52:05 +01:00
ddm be6c14c5b6 [IMP] Shop tour code cleanup
bzr revid: ddm@openerp.com-20131120104107-hoiu7n6cq68qf69u
2013-11-20 11:41:07 +01:00
Thibault Delavallée d1bc4d3766 [MERGE] Sync with website-al
bzr revid: tde@openerp.com-20131120091851-mtln13mmv8amuau7
2013-11-20 10:18:51 +01:00
Christophe Matthieu e41e8f3957 [IMP] website_hr_recruitment: clear url path
bzr revid: chm@openerp.com-20131119161403-wsqwgfi9w3ythjeg
2013-11-19 17:14:03 +01:00
Thibault Delavallée 38a9a3f480 [MERGE] Sync with website-al
bzr revid: tde@openerp.com-20131119160204-1yvqbg4vgpc0bkqs
2013-11-19 17:02:04 +01:00
Thibault Delavallée 4f6e792733 [IMP] website_sale: improved checkout process
- now going to shop/confirmation when coming back from the acquirer
- added poll on the confirmation page to wait for data from acquirer
- misc cleaning of checkout process, order and transaction management
- added cancel state on payment.transaction, when canceled by the
customer

bzr revid: tde@openerp.com-20131119160129-fkwkhjvk1bh0uarf
2013-11-19 17:01:29 +01:00
ddm e17d99988b [FIX] Shop tutorial false start
bzr revid: ddm@openerp.com-20131119153908-8n1kse1y2js7v8oj
2013-11-19 16:39:08 +01:00
Christophe Matthieu 20add62aef [IMP] website_sale: Remove new button
bzr revid: chm@openerp.com-20131119152903-r1h3slpy5vigfor4
2013-11-19 16:29:03 +01:00
Christophe Matthieu cae5522196 [IMP] website_sale: breadcrum layout in my cart
bzr revid: chm@openerp.com-20131119152344-w2f56nmd2ce0spon
2013-11-19 16:23:44 +01:00
ddm 47295c4e0e [FIX] Fixes to shop tour
bzr revid: ddm@openerp.com-20131119151059-8xl169vodupwy8xw
2013-11-19 16:10:59 +01:00
ddm a89c3dff4c [FIX] Missing double quotes
bzr revid: ddm@openerp.com-20131119122605-o6tjpfq7be5tn6zk
2013-11-19 13:26:05 +01:00
ddm 1ec2cb9331 [IMP] Shop tutorial continued
bzr revid: ddm@openerp.com-20131119122319-45fu90nooiwb7so7
2013-11-19 13:23:19 +01:00
Fabien Meghazi 3951af2ab5 [IMP] Content->New Product asks for name of product
bzr revid: fme@openerp.com-20131119113822-ve7bl516xowa7u1f
2013-11-19 12:38:22 +01:00
Christophe Matthieu 910c2657a9 [IMP] website: add a group_website_publisher to Display Editor Bar on Website and other editable option
bzr revid: chm@openerp.com-20131119103042-stdyd6r00e1zgli5
2013-11-19 11:30:42 +01:00
Thibault Delavallée ba14bbe339 [MOV] website_sale: move get_order and get_current_order code into Website class
and into website specific file.

bzr revid: tde@openerp.com-20131119102921-ie03umd2ozasp798
2013-11-19 11:29:21 +01:00
ddm 4ba5cad0e3 [IMP] Improve tour registration
bzr revid: ddm@openerp.com-20131119094353-kg04ijualwtsz1lo
2013-11-19 10:43:53 +01:00
Thibault Delavallée 5a51562c18 [ADD] website_sale: added website file in controllers, for website specific code
bzr revid: tde@openerp.com-20131119093735-peyoz1ri2hv21w3v
2013-11-19 10:37:35 +01:00
Thibault Delavallée 4d84a4a627 [MERGE] Sync with website-al
bzr revid: tde@openerp.com-20131119091935-2bhj417353diri9l
2013-11-19 10:19:35 +01:00
ddm c40105ce18 [IMP] Start eCommerce tutorial on install
bzr revid: ddm@openerp.com-20131119090812-amjdzjfh5xwoouex
2013-11-19 10:08:12 +01:00
Christophe Matthieu 5a6a1efc79 [IMP] website_blog: add breadcrumb; [IMP] clean links
bzr revid: chm@openerp.com-20131118143530-5205sp6q7xp6lbj7
2013-11-18 15:35:30 +01:00
Thibault Delavallée 7237ae3a63 [MERGE] Sync with website-al
bzr revid: tde@openerp.com-20131118100534-1pw762aklfdt2hwn
2013-11-18 11:05:34 +01:00
Paramjit Singh Sahota 5900672160 [MERGE] Merged lp:~openerp-dev/openobject-addons/trunk-website-al.
bzr revid: psa@tinyerp.com-20131118050254-oc3szg7ws2m75lu4
2013-11-18 10:32:54 +05:30
Fabien Pinckaers b61ac1998e [FIX] access right with sale with event crashed [NEW] website_sale_delivery module
bzr revid: fp@openerp.com-20131116224306-7is2hawhhpzazie3
2013-11-16 23:43:06 +01:00
Fabien Pinckaers c69f31d82c [iMP] Order of published/unpublished documents
bzr revid: fp@openerp.com-20131116095426-lqwfdid9z1asi2se
2013-11-16 10:54:26 +01:00
Christophe Matthieu e61ec3f1cd [FIX] website_sale: click on blank cd, add to cart -> I have a webcam instead
bzr revid: chm@openerp.com-20131115163048-i999l74bfd8t3zrh
2013-11-15 17:30:48 +01:00
Christophe Matthieu 85014499a5 [IMP] website_sale: domain to display product in shop, overwrited in website_event
bzr revid: chm@openerp.com-20131115160828-pjv3gessa5sxu2ap
2013-11-15 17:08:28 +01:00
Christophe Matthieu 419c7c6b32 [FIX] website_sale: ribon
bzr revid: chm@openerp.com-20131115160721-btxwlxaj7nf9se5n
2013-11-15 17:07:21 +01:00
Christophe Matthieu b958ece1df [IMP] website_sale: access rights
bzr revid: chm@openerp.com-20131115152716-86wb7yxq2s4hr633
2013-11-15 16:27:16 +01:00
Thibault Delavallée 9f38df4d57 [MERGE] Sync with website-al
bzr revid: tde@openerp.com-20131115133635-66u5iuesqb5u6leq
2013-11-15 14:36:35 +01:00
Thibault Delavallée 28c864b00f [IMP] website_sale: added basic management of acquirer button in sale.
The action of the rendered button is catched, re-routed to a custom controller in sale that
creates the payment.transaction, or fetch an already-existing one.

Once the transaction is found or created, the user is redirected to the acquirer
transaction url.

Next step: display the transaction status in the payment page.

bzr revid: tde@openerp.com-20131115133414-jiob0gkpv106db27
2013-11-15 14:34:14 +01:00
ddm 2dbb8f1730 [IMP] Rename shop tour
bzr revid: ddm@openerp.com-20131114180737-e0tcvj4wl753hk0d
2013-11-14 19:07:37 +01:00
ddm a07adbfc5d [IMP] Shop tour scaffholding
bzr revid: ddm@openerp.com-20131114171736-090vctn8zr30ne8g
2013-11-14 18:17:36 +01:00
Christophe Matthieu 3f1ff327ad [FIX] website: access right for demo user
bzr revid: chm@openerp.com-20131114152212-jcmyzbf6zcpkp999
2013-11-14 16:22:12 +01:00
Christophe Matthieu 62f00f6941 [IMP] website_sale: remove product 'Service' from the shop list of products
bzr revid: chm@openerp.com-20131114113845-xgs79iq2eq2bqgmm
2013-11-14 12:38:45 +01:00
ddm 569b6dc220 [Oops] Sorry about that
bzr revid: ddm@openerp.com-20131113202732-0uak3vi7qkf8jts7
2013-11-13 21:27:32 +01:00
ddm 02217abc1f [FIX] Checkout form almost functional
bzr revid: ddm@openerp.com-20131113184303-0i6rtjxbavb9znxz
2013-11-13 19:43:03 +01:00
Fabien Meghazi 7598bcdb98 [ADD] Content menu links splitted per modules
TODO: website.prompt() should be finished for Add a blog post link

Added @id=editable_scripts_hook in layout template so modules can easly add *.editor.js files

bzr revid: fme@openerp.com-20131113171438-3l0wo08ta5vsulq3
2013-11-13 18:14:38 +01:00
Thibault Delavallée 833adcec62 [FIX] website_sale: fixed template about acquirer, when displaying the form of an acquirer
bzr revid: tde@openerp.com-20131113140009-wpa69bbmswyncmoz
2013-11-13 15:00:09 +01:00
Thibault Delavallée 9b25f6eb42 [REV] website_sale: removed a change to lessen the diff
bzr revid: tde@openerp.com-20131113135947-fq7z0ci0ue92q11w
2013-11-13 14:59:47 +01:00
Thibault Delavallée 91ddcfefcc [REV] website_sale: removed a space removal, to shorten the diff
bzr revid: tde@openerp.com-20131113104351-tly8h3buek6e1msd
2013-11-13 11:43:51 +01:00
Thibault Delavallée 72ff6562b6 [FIX] website_sale: fixed remaining TREE tag due to conflict
bzr revid: tde@openerp.com-20131113104333-5ulxae6vbcgc5al6
2013-11-13 11:43:33 +01:00
Thibault Delavallée ac54e05a21 [MERGE] Sync with website-al
bzr revid: tde@openerp.com-20131113093009-w6jih5xosequqowh
2013-11-13 10:30:09 +01:00
Christophe Matthieu d96222ac4f [FIX] website_sale: 'Product Description' overlaps with price
bzr revid: chm@openerp.com-20131112173502-gddstacuq8n32gdc
2013-11-12 18:35:02 +01:00
Christophe Matthieu 8a48f25446 [FIX] website_sale: list_view
bzr revid: chm@openerp.com-20131112172811-yc0tn0gfz2pvwpb0
2013-11-12 18:28:11 +01:00
Christophe Matthieu 34600660bf [FIX] website_sale: access right for website.product.style
bzr revid: chm@openerp.com-20131112165415-c6o3c26djdtuaa2k
2013-11-12 17:54:15 +01:00
Fabien Meghazi 557d887496 [IMP] preprocess static @href|src|action, static url doesn't need t-href anymore
you need to pull server branch

bzr revid: fme@openerp.com-20131112144442-y9bw5q6kkoym8o1i
2013-11-12 15:44:42 +01:00
Fabien Meghazi 91ac20c28c [FIX] Remove lang_code from kwargs
bzr revid: fme@openerp.com-20131112112150-ka9ner1bkqx6ioeg
2013-11-12 12:21:50 +01:00
Thibault Delavallée 92e72bb317 [MERGE] Sync with website-al
bzr revid: tde@openerp.com-20131112095402-82v28vq537o6le8c
2013-11-12 10:54:02 +01:00
Paramjit Singh Sahota be9553d6f1 [MERGE] Merged lp:~openerp-dev/openobject-addons/trunk-website-al
bzr revid: psa@tinyerp.com-20131111063123-qysh7oyiscfy8ku9
2013-11-11 12:01:23 +05:30
ddm 0b16f685c1 [FIX] beware of multilang when removing **post
bzr revid: ddm@openerp.com-20131108172019-51yymatg4b1zanc1
2013-11-08 18:20:19 +01:00
ddm 4d5a8ed6ab [IMP] cleanup product controller
bzr revid: ddm@openerp.com-20131108164917-0cn91vb1yn822bvi
2013-11-08 17:49:17 +01:00
Christophe Matthieu 9d9b2ed63c [FIX] website_sale: Shopping Cart suggested products
bzr revid: chm@openerp.com-20131108155841-m4b6k02zx8h54ajf
2013-11-08 16:58:41 +01:00
Thibault Delavallée 35619dfe12 [MERGE] Sync with website-al main branch
bzr revid: tde@openerp.com-20131107172339-zjpa2xmtf2xql9eu
2013-11-07 18:23:39 +01:00
Christophe Matthieu ec2a9776ab [IMP] website_sale: move attributes under add to cart button in product view
bzr revid: chm@openerp.com-20131107164522-uauyelduq7o4sfj3
2013-11-07 17:45:22 +01:00
Christophe Matthieu dd497b0ef2 [IMP] website_sale: change name of suggested product template
bzr revid: chm@openerp.com-20131107162916-ocm5q101psem5j2v
2013-11-07 17:29:16 +01:00
Christophe Matthieu 4ff0a207f6 [IMP] website_sale: some change for attributes
bzr revid: chm@openerp.com-20131107162101-82tl3ibbhxkbgjro
2013-11-07 17:21:01 +01:00
Fabien Meghazi 01a28b6e03 [FIX] Can't translate menus
context was not passed while setting request.website
forced to refactor a bit in order to make true model methods but stopped
because it will be duplicated work when migrating to the new api

bzr revid: fme@openerp.com-20131107151400-9dmtgz7xs34qmbmq
2013-11-07 16:14:00 +01:00
Christophe Matthieu 28b932a40d [FIX] website_sale: highlight category
bzr revid: chm@openerp.com-20131107144828-0wa4vexo5nj41uh5
2013-11-07 15:48:28 +01:00
Christophe Matthieu a4cea5c7eb [IMP] website_sale: user can display filters without categories
bzr revid: chm@openerp.com-20131107143959-551ti1ces04toes0
2013-11-07 15:39:59 +01:00
ddm 821f703125 [IMP] use single template for search box in eCommerce
bzr revid: ddm@openerp.com-20131107135528-0hovrmuxk51xl8wo
2013-11-07 14:55:28 +01:00
Christophe Matthieu 25f6d1c83f [IMP] website_sale: header change for user customization
bzr revid: chm@openerp.com-20131107135306-8jpe0gl4iqmgl51k
2013-11-07 14:53:06 +01:00
Christophe Matthieu 9ae2008115 [IMP] website: phone view, hide options and editor buttons
bzr revid: chm@openerp.com-20131107112533-o33ok38tbayrdbke
2013-11-07 12:25:33 +01:00
Christophe Matthieu 2ae05fb8de [IMP] website_sale: display message when search returns no result
bzr revid: chm@openerp.com-20131107102935-r9212sq6avbhy2o2
2013-11-07 11:29:35 +01:00
ddm b7a4c6d3f0 [FIX] eCommerve search + categories & filters
Hopefully this completely solves it. More testing required...

bzr revid: ddm@openerp.com-20131106175743-xxxswsc0vs5fh3x5
2013-11-06 18:57:43 +01:00
Fabien Meghazi 5ce5a2d877 [ADD] Added sequence field to website.menu data
bzr revid: fme@openerp.com-20131106154207-dd6g5jgpjt35ee9h
2013-11-06 16:42:07 +01:00
ddm 5f41d10ab5 [FIX] product links when browsing categories
bzr revid: ddm@openerp.com-20131105162558-4e1yua2hipvf5cly
2013-11-05 17:25:58 +01:00
Christophe Matthieu 67c437df77 [FIX] website_sale: access right for product.attribute.product; white list for filter link
bzr revid: chm@openerp.com-20131105161737-b1o41v17p7wsjl6v
2013-11-05 17:17:37 +01:00
ddm b34bb11b2d [FIX] avoid building urls manually if possible
bzr revid: ddm@openerp.com-20131105155627-ahyo9av7wh1aa7jl
2013-11-05 16:56:27 +01:00
Christophe Matthieu fb5ae3cabf [FIX] website_sale: mycart when the user haven't sale order
bzr revid: chm@openerp.com-20131105155410-pel99sbzka27zl4o
2013-11-05 16:54:10 +01:00
Xavier Morel 5ce1bfdddf [FIX] more templates which aren't actually pages
bzr revid: xmo@openerp.com-20131105151404-olp8wvdqx9yxuxj9
2013-11-05 16:14:04 +01:00
Xavier Morel bf602c18b7 [FIX] cart template is not a page
bzr revid: xmo@openerp.com-20131105094953-fdmm1j3k4z1abg92
2013-11-05 10:49:53 +01:00
Christophe Matthieu 475c77874b [FIX] website_sale: add filter
bzr revid: chm@openerp.com-20131105151417-zas9dcz5jn0za8st
2013-11-05 16:14:17 +01:00
Christophe Matthieu f318f99825 [IMP] website_sale: attributes/filter, fix access right, add default value for filter (for custom user ecommerce with category,label...)
bzr revid: chm@openerp.com-20131105150928-ps01ziqnfgd9hu46
2013-11-05 16:09:28 +01:00
Christophe Matthieu 7f5a60f13c [FIX] website_sale: update total when the user change a product quantity
bzr revid: chm@openerp.com-20131105132747-figm8j11d6ul1v0k
2013-11-05 14:27:47 +01:00
Christophe Matthieu a31847a432 [FIX] website_sale: add access rules for product.pricelist
bzr revid: chm@openerp.com-20131105092801-1vohr6w15cxqj4wp
2013-11-05 10:28:01 +01:00
Thibault Delavallée 420cdb13a2 [MERGE] Sync with website-al
bzr revid: tde@openerp.com-20131031102749-mzn5bqcunwuo1hsf
2013-10-31 11:27:49 +01:00
Fabien Meghazi 90814d781a [MERGE] upstream
bzr revid: fme@openerp.com-20131030144813-xmjb6i9ayv23aqyi
2013-10-30 15:48:13 +01:00
Xavier Morel 3a1ed80b41 [FIX] creation of new products from products listing page
* fix creation controller to redirect to the id of the *product
  template* implicitly created when the product is created, not to the
  product, as "product" URLs actually display information about a
  product template
* ensure the controller is only POST-ed to, not GET
* fix button to POST the creation request (use form and actual button,
  not link)
* fix template (foreach -> t-foreach)

bzr revid: xmo@openerp.com-20131030133019-5pq3qekwu465x1k6
2013-10-30 14:30:19 +01:00
Fabien Meghazi 12801a8cbc [MERGE] upstream
bzr revid: fme@openerp.com-20131030082046-13kxszts8g0ky4wr
2013-10-30 09:20:46 +01:00
Paramjit Singh Sahota 3065d4dc27 [MERGE] Merged lp:~openerp-dev/openobject-addons/trunk-website-al
bzr revid: psa@tinyerp.com-20131029050653-528vjzg4rpbo3l62
2013-10-29 10:36:53 +05:30
ddm 2196a69a61 [FIX] eCommerce: duplicate product price
bzr revid: ddm@openerp.com-20131028145043-ek0rnvatu2ab4avx
2013-10-28 15:50:43 +01:00
Paramjit Singh Sahota 5d800abfdb [MERGE] Merged lp:~openerp-dev/openobject-addons/trunk-website-al
bzr revid: psa@tinyerp.com-20131022115302-t5a9ftki0yt2pxvk
bzr revid: psa@tinyerp.com-20131024051639-ijmy82htxvy3c23r
bzr revid: psa@tinyerp.com-20131028063631-7ndbt6c4x09ad283
2013-10-28 12:06:31 +05:30
Fabien Meghazi eb7b1362cd [WIP] Menu working from database (not yet multi-website)
bzr revid: fme@openerp.com-20131025152446-si9gsjujzcn40hip
2013-10-25 17:24:46 +02:00
Thibault Delavallée 15ec0ebb62 [MERGE] Sync with website-al
bzr revid: tde@openerp.com-20131024131445-zaxaw5rpu681gwoz
2013-10-24 15:14:45 +02:00
Thibault Delavallée 2cc18c153e [REV] Reverted a change in _openerp__.py in website_sale, because
this was just for local tests.

bzr revid: tde@openerp.com-20131024111453-tqjx4st6js5qnoz4
2013-10-24 13:14:53 +02:00
Thibault Delavallée 0467c8a5ab [FIX] [WIP] website_sale: fix crash when having product templates without variant.
probably it should not be displayed, but as there does not seem to exist any
clue about what the controller / view should do, I added some protections.

[DOC] added some comments because some methods seems quite weird.

bzr revid: tde@openerp.com-20131024110453-uj4xnrtwst0fdcrb
2013-10-24 13:04:53 +02:00
Thibault Delavallée 258846a697 [FIX] [WIP] website_sale: Tries to fix method
that does things not commented on things that do not necessarily exist.

Does it hurt you to put some docstrings ?

bzr revid: tde@openerp.com-20131024105524-eattmf2s52ekztn3
2013-10-24 12:55:24 +02:00
ddm 3ff98b4050 [IMP] eCommerce: remove duplicate button
bzr revid: ddm@openerp.com-20131024092438-aelgmzbcpvwmf33p
2013-10-24 11:24:38 +02:00
ddm bffc22b391 [IMP] Consistency
bzr revid: ddm@openerp.com-20131024092057-p26cnzy9q37zuc6s
2013-10-24 11:20:57 +02:00
ddm d5379f3b7c [FIX] eCommerce cart layout
Fixed 'Continue Shopping' button spacing when cart empty

bzr revid: ddm@openerp.com-20131023154639-j7385c9oaka2k3g1
2013-10-23 17:46:39 +02:00
Fabien Meghazi 7dd1934585 [FIX] option typo: unable_editor -> enable_editor
bzr revid: fme@openerp.com-20131023091152-h0hxw47hzfor2al8
2013-10-23 11:11:52 +02:00
ddm 3873868633 [FIX] Fixed eCommerce pager
bzr revid: ddm@openerp.com-20131022151655-erprk7ci7mrwmb18
2013-10-22 17:16:55 +02:00
Xavier Morel 3655f43e42 [IMP] warnings and shit
bzr revid: xmo@openerp.com-20131022151144-tblwba9rf77iuidl
2013-10-22 17:11:44 +02:00
ddm 7994ceb43d [IMP] eCommerce: layout improvements
bzr revid: ddm@openerp.com-20131022142804-58oabf37w3zsg2pg
2013-10-22 16:28:04 +02:00
ddm 1888dea9b4 [IMP] eCommerce: Checkout summary moved to left (cf. apr's review)
bzr revid: ddm@openerp.com-20131022140119-82ex7kvrzeqc7jri
2013-10-22 16:01:19 +02:00
ddm 291ffdb515 [CMS] eCommerce: remove product list title (cf. apr's review)
bzr revid: ddm@openerp.com-20131022134409-g1qi25a96jvzby8s
2013-10-22 15:44:09 +02:00
Xavier Morel 31ba0b8b5a [FIX] image t-field lost during a merge
bzr revid: xmo@openerp.com-20131022105955-i550clo5snyvnv26
2013-10-22 12:59:55 +02:00
Paramjit Singh Sahota 5d233599ce contenteditable false.
bzr revid: psa@tinyerp.com-20131022063841-5vtzxns0ho2heuld
2013-10-22 12:08:41 +05:30
Paramjit Singh Sahota 4266d44b61 [IMP] Improvd the banners.
bzr revid: psa@tinyerp.com-20131022060436-39jpcp2rxrx8okq9
2013-10-22 11:34:36 +05:30
ddm 2771c47379 [FIX] Ace: proper template naming
bzr revid: ddm@openerp.com-20131021133957-7ktyfk21a0huj1vl
2013-10-21 15:39:57 +02:00
Paramjit Singh Sahota 6befd7d6c5 [IMP]Improved code.
bzr revid: psa@tinyerp.com-20131021132901-up1ianuz5rtg3hly
2013-10-21 18:59:01 +05:30
Paramjit Singh Sahota 32124e7db5 [IMP] Little Improvement.
bzr revid: psa@tinyerp.com-20131021085725-wls4ocyjo38tnq7w
2013-10-21 14:27:25 +05:30
Paramjit Singh Sahota 5f3aa19035 [IMP] Improved code and make file for demo data.
bzr revid: psa@tinyerp.com-20131021074817-3yren0baw8fqijie
2013-10-21 13:18:17 +05:30
Paramjit Singh Sahota a8519350b9 [MERGE] Merged trunk-website-al
bzr revid: psa@tinyerp.com-20131018134347-gbvtw3diw1lrli6k
2013-10-18 19:13:47 +05:30
Paramjit Singh Sahota 7baf49139a [IMP] Added event banner for homepage.
bzr revid: psa@tinyerp.com-20131018130256-gr9ikd0iiszvgsmg
2013-10-18 18:32:56 +05:30
Fabien Meghazi 0373662dd4 [NODISK] @ddm: Got no floppy disk so I push here
bzr revid: fme@openerp.com-20131018130034-vo6rgndvzv1ni6nu
2013-10-18 15:00:34 +02:00
Paramjit Singh Sahota 5732f1552e [IMP]Added the demodata for homepage.
bzr revid: psa@tinyerp.com-20131018123244-ueuj25lto0ugs6mj
2013-10-18 18:02:44 +05:30
Christophe Matthieu 0445188ff2 [MERGE] sync from website-al
bzr revid: chm@openerp.com-20131018121050-vpk0lltaia4lka4l
2013-10-18 14:10:50 +02:00
Christophe Matthieu 666387a274 [WIP] payment_acquirer
bzr revid: chm@openerp.com-20131018111530-tjyhp3cu1qlabhij
2013-10-18 13:15:30 +02:00
Christophe Matthieu fc43a53079 [FIX] product.attribute: store min and max
bzr revid: chm@openerp.com-20131017131604-x2xo963p9pq81hvf
2013-10-17 15:16:04 +02:00
Paramjit Singh Sahota 70dd2ebc14 [IMP] Improved path.
bzr revid: psa@tinyerp.com-20131017131321-uyyyp9nii5ab8ejx
2013-10-17 18:43:21 +05:30
Paramjit Singh Sahota 67b6faf955 [IMP]ADded banner for shop.
bzr revid: psa@tinyerp.com-20131017130421-fnir86hberl2t6qy
2013-10-17 18:34:21 +05:30
Christophe Matthieu 36675c3663 [WIP] payment_acquirer
bzr revid: chm@openerp.com-20131017110046-1b5pmju5q8x3gaz5
2013-10-17 13:00:46 +02:00
Paramjit Singh Sahota e126969eab For the sack removed the banner from homepage.
bzr revid: psa@tinyerp.com-20131017095125-uf4dm2jfy7a0sla4
2013-10-17 15:21:25 +05:30
Paramjit Singh Sahota 5b1268d5e7 [IMP] Improved the layout of homepage.
bzr revid: psa@tinyerp.com-20131017071144-k58tomhtjit4n126
2013-10-17 12:41:44 +05:30
ddm ebdfbc58f1 [FIX] SEO for shop products
bzr revid: ddm@openerp.com-20131016160232-e5rxi1hoofm5anrw
2013-10-16 18:02:32 +02:00
Christophe Matthieu 6e4c0f9068 [WIP] website_sale use payment_acquirer
bzr revid: chm@openerp.com-20131016150837-1zo80gd1pmlvy2im
2013-10-16 17:08:37 +02:00
Fabien Meghazi 1cec2a5b6f [REM] Obsolete route /admin
bzr revid: fme@openerp.com-20131016093248-2q2c8ppkxxhfx1su
2013-10-16 11:32:48 +02:00
Christophe Matthieu 110d2d1386 [FIX] website_sale: forgotten files
bzr revid: chm@openerp.com-20131015094505-g0n3g48megu96kh0
2013-10-15 11:45:05 +02:00
Christophe Matthieu 5dd919e930 [IMP] website_sale: replace sql search by openerp domain for attributes searching
bzr revid: chm@openerp.com-20131015093350-a4irzeqiwpn55gh4
2013-10-15 11:33:50 +02:00
Christophe Matthieu 03b360e19f [FIX] website_sale: search by facets/attributes and category
bzr revid: chm@openerp.com-20131015083331-gypew1z1sb4m9jzt
2013-10-15 10:33:31 +02:00
Christophe Matthieu f06566baa1 [IMP] website_sale: remove some args in t-keep-query xml attr
bzr revid: chm@openerp.com-20131015083010-sxslddq0l8hk174g
2013-10-15 10:30:10 +02:00
Christophe Matthieu e6a831a1a2 [IMP] website: add facets/attributes on product template. Displayed in the left category menu in the ecommerce
bzr revid: chm@openerp.com-20131015082726-6f1tkyhoaju27p85
2013-10-15 10:27:26 +02:00
Fabien Meghazi 853cb1dd26 [MERGE] SEO meta data persistence. New template title handling
bzr revid: fme@openerp.com-20131014151509-6bnux7ncvqmy3tea
2013-10-14 17:15:09 +02:00
Xavier Morel 804f879518 [MERGE] new fields & field conversions in CMS
bzr revid: xmo@openerp.com-20131014100222-v73qz8dbrurc2eoq
2013-10-14 12:02:22 +02:00
Xavier Morel 2cdaa44b9e [FIX] wrong end tag during merge
bzr revid: xmo@openerp.com-20131014095820-njd1v48lgljrj2q0
2013-10-14 11:58:20 +02:00
Fabien Meghazi 631b1cbc09 [MERGE] upstream
bzr revid: fme@openerp.com-20131014095642-qxl7ceqptfsj215l
2013-10-14 11:56:42 +02:00
Xavier Morel 2e352ce187 [MERGE] from trunk
bzr revid: xmo@openerp.com-20131014085459-dhbypq0hg3lzzf3j
2013-10-14 10:54:59 +02:00
Christophe Matthieu 2d719d3d7b [MOVE] website_sale: py files to models/
bzr revid: chm@openerp.com-20131014081841-k8iz2b67voezgue4
2013-10-14 10:18:41 +02:00
Fabien Pinckaers a21459d79f [IMP] demo data
bzr revid: fp@openerp.com-20131013190105-5mwo51w7v62tkm89
2013-10-13 21:01:05 +02:00
Fabien Pinckaers a128704b47 [IMP] demo data
bzr revid: fp@openerp.com-20131013154839-4fscqfpzohhevww5
2013-10-13 17:48:39 +02:00
Xavier Morel 1ad6132624 [IMP] span[text-decoration] -> del
bzr revid: xmo@openerp.com-20131011135550-q4s83cgbb7f8qgof
2013-10-11 15:55:50 +02:00
Xavier Morel 1208a5bcf5 [ADD] monetary widget use in website_sale
bzr revid: xmo@openerp.com-20131011131147-plqmc1r5ok4tcrge
2013-10-11 15:11:47 +02:00
Fabien Meghazi 6a37c2fb82 [IMP] Use view 'name' as title for main_object of type ir.ui.view
bzr revid: fme@openerp.com-20131010145525-417zbwltyqzbjolz
2013-10-10 16:55:25 +02:00
Fabien Meghazi 9b40e849d6 [WIP] new title managment in templates. expose main_object for seo
bzr revid: fme@openerp.com-20131010132907-xxmg96qmcw9j5f2d
2013-10-10 15:29:07 +02:00
Christophe Matthieu 7cfefd4795 [IMP] website_sale: small change in checkout view
bzr revid: chm@openerp.com-20131010085141-w6dfki153ob8ke4s
2013-10-10 10:51:41 +02:00
Christophe Matthieu af5cc9c02a [FIX] website_view: css price with position absolute for description
bzr revid: chm@openerp.com-20131009135914-nq5sr4qi7dc5wbsv
2013-10-09 15:59:14 +02:00
Christophe Matthieu 41bb68a87b [FIX] website_view: css responsible < 600
bzr revid: chm@openerp.com-20131009134016-chus09j1h0zogbo2
2013-10-09 15:40:16 +02:00
Christophe Matthieu 6de0a5d34d [FIX] website_sale: change view for new qweb security access
bzr revid: chm@openerp.com-20131009124848-1n3eiy7dbew6j2js
2013-10-09 14:48:48 +02:00
Christophe Matthieu 47e324e620 [FIX] website_sale: access rules
bzr revid: chm@openerp.com-20131008153302-09coejmzrcjns36u
2013-10-08 17:33:02 +02:00
Christophe Matthieu 20b6367ec5 [IMP] website_sale: better access rules and security
bzr revid: chm@openerp.com-20131008152233-zl3dxoyso9liahlm
2013-10-08 17:22:33 +02:00
Xavier Morel 426757ad92 [ADD] linked image fields
bzr revid: xmo@openerp.com-20131008120456-r8tqd5iyq1zfsdvi
2013-10-08 14:04:56 +02:00
Fabien Pinckaers 0665e77558 [IMP] cleaned picture
bzr revid: fp@openerp.com-20131004224827-fkn6srxkmwbfskxa
2013-10-05 00:48:27 +02:00
Fabien Pinckaers 264186c307 [IMP] icons
bzr revid: fp@openerp.com-20131004224358-7v3wjqr6v3lulfls
2013-10-05 00:43:58 +02:00
Christophe Matthieu 8e746c7a86 [FIX] website: replace snippet-id by data-snippet-id inside demo data
bzr revid: chm@openerp.com-20131004104534-txgubiz17px6adra
2013-10-04 12:45:34 +02:00
Christophe Matthieu d96072fc3a [IMP] website_sale: on error, label in red color
bzr revid: chm@openerp.com-20131003112720-maxy73xo323s3vgl
2013-10-03 13:27:20 +02:00
Christophe Matthieu f5262b9c5c [IMP] website_sale: icon for policies and Secure Payment; fix my cart label
bzr revid: chm@openerp.com-20131003112354-l146jewjuzhlzt7p
2013-10-03 13:23:54 +02:00
Christophe Matthieu 6f454c6b33 [IMP] website_sale: shop/mycart, My Cart, in the top
bzr revid: chm@openerp.com-20131003110411-9a1536dqwhuhabq7
2013-10-03 13:04:11 +02:00
Christophe Matthieu 16a3aa522b [IMP] website_sale: variant change the price
bzr revid: chm@openerp.com-20131003104701-28mvvte5wa6q8mt7
2013-10-03 12:47:01 +02:00
Paramjit Singh Sahota e74afb7d5f [IMP]Improved
bzr revid: psa@tinyerp.com-20131003072514-tjnb7ey20x16uzzf
2013-10-03 12:55:14 +05:30
Paramjit Singh Sahota a3a0d02d19 Added product description for the published products.
bzr revid: psa@tinyerp.com-20131003062124-veb3i998ouxianil
2013-10-03 11:51:24 +05:30
Christophe Matthieu adef9bc3df [FIX] website_sale: edit, suggested products
bzr revid: chm@openerp.com-20131002162810-cjo5r9itmuc0x71o
2013-10-02 18:28:10 +02:00
Christophe Matthieu 61d6d2dacd [FIX] crappy publisher change
bzr revid: chm@openerp.com-20131002154528-yno7lqkuddidjbis
2013-10-02 17:45:28 +02:00
Christophe Matthieu 86159fe4b0 [IMP] website_sale: improve security: remove superuser_id and replace by request.uid
bzr revid: chm@openerp.com-20131002083750-ncyf7v7lip71cbuq
2013-10-02 10:37:50 +02:00
Christophe Matthieu 2ae84ed2e2 [FIX] website_sale: access right for public access for price
bzr revid: chm@openerp.com-20131002083018-gavt68w57t9wneu5
2013-10-02 10:30:18 +02:00
Christophe Matthieu d2a743cbde [IMP] website_sale: context, routes
bzr revid: chm@openerp.com-20131002071239-4glhz7g8iz1r9gea
2013-10-02 09:12:39 +02:00
Fabien Pinckaers 8da11482c4 [IMP] style
bzr revid: fp@openerp.com-20131001221431-5hde5uggcr9j0rjy
2013-10-02 00:14:31 +02:00
Fabien Pinckaers 315f9e03c3 [IMP] website_sale manifest
bzr revid: fp@openerp.com-20131001221253-lpa5lgu75wbiepsc
2013-10-02 00:12:53 +02:00
Christophe Matthieu 10c61ec2e9 [FIX] website_sale: editor grid
bzr revid: chm@openerp.com-20131001123216-bdvzgbpw30d188ps
2013-10-01 14:32:16 +02:00
Christophe Matthieu aea15f9f6f [IMP] website snippet: new change background
bzr revid: chm@openerp.com-20131001120335-kwyyodiwturplyfy
2013-10-01 14:03:35 +02:00
Christophe Matthieu 08a6ca9d21 [FIX] website_sale: checkout view for public user
bzr revid: chm@openerp.com-20131001095117-q9ykymxb2haibi65
2013-10-01 11:51:17 +02:00
Christophe Matthieu 8a9938333b [FIX] website_sale: responsible design of grid of products for firefox
bzr revid: chm@openerp.com-20131001090800-i97ojnj2lmi2hg4v
2013-10-01 11:08:00 +02:00
Thibault Delavallée 726cda367e [FIX] website and all derived addons: fixed imports broken when moving
website.py to models/ directory in website (revision 9491 revid:xmo@openerp.com-20130930145358-qh7xdicgg21prsk4).

bzr revid: tde@openerp.com-20131001085739-hoczgpqrv2nrr6lb
2013-10-01 10:57:39 +02:00
Fabien Pinckaers 635999b9e9 [IMP] top badge for my cart
bzr revid: fp@tinyerp.com-20131001072057-m3551lf4l68b2w1o
2013-10-01 09:20:57 +02:00
Fabien Pinckaers 656fcad3eb [IMP] Payment Process Design
bzr revid: fp@openerp.com-20130930225105-0dses1tdzm2iysfp
2013-10-01 00:51:05 +02:00
Christophe Matthieu af96efffc9 [IMP] website_sale: responsible design for products grid
bzr revid: chm@openerp.com-20130930084708-is68jozdizp1c9z9
2013-09-30 10:47:08 +02:00
Fabien Pinckaers 27c9ab5737 [FIX] typo
bzr revid: fp@tinyerp.com-20130930083759-gjc0gnv96w0n4kju
2013-09-30 10:37:59 +02:00
Fabien Pinckaers 3430cef9a4 [IMP] design shop
bzr revid: fp@openerp.com-20130929160635-ye56hhpj5ycbzltt
2013-09-29 18:06:35 +02:00
Fabien Pinckaers 2ecb96c061 [IMP] html fix: row missing
bzr revid: fp@openerp.com-20130929154204-xodhyzau24ms0wr6
2013-09-29 17:42:04 +02:00
Fabien Pinckaers 97c0c0d641 [IMP] Promo Ribbon for shop
bzr revid: fp@openerp.com-20130929153420-k01nqjj234tp6ovc
2013-09-29 17:34:20 +02:00
Fabien Pinckaers 0762fd9e93 [IMP] manifest improvements
bzr revid: fp@openerp.com-20130928132242-ndw3gu8z5yr95plc
2013-09-28 15:22:42 +02:00
Christophe Matthieu 8d3db3a13f [IMP] website_sale: responsible design (css height)
bzr revid: chm@openerp.com-20130927152625-mrr0r2514qfwyisp
2013-09-27 17:26:25 +02:00
Christophe Matthieu a5ac76bc2b [FIX] website_sale: context pricelist and add demo data for discount
bzr revid: chm@openerp.com-20130927144636-hha4luhu6v4lvyc0
2013-09-27 16:46:36 +02:00
Christophe Matthieu 6e3a9e63b7 [FIX] website_sale: hack link with javascript
bzr revid: chm@openerp.com-20130927134028-f2nl4xinq0zd0rb7
2013-09-27 15:40:28 +02:00
Xavier Morel 4950703cd3 [FIX] crappy view
bzr revid: xmo@openerp.com-20130927124406-5zftzi5g0m0g1lds
2013-09-27 14:44:06 +02:00
Xavier Morel 3b431eec45 [IMP] file read
bzr revid: xmo@openerp.com-20130927121335-iixxhkft8qmii85x
2013-09-27 14:13:35 +02:00
Christophe Matthieu 45190a6f7d [FIX] website_sale: reload page after edit size
bzr revid: chm@openerp.com-20130927110146-obp9tcolk8pdq82x
2013-09-27 13:01:46 +02:00
Christophe Matthieu da8c4e1be1 [IMP] website_sale: sweeter style and size edition on view 'list'
bzr revid: chm@openerp.com-20130927103148-nwm0amgkn8buk4dd
2013-09-27 12:31:48 +02:00
Fabien Pinckaers 73faaabdc8 [IMP] Product Sale Views Cleanup
bzr revid: fp@openerp.com-20130927054910-lppoqz4hxmomckeg
2013-09-27 07:49:10 +02:00
Fabien Pinckaers 54419cf4de [FIX] style in shop list view
bzr revid: fp@openerp.com-20130927053013-ca212xclwntv8ys2
2013-09-27 07:30:13 +02:00
Fabien Meghazi e7d55014a4 [MERGE] multilang
bzr revid: fme@openerp.com-20130926165324-2jfo9s8q3u4teor1
2013-09-26 18:53:24 +02:00
Fabien Meghazi 6d47823121 [IMP] website_sale multilang
bzr revid: fme@openerp.com-20130926145448-lvrfd6ma755jf549
2013-09-26 16:54:48 +02:00
Christophe Matthieu 71a1b12e31 [IMP] website_sale + website_event: set order, first items = published
bzr revid: chm@openerp.com-20130926141935-1y8ts0y0n1i5tpun
2013-09-26 16:19:35 +02:00
Christophe Matthieu 9b538b3744 [FIX] website_sale: add to cart
bzr revid: chm@openerp.com-20130926140750-tmp5wexrpbkipt0w
2013-09-26 16:07:50 +02:00
Christophe Matthieu 9f58a5c082 [IMP] website_sale: add styles selector on product
bzr revid: chm@openerp.com-20130926130954-fxojimjdinepgpjq
2013-09-26 15:09:54 +02:00
Christophe Matthieu c66c5d5b6a [IMP] change publish button, fix website_sale product order + push top/bottom
bzr revid: chm@openerp.com-20130926111854-22ikjc2enj0hi0qu
2013-09-26 13:18:54 +02:00
Christophe Matthieu b05cd31b59 [FIX] website_sale: add_to_cart inherit
bzr revid: chm@openerp.com-20130926091825-bfykta69vl3knbxh
2013-09-26 11:18:25 +02:00
Christophe Matthieu 437440e2c9 [IMP] website_sale: demo data and style size datas
bzr revid: chm@openerp.com-20130926081600-o6yp6mbkec8anfr2
2013-09-26 10:16:00 +02:00
Christophe Matthieu cf79e61c36 [FIX] website_sale: inherit_option_id for list view and category view
bzr revid: chm@openerp.com-20130926075650-blc9d3fyj3gbcgoq
2013-09-26 09:56:50 +02:00
Christophe Matthieu cd5a77788d [IMP] website_sale: method get_bin_packing_products or get_products call inside the view
bzr revid: chm@openerp.com-20130926074644-d3bjd8te6ks82u7a
2013-09-26 09:46:44 +02:00
Christophe Matthieu b8f1ffaafc [IMP] website_sale: bin packing product for sweet layout
bzr revid: chm@openerp.com-20130925180538-qnq699csoof8jrt5
2013-09-25 20:05:38 +02:00
Xavier Morel aae0a815d2 [IMP] replace instances of t[@t-field], they're a pain in the ass
bzr revid: xmo@openerp.com-20130925112803-ya54yb2kwdodj3y5
2013-09-25 13:28:03 +02:00
Christophe Matthieu bd16487da1 [IMP] website_sale: change css and demo data
bzr revid: chm@openerp.com-20130924152639-v6hr0laatjcbxe39
2013-09-24 17:26:39 +02:00
Thibault Delavallée 0c040ae237 [MERGE] [IMP] [DEMO] event, website_event improvements
[IMP] [DEMO] event: cleaned demo data. Also renamed note field into description, and moved it out of groups_noone, in order to effectively use it to hold the html description of the event.

[IMP] event_sale: cleaned demo data

[ADD] website_mail: added mail_thread file that hold website_message_ids field, holding published comments. Use it for public objects. However as inheritance seems to be still buggy, this field is redefined in website_blog and website_event (at least) to be able to use it. Remove specific declarations when the bug is fixed.

[IMP] [ADD] website_event:
- added skeleton directory for doc
- added skeleton directory for tests
- added dependency towards website_mail module, to benefit from follow feature
- cleaned demo data
- use website_mail for follow / unfollow mechanism
- added website_message_ids field, use it in view
- some improvements in website view (title, event description)

[FIX] website_sales: somewhat fixed partner information fetch in checkout; whole code of those controllers is really obfuscated and very dubious.

bzr revid: tde@openerp.com-20130924130517-hzi2qm108ec65viq
2013-09-24 15:05:17 +02:00
Thibault Delavallée 39726ffe2d [CLEAN] removed print statement
bzr revid: tde@openerp.com-20130924124426-7pz7a9cinllcnspn
2013-09-24 14:44:26 +02:00
Thibault Delavallée ac2384ee47 [IMP] website_sale: basic cleaning of checkout method about getting partner data. In view, do not use get when the data, use brackets, this helps tracking issues in your process.
bzr revid: tde@openerp.com-20130924124253-gld6lwzm3dc8bhwn
2013-09-24 14:42:53 +02:00
Thibault Delavallée 90eba9e022 [MOVE] Do not be afraid to put different models in different files. Stop putting shit everywhere.
bzr revid: tde@openerp.com-20130924121944-ifjosr5yol6b9tsy
2013-09-24 14:19:44 +02:00
Xavier Morel 8b06e72716 [FIX] block-level links
bzr revid: xmo@openerp.com-20130924112402-twcgdh0b18vzdwru
2013-09-24 13:24:02 +02:00
Christophe Matthieu 51fae1fcf8 [IMP] website_sale display only non empty category in non editable mode
bzr revid: chm@openerp.com-20130924102834-op0bm475w20x35j4
2013-09-24 12:28:34 +02:00
Christophe Matthieu abc273e9a1 [IMP] website_sale: change size y when category is displayed
bzr revid: chm@openerp.com-20130924085507-9m1gsdnlsfgn4fj4
2013-09-24 10:55:07 +02:00
Christophe Matthieu 458121ab5c [IMP] website_sale: when the products is displayed from a search, use the same size x,y for all products
bzr revid: chm@openerp.com-20130924084100-y6pgvislcpdo9izx
2013-09-24 10:41:00 +02:00
Christophe Matthieu b1cf178978 [MERGE] website_sale: add layout options and css
bzr revid: chm@openerp.com-20130924083349-1woicpx50668272g
2013-09-24 10:33:49 +02:00
Christophe Matthieu 9bb4af7d9f [IMP] website snippet: add comment for auto set snippet and remove data-snippet-id in website_sale view
bzr revid: chm@openerp.com-20130924082423-ylzeprl3w4tlb83e
2013-09-24 10:24:23 +02:00
Paramjit Singh Sahota 8fc3877646 [IMP] Improved code to make small way to change to list view rather than writing the whole product template code twice.
bzr revid: psa@tinyerp.com-20130924064617-40ruht7l15c08p7y
2013-09-24 12:16:17 +05:30
Paramjit Singh Sahota c931f60bd3 [MERGE] MERGED trunk-website-al
bzr revid: psa@tinyerp.com-20130923133137-heq2s7r9hjlm150g
2013-09-23 19:01:37 +05:30
Paramjit Singh Sahota 7a76a45a50 done the same changes in sass as in css.
bzr revid: psa@tinyerp.com-20130923131611-eoexbw2a9dbxxyum
2013-09-23 18:46:11 +05:30
Paramjit Singh Sahota de41937cfb [IMP] Improved the template id.
bzr revid: psa@tinyerp.com-20130923130238-4it782jesm211t6w
2013-09-23 18:32:38 +05:30
Paramjit Singh Sahota f06f48ce52 [IMP] added list grid for shop.
bzr revid: psa@tinyerp.com-20130923124752-dhg0aao3diuh1isn
2013-09-23 18:17:52 +05:30
Xavier Morel 89fc31a633 [MERGE] from trunk
bzr revid: xmo@openerp.com-20130923120328-0wgd7wxhl1y5qyhr
2013-09-23 14:03:28 +02:00
Paramjit Singh Sahota 71ab933988 More customizable options:
Add to Cart must be in a inherit_option_id
Product sale_description must be in a inherit_option_id

bzr revid: psa@tinyerp.com-20130923111441-pxhn2u2ex1oh1cws
2013-09-23 16:44:41 +05:30
Christophe Matthieu 6788b91af4 [FIX] website: move demo data into website_sale
bzr revid: chm@openerp.com-20130923075147-n7ri551aatt81d3f
2013-09-23 09:51:47 +02:00
Fabien Pinckaers 7335353b89 [IMP] manifest website_*
bzr revid: fp@openerp.com-20130922210853-rs8jze1zuql94cyd
2013-09-22 23:08:53 +02:00
Fabien Pinckaers b2726bf5b8 [IMP] manifest website_sale
bzr revid: fp@openerp.com-20130922210610-nq6t4dvr8yt71mz0
2013-09-22 23:06:10 +02:00
Fabien Pinckaers 765aa3587f [IMP] Missing title
bzr revid: fp@openerp.com-20130922205737-xef9mf20oanmsdgn
2013-09-22 22:57:37 +02:00
Fabien Pinckaers c59a8444f6 [IMP] product demo data
bzr revid: fp@openerp.com-20130922204023-z1htuze3mj7hpjf8
2013-09-22 22:40:23 +02:00
Fabien Pinckaers 0e96d8d38d [IMP] demo data shop
bzr revid: fp@openerp.com-20130922195823-z5jpuh7n67u80hyl
2013-09-22 21:58:23 +02:00
Fabien Pinckaers 4c3121f87c [IMP] product description ipad
bzr revid: fp@openerp.com-20130922194454-35xx0x1nx3mixl3a
2013-09-22 21:44:54 +02:00
Fabien Pinckaers b705f1e627 [IMP] eCommerce Layouts
bzr revid: fp@openerp.com-20130922193356-gqfyqc9s8dg0wg8g
2013-09-22 21:33:56 +02:00
Fabien Pinckaers a828535ce4 [IMP] mini improvement opacity
bzr revid: fp@openerp.com-20130922172957-rzt2ibr3mryz1m3c
2013-09-22 19:29:57 +02:00
Fabien Pinckaers 512a9970df [IMP] Shop Improvements
bzr revid: fp@openerp.com-20130922172727-9zvivms9w9v5hv2q
2013-09-22 19:27:27 +02:00
Fabien Pinckaers 9fae3fbba8 [IMP] no border
bzr revid: fp@openerp.com-20130921233915-kutt3mfyqxvnnf56
2013-09-22 01:39:15 +02:00
Fabien Pinckaers 57495427f8 [IMP] Shop layout
bzr revid: fp@openerp.com-20130921233115-baaczyravkgxtuih
2013-09-22 01:31:15 +02:00
Fabien Pinckaers a2376d8f08 [iMP] shops
bzr revid: fp@openerp.com-20130921233056-sy0oe5mzyetyn1lq
2013-09-22 01:30:56 +02:00
Fabien Pinckaers d391d7b67d [IMP] Shop better design
bzr revid: fp@openerp.com-20130921232827-2wlkjwh48547jwue
2013-09-22 01:28:27 +02:00
Fabien Pinckaers 1764bb9bde [IMP] product categories hidden by default
bzr revid: fp@openerp.com-20130921061651-01mulu423e22kf5s
2013-09-21 08:16:51 +02:00
Paramjit Singh Sahota 3dadd6e729 Added product snippet for test and added the data-snippet-id in product of resizing product.
bzr revid: psa@tinyerp.com-20130920070643-cmdq57j04hgx764c
2013-09-20 12:36:43 +05:30
Paramjit Singh Sahota 27815589b4 [IMP] Added the fixed size of the product image.
bzr revid: psa@tinyerp.com-20130920050445-d6hz2t4169rmdi0i
2013-09-20 10:34:45 +05:30
Xavier Morel 674c2d7c33 [FIX] block-level link, incompatible with RTE
bzr revid: xmo@openerp.com-20130919121541-mj2l9o8wmxmk2l9v
2013-09-19 14:15:41 +02:00
Paramjit Singh Sahota e44603759e [IMP] Improved css product_image
bzr revid: psa@tinyerp.com-20130919103148-wqe9lerng1m6p9p6
2013-09-19 16:01:48 +05:30
Paramjit Singh Sahota 355caa6580 Merged lp:~openerp-dev/openobject-addons/trunk-website-shop-fp
bzr revid: psa@tinyerp.com-20130919100105-kcl6ia2bwe5acjv0
2013-09-19 15:31:05 +05:30
Fabien Pinckaers b8c94e2957 [IMP] empty zone CSS
bzr revid: fp@tinyerp.com-20130919075309-irpuwo776frfwb12
2013-09-19 09:53:09 +02:00
Fabien Pinckaers 2c7d428aee [IMP] shop
bzr revid: fp@openerp.com-20130919055425-6puq8f4e7bawkyan
2013-09-19 07:54:25 +02:00
Xavier Morel e0662b11d0 [FIX] wrap the wrapper in order to allow RTE on all of the page (except the toolbar)
CKEditor does not work directly on body, and it's a bad idea anyway
(editing the edition toolbar won't end well). 

A big wrapper around all of the page's content can be used as RTE hook
to give access to the body as well as the header and footers.

bzr revid: xmo@openerp.com-20130918145028-6ppi9sro2un0quh5
2013-09-18 16:50:28 +02:00
Xavier Morel 47e3a0604c [FIX] change block-level link to inline
Although HTML5 has added a concept of "transparent content model"[0]
where elements (such as links) can be block-level or inline depending
on their context (amongst a number of other dynamic content model
properties), most RTEs based their validation on a static DTD-type
content model and haven't been updated yet.

That's the case of CKEditor (and tinymce and aloha, it seems), and the
validator breaks block-level links. So don't use them.

[0] http://www.w3.org/TR/2011/WD-html5-20110525/content-models.html#transparent-content-models

bzr revid: xmo@openerp.com-20130917135656-g58xnx7f2avcuh9d
2013-09-17 15:56:56 +02:00
Xavier Morel d29da6144d [IMP] make products filler uneditable to avoid confusion
bzr revid: xmo@openerp.com-20130917131353-sn5mhmcvkp0l2dcz
2013-09-17 15:13:53 +02:00
Xavier Morel 19b0fa5a6a [IMP] placeholder for inline fields is very hard to see when the field is empty, block-level fields are much better in that situation
bzr revid: xmo@openerp.com-20130917130126-s5lgxjv9ezefek1u
2013-09-17 15:01:26 +02:00
Fabien Pinckaers 364995c7f4 [IMP] oe_structure, cleaning of wrap
bzr revid: fp@openerp.com-20130915172537-jbd04hmgqvzz71qb
2013-09-15 19:25:37 +02:00
Fabien Pinckaers 19caff669a [IMP] snippets misc improvements
bzr revid: fp@openerp.com-20130915110427-2r2fyzuthmlkh5ua
2013-09-15 13:04:27 +02:00
Fabien Pinckaers b7f3383c3c [IMP] title node selection
bzr revid: fp@openerp.com-20130914221301-gnt115hzjv61slpe
2013-09-15 00:13:01 +02:00
Xavier Morel 922053531e [MERGE] from parent
bzr revid: xmo@openerp.com-20130912141026-mmmyg91nwlzccr0g
2013-09-12 16:10:26 +02:00
Christophe Matthieu 4f93622697 [IMP] website: snippet editor and building block
bzr revid: chm@openerp.com-20130911130045-kpya856mndrao0fi
2013-09-11 15:00:45 +02:00
Christophe Matthieu b3898c8d23 [IMP] website: snippet editor and building block
bzr revid: chm@openerp.com-20130911125632-ekcxa8b4lu5ml4eq
2013-09-11 14:56:32 +02:00
Xavier Morel f7a14f2830 [HIDE] issue with ckeditor not handling block-level links
Instead of keeping them where they are, ckeditor propagates links to
closest inline elements (as pre-HTML5 parsing did), which breaks
e.g. product headers.

bzr revid: xmo@openerp.com-20130911084305-b5v36wlni620m7r3
2013-09-11 10:43:05 +02:00
Fabien Meghazi c4a39548b2 [IMP] better name for global rendering variables
bzr revid: fme@openerp.com-20130910141502-ptz2vj1jckvh7urq
2013-09-10 16:15:02 +02:00
Fabien Meghazi 0e82448ed8 [IMP] Refactor code + WIP multiwebsite
bzr revid: fme@openerp.com-20130910134133-esdgbhbtt8eguapk
2013-09-10 15:41:33 +02:00
Xavier Morel 857e7a4f56 [FIX] make product prices editable (kinda-sorta)
bzr revid: xmo@openerp.com-20130910133123-h0dnnu076a0zeftw
2013-09-10 15:31:23 +02:00
Christophe Matthieu f61e65539e [IMP] website: auto open editor when create new product (use ?unable_editor in url)
bzr revid: chm@openerp.com-20130910122646-ug8dn61rqgbm3eq3
2013-09-10 14:26:46 +02:00
Christophe Matthieu cb8bdad1ec [FIX] website_sale: reduce qty
bzr revid: chm@openerp.com-20130910115159-qdmhi4rdmxqz5cm3
2013-09-10 13:51:59 +02:00
Fabien Meghazi bf09524def [FIX] context set on wrong methods
bzr revid: fme@openerp.com-20130909100059-j7yhkfql3qxaz96b
2013-09-09 12:00:59 +02:00
Fabien Meghazi e980e1c715 [FIX] context merge
bzr revid: fme@openerp.com-20130909075031-rvwxjdc07zhq0m8u
2013-09-09 09:50:31 +02:00
Fabien Meghazi d2e90f0621 [BREAK] request.context everywhere
some stuff broken will be repaired by chm

bzr revid: fme@openerp.com-20130905151803-7d17us7rn9yubnb2
2013-09-05 17:18:03 +02:00
Christophe Matthieu 5943962ec1 [FIX] website_sale: display error with bootstrap 3
bzr revid: chm@openerp.com-20130905095933-1f6qabic7zeafn7a
2013-09-05 11:59:33 +02:00
Christophe Matthieu 7fee8f5609 [IMP] website: change footer xml
bzr revid: chm@openerp.com-20130905092927-2aixeyk1z5ot4oku
2013-09-05 11:29:27 +02:00
Christophe Matthieu a837eb1ba8 [FIX] website_sale: add product; update product number in cart
bzr revid: chm@openerp.com-20130905080407-4pwjvo1hxabf1a2r
2013-09-05 10:04:07 +02:00
Fabien Meghazi 6621c1275b [IMP] Refactoring using `webcontext`
bzr revid: fme@openerp.com-20130904153236-gc78bs8pxeprktkr
2013-09-04 17:32:36 +02:00
Christophe Matthieu 20e0db456f [IMP] wwebsite: add option background and style in snippets carousel
bzr revid: chm@openerp.com-20130904140138-tvt640suoiln13fx
2013-09-04 16:01:38 +02:00
Christophe Matthieu e32c3c08f8 [IMP] website_sale: demo data publish
bzr revid: chm@openerp.com-20130904140051-c2j3huf7pbq76063
2013-09-04 16:00:51 +02:00
Christophe Matthieu 3e1302ee73 [IMP] website_sale: inherit product view to display more informations about website published products
bzr revid: chm@openerp.com-20130904095405-rrbt0ckedpg7ul90
2013-09-04 11:54:05 +02:00
Christophe Matthieu 7704ce7e03 [IMP] website_sale: add product in website
bzr revid: chm@openerp.com-20130904084958-6rq5xu0xjwzcv399
2013-09-04 10:49:58 +02:00
Fabien Meghazi dce9cd6583 [FIX] language selection
bzr revid: fme@openerp.com-20130904081659-f2vyt3iy9pr6d3yq
2013-09-04 10:16:59 +02:00
Christophe Matthieu 16995938b2 [FIX] website_sale: display product number for cart
bzr revid: chm@openerp.com-20130904064217-xrs3pqetmg67zlrj
2013-09-04 08:42:17 +02:00
Fabien Meghazi d1e00382bd [ADD] WebContext object and language selector
bzr revid: fme@openerp.com-20130903153520-14o3vk29l3ft7z0a
2013-09-03 17:35:20 +02:00
Christophe Matthieu 2dfe9f2bed [IMP] website_sale: add javascript for add/remove to basket for usability
bzr revid: chm@openerp.com-20130903123438-h0lg0ufouovc09f3
2013-09-03 14:34:38 +02:00
Christophe Matthieu cabe9fe9f7 [FIX] website_sale: ellipsis
bzr revid: chm@openerp.com-20130903114201-an4018t32ym3l02m
2013-09-03 13:42:01 +02:00
Christophe Matthieu 016f782c8b [FIX] website_sale: product pricelist
bzr revid: chm@openerp.com-20130903113658-dmwflky4f1ft6poe
2013-09-03 13:36:58 +02:00
Christophe Matthieu 1fbf4c6349 [IMP] website: publisher with css for activated and disabled
bzr revid: chm@openerp.com-20130903104115-9yukaqh0teh45ipf
2013-09-03 12:41:15 +02:00
Christophe Matthieu 2cccfcb556 [IMP] website_sale: Add to Basket and fix suggested
bzr revid: chm@openerp.com-20130903083639-ftnd8lxhbotq7czo
2013-09-03 10:36:39 +02:00
Christophe Matthieu 8314c4ef9d [IMP] website_sale: prduct boxes have the same size
bzr revid: chm@openerp.com-20130903082814-uuh11ttoyvjpvjox
2013-09-03 10:28:14 +02:00
Christophe Matthieu 85736a0c6a [IMP] website_sale: layout of publisher
bzr revid: chm@openerp.com-20130902155431-fkx8b29k7r1qpkp4
2013-09-02 17:54:31 +02:00
Christophe Matthieu 86631bae37 [IMP] website_sale: custom css for disable (not published) product
bzr revid: chm@openerp.com-20130902153030-5mv6u3ehqgemsbuh
2013-09-02 17:30:30 +02:00
Christophe Matthieu fb84138df2 [FIX] website_sale: display add button if they are only one variant
bzr revid: chm@openerp.com-20130902151503-is98p513qutdxlrn
2013-09-02 17:15:03 +02:00
Christophe Matthieu 9183757380 [FIX] website_event vs website_sale: variation of ticket price with pricelist if the ticket have the same price of the product. If the price is different, do not change the price of the ticket
bzr revid: chm@openerp.com-20130902104646-argn1gu8rk2p1w7a
2013-09-02 12:46:46 +02:00
Christophe Matthieu de523a011c [IMP] website_sale: add/update product reset the price: NEED FIX website_event for ticket price
bzr revid: chm@openerp.com-20130830145624-vg7oc0c41kdmny78
2013-08-30 16:56:24 +02:00
Christophe Matthieu af547e9925 [IMP] website_sale: add product don't reset the price
bzr revid: chm@openerp.com-20130830144852-cfgc23qsp080s6kj
2013-08-30 16:48:52 +02:00
Christophe Matthieu afc2ddd40c [FIX] website_sale: checkout
bzr revid: chm@openerp.com-20130830144204-5x4k7345nmzni65c
2013-08-30 16:42:04 +02:00
Fabien Pinckaers 1aea7145c7 [IMP] fixes bootstrap
bzr revid: fp@openerp.com-20130829220425-xxyub3uvrmdi13j4
2013-08-30 00:04:25 +02:00
Fabien Pinckaers 607e6f73e4 [IMP] bootstrap 3 mobile menu
bzr revid: fp@openerp.com-20130829204553-qyfk30am8tj4bm5n
2013-08-29 22:45:53 +02:00
Fabien Pinckaers 7768e28a7b [IMP] Bootstrap 3
bzr revid: fp@tinyerp.com-20130829175831-9f3sh4631m0jmq88
2013-08-29 19:58:31 +02:00
Christophe Matthieu e6da64b39e [IMP] website_crm_partner_assign: imp views
bzr revid: chm@openerp.com-20130829150058-bmcedth32o4nrdvh
2013-08-29 17:00:58 +02:00
Paramjit Singh Sahota 497c7addad [IMP] Removed inline css for hierarchy and added a global css for that.
bzr revid: psa@tinyerp.com-20130829122222-h60648t5v28tmt90
2013-08-29 17:52:22 +05:30
bth-openerp 1a7c0c53cc [IMP]Improved Verical divider.
bzr revid: bth@tinyerp.com-20130829101048-8qk056y1tg61wu0e
2013-08-29 15:40:48 +05:30
bth-openerp 8c19a10e98 [IMP]Improved css.
bzr revid: bth@tinyerp.com-20130829084858-fagqaiq6g8gzv8nh
2013-08-29 14:18:58 +05:30
bth-openerp 8e2014209d [IMP]IMproved nav tag to div tag and removed class from themes.
bzr revid: bth@tinyerp.com-20130829073759-fxn6o9jrq8uojbqr
2013-08-29 13:07:59 +05:30
bth-openerp 4eee602d6e [MERGE]Merge lp:~openerp-dev/openobject-addons/trunk-website-al.
bzr revid: bth@tinyerp.com-20130829063717-t8kqjombb25gqmsb
2013-08-29 12:07:17 +05:30
Christophe Matthieu 2fab26a2d2 [IMP] point_of_sale, product: change model 'pos.category' of the pos into product.public.category in product. product.public.category is used for eg by pos and website_sale. Add some demo data for this category. Add a domain in pos 'model.js' to select non empty categories
bzr revid: chm@openerp.com-20130828151658-3isgyl93c3hwp1pc
2013-08-28 17:16:58 +02:00
Fabien Pinckaers 82bbba14de [IMP] demo data
bzr revid: fp@tinyerp.com-20130828102114-w44ufdk3nujpmx3u
2013-08-28 12:21:14 +02:00
Christophe Matthieu 82c3c6bc33 [IMP] website_event: inherit website_sale mycart to don't display reduction if it's an event ticket price
bzr revid: chm@openerp.com-20130828094118-bzqgyuxc1ztqun8n
2013-08-28 11:41:18 +02:00
Christophe Matthieu ab08db3b87 [FIX] website_event: add to cart to website_sale
bzr revid: chm@openerp.com-20130828093416-o00apdeprqqgrx52
2013-08-28 11:34:16 +02:00
Fabien Pinckaers cc2d285b84 [IMP] Open the right page after installing an app
bzr revid: fp@tinyerp.com-20130827151303-3z6r15vikxza7x11
2013-08-27 17:13:03 +02:00
bth-openerp 5c985c0fcd [IMP]Improved code for class and style.
bzr revid: bth@tinyerp.com-20130827134916-q97gti3g3iczwtnl
2013-08-27 19:19:16 +05:30
bth-openerp 411ae838f9 [IMP]Improved code for website_sail module.
bzr revid: bth@tinyerp.com-20130827133426-p3flo3ojcnwd26le
2013-08-27 19:04:26 +05:30
bth-openerp 35216e1a53 [MERGE]Merge lp:~openerp-dev/openobject-addons/trunk-website-al.
bzr revid: bth@tinyerp.com-20130827125728-08li08bkjyia7vok
2013-08-27 18:27:28 +05:30
Fabien Pinckaers 155bfe2d42 [IMP] Published by Default
bzr revid: fp@tinyerp.com-20130827100316-9obekfc3ze70x6jh
2013-08-27 12:03:16 +02:00
bth-openerp cf2dab4851 [IMP]IMproved code or class and navigation.
bzr revid: bth@tinyerp.com-20130826134729-b0olyv7di2oq5xrk
2013-08-26 19:17:29 +05:30
Paramjit Singh Sahota 3a0d36b4d4 [IMP] Imprved for Search box.
bzr revid: psa@tinyerp.com-20130826133129-6l5576r39qcjj73i
2013-08-26 19:01:29 +05:30
Paramjit Singh Sahota 41a0186daa [IMP]Improved the billing form
bzr revid: psa@tinyerp.com-20130826121509-fds3sx1sw8p1eedg
2013-08-26 17:45:09 +05:30
Paramjit Singh Sahota ee41159e86 [REVERT] Reverted the changes of index.html file of website_sale
bzr revid: psa@tinyerp.com-20130826115133-f9n26296a9wilfdv
2013-08-26 17:21:33 +05:30
Paramjit Singh Sahota 199e945460 [IMP]Little Improved
bzr revid: psa@tinyerp.com-20130826111437-640etfb9ypsipeyx
2013-08-26 16:44:37 +05:30
Paramjit Singh Sahota 07d067a544 [IMP]Improved
bzr revid: psa@tinyerp.com-20130826110531-mnqj1q62l6epxvws
2013-08-26 16:35:31 +05:30
Paramjit Singh Sahota e6b47051ea MERGED lp:~openerp-dev/openobject-addons/trunk-website-bootstrap-3.0-bth and resolved conflicts
bzr revid: psa@tinyerp.com-20130826093529-3o64l5r3osuxm6i4
2013-08-26 15:05:29 +05:30
Paramjit Singh Sahota 011e195f3f Improved code.
bzr revid: psa@tinyerp.com-20130826092641-mbirfw9t322wn9am
2013-08-26 14:56:41 +05:30
Paramjit Singh Sahota c4f58b7466 [IMP] improved css for checkout form and others.
bzr revid: psa@tinyerp.com-20130826074016-bejnsnij9ly9df93
2013-08-26 13:10:16 +05:30
bth-openerp af2306a29f [IMP]Migrated website_contract into bootstrap 3.0.
bzr revid: bth@tinyerp.com-20130826070854-uin768rdyrdn0uxc
2013-08-26 12:38:54 +05:30
Paramjit Singh Sahota 7e718a6804 [MERGE] Merged lp:~openerp-dev/openobject-addons/trunk-website-bootstrap-3.0-bth
bzr revid: psa@tinyerp.com-20130826061942-dr9m4iv3jvtl77ib
2013-08-26 11:49:42 +05:30
Paramjit Singh Sahota ed6452c74f [IMP]Improved label-default.
bzr revid: psa@tinyerp.com-20130826061024-q5y4t2emq55rpr5f
2013-08-26 11:40:24 +05:30
Paramjit Singh Sahota 8f5068d8a1 [IMP] Improved code for 'website_sale' to make it compatible according to bootstrap 3.0
bzr revid: psa@tinyerp.com-20130826054441-g0xl17kvhcnbw3ck
2013-08-26 11:14:41 +05:30
Christophe Matthieu 5a90cb546d [FIX] website_sale: return to product after add to cart
bzr revid: chm@openerp.com-20130823144133-6qkx8flsra72crb4
2013-08-23 16:41:33 +02:00
Christophe Matthieu cf1780d251 [FIX] website_sale: set pricelist
bzr revid: chm@openerp.com-20130823143757-81cc0pzajetu55m8
2013-08-23 16:37:57 +02:00
Christophe Matthieu 3602641e1d [WIP] website_contract: reference view
bzr revid: chm@openerp.com-20130823133604-ujkiu67hrjtj4qtg
2013-08-23 15:36:04 +02:00
Christophe Matthieu 651e511ed9 [IMP] website_sale: fix context value, get order line name insead of product name, wip payment
bzr revid: chm@openerp.com-20130823094017-90m72xi2oif4qkuj
2013-08-23 11:40:17 +02:00
Christophe Matthieu 370fa231bf [IMP] website_sale: add price for variation and price_list for reduction
bzr revid: chm@openerp.com-20130822142735-n1aglt9wakj27dsb
2013-08-22 16:27:35 +02:00
Christophe Matthieu 01733be984 [FIX] website_sale: pricelist code required
bzr revid: chm@openerp.com-20130822090941-yrb7c95xw2y4d15r
2013-08-22 11:09:41 +02:00
Fabien Meghazi 98f19d8890 [IMP] Improved string interpolation in templates
bzr revid: fme@openerp.com-20130821145731-kkw9sxiv6oqz65qk
2013-08-21 16:57:31 +02:00
Xavier Morel 667dbbfdd9 [IMP] simplify ckeditor image and link dialogs
& add easy linking to existing site pages and attachments

bzr revid: xmo@openerp.com-20130821143816-0hvp0m0eklh6ti1m
2013-08-21 16:38:16 +02:00
Fabien Meghazi e039e76883 [IMP] Improved template's t-foreach
You need to pull Rev#4980 of server/trunk-website-al

bzr revid: fme@openerp.com-20130821140953-zb2hdglg1nvp2ckq
2013-08-21 16:09:53 +02:00
Xavier Morel 7423dd5949 [REM] page flags on a bunch of templates which turn out not to be pages after all
bzr revid: xmo@openerp.com-20130821135931-6ezsw089sju2eyga
2013-08-21 15:59:31 +02:00
Xavier Morel 2731bc014c [IMP] mark a bunch of templates as pages, mark all new pages as pages on creation
bzr revid: xmo@openerp.com-20130821121358-b6y5d1b8wgz8iyo0
2013-08-21 14:13:58 +02:00
Christophe Matthieu 05bb4f2dca [IMP] website_sale: use product.template insead of product.product
bzr revid: chm@openerp.com-20130820141203-vkg93z9odh0rlf4d
2013-08-20 16:12:03 +02:00
Christophe Matthieu 55b1378e77 [IMP] website_sale: add product variants
bzr revid: chm@openerp.com-20130819131929-x75ib5y6dcu4bcu7
2013-08-19 15:19:29 +02:00
Christophe Matthieu 571d9044d6 [IMP] website_sale: add suggested products
bzr revid: chm@openerp.com-20130819104144-81w0c3cicdqdf9ix
2013-08-19 12:41:44 +02:00
Christophe Matthieu 6581346ef1 [IMP] website_sale: clean xml view
bzr revid: chm@openerp.com-20130814161545-qrjqztu13gemw5qk
2013-08-14 18:15:45 +02:00
Christophe Matthieu 30f643c641 [IMP] website: add '/website/image' controllers. Use img and google_map method in website_sale, website_event and website_hr
bzr revid: chm@openerp.com-20130814135741-t3bgdtzw2brq8edz
2013-08-14 15:57:41 +02:00
Christophe Matthieu f78d8e22e0 [FIX] website: pager must add url extra params in genarated urls
bzr revid: chm@openerp.com-20130814105400-it4s51b6wwdiipb1
2013-08-14 12:54:00 +02:00
Christophe Matthieu e16a75fdb6 [FIX] website_sale: domain with search product and category
bzr revid: chm@openerp.com-20130814103551-otfpqyxen93vlx11
2013-08-14 12:35:51 +02:00
Christophe Matthieu 6b61a0d7c6 [IMP] website_sale: layout of product categories is optionnal
bzr revid: chm@openerp.com-20130814095317-ww69p8d05peolygy
2013-08-14 11:53:17 +02:00
Christophe Matthieu 2d1ec50f37 [FIX] website: css for grid
bzr revid: chm@openerp.com-20130814090723-joipibbbz0x5k77y
2013-08-14 11:07:23 +02:00
Christophe Matthieu ddf32f4f9e [IMP] website: refact. python for website publish button
bzr revid: chm@openerp.com-20130814084505-5ynbrmfvbu48v7kx
2013-08-14 10:45:05 +02:00
Christophe Matthieu 39d5bced7f [IMP] website: refact. javascript,xml for website publish button
bzr revid: chm@openerp.com-20130814083439-wvc07n0sg2vblq1y
2013-08-14 10:34:39 +02:00
Christophe Matthieu ba0230fa53 [FIX] website_hr: add javascript tag, website_sale: t-if for display number of product
bzr revid: chm@openerp.com-20130813142743-gwmmm2ik495ospbq
2013-08-13 16:27:43 +02:00
Christophe Matthieu c5d941ffc0 [FIX] website: website link menu and use url action
bzr revid: chm@openerp.com-20130813124306-slt7xvl7ox2919r7
2013-08-13 14:43:06 +02:00
Christophe Matthieu e1958f2ad7 [IMP] website: change some name button in website addons
bzr revid: chm@openerp.com-20130813115247-b8rq6hytqbwn4eog
2013-08-13 13:52:47 +02:00
Xavier Morel 458dde0a80 [FIX] don't return un-initialized local variable
bzr revid: xmo@openerp.com-20130813091218-rr6o88ir2wie1r82
2013-08-13 11:12:18 +02:00
Christophe Matthieu 2903251c25 [IMP] website_sale: improve layout of my cart and checkout pages
bzr revid: chm@openerp.com-20130813103948-fqg91t8nhg3szbn5
2013-08-13 12:39:48 +02:00
Christophe Matthieu 59ba4e7561 [WIP] website_sale: refactoring and use inherit_option_id
bzr revid: chm@openerp.com-20130812163123-3ako1rggjnszzi2h
2013-08-12 18:31:23 +02:00
Christophe Matthieu f6c27fda01 [IMP] website: refactoring + create method pager and template pager. Used by website_sale and website_event
bzr revid: chm@openerp.com-20130812134826-tij95o38mf3r7tts
2013-08-12 15:48:26 +02:00
Christophe Matthieu 8523e66bc4 [IMP] website: create method pager and template pager. Used by website_sale and website_event
bzr revid: chm@openerp.com-20130812134312-jmy2je288b4ofazy
2013-08-12 15:43:12 +02:00
Fabien Pinckaers d81b6b4fc8 [IMP] removed auto_install --> Apps menu makes it unuseful
bzr revid: fp@tinyerp.com-20130812114346-0t9v2eiwbimsrfp5
2013-08-12 13:43:46 +02:00
Christophe Matthieu 3f86396b4e [IMP] website: move hearder and footer in layout
bzr revid: chm@openerp.com-20130812093255-3cbehw7nx0h57qca
2013-08-12 11:32:55 +02:00
Christophe Matthieu 2abdcf99bc [FIX] website_sale: renames files
bzr revid: chm@openerp.com-20130812091249-oz2ji7m8remif0xo
2013-08-12 11:12:49 +02:00
Fabien Pinckaers 1c83621691 [FIX] bug in prev/next ecommerce
bzr revid: fp@tinyerp.com-20130812084149-a37cr8tzfolk395h
2013-08-12 10:41:49 +02:00
Fabien Pinckaers 2d8821b28b [IMP] View defined 2 times
bzr revid: fp@tinyerp.com-20130812083818-zt6alsh8l6ruaxmx
2013-08-12 10:38:18 +02:00
Fabien Pinckaers dcfe89b6da [IMP] First Theme Example
bzr revid: fp@openerp.com-20130811210927-dys2ilkss3553r65
2013-08-11 23:09:27 +02:00
Fabien Pinckaers a416267806 [IMP] Website Apps
bzr revid: fp@tinyerp.com-20130811140619-a164pkqxwpdwrohc
2013-08-11 16:06:19 +02:00
Fabien Pinckaers d7e1f026a1 [IMP] manifest improvements
bzr revid: fp@tinyerp.com-20130809105933-419qycvhr4l7r0bj
2013-08-09 12:59:33 +02:00
Fabien Meghazi c45e14b970 [IMP] Improved some templates
bzr revid: fme@openerp.com-20130808225336-yfdm85ll1zszl5co
2013-08-09 00:53:36 +02:00
Christophe Matthieu fbb2d16c61 [IMP] website_sale: add number of products in my cart top menu link
bzr revid: chm@openerp.com-20130808144247-pi2p5d00h3eke4cl
2013-08-08 16:42:47 +02:00
Christophe Matthieu 62ed1ca0bb [MERGE] from trunk-website-sale-chm: website_sale: use link instead of javascript hack for button 'add cart' and 'checkout'
bzr revid: chm@openerp.com-20130808142843-wxu9qc4cnl5dvubj
2013-08-08 16:28:43 +02:00
Christophe Matthieu 661e4a5e22 [MERGE] from trunk-website-event-chm: managment of tickets for an event to defined price and max number registration, and check registration_limits
bzr revid: chm@openerp.com-20130808142601-i35kcy42a2plpmnb
2013-08-08 16:26:01 +02:00
Christophe Matthieu ec950aec2b [IMP] website_sale: use link instead of javascript hack for button 'add cart' and 'checkout'
bzr revid: chm@openerp.com-20130808142341-ju7qq63543fkr2uw
2013-08-08 16:23:41 +02:00
Fabien Pinckaers e9e340eae6 [WIP] website_sale draft manifest
bzr revid: fp@tinyerp.com-20130808091257-6ps3hdaibpatzb6l
2013-08-08 11:12:57 +02:00
Christophe Matthieu b9d668e23d [MERGE] from trunk-website-event-chm: managment of tickets for an event to defined price and max number registration, and check registration_limits
bzr revid: chm@openerp.com-20130807141328-mpxkhr70qs4qhe18
2013-08-07 16:13:28 +02:00
Christophe Matthieu edce9867e5 [FIX] website_sale: create a new order if order.
bzr revid: chm@openerp.com-20130807140334-oa8bap1i0ya9tfaf
2013-08-07 16:03:34 +02:00
Christophe Matthieu c012e3bdc6 [IMP] website_event: create order_line and check registration_limits
bzr revid: chm@openerp.com-20130807134547-rbsrcswsozmna03w
2013-08-07 15:45:47 +02:00
Fabien Meghazi 6e56bac4b0 [IMP] Replaced website#get_public_uid by get_public_user (returns browse record)
bzr revid: fme@openerp.com-20130807130127-9yd6k1pypyhmo12n
2013-08-07 15:01:27 +02:00
Christophe Matthieu cf82d597f2 [IMP] website_event: on_change product
bzr revid: chm@openerp.com-20130806144536-6l2g1glui1cout2q
2013-08-06 16:45:36 +02:00
Christophe Matthieu 1a93e8bbca [IMP] website_sale: some access right
bzr revid: chm@openerp.com-20130806141848-0m2c742tg18p2f04
2013-08-06 16:18:48 +02:00
Fabien Meghazi 67e1d2819b [REM] Remove public_uid from request
bzr revid: fme@openerp.com-20130806140636-qreh32s86q1synmk
2013-08-06 16:06:36 +02:00
Frédéric van der Essen 9cba9de9fd [MERGE] from upstream
bzr revid: fva@openerp.com-20130806123005-7mup0zq6ua4d8g3r
2013-08-06 14:30:05 +02:00
Frédéric van der Essen 2abda5e554 [WIP] ecommerce pagination: fun with qweb
bzr revid: fva@openerp.com-20130806121931-9eso1k9pf7imaf8d
2013-08-06 14:19:31 +02:00
Frédéric van der Essen c51b8953b4 [WIP] ecommerce pagination
bzr revid: fva@openerp.com-20130806092344-noe43pgifa3rqr04
2013-08-06 11:23:44 +02:00
Christophe Matthieu c8999f8553 [IMP] website_sale: description_website
bzr revid: chm@openerp.com-20130806075346-6bi5zbjw39juheih
2013-08-06 09:53:46 +02:00
Fabien Meghazi af08367290 [ADD] Added website osv object + refactoring
bzr revid: fme@openerp.com-20130805161600-abms35e0vk47f3i1
2013-08-05 18:16:00 +02:00
Frédéric van der Essen c7ae298ad5 [MERGE] from upstream
bzr revid: fva@openerp.com-20130805120523-ux0vnixhbe59pvrf
bzr revid: fva@openerp.com-20130805123836-1vhj1e5mb0ejiu9j
2013-08-05 14:38:36 +02:00
Christophe Matthieu 8c4e722929 [MERGE] from website-al
bzr revid: chm@openerp.com-20130805083851-i7tiy5ym0ri144er
2013-08-05 10:38:51 +02:00
Fabien Pinckaers 4bcdefe3bb [IMP] changed t-field syntax from <div t-record=record t-field='field'/> to <div t-field='record.field'/>
bzr revid: fp@openerp.com-20130804202125-dtawe6zx9yk5x7bd
2013-08-04 22:21:25 +02:00
Christophe Matthieu d37aebb7f0 [IMP] website: security and public access
bzr revid: chm@openerp.com-20130802035504-lokijwh57e0q3w6a
2013-08-02 05:55:04 +02:00
Christophe Matthieu cb67d10b5c [IMP] website_sale: all with SUPERUSER_ID. Todo: specific access rules
bzr revid: chm@openerp.com-20130801145528-578wc6chvltt9af7
2013-08-01 16:55:28 +02:00
Christophe Matthieu a176be5c44 [IMP] website: public_uid
bzr revid: chm@openerp.com-20130801143347-ihg8nkb1frs08rl2
2013-08-01 16:33:47 +02:00
Christophe Matthieu bd23b31721 [IMP] website: add auth_method_public
bzr revid: chm@openerp.com-20130801124850-9ycc9j77wphiiww6
2013-08-01 14:48:50 +02:00
Frédéric van der Essen cd1fe5b566 remove custom input background
bzr revid: fva@openerp.com-20130731082117-r1qzq4b3mkcet2nl
2013-07-31 10:21:17 +02:00
Frédéric van der Essen 1a0976a764 quick fix for the shopping cart display
bzr revid: fva@openerp.com-20130731081304-1j2p1o13e061ka1q
2013-07-31 10:13:04 +02:00
Frédéric van der Essen a26d3cdbae styling improvements on ecommerce and blog
bzr revid: fva@openerp.com-20130730182433-33t3ggw722usd82w
2013-07-30 20:24:33 +02:00
Christophe Matthieu 8bc4e0e8a4 [IMP] remove client action goBack and add client action redirect
bzr revid: chm@openerp.com-20130726092643-onck6ad1e2aj7gbo
2013-07-26 11:26:43 +02:00
Christophe Matthieu 087989b12e [IMP] website_mail: publish and post message
bzr revid: chm@openerp.com-20130725145743-uxt7lqxeavxb6u4g
2013-07-25 16:57:43 +02:00
Christophe Matthieu 185827a579 [IMP] website_mail
bzr revid: chm@openerp.com-20130724152027-hzcdqli4t80ytg3l
2013-07-24 17:20:27 +02:00
Christophe Matthieu 5fc0d839ee [IMP] website_sale: payments
bzr revid: chm@openerp.com-20130724122330-zxvh94cdn8f2fvzc
2013-07-24 14:23:30 +02:00
Christophe Matthieu f966934f70 [IMP] website: media print css
bzr revid: chm@openerp.com-20130724102654-ifwzgmc1ftgjp5qu
2013-07-24 12:26:54 +02:00
Christophe Matthieu 9cc1eefa46 [IMP] website_sale: checkout end
bzr revid: chm@openerp.com-20130724094218-9mppzak93e1pyfyp
2013-07-24 11:42:18 +02:00
Christophe Matthieu 06d90a6000 [IMP] website_sale: shipping
bzr revid: chm@openerp.com-20130723161319-atlj3diisdl6684v
2013-07-23 18:13:19 +02:00
Christophe Matthieu 3bf704b475 [IMP] website_sale: sates, company
bzr revid: chm@openerp.com-20130723154211-vhskyfd256z1sbtw
2013-07-23 17:42:11 +02:00
Christophe Matthieu 2f97f8b5b7 [IMP] website_sale: default value in checkout
bzr revid: chm@openerp.com-20130723151607-w4blimvr7f40rlzg
2013-07-23 17:16:07 +02:00
Christophe Matthieu 840f1923a6 [IMP] website_sale: checkout + action return
bzr revid: chm@openerp.com-20130723133923-umjm1uqk8y5xalf6
2013-07-23 15:39:23 +02:00
Christophe Matthieu f2610aa370 [IMP] website_sale: no widget, all in xml
bzr revid: chm@openerp.com-20130723081813-wdsuv2g6uc62dm65
2013-07-23 10:18:13 +02:00
Fabien Meghazi 596c38e7d7 [IMP] Use <template> helper for qweb views
bzr revid: fme@openerp.com-20130722110836-w2el03tn5asm9ixm
2013-07-22 13:08:36 +02:00
Christophe Matthieu 45d94be656 [IMP] begin widget checkout
bzr revid: chm@openerp.com-20130722102857-3t0uos21ojv5tvut
2013-07-22 12:28:57 +02:00
Christophe Matthieu 02e8b1ab3e [IMP] website_sale: no accordion
bzr revid: chm@openerp.com-20130716143048-fafg42kd92396d2z
2013-07-16 16:30:48 +02:00
Fabien Meghazi d1c74232b8 [ADD] Added template declaration in qweb templates
bzr revid: fme@openerp.com-20130718170004-sreng8338a40nilc
2013-07-18 19:00:04 +02:00
Christophe Matthieu b8357bfa10 [IMP] website_sale: begin checkout view
bzr revid: chm@openerp.com-20130716125735-wy0hwogrf18ssfhb
2013-07-16 14:57:35 +02:00
Christophe Matthieu fbae203ac7 [ADD] website_sale: pricelist
bzr revid: chm@openerp.com-20130716093624-lf15mryypg3aevl8
2013-07-16 11:36:24 +02:00
Christophe Matthieu e52bdd3838 [IMP] website_sale: promotionnal code
bzr revid: chm@openerp.com-20130712085714-rmryh2pebnv8nsjk
2013-07-12 10:57:14 +02:00
Christophe Matthieu 78fa7ceb12 [IMP] website_sale: recommended
bzr revid: chm@openerp.com-20130711143456-dpv0pm9bpeebfq8e
2013-07-11 16:34:56 +02:00
Christophe Matthieu ffbac75519 [IMP] website_sale: recommended
bzr revid: chm@openerp.com-20130711142434-natrpfsutm6o66a9
2013-07-11 16:24:34 +02:00
Christophe Matthieu d04da544b0 [MERGE/FIX] fix for WEB revision 3772 merged
bzr revid: chm@openerp.com-20130710153352-hrsna4ky8ej1acf0
2013-07-10 17:33:52 +02:00
Christophe Matthieu c8b21aafe7 [IMP] website_sale: css
bzr revid: chm@openerp.com-20130710151313-mj1zbli3fd02ahf5
2013-07-10 17:13:13 +02:00
Christophe Matthieu 6a16ccfada [IMP] website_sale: search
bzr revid: chm@openerp.com-20130710150339-m5rn3vzd52vs4ko6
2013-07-10 17:03:39 +02:00
Christophe Matthieu 5f0b723525 [IMP] website_sale: login and complete information
bzr revid: chm@openerp.com-20130710142908-c9xr4pk38zhu7cn1
2013-07-10 16:29:08 +02:00
Christophe Matthieu 1bf0661f69 [IMP] website_sale: css
bzr revid: chm@openerp.com-20130710131111-7ll30ij7279ubcpu
2013-07-10 15:11:11 +02:00
Christophe Simonis 307c799655 [FIX] website_sale: correct cart
bzr revid: chs@openerp.com-20130702210104-nzcqrnh2epp2cmlj
2013-07-02 23:01:04 +02:00
Christophe Simonis 23c238e7a4 [FIX] website_sale: make views editables
bzr revid: chs@openerp.com-20130702204849-haixhwag18xjyr3r
2013-07-02 22:48:49 +02:00
Christophe Simonis 2685708e57 [IMP] website_sale: icons!!
bzr revid: chs@openerp.com-20130702192316-12ajhsw44q9b1h0y
2013-07-02 21:23:16 +02:00
Nicolas Wisniewski 21b908c0ac [FIX] Ecommerce
bzr revid: nwi@openerp.com-20130702164619-agvgkhqskjddcmqj
2013-07-02 18:46:19 +02:00
Christophe Matthieu 4cea604fab [IMP] website_crm: form
bzr revid: chm@openerp.com-20130702164545-z4qeyjtq9ra2x20j
2013-07-02 18:45:45 +02:00
Christophe Matthieu fcd975efa4 [IMP] website_crm
bzr revid: chm@openerp.com-20130702163157-d9a2woqai8dfr4co
2013-07-02 18:31:57 +02:00
Christophe Matthieu 42f1bdbd87 [IMP] website_crm
bzr revid: chm@openerp.com-20130702160305-iffdvxsqkoczckzh
2013-07-02 18:03:05 +02:00
Christophe Matthieu 7885fd0fea [IMP] ecommerce => website_sale
bzr revid: chm@openerp.com-20130702152141-qibw8m2kvsf1dv5a
2013-07-02 17:21:41 +02:00