Commit Graph
1458 Commits
Author SHA1 Message Date
uco (OpenERP) 1a1977fa18 [MERGE]: Merged with team1.
bzr revid: uco@tinyerp.com-20101116091931-cs4fnjlh08jobmio
2010-11-16 14:49:31 +05:30
ssi 80cd5613d4 Merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons1
bzr revid: ssi@tinyerp.com-20101116091753-e1mvo6kmv4kf9ner
2010-11-16 14:47:53 +05:30
uco (OpenERP) a559f596a3 [FIX] project: Progressbar on project changes if task work is entered.
lp bug: https://launchpad.net/bugs/655034 fixed

bzr revid: uco@tinyerp.com-20101116091447-eec67eaajm5affl5
2010-11-16 14:44:47 +05:30
Launchpad Translations on behalf of openerp 9ce4c19ddb Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20101113045543-gq76fkq68gr8ztn4
bzr revid: launchpad_translations_on_behalf_of_openerp-20101114050617-nexh3bn94sursrgz
bzr revid: launchpad_translations_on_behalf_of_openerp-20101115050022-k7zlh9jzqc8beyz4
bzr revid: launchpad_translations_on_behalf_of_openerp-20101116050554-aaipk5pslwtpiv7i
bzr revid: launchpad_translations_on_behalf_of_openerp-20101116050822-70xxlgdqeenfg117
2010-11-16 05:08:22 +00:00
uco (OpenERP) 4eaac76fc2 [MERGE]: Merged with team1.
bzr revid: uco@tinyerp.com-20101115133424-pjjzj3oirwod37vv
2010-11-15 19:04:24 +05:30
ssi 770f580b9e [FIX]project: useability changes.
bzr revid: ssi@tinyerp.com-20101115115239-7wmjjkna5mbrpr22
2010-11-15 17:22:39 +05:30
sbh (Open ERP) f9755f3c0e [Fix] project,resource,subscription: Fix wrong helptext for field active
bzr revid: sbh@tinyerp.com-20101115111222-x6hb9v8o17z2q8ez
2010-11-15 16:42:22 +05:30
aag (OpenERP) 58c93f841a [MERGE]: Merge with lp:openobject-trunk-dev-addons2
bzr revid: aag@tinyerp.co.in-20101115072327-t05wyy17bnnsuy45
2010-11-15 12:53:27 +05:30
rpa (Open ERP) af3c12649e [MERGE]: Merge with lp:openobject-addons
bzr revid: rpa@tinyerp.com-20101115062357-ergodyxlts4o8sek
2010-11-15 11:53:57 +05:30
Launchpad Translations on behalf of openerp 119e7a11d2 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20101115050315-qaclmic5ub5vtdnr
2010-11-15 05:03:15 +00:00
Harry (OpenERP) 764b9f251e [FIX] correct regression on intalling module without demo data
bzr revid: hmo@tinyerp.com-20101114134821-7djwpr6nmmxu584q
2010-11-14 19:18:21 +05:30
qdp-launchpad@tinyerp.com dd856bd4fd [MERGE] merged the report team branch
bzr revid: qdp-launchpad@tinyerp.com-20101112165802-wnhaqyjpmesh01d6
2010-11-12 17:58:02 +01:00
aag (OpenERP) e6edbe3f9d [MERGE]: Merge with lp:openobject-trunk-dev-addons2
bzr revid: aag@tinyerp.co.in-20101112062248-7lou4kg8f6fazw1f
2010-11-12 11:52:48 +05:30
aag (OpenERP) eeaa68471d [IMP] IN ALL: the demo user should be in all applications name user groups, Task id: 1771
bzr revid: aag@tinyerp.co.in-20101111131855-v07piwfyp33wlmng
2010-11-11 18:48:55 +05:30
uco (OpenERP) eb8bd6581d [MERGE]: Merged with team1.
bzr revid: uco@tinyerp.com-20101111095129-n18vjv3zxgmy0stg
2010-11-11 15:21:29 +05:30
Jni (Open ERP) 259c64c463 [MERGE]
bzr revid: jni@tinyerp.com-20101111072715-74x5d496en1pmso2
2010-11-11 12:57:15 +05:30
rpa (Open ERP) 6de3dcb878 [MERGE]: Merge with lp:openobject-addons
bzr revid: rpa@tinyerp.com-20101111051634-iy69y3q2sucboa46
2010-11-11 10:46:34 +05:30
sbh (Open ERP) e5b7eec612 [MERGE] Merge with lp:openobject-addons
bzr revid: sbh@tinyerp.com-20101111045944-0hm1yxx00x4syiw0
2010-11-11 10:29:44 +05:30
Launchpad Translations on behalf of openerp 9e785c2625 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20101111044701-gp2brdtzag98kxg6
2010-11-11 04:47:01 +00:00
uco (OpenERP) cef1f427ea [MERGE]: Merged with team1.
bzr revid: uco@tinyerp.com-20101110124727-2zx4l0pfg5s4wi6h
2010-11-10 18:17:27 +05:30
Thibault Francois d516bc0ea1 [MERGE] with trunk
bzr revid: tfr@openerp.com-20101110120902-k60lls4irx842pq2
2010-11-10 13:09:02 +01:00
uco (OpenERP) bdb8814237 [FIX] project: Fixed encoding error on task name in Delegate wizard.
lp bug: https://launchpad.net/bugs/670914 fixed

bzr revid: uco@tinyerp.com-20101110115959-nd8h9v8910hr3jvc
2010-11-10 17:29:59 +05:30
rpa (Open ERP) 4bfcb0809d [MERGE]: Merge with lp:openobject-addons
bzr revid: rpa@tinyerp.com-20101110054241-k1sikqoplpmuzxrz
2010-11-10 11:12:41 +05:30
apa-tiny 7409cb2151 merged from trunk
bzr revid: apa@tinyerp.com-20101110052647-w30yvklo6323xkz0
2010-11-10 10:56:47 +05:30
Launchpad Translations on behalf of openerp 94143c9715 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20101110050221-quig15hg09hn12wr
bzr revid: launchpad_translations_on_behalf_of_openerp-20101110050350-1ucvpkibprfbqlgr
2010-11-10 05:03:50 +00:00
rpa (Open ERP) a9305f9ccc [MERGE]: Merge with lp:openobject-addons
bzr revid: rpa@tinyerp.com-20101104125329-4c38n4uczfpxaq7c
2010-11-04 18:23:29 +05:30
atp (Open ERP) 9738cf9d8d [IMP]: Changed date format in demo data and add more planning lines in project_planning module.
bzr revid: atp@tinyerp.co.in-20101104095612-0m2v38vzs8o2mxyd
2010-11-04 15:26:12 +05:30
apa-tiny ff9527cbdc merged from trunk
bzr revid: apa@tinyerp.com-20101104044014-e56x5lsidf3s52j8
2010-11-04 10:10:14 +05:30
Thibault Francois 241624f22f [MERGE] from trunk
bzr revid: tfr@openerp.com-20101103151850-ew8yljv698wf4v6z
2010-11-03 16:18:50 +01:00
Harry (OpenERP) 75668855e7 [FIX] project: project_id is not passed in context so removed it from context of Task action
bzr revid: hmo@tinyerp.com-20101103095538-em2m2vs8mu8dcrzg
2010-11-03 15:25:38 +05:30
Launchpad Translations on behalf of openerp 8c073c3c98 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20101103045904-bp74yxj1qhrx37q7
bzr revid: launchpad_translations_on_behalf_of_openerp-20101103050114-xf1zmv7buebcxyez
2010-11-03 05:01:14 +00:00
uco (OpenERP) 0f4d932dda [FIX] project: Fixed default date value computed at server startup.
lp bug: https://launchpad.net/bugs/624509 fixed

bzr revid: uco@tinyerp.com-20101102112909-z03so3ydx0fr1t9d
2010-11-02 16:59:09 +05:30
uco (OpenERP) f7f51a9497 [ADD] Task ID-1720: The demo user should be in all '<application's name> user' groups.
bzr revid: uco@tinyerp.com-20101102095327-77v9g35gjosrc5ky
2010-11-02 15:23:27 +05:30
Jni (Open ERP) e9046c9af0 [MERGE]
bzr revid: jni@tinyerp.com-20101102062756-9bqdd7y6byelwy63
2010-11-02 11:57:56 +05:30
Launchpad Translations on behalf of openerp b09e253870 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20101030055500-cfnudo9jdc2xdc67
bzr revid: launchpad_translations_on_behalf_of_openerp-20101031050524-lkw0mrbsz97myy0j
bzr revid: launchpad_translations_on_behalf_of_openerp-20101101051147-bsyo3gv9dgg7dv0c
bzr revid: launchpad_translations_on_behalf_of_openerp-20101102045123-ik9e4974excrv3ng
2010-11-02 04:51:23 +00:00
apa-tiny f113cdbe4f [MERGE]
bzr revid: jni@tinyerp.com-20101029092806-lk6sui10brnadmfv
bzr revid: apa@tinyerp.com-20101101063154-92pnyctoc5cnhb6q
2010-11-01 12:01:54 +05:30
rpa (Open ERP) aacf0a1dfe [MERGE]: Merge with lp:openobject-addons
bzr revid: rpa@tinyerp.com-20101101055003-icatoauxn5q3sqf4
2010-11-01 11:20:03 +05:30
AMP (OpenERP) 35cc3bab71 [Merge]
bzr revid: amp@tinyerp.com-20101029052201-gtce4w3gh8wwx3ke
2010-10-29 10:52:01 +05:30
apa-tiny 4e7fbfec59 [MERGE]
bzr revid: apa@tinyerp.com-20101028114513-r0zu13b6fwgsfq4o
2010-10-28 17:15:13 +05:30
Harry (OpenERP) 54f46060dc [MERGE]
bzr revid: hmo@tinyerp.com-20101028114019-5qkatqamaxhx6k0u
2010-10-28 17:10:19 +05:30
Harry (OpenERP) 214fddfc4c [MERGE]
bzr revid: hmo@tinyerp.com-20101028113641-vhuqs53ocp930zi5
2010-10-28 17:06:41 +05:30
olt@tinyerp.com 2234f40038 [FIX] project: typo: 'Alien' -> 'Aline'
bzr revid: olt@tinyerp.com-20101028111937-bwn6z1r0yv5mnj6t
2010-10-28 13:19:37 +02:00
Jni (Open ERP) 34d8146b35 [MERGE]
bzr revid: jni@tinyerp.com-20101028051145-cxcg0knjtx4991q9
2010-10-28 10:41:45 +05:30
AMP (OpenERP) 586983c2dd [Merge]
bzr revid: amp@tinyerp.com-20101028050135-pdagi7051m2hakgx
2010-10-28 10:31:35 +05:30
Harry (OpenERP) a91878d868 [FIX] project: fixed yml issue
bzr revid: hmo@tinyerp.com-20101027113715-b6973r91ravjljjg
2010-10-27 17:07:15 +05:30
Harry (OpenERP) e42ec27394 [MERGE] merged from openobject-addons branch
bzr revid: hmo@tinyerp.com-20101027055119-nbquo0yywszt6ts1
2010-10-27 11:21:19 +05:30
Vir (Open ERP) 804b40ad23 [Merge]
bzr revid: vir@tinyerp.com-20101027050557-fa9dmeooh5se7udy
2010-10-27 10:35:57 +05:30
Jni (Open ERP) 434bb71009 [REM]:Removed Conflicts
bzr revid: jni@tinyerp.com-20101026130932-t9g2jcxdg3hchliz
2010-10-26 18:39:32 +05:30
Harry (OpenERP) b9eb67c65b [MERGE]
bzr revid: hmo@tinyerp.com-20101026115037-elfqoej32fnteh12
2010-10-26 17:20:37 +05:30
Jay (OpenERP) f47cd9f6c5 [MERGE] Merged Addons fixes branch
bzr revid: jvo@tinyerp.com-20101026113257-5vu05j7n3r5w0gai
2010-10-26 17:02:57 +05:30