Quentin (OpenERP)
70eb74a260
[MERGE] merged with trunk up to revision 9425. Needs to find another icon for Traceability on lot, though
...
bzr revid: qdp-launchpad@openerp.com-20140507182917-erjammra4okyei1c
2014-05-07 20:29:17 +02:00
chm@openerp.com
c10800f2f1
[FIX] website_event_sale: multi tickets
...
bzr revid: chm@openerp.com-20140502140152-hx7ktaf0cg2m7ija
2014-05-02 16:01:52 +02:00
Josse Colpaert
8b84615de1
[MERGE] Merge from trunk test
...
bzr revid: jco@openerp.com-20140502130352-c3h1fk332eqyd78b
2014-05-02 15:03:52 +02:00
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
Quentin (OpenERP)
57cebaaac6
[MERGE] merged trunk up to revision 9365.
...
bzr revid: qdp-launchpad@openerp.com-20140422092815-f4tlfmo8zj1nogbl
2014-04-22 11:28:15 +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
Quentin (OpenERP)
fbd3255e37
[MERGE] merged trunk up to revision 9350
...
bzr revid: qdp-launchpad@openerp.com-20140416150551-lxpscdd74mgv99r1
2014-04-16 17:05:51 +02:00
Quentin (OpenERP)
398d96f273
[MERGE] merged trunk up to revision 9327
...
bzr revid: qdp-launchpad@openerp.com-20140414094743-hv0u7qhigv1to2uc
2014-04-14 11:47:43 +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
Fabien Pinckaers
f5ccf4c523
[IMP] Ticket types translateable
...
bzr revid: fp@tinyerp.com-20140414123231-b27qnkaujayk9j84
2014-04-14 14:32:31 +02: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
Quentin (OpenERP)
ff4726ea7d
[MERGE] merged trunk up to revision 9281
...
bzr revid: qdp-launchpad@openerp.com-20140403081427-7xpn57wdfv08v2al
2014-04-03 10:14:27 +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
Quentin (OpenERP)
da210e4b5e
[MERGE] trunk
...
bzr revid: qdp-launchpad@openerp.com-20140311132813-0gmbof2u8nmgv9p3
2014-03-11 14:28:13 +01: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
Quentin (OpenERP)
e36b32a661
[MERGE] merged with main trunk (revision 9186)
...
bzr revid: qdp-launchpad@openerp.com-20140228131516-ihigousbe5p1nt68
2014-02-28 14:15:16 +01: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
Cedric Snauwaert
9b249181e3
[MERGE]merge with latest trunk
...
bzr revid: csn@openerp.com-20140210161556-qq52vvhdegyda7k6
2014-02-10 17:15:56 +01: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
Quentin (OpenERP)
256d7f37a2
[FIX] fix needed after the previous merge with trunk: parse error in event_sale
...
bzr revid: qdp-launchpad@openerp.com-20140204075652-bxmne823zf71j207
2014-02-04 08:56:52 +01:00
Quentin (OpenERP)
753f7541db
[MERGE] main trunk
...
bzr revid: qdp-launchpad@openerp.com-20140203173000-mk092iw2wz3y0e3e
2014-02-03 18:30:00 +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
Quentin (OpenERP)
fc93025818
[MERGE] merged trunk
...
bzr revid: qdp-launchpad@openerp.com-20140120144243-5kw535p28t1x7yeg
2014-01-20 15:42:43 +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