Commit Graph

193 Commits

Author SHA1 Message Date
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
Xavier Morel 426757ad92 [ADD] linked image fields
bzr revid: xmo@openerp.com-20131008120456-r8tqd5iyq1zfsdvi
2013-10-08 14:04:56 +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
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 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
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
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
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
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
Xavier Morel 4950703cd3 [FIX] crappy view
bzr revid: xmo@openerp.com-20130927124406-5zftzi5g0m0g1lds
2013-09-27 14:44:06 +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 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 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 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 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
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 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 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
Fabien Pinckaers 765aa3587f [IMP] Missing title
bzr revid: fp@openerp.com-20130922205737-xef9mf20oanmsdgn
2013-09-22 22:57:37 +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 512a9970df [IMP] Shop Improvements
bzr revid: fp@openerp.com-20130922172727-9zvivms9w9v5hv2q
2013-09-22 19:27:27 +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
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 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
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 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 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
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
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 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 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