Commit Graph

219 Commits

Author SHA1 Message Date
Olivier Dony a9d2b65da5 [MERGE] Fwd-port 7.0 up to 783b9e1 2014-07-11 11:51:06 +02:00
Olivier Dony 783b9e1c89 [FIX] event_sale: reset event-related fields on SO line when switching products 2014-07-11 11:45:38 +02:00
Richard Mathot a0a17fa46e [TYPO] in event, event_sale 2014-07-10 14:11:01 +02:00
FalcoBolger 44bf56c77c [FIX] event_sale: do not crash when empty field product in ticket types lines 2014-07-10 11:26:19 +02:00
Denis Ledoux e7a0b1bb90 [FIX] event_sale: stored seats_max field
seats_max is a stored field in event, and should remain stored when overrided in event_sale
2014-06-03 12:21:34 +02:00
Denis Ledoux cadf582d78 [FIX] event_sale, website_event_sale: ACLs for event.event.ticket
event.event.ticket were set in website_event_sale, while this model is set in event_sale module
Manager acl moved from website_event_sale to event_sale
Created a new acl for event user in event_sale
Left the acl for everyone in website_event_sale, meaning that when this module is installed, everyone can read tickets, event those who aren't event user
2014-05-27 18:39:00 +02:00
Olivier Dony 60cafe4da2 [FIX] website_event_sale: hide event tickets that are not for sale anymore
This should ideally be based on an extra timezone
field on each event, pending fix later in trunk.

bzr revid: odo@openerp.com-20140422123153-m6za55oqkiqysalx
2014-04-22 14:31:53 +02:00
Launchpad Translations on behalf of openerp 16ce262c33 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140329073038-m7q4sxpb8tprh00r
bzr revid: launchpad_translations_on_behalf_of_openerp-20140330061549-r3t0pecngy76c2rw
bzr revid: launchpad_translations_on_behalf_of_openerp-20140331064021-x3wjc8s4oa0ncq95
bzr revid: launchpad_translations_on_behalf_of_openerp-20140401065325-w3viflz7c33n4uis
bzr revid: launchpad_translations_on_behalf_of_openerp-20140402064459-d7e3d8nwo8famjh6
2014-04-02 06:44:59 +00:00
Launchpad Translations on behalf of openerp b201dc79b7 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140218054104-8egkh4jj7hiiwuih
bzr revid: launchpad_translations_on_behalf_of_openerp-20140219054048-688twg0fubtm2x2q
bzr revid: launchpad_translations_on_behalf_of_openerp-20140220054214-237ri67t9rw3l4fu
bzr revid: launchpad_translations_on_behalf_of_openerp-20140221063855-wniw42r27gyg3h6y
bzr revid: launchpad_translations_on_behalf_of_openerp-20140222073328-xpn7nwqz407yzumq
bzr revid: launchpad_translations_on_behalf_of_openerp-20140223074516-0r09cpmma58ylqji
bzr revid: launchpad_translations_on_behalf_of_openerp-20140224060319-535oheaq2w9u2ye3
bzr revid: launchpad_translations_on_behalf_of_openerp-20140225062420-zl7curej0e0warhz
bzr revid: launchpad_translations_on_behalf_of_openerp-20140226073146-3vzhw4hddr81olbs
bzr revid: launchpad_translations_on_behalf_of_openerp-20140227062959-24e2rn98rqb9afpr
bzr revid: launchpad_translations_on_behalf_of_openerp-20140228072152-f9gm4ud1wu19ge27
bzr revid: launchpad_translations_on_behalf_of_openerp-20140301055205-r0df0fqz9yf5z66i
bzr revid: launchpad_translations_on_behalf_of_openerp-20140302052638-bjf11oumy7w15oco
bzr revid: launchpad_translations_on_behalf_of_openerp-20140304082704-k1z2te1tfud43zy3
2014-03-04 08:27:04 +00:00
Launchpad Translations on behalf of openerp ffabcd257c Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140206062321-j6cpns6xz3f81net
bzr revid: launchpad_translations_on_behalf_of_openerp-20140206062510-x502ahdwzezvea54
2014-02-06 06:25:10 +00:00
Olivier Dony d248bcb33a [FIX] event_sale: consistent addition of event-related fields on products and templates
bzr revid: odo@openerp.com-20140130172422-wvq804yizh5x3xe0
2014-01-30 18:24:22 +01:00
Denis Ledoux 369a88a5a1 [FIX] event_sale, website_event: copy paste errors in views
bzr revid: dle@openerp.com-20140130154910-xmg8dehh0zubgif8
2014-01-30 16:49:10 +01:00
Antony Lesuisse 033c38c304 [MERGE] trunk
bzr revid: al@openerp.com-20140129021916-ckb3rplmcpjbqel3
2014-01-29 03:19:16 +01:00
Christophe Matthieu 07adc071df [IMP] website_event: split module: remove depends with sale and move event's ticket form into a bridge: website_event_sale
bzr revid: chm@openerp.com-20140128113101-aon81actmpahyn58
2014-01-28 12:31:01 +01:00
Christophe Matthieu d588e44d34 [IMP] event,event_sale: refactoring; remove crappy 9999 hardcoded values; remove visibility; add constraints
[FIX] remove module_portal_anonymous ref
[IMP] website: res_config with wizard
[IMP] event: remove related field to res.partner
[FIX] website_sale: change crappy _get_pricelist method (who return a browse record to a function field type many2one)

bzr revid: chm@openerp.com-20140128092037-zrrbz1hrmgat88o4
2014-01-28 10:20:37 +01:00
Launchpad Translations on behalf of openerp 3ce5e01eca Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140128064139-6fjg3b236v5d790j
2014-01-28 06:41:39 +00:00
Christophe Matthieu 43044d8ee7 [IMP] event,event_sale: refactoring; remove crappy 9999 hardcoded values; remove visibility; add constraints
bzr revid: chm@openerp.com-20140127135828-z848mvpis5d9xyh8
2014-01-27 14:58:28 +01:00
Christophe Matthieu 9548b71db8 [FIX] event_sale: traceback when confirming an event
bzr revid: chm@openerp.com-20140124132357-90mx68jr7vbxjw1c
2014-01-24 14:23:57 +01:00
Raphael Collet c08b9a7b03 [FIX] event_sale: improve usage of get_object()
bzr revid: rco@openerp.com-20140123163746-9p5zz3ntn6908tfi
2014-01-23 17:37:46 +01:00
Thibault Delavallée 38d64147d5 [IMP] product: only template child / multiple template childs form view improvements
- added a is_only_child field on product.product, telling whether the
product is the only child of the product.template
- improved the product form view, to set readonly all fields coming fgrom
the template when the product is not the only child. This way, the user
is more aware that changing a value in the template changes the value
for all child products. He will have to do those changes on the template
form. A link to the template has been added in the product form view.

bzr revid: tde@openerp.com-20140122095826-8k0wl7af57iiyify
2014-01-22 10:58:26 +01:00
Launchpad Translations on behalf of openerp 28d79433c3 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140118070457-rn2tgdxis2fi3nqo
bzr revid: launchpad_translations_on_behalf_of_openerp-20140119055822-ajy043mntc4jr407
bzr revid: launchpad_translations_on_behalf_of_openerp-20140120055854-z7wtyb24c5t8kcmj
bzr revid: launchpad_translations_on_behalf_of_openerp-20140118070538-2xm86ece1aate8u9
bzr revid: launchpad_translations_on_behalf_of_openerp-20140119055932-sa6vrp2g8ua3u88e
bzr revid: launchpad_translations_on_behalf_of_openerp-20140120055948-lwcyqcfutgamwac1
bzr revid: launchpad_translations_on_behalf_of_openerp-20140118070546-d89xqw56zou7e9p9
bzr revid: launchpad_translations_on_behalf_of_openerp-20140120055955-6wrdxqy1018mo7jq
2014-01-20 05:59:55 +00:00
Thibault Delavallée 9cf78e93cc [MERGE] Sync with trunk, tries to solve conflicts. There are still some new images to convert into images in xml files.
bzr revid: tde@openerp.com-20140116103910-qmm2y6kucmngplnk
2014-01-16 11:39:10 +01:00
Christophe Matthieu b1a422a9dc [FIX] event_sale: demo data
bzr revid: chm@openerp.com-20140113083246-qypjeukv1kf5rrjf
2014-01-13 09:32:46 +01:00
Stephane Wirtel bea411bb98 [IMP] Backport one feature from website: this feature allows to specify a file
path on the field tag fetching the right file instead of using the base64
encoded file in the field.

<field name="image" type="base64" file="base/static/img/main_partner-image.png" />

bzr revid: stw@openerp.com-20140109154550-a04qybctzaaqtrlr
2014-01-09 16:45:50 +01:00
Christophe Matthieu db17d26b3a [IMP] website_event: create tickets inside add_event. (insead of overwrite create in event_sale)
bzr revid: chm@openerp.com-20131127103816-fn1dse25djmknylj
2013-11-27 11:38:16 +01:00
Christophe Matthieu 9fc02cfadc [IMP] event_sale: add a deadline equal datebegin on tickets created if deadline is empty
bzr revid: chm@openerp.com-20131127102514-zu38sazvzzlb9deh
2013-11-27 11:25:14 +01:00
Fabien Pinckaers 183c75a3c7 [IMP] default values on new events
bzr revid: fp@tinyerp.com-20131126161424-savrp6u63zmpoq5w
2013-11-26 17:14:24 +01:00
Fabien Pinckaers fb0abe39bc [WIP] EVENT: new features required for community days/big events
Manage tracks/talks
	Allow a dedicated menu per event
	Allow a blog per event, to announce stuff
	A "Call for Proposal" page

bzr revid: fp@tinyerp.com-20131124185434-hwyluq90e2g4g7tj
2013-11-24 19:54:34 +01:00
Launchpad Translations on behalf of openerp 271ed43e7b Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131121054848-007arsnnoa8fs65e
bzr revid: launchpad_translations_on_behalf_of_openerp-20131121063838-blqn6j0yfmrlw5vp
2013-11-21 06:38:38 +00:00
Christophe Matthieu 6185c3270e [FIX] event_sale: 'product.product' object has no attribute 'onchange_event_ok' => product.template
bzr revid: chm@openerp.com-20131119090946-p6wtc1j6u4jkm72i
2013-11-19 10:09:46 +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
Launchpad Translations on behalf of openerp 108ccbf108 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131114062958-ies8xa3pft7n59ms
bzr revid: launchpad_translations_on_behalf_of_openerp-20131106055135-r0xt2vr04710jh1t
bzr revid: launchpad_translations_on_behalf_of_openerp-20131107055120-r8z445ergt50erlx
bzr revid: launchpad_translations_on_behalf_of_openerp-20131108062620-bvfofx1jl1wb1csh
bzr revid: launchpad_translations_on_behalf_of_openerp-20131110064525-ioceogsmu0nmx2qj
bzr revid: launchpad_translations_on_behalf_of_openerp-20131111053908-gbrp09ast5fhr6iw
bzr revid: launchpad_translations_on_behalf_of_openerp-20131112062316-5uf2bvbzdhkq1b7k
bzr revid: launchpad_translations_on_behalf_of_openerp-20131113060841-bkjcuz4e9rtzn6f9
bzr revid: launchpad_translations_on_behalf_of_openerp-20131114063058-rrm2q5lxkyawuvpz
2013-11-14 06:30:58 +00:00
Launchpad Translations on behalf of openerp 15062bdffe Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131105060056-7xuq20lqt1upcdc6
2013-11-05 06:00:56 +00: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
Thibault Delavallée 607de396ba [MERGE] Sync with trunk, until revision 8927
bzr revid: tde@openerp.com-20131002135442-g8l2vpkq7h0roqdt
2013-10-02 15:54:42 +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 a5c05adda3 [IMP] manifest event module
bzr revid: fp@openerp.com-20130928204105-8q30oh21c1xcck5a
2013-09-28 22:41:05 +02:00
Fabien Pinckaers 650d4a9f51 [IMP] demo data events
bzr revid: fp@openerp.com-20130928201840-v12rwigq2k13sspe
2013-09-28 22:18:40 +02:00
Thibault Delavallée 754fbd0d79 [IMP] event_sale: cleaned demo data, using standard xml_ids.
Also removed website_published and description website fields, not necessary at all.

bzr revid: tde@openerp.com-20130924101924-0onpypxq0806dzb7
2013-09-24 12:19:24 +02:00
ima-openerp a7e1ae6b61 [IMP]added ticket data for events.
bzr revid: ishwarmalvi13@gmail.com-20130924070446-59j3slvcf8kzgerk
2013-09-24 12:34:46 +05:30
ima-openerp e70f0cdf3a [IMP]added event description and improved code.
bzr revid: ishwarmalvi13@gmail.com-20130923125835-j18ge3q2bmaj0jvl
2013-09-23 18:28:35 +05:30
Launchpad Translations on behalf of openerp c7471d1bff Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130919045624-x71znzpi3rpnvpcs
bzr revid: launchpad_translations_on_behalf_of_openerp-20130920060145-80h8zse3uw3jg2fx
2013-09-20 06:01:45 +00:00
ima-openerp fc3f548661 [IMP]added demo data for event.
bzr revid: ishwarmalvi13@gmail.com-20130919141136-2apdtn0e0h8p3wg7
2013-09-19 19:41:36 +05:30
Launchpad Translations on behalf of openerp 4cb9834833 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130913060838-a2k0hfitlgdrqj0h
2013-09-13 06:08:38 +00:00
Launchpad Translations on behalf of openerp 9dba69ba48 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130912064018-3vecn03jcu9fm1m8
2013-09-12 06:40:18 +00:00
Launchpad Translations on behalf of openerp 7d151605a2 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130910052339-qlk3s9xi37dkmdl8
2013-09-10 05:23:39 +00: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
Launchpad Translations on behalf of openerp cb8f9c5a0d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130903054857-i15nhvtthlho7chm
2013-09-03 05:48:57 +00: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 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