Commit Graph
223 Commits
Author SHA1 Message Date
Olivier Dony f42126df0e [MERGE] latest trunk
bzr revid: odo@openerp.com-20110906080846-lyi3haucchsaz7uo
2011-09-06 10:08:46 +02:00
Launchpad Translations on behalf of openerp 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 2f543db06e [IMP] mail: cleanup/rename API + adapt dependencies (wip)
bzr revid: odo@openerp.com-20110825122757-0mqr0gbol25t0n41
2011-08-25 14:27:57 +02: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 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
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
Xavier Morel 09cf4d40d0 [FIX] convert ir.actions.todo fields to match model definition changes
* type = special => type = automatic
* type = recurring | normal => type = normal
* default type special => normal
* state = hidden => state = done

bzr revid: xmo@openerp.com-20110729140324-0nxus4p8ufj46z9y
2011-07-29 16:03:24 +02:00
Xavier Morel cc13113641 [REF] reformat xml files before applying automated search&replace on them
bzr revid: xmo@openerp.com-20110729134810-oiqptqs2omvo7o7c
2011-07-29 15:48:10 +02:00
Xavier Morel 5a41a68bc2 [MERGE] from trunk
bzr revid: xmo@openerp.com-20110726111218-umzudy6z5wrn63j9
2011-07-26 13:12:18 +02:00
Xavier Morel a5fdb75ad6 [FIX] ir.actions.todo are now unskippable
bzr revid: xmo@openerp.com-20110714103725-6r6j35qegobhvx5u
2011-07-14 12:37:25 +02:00
Raphael Collet adafbc707a [MERGE] from trunk
bzr revid: rco@openerp.com-20110708092232-mlezo4330k2j8vvw
2011-07-08 11:22:32 +02:00
Quentin (OpenERP) 664ba7bba3 [MERGE] merge with main addons branch
bzr revid: qdp-launchpad@openerp.com-20110630133009-i0qxzrn9up9e0bog
2011-06-30 15:30:09 +02:00
Launchpad Translations on behalf of openerp 154ee1ca4d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110621043725-4i5mlfx0gnvi6ih8
2011-06-21 04:37:25 +00:00
aag (OpenERP) a77d54ba3b [IMP]fetchmail:Load Outlook Plug-In in Sales Management-5 categ
bzr revid: aag@tinyerp.co.in-20110603092419-miu0p4agwyg8hg0c
2011-06-03 14:54:19 +05:30
aag (OpenERP) 9916ddfd57 [ADD]fetchmail: Load Outlook Plug-In add to sale -7 seq category
bzr revid: aag@tinyerp.co.in-20110602063556-mhl9jf96dqzszvfv
2011-06-02 12:05:56 +05:30
Launchpad Translations on behalf of openerp 41501f2229 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110525043907-tufpcfjsxudshbkg
2011-05-25 04:39:07 +00:00
Raphael Collet dad7ce2021 [MERGE] improve text in module outlook
bzr revid: rco@openerp.com-20110520074801-big3rj6f2gp3slo9
2011-05-20 09:48:01 +02:00
Amit Bhavsar (Open ERP) 184cdbe346 [usability],text improvement in outlook module
bzr revid: amb@tinyerp.com-20110520060011-prkqbpuon7x4ns3u
2011-05-20 11:30:11 +05:30
Launchpad Translations on behalf of openerp 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) 5be7bbd5c3 [MERGE] merged with trunk development branch
bzr revid: hmo@tinyerp.com-20110428111210-llk36qlgkdz1ls54
2011-04-28 16:42:10 +05:30
Rifakat Haradwala (Open ERP) 6b38a3a097 [FIX] outlook: removed encodeing for the attachment content
bzr revid: rha@tinyerp.com-20110428101528-pljylyati4kq3xls
2011-04-28 15:45:28 +05:30
Rifakat Haradwala (Open ERP) 2fa1c59ddf [IMP] outlook,mail: improvements for outlook plugin
bzr revid: rha@tinyerp.com-20110427134711-uqfm7m4s4lwj1tgi
2011-04-27 19:17:11 +05:30
Rucha (Open ERP) 1d5fa6ca4c [IMP]: *: Reviewed config wizards of all modules and changed type + state in order to follow the behaviour described below:
* After a fresh installation of a DB if we dont select and application to install nothing will come
* If I select HR module first time, this module will be installed and all special wizards of this module should be appeared
* If I select HR module(its installed) again from application list, all special wizards of this module should be set as todo in order to display when clicking next
* For any other wizards we have to go to list of config wizards and run them manually (for web client these are supposed to be there in config panel)

bzr revid: rpa@tinyerp.com-20110427133518-52mawayc3rgoyx9h
2011-04-27 19:05:18 +05:30
Rucha (Open ERP) b6428f5b9d [MERGE]: Merge with latest trunk
bzr revid: rpa@tinyerp.com-20110415092039-94d5dn2qiq388m7b
bzr revid: rpa@tinyerp.com-20110426064148-nqu2870kk5y59fym
bzr revid: rpa@tinyerp.com-20110427044613-zx55jv7o3t209meb
2011-04-27 10:16:13 +05:30
Launchpad Translations on behalf of openerp 2f1607c786 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110422043906-4a4yeks4mzl3sfef
bzr revid: launchpad_translations_on_behalf_of_openerp-20110423045345-9xga4elfyud8nsec
bzr revid: launchpad_translations_on_behalf_of_openerp-20110424043747-9x0ffekdqw8ldcc1
bzr revid: launchpad_translations_on_behalf_of_openerp-20110425045050-3owniws6mcmmclll
bzr revid: launchpad_translations_on_behalf_of_openerp-20110426044154-jrf1eg82ie49zl0r
2011-04-26 04:41:54 +00:00
Rucha (Open ERP) 765cc4eb79 [MERGE]: Merge with lp:~openerp-dev/openobject-addons/trunk-rework-addons-23-march-aag
bzr revid: rpa@tinyerp.com-20110413133441-ece8itsj3jofpxup
2011-04-13 19:04:41 +05:30
aag (OpenERP) 2b90da0cb4 [IMP]outlook:Load the outlook plugin :Type:normal confg wiz
bzr revid: aag@tinyerp.co.in-20110412054408-t6fgawxxd9m3ppxt
2011-04-12 11:14:08 +05:30
Rucha (Open ERP) b306d963ea [MERGE]: Merge work of aag for new wizards to be appeared in config panel (Work in progress)
bzr revid: rpa@tinyerp.com-20110411102108-d6pqgxcqsef0bdxl
2011-04-11 15:51:08 +05:30
aag (OpenERP) 7eff17aef5 [IMP]thunderbird,outlook:Rename Conf wiz name With Prefix Load like Thunderbird Plug-In to --> Load Thunderbird Plug-In
bzr revid: aag@tinyerp.co.in-20110407085415-jgob7tvcacn14dnj
2011-04-07 14:24:15 +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
Rifakat Haradwala (Open ERP) 9a9c100595 [Merge]: merge with lp:~openerp-dev/openobject-addons/emails-framework-addons
bzr revid: rha@tinyerp.com-20110330092614-sgnniorxit17zvxn
2011-03-30 14:56:14 +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
Launchpad Translations on behalf of openerp f35a989981 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110323043607-ydbntrwael93hvcn
2011-03-23 04:36:07 +00: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
Rifakat Haradwala (Open ERP) 455fb2d6b3 [IMP] email: email cleanup
bzr revid: rha@tinyerp.com-20110318134419-78qmipdipsryqgnz
2011-03-18 19:14:19 +05:30
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
Launchpad Translations on behalf of openerp c18e506cf5 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110318050000-clr4x2jge8ptg7q6
2011-03-18 05:00:00 +00:00
niv-openerp edbb2d7168 [MERGE] Improvements to manifests.
bzr revid: nicolas.vanhoren@openerp.com-20110317122126-q1vxxy287aykxv6h
2011-03-17 13:21:26 +01:00
vro 79bf0f73da [ADD]: Images: outlook, wiki, wiki_faq, wiki_quality_manual
bzr revid: vro@tinyerp.com-20110317110408-2o5nbazf4a1b9iru
2011-03-17 16:34:08 +05:30
Rucha (Open ERP) 117d3f75a0 [MERGE]: Merge with latest trunk
bzr revid: rpa@tinyerp.com-20110317095800-l0sc4mj3uktsm8wa
2011-03-17 15:28:00 +05:30
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
Launchpad Translations on behalf of openerp 418a1beffd Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110310044636-k42hq7vfv8qd11o5
2011-03-10 04:46:36 +00: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
Launchpad Translations on behalf of openerp 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
Harry (OpenERP) ec73645c4c [MERGE] merged trunk-addons-development branch
bzr revid: hmo@tinyerp.com-20110228075715-o0wm18nhd910aubc
bzr revid: hmo@tinyerp.com-20110301055553-adkdzxqxj1fcroh6
2011-03-01 11:25:53 +05:30
Launchpad Translations on behalf of openerp 9c7afeb2c8 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110301043841-ufga2xxsn0e0jxpz
2011-03-01 04:38:41 +00:00
Launchpad Translations on behalf of openerp 1bfe6c8df9 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110226050040-nkymkib29qktvvqm
2011-02-26 05:00:40 +00:00
Launchpad Translations on behalf of openerp 5eb533a415 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110216050027-qh55wef1rwb8hc9y
bzr revid: launchpad_translations_on_behalf_of_openerp-20110215043802-u5lpwzvi9tsp5qbj
bzr revid: launchpad_translations_on_behalf_of_openerp-20110216050338-aj0ab43kdrpgrh0r
bzr revid: launchpad_translations_on_behalf_of_openerp-20110217043649-3o2fe7rz274hzokb
2011-02-17 04:36:49 +00:00
Harry (OpenERP) 63c8d44d88 [MERGE] merged from trunk-addons-development branch
bzr revid: hmo@tinyerp.com-20110215102211-n15lmjf1vgq5bcyo
2011-02-15 15:52:11 +05:30