96b9454a32
[FIX] revert 5138 revid:fp@tinyerp.com-20110924090407-x4e0ptu2am495rpv incorrect tests
...
bzr revid: al@openerp.com-20110925095948-hgtg1djicpvcm3nc
2011-09-25 11:59:48 +02:00
7b190983da
merge
...
bzr revid: fp@tinyerp.com-20110924090407-x4e0ptu2am495rpv
2011-09-24 11:04:07 +02:00
ccc56996dd
[MERGE] trunk-search_views or instead of and in groups
...
bzr revid: al@openerp.com-20110923172247-pj5ii3pxisiyco6k
2011-09-23 19:22:47 +02:00
edb0f56002
Remove the separator
...
bzr revid: dbr@tinyerp.com-20110922104228-tqrjx6ajh289nsin
2011-09-22 16:12:28 +05:30
1373698a48
[IMP]Improve the code
...
bzr revid: dbr@tinyerp.com-20110922103057-nlb77lksv28t6oas
2011-09-22 16:00:57 +05:30
de2db44b53
[IMP]project_scrum: Improve the default search
...
bzr revid: dbr@tinyerp.com-20110922092926-ynbhj7n93t3l6d7x
2011-09-22 14:59:26 +05:30
582e640be7
[Merge]with: lp:openobject-addons
...
bzr revid: dbr@tinyerp.com-20110921063919-t3qcfbp6h6x46k0h
2011-09-21 12:09:19 +05:30
cf679cf5a9
[IMP]project_scrum: Improve the sprints search view
...
bzr revid: dbr@tinyerp.com-20110920125259-36me4wcq1zmw8s2b
2011-09-20 18:22:59 +05:30
477a7f1d4e
[IMP] Improve the search views
...
bzr revid: dbr@tinyerp.com-20110920105829-ythiwkwv437qti30
2011-09-20 16:28:29 +05:30
05d6d35cc8
[Merge]
...
bzr revid: fp@tinyerp.com-20110917110317-34apz3spz1h9azjl
2011-09-17 13:03:17 +02:00
87232b309f
[IMP]project_* : Improve the code
...
bzr revid: dbr@tinyerp.com-20110916114403-umbfkuhovq9z9qha
2011-09-16 17:14:03 +05:30
e3fb37a734
[Merge]with: lp:openobject-addons
...
bzr revid: dbr@tinyerp.com-20110914051902-r73uw1yu1bck6xzn
2011-09-14 10:49:02 +05:30
41f3bef4f2
[Merge]with: lp:openobject-addons
...
bzr revid: dbr@tinyerp.com-20110909045919-yem2739zo7oi25cj
bzr revid: dbr@tinyerp.com-20110912051050-f0vcgre02x6aiikp
bzr revid: dbr@tinyerp.com-20110913051152-5hla7hvxs58k6xmv
2011-09-13 10:41:52 +05:30
983a7d2fd2
[MERGE] latest trunk
...
bzr revid: odo@openerp.com-20110912123152-xswj0jlmhp7qpoz8
2011-09-12 14:31:52 +02:00
178fec5c64
[FIX] str 'in' str (singletons missing tuple-building comma), in @colors attributes. Replace by string equality
...
bzr revid: xmo@openerp.com-20110911135025-v9yct8pnjfj21tyj
2011-09-11 15:50:25 +02:00
d5d2099658
[IMP] mail*: rename mail.compose.wizard extension, for consistency
...
bzr revid: odo@openerp.com-20110909131045-mzuspzazkv34ns3q
2011-09-09 15:10:45 +02:00
5cbd017b19
[IMP]project_* : Improve the statements
...
bzr revid: dbr@tinyerp.com-20110907093659-iwkovt45beo4pzl5
2011-09-07 15:06:59 +05:30
f42126df0e
[MERGE] latest trunk
...
bzr revid: odo@openerp.com-20110906080846-lyi3haucchsaz7uo
2011-09-06 10:08:46 +02:00
823a3f8bf0
[Merge]with: lp:openobject-addons
...
bzr revid: dbr@tinyerp.com-20110902052628-lxsoyzz0qlaev4tp
bzr revid: dbr@tinyerp.com-20110905055747-rk09ip9leb82umdn
bzr revid: dbr@tinyerp.com-20110906050725-bc453pgrz4m2t5ix
2011-09-06 10:37:25 +05:30
752df5acbd
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110905055933-cld0r3vv3jmiu5bx
bzr revid: launchpad_translations_on_behalf_of_openerp-20110906044018-ajk9u7zfqoiatufs
2011-09-06 04:40:18 +00:00
da10b71e50
[IMP]project_scrum: Improve test cases
...
bzr revid: dbr@tinyerp.com-20110831132600-fz0dd6ujd19sabz6
2011-08-31 18:56:00 +05:30
71443ad49f
[MERGE] trunk
...
bzr revid: al@openerp.com-20110827211948-kmap692ves3ixo4k
2011-08-27 23:19:48 +02:00
5906bf6b5a
[IMP]project_scrum : Improve the test cases
...
bzr revid: dbr@tinyerp.com-20110826123100-kwv3k2kg3z8xwrl1
2011-08-26 18:01:00 +05:30
8a6ab52dfb
[ADD]project_scrum : Add file for scrum sprit test cases
...
bzr revid: dbr@tinyerp.com-20110826121757-71ku92r0g5jnzipe
2011-08-26 17:47:57 +05:30
ae7b1699cb
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110823050537-7q5lx6k2wq8n70ld
bzr revid: launchpad_translations_on_behalf_of_openerp-20110824043728-ri9o75i5hp2tss1x
2011-08-24 04:37:28 +00:00
4fcb67bef1
[MERGE] latest trunk
...
bzr revid: odo@openerp.com-20110822171856-1zkyunpjyz5ffdth
2011-08-22 19:18:56 +02:00
8f9f45ea94
[IMP] all: next pass of review/renaming for new mail API
...
bzr revid: odo@openerp.com-20110822171659-zxho36a6n628i10q
2011-08-22 19:16:59 +02:00
063e28a83d
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110820045348-7oh5zs7l4lr3zsq1
2011-08-20 04:53:48 +00:00
b93ee681aa
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110819043543-y0ffrzj9o2vtuktx
2011-08-19 04:35:43 +00:00
ac9c0e55b0
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110818043608-kjmi6rgmnpk2d36r
2011-08-18 04:36:08 +00:00
2a5e3c0712
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110817044135-4q05u1i6k8x337j9
2011-08-17 04:41:35 +00:00
cdbd7dd7d6
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110816043437-2ik9gp5alwecpla8
2011-08-16 04:34:37 +00:00
3278222800
[FIX] project_scrum: filters in field in override to project search view
...
bzr revid: xmo@openerp.com-20110812080051-ozhrap5afiqunt1f
2011-08-12 10:00:51 +02:00
50507512cb
[MERGE] latest trunk
...
This was a helluva merge, with hundreds of conflicts resolved manually!!
I hope I did not break too many things, but a full review of the mail-related
features (where most of the conflicts occurred) must still be done before
this feature branch can be merged.
bzr revid: odo@openerp.com-20110809234428-3dsvxrt6t54ju0cf
2011-08-10 01:44:28 +02:00
0b4d547900
[MERGE] from trunk
...
bzr revid: rco@openerp.com-20110805142118-0z8k0f897xfu2zll
2011-08-05 16:21:18 +02:00
be1a659658
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110803043726-ofn4l3px2ooldl00
bzr revid: launchpad_translations_on_behalf_of_openerp-20110804043456-fnef8uwgur5od0en
2011-08-04 04:34:56 +00:00
caa3c07094
email.addresss_id_repalce_by_user_email
...
bzr revid: rmu@tinyerp.com-20110728061156-swmn5jz78zb3w4vd
2011-07-28 11:41:56 +05:30
292b4683b6
[MERGE] add field 'complexity' in modules
...
bzr revid: rco@openerp.com-20110708100307-5axn5hnn92qm8qiw
2011-07-08 12:03:07 +02:00
1f5aa0643f
[IMP]: module is defined by its complexity
...
bzr revid: han@tinyerp.com-20110706122928-xvcpdu5inpkganfy
2011-07-06 17:59:28 +05:30
06fb14130a
[IMP] removed method=True params from all fields.function
...
Server revision 3495 odo@openerp.com-20110701232328-flgxulxva70vnyxr
removed the need for passing method=True to function fields,
so this is the equivalent addons fix, removing it everywhere.
Please be careful from now on, and do not pass it anymore!
bzr revid: odo@openerp.com-20110701234124-a61zl0idvdfz3hyb
2011-07-02 01:41:24 +02:00
effe36ee48
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110618045712-0yql5n0y3b2cdjn5
bzr revid: launchpad_translations_on_behalf_of_openerp-20110619043730-488lieaxfqynd5ji
bzr revid: launchpad_translations_on_behalf_of_openerp-20110620043317-29hyt535kvzpilvb
2011-06-20 04:33:17 +00:00
b217fdbb73
[FIX] wrong tooltip
...
bzr revid: jam@tinyerp.com-20110606063446-101wsd4dqunvy0vd
2011-06-06 12:04:46 +05:30
efe639a92e
[BUG/FIX] project_scrum : Email From issue as per bug lp#791895 and email body format improved
...
bzr revid: jam@tinyerp.com-20110606062151-dg9aeec6l7mp7w7c
2011-06-06 11:51:51 +05:30
552afb10c5
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110603044017-yoke5zwvpebyo93o
bzr revid: launchpad_translations_on_behalf_of_openerp-20110604045342-rkt8o6e65uyj8kjd
bzr revid: launchpad_translations_on_behalf_of_openerp-20110605043539-vvllkcbozllrdlg7
bzr revid: launchpad_translations_on_behalf_of_openerp-20110606043718-0i2770ro7c0oho9t
2011-06-06 04:37:18 +00:00
d553615695
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110429055618-q15rvfmlvfsl2im5
bzr revid: launchpad_translations_on_behalf_of_openerp-20110430045341-qzlphdlvqf2aa1zx
bzr revid: launchpad_translations_on_behalf_of_openerp-20110501045420-py2vl38b1o3mfs7o
bzr revid: launchpad_translations_on_behalf_of_openerp-20110502043731-ym2tvgj2djoitk8f
2011-05-02 04:37:31 +00:00
5be7bbd5c3
[MERGE] merged with trunk development branch
...
bzr revid: hmo@tinyerp.com-20110428111210-llk36qlgkdz1ls54
2011-04-28 16:42:10 +05:30
0577796333
[MERGE] merged addons trunk development branch after resolving conflicts
...
bzr revid: hmo@tinyerp.com-20110421080156-3c8gg29i01089rgo
2011-04-21 13:31:56 +05:30
44bcca9f2f
[IMP] email.compose.message: useability improvements
...
bzr revid: rha@tinyerp.com-20110419115850-8vsbd9yv3vhedgss
2011-04-19 17:28:50 +05:30
bc708c8b96
[REVIEW] remove passing email_model and email_res_id into context
...
bzr revid: hmo@tinyerp.com-20110412091820-t9wjrzetr814soeg
2011-04-12 14:48:20 +05:30
f53ee6053a
[IMP] email.message.common: implemented active_id and active_model in default_get() and fix reference of fields subject and body
...
bzr revid: rha@tinyerp.com-20110407125024-4354406jcb4ih2k9
2011-04-07 18:20:24 +05:30
Antony Lesuisse
Fabien Pinckaers
DBR (OpenERP)
Olivier Dony
Xavier Morel
Launchpad Translations on behalf of openerp
Raphael Collet
RavishchanraMurari (Open ERP)
Hardik Ansodariy (OpenERP)
Jigar Amin
Harry (OpenERP)
Rifakat Haradwala (Open ERP)