Commit Graph

160 Commits

Author SHA1 Message Date
Xavier Morel e06f5b414b [IMP] inherit_option_id -> application 2014-05-27 12:13:51 +02:00
Fabien Pinckaers 143615ddc1 Merge branch 'master-remove-html-fields-backend-ypa' of https://github.com/odoo-dev/odoo into odoo-dev-master-remove-html-fields-backend-ypa 2014-05-23 09:24:16 +02:00
Yogesh Parekh c0f453a1ea Remove description html field from website_event_track module 2014-05-22 15:28:39 +05:30
Christophe Simonis a756b82372 [MERGE] forward port of branch saas-4 up to revid bb26dea 2014-05-20 20:19:55 +02:00
Christophe Simonis 040c93026a [MERGE] merge bzr trunk addons branch 2014-05-20 18:10:36 +02:00
Richard Mathot (OpenERP) be99dbf16a [FIX] website_event_track: human-readable display of track durations 2014-05-19 17:41:50 +02:00
Vicente Jimenez Aguilar 3b859c219f Default event track is half hour not 30 hours
This is a leftover from revision 9304
where the duration property of events changed unit
from minutes to hours but the defualt value remained 30.
2014-05-19 14:04:01 +02:00
Fabien Meghazi c3cfc4bc32 [MERGE] sitemap backport, merge trunk from 9438 til 9440
merge from 9438 revid:fp@tinyerp.com-20140511115231-g8ke14r9iepyypv4 til 9440 revid:fp@tinyerp.com-20140511143314-nzn1239l00arbxjq
2014-05-13 16:38:31 +02:00
Fabien Meghazi 8eed143112 [IMP] Invert multilang logic in route decorator. True by default, can be set to False explicitlty 2014-05-13 11:35:45 +02:00
Xavier Morel ef06e5087a [FIX] various website modules, re-enable crawler tests
* fix crawler to discard URL fragments before deduplicating and crawling
* fix website_forum links which should not be links (either because their urls
  are JSON-RPC methods or because their urls are side-effecting
* remove stray print statements
* side-improvements (simplifications) to some methods
2014-05-13 11:42:05 +02:00
Xavier Morel 36bb8acfab [IMP] website_event_track: simplify event_agenda 2014-05-13 10:49:24 +02:00
Richard Mathot (OpenERP) 5cf2386e72 [FIX] website_event_track: display days in chronological order 2014-05-13 09:28:03 +02:00
Fabien Pinckaers 798e4156fa [IMP] sitemap cleaning: events
bzr revid: fp@tinyerp.com-20140511143314-nzn1239l00arbxjq
2014-05-11 16:33:14 +02:00
Raphael Collet 1d0a6e20a4 [FIX] event: move definition of fields track_ids and count_tracks to the right module
bzr revid: rco@openerp.com-20140505085739-z2asr1vrx6yyjtlh
2014-05-05 10:57:39 +02:00
Gery Debongnie 2e9ee9c76e [MERGE] merge from rma branch
bzr revid: ged@openerp.com-20140410145131-fj17mdpi13wa5a9m
2014-04-10 16:51:31 +02:00
Fabien Pinckaers 8970cefdd1 [IMP] track duration in hours
bzr revid: fp@tinyerp.com-20140409184334-ehkhowyhyqw6cdmx
2014-04-09 20:43:34 +02:00
Fabien Pinckaers 65908c769b [IMP] Event Agenda: merge with cleaning
bzr revid: fp@tinyerp.com-20140409172600-bwy97j8kr8dzrgg9
2014-04-09 19:26:00 +02:00
Vidhin Mehta (OpenERP) 9776b9e0bd [FIX]
bzr revid: vme@tinyerp.com-20140409102852-wzbj1h4l9s94v7fc
2014-04-09 15:58:52 +05:30
Vidhin Mehta (OpenERP) 308ac3dcaf [IMP]improve comment
bzr revid: vme@tinyerp.com-20140409101205-j41ufx8kxh10usf3
2014-04-09 15:42:05 +05:30
Vidhin Mehta (OpenERP) 4a1bc09a40 [IMP]shows location on days and fixes other bug.
bzr revid: vme@tinyerp.com-20140409100310-tiugx0jzxlwdphy6
2014-04-09 15:33:10 +05:30
Fabien Pinckaers 6dff1b434d [IMP] track translatable
bzr revid: fp@tinyerp.com-20140409082730-0aafeuss3o8ywmkm
2014-04-09 10:27:30 +02:00
Christophe Simonis 0fad8159f3 [MERGE] forward port of branch saas-3 up to revid 9380 chs@openerp.com-20140407144439-10n8fs6zovodwwtx
bzr revid: chs@openerp.com-20140407163318-hh3jwfkj3o2c83lk
2014-04-07 18:33:18 +02:00
Vidhin Mehta (OpenERP) 2baf1c7a52 [IMP]
bzr revid: vme@tinyerp.com-20140404110140-i0gtefh1astotx70
2014-04-04 16:31:40 +05:30
Vidhin Mehta (OpenERP) 2a8f2a70ff [IMP]Show track name when overlaping and color shown in backend view.
bzr revid: vme@tinyerp.com-20140404105903-wvgrsias92zml5di
2014-04-04 16:29:03 +05:30
Vidhin Mehta (OpenERP) a4907a2d82 [FIX]timezone
bzr revid: vme@tinyerp.com-20140404070517-gr561r6l5b02t4a3
2014-04-04 12:35:17 +05:30
Vidhin Mehta (OpenERP) 2325750562 [REM]
bzr revid: vme@tinyerp.com-20140404055028-cjb6vzv1whvacpr1
2014-04-04 11:20:28 +05:30
Denis Ledoux 73b3c851da [FIX] website*: remove unusable demo links from manifests
bzr revid: dle@openerp.com-20140403145128-9w92v4mmasz66mqj
2014-04-03 16:51:28 +02:00
Vidhin Mehta (OpenERP) 77390a8b76 [MERGE]Trunk.
bzr revid: vme@tinyerp.com-20140403131938-75bwnfhg6frydlnb
2014-04-03 18:49:38 +05:30
Vidhin Mehta (OpenERP) ec02c17ded [IMP]Add test cases.
bzr revid: vme@tinyerp.com-20140403125219-i34g7kxpcsbo1pcq
2014-04-03 18:22:19 +05:30
Vidhin Mehta (OpenERP) a2bb4bb603 [ADD]Add many usefull comments.
bzr revid: vme@tinyerp.com-20140403101936-7qvi6wqvfpxpcpg9
2014-04-03 15:49:36 +05:30
Vidhin Mehta (OpenERP) 6a58964065 [MERGE]Trunks.
bzr revid: vme@tinyerp.com-20140403072700-9p2m0jmtp28xwpxd
2014-04-03 12:57:00 +05:30
Fabien Pinckaers 9588999c7c [IMP] Tracks: alphabetic order
bzr revid: fp@tinyerp.com-20140403072548-y4823lyjuovl5neu
2014-04-03 09:25:48 +02:00
Vidhin Mehta (OpenERP) 3357b38143 [Refacotere]Code.
bzr revid: vme@tinyerp.com-20140403071711-5dclywkcojrqu7dj
2014-04-03 12:47:11 +05:30
Randhir Mayatra rma-openerp 3470c07e77 [MERGE] merge with latest trunk
bzr revid: rma@tinyerp.com-20140327043351-3lqmcuxd26mrlzxu
2014-03-27 10:03:51 +05:30
Yogesh Parekh (OpenERP) 22fd5a3e92 [IMP]: Convert buttons into stat button in stockand purchase module
bzr revid: ypa@tinyerp.com-20140326125640-0my7ih6bgk9s9dt1
2014-03-26 18:26:40 +05:30
Vidhin Mehta (OpenERP) 17021e8bfb [IMP]
bzr revid: vme@tinyerp.com-20140326113540-0ore3bg7sd1r2vu3
2014-03-26 17:05:40 +05:30
Vidhin Mehta (OpenERP) df0631ad3d [IMP]default date set to event's date_begin.
bzr revid: vme@tinyerp.com-20140326103833-11s3q1wbir5359xd
2014-03-26 16:08:33 +05:30
Vidhin Mehta (OpenERP) e7bb0c0bcf [fIX]
bzr revid: vme@tinyerp.com-20140326094009-3w0ybp1ay3v1jlh5
2014-03-26 15:10:09 +05:30
Vidhin Mehta (OpenERP) cf96c853ee [IMP]demo data.
bzr revid: vme@tinyerp.com-20140326092431-i8cw7gxdgr7damai
2014-03-26 14:54:31 +05:30
Vidhin Mehta (OpenERP) cdc28ed904 [IMP] overlap check with sql.
bzr revid: vme@tinyerp.com-20140326090209-afmcp61o8zo9yjvq
2014-03-26 14:32:09 +05:30
Vidhin Mehta (OpenERP) a6039496f6 [IMP]Add comments.
bzr revid: vme@tinyerp.com-20140325132319-w0f9xfokn7yicjkv
2014-03-25 18:53:19 +05:30
Vidhin Mehta (OpenERP) 763b1475a9 [IMP]Minor improvements.
bzr revid: vme@tinyerp.com-20140325131433-qf26x8kueone81tj
2014-03-25 18:44:33 +05:30
Vidhin Mehta (OpenERP) f2c567a666 [IMP]typo changing commits.
bzr revid: vme@tinyerp.com-20140325125343-prtk6wus50t93uih
2014-03-25 18:23:43 +05:30
Vidhin Mehta (OpenERP) 0881710694 [IMP]Refactore.
bzr revid: vme@tinyerp.com-20140325122327-9lqr308hz01q25p7
2014-03-25 17:53:27 +05:30
Vidhin Mehta (OpenERP) 458991e011 [IMP]make global methods.
bzr revid: vme@tinyerp.com-20140325103253-co0m99smbvtq7pxc
2014-03-25 16:02:53 +05:30
chm@openerp.com 13d7cfe86c [MERGE] from trunk
bzr revid: chm@openerp.com-20140324082341-d6gqyloc7822aen2
bzr revid: chm@openerp.com-20140325084852-i1yomuyhyen4ss95
2014-03-25 09:48:52 +01:00
Vidhin Mehta (OpenERP) 279be8cb26 [IMP]code refactore python.
bzr revid: vme@tinyerp.com-20140325065616-u4gksi76xtb6ajhw
2014-03-25 12:26:16 +05:30
Denis Ledoux 5e967d1a3f [MERGE] Forward-port of latest saas-3 bugfixes, up to rev. 9347 revid:dle@openerp.com-20140324162524-ew3c3eauj3kcnefi
bzr revid: dle@openerp.com-20140324162852-iubef1i0hwpxiske
2014-03-24 17:28:52 +01:00
Kersten Jeremy a747309ba8 [FIX] Add related field in sponsor model to allow public user to get logo from res partner without give all the rights.
bzr revid: jke@openerp.com-20140324134446-vy2vxycwltb8oclf
2014-03-24 14:44:46 +01:00
Vidhin Mehta (OpenERP) ee0e15c48e [REM]remove unwanted id.
bzr revid: vme@tinyerp.com-20140324091745-tfjamd3t17jaaju4
2014-03-24 14:47:45 +05:30