6072fd11af
[MERGE] merged trunk.
...
bzr revid: vmt@openerp.com-20121210111654-0pm3pupnqqeip52n
2012-12-10 12:16:54 +01:00
e7f4891d46
[IMP] use the openerp namespace.
...
bzr revid: vmt@openerp.com-20121206145632-0h1coh5aaem65wsy
2012-12-06 15:56:32 +01:00
1dba8eb0c3
[FIX] typo in docstring
...
bzr revid: abo@openerp.com-20121204153544-ungdrl3sf88h3ej0
2012-12-04 16:35:44 +01:00
4f1e657da7
[IMP] we actually can merge more than two opps together
...
bzr revid: abo@openerp.com-20121203164026-jd722eo3h2vqwfkq
2012-12-03 17:40:26 +01:00
4e64f8e96f
[WIP] redirect to the right view (opp or lead)
...
improve documentation and code style
bzr revid: abo@openerp.com-20121120181333-ho2zu27q1qs2hoe5
2012-11-20 19:13:33 +01:00
3dba2e5586
[IMP] remove a write() that sincerely seems useless
...
improve some var names
bzr revid: abo@openerp.com-20121119181224-c206f0xzuxw2hes0
2012-11-19 19:12:24 +01:00
6974be3d6d
[IMP] remove dead code from crm_partner_to_opportunity and crm_phonecall_to_opportunity
...
fp and al judged that phonecall2opp wizard was just a 'one more click' step
instead of the wizard, a phonecall will directly be converted into an opp when clicking on the 'Convert to opp' button (todo)
tests have been adapted, but some tests are still missing like 'merge lead with opp' or 'merge leads together' (todo)
documentation has been improved
bzr revid: abo@openerp.com-20121114184134-m37k9mwsq2hclgii
2012-11-14 19:41:34 +01:00
22d2823e74
[FIX] leads merge feature
...
bzr revid: abo@openerp.com-20120927134513-pi9wr5vt0f02bqsu
2012-09-27 15:45:13 +02:00
c6a71b8dbb
[IMP] crm: clear apis
...
bzr revid: hmo@tinyerp.com-20111021070111-tzgqm0jo3gor9jvm
2011-10-21 12:31:11 +05:30
ed37664ec9
[FIX] merge opportunity fix
...
bzr revid: kjo@tinyerp.com-20110926091424-0nibn122kicrp768
2011-09-26 14:44:24 +05:30
c1ad93498d
[MERGE] lp:~openerp-dev/openobject-addons/trunk-usability-bug_when_merging_opportunities-aar
...
bzr revid: stw@openerp.com-20110914125814-2djnda3zlanzhfas
2011-09-14 14:58:14 +02:00
4b9d94d3b9
[FIX] Clean and Rewrite the code of the previous commit
...
bzr revid: stw@openerp.com-20110914103959-c2kbbmosrkv3w6ge
2011-09-14 12:39:59 +02:00
28986d87fb
[IMP] improve the opportunity merging and its attachments
...
bzr revid: aar@tinyerp.com-20110912125106-xmh53poxaytd4frt
2011-09-12 18:21:06 +05:30
ee8fb1c6f7
[IMP] solve bug when merge opportunities
...
bzr revid: aar@tinyerp.com-20110906070258-hcyvgcmvy9bkiuaz
2011-09-06 12:32:58 +05:30
2f543db06e
[IMP] mail: cleanup/rename API + adapt dependencies (wip)
...
bzr revid: odo@openerp.com-20110825122757-0mqr0gbol25t0n41
2011-08-25 14:27:57 +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
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
3e6b0297d0
[IMP] crm*: update crm modules to new mail module (wip)
...
bzr revid: odo@openerp.com-20110722182337-5irz3g2qva0cf45e
2011-07-22 20:23:37 +02:00
37e5b6aa27
[MERGE] trunk
...
bzr revid: tfr@openerp.com-20110627094420-4hgyyo72orq3dp0u
2011-06-27 11:44:20 +02:00
2b5a65155e
[MERGE] with trunk
...
bzr revid: tfr@openerp.com-20110616153244-82785aneylz1h3tu
2011-06-16 17:32:44 +02:00
c827143085
[Fix] crm: correct the indeation
...
bzr revid: sbh@tinyerp.com-20110601120047-knq61e9m0sotf5b0
2011-06-01 17:30:47 +05:30
aaacdac704
[MERGE] Merge with lp:~openerp-dev/openobject-addons/trunk-calendar
...
bzr revid: sbh@tinyerp.com-20110601111119-7nggxba11p0bp5wb
2011-06-01 16:41:19 +05:30
3a6010b706
[MERGE] Merge with lp:openobject-addons
...
bzr revid: sbh@tinyerp.com-20110601103949-lhzpnstpexkxca91
2011-06-01 16:09:49 +05:30
4b6fa91c17
[MERGE] Merge with lp:openobject-addons
...
bzr revid: sbh@tinyerp.com-20110512050143-5tbc55oop00ksr4u
2011-05-12 10:31:43 +05:30
c79040b08e
[IMP] merge opp, merging data in the module responsible of those data
...
bzr revid: tfr@openerp.com-20110506081447-k6mglb3ipzfd1bns
2011-05-06 10:14:47 +02:00
3f694e2e6d
[FIX]: crm: changes regarding
...
*Merge opportunities wizard
*Convert opportunities wizard, fix for cr and uid parameter passing
bzr revid: rha@tinyerp.com-20110505115242-dsp2161zun8r2wmd
2011-05-05 17:22:42 +05:30
cc3d7333c8
[FIX][IMP] all modules improvement.
...
bzr revid: amp@tinyerp.com-20110429084948-x0pny8n2ersc4h8m
2011-04-29 14:19:48 +05:30
cf032c0bf0
[MERGE] correction of backlog1
...
bzr revid: hmo@tinyerp.com-20110421095844-73673t3zs2clyeba
2011-04-21 15:28:44 +05:30
4b2f93cb34
[FIX]: removed method _history() and called history() instead
...
bzr revid: rha@tinyerp.com-20110421091915-fw1sr549av69mm4b
2011-04-21 14:49:15 +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
e0c7efa201
[MERGE] fix few crm issue
...
bzr revid: tfr@openerp.com-20110420152955-8pae1j13cgfqpv2h
2011-04-20 17:29:55 +02:00
5da2329d03
[Fix] crm: fix the buildbot warning
...
bzr revid: sbh@tinyerp.com-20110413060915-g4yyry312tvtoc6e
2011-04-13 11:39:15 +05:30
f886532a45
[Fix] crm: Fix the string
...
bzr revid: sbh@tinyerp.com-20110413051704-snm72vjkly632eyj
2011-04-13 10:47:04 +05:30
8334cc2c59
[MERGE] Merge with lp:openobject-addons
...
bzr revid: sbh@tinyerp.com-20110413045550-zlcq9sjo6txa65nz
2011-04-13 10:25:50 +05:30
047b10f0ff
[FIX] mass convert oldest lead
...
bzr revid: tfr@openerp.com-20110411085120-xdjn8z046ak9enen
2011-04-11 10:51:20 +02:00
1a45ff614d
[MERGE] crm improvement
...
bzr revid: tfr@openerp.com-20110407092730-bjm0pwq9mewpvzc0
2011-04-07 11:27:30 +02:00
0703c5d506
[IMP, FIX] partner look up, only name =, convert merge only with one opp, don't merge cancelled and done, fix history loss, take info from oldest opp
...
bzr revid: tfr@openerp.com-20110329134022-80wkml8mbgwp9igy
2011-03-29 15:40:22 +02:00
49a52d542a
[IMP, FIX] partner look up, only name =, convert merge only with one opp, don't merge cancelled and done, fix history loss, take info from oldest opp
...
bzr revid: tfr@openerp.com-20110329131242-z8rtt70fj7u8ishi
2011-03-29 15:12:42 +02:00
84fca70681
[ADD] Mass convert lead 2 opp
...
bzr revid: tfr@openerp.com-20110316143025-92c4khhhwjlc3c86
2011-03-16 15:30:25 +01:00
6ef20247f0
[ADD] Mass mailing + Mass forward
...
bzr revid: tfr@openerp.com-20110228171827-32ftmy34psg9c600
2011-02-28 18:18:27 +01:00
85e8c93460
[MERGE] merged with trunk-addons-development
...
bzr revid: hmo@tinyerp.com-20110225074706-pjzvvfqe1200zwji
2011-02-25 13:17:06 +05:30
c4b9f8f781
[Fix] fix buildbot warning
...
bzr revid: sbh@tinyerp.com-20110225052042-7ejedxroblhl38j7
2011-02-25 10:50:42 +05:30
33765897a3
[MERGE][FIX] merge from trunk + fixes conflict
...
bzr revid: tfr@openerp.com-20110224150309-nujh3109r295yc9b
2011-02-24 16:03:09 +01:00
0811ebc782
[FIX] MERGE opportunity acess right
...
bzr revid: tfr@openerp.com-20110222151800-958p80hjopv1ggt1
2011-02-22 16:18:00 +01:00
655b917b82
[FIX]
...
bzr revid: tfr@openerp.com-20110217153543-vw7r3nmu7lr5ytsn
2011-02-17 16:35:43 +01:00
35ba1c6c9e
[FIX] read unlik opportunities
...
bzr revid: tfr@openerp.com-20110217134106-dpg4gjpkxrp8xsfj
2011-02-17 14:41:06 +01:00
d972df33da
[FIX] delete unlink opportunity in field opportunity_ids in wizard
...
bzr revid: tfr@openerp.com-20110217125731-9qp6uw5srjl7ibzo
2011-02-17 13:57:31 +01:00
bf5c7f5171
[IMP] Merge attachement + complete information of opportunity
...
bzr revid: tfr@openerp.com-20110209150712-i79q4z43jev56tpi
2011-02-09 16:07:12 +01:00
a0e3a22dda
[FIX] merge opportunity add in m2m ok
...
bzr revid: tfr@openerp.com-20110209141545-l01rbb9rt4ls24h2
2011-02-09 15:15:45 +01:00
6ca06b7027
[FIX] crm View, onchange, history
...
bzr revid: tfr@openerp.com-20110208133640-4o0trrfk68yx7vu0
2011-02-08 14:36:40 +01:00
Vo Minh Thu
Antonin Bourguignon
Harry (OpenERP)
Kuldeep Joshi (OpenERP)
Stephane Wirtel
Amit Parmar (OpenERP)
Olivier Dony
tfr@openerp.com
Bhumika (OpenERP)
Rifakat Haradwala (Open ERP)
Thibault Francois