Commit Graph

473 Commits

Author SHA1 Message Date
Josse Colpaert 8b84615de1 [MERGE] Merge from trunk test
bzr revid: jco@openerp.com-20140502130352-c3h1fk332eqyd78b
2014-05-02 15:03:52 +02:00
Richard Mathot (OpenERP) d0e9ba289f [MERGE] from trunk
bzr revid: rim@openerp.com-20140429124452-5cvpmtpyz2daj8w2
2014-04-29 14:44:52 +02:00
Quentin (OpenERP) 7a6b00b651 [MERGE] merged with trunk up to revision 9381
bzr revid: qdp-launchpad@openerp.com-20140425090414-vpg4szws9y4fgznc
2014-04-25 11:04:14 +02:00
Richard Mathot (OpenERP) 71560225a9 [MERGE] from trunk
bzr revid: rim@openerp.com-20140422093002-5mset34e3o1jkadr
2014-04-22 11:30:02 +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
Darshan Kalola (OpenERP) cccc7a3d0c [MERGE]sync with trunk.
bzr revid: dka@tinyerp.com-20140417132329-sd2skyprb3nt88uw
2014-04-17 18:53:29 +05:30
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
Rakesh Sindhav (OpenERP) f081a5e441 [IMP]account,purchse,warehouse,sale: view improvement in addons modules
bzr revid: rsi@tinyerp.com-20140411131842-9zppvrs2szqa4o47
2014-04-11 18:48:42 +05:30
Quentin (OpenERP) 2006e8d6be [MERGE] _compute_planned_workcenter passes wrong magic value for absent calendar_id. Courtesy of Holger Brunn (Therp)
lp bug: https://launchpad.net/bugs/1297352 fixed

bzr revid: qdp-launchpad@openerp.com-20140403093833-923ly0uz860gd3i2
2014-04-03 11:38:33 +02: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
Holger Brunn 266b553aa8 [FIX] pass correct magic value for resource
[FIX] typo

lp bug: https://launchpad.net/bugs/1297352 fixed

bzr revid: hbrunn@therp.nl-20140325151047-6sd0irzu4e85i5ru
2014-03-25 16:10:47 +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
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
Xavier Morel 642b3a167d [FIX] resource: py26 compat'
bzr revid: xmo@openerp.com-20140128175640-gmeecmwhevhg3oek
2014-01-28 18:56:40 +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
Thibault Delavallée 339c2ecc54 [IMP] default_interval also in schedule_hours, allowing to
schedule some work with a default calendar, like previous version
of resource module.

bzr revid: tde@openerp.com-20140122142805-8zyntmkx72l10fbq
2014-01-22 15:28:05 +01:00
Thibault Delavallée 2f275894f3 [CLEAN] resource: removed some TDE NOTE
bzr revid: tde@openerp.com-20140122134700-0iwb4uhg8jjdjzxn
2014-01-22 14:47:00 +01:00
Thibault Delavallée 6df94832bd [CLEAN] resource: some cleaning in docstrings
bzr revid: tde@openerp.com-20140122134609-7fvd1p49r8e40zoa
2014-01-22 14:46:09 +01:00
Thibault Delavallée 9fbbba1ee0 [IMP] resource : some docstrings cleaning + void calendar
taken into account in days scheduling + finished yesys

bzr revid: tde@openerp.com-20140122132918-4c1ag6y5gqasi32d
2014-01-22 14:29:18 +01:00
Thibault Delavallée f92f824b30 [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20140110124928-jz1ie9qyh6n99fi7
2014-01-10 13:49:28 +01:00
Launchpad Translations on behalf of openerp 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
Thibault Delavallée 03d7a17880 [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20131210093307-gxn4g59xba3l82zx
2013-12-10 10:33:07 +01: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
Olivier Dony 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
Launchpad Translations on behalf of openerp eaa917bef9 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131120054418-15be15rhz84vk0et
2013-11-20 05:44:18 +00:00
Denis Ledoux 70d8172d32 [FIX]resource: interval_get_multi crashed when the interval of hours was greater than 24, because it was using datetime parameters instead of using timedelta to create a datetime in the future/past
bzr revid: dle@openerp.com-20131114175244-iudygbtpbppuxbds
2013-11-14 18:52:44 +01: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 9d4c7f4db9 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131101062724-823uztz81d48e7zk
bzr revid: launchpad_translations_on_behalf_of_openerp-20131102062340-1guhkeb34orj1d77
bzr revid: launchpad_translations_on_behalf_of_openerp-20131103054341-mg7xr0dkzd2rp6rx
bzr revid: launchpad_translations_on_behalf_of_openerp-20131104060249-fio493wxgjvvlthm
2013-11-04 06:02:49 +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
Launchpad Translations on behalf of openerp e142005a01 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131028052339-0v9n7leiirwlacok
2013-10-28 05:23:39 +00:00
Launchpad Translations on behalf of openerp 566af6033f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131011052941-f4x7ued38x0siu4u
bzr revid: launchpad_translations_on_behalf_of_openerp-20131013053842-x6nja74l8by5vd1q
bzr revid: launchpad_translations_on_behalf_of_openerp-20131014053313-j22u5qen55na9js8
2013-10-14 05:33:13 +00:00
Antony Lesuisse 9757c08872 use referencable models instead of _get_links
bzr revid: al@openerp.com-20131006115808-etkyq34ar1pqh2pb
2013-10-06 13:58:08 +02:00
Launchpad Translations on behalf of openerp c7471d1bff Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130919045624-x71znzpi3rpnvpcs
bzr revid: launchpad_translations_on_behalf_of_openerp-20130920060145-80h8zse3uw3jg2fx
2013-09-20 06:01:45 +00:00
Launchpad Translations on behalf of openerp a46cbb7a31 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130913060803-zltruvkg213vqm57
bzr revid: launchpad_translations_on_behalf_of_openerp-20130915061052-1kts2jol7uvq1n4f
bzr revid: launchpad_translations_on_behalf_of_openerp-20130917051850-e1s8v09muo1atjwh
bzr revid: launchpad_translations_on_behalf_of_openerp-20130917051903-257acdjbxi60zyv8
2013-09-17 05:19:03 +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
Launchpad Translations on behalf of openerp 9dba69ba48 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130912064018-3vecn03jcu9fm1m8
2013-09-12 06:40:18 +00:00
Martin Trigaux 5e051e9484 [FIX] resource: better access rights
bzr revid: mat@openerp.com-20130911142549-cpzg8588ol31b8k1
2013-09-11 16:25:49 +02:00
Martin Trigaux c48504fdba [MERGE] sync with trunk (state -> stage removed some test)
bzr revid: mat@openerp.com-20130911110755-zf3ytf9m27im6x9k
2013-09-11 13:07:55 +02:00
Thibault Delavallée ed0a829cb3 [MERGE] [IMP] addons: improved name and tooltips of groupby date in various addons.
bzr revid: tde@openerp.com-20130904141053-yustqiuzynbettq8
2013-09-04 16:10:53 +02:00
Launchpad Translations on behalf of openerp cb8f9c5a0d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130903054857-i15nhvtthlho7chm
2013-09-03 05:48:57 +00:00
Thibault Delavallée 6e1cb5226b [IMP] hr_contract: added override of base_action_rule (+ dependency) to add the possibility to use a user-related working scheduling.
bzr revid: tde@openerp.com-20130902134200-xvy5hb7lqv2wv0um
2013-09-02 15:42:00 +02:00
Thibault Delavallée 2cdefa52ef [FIX] resource: fixed computation with a False calendar id (spotted in stock_no_autopicking.py yml tests)
bzr revid: tde@openerp.com-20130830144334-ong666lutkbibtrd
2013-08-30 16:43:34 +02:00
Thibault Delavallée 83e0e842c2 [CLEAN] resource: cleaned old API
bzr revid: tde@openerp.com-20130830142736-pd1o12fe40h2vgi2
2013-08-30 16:27:36 +02:00
Thibault Delavallée 53fe285259 [IMP] resource: old API replacement + first implementation of compute_hours, to compute the number of working hours between two dates.
bzr revid: tde@openerp.com-20130830141610-uu1t88atcvpmkjjb
2013-08-30 16:16:10 +02:00
Thibault Delavallée af79a26a1f [IMP] resource: overall fix of hours/days computation + scheduling + added tests
bzr revid: tde@openerp.com-20130830133250-ixehp7imac0duygd
2013-08-30 15:32:50 +02:00
Thibault Delavallée a67459018c [IMP] resource: first refactoring of various methods to calculate timed intervals based on resource.calendar. Added tests.
bzr revid: tde@openerp.com-20130821105109-1rtynzx69hmslxey
2013-08-21 12:51:09 +02:00