Commit Graph

194 Commits

Author SHA1 Message Date
Antony Lesuisse 7e25b9ae55 [MERGE] saas-4 report_webkit missing dependency on report
bzr revid: al@openerp.com-20140501152604-4cobh5ui47dt4pem
bzr revid: al@openerp.com-20140501155633-gefnc3zqcsr2rhaz
bzr revid: al@openerp.com-20140501161156-4wbsvhh8gz4r22h3
2014-05-01 18:11:56 +02:00
Olivier Dony 3891e0f2aa [FIX] event_sale: call to parent store trigger resolver fails due to class mismatch for <unbound_method>
bzr revid: odo@openerp.com-20140429105020-0itp8j0oa4im3bj7
2014-04-29 12:50:20 +02:00
Olivier Dony 9706320c11 [FIX] event_sale: `seats_available` needs to be recomputed according to the value of `seats_max` that changes when tickets are updated
bzr revid: odo@openerp.com-20140428094449-wuvjwl4ko10l4c92
2014-04-28 11:44:49 +02:00
Christophe Simonis 7a7d7febf8 [MERGE] forward port of branch saas-3 up to revid 9429 chs@openerp.com-20140424123538-rxk9got9k2on1ki1
bzr revid: chs@openerp.com-20140424131824-4ksluvhnegp7kplb
bzr revid: chs@openerp.com-20140424134533-lhhcd32n3s0m9cqk
2014-04-24 15:45:33 +02:00
Richard Mathot (OpenERP) 11680fd1f7 [IMP] Usability of event and event_sale
bzr revid: rim@openerp.com-20140423133917-zpulvflwflgz12sw
2014-04-23 15:39:17 +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 fa60b90c1f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140422075247-nxfftok20ltlnea6
2014-04-22 07:52:47 +00:00
Fabien Pinckaers f5ccf4c523 [IMP] Ticket types translateable
bzr revid: fp@tinyerp.com-20140414123231-b27qnkaujayk9j84
2014-04-14 14:32:31 +02:00
Launchpad Translations on behalf of openerp e82fbf7d91 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140412083153-3ona1js7o6z421vg
2014-04-12 08:31:53 +00:00
Raphael Collet 3ba23748bc [FIX] event_sale: fix non-closing tags in xml file
bzr revid: rco@openerp.com-20140410112922-wryrl5dw8aveyw27
2014-04-10 13:29:22 +02:00
Fabien Pinckaers ec2ea6643b [IMP] evnet
bzr revid: fp@tinyerp.com-20140410091747-mznpvuxdbi1uxj2d
2014-04-10 11:17:47 +02:00
Launchpad Translations on behalf of openerp 00f57e0710 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140401053916-5sh5hkd0k7j4q6pu
bzr revid: launchpad_translations_on_behalf_of_openerp-20140401061016-u413ch6j6f64dd4m
2014-04-01 06:10:16 +00:00
Launchpad Translations on behalf of openerp 51aa261b44 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140327073504-l0fydwct329jhirh
2014-03-27 07:35:04 +00:00
Launchpad Translations on behalf of openerp 9863dbe5c8 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140304075238-yra39uwmwahmrnf3
2014-03-04 07:52:38 +00:00
Launchpad Translations on behalf of openerp bb08d9aa3a Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140219052308-a68gl450xb2r5kd8
2014-02-19 05:23:08 +00:00
Thibault Delavallée 1b13217838 [MERGE] sales/crm: minor improvements in account_analytic_analysis, crm, event_sale, hr_timesheet_invoice, sale views
bzr revid: tde@openerp.com-20140205160347-nptajwoxfl5ylfa9
2014-02-05 17:03:47 +01: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
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
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
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
Atul Patel (OpenERP) 89c428bd84 [MERGE]: Merged with addons
bzr revid: atp@tinyerp.com-20131029133906-xrxccq8zm285m2zw
2013-10-29 19:09:06 +05:30
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
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 9dba69ba48 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130912064018-3vecn03jcu9fm1m8
2013-09-12 06:40:18 +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