77581e2a06
[MERGE]sync with trunk
...
bzr revid: sgo@tinyerp.com-20140210052655-efiwytz5kllk7irx
2014-02-10 10:56:55 +05:30
4b30f1fcbd
[MERGE] trunk-website-al
...
bzr revid: al@openerp.com-20140131005157-jkf8hz6fh2buml2c
2014-01-31 01:51:57 +01:00
9cdcf812a6
[MERGE] merge from trunk into local branch
...
bzr revid: ged@openerp.com-20140130135251-ahk515cy0wc87kyr
2014-01-30 14:52:51 +01:00
906f28109c
[IMP] improves the task analysis reporting view by adding measures to the pivot table (num paid) and changes the view in dashboard project (addon project)
...
bzr revid: ged@openerp.com-20140129152440-ibi9ity10onbi3st
2014-01-29 16:24:40 +01:00
033c38c304
[MERGE] trunk
...
bzr revid: al@openerp.com-20140129021916-ckb3rplmcpjbqel3
2014-01-29 03:19:16 +01:00
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
3ce5e01eca
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140128064139-6fjg3b236v5d790j
2014-01-28 06:41:39 +00:00
00c6d55ac9
[MERGE] merge trunk into local branch
...
bzr revid: ged@openerp.com-20140116144326-8kwqab71zp8s7a8e
2014-01-16 15:43:26 +01:00
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
91aaaec0a5
[MERGE] forward port of branch saas-2 up to revid 9092 dle@openerp.com-20140115165506-yuux9km39gbv7k4n
...
bzr revid: chs@openerp.com-20140115214454-dhl8xzr429co0j5d
2014-01-15 22:44:54 +01:00
be0da788f6
[MERGE] merge trunk into local branch
...
bzr revid: ged@openerp.com-20140113110402-t4hmjl1vdqt91qx6
bzr revid: ged@openerp.com-20140113142408-12i6pqw1cbdqhqg2
2014-01-13 15:24:08 +01:00
9a93675d2d
[FIX] project: projects_ids default value must be an array or none, not a lonely integer
...
bzr revid: dle@openerp.com-20140113113015-fobrv940bjhw1g7z
2014-01-13 12:30:15 +01:00
fb6f7b406d
[IMP] project: remove duplicated field complete_name (already present in account.analytic.account)
...
bzr revid: mat@openerp.com-20140113103245-md9rl0hsym79abdq
2014-01-13 11:32:45 +01:00
0c24b69db2
[MERGE] merge from trunk
...
bzr revid: ged@openerp.com-20140113081030-74nfutdr5le70dz4
2014-01-13 09:10:30 +01:00
05aab83eb1
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9743 revid:qdp-launchpad@openerp.com-20140108160719-9i8xhrat49cn9l5e
...
bzr revid: chs@openerp.com-20140107141524-xzz39a2ym66swr0t
bzr revid: chs@openerp.com-20140107172248-zic9mqg0rigy2czb
bzr revid: chs@openerp.com-20140108160418-ph17jgy5hlejj9hr
bzr revid: dle@openerp.com-20140108171400-8r0fwv3wi36w2im0
2014-01-08 18:14:00 +01:00
5237d95f16
[ADD] project: add change_default parameter on project_id field of project.task. This allows to set default values depending on project through ir.values.
...
bzr revid: mat@openerp.com-20140107171346-nd1a2esmdaqj9xip
2014-01-07 18:13:46 +01:00
56dc173361
[FIX] _auto_init: return a value to _auto_init calls. Backport of trunk revision 8679
...
bzr revid: mat@openerp.com-20140107145142-zm48pcjvqp42cfjg
2014-01-07 15:51:42 +01:00
49c0b7a820
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20140106135700-rt0g44w5xmpbtxiu
2014-01-06 14:57:00 +01:00
dabb11ab88
[FIX] migrate_to_alias() of mail.alias didn't care about result value of _auto_init
...
bzr revid: cto@openerp.com-20140106133600-o7a2p3pr1zlvjezb
2014-01-06 14:36:00 +01:00
e0951d6e18
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131227053952-0hms21l5679mfv9d
bzr revid: launchpad_translations_on_behalf_of_openerp-20131228053802-9q255pplfsr06jvf
bzr revid: launchpad_translations_on_behalf_of_openerp-20131230050715-gywiu51n8ejcvnkp
bzr revid: launchpad_translations_on_behalf_of_openerp-20131231052701-yjrbqgyv2os2z8gt
bzr revid: launchpad_translations_on_behalf_of_openerp-20140101054400-7tz7obdh31v8log8
bzr revid: launchpad_translations_on_behalf_of_openerp-20140102054530-gtwf0yp277zkqm0i
2014-01-02 05:45:30 +00:00
892e54111b
[IMP] removes old tree view in reporting and replaces it by the new graph view in pivot mode by default (addon project)
...
bzr revid: ged@openerp.com-20131231145325-9rb3td76i454ptlx
2013-12-31 15:53:25 +01:00
67e479e96e
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131225060225-zss93rqqqz3holkp
bzr revid: launchpad_translations_on_behalf_of_openerp-20131226060540-odnnltlm0bobiqp9
bzr revid: launchpad_translations_on_behalf_of_openerp-20131227052235-xq201ghozcgucfuq
bzr revid: launchpad_translations_on_behalf_of_openerp-20131228051943-jo247cfuiyx4w767
bzr revid: launchpad_translations_on_behalf_of_openerp-20131230043947-d1jcf2vpf9go93ec
bzr revid: launchpad_translations_on_behalf_of_openerp-20131231044745-8v24a0fydnvde3js
2013-12-31 04:47:45 +00:00
bdcb7fcc17
[MERGE] merge from trunk
...
bzr revid: ged@openerp.com-20131227152252-5kz11jpespxg1h5w
bzr revid: ged@openerp.com-20131230090844-9vugoov6jsc6z5j0
2013-12-30 10:08:44 +01:00
9dfb5de2f8
[MERGE] merge from trunk
...
bzr revid: ged@openerp.com-20131224112327-r1evm1pcw2gpn8dh
bzr revid: ged@openerp.com-20131226132625-33fgmyb0fbu0c9ia
2013-12-26 14:26:25 +01:00
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
e6c2dd738b
[IMP] changes the xml description of the graphs to use the new graph view (and to make sure the result is as close as possible) (addon project)
...
bzr revid: ged@openerp.com-20131224102922-g7nbwftaktd4g2v4
2013-12-24 11:29:22 +01:00
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
73dfa69e34
[FIX] project: fix task progress not correctly updated when reopening a task
...
bzr revid: xal@openerp.com-20131220091823-o9uvvlo6hdh4xukw
2013-12-20 10:18:23 +01:00
3f7f02d508
[FIX] project: fix error on ``schedule_tasks`` when there is no resource available on project
...
bzr revid: xal@openerp.com-20131219154546-xlbgqfkc34ndf8kp
2013-12-19 16:45:46 +01:00
751eb333bc
[MERGE] [FIX] mail: fixed group button position that was too much dependent of the group description length
...
[IMP] project: removed unnecessary code in project to try to be able to move kanban records in a folded column (was not working + generic solution coming)
bzr revid: tde@openerp.com-20131219135206-nv8i13wjugix84r3
2013-12-19 14:52:06 +01:00
ef8322273e
[FIX] [TESTS] project, hr_holidays and portal-related modules: fixed tests, because the raised errors have been updated
...
bzr revid: tde@openerp.com-20131206125751-lx5ki1nz10pdo63r
2013-12-06 13:57:51 +01:00
fd2821086f
[MERGE] sync with trunk
...
bzr revid: chm@openerp.com-20131202150925-eqsi0uu0fqtwimhj
2013-12-02 16:09:25 +01:00
1fedbc18f5
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131126060718-7io3n16co82qp5pu
bzr revid: launchpad_translations_on_behalf_of_openerp-20131127053913-ypnlpggd4wt58pzx
bzr revid: launchpad_translations_on_behalf_of_openerp-20131128060603-kk12b8iu0uhhtist
bzr revid: launchpad_translations_on_behalf_of_openerp-20131129052938-u0wq863etr3sl1cm
bzr revid: launchpad_translations_on_behalf_of_openerp-20131129053023-zlbrprsiq9e7vs39
2013-11-29 05:30:23 +00:00
f0bf946b12
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20131129094610-qlrd1h502szo0b61
2013-11-29 10:46:10 +01:00
0521d1aab3
[MERGE] forward port of branch saas-2 up to revid 9017 chs@openerp.com-20131127110552-3u2nxwu01gxj9i7m
...
bzr revid: chs@openerp.com-20131127111208-iclt7a9ib7oucumh
2013-11-27 12:12:08 +01:00
a8beece158
[IMP] [REV] crm, addons: still stage/state tweaking
...
- crm: Mark Won / Lost buttons are back
- crm: now using the new 'fold_field' option to fold some stages on the fold
field of stages. Back to saas-1 bebavhior.
- project, project_issue: task and issue also use the fold_field option.
- project: fixed 'X Tasks' display on the project vignette: now always displaying
'X Tasks at plural form to simplify the view.
bzr revid: tde@openerp.com-20131127095300-9onzlt5pl9u82zt6
2013-11-27 10:53:00 +01:00
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
000c38816d
[MERGE] [IMP] Addons: updated some field labels to avoid duplicates to ease
...
the import / export process
Aso includes
- project: deprecated priority field: use sequence instead
- base_calendar: calendar.event: deprecated organizer field: use organize_id instead
bzr revid: tde@openerp.com-20131125093741-hx9hpj85xqfalvqw
2013-11-25 10:37:41 +01:00
5f21b4bff9
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131123062620-6obt60lwob64hi98
bzr revid: launchpad_translations_on_behalf_of_openerp-20131124054757-4w9nik6wieeqf0yg
bzr revid: launchpad_translations_on_behalf_of_openerp-20131125060111-rf445xxiinvazinv
2013-11-25 06:01:11 +00:00
f7255290b9
[FIX] project: task type does not have a `closed` field
...
bzr revid: chs@openerp.com-20131124200937-0hwd527qxuaezic5
2013-11-24 21:09:37 +01:00
0244543c71
[MERGE] forward port of branch 7.0 up to revid 9636 mat@openerp.com-20131122165504-tmbg0ixhqed4kdkz
...
bzr revid: chs@openerp.com-20131122193122-wpdfsfn24ezj1qrp
2013-11-22 20:31:22 +01:00
3a7c74ca31
[FIX] project: convert int to list for iteration write of account.analytic.account
...
bzr revid: mat@openerp.com-20131122165504-tmbg0ixhqed4kdkz
2013-11-22 17:55:04 +01:00
2cba6a5355
[MERGE] Forward-port of latest 7.0 fixes up to rev 9629 rev-id odo@openerp.com-20131121153230-keie85rmes2zh2o8
...
bzr revid: chs@openerp.com-20131121112139-aw2ara1i1xymue62
bzr revid: odo@openerp.com-20131121154205-ul9hf9tz3h0x2n7m
2013-11-21 16:42:05 +01:00
b1f8f3dfd2
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131122060235-8k2oxuc94x45jjoc
bzr revid: launchpad_translations_on_behalf_of_openerp-20131122060308-lb2sgcxbv804pafr
bzr revid: launchpad_translations_on_behalf_of_openerp-20131116062541-ouuae0dl331ekjcb
bzr revid: launchpad_translations_on_behalf_of_openerp-20131117054520-eypowk6g8qatvq7n
bzr revid: launchpad_translations_on_behalf_of_openerp-20131120054421-95x86930ezm0p33h
bzr revid: launchpad_translations_on_behalf_of_openerp-20131121063904-5igv5f7tgwlaipvv
bzr revid: launchpad_translations_on_behalf_of_openerp-20131122060313-x4c5bx498gyrkhqr
2013-11-22 06:03:13 +00:00
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
a85442d6db
[FIX] fleet,project allow demo user to create cars and projects
...
bzr revid: al@openerp.com-20131120165314-btwzd5b0yvqcg2gc
2013-11-20 17:53:14 +01:00
bbe50b786a
[MERGE] [FIX] project: add noupdate on data to avoid erasing changes on stages, exclude mail.message.subtypes (want overwrite), courtesy of Alex Comba (Agile BG)
...
lp bug: https://launchpad.net/bugs/1172149 fixed
bzr revid: mat@openerp.com-20131120151439-96l2z98tebj46fzs
2013-11-20 16:14:39 +01:00
44664076da
[MERGE] Forward-port of latest 7.0 fixes up to rev 9618 rev-id: dle@openerp.com-20131120142131-s333lyva85cyn41o
...
bzr revid: odo@openerp.com-20131120144059-yyh7emvgdarff09b
bzr revid: odo@openerp.com-20131120144318-11nmn1zj00zmi10z
2013-11-20 15:43:18 +01:00
eaa917bef9
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131120054418-15be15rhz84vk0et
2013-11-20 05:44:18 +00:00
2160342cea
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131116062538-hsi3j63m1pw01qem
bzr revid: launchpad_translations_on_behalf_of_openerp-20131117054515-0jw3bd84wk546u6j
bzr revid: launchpad_translations_on_behalf_of_openerp-20131118055319-wz4qa3cxwowlonxt
2013-11-18 05:53:19 +00:00
Sanjay Gohel (OpenERP)
Antony Lesuisse
Gery Debongnie
Olivier Dony
Launchpad Translations on behalf of openerp
Thibault Delavallée
Christophe Simonis
Denis Ledoux
Martin Trigaux
Cecile Tonglet
Xavier ALT
Christophe Matthieu