Commit Graph
209 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 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
Antony Lesuisse 65c43a1946 [MERGE] trunk
bzr revid: al@openerp.com-20110805211034-hc8z53m6zzwksipu
2011-08-05 23:10:34 +02:00
Raphael Collet 0b4d547900 [MERGE] from trunk
bzr revid: rco@openerp.com-20110805142118-0z8k0f897xfu2zll
2011-08-05 16:21:18 +02:00
Launchpad Translations on behalf of openerp 6aeed3c0d9 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110805044024-q7ugk62igzbg3qjo
2011-08-05 04:40:24 +00:00
Raphael Collet 56d7786d46 [MERGE] move menu Automated Actions
bzr revid: rco@openerp.com-20110804143305-e2ws5yb7q5w2shzu
2011-08-04 16:33:05 +02:00
Launchpad Translations on behalf of openerp 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
Raphael Collet be0809a670 [MERGE] remove address_id from user
bzr revid: rco@openerp.com-20110803100602-75dcx4dqsh3sragi
2011-08-03 12:06:02 +02:00
Amit Bhavsar (Open ERP) 101fdbd738 [usability],automated action menu come at adminstration menu
bzr revid: amb@tinyerp.com-20110728070432-bwi7d0o0a1n1xvtr
2011-07-28 12:34:32 +05:30
RavishchanraMurari (Open ERP) caa3c07094 email.addresss_id_repalce_by_user_email
bzr revid: rmu@tinyerp.com-20110728061156-swmn5jz78zb3w4vd
2011-07-28 11:41:56 +05:30
Raphael Collet 292b4683b6 [MERGE] add field 'complexity' in modules
bzr revid: rco@openerp.com-20110708100307-5axn5hnn92qm8qiw
2011-07-08 12:03:07 +02:00
Raphael Collet adafbc707a [MERGE] from trunk
bzr revid: rco@openerp.com-20110708092232-mlezo4330k2j8vvw
2011-07-08 11:22:32 +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
Olivier Dony 48e5f7b773 [FIX] base_action_rule: dumb patch to avoid repeated calls to related cron task
base.action.rule uses a trick to piggyback on the
first execution of ir.cron's poolJobs() to register
its ORM hooks. It was currently doing that every
single time poolJobs() was called, leading to
incessant querying the ORM objects for which a
base action rule exist. 
Now it will do it only once, and then respect the
scheduled executions.
Soon this mechanism will be removed and replaced
by a proper event handler for some 'ORM finished init'
event, to be fired by the server.

bzr revid: odo@openerp.com-20110624102419-safqqq1hcc5v1tau
2011-06-24 12:24:19 +02:00
Launchpad Translations on behalf of openerp 6c57b9ddc1 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110601043809-ocpn3eaostvtf4mx
2011-06-01 04:38:09 +00:00
Raphael Collet e23b1cd050 [MERGE] move menu 'Automated Actions' to Administration/Customization
bzr revid: rco@openerp.com-20110519145312-7awlwys2opzy8bva
2011-05-19 16:53:12 +02:00
Amit Bhavsar (Open ERP) fca888b1c8 [usability],change in manu automated action
bzr revid: amb@tinyerp.com-20110519123747-ysmde794md2m1esg
2011-05-19 18:07:47 +05:30
Amit Bhavsar (Open ERP) 61aa21b90c [usability] move action rules into administration, base_action_rule_view
bzr revid: amb@tinyerp.com-20110518122409-3dpyvfdq0fai5hmj
2011-05-18 17:54:09 +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
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
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
Launchpad Translations on behalf of openerp ad0ececa4e Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110412043500-p2dr3313fnqonqsm
bzr revid: launchpad_translations_on_behalf_of_openerp-20110413044003-7pujurdq9cldrqkm
bzr revid: launchpad_translations_on_behalf_of_openerp-20110415050633-iw3b088ogvp5c34f
2011-04-15 05:06:33 +00:00
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 d8ca559b5d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110329044041-qyy3q7u1em74acq9
2011-03-29 04:40:41 +00:00
niv-openerp 55a226ef3a [MERGE] Resynchronized with trunk.
bzr revid: nicolas.vanhoren@openerp.com-20110325102413-7xjgusazsow7nwaf
2011-03-25 11:24:13 +01:00
vro 28bb0168f2 [IMP]: Detailed descriptions added.
bzr revid: vro@tinyerp.com-20110322132141-nlms978ymg4mom1g
2011-03-22 18:51:41 +05:30
Launchpad Translations on behalf of openerp 8c5349a683 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110320044558-ev1jrkafe83u2pxc
bzr revid: launchpad_translations_on_behalf_of_openerp-20110321044719-jq7brro8iejzgpqq
bzr revid: launchpad_translations_on_behalf_of_openerp-20110322043613-5hvgnsn9xs2glqfx
2011-03-22 04:36:13 +00:00
Rifakat Haradwala (Open ERP) 2fe7c51e36 [REM] email.smtp_server: removed email.smtp_server and did changes in email module
bzr revid: rha@tinyerp.com-20110321133156-y57yw6sekshnw9ns
2011-03-21 19:01:56 +05:30
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
vro 3e6ec6f679 [ADD]: Images: base_action_rule, base_calendar, base_contact, base crypt
bzr revid: vro@tinyerp.com-20110314121708-xzia08gel40uvygp
2011-03-14 17:47:08 +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
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
Harry (OpenERP) 85e8c93460 [MERGE] merged with trunk-addons-development
bzr revid: hmo@tinyerp.com-20110225074706-pjzvvfqe1200zwji
2011-02-25 13:17:06 +05:30
Thibault Francois 33765897a3 [MERGE][FIX] merge from trunk + fixes conflict
bzr revid: tfr@openerp.com-20110224150309-nujh3109r295yc9b
2011-02-24 16:03:09 +01:00
Thibault Francois a001b29366 [MERGE] my-addons
bzr revid: tfr@openerp.com-20110214163231-41oa4q6mrczj0015
2011-02-14 17:32:31 +01:00
Yogesh (OpenERP) 659900e4d5 [IMP] add argument in email_send method of addons module.
bzr revid: ysa@tinyerp.com-20110209091848-tb1d9qcj9bz3iq2b
2011-02-09 14:48:48 +05:30
Yogesh (OpenERP) 26447d3f50 [MOV] change module name email to emails
bzr revid: ysa@tinyerp.com-20110208085311-yepv15l0pskvrmc2
2011-02-08 14:23:11 +05:30
Yogesh (OpenERP) 6bdf56a973 [MERGE] Merge with lp:openobject-addons
bzr revid: ysa@tinyerp.com-20110204092456-t9lequsjqs7pk1vz
2011-02-04 14:54:56 +05:30