odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity
94,521 Commits 3 Branches 0 Tags 961 MiB
Commit Graph

221 Commits

Author SHA1 Message Date
Fabien Meghazi faa09da325 Removed version="7.0" from form views 2014-06-12 09:09:59 +02:00
Géry Debongnie af58bc5914 Merge remote-tracking branch 'odoo/master' into master-inline-searchview-ged 2014-06-11 10:10:58 +02:00
Olivier Dony 6b85d80f23 [FIX] Wrap werkzeug.utils.escape() to accomodate signature change in 0.9 
We always want to escape quotes (") as part of the process of
generating HTML output. This option (quote=True) turned into
an implicit flag with a DeprecationWarning in werkzeug 0.9.0
It is likely to disappear in a future release of werkzeug too.
A wrapper avoids this warning without loss of compatibility
 2014-06-10 18:46:40 +02:00
Christophe Simonis a7c2125735 [MERGE] forward port of branch saas-4 up to 6b8e972 2014-06-10 13:15:46 +02:00
Christophe Simonis 6b8e9727e5 [MERGE] forward port of branch saas-3 up to 4601d85 2014-06-10 12:29:47 +02:00
Denis Ledoux 4b3cec8ecf [FIX] website_event_track: remove trailing comma in speakers name in event tracks 2014-06-05 17:50:15 +02:00
Géry Debongnie 5cc8f9ca42 Merge remote-tracking branch 'odoo/master' into master-inline-searchview-ged 2014-05-28 10:37:16 +02:00
Olivier Dony 04211015fc [MERGE] Forward-port of latest saas-4 fixes, up to 0452851 2014-05-27 20:49:49 +02:00
Xavier Morel e06f5b414b [IMP] inherit_option_id -> application 2014-05-27 12:13:51 +02:00
Géry Debongnie 62900fe01b Merge remote-tracking branch 'odoo/master' into master-inline-searchview-ged 
Conflicts:
	addons/crm/crm_case_section_view.xml
 2014-05-26 10:06:31 +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
Géry Debongnie 555677f14d [IMP] replace all 'Group By...' by 'Group By' 
in all searchview, the 'Group By...' looks weird, next to the Custom
Reports and Filters.  This change was requested by the upper management
 2014-05-22 11:44:35 +02:00
Richard Mathot 37d6fe344b [FIX] website_event_track: display speakers name to public users 2014-05-21 17:10:50 +02:00
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
Vidhin Mehta (OpenERP) 5755070df3 [IMP]talks count. 
bzr revid: vme@tinyerp.com-20140324085647-ms5rrfwvpj0t1apn
 2014-03-24 14:26:47 +05:30
Vidhin Mehta (OpenERP) b74c4bca0e [REM]silly mistake. 
bzr revid: vme@tinyerp.com-20140324063121-7wap2zutyu7d4hqs
 2014-03-24 12:01:21 +05:30
Vidhin Mehta (OpenERP) e6a43c98a1 [IMP]timzone field added in backend side. 
bzr revid: vme@tinyerp.com-20140324060613-zf2gki5u5mreolo0
 2014-03-24 11:36:13 +05:30
Vidhin Mehta (OpenERP) af8149264a [REM]unnecessary code. 
bzr revid: vme@tinyerp.com-20140324052855-atpcer0b8vt0v356
 2014-03-24 10:58:55 +05:30
Vidhin Mehta (OpenERP) d43c76de65 [REM]remove timezone from frontend. 
bzr revid: vme@tinyerp.com-20140324052004-441bz8g24kix3fei
 2014-03-24 10:50:04 +05:30
Vidhin Mehta (OpenERP) 2d3656fd35 [IMP]show timezone option, select bydefault and change timezone value according to selection. 
bzr revid: vme@tinyerp.com-20140321064541-zvrnx1b9azgrjkh7
 2014-03-21 12:15:41 +05:30
Vidhin Mehta (OpenERP) ec837facef [FIX] 
bzr revid: vme@tinyerp.com-20140318133544-igwmmruotonjy62k
 2014-03-18 19:05:44 +05:30
chm@openerp.com 353bbdc2c3 [FIX] website: route and redirect: remove all backslash from url 
bzr revid: chm@openerp.com-20140314162346-25vohj6ayp65tgiy
 2014-03-14 17:23:46 +01:00
Vidhin Mehta (OpenERP) cfa67eeace [IMP]Filter records in which start date and duration are null also duration is 0. 
bzr revid: vme@tinyerp.com-20140314122303-q7hgy4a3ij91yfxu
 2014-03-14 17:53:03 +05:30
Vidhin Mehta (OpenERP) 54fd56bd7d [FIX]minor. 
bzr revid: vme@tinyerp.com-20140314103626-o5dqmk1a3ffl2ire
 2014-03-14 16:06:26 +05:30
Vidhin Mehta (OpenERP) 18ea853519 [IMP]typo change. 
bzr revid: vme@tinyerp.com-20140314102323-wuklgyvll1s0wx0s
 2014-03-14 15:53:23 +05:30
Vidhin Mehta (OpenERP) 1de65c1d5d [IMP]Remove row when it's totally empty(taken care of rowspan), now filter will find only its related table. 
bzr revid: vme@tinyerp.com-20140314101546-ani4rne4jjldm7gi
 2014-03-14 15:45:46 +05:30
Vidhin Mehta (OpenERP) fe8777e209 [IMP]show/hide element with visiblity. 
bzr revid: vme@tinyerp.com-20140314083843-h5pyl9xkbs6j8qi5
 2014-03-14 14:08:43 +05:30
Vidhin Mehta (OpenERP) 9eea6a2dd8 [IMP]make 10% special width for first column of every row. 
bzr revid: vme@tinyerp.com-20140314072828-8xjnpdtpcoilquaq
 2014-03-14 12:58:28 +05:30
Vidhin Mehta (OpenERP) cfa7e909c1 [IMP]format for date 
bzr revid: vme@tinyerp.com-20140314072056-kictunm2cx3jonvq
 2014-03-14 12:50:56 +05:30
Darshan Kalola (OpenERP) 9374159c00 [IMP]improved typo, display time slot in one line and used define color when location_id = False. 
bzr revid: dka@tinyerp.com-20140314071608-3al2qurbjwq65o9b
 2014-03-14 12:46:08 +05:30
Vidhin Mehta (OpenERP) 9a9aa166ac [IMP]if not publish than red icon. 
bzr revid: vme@tinyerp.com-20140314064536-j2w3tlvomcfmci11
 2014-03-14 12:15:36 +05:30
Darshan Kalola (OpenERP) acd7451951 [IMP]added stage_id in demo data of event_track and removed registration & cofee talk from demo data. 
bzr revid: dka@tinyerp.com-20140314062619-ei0o78n9szqyl9wt
 2014-03-14 11:56:19 +05:30
Darshan Kalola (OpenERP) af01232ec0 [IMP]improved speaker name, added class text-muted and make it small. 
bzr revid: dka@tinyerp.com-20140314055628-4e9vv5e15ybrftw5
 2014-03-14 11:26:28 +05:30
Vidhin Mehta (OpenERP) 8cccfb7e3f [IMP]user superuserid. 
bzr revid: vme@tinyerp.com-20140314052730-7ktkfem61ze5d6ri
 2014-03-14 10:57:30 +05:30
Vidhin Mehta (OpenERP) 92d336bb7e [REM~] 
bzr revid: vme@tinyerp.com-20140314052114-ynikfc502x9oay3g
 2014-03-14 10:51:14 +05:30
Vidhin Mehta (OpenERP) 237f94797d [IMP]link each track to talk, remove link with room name. 
bzr revid: vme@tinyerp.com-20140314051852-g5ae2nn1aanb8zd2
 2014-03-14 10:48:52 +05:30
Vidhin Mehta (OpenERP) 0628fca1fc [IMP]add talks 
bzr revid: vme@tinyerp.com-20140313133224-jmzacgnqlxee32y5
 2014-03-13 19:02:24 +05:30
Vidhin Mehta (OpenERP) 03ca05f638 [IMP] start date and end date can't be same, track must have secret key. 
bzr revid: vme@tinyerp.com-20140313101559-q3h08sxbvuy3j7ov
 2014-03-13 15:45:59 +05:30
Vidhin Mehta (OpenERP) 49c965aed1 [MERGE]Trunk. 
bzr revid: vme@tinyerp.com-20140313092609-jsjt19yw2eczb1jq
 2014-03-13 14:56:09 +05:30
Vidhin Mehta (OpenERP) 8152dff1c1 [ADD]comment 
bzr revid: vme@tinyerp.com-20140313092428-rvyc6zz8nubfsg3g
 2014-03-13 14:54:28 +05:30
Vidhin Mehta (OpenERP) 08823a3640 [IMP]track can't overlapped now, contraint added, change in demo data. 
bzr revid: vme@tinyerp.com-20140313084226-dx4tkrhi6ju0th8y
 2014-03-13 14:12:26 +05:30
Vidhin Mehta (OpenERP) 5587ede447 [IMP]complete algo,template and working well timetable. 
bzr revid: vme@tinyerp.com-20140313064737-r49q62owvgaltmuq
 2014-03-13 12:17:37 +05:30
Christophe Simonis d504764eff [MERGE] forward port of branch saas-3 up to revid 9298 chm@openerp.com-20140311130852-3ft0v1mc9ht1any6 
bzr revid: chs@openerp.com-20140311145205-s56fj113fsrnisc3
 2014-03-11 15:52:05 +01:00
Darshan Kalola (OpenERP) 13c55facde [IMP]event-track: implement color code for event and added color in demo data of event_track. 
bzr revid: dka@tinyerp.com-20140311104223-whztnya4fwf8i0c9
 2014-03-11 16:12:23 +05:30
Vidhin Mehta (OpenERP) 346fd24b1d [IMP]Remove global variable. 
bzr revid: vme@tinyerp.com-20140311093753-4y0y8s9ct01hy7y1
 2014-03-11 15:07:53 +05:30
Vidhin Mehta (OpenERP) 40d60c0bde [IMP]Complete algo for timetable. 
bzr revid: vme@tinyerp.com-20140311093058-80ot2az38sg4dc92
 2014-03-11 15:00:58 +05:30
Vidhin Mehta (OpenERP) f9575281f2 [IMP]IMplement alog half.(other part in progress.) 
bzr revid: vme@tinyerp.com-20140311065252-glvmfxhfqfahs5hf
 2014-03-11 12:22:52 +05:30
Darshan Kalola (OpenERP) cda569e361 [IMP]added speakers in event_track demo data and display speaker after event title. 
bzr revid: dka@tinyerp.com-20140307122642-j8dfijlsa2jzl962
 2014-03-07 17:56:42 +05:30
Paramjit Singh Sahota da0fad7958 [IMP] Search box 
bzr revid: psa@tinyerp.com-20140307121007-oa5y7jgjtvcirphz
 2014-03-07 17:40:07 +05:30
Vidhin Mehta (OpenERP) e2cab53a41 [IMP]Improvement in view. 
bzr revid: vme@tinyerp.com-20140307095520-vz30dd8j0nm8kgvm
 2014-03-07 15:25:20 +05:30
Vidhin Mehta (OpenERP) 71503bc1ce [IMP]Improvement in event. 
bzr revid: vme@tinyerp.com-20140307085248-ohtrossx8hbdbi72
 2014-03-07 14:22:48 +05:30
Kersten Jeremy 01028e5260 [IMP] Remove the seconds on event demoo data 
bzr revid: jke@openerp.com-20140228090844-akorvc0ve71x0i4j
 2014-02-28 10:08:44 +01:00
Fabien Pinckaers 100cc571cd [IMP] Event Security Fix + Publish Track 
bzr revid: fp@tinyerp.com-20140227131144-8rq3woldpl1zbppj
 2014-02-27 14:11:44 +01:00