Olivier Dony
196c11d41e
[MERGE] latest trunk
...
bzr revid: odo@openerp.com-20110913132843-eo7vevh8h9924hm2
2011-09-13 15:28:43 +02:00
Olivier Dony
30cc28efbb
[FIX] crm: button/action methods must not return None
...
bzr revid: odo@openerp.com-20110913085249-tyv40pa84t4n2n01
2011-09-13 10:52:49 +02:00
Antony Lesuisse
4f5fa4f0d8
[MERGE] trunk
...
bzr revid: al@openerp.com-20110828025452-vkkj23005ct60wpb
2011-08-28 04:54:52 +02:00
Antony Lesuisse
e83ea8f54c
[IMP] res.partner.canal into crm.case.channel
...
bzr revid: al@openerp.com-20110827233130-end57de3i484r0kb
2011-08-28 01:31:30 +02:00
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
Antony Lesuisse
c8dcb4e685
[FIX] crm fix crm_claim
...
bzr revid: al@openerp.com-20110825045455-95a8nt7ep6sonk3a
2011-08-25 06:54:55 +02:00
Antony Lesuisse
42b36f710e
[MERGE] remove stage type ksa, and MASSIVE crm_lead cleanup
...
bzr revid: al@openerp.com-20110825041037-0jerocl9x8psve2c
2011-08-25 06:10:37 +02:00
Antony Lesuisse
039a6852d0
[IMP] crm tooltip on saleteam working time
...
bzr revid: al@openerp.com-20110825002936-8gpd07pmgraex07o
2011-08-25 02:29:36 +02:00
Antony Lesuisse
544ceeeb4a
[MERGE] rename team leader and improve tooltips
...
bzr revid: al@openerp.com-20110825001947-qkbxdlrli2ig1t6n
2011-08-25 02:19:47 +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
Mayur Maheshwari (OpenERP)
517620e407
[IMP]crm:field name is renamed
...
bzr revid: mma@tinyerp.com-20110818065756-kkqu0bqm1u4mz0b5
2011-08-18 12:27:56 +05:30
ksa (Open ERP)
925d4eab9c
[REM]: remove unuse space
...
bzr revid: ksa@tinyerp.co.in-20110817125947-3b5yiwo10g7v7leu
2011-08-17 18:29:47 +05:30
ksa (Open ERP)
5e581e6188
[IMP]: for stage type of mark lost and mark won
...
bzr revid: ksa@tinyerp.co.in-20110817124134-jkpomynnsu5r51wp
2011-08-17 18:11:34 +05:30
ksa (Open ERP)
d7746c8403
[IMP]: change state for that improve method stage_change
...
bzr revid: ksa@tinyerp.co.in-20110817123220-uyv6wfjh51tcdkjw
2011-08-17 18:02:20 +05:30
ksa (Open ERP)
568b5315e1
[IMP]: method for find percentage for stage in crm
...
bzr revid: ksa@tinyerp.co.in-20110817122209-1u82d7otgjyo8df8
2011-08-17 17:52:09 +05:30
ksa (Open ERP)
45ecce84a6
[REM]: type field for case stage
...
bzr revid: ksa@tinyerp.co.in-20110817103135-l9ts7x7s3wljz9fq
2011-08-17 16:01:35 +05:30
ksa (Open ERP)
bc6a9c631e
[IMP]: remove stage type for crm when use method for set stage from cancel to open
...
bzr revid: ksa@tinyerp.co.in-20110817102104-776rgzg3hit5oya7
2011-08-17 15:51:04 +05:30
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
Raphael Collet
be0809a670
[MERGE] remove address_id from user
...
bzr revid: rco@openerp.com-20110803100602-75dcx4dqsh3sragi
2011-08-03 12:06:02 +02:00
RavishchanraMurari (Open ERP)
304de3d738
remove_address_id
...
bzr revid: rmu@tinyerp.com-20110803054215-v0vbxrm7ceef9p4q
2011-08-03 11:12:15 +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
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
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
be10c98ff3
[CLEAN] remove print
...
bzr revid: tfr@openerp.com-20110629134636-qyk3xgafn420khhj
2011-06-29 15:46:36 +02:00
52fd99498c
[MERGE + clean] bug fix lp:689566
...
bzr revid: tfr@openerp.com-20110629110531-baxztn7ro4cznbtn
2011-06-29 13:05:31 +02:00
DBR (OpenERP)
efc308e690
[FIX] Fix the problem of reconfirm
...
lp bug: https://launchpad.net/bugs/802539 fixed
bzr revid: dbr@tinyerp.com-20110628050350-yt7muh597au50xpr
2011-06-28 10:33:50 +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)
3a6010b706
[MERGE] Merge with lp:openobject-addons
...
bzr revid: sbh@tinyerp.com-20110601103949-lhzpnstpexkxca91
2011-06-01 16:09:49 +05:30
d27ae843a3
[FIX] duplicate and edit all bug + refactor crm_case crm_base meeting phonecall
...
bzr revid: tfr@openerp.com-20110531133232-aiclel28l79p25bj
2011-05-31 15:32:32 +02:00
Jigar Amin
4ebbe5d4b6
[IMP] crm_phoncall : remove the visibilty of the draft from phonecall
...
bzr revid: jam@tinyerp.com-20110516061745-zlhzw0gjabqn6vh1
2011-05-16 11:47:45 +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
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
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)
96c65e3dbe
[FIX]: improvements for attachment as dictionary
...
bzr revid: rha@tinyerp.com-20110420095458-0w53lpa10sv7wnep
2011-04-20 15:24:58 +05:30
Jigar Amin
0d9276a6c9
[FIX] crm : lp:747776 added condition for the ids
...
lp bug: https://launchpad.net/bugs/747776 fixed
bzr revid: jam@tinyerp.com-20110419121132-ttcra01mxigd2tp1
2011-04-19 17:41:32 +05:30
Harry (OpenERP)
37a916b539
[MERGE] cleanup email module and rename it with mail module
...
bzr revid: hmo@tinyerp.com-20110406054513-bn5e5sys9ugm1vq5
2011-04-06 11:15:13 +05:30
Harry (OpenERP)
131daf04aa
[FIX] mail: In email.therad, fixed message_new and message_update method
...
bzr revid: hmo@tinyerp.com-20110406043752-nqpgav3h6f0rk8v1
2011-04-06 10:07:52 +05:30
Rifakat Haradwala (Open ERP)
dfb7539e98
[IMP]: improvements
...
bzr revid: rha@tinyerp.com-20110331090350-uud2kept28bs1xv0
2011-03-31 14:33:50 +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
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
Rifakat Haradwala (Open ERP)
455fb2d6b3
[IMP] email: email cleanup
...
bzr revid: rha@tinyerp.com-20110318134419-78qmipdipsryqgnz
2011-03-18 19:14:19 +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
Thibault Francois
9fb3e10ee7
[MERGE] bug fix 722723
...
bzr revid: tfr@openerp.com-20110304125334-ht2v8t21lwq7q7md
2011-03-04 13:53:34 +01:00
Thibault Francois
4cead9e021
[FIX] exception raise when not reply to remove, email send to user not to reply_to of the sales team
...
bzr revid: tfr@openerp.com-20110304121336-lcj3586ayaalq19v
2011-03-04 13:13:36 +01:00
Harry (OpenERP)
975c088bb8
[MERGE] merged with trunk-addons-deveopment branch
...
bzr revid: hmo@tinyerp.com-20110303052728-q2xcuqcbh7lxkmnx
2011-03-03 10:57:28 +05:30
Thibault Francois
edd32485de
[FIX] raise an exception on case.email only if need to remind partner
...
bzr revid: tfr@openerp.com-20110302122907-ex23dr1jzuuyjghs
2011-03-02 13:29:07 +01:00
Olivier Dony