Olivier Dony
d22c3043aa
[FIX] marketing_campaign: typos and cleanup
...
bzr revid: odo@openerp.com-20110912180025-scdjvcnquo07zcha
2011-09-12 20:00:25 +02:00
Olivier Dony
983a7d2fd2
[MERGE] latest trunk
...
bzr revid: odo@openerp.com-20110912123152-xswj0jlmhp7qpoz8
2011-09-12 14:31:52 +02:00
Xavier Morel
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
Olivier Dony
f42126df0e
[MERGE] latest trunk
...
bzr revid: odo@openerp.com-20110906080846-lyi3haucchsaz7uo
2011-09-06 10:08:46 +02:00
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
Olivier Dony
b0bed63351
[IMP] mail.thread: renaming methods to avoid collisions with objects that use the mixin
...
bzr revid: odo@openerp.com-20110823175809-hw81fkptg90702vh
2011-08-23 19:58:09 +02:00
Olivier Dony
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
Raphael Collet
292b4683b6
[MERGE] add field 'complexity' in modules
...
bzr revid: rco@openerp.com-20110708100307-5axn5hnn92qm8qiw
2011-07-08 12:03:07 +02:00
Hardik Ansodariy (OpenERP)
1f5aa0643f
[IMP]: module is defined by its complexity
...
bzr revid: han@tinyerp.com-20110706122928-xvcpdu5inpkganfy
2011-07-06 17:59:28 +05:30
5a823350e0
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110702050634-xl59j3cyqucb2xbr
bzr revid: launchpad_translations_on_behalf_of_openerp-20110703044707-mjrlbh7l81jm56z7
bzr revid: launchpad_translations_on_behalf_of_openerp-20110705043321-ij8r6auabm4cptt6
2011-07-05 04:33:21 +00:00
Olivier Dony
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
f1ea42e230
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110701045457-prq3cv67drfa19xt
2011-07-01 04:54:57 +00:00
f08cf2f85f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110507045323-azozpfkhj7vaix3f
bzr revid: launchpad_translations_on_behalf_of_openerp-20110507045352-2mjk93fx426eijy4
bzr revid: launchpad_translations_on_behalf_of_openerp-20110508043753-3bcytaz1rrn2vvbh
bzr revid: launchpad_translations_on_behalf_of_openerp-20110509043658-oyhxuwreey6yc4r1
2011-05-09 04:36:58 +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
Harry (OpenERP)
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
Thibault Francois
b11a71fd87
[MERGE] improvement project-issue
...
bzr revid: tfr@openerp.com-20110407114145-xvr27pjquxwk9ff0
2011-04-07 13:41:45 +02:00
Thibault Francois
1a45ff614d
[MERGE] crm improvement
...
bzr revid: tfr@openerp.com-20110407092730-bjm0pwq9mewpvzc0
2011-04-07 11:27:30 +02:00
Rifakat Haradwala (Open ERP)
63de8740bc
[FIX] csv file semicolon error
...
bzr revid: rha@tinyerp.com-20110405061713-b9qmkeqqg64er6lf
2011-04-05 11:47:13 +05:30
Rifakat Haradwala (Open ERP)
47a85e9f8f
[IMP] mail: rename module email to mail because of parsing error
...
bzr revid: rha@tinyerp.com-20110404094552-j2rdq2sbeqrbffgn
2011-04-04 15:15:52 +05:30
Harry (OpenERP)
cf7c73310d
[MERGE] merged with trunk addods development branch
...
bzr revid: hmo@tinyerp.com-20110329122736-78igudbed2jz7lf4
2011-03-29 17:57:36 +05:30
niv-openerp
1b7854503d
[IMP] Improvements to the screenshots for some modules.
...
bzr revid: nicolas.vanhoren@openerp.com-20110322131214-g4h9rzpam67k2ym9
2011-03-22 14:12:14 +01:00
niv-openerp
cf07e58016
[MERGE] Other improvements of descriptions in module manifests.
...
bzr revid: nicolas.vanhoren@openerp.com-20110318140618-jg2jumv3gyacfb74
2011-03-18 15:06:18 +01:00
vro
437ed909c2
[IMP]: Module descriptions.
...
bzr revid: vro@tinyerp.com-20110318114737-znh9wtipt84hc5jd
2011-03-18 17:17:37 +05:30
niv-openerp
a898038b47
[MERGE] Merged module screenshots and improvements to module descriptions.
...
bzr revid: nicolas.vanhoren@openerp.com-20110318110816-f8bnmmlfzc9eqyu7
2011-03-18 12:08:16 +01:00
niv-openerp
edbb2d7168
[MERGE] Improvements to manifests.
...
bzr revid: nicolas.vanhoren@openerp.com-20110317122126-q1vxxy287aykxv6h
2011-03-17 13:21:26 +01:00
Rucha (Open ERP)
117d3f75a0
[MERGE]: Merge with latest trunk
...
bzr revid: rpa@tinyerp.com-20110317095800-l0sc4mj3uktsm8wa
2011-03-17 15:28:00 +05:30
Olivier Dony
f74b1bafe0
[IMP] marketing_campaign: added unique field for duplicate prevention on the campaign form
...
bzr revid: odo@openerp.com-20110316182903-9qh08k4wu2wb14hr
2011-03-16 19:29:03 +01:00
Olivier Dony
0045ab984c
[IMP] marketing_campaign: duplicate prevention for segments can now use a unique field set on the campaign
...
bzr revid: odo@openerp.com-20110316182356-r7xqcmz42se6n4ms
2011-03-16 19:23:56 +01:00
vro
d4672f80ac
[ADD]: Images: lunch, mail_gateway, marketing, marketing_campaign
...
bzr revid: vro@tinyerp.com-20110316074733-rlpnvdspeguh3fnc
2011-03-16 13:17:33 +05:30
Olivier Dony
488200e0c9
[FIX] marketing_campaign: avoid exception when resource linked to workitem was deleted
...
bzr revid: odo@openerp.com-20110312011401-qy5lmffp4owfsxf6
2011-03-12 02:14:01 +01:00
Olivier Dony
cbb98b719b
[FIX] marketing_campaign: fixed search on res_name on workitems + minor tweaks
...
bzr revid: odo@openerp.com-20110312000705-rbjet1wg30y79v12
2011-03-12 01:07:05 +01:00
Olivier Dony
599d655465
[FIX] marketing_campaign: workitem.process_all() must respect campaign states
...
bzr revid: odo@openerp.com-20110311104831-ewujjdgwg1jd5qhc
2011-03-11 11:48:31 +01:00
Olivier Dony
02a703770a
[IMP] marketing_campaign: activity now passes workitem to server actions via context
...
bzr revid: odo@openerp.com-20110311104300-ka3616hqa8ad52qg
2011-03-11 11:43:00 +01:00
Yogesh (OpenERP)
e1afe5828a
[IMP] change module name emails to email and related to changes in addons all module. move email_gateway module file in email module and also related changes in related module..
...
bzr revid: ysa@tinyerp.com-20110310073900-ivesygpb7cdwpp43
2011-03-10 13:09:00 +05:30
Thibault Francois
e3e979a498
[MERGE] default value in act_window
...
bzr revid: tfr@openerp.com-20110309130345-uraw50vl1xlzqy6t
2011-03-09 14:03:45 +01:00
Els Van Vossel
a69c473f52
[IMP] Changed all module categories, limited number of categories
...
bzr revid: evv@openerp.com-20110309100505-mwxe08davyzdkfis
2011-03-09 11:05:05 +01:00
1e681a15bc
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110305045627-sks4s3i42qo2oj3p
bzr revid: launchpad_translations_on_behalf_of_openerp-20110306045008-pcson59t3bl9r6ax
bzr revid: launchpad_translations_on_behalf_of_openerp-20110307044936-g60qlnsbhllrba7h
bzr revid: launchpad_translations_on_behalf_of_openerp-20110308044752-1i8vh7qa5baootby
bzr revid: launchpad_translations_on_behalf_of_openerp-20110309044026-i5o7lki6yoc0wwol
2011-03-09 04:40:26 +00:00
4c3c85a945
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110304044528-3aw0bq4jyxvz4gyb
2011-03-04 04:45:28 +00:00
Harry (OpenERP)
53dc88ecaa
[IMP+FIX] emails: menu name improvement for Incomming server and Outgoing Server and fix regression in markertin compain module
...
bzr revid: hmo@tinyerp.com-20110215073150-q3r9hyk41ryn1jjx
2011-02-15 13:01:50 +05:30
Harry (OpenERP)
6eaf481c6c
[MERGE] merged work from ysa-addons branch
...
bzr revid: hmo@tinyerp.com-20110214060627-z3lnvmp02dkhw374
2011-02-14 11:36:27 +05:30
30bfcd2574
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110211045958-qw2uif8guhebh48q
2011-02-11 04:59:58 +00:00
Yogesh (OpenERP)
25d6bc3f95
[MERGE] Merge with lp:~openerp-dev/openobject-addons/emails-framework-addons
...
bzr revid: ysa@tinyerp.com-20110209070516-yfqydt9y21qk40mx
2011-02-09 12:35:16 +05:30
7b6e366a5f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110208043710-75bxojtr8ox15lgb
bzr revid: launchpad_translations_on_behalf_of_openerp-20110209045556-98ev5i679ddf25uu
2011-02-09 04:55:56 +00:00
Yogesh (OpenERP)
05336df19f
[IMP] change module name email to emails.
...
bzr revid: ysa@tinyerp.com-20110208094016-7svkud5dzdf8a2uc
2011-02-08 15:10:16 +05:30
Yogesh (OpenERP)
0ee0948e88
[MERGE] merge with lp:openobject-addons
...
bzr revid: ysa@tinyerp.com-20110207091748-s2fasyxlx5h5zi8k
2011-02-07 14:47:48 +05:30
Yogesh (OpenERP)
93f54b8f03
[IMP] email, email_template and email_gateway related changes done in addons module..
...
bzr revid: ysa@tinyerp.com-20110207072906-knh218shj8ufyxu7
2011-02-07 12:59:06 +05:30
89933f4c30
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110205045946-ngssapvavvzymfc4
bzr revid: launchpad_translations_on_behalf_of_openerp-20110206045319-cjbcpcr7k0jw8v8f
bzr revid: launchpad_translations_on_behalf_of_openerp-20110205050201-5kxv4wvlb171y4ec
bzr revid: launchpad_translations_on_behalf_of_openerp-20110206045419-syxas10vfjwq4nw9
bzr revid: launchpad_translations_on_behalf_of_openerp-20110207052017-1qsba36kfnjc0zkj
2011-02-07 05:20:17 +00:00
7a59b73896
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110131060829-cw2n1p0rxt186agi
bzr revid: launchpad_translations_on_behalf_of_openerp-20110129054416-mqjy6dbh74m5srtu
bzr revid: launchpad_translations_on_behalf_of_openerp-20110130055001-gehu37plrrjaogxb
bzr revid: launchpad_translations_on_behalf_of_openerp-20110131060928-xs2u6nr3y2x0h9db
2011-01-31 06:09:28 +00:00
61a62b1dfe
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110129045401-1zezcgk719d3dm0t
bzr revid: launchpad_translations_on_behalf_of_openerp-20110130044958-yshcathln43o1wdz
bzr revid: launchpad_translations_on_behalf_of_openerp-20110131045457-rzhwci5po7ea72bd
bzr revid: launchpad_translations_on_behalf_of_openerp-20110129045641-xfn2nij4y67wyq3h
bzr revid: launchpad_translations_on_behalf_of_openerp-20110130045141-vh5ecttx8tj5vdg4
bzr revid: launchpad_translations_on_behalf_of_openerp-20110131045711-41727n3c4e3wi0t9
2011-01-31 04:57:11 +00:00
Ujjvala Collins (OpenERP)
75496112a7
[MERGE]
...
bzr revid: uco@tinyerp.com-20110131045523-mqzj6whgu28l7vqb
2011-01-31 10:25:23 +05:30
Olivier Dony