Commit Graph

36 Commits

Author SHA1 Message Date
Thibault Delavallée a0c2def796 [IMP] website_contract
- removed already-defined res.partner fields, using dependency towards website_partner;
- fixed references/<partner_id>/ that was buggy;
- cleaned a bit references controller;
- fixed customer template that was crashing;

website_partner: added website_published onto the partner form view, to be able to
change it directly in the backend

bzr revid: tde@openerp.com-20131002125801-zdoor3laarm7j3su
2013-10-02 14:58:01 +02:00
Fabien Meghazi b6e1e1ec71 [MERGE] upstream
bzr revid: fme@openerp.com-20130926133155-y1fz603wa4oxw6g3
2013-09-26 15:31:55 +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
Fabien Meghazi 5a0f580f5a [MERGE] upstream
bzr revid: fme@openerp.com-20130925085226-lonpq3add9eaaf9q
2013-09-25 10:52:26 +02:00
Xavier Morel 89fc31a633 [MERGE] from trunk
bzr revid: xmo@openerp.com-20130923120328-0wgd7wxhl1y5qyhr
2013-09-23 14:03:28 +02:00
Fabien Meghazi 3dc22cb54f [FIX] Do not use text nodes if unnecessary
bzr revid: fme@openerp.com-20130923115641-2d4o4y3a7jkl5h9o
2013-09-23 13:56:41 +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
Fabien Pinckaers 364995c7f4 [IMP] oe_structure, cleaning of wrap
bzr revid: fp@openerp.com-20130915172537-jbd04hmgqvzz71qb
2013-09-15 19:25:37 +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 91052e02c9 [IMP] website: apply publisher css to all website modules
bzr revid: chm@openerp.com-20130903110410-cxigps11scpr9dpr
2013-09-03 13:04:10 +02:00
Christophe Matthieu 0216d769cb [IMP] create website_membership
bzr revid: chm@openerp.com-20130902135210-zevplu7bs7w2cpcm
2013-09-02 15:52:10 +02:00
Christophe Matthieu dec8c40c11 [IMP] rename website_google_map; add demo for event
bzr revid: chm@openerp.com-20130830134026-88luqb16o6ny6voy
2013-08-30 15:40:26 +02:00
Fabien Pinckaers 29735543e4 [MERGE] fixes from india
bzr revid: fp@tinyerp.com-20130830130152-7xrcbeuxh17mhglu
2013-08-30 15:01:52 +02:00
Paramjit Singh Sahota 5131b1b3b2 [IMP] Improved the navbar layout in website_contract.
bzr revid: psa@tinyerp.com-20130830094801-pj65puawg7fei490
2013-08-30 15:18:01 +05:30
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 00ffaf44df Improved code
bzr revid: psa@tinyerp.com-20130829135602-gbsa5k1hp7qtnwv6
2013-08-29 19:26:02 +05:30
bth-openerp 8d250bea6c [IMP]Add class into form.
bzr revid: bth@tinyerp.com-20130829134914-7tuzol42zmrk82cv
2013-08-29 19:19:14 +05:30
Christophe Matthieu e92cb74565 [IMP] website_crm_partner_assign: some change in view
bzr revid: chm@openerp.com-20130829133210-o7tp2zj01x8i7fej
2013-08-29 15:32:10 +02:00
bth-openerp 91d771f7dc [MERGE]Merge lp:~openerp-dev/openobject-addons/trunk-website-al.
bzr revid: bth@tinyerp.com-20130829132442-2td1iateub2j2eug
2013-08-29 18:54:42 +05:30
Christophe Matthieu 52b14d5ee0 [IMP] rename website_crm_partner_assign to website_worldmap
bzr revid: chm@openerp.com-20130829122113-uzau2huz0sb067f8
2013-08-29 14:21:13 +02:00
bth-openerp 5838f92503 [MERGE]Merge lp:~openerp-dev/openobject-addons/trunk-website-al.
bzr revid: bth@tinyerp.com-20130829120556-3s82dl6khlh5yonl
2013-08-29 17:35:56 +05:30
Christophe Matthieu b71464ad7b [IMP] website_contract: add location after worldmap
bzr revid: chm@openerp.com-20130829111058-6z8tqf70xyl3zmyy
2013-08-29 13:10:58 +02:00
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 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
Christophe Matthieu 26fb3758e7 [IMP] website_crm_partner_assign: new module for display worldmap for list of partner. Call the template in an iframe (with get options: partner_id, width, height, partner_url).
bzr revid: chm@openerp.com-20130827102353-htupokzt9nmaiyeu
2013-08-27 12:23:53 +02:00
bth-openerp e5665f8868 [MERGE]Merge lp:~openerp-dev/openobject-addons/trunk-website-al.
bzr revid: bth@tinyerp.com-20130827055533-ybsdhedhetgclv6a
2013-08-27 11:25:33 +05:30
Christophe Matthieu 667d96ff0c [FIX] website: catch and dispatch error for rendering
bzr revid: chm@openerp.com-20130826101615-t1ouij4flhtdthxe
2013-08-26 12:16:15 +02:00
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 af7d52ed07 [IMP] Improved code of 'website_contract' to make it compatible according to bootstrap 3.0
bzr revid: psa@tinyerp.com-20130826053030-66aoebw4zidrdqsc
2013-08-26 11:00:30 +05:30
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 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 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
Christophe Matthieu 84208fd7ae [IMP] website_contract: published
bzr revid: chm@openerp.com-20130819151034-o079dfazpo043kw2
2013-08-19 17:10:34 +02:00
Christophe Matthieu 4e166063c8 [IMP] website_contract: imp layout
bzr revid: chm@openerp.com-20130819144534-oh9vi9b3pznnifgu
2013-08-19 16:45:34 +02:00
Christophe Matthieu 7985102006 [IMP] add new module website_contract
bzr revid: chm@openerp.com-20130819143423-gjg6b11x41k3crse
2013-08-19 16:34:23 +02:00