Commit Graph

178 Commits

Author SHA1 Message Date
Christophe Matthieu 5ec0f27cde [IMP] website: real custom footer (no dynamic datas)
bzr revid: chm@openerp.com-20131107131949-3uotg47a79r4vml6
2013-11-07 14:19:49 +01:00
Christophe Matthieu 11c54b7d75 [IMP] website_event: move the option publish/unpublish
bzr revid: chm@openerp.com-20131107101206-dwueji94ailuo5zs
2013-11-07 11:12:06 +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
Christophe Matthieu bfc8f61984 [FIX] website: can choose an other controller to publish data. Website sale: add a contraint for address and organizer for publish an event. Auto publish address and organizer in front end. Clean website_hr_recruitment publisher
bzr revid: chm@openerp.com-20131104155230-j36l2e1fez0vnkwi
2013-11-04 16:52:30 +01:00
Fabien Meghazi 254e1e5ba3 [MERGE] upstream
bzr revid: fme@openerp.com-20131031165355-p8lyjfiftmdkca34
2013-10-31 17:53:55 +01:00
ddm 43e6b60799 [FIX] Multilingual support (events etc.)
bzr revid: ddm@openerp.com-20131030162909-7bcq16gq154mv1lw
2013-10-30 17:29:09 +01:00
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
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
Thibault Delavallée 2bd8457939 [FIX] website_event: fixed long-running bug in website_event. The base template
in website_sale has been modified, but dependant modules have not been updated.

bzr revid: tde@openerp.com-20131004110222-qyw7ekbfn1n7v6zz
2013-10-04 13:02:22 +02:00
Fabien Pinckaers 7ea23c9089 [IMP] removing bad code applied to all products events and non events
bzr revid: fp@tinyerp.com-20131001065737-fjzmpsoliqgasbbk
2013-10-01 08:57:37 +02:00
Fabien Pinckaers 650d4a9f51 [IMP] demo data events
bzr revid: fp@openerp.com-20130928201840-v12rwigq2k13sspe
2013-09-28 22:18:40 +02:00
Fabien Pinckaers 4bcbc59213 [IMP] Events Layout
bzr revid: fp@openerp.com-20130928191347-n1jvtg2u3lhuade7
2013-09-28 21:13:47 +02:00
Fabien Pinckaers 5ade35c313 [IMP] Events Style
bzr revid: fp@openerp.com-20130928164352-loesvbihw1kvkvaj
2013-09-28 18:43:52 +02:00
Xavier Morel 03348a0a9f [REM] leftover reference to website_event
bzr revid: xmo@openerp.com-20130927122050-g3p25rqbi75o7nks
2013-09-27 14:20:50 +02:00
Fabien Meghazi e7d55014a4 [MERGE] multilang
bzr revid: fme@openerp.com-20130926165324-2jfo9s8q3u4teor1
2013-09-26 18:53:24 +02:00
Fabien Meghazi ea642e75bf [IMP] website_event multilang
Some controllers does not use route params so it fails with language url offset

bzr revid: fme@openerp.com-20130926150729-ltq6wafp4h0n5x0l
2013-09-26 17:07:29 +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
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
Thibault Delavallée 6a3939f932 [IMP] website_event: title of the main events page summarises the search
bzr revid: tde@openerp.com-20130924111957-mzxnibdgbb8d09zo
2013-09-24 13:19:57 +02:00
Thibault Delavallée 95e7c0f61c [IMP] website_event: use website_mail follow template and controller instead of redefining it
bzr revid: tde@openerp.com-20130924105206-9fhzpd3f3os1eyar
2013-09-24 12:52:06 +02:00
Thibault Delavallée 620e527116 [IMP] website_event: removed description_website, now using standard description field.
Cleaned demo data.

bzr revid: tde@openerp.com-20130924102651-fym6t9mgq6mpy3kz
2013-09-24 12:26:51 +02:00
Thibault Delavallée 2c9f267d31 [MERGE] [IMP] [DEMO] event: demo data improvements
bzr revid: tde@openerp.com-20130924083721-8j81hwtqdx8eykxp
2013-09-24 10:37:21 +02:00
Xavier Morel 89fc31a633 [MERGE] from trunk
bzr revid: xmo@openerp.com-20130923120328-0wgd7wxhl1y5qyhr
2013-09-23 14:03:28 +02:00
ima-openerp 3f750aa42c [IMP]added demo data for address_id and improved code.
bzr revid: ishwarmalvi13@gmail.com-20130920121406-kfs5avkvb72rploe
2013-09-20 17:44:06 +05:30
ima-openerp 218645d88b [IMP]improved event view.
bzr revid: ishwarmalvi13@gmail.com-20130920101409-pz8szq99u067lc79
2013-09-20 15:44:09 +05:30
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 1679771af7 [FIX] ckeditor widgets don't work on td
bzr revid: xmo@openerp.com-20130917112649-c7o9746bvmnj53ti
2013-09-17 13:26:49 +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 Meghazi a086a2eb4d [FIX] minor fix
bzr revid: fme@openerp.com-20130912144707-s9p59h21u91zk4jn
2013-09-12 16:47:07 +02:00
Xavier Morel 9f0d6c8646 [REM] a copy/paste is fine...
bzr revid: xmo@openerp.com-20130911115449-kw4tr1g50kp3rj3n
2013-09-11 13:54:49 +02:00
Christophe Matthieu c80cf7d064 [IMP] website_event: add subscribe option and comments
bzr revid: chm@openerp.com-20130905104212-m6cybnbif4tsn9t3
2013-09-05 12:42:12 +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 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 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 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
Fabien Pinckaers 5f2b77d6c0 [IMP] small html/css improvements
bzr revid: fp@openerp.com-20130831090112-3omb9popd0099m5u
2013-08-31 11:01:12 +02:00
Paramjit Singh Sahota 223717d284 [IMP] Improved some changes for website_event and website_mail.
bzr revid: psa@tinyerp.com-20130830100316-hr0rstxr50uswe9i
2013-08-30 15:33:16 +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 69327029a7 [IMP] website_event: demo data
bzr revid: chm@openerp.com-20130829153748-gtbocio487ym5drj
2013-08-29 17:37:48 +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 5a67f90572 [IMP] Improved the left bar nav-header of event.
bzr revid: psa@tinyerp.com-20130829092959-21me8xt6r1o2rq7k
2013-08-29 14:59: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 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
ajay javiya (OpenERP) d3b90baa3f [IMP]: migrate website_event module from bootstrap 2.x to 3.0
bzr revid: aja@tinyerp.com-20130823121930-pryy1nq5nxels4u3
2013-08-23 17:49:30 +05:30
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 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 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 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 ed5ad1c91d [IMP] website_event: category and location in the left menu are optional
bzr revid: chm@openerp.com-20130812140243-ds50tzo36lqvdxyr
2013-08-12 16:02:43 +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
Fabien Pinckaers dcfe89b6da [IMP] First Theme Example
bzr revid: fp@openerp.com-20130811210927-dys2ilkss3553r65
2013-08-11 23:09:27 +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 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
Christophe Matthieu 95e8504d5c [IMP] website_event: add function fields register on ticket model. Add onchange on sale.order.line for event tickets
bzr revid: chm@openerp.com-20130807112812-23l0b8pjdzutyixy
2013-08-07 13:28:12 +02:00
Christophe Matthieu 64ec795203 [IMP] website_event: managment of tickets for an event to defined price and max number registration
bzr revid: chm@openerp.com-20130807094734-4uwlezgr50m4lwwu
2013-08-07 11:47:34 +02:00
Christophe Matthieu 966da9b37b [IMP] website
bzr revid: chm@openerp.com-20130806152158-0waq0cqo2702isyo
2013-08-06 17:21:58 +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 ca54d94534 [IMP] website_event, event
bzr revid: chm@openerp.com-20130806130053-wt1l25ri50c1z0e6
2013-08-06 15:00:53 +02:00
Christophe Matthieu 472b547c30 [FIX] website_event: access right for public user
bzr revid: chm@openerp.com-20130806093115-1bhh873xhycdag84
2013-08-06 11:31:15 +02:00
Christophe Matthieu bf86ccf433 [IMP] website: clean xml
bzr revid: chm@openerp.com-20130806080412-aq2mtf577zt1t3pl
2013-08-06 10:04:12 +02:00
Christophe Matthieu 81d707978e [FIX] website_event
bzr revid: chm@openerp.com-20130805150514-9zfut5y6xda3rpyx
2013-08-05 17:05:14 +02:00
Christophe Matthieu 4b8a51f3af [IMP] website_event
bzr revid: chm@openerp.com-20130805150319-y5iy0zxkq4fkuk5h
2013-08-05 17:03:19 +02:00
Christophe Matthieu d67443803a [IMP] website_event
bzr revid: chm@openerp.com-20130805130420-wlf5qkbamii90jcr
2013-08-05 15:04:20 +02:00
Christophe Matthieu 9cd3d8132b [IMP] website_event
bzr revid: chm@openerp.com-20130805124428-9pnqbdb68lruqnxq
2013-08-05 14:44:28 +02:00
Christophe Matthieu b1f0bc68c6 [IMP] website_mail, website_event
bzr revid: chm@openerp.com-20130805102110-5kupl0xdb8tw3x5m
2013-08-05 12:21:10 +02:00
Christophe Matthieu 686b44454a [IMP] website_event: search dates
bzr revid: chm@openerp.com-20130802104504-7o2uubwabn3yafqc
2013-08-02 12:45:04 +02:00
Christophe Matthieu 87a5495db0 [IMP] website_event: layout
bzr revid: chm@openerp.com-20130802101122-tjhs1iuafqusat67
2013-08-02 12:11:22 +02:00
Christophe Matthieu b7635f3382 [IMP] website_event: layout
bzr revid: chm@openerp.com-20130802091131-03focn43orp9h771
2013-08-02 11:11:31 +02:00
Christophe Matthieu 56803c5814 [IMP] website_event
bzr revid: chm@openerp.com-20130802044915-zo5shxu4dw7zn05c
2013-08-02 06:49:15 +02:00
Christophe Matthieu 89ddff91e3 [IMP] website_event
bzr revid: chm@openerp.com-20130802043526-btxa9x3xi5co9oru
2013-08-02 06:35:26 +02:00