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

1011 Commits

Author SHA1 Message Date
Gery Debongnie 5aa2fa150c [MERGE] merge from trunk 
bzr revid: ged@openerp.com-20140502130753-4z24z1to9pkrckvq
 2014-05-02 15:07:53 +02:00
Richard Mathot (OpenERP) 6e8ba284a5 [FIX][REM] hr_timesheet: removed reports mistakenly reintroduced 
bzr revid: rim@openerp.com-20140429141127-hskvdl652ei55ypf
 2014-04-29 16:11:27 +02:00
Darshan Kalola (OpenERP) 2680f382ad [MERGE][REM] Removal of "process" module and its avatars in others modules 
bzr revid: rim@openerp.com-20140429133137-srcttmqxhwo6u295
 2014-04-29 15:31:37 +02:00
Richard Mathot (OpenERP) d0e9ba289f [MERGE] from trunk 
bzr revid: rim@openerp.com-20140429124452-5cvpmtpyz2daj8w2
 2014-04-29 14:44:52 +02:00
Simon Lejeune 49fe785e64 [REM] hr_timesheet: removed xsl/models of user(s) timesheet reports as they are not available since rev 9064 revid:ged@openerp.com-20140127161718-uo6pperke86pqq5v. They are already replaced by graphviews. 
bzr revid: sle@openerp.com-20140425113228-obzblo2nmkmo2q58
 2014-04-25 13:32:28 +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
Darshan Kalola (OpenERP) cccc7a3d0c [MERGE]sync with trunk. 
bzr revid: dka@tinyerp.com-20140417132329-sd2skyprb3nt88uw
 2014-04-17 18:53:29 +05:30
Gery Debongnie f57b767361 [MERGE] merge from trunk 
bzr revid: ged@openerp.com-20140415150146-5ovdjzta58t5dhd2
 2014-04-15 17:01:46 +02:00
Richard Mathot (OpenERP) 028b093102 [MERGE] from trunk 
bzr revid: rim@openerp.com-20140414115604-x1a32wfbxwkn3yhp
 2014-04-14 13:56:04 +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
Gery Debongnie 2e9ee9c76e [MERGE] merge from rma branch 
bzr revid: ged@openerp.com-20140410145131-fj17mdpi13wa5a9m
 2014-04-10 16:51:31 +02:00
Denis Ledoux 2695cacea4 [FIX] account_analytic_analysis, analytic, hr_timesheet: do not override existing data of analytic account on template on_change 
bzr revid: dle@openerp.com-20140401123657-ozh4ycx36jojpg51
 2014-04-01 14:36:57 +02:00
Chirag Dodiya (OpenERP) 2fd348f3e0 [MRG]Merge with lp:openobject-addons 
bzr revid: cod@tinyerp.com-20140331090810-5qxnrmz9gd4il41f
 2014-03-31 14:38:10 +05:30
Randhir Mayatra rma-openerp 77ff3a69b8 [IMP] improve icons and views 
bzr revid: rma@tinyerp.com-20140328133051-2amm63n2vy3bj3xe
 2014-03-28 19:00:51 +05:30
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
Randhir Mayatra rma-openerp 96ea9392aa [IMP] convert button into stat button for products 
bzr revid: rma@tinyerp.com-20140324135621-13t191kmnn6t22jk
 2014-03-24 19:26:21 +05:30
Chirag Dodiya (OpenERP) 472ca8aad8 [IMP]Set use_timesheets field default true and improved typo 
bzr revid: cod@tinyerp.com-20140319121548-qlsnp01v8mop5p92
 2014-03-19 17:45:48 +05:30
Chirag Dodiya (OpenERP) 5031dcc1fb [MRG]Merge with lp:openobject-addons 
bzr revid: cod@tinyerp.com-20140310101855-sgdq58rrzsyt4n13
 2014-03-10 15:48:55 +05:30
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
Chirag Dodiya (OpenERP) 47fa47e23b [MRG]Merge with trunk 
bzr revid: cod@tinyerp.com-20140225072331-xzbo2aedsk2te98n
 2014-02-25 12:53:31 +05:30
Darshan Kalola (OpenERP) b3c6e20e36 [MERGE]sync with trunk and resolve conflicts. 
bzr revid: dka@tinyerp.com-20140210084803-rjkt9e4rhni8nhlt
 2014-02-10 14:18:03 +05:30
Antony Lesuisse 033c38c304 [MERGE] trunk 
bzr revid: al@openerp.com-20140129021916-ckb3rplmcpjbqel3
 2014-01-29 03:19:16 +01:00
Olivier Dony 39c27c72d0 [MERGE] Sync with trunk rev. 9064 rev-id ged@openerp.com-20140127161718-uo6pperke86pqq5v 
bzr revid: odo@openerp.com-20140128175835-jannyh3cv3gi1sxn
 2014-01-28 18:58:35 +01:00
Chirag Dodiya (OpenERP) c02a8addb0 [MRG]Merge with lp:openobject-addons 
bzr revid: cod@tinyerp.com-20140128065314-c6r9mqtkoakpe2ke
 2014-01-28 12:23:14 +05:30
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
Gery Debongnie cdde84f821 [FIX] remove the yml tests hr_timesheet_report (it should have been removed when I removed the Employee(s) timesheet reports from the reporting menu) (addon hr_timesheet) 
bzr revid: ged@openerp.com-20140127140430-49i2dqyq67qc19qm
 2014-01-27 15:04:30 +01:00
Gery Debongnie a584ba9ed2 [IMP] removes 'Employee Timesheet' and 'Employees Timesheet' reports in HR reporting (addon hr_timesheet) 
bzr revid: ged@openerp.com-20140127132020-qhxgkygxx38vecab
 2014-01-27 14:20:20 +01:00
Christophe Matthieu cd12832f9e [IMP] product: Service (product.product_product_consultant) is sale_ok=False by default and overwrite in hr_timesheet to True 
bzr revid: chm@openerp.com-20140115152526-dptyljv7yxdkmis0
 2014-01-15 16:25:26 +01:00
Chirag Dodiya (OpenERP) 7db3c7aaac [REM]Removed use_timesheets field from defaults 
bzr revid: cod@tinyerp.com-20131223115619-oimjlyrimgbaa7ie
 2013-12-23 17:26:19 +05:30
Chirag Dodiya (OpenERP) 03176d176b [IMP]Improved code to set use_timesheets default true and added action for menu Timesheets Accounts 
bzr revid: cod@tinyerp.com-20131223100035-us5sljbq2iyq9shs
 2013-12-23 15:30:35 +05:30
Thibault Delavallée 1aa92dbc46 [FORWARD] Forward port of saas-2 fixes until revision 9058 (revid tde@openerp.com-20131220162158-hbgktly09dv37958) 
bzr revid: tde@openerp.com-20131220165519-2okhclp3qb3if1ey
 2013-12-20 17:55:19 +01:00
Denis Ledoux 1508c5dd00 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9718 rev-id: dle@openerp.com-20131224103535-rhtje7dnq1ie7jtb 
bzr revid: tde@openerp.com-20131220162158-hbgktly09dv37958
bzr revid: dle@openerp.com-20131223155041-8zp8e08fihbr0ie2
bzr revid: dle@openerp.com-20131224112407-aw6dq2q92312kjbk
 2013-12-24 12:24:07 +01:00
Chirag Dodiya (OpenERP) f794a8c7af [IMP]Improved code to set action 
bzr revid: cod@tinyerp.com-20131220111022-hnf8jfwr8h0h74hw
 2013-12-20 16:40:22 +05:30
Chirag Dodiya (OpenERP) 851e3d8d87 [ADD] Added timesheet accounts menu in hr configuration 
bzr revid: cod@tinyerp.com-20131220061935-p0dqxrer1mp3sll4
 2013-12-20 11:49:35 +05:30
Xavier ALT 6df572aae4 [FIX] hr_holidays, hr_timesheet: fix XMLSyntaxError when company name contain an ampersand '&' sign 
bzr revid: xal@openerp.com-20131219135147-jpli369iqlanf3t3
 2013-12-19 14:51:47 +01:00
Launchpad Translations on behalf of openerp 94b4618c13 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20131215054553-py8zfwrk3bir6m1l
bzr revid: launchpad_translations_on_behalf_of_openerp-20131212055820-zh0fqpweezvphdc6
bzr revid: launchpad_translations_on_behalf_of_openerp-20131213064308-hil3cycv38im8qds
bzr revid: launchpad_translations_on_behalf_of_openerp-20131215054616-uyc9y42oetvmq1cs
bzr revid: launchpad_translations_on_behalf_of_openerp-20131216053557-w3gf0jlw5wrtzllr
 2013-12-16 05:35:57 +00:00
Martin Trigaux cca8bb4d64 [FIX] font: revert previous (use name and not familly in reportlab), fix reports using spaces 
bzr revid: mat@openerp.com-20131209133431-6gjhq1zmrb2ro6eo
 2013-12-09 14:34:31 +01:00
Launchpad Translations on behalf of openerp a092227c6e Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20131207063209-2xi8ba5wu6l6ze00
bzr revid: launchpad_translations_on_behalf_of_openerp-20131208054536-mg4w4d6ljq8ji1nj
bzr revid: launchpad_translations_on_behalf_of_openerp-20131207063232-l64v1fhf1qcpxm2l
bzr revid: launchpad_translations_on_behalf_of_openerp-20131208054646-zixed7abpuze4qt1
bzr revid: launchpad_translations_on_behalf_of_openerp-20131123062625-f7inv72rtg2kel8g
bzr revid: launchpad_translations_on_behalf_of_openerp-20131124054801-1ukcpelfukkvwn60
bzr revid: launchpad_translations_on_behalf_of_openerp-20131125060120-nm8tkfbftg8c88v1
bzr revid: launchpad_translations_on_behalf_of_openerp-20131126060753-jnx5ran2accmo0lh
bzr revid: launchpad_translations_on_behalf_of_openerp-20131127054000-wtg675pf33f3bkar
bzr revid: launchpad_translations_on_behalf_of_openerp-20131129053028-abszdj4y76smnacb
bzr revid: launchpad_translations_on_behalf_of_openerp-20131201054555-3u1m1sy1f2og78nn
bzr revid: launchpad_translations_on_behalf_of_openerp-20131202055227-mm70khzdfnp4qcj9
bzr revid: launchpad_translations_on_behalf_of_openerp-20131207063237-vza5vb51xmd2ipl6
bzr revid: launchpad_translations_on_behalf_of_openerp-20131208054653-f4zth8j3iczlzcqz
 2013-12-08 05:46:53 +00:00
Christophe Simonis bb1e256f5b [MERGE] forward port of branch saas-2 up to revid 9010 dle@openerp.com-20131125143003-vjtzj1c5051pdnk3 
bzr revid: chs@openerp.com-20131125150054-b135qshkx6icakgk
 2013-11-25 16:00:54 +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
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 40c309024c Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20131026062529-74ir3upguunr9mw3
bzr revid: launchpad_translations_on_behalf_of_openerp-20131027061317-d9s440jzv1juvswi
bzr revid: launchpad_translations_on_behalf_of_openerp-20131028054233-15znliqv2eh2jq0i
bzr revid: launchpad_translations_on_behalf_of_openerp-20131029051429-rcytejyrg2s4t9db
bzr revid: launchpad_translations_on_behalf_of_openerp-20131030055438-gp0hyend0jooi941
 2013-10-30 05:54:38 +00:00
Darshan Kalola (OpenERP) 960924195e [MERGE]merged with main addons 
bzr revid: dka@tinyerp.com-20131030052926-i9c25mf6wpseioh3
 2013-10-30 10:59:26 +05:30
Denis Ledoux 108eea6524 [MERGE] Forward-port of latest saas-1 bugfixes, up to rev. 8797 rev-id: dle@openerp.com-20131028202715-uinjafcgpnw1nucx 
bzr revid: mat@openerp.com-20131028163349-hr0ul2uf18fcvg4b
bzr revid: dle@openerp.com-20131028202944-eddqtgtikjq93nil
 2013-10-28 21:29:44 +01:00
Martin Trigaux d5211929b8 [MERGE] forward port of 7.0 until revision 9546 (launchpad_translations_on_behalf_of_openerp-20131028054233-15znliqv2eh2jq0i) 
bzr revid: mat@openerp.com-20131028161227-rpv6d0unjmg12jgk
 2013-10-28 17:12:27 +01:00
Martin Trigaux ffc27c288f [FIX] hr_timesheet: cost and revenues of parent analytic accounts aggregate from child analytic accounts 
bzr revid: mat@openerp.com-20131021160326-62hpxyypgu70v6w2
 2013-10-21 18:03:26 +02:00
Raphael Collet 8c32ff49e9 [FIX] hr_timesheet: missing positional argument in call to default_get() 
bzr revid: rco@openerp.com-20131008112422-ebgj08a4emmhjghp
 2013-10-08 13:24:22 +02:00
Martin Trigaux 11308f37dd [FIX] test: avoid getting error when trying to send an email to the newly created user (email replaced by login) 
bzr revid: mat@openerp.com-20131003143234-8tu732aa4rmycoif
 2013-10-03 16:32:34 +02:00
Launchpad Translations on behalf of openerp 23620b2e54 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20130925054843-vx0nogr2rpf5amw4
bzr revid: launchpad_translations_on_behalf_of_openerp-20130926055416-ubjv2v9mogsb49f3
bzr revid: launchpad_translations_on_behalf_of_openerp-20130927061626-2rcumswg0tc4e10e
bzr revid: launchpad_translations_on_behalf_of_openerp-20130926055451-072mn28h3ew4cwfp
bzr revid: launchpad_translations_on_behalf_of_openerp-20130927061658-4svrcqcw04av1e5w
 2013-09-27 06:16:58 +00:00
Martin Trigaux ab7d8c4ccf [MERGE] refactoring of tests to be executed as normal users instead of administrator, fixed some security rules 
bzr revid: mat@openerp.com-20130912085812-xvmjoa5fjis0l2ws
 2013-09-12 10:58:12 +02:00