Commit Graph

347 Commits

Author SHA1 Message Date
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
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
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 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 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
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 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
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 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
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