Commit Graph
1198 Commits
Author SHA1 Message Date
Sbh (OpenERP) 6b8317f704 [MERGE] Merge crm and project improvement
bzr revid: sbh@tinyerp.com-20101223081458-kcbi2ul623hxr31y
2010-12-23 13:44:58 +05:30
Sbh (OpenERP) 7c46db34b0 [IMP] project: Add the column in task list view
bzr revid: sbh@tinyerp.com-20101223061902-o3o2inzyd954c3n4
2010-12-23 11:49:02 +05:30
Sbh (OpenERP) 2fd1445f10 [IMP] project: set invisible on task work when state is draft
bzr revid: sbh@tinyerp.com-20101223060808-vz1u88ta4od5whgx
2010-12-23 11:38:08 +05:30
Thibault Francois b845bb4ee1 [MERGE] trunk dev addons1
bzr revid: tfr@openerp.com-20101222132330-537grpixmbdtz43s
2010-12-22 14:23:30 +01:00
Launchpad Translations on behalf of openerp 8be856082e Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20101222054619-0p561c2n1h18e0tc
2010-12-22 05:46:19 +00:00
Sbh (OpenERP) d9f2060af1 [MERGE] Merge with lp:openobject-addons
bzr revid: sbh@tinyerp.com-20101222040512-6ahyzlwt9fnpdl2r
2010-12-22 09:35:12 +05:30
Olivier Dony df25a5570c [I18N] all: cleanup export after fixing some remaining translation export issues
bzr revid: odo@openerp.com-20101221194751-g69ixmtrurd6ewo7
2010-12-21 20:47:51 +01:00
Sbh (OpenERP) 32b85439a7 [Fix] project: take the correct parent id
bzr revid: sbh@tinyerp.com-20101221091839-gis6dzrb4jne72fc
2010-12-21 14:48:39 +05:30
uco (OpenERP) 43cea783a8 [MERGE]
bzr revid: uco@tinyerp.com-20101220090417-9vzm73sa5owwtygn
2010-12-20 14:34:17 +05:30
Launchpad Translations on behalf of openerp c2f85df411 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20101218050707-tdumvza0nnw0ai4c
bzr revid: launchpad_translations_on_behalf_of_openerp-20101219044813-9lk6hs4sgaut10z1
bzr revid: launchpad_translations_on_behalf_of_openerp-20101220045307-e2nnaoqthf10jhmy
2010-12-20 04:53:07 +00:00
Sbh (OpenERP) 01655b4e9c [MERGE] merge with lp:openobject-addons
bzr revid: sbh@tinyerp.com-20101220041756-2avhxf2l3hto04i3
2010-12-20 09:47:56 +05:30
Sbh (OpenERP) 06c40ea952 [Fix] project: assing default in task
lp bug: https://launchpad.net/bugs/691122 fixed

bzr revid: sbh@tinyerp.com-20101217123844-0kavik2g090s4kr7
2010-12-17 18:08:44 +05:30
Launchpad Translations on behalf of openerp 4028b53efe Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20101217055305-qykqycjvpt8fc9q0
2010-12-17 05:53:05 +00:00
Sbh (OpenERP) 5c45f67081 [MERGE] Merge with team1 branch
bzr revid: sbh@tinyerp.com-20101217040849-9c3fgn6mie7quelb
2010-12-17 09:38:49 +05:30
uco (OpenERP) bc983971ed [FIX] project: Corrected 'parent_id' problem for Project.
lp bug: https://launchpad.net/bugs/690109 fixed

bzr revid: uco@tinyerp.com-20101216111348-d0mgywzig45ym69i
2010-12-16 16:43:48 +05:30
Sbh (OpenERP) 125ca66f81 [Merge] Merge with team1 branch
bzr revid: sbh@tinyerp.com-20101216045409-6rllaq60cyuiszg9
2010-12-16 10:24:09 +05:30
Launchpad Translations on behalf of openerp 1f377cca79 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20101216044244-go321rqvup2m8l4y
bzr revid: launchpad_translations_on_behalf_of_openerp-20101216044841-ewqql1al8ld9es0h
2010-12-16 04:48:41 +00:00
Sbh (OpenERP) f2fd74473a [Merge] Merge with lp:opeobject-addons
bzr revid: sbh@tinyerp.com-20101216043040-ypze2jujqdwvct22
2010-12-16 10:00:40 +05:30
uco (OpenERP) aa0ef3c602 [MERGE] all: added missing contexts in most methods + improved context usage according to guidelines
bzr revid: odo@openerp.com-20101215171655-ohuu8uwxzza9jbni
2010-12-15 18:16:55 +01:00
Olivier Dony 2d89b7a153 [I18N] all: re-exported translation templates after latest translation improvements
bzr revid: odo@openerp.com-20101215150748-ypwfuhqk5o7f3g48
2010-12-15 16:07:48 +01:00
Sbh (OpenERP) 481d1a516b [MERGE] merge with team1 branch
bzr revid: sbh@tinyerp.com-20101215063057-8x4icuelo0ejotnk
2010-12-15 12:00:57 +05:30
Sbh (OpenERP) 9bcfd67d81 [MERGE] Merge with lp:openobject-addons
bzr revid: sbh@tinyerp.com-20101215054706-mgwy0cxf5tct6qz5
2010-12-15 11:17:06 +05:30
Launchpad Translations on behalf of openerp 9b10499abe Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20101215043854-s3j1x291m7kl3dig
bzr revid: launchpad_translations_on_behalf_of_openerp-20101215052125-i0y5f9gpuhsjreax
2010-12-15 05:21:25 +00:00
jam-openerp 8ea6ce89df [BUG-FIX] lp:681343
bzr revid: jam@tinyerp.com-20101214100751-k6d8rzh6531cgc06
2010-12-14 15:37:51 +05:30
uco (OpenERP) 690fbff411 [MERGE]
bzr revid: uco@tinyerp.com-20101214073712-b51lj9zyba9p1bp9
2010-12-14 13:07:12 +05:30
Launchpad Translations on behalf of openerp 6e05b3cc93 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20101214045316-3c6x6lhto9swc1hw
bzr revid: launchpad_translations_on_behalf_of_openerp-20101214053806-8xtqagluqiijot4p
2010-12-14 05:38:06 +00:00
Sbh (OpenERP) 2d258d4113 [MERGE] merge with team1 branch
bzr revid: sbh@tinyerp.com-20101214042250-8wop16wze4felppt
2010-12-14 09:52:50 +05:30
Sbh (OpenERP) e42c8273b4 [Merge] Merge with lp:openobject-addons
bzr revid: sbh@tinyerp.com-20101213093232-likal5o7ehstv8c5
2010-12-13 15:02:32 +05:30
Sbh (OpenERP) 599aebfa17 [MERGE] merge with lp:openbobject-addons
bzr revid: sbh@tinyerp.com-20101213072534-c3ova714z4r977tx
2010-12-13 12:55:34 +05:30
uco (OpenERP) 9ff9d1ff04 [MERGE]
bzr revid: uco@tinyerp.com-20101213071756-wopi0pojilu7hr7q
2010-12-13 12:47:56 +05:30
uco (OpenERP) d827b2f6ea [REF]: Added remaining context changes in _constraints. Removed unnecessary checking for context from methods.
bzr revid: uco@tinyerp.com-20101213064309-vg36f1510xv2f8zb
2010-12-13 12:13:09 +05:30
Launchpad Translations on behalf of openerp b73b1c471a Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20101212044547-xwyztuk2luf60dlb
2010-12-12 04:45:47 +00:00
Launchpad Translations on behalf of openerp 71def15f13 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20101211050850-f7y0827upqa9zdw0
2010-12-11 05:08:50 +00:00
uco (OpenERP) 8596a9626b [MERGE]
bzr revid: uco@tinyerp.com-20101209113128-y3xryg2uy0gxopyc
bzr revid: uco@tinyerp.com-20101210063216-oa2hc5xb14v50jof
2010-12-10 12:02:16 +05:30
Sbh (OpenERP) c22b2082ec [MERGE] Merge with lp:openobject-addons
bzr revid: sbh@tinyerp.com-20101210041916-d3m73fsr0rckdh9c
2010-12-10 09:49:16 +05:30
Sbh (OpenERP) 566d6bd265 [MERGE] Merge project improvement
bzr revid: sbh@tinyerp.com-20101209115211-59kgvup52dqrm2en
2010-12-09 17:22:11 +05:30
Sbh (OpenERP) 8e211472f3 [MERGE] merge with team1 branch
bzr revid: sbh@tinyerp.com-20101207113112-rpr4it217zjlien9
bzr revid: sbh@tinyerp.com-20101209060801-b8hbfp1xxt7an206
2010-12-09 11:38:01 +05:30
Sbh (OpenERP) 0f2f58c338 [MERGE] merge with lp:openobject-addons
bzr revid: sbh@tinyerp.com-20101209044643-hnxu2bwgddkgol5g
2010-12-09 10:16:43 +05:30
Olivier Dony aa27cd5b1c [REVERT] project/board_project_manager_view.xml: reverted previous incorrect patch (incorrect view_id)
bzr revid: odo@openerp.com-20101208175348-rfp94f9w4js0nbrd
2010-12-08 18:53:48 +01:00
Launchpad Translations on behalf of openerp e2d025c961 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20101209045022-g1ar37i6xtnr0jtq
bzr revid: launchpad_translations_on_behalf_of_openerp-20101209045802-ari4r0g7oouy55c8
2010-12-09 04:58:02 +00:00
Xavier Morel f21577dde9 [REM] all @default attributes: they should not be there and they aren't handled by the GTK client (as far as I know)
bzr revid: xmo@openerp.com-20101208102305-yd96zmg10exredgq
2010-12-08 11:23:05 +01:00
Sbh (OpenERP) a54033f565 [MERGE] small change
bzr revid: sbh@tinyerp.com-20101207112811-k64b8upftb7rvabv
2010-12-07 16:58:11 +05:30
Sbh (OpenERP) 4e617d16fa [Fix] mail_gateway,marketing_campaign,project: Fix the Histroy tab
lp bug: https://launchpad.net/bugs/680121 fixed

bzr revid: sbh@tinyerp.com-20101207084001-54vnxkpq1ts7aess
2010-12-07 14:10:01 +05:30
uco (OpenERP) b1cf433ecc [MERGE]: Merged with trunk-addons.
bzr revid: uco@tinyerp.com-20101206131102-z2xzz8eshkswo00q
2010-12-06 18:41:02 +05:30
uco (OpenERP) 056f8ff583 [MERGE]: Merged with team1.
bzr revid: uco@tinyerp.com-20101206101947-dpr9ubb2pzuwa6p3
2010-12-06 15:49:47 +05:30
Sbh (OpenERP) 1c92889461 [Fix] project: remove view_id
bzr revid: sbh@tinyerp.com-20101206062657-n55jphqfirybvgjn
2010-12-06 11:56:57 +05:30
Launchpad Translations on behalf of openerp 50be667595 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20101204051645-1r4dxlktdeeiy2fn
bzr revid: launchpad_translations_on_behalf_of_openerp-20101205045319-cr1iy0be5p2hljje
2010-12-05 04:53:19 +00:00
Olivier Dony c95efe7997 [I18N] all: updated PO templates after latest cleanup
bzr revid: odo@openerp.com-20101203155533-bda40vcxelidfse9
2010-12-03 16:55:33 +01:00
uco (OpenERP) bd8bfab2da [FIX] project: Fixed error occurring on planned hours.
lp bug: https://launchpad.net/bugs/684472 fixed

bzr revid: uco@tinyerp.com-20101203124639-62f62f7urjuj812y
2010-12-03 18:16:39 +05:30
P. Christeas e28cd5bdaf Merge commit '905f8b1d6c9e' into patch13
Conflicts:
	crm_claim/crm_claim_demo.xml
	project/board_project_manager_view.xml

bzr revid: p_christ@hol.gr-20101202201937-akh200wknpt9958h
2010-12-02 22:19:37 +02:00