876f1b6806
[CLEAN] remove old wizard interface + remove open history event, not used anymore
...
bzr revid: tfr@openerp.com-20111019122735-wy60y1o3czp25phw
2011-10-19 14:27:35 +02:00
Olivier Dony
8b7800750c
[MERGE] Fixes related to server removal of osv_memory
...
bzr revid: odo@openerp.com-20110927213803-rj2hujpigijhvvpl
2011-09-27 23:38:03 +02:00
Olivier Dony
674f3d794e
[FIX] crm: fix wizards for proper inheritance
...
bzr revid: odo@openerp.com-20110927172015-qoeaund7u2knrct5
2011-09-27 19:20:15 +02:00
Kuldeep Joshi (OpenERP)
ed37664ec9
[FIX] merge opportunity fix
...
bzr revid: kjo@tinyerp.com-20110926091424-0nibn122kicrp768
2011-09-26 14:44:24 +05:30
Fabien Pinckaers
44719f5d5f
fix
...
bzr revid: fp@tinyerp.com-20110924091726-gnqdy6oqqt7ytq64
2011-09-24 11:17:26 +02:00
Bharat (OpenERP)
cb01834474
[MERGE] merged with main addons
...
bzr revid: bde@tinyerp.com-20110915112258-0q44o8srvpkcwxhd
2011-09-15 16:52:58 +05:30
Stephane Wirtel
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
Stephane Wirtel
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
Olivier Dony
59b200ea85
[IMP] crm: cleanup add note wizard
...
bzr revid: odo@openerp.com-20110912171530-2p5l211791schp6d
2011-09-12 19:15:30 +02:00
Amit Parmar (OpenERP)
28986d87fb
[IMP] improve the opportunity merging and its attachments
...
bzr revid: aar@tinyerp.com-20110912125106-xmh53poxaytd4frt
2011-09-12 18:21:06 +05:30
Olivier Dony
98165a1522
[IMP] crm: mail composition wizard - better defaults
...
bzr revid: odo@openerp.com-20110907171127-shibkhmoi7ptbw1u
2011-09-07 19:11:27 +02:00
Bharat (OpenERP)
e5b15924cd
[IMP] improved the function name and made code compatible according to osv.osv_memory for wizard_history_event
...
bzr revid: bde@tinyerp.com-20110907124054-jochp9iishedo2ig
2011-09-07 18:10:54 +05:30
Olivier Dony
e9d94b824e
[IMP]: crm,mail: minor fixes after review
...
bzr revid: odo@openerp.com-20110906080014-6texz097jepfrwsp
2011-09-06 10:00:14 +02:00
Amit Parmar (OpenERP)
ee8fb1c6f7
[IMP] solve bug when merge opportunities
...
bzr revid: aar@tinyerp.com-20110906070258-hcyvgcmvy9bkiuaz
2011-09-06 12:32:58 +05:30
Bharat (OpenERP)
e4ba5e6c5a
[CONVERT] converted wizards from wizard.interface to osv.osv_memory for crm module
...
bzr revid: bde@tinyerp.com-20110830065610-hkl82810ljccy3fs
2011-08-30 12:26:10 +05:30
Antony Lesuisse
71443ad49f
[MERGE] trunk
...
bzr revid: al@openerp.com-20110827211948-kmap692ves3ixo4k
2011-08-27 23:19:48 +02: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
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
ksa (Open ERP)
b99b42a51d
[IMP]: remove stage type in lead and opportunity report
...
bzr revid: ksa@tinyerp.co.in-20110817054625-xh1v2s9bdkoxaqd4
2011-08-17 11:16:25 +05:30
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
Olivier Dony
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
52fd99498c
[MERGE + clean] bug fix lp:689566
...
bzr revid: tfr@openerp.com-20110629110531-baxztn7ro4cznbtn
2011-06-29 13:05:31 +02:00
Ashutosh Srivastava (Open ERP)
b84340d46e
crm :remove comment
...
bzr revid: asr@tinyerp.com-20110628104635-e7w3eupitogc8p04
2011-06-28 16:16:35 +05:30
Ashutosh Srivastava (Open ERP)
b0e033f261
[FIX] crm : Inconsistency when scheduling a call from an opportunity
...
lp bug: https://launchpad.net/bugs/689566 fixed
bzr revid: asr@tinyerp.com-20110628102536-cgjyefsqyme82qfk
2011-06-28 15:55:36 +05:30
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
Bhumika (OpenERP)
c827143085
[Fix] crm: correct the indeation
...
bzr revid: sbh@tinyerp.com-20110601120047-knq61e9m0sotf5b0
2011-06-01 17:30:47 +05:30
Bhumika (OpenERP)
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
Bhumika (OpenERP)
3a6010b706
[MERGE] Merge with lp:openobject-addons
...
bzr revid: sbh@tinyerp.com-20110601103949-lhzpnstpexkxca91
2011-06-01 16:09:49 +05:30
d6d2af63d6
[MERGE] jam correction + last correction by tfr
...
bzr revid: tfr@openerp.com-20110517132830-p42ps4qd0rkxsjf3
2011-05-17 15:28:30 +02:00
Jigar Amin
966212d0f6
[IMP] crm : added partner field to schedule call wizard for info
...
bzr revid: jam@tinyerp.com-20110516054802-isw0trjwv6n3uzmt
2011-05-16 11:18:02 +05:30
Bhumika (OpenERP)
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
Rifakat Haradwala (Open ERP)
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
Harry (OpenERP)
5be7bbd5c3
[MERGE] merged with trunk development branch
...
bzr revid: hmo@tinyerp.com-20110428111210-llk36qlgkdz1ls54
2011-04-28 16:42:10 +05:30
Ujjvala Collins (OpenERP)
92c356a2b9
[IMP] crm: Phone calls, usability improvements.
...
bzr revid: uco@tinyerp.com-20110427092202-2zhwtcyyyccbipk2
2011-04-27 14:52:02 +05:30
Harry (OpenERP)
cf032c0bf0
[MERGE] correction of backlog1
...
bzr revid: hmo@tinyerp.com-20110421095844-73673t3zs2clyeba
2011-04-21 15:28:44 +05:30
Rifakat Haradwala (Open ERP)
4b2f93cb34
[FIX]: removed method _history() and called history() instead
...
bzr revid: rha@tinyerp.com-20110421091915-fw1sr549av69mm4b
2011-04-21 14:49:15 +05:30
Harry (OpenERP)
1a404f0c96
[IMP] crm: send_mail_to_salesman method , call schedule_with_attach instead of direct send email
...
bzr revid: hmo@tinyerp.com-20110421080908-c3oc32kkwdygb2e4
2011-04-21 13:39:08 +05:30
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
Harry (OpenERP)
baaf0aafcb
[MERGE] correction
...
bzr revid: hmo@tinyerp.com-20110421065428-wbuau1oayr5s24yz
2011-04-21 12:24:28 +05:30
Rifakat Haradwala (Open ERP)
b511ca0034
[FIX] crm: fixed attachment problem as list
...
bzr revid: rha@tinyerp.com-20110421053450-2pj6x32de396uqoh
2011-04-21 11:04:50 +05:30
e0c7efa201
[MERGE] fix few crm issue
...
bzr revid: tfr@openerp.com-20110420152955-8pae1j13cgfqpv2h
2011-04-20 17:29:55 +02:00
Rifakat Haradwala (Open ERP)
e217bb0e39
[REM] crm: removed crm_send_email.py as it is unused
...
bzr revid: rha@tinyerp.com-20110420120459-f2ek7ifx0x0lgzhe
2011-04-20 17:34:59 +05:30
Ujjvala Collins (OpenERP)
55977b08c8
[REF]: Corrections for views.
...
bzr revid: uco@tinyerp.com-20110420091739-iyg7ezi3gybyir51
2011-04-20 14:47:39 +05:30
Husen Daudi
0843403790
improved label in phone calls
...
bzr revid: hda@hda-laptop-20110419132435-slnz5spllnu7iaud
2011-04-19 18:54:35 +05:30
Husen Daudi
281230ad87
fixed typo
...
bzr revid: hda@hda-laptop-20110419131359-pku1mofjrao121j1
2011-04-19 18:43:59 +05:30
Rifakat Haradwala (Open ERP)
44bcca9f2f
[IMP] email.compose.message: useability improvements
...
bzr revid: rha@tinyerp.com-20110419115850-8vsbd9yv3vhedgss
2011-04-19 17:28:50 +05:30
Anup (OpenERP)
47fbcd34a8
[FIX] crm : Confusing Typo in Schedule Phone call wizard changed.
...
bzr revid: ach@tinyerp.com-20110419112523-0nvutph0kqqx9fiy
2011-04-19 16:55:23 +05:30
tfr@openerp.com