bdd8a38121
[MERGE] Sync with trunk.
...
bzr revid: tde@openerp.com-20130402081312-v4pmhvv25gopey9y
2013-04-02 10:13:12 +02:00
2d925d5c27
[FIX]crm: crm merge tests testing new merge behaviour (opps before leads)
...
bzr revid: dle@openerp.com-20130329130615-gbjqw0x2ybeekext
2013-03-29 14:06:15 +01:00
58a31f00d8
[FIX]crm: crm lead merge, add create_date in argument for sorting
...
bzr revid: dle@openerp.com-20130329115908-gjia2se2kgnkaahh
2013-03-29 12:59:08 +01:00
3679b0c44c
[FIX]crm: convert lead to opportunity, opportunity always win vs lead, even if lead.stage > opp.lead
...
bzr revid: dle@openerp.com-20130329111609-7v516rnid2ytk836
2013-03-29 12:16:09 +01:00
ee348877ad
[MERGE] sync with visibility
...
bzr revid: chm@openerp.com-20130325153341-1rzlwyr1m37vpec3
2013-03-25 16:33:41 +01:00
2a2929b91c
[FIX] salesteams: create leads with default section_id
...
bzr revid: chm@openerp.com-20130325153240-jppxhjv27f7zpngn
2013-03-25 16:32:40 +01:00
5b3b35cd7c
[MERGE] from visibility and alias
...
bzr revid: chm@openerp.com-20130325104314-sx1hpm5bdzoyh92b
2013-03-25 11:43:14 +01:00
9845f41c09
[IMP] project, project_issue: improve get_empty_list_help
...
bzr revid: chm@openerp.com-20130325104012-h5ryupgzglia4twg
2013-03-25 11:40:12 +01:00
a4d3976caf
[IMP] sales teams: in progress
...
bzr revid: chm@openerp.com-20130325102555-5q3j1y5dapohgax5
2013-03-25 11:25:55 +01:00
05a9270e47
[IMP] crm.case.section,salesteams: kanban
...
bzr revid: chm@openerp.com-20130322160934-3mekvjm9hxaiwp4b
2013-03-22 17:09:34 +01:00
e4cffe267e
[FIX] crm_lead
...
bzr revid: chm@openerp.com-20130322150110-mdgra3ppqui5eanj
2013-03-22 16:01:10 +01:00
a45ad6ec82
[IMP] crm: clean code
...
bzr revid: chm@openerp.com-20130322123803-43mz918j3ez9muvg
2013-03-22 13:38:03 +01:00
9d45f9ad82
[IMP] code cleaning for get_empty_list_help
...
bzr revid: chm@openerp.com-20130321133139-k6ycur34ojw2qhjq
2013-03-21 14:31:39 +01:00
809ec6e49f
[IMP] view_form: statusbar with folded selection, remove fold = false
...
bzr revid: chm@openerp.com-20130321125626-83cckp5vdb14t18u
2013-03-21 13:56:26 +01:00
7175b3e3fb
[IMP] make strings translatable
...
bzr revid: tpa@tinyerp.com-20130321053855-2cg08qtcsjrouo35
2013-03-21 11:08:55 +05:30
cd90ed025a
[MRG] merge with lp:openobject-addons
...
bzr revid: tpa@tinyerp.com-20130321045350-wrm8yh6p0zywlhbb
2013-03-21 10:23:50 +05:30
ae30f8fff3
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20130320125517-jv2ot85iypncoesj
2013-03-20 13:55:17 +01:00
be05b374a1
[MERGE] forwardport of bugfixes made in v7 up to revision 8854.
...
bzr revid: qdp-launchpad@openerp.com-20130314112740-s01t51p4m7mxcumz
2013-03-14 12:27:40 +01:00
b255703166
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20130313141718-dw76m7fvy0co3rfi
2013-03-13 15:17:18 +01:00
3dc1a58ed5
[FIX] crm, email_template: fixed help messages talking about partners and leads instead of leads and partners... well, I think this comment is not very understandable, but at least there is a commit message. Horray.
...
bzr revid: tde@openerp.com-20130313121221-lo0kmkt2lltyr94e
2013-03-13 13:12:21 +01:00
2f4a59fd06
[IMP] email_template, crm: added forgotten filters for opt-out; cleaned help of opt-out; email body is back into internal note as it has been decided that it was too much change for 7.0, especially that email content parsing is not robust enough.
...
bzr revid: tde@openerp.com-20130313112013-veqzplextey1300p
2013-03-13 12:20:13 +01:00
d130a05e8c
[FIX] crm, email_template: opt_out parameter used only for mass mailing and marketing campaigns. Updated help accordingly.
...
bzr revid: tde@openerp.com-20130308124753-dzt5e5nf7zpaq2dk
2013-03-08 13:47:53 +01:00
b979204344
[IMP] give name to the wizard and improve domain
...
bzr revid: tpa@tinyerp.com-20130308093740-al8tywa721h3spy1
2013-03-08 15:07:40 +05:30
864ff38236
[IMP] CRM: when processing incoming emails to create a lead, do not add the email content as description.
...
bzr revid: tde@openerp.com-20130307153216-hab124jnmcmj3dm8
2013-03-07 16:32:16 +01:00
c164cac08c
[IMP] crm: logging/schedulign a call now adds the description in the chatter message.
...
bzr revid: tde@openerp.com-20130306140107-myvtia1tsham9yuv
2013-03-06 15:01:07 +01:00
6de2650299
[IMP] Suggested recipients: check whether an email is linked to a partner.
...
bzr revid: tde@openerp.com-20130228170546-t04n73pvuwtp20jh
2013-02-28 18:05:46 +01:00
3131bcaf49
[MERGE] Sync with 7.0
...
bzr revid: tde@openerp.com-20130228091737-z87qfktspdqs1l71
2013-02-28 10:17:37 +01:00
081ef3d91e
[REV] crm: new_send_mail code is back, because can't delete code called by views.
...
bzr revid: tde@openerp.com-20130228091612-dtue2pr0c3y4zqz1
2013-02-28 10:16:12 +01:00
d1219f9a97
[FIX] crm: if email_from was not valid, the merge of lead was crashing with 'list index out of range' error (trying to reach first element of [])
...
bzr revid: qdp-launchpad@openerp.com-20130227121506-guwlypemmyl2tvgk
2013-02-27 13:15:06 +01:00
c5e395ec49
[REM] Crm: removed 'send mail' button and related function. Cleaned poportunity basic template.
...
bzr revid: tde@openerp.com-20130226113624-0znlq3eihuzfbutm
2013-02-26 12:36:24 +01:00
a07bd2dbf4
[FIX] CRM: suggeste recipint for partner OR email, not both.
...
bzr revid: tde@openerp.com-20130222101434-moh3clokcbf5gmsw
2013-02-22 11:14:34 +01:00
4c98128d11
[IMP] mail: remove auto_follow on user_id field. Replaced by partner suggestion on user_id, based on message_get_suggested_partners called in Chatter. Improved JS code, to handle various case (partner without email, email without partner, partner with email).
...
bzr revid: tde@openerp.com-20130221184243-pu2tgtlanh34onpr
2013-02-21 19:42:43 +01:00
c494212dbf
[MERGE] Sync with 7.0
...
bzr revid: tde@openerp.com-20130221130023-u481oijd6fcy73hf
2013-02-21 14:00:23 +01:00
e0372e8c6d
[FWD] [MERGE] Forward port of addons-v7 until rev. 8736.
...
bzr revid: tde@openerp.com-20130221105247-ezl63lpl4vdjxtys
2013-02-21 11:52:47 +01:00
8711625764
[FIX] merge of leads/opps with attachments
...
bzr revid: qdp-launchpad@openerp.com-20130220140936-qy04t7hjebsc9tgg
2013-02-20 15:09:36 +01:00
c3b6408715
[IMP] Chatter: refactoring of 'include new emails/partners' in Chatter compose. It does not create partner everytime; discarding the creation popup discards the creation and addition as recipient.
...
bzr revid: tde@openerp.com-20130220124923-w3e9hxomniphadj7
2013-02-20 13:49:23 +01:00
22184bda0e
[FIX] Will bring attachments together when merging leads/opportunities
...
bzr revid: jco@openerp.com-20130220124052-8zf2pkqn4oy4y4qw
2013-02-20 13:40:52 +01:00
713ff5c65d
[FIX] use openerp namespace.
...
bzr revid: vmt@openerp.com-20130219084255-m8kxcsejob64hh72
2013-02-19 09:42:55 +01:00
719a708579
[MERGE]Latest 7.0
...
bzr revid: dle@openerp.com-20130212133730-azwne7kp2uzuzxm5
2013-02-12 14:37:30 +01:00
f9f5b19fc2
[FIX]stages with sequence 0 was regarded as canceled, because of 0 meaned false. Replaced and assignment expression with if
...
bzr revid: dle@openerp.com-20130212133632-i1wqwo3jrwy07fvl
2013-02-12 14:36:32 +01:00
ec6a6782c9
[FIX] crm merge dont tamper fields constant
...
bzr revid: al@openerp.com-20130208172025-cj4mzshz9j3jmui5
2013-02-08 18:20:25 +01:00
c84d60a74e
[FIX]Forget to re-revert ,.join
...
bzr revid: dle@openerp.com-20130206132219-o1y154vo40r0rsyx
2013-02-06 14:22:19 +01:00
808fb96ded
[REVERT]lead merge text contact back to , instead of line return
...
bzr revid: dle@openerp.com-20130206131234-9y73kgq6nqplt2lt
2013-02-06 14:12:34 +01:00
0c4a656639
[IMP] salesteams: add account, crm: on_change user_id, change the salesteams
...
bzr revid: chm@openerp.com-20130206115736-fw3coo0u50itvjlq
2013-02-06 12:57:36 +01:00
fb58f9290b
[FIX]crm lead: When merge, logger message display now Merged lead or merged opportunity depending on the initial type
...
bzr revid: dle@openerp.com-20130206111536-qbc70bqrweotwj1f
2013-02-06 12:15:36 +01:00
4b2556736e
[FIX]if convert lead to opp, if result merged data stage is not in sales team, then set the stage of the sales team with the lowest sequence
...
bzr revid: dle@openerp.com-20130206110656-3tz2gccn8i3fu29w
2013-02-06 12:06:56 +01:00
1c58057325
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20130206101612-by10wynzt652kh67
2013-02-06 11:16:12 +01:00
b76f4c7a45
[IMP] salesteams: add sales order and quotation
...
bzr revid: chm@openerp.com-20130206094414-8f7kp19dam6su991
2013-02-06 10:44:14 +01:00
5c7ab68ccf
[FIX]crm lead opportunity merge/convert order by sequence desc instead of create_date
...
bzr revid: dle@openerp.com-20130205170641-mduj04o1ge0ze7qr
2013-02-05 18:06:41 +01:00
2e416db0d0
[FIX]crm lead opportunity merge/convert order by sequence desc instead of create_date
...
bzr revid: dle@openerp.com-20130205163502-0zty8byrs3em2kmd
2013-02-05 17:35:02 +01:00
bfcbb3f619
[IMP] crm: dynamic_help
...
bzr revid: chm@openerp.com-20130205161002-3dxect9a9x43852z
2013-02-05 17:10:02 +01:00
00b6936b70
[FIX]Convert to opportunity. Take oldest opportunity stage except cancel
...
bzr revid: dle@openerp.com-20130205145146-w1yqv4hqtwbskso0
2013-02-05 15:51:46 +01:00
ae3ec8e758
[MERGE]Latest trunk
...
bzr revid: dle@openerp.com-20130205130032-x942wxg9srzxbw5e
2013-02-05 14:00:32 +01:00
cfd09ab190
[FIX]Merge notify
...
bzr revid: dle@openerp.com-20130205113024-fo5suvqitcalgd2m
2013-02-05 12:30:24 +01:00
952ee17989
[FIX]Fix redirect to opportunity
...
bzr revid: dle@openerp.com-20130205101822-l7w2h1rz3utsonur
2013-02-05 11:18:22 +01:00
83dd5d14b0
[FIX]Remove useless print, useless partner_id redifining, invisible context for section_id
...
bzr revid: dle@openerp.com-20130205100940-fc272ogg3v58j3hj
2013-02-05 11:09:40 +01:00
191ff031c9
[FIX]Merge lead/opportunities
...
bzr revid: dle@openerp.com-20130205095028-vomxadw2sy3lck9x
2013-02-05 10:50:28 +01:00
1b9503923c
[FIX]Merge Lead/Opp on convert to opportunity
...
bzr revid: dle@openerp.com-20130204175106-q2r6xmox16co4n35
2013-02-04 18:51:06 +01:00
d26dcb7f0f
[IMP] crm: lead -> opportunity: when creating a new customer, use strong info about customer name or throw a warning instead of guessing from email or subject. Purpose: avoid having bloated partner database.
...
bzr revid: tde@openerp.com-20130201120424-y16ni0ztp7ciu8e0
2013-02-01 13:04:24 +01:00
08ca917d5b
[FIX] Fixed the fix, because actually we could have a contact_email and not a contact_name according to the regex. Should be working fine now.
...
bzr revid: tde@openerp.com-20130131160924-cp0xcj7nm7zbb07v
2013-01-31 17:09:24 +01:00
cc79a9b3b6
[FIX] crm: lead to opportunity conversion: when creating a customer, use the email_from to try to find a name to the partner before using the subject.
...
bzr revid: tde@openerp.com-20130131152820-wyz2026n0hdr87dn
2013-01-31 16:28:20 +01:00
e9f6e0036e
[IMP] crm_lead: message_new now uses the on_change_partner_id to set the address of the partner of the lead, if any.
...
bzr revid: tde@openerp.com-20130129143815-37voxmjw22eop7jl
2013-01-29 15:38:15 +01:00
497b4a88e2
[IMP]improve the view of convert to opportunity
...
bzr revid: rma@tinyerp.com-20130118124119-ars1aqg2jg7y037o
2013-01-18 18:11:19 +05:30
7ec52bb84b
[FIX] crm: at lead creation, take into account the type given in vals to find the stage_id (if not provided) + refactoring of create() of tasks, project issues and leads
...
bzr revid: qdp-launchpad@openerp.com-20130115100353-z35mqrwij936n54s
2013-01-15 11:03:53 +01:00
ad70edb40b
[FIX] mail_thread subclasses: message_new must not override the explicitly provided ``custom_values``
...
This was the case before, but was broken involuntarily during the
big mail refactoring for v7. The default values provided by
custom message_new methods should only be used as defaults.
bzr revid: odo@openerp.com-20130110172723-ym7mcmdllcucj0j3
2013-01-10 18:27:23 +01:00
d3348706d9
[MERGE] clean convert to opporunity wizard
...
bzr revid: fp@tinyerp.com-20130107173037-ssam27a2acba7v23
2013-01-07 18:30:37 +01:00
8da57cbd2e
[IMP] crm, project, project_issue: reply_to address is now the alias of the parent section, project, project, if any.
...
bzr revid: tde@openerp.com-20130103170316-8n6d8u0h14dy4x48
2013-01-03 18:03:16 +01:00
8a89312742
[FIX] crm, project, project_issue: default stage_id at creation should not overwrite values given in create values if any.
...
bzr revid: tde@openerp.com-20130103150653-nlwp0u8bt2ljs3uc
2013-01-03 16:06:53 +01:00
9bd0ccb864
[FIX] only probability > 0 for stage assignation when convertion of lead into opportunity
...
bzr revid: acl@openerp.com-20130103133841-oeadynn3lctw1uu8
2013-01-03 14:38:41 +01:00
a26b66dbf5
[FIX] mail_thread subclasses: message_new() should copy the author_id if one was identified
...
bzr revid: odo@openerp.com-20130115134359-mczjs42f4gchrk7d
2013-01-15 14:43:59 +01:00
b0e1872b3e
[FIX] crm: don't use context if you didn't check it's not equal to None... stupid me
...
bzr revid: qdp-launchpad@openerp.com-20121228143912-9v8gnv17cpn8l3ug
2012-12-28 15:39:12 +01:00
3ee1580802
[IMP] Typo
...
bzr revid: cbi@openerp.com-20121228122343-wulz32j4yfk5cot2
2012-12-28 13:23:43 +01:00
39888a5128
[FIX] Leads no longer get a random draft stage, but correctly get one from their sales team
...
bzr revid: cbi@openerp.com-20121228121858-bcbsinqx7ong724c
2012-12-28 13:18:58 +01:00
e3c31cab9e
[IMP] track_visibility atribute: moved onto explicit strings.
...
bzr revid: tde@openerp.com-20121220114730-nip8qaaajr5mqw6s
2012-12-20 12:47:30 +01:00
91e98f9d17
[CLEAN] crm: cleaned subtypes, removed auto following that will be added in mail_thread. Updated track_visility parameter.
...
bzr revid: tde@openerp.com-20121219164048-7q9xy3pjs3demtcf
2012-12-19 17:40:48 +01:00
fd8f0dfa65
[FIX] FIxed last fix. changed fields must include invisible fields that are in the _track structure.
...
bzr revid: tde@openerp.com-20121219113205-wa5dt7vpsxjmwav0
2012-12-19 12:32:05 +01:00
95897cf9ac
[FIX] crm: added a tracking on state, otherwise subtypes for won/lost were not activated.
...
bzr revid: tde@openerp.com-20121219111838-v80c932564zf3axl
2012-12-19 12:18:38 +01:00
e1be2b071a
[FIX] fix _track stuff
...
bzr revid: fp@tinyerp.com-20121219004222-x0gt6qhvwhcpdgld
2012-12-19 01:42:22 +01:00
065821dfd6
[MOD] use read() instead of browse
...
bzr revid: fp@tinyerp.com-20121218234907-j672neyvifmo4bur
2012-12-19 00:49:07 +01:00
8e0c7f9781
[MERGE] Sync with trunk.
...
bzr revid: tde@openerp.com-20121218181852-j9qg1po5y4yw67ko
2012-12-18 19:18:52 +01:00
fc0c2942ba
[MERGE] Another batch of bugfixes from 6.1
...
bzr revid: odo@openerp.com-20121218175547-7c1uxq4ypbi314gx
2012-12-18 18:55:47 +01:00
81242cd1f3
[IMP] CRM: updated subtype for auto subscription.
...
bzr revid: tde@openerp.com-20121218153518-vzzrejipoxdcozkl
2012-12-18 16:35:18 +01:00
0e77d66989
[MERGE] staging branch with misc fixes
...
bzr revid: qdp-launchpad@openerp.com-20121218152005-a1gahm72g6wylrg3
2012-12-18 16:20:05 +01:00
50d0533939
[MERGE] Sync with trunk, to have last fixes about CRM.
...
bzr revid: tde@openerp.com-20121218140842-ctuzgms6dqr6c296
2012-12-18 15:08:42 +01:00
011b4f0045
[FIX] crm stage_id statusbar issues
...
bzr revid: vta@openerp.com-20121218134629-x0ygxo1hwer0m4jm
2012-12-18 14:46:29 +01:00
a513344bc1
[MERGE] trunk
...
bzr revid: qdp-launchpad@openerp.com-20121218134118-ixggega7sumgv6gq
2012-12-18 14:41:18 +01:00
13637c22b9
[IMP] crm: add a button to send emails on opportunities
...
bzr revid: qdp-launchpad@openerp.com-20121218133844-jjx5ebo122ovwmfg
2012-12-18 14:38:44 +01:00
899031fc30
[CLEAN] CRM: cleaned a bit message_post and fixed subtype names.
...
bzr revid: tde@openerp.com-20121218132113-588s3tfml01lmqpa
2012-12-18 14:21:13 +01:00
b95b32d644
[MERGE] Merged branch holding subtype work by APA.
...
bzr revid: tde@openerp.com-20121218131142-2jb6wac6y9q6dc7v
2012-12-18 14:11:42 +01:00
cf05dbf53a
[IMP] CRM: added tracked fields, removed now unnecessary message_post code.
...
bzr revid: tde@openerp.com-20121218125634-4mrml8xpb25u3oaw
2012-12-18 13:56:34 +01:00
2dbe4a696e
[MERGE] Sync wirth trunk.
...
bzr revid: tde@openerp.com-20121218093241-y0id5g1r1k6yok42
2012-12-18 10:32:41 +01:00
73980eba5f
[MERGE] trunk-import-openerp-thu (use strict naming convention when importing openerp stuff)
...
bzr revid: rco@openerp.com-20121218085914-qzr2upqfxmfbzfsx
2012-12-18 09:59:14 +01:00
a972f0181d
[MERGE] with trunk
...
bzr revid: fka@tinyerp.com-20121218045009-drt4gjkcnpl5hxxr
2012-12-18 10:20:09 +05:30
b67f73c327
[MERGE] Sync with trunk
...
bzr revid: odo@openerp.com-20121218025230-zig415ldtmazgbxt
2012-12-18 03:52:30 +01:00
84d7987f33
[MERGE] Bugfixes from 6.1 until revision 6900
...
rev.6900 = xal@openerp.com-20120720134532-t07xr3lp8ouhn2dv
bzr revid: odo@openerp.com-20121218021123-9ligpn7bkr9zo4n7
2012-12-18 03:11:23 +01:00
6a16fb2fde
[IMP] better domain for crm opportunities
...
bzr revid: fp@tinyerp.com-20121217173046-8w945atg1hxp2wum
2012-12-17 18:30:46 +01:00
baeefa6952
[FIX] replace from/import stuffs of openerp stuffs by from/import openerp.stuffs
...
bzr revid: cto@openerp.com-20121217154628-0c0i8y3389yz4dxd
2012-12-17 16:46:28 +01:00
15fe515601
[MERGE] From trunk
...
bzr revid: cto@openerp.com-20121217144306-tkodwpox30cuvb28
2012-12-17 15:43:06 +01:00
6d2a0d270f
[MERGE] Merged lp:~openerp-dev/openobject-addons/trunk-tracked-fields-chs, with some selective choices.
...
bzr revid: tde@openerp.com-20121217095510-8upbg071esk5hlk1
2012-12-17 10:55:10 +01:00
1f2f15c51d
[IMP] update followers
...
bzr revid: fka@tinyerp.com-20121217091402-pylrooffkzykcnu9
2012-12-17 14:44:02 +05:30
7608fe70de
[IMP] add generic method _subscribe_followers_subtype in mail_thread & remove method in all module
...
bzr revid: fka@tinyerp.com-20121217073817-8kmp0j3kn39gyrwg
2012-12-17 13:08:17 +05:30
6ebeb076c3
[MERGE] with trunk
...
bzr revid: fka@tinyerp.com-20121217051643-o8j4hz7w8thwbymi
2012-12-17 10:46:43 +05:30
de45fd4fc1
[MERGE]with trunk
...
bzr revid: sgo@tinyerp.com-20121217050659-q5w6zwefizgjv4fd
2012-12-17 10:36:59 +05:30
b4d72207b2
[IMP] cleaning sales team stuff
...
bzr revid: fp@tinyerp.com-20121216155843-kl2mgr3ecyi85mw1
2012-12-16 16:58:43 +01:00
f0ade4cd4d
[IMP] Add comments
...
bzr revid: fka@tinyerp.com-20121213115810-x1myyu344xdklky9
2012-12-13 17:28:10 +05:30
e664c9583a
[IMP] improve code
...
bzr revid: fka@tinyerp.com-20121213102024-gly6jwslfkyg9wsm
2012-12-13 15:50:24 +05:30
0139a0baed
[IMP] improve code
...
bzr revid: fka@tinyerp.com-20121213085354-j1u1d7zj0peyoulb
2012-12-13 14:23:54 +05:30
6072fd11af
[MERGE] merged trunk.
...
bzr revid: vmt@openerp.com-20121210111654-0pm3pupnqqeip52n
2012-12-10 12:16:54 +01:00
510af53747
[MERGE]with trunk
...
bzr revid: sgo@tinyerp.com-20121210050956-qie5jf94xvgogiaq
2012-12-10 10:39:56 +05:30
955f2588a2
[MERGE] with trunk
...
bzr revid: fka@tinyerp.com-20121210045724-sk2hk8mmi8iahfwn
2012-12-10 10:27:24 +05:30
c270aa7693
[MERGE]
...
bzr revid: fp@tinyerp.com-20121208162456-f544eem3hs4sm8i7
2012-12-08 17:24:56 +01:00
0cc0dda679
crm non translatable string
...
bzr revid: al@openerp.com-20121208083038-9hm7uausdmbgclc2
2012-12-08 09:30:38 +01:00
3fa8c94859
[MERGE] trunk
...
bzr revid: al@openerp.com-20121208082814-qftvqsdht91lxvcc
2012-12-08 09:28:14 +01:00
0cce342627
[IMP] update followers
...
bzr revid: fka@tinyerp.com-20121207105030-97ohiuppto439633
2012-12-07 16:20:30 +05:30
5db87bea9c
[MERGE] Bugfixes from 6.1 until revision 6800
...
bzr revid: odo@openerp.com-20121206153856-9y9v8ok6yxo6l5f0
2012-12-06 16:38:56 +01:00
e7f4891d46
[IMP] use the openerp namespace.
...
bzr revid: vmt@openerp.com-20121206145632-0h1coh5aaem65wsy
2012-12-06 15:56:32 +01:00
e76573f945
[FIX] reintroduce modifications forward ported from 6.1 from Olivier Dony
...
bzr revid: abo@openerp.com-20121206140428-2v271z0ozdwl1yi3
2012-12-06 15:04:28 +01:00
84527bbdf3
[IMP]improve code
...
bzr revid: fka@tinyerp.com-20121206064927-59pdr3580a693waa
2012-12-06 12:19:27 +05:30
09e2b82331
[FIX] typo in a comment
...
bzr revid: abo@openerp.com-20121205192454-qhge3cef8c6hd070
2012-12-05 20:24:54 +01:00
1df211b693
[IMP] rename methods in crm_lead and crm_phonecall:
...
in these classes, the method convert_partner() is now named handle_partner_assignation()
also the method in crm_phonecall has received the same refactoring than the one in crm_lead
documentation has been improved
these two method are a pure code duplication and would deserve a refactoring
bzr revid: abo@openerp.com-20121205192146-rogbsln3atcm1lvt
2012-12-05 20:21:46 +01:00
aef3c22f7f
[IMP] identation and doc
...
bzr revid: abo@openerp.com-20121205183545-uyu9a1t5gl182s1m
2012-12-05 19:35:45 +01:00
825472c6a7
[IMP] remove the make_partner() method which wasn't in use anywhere anymore
...
bzr revid: abo@openerp.com-20121205171815-ztd21cjrfi0cy1vr
2012-12-05 18:18:15 +01:00
9f3688a692
[FIX] forgot a %
...
bzr revid: abo@openerp.com-20121205170912-ttwnyvma0472mjpe
2012-12-05 18:09:12 +01:00
e2df492679
[FIX] wrong var name
...
also minor imp in crm_phonecall.py doc
bzr revid: abo@openerp.com-20121205161935-pm4x6v0y426qzc47
2012-12-05 17:19:35 +01:00
cc4b35e30a
[IMP] code style
...
bzr revid: abo@openerp.com-20121205155043-ab3twinl6ghatrez
2012-12-05 16:50:43 +01:00
35b0c81b61
[IMP] we actually don't have to perform this test: user_ids is tested in the for loop two lines below. It wouldn't change anything whether it's a None or an empty list
...
bzr revid: abo@openerp.com-20121205145109-ir4cea5j5cd82q8j
2012-12-05 15:51:09 +01:00
fce2550ac1
[IMP] improve code
...
bzr revid: fka@tinyerp.com-20121205085819-d6i1ool120ax8uft
2012-12-05 14:28:19 +05:30
48f9d6ca8f
[IMP] display subtype of related salesteam in lead
...
bzr revid: fka@tinyerp.com-20121205084426-1dk9gsy8upbfsgdx
2012-12-05 14:14:26 +05:30
b2ad0b28a9
[IMP] rename _merge_notification into _merge_notify and add a few doc
...
bzr revid: abo@openerp.com-20121204174231-wwwijubb657al2hw
2012-12-04 18:42:31 +01:00
6f8c5baffe
[IMP] use fields.datetime.now()
...
bzr revid: abo@openerp.com-20121204153351-ckl04lewsl83a19l
2012-12-04 16:33:51 +01:00
8142082057
[IMP] _get_type() is now an object method named _merge_get_result_type(), allowing to use it anywhere in the class
...
bzr revid: abo@openerp.com-20121204153222-a9nkj8xkx20x0p1b
2012-12-04 16:32:22 +01:00
c9c7b3e134
[FIX] docstring
...
bzr revid: abo@openerp.com-20121204133833-hwx10f4eqtm05ur9
2012-12-04 14:38:33 +01:00
b17de5f75f
[IMP] regroup leads' fields to merge in a global var and therefore avoid their duplication
...
bzr revid: abo@openerp.com-20121204133000-541vbw9vmts77myq
2012-12-04 14:30:00 +01:00
c91da1fb35
[MERGE]merge with latest trunk
...
bzr revid: sgo@tinyerp.com-20121203132425-umzbdj5gm6m29b6c
2012-12-03 18:54:25 +05:30
e1d1b049c1
[IMP] remove _get_subscription_data method
...
bzr revid: fka@tinyerp.com-20121203130126-1ofjqy0w459q58p1
2012-12-03 18:31:26 +05:30
c3a3492848
[MERGE] Sync with trunk.
...
bzr revid: tde@openerp.com-20121203093454-lf21qlsuse1ve8ro
2012-12-03 10:34:54 +01:00
60884cc4f6
[MERGE] trunk
...
bzr revid: abo@openerp.com-20121130170307-732mw3b7zjkc9l9l
2012-11-30 18:03:07 +01:00
6c53679c84
[IMP] tests for the merge feature
...
bzr revid: abo@openerp.com-20121130151413-07ezgnoaiuopsd90
2012-11-30 16:14:13 +01:00
33048d7c79
[IMP] merge addons23
...
bzr revid: fp@openerp.com-20121130100516-r0gspmovo8ebdqi0
2012-11-30 11:05:16 +01:00
8b251e53ca
[REM]crm:message improved for merge oppertunities/lead
...
bzr revid: kbh@tinyerp.com-20121129131720-iq54wku42h55bfdm
2012-11-29 18:47:20 +05:30
2a5e4e9308
[IMP]improve code
...
bzr revid: kbh@tinyerp.com-20121128055337-0s5cz2gkaou7unj0
2012-11-28 11:23:37 +05:30
3f626523ac
[IMP]improve code for merge lead/opportunity message
...
bzr revid: kbh@tinyerp.com-20121128053658-kiosagyvz7s78x4s
2012-11-28 11:06:58 +05:30
26492d98d5
[IMP] properly cycle through the salesmen (round-robin) while converting leads into opps with salesmen assignation
...
bzr revid: abo@openerp.com-20121127165401-s8fgs553gr2amj3u
2012-11-27 17:54:01 +01:00
34aa66449c
[IMP] indentation
...
bzr revid: abo@openerp.com-20121127164940-g31ywi5abnfslyfl
2012-11-27 17:49:40 +01:00
6fa5b85564
[IMP] add documentation
...
bzr revid: abo@openerp.com-20121127142628-ngmkhjyytrqyy9c0
2012-11-27 15:26:28 +01:00
257bc28f47
[MERGE]merge with trunk
...
bzr revid: sgo@tinyerp.com-20121127132410-97fdoscu8mhg7d6r
2012-11-27 18:54:10 +05:30
927491120a
[IMP]improve as per comment
...
bzr revid: sgo@tinyerp.com-20121127130723-44i0t3v89ewdy8zw
2012-11-27 18:37:23 +05:30
6daa367cad
[FIX] chatter message when we merge leads/opportunities is not well formatted
...
bzr revid: kbh@tinyerp.com-20121127085421-o4exf3xdcu1gt5e9
2012-11-27 14:24:21 +05:30
850668d2ff
[FIX] forgot to update this test: properly test that at the first opp met, a type 'opportunity' is returned
...
bzr revid: abo@openerp.com-20121126180920-s83ik6atj55yqhx1
2012-11-26 19:09:20 +01:00
1d79fa3569
[IMP] properly define the type of the resulting element after a merge between leads and/or opps
...
improve code style (shorten some var names for readability's sake)
improve documentation
bzr revid: abo@openerp.com-20121126174918-ickhxtrq2wzfhbo7
2012-11-26 18:49:18 +01:00
fd1104d095
[MERGE] trunk
...
bzr revid: abo@openerp.com-20121126102027-lxpt4dh3jyetpbu2
2012-11-26 11:20:27 +01:00
bc5884e305
[FIX]CRM:merged opportunities category
...
bzr revid: kbh@tinyerp.com-20121126090733-qtudsnzko4sn7dqz
2012-11-26 14:37:33 +05:30
60461a3803
[MERGE]merge with trunk
...
bzr revid: sgo@tinyerp.com-20121126061137-zlho8uq0fcxvrx5t
2012-11-26 11:41:37 +05:30
ccd78ad745
[IMP] remove message post for stage change and implement subtype on changed stage
...
bzr revid: sgo@tinyerp.com-20121126055541-nh8wjs35wviiybks
2012-11-26 11:25:41 +05:30
ba07c8bdaf
[MERGE]merge with trunk
...
bzr revid: sgo@tinyerp.com-20121126050352-zbm3tn75gg6ojqkp
2012-11-26 10:33:52 +05:30
2068c1ae4b
[Merge] Merge with main addons.
...
bzr revid: mdi@tinyerp.com-20121126044759-dk67dwd1mkk2rfo1
2012-11-26 10:17:59 +05:30
70c499a4d8
[IMP] lead form view, group form, project_gtd not an app
...
bzr revid: fp@tinyerp.com-20121124175319-35lipyk2wj8w9mmh
2012-11-24 18:53:19 +01:00
cd38db8d30
[IMP]if record in oppertunity type subtype convert opprtunity not shown
...
bzr revid: fka@tinyerp.com-20121123125338-x6cpm3gs0a3u90vx
2012-11-23 18:23:38 +05:30
6e1e4f084b
[IMP]improve code for tracking field and add code for tracked it
...
bzr revid: sgo@tinyerp.com-20121122051759-lks3ykule5w5om6x
2012-11-22 10:47:59 +05:30
342680e244
[IMP] code style and documentation
...
bzr revid: abo@openerp.com-20121120181536-vmgw4a5qo03qs5ga
2012-11-20 19:15:36 +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
e6a7f91925
[MERGE] with trunk
...
bzr revid: fka@tinyerp.com-20121120124426-eyc3m8qbf00p728d
2012-11-20 18:14:26 +05:30
df6c3c29ab
[IMP] crm: changed _sql_constraints
...
bzr revid: cha@tinyerp.com-20121120122705-ioqxdvf4e1as30zy
2012-11-20 17:57:05 +05:30
74825e615c
[MERGE] merge with parent branch
...
bzr revid: cha@tinyerp.com-20121120115934-i1a6yru1p5cw6tp8
2012-11-20 17:29:34 +05:30
b76352405b
[IMP] crm: added method to view phone calls related to partner
...
bzr revid: cha@tinyerp.com-20121120114706-80kw0u0zks4y2hoc
2012-11-20 17:17:06 +05:30
b9c07b1019
[MERGE] Sync with trunk.
...
bzr revid: tde@openerp.com-20121120090512-82lyg9jotfvlim0n
2012-11-20 10:05:12 +01:00
87d4e235a4
[MERGE] [FIX] hr_recruitment: fixed message_update, broken since a few weeks
...
Also fixed tools.misc.command_re -> tools.command_re
Also fixed fetchmail behavior when managing replies that could lead to messages having a good parent_id, but not attached to the correct document, if headers did not hold model and res_id data.
bzr revid: tde@openerp.com-20121120090237-cekj1kzvsb772hv1
2012-11-20 10:02:37 +01:00
8439e5fdab
[MERGE] with trunk
...
bzr revid: fka@tinyerp.com-20121120045052-l9olcqebf5kgebr2
2012-11-20 10:20:52 +05:30
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
f35df2fdc8
[FIX] crm: fixed a call to command_re, now in tools.mail.
...
bzr revid: tde@openerp.com-20121119132141-6zikqzuxlxap550f
2012-11-19 14:21:41 +01:00
4d0b357664
[IMP] remove comment: lead_ids is passed to the context in action_merge() (cf. crm_merge_opportunities.py)
...
bzr revid: abo@openerp.com-20121119131649-1usgf8qktrtd1tbo
2012-11-19 14:16:49 +01:00
e298cdfa82
[MERGE]merge with latest addons trunk
...
bzr revid: csn@openerp.com-20121119125613-211aykfipa9l59q3
2012-11-19 13:56:13 +01:00
5c17ed60e6
[IMP] improve code
...
bzr revid: fka@tinyerp.com-20121119111438-xobjmirj0wfq15pn
2012-11-19 16:44:38 +05:30
087fe434b8
[IMP] crm: added sql constraint to restrict field 'probability'
...
bzr revid: cha@tinyerp.com-20121119100843-kxy55wnvb6djt0sw
2012-11-19 15:38:43 +05:30
101b1003b1
[IMP] crm: re-added message subtypes.
...
bzr revid: tde@openerp.com-20121116095041-3tu0mqhzrgsfjaei
2012-11-16 10:50:41 +01:00
6db4b0b211
[IMP] remove restrictions on lead deletion
...
After a short conversation with fp, al, odo, abo: it seems that it would be nice for usability's sake to remove restrictions on leads deletion, in the CRM module.
This condition on leads' state was introduced several years ago by fp to avoid unfortunate misclicks. It has been followed by another one bypassing the first one in case where the sales team had the allow_unlink flag set.
Since the Delete button has been thrown away in the More menu, it shouldn't get misclicked anymore, preventing damages in the CRM pipe. This will simplify access rights for users: if you want to delete a lead, you can, whatever its state, whatever its sales team.
Access restriction is still possible though by creating a record rule with a domain on the lead.state.
lp bug: https://launchpad.net/bugs/1078037 fixed
bzr revid: abo@openerp.com-20121112180144-utqcm39etuuzxdsu
2012-11-12 19:01:44 +01:00
ab8b6fae11
[FIX] the double partner creation in lead2opportunity (introduced in revno 7251.1.122 revid:odo@openerp.com-20120823200629-1m1eym62l7aabzgl)
...
lp bug: https://launchpad.net/bugs/1065751 fixed
bzr revid: abo@openerp.com-20121107163037-bmywme6nnhlxaaic
2012-11-07 17:30:37 +01:00
48bf8e72da
[IMP] minor imp of code style
...
bzr revid: abo@openerp.com-20121107161142-c5iqr501mxbghy82
2012-11-07 17:11:42 +01:00
b0b9b61915
[FiX] get types fron context
...
bzr revid: shp@tinyerp.com-20121107125615-3hwvihesuqyblta4
2012-11-07 18:26:15 +05:30
efd48ffbef
[WIP] fix the duplicate partner creation when converting a lead to opportunity
...
lp bug: https://launchpad.net/bugs/1065751 fixed
bzr revid: abo@openerp.com-20121106175142-eoozcwd8xz5412mk
2012-11-06 18:51:42 +01:00
0acbe74789
[MERGE] English typos
...
bzr revid: fp@openerp.com-20121102173701-b424fq3bn7ferxbd
2012-11-02 18:37:01 +01:00
f47bf0fd0b
[MERGE] addons 16 sale
...
bzr revid: fp@openerp.com-20121102162611-3nt9oo1zcyzjh81l
2012-11-02 17:26:11 +01:00
67fc9a997c
[MERGE] crm improvements
...
bzr revid: fp@tinyerp.com-20121102091325-cesxnckhwg77tx6w
2012-11-02 10:13:25 +01:00
ccddcef5da
[FIX] set the domain
...
bzr revid: shp@tinyerp.com-20121031121720-8w2kml7l5mihdjop
2012-10-31 17:47:20 +05:30
2a03bc48b9
[IMP] or condition
...
bzr revid: shp@tinyerp.com-20121030093057-ybd2uhr926dnyt9u
2012-10-30 15:00:57 +05:30
ee4cd1af53
[FIX] crm lead country id shoud respect the state
...
bzr revid: jam@tinyerp.com-20121030090806-kdhfku7g8c108s8j
2012-10-30 14:38:06 +05:30
5569c20aa1
[FIXED] remove opportunity condition
...
bzr revid: shp@tinyerp.com-20121030070726-5s6ou598as1p4shb
2012-10-30 12:37:26 +05:30
7a8d675302
[IMP] code style
...
remove mutable default
remove useless whitespaces
bzr revid: abo@openerp.com-20121029181156-ao52q3uun3ilp2qk
2012-10-29 19:11:56 +01:00
97208c971b
[IMP] avoid tabs (4 spaces) in the middle of help text
...
bzr revid: abo@openerp.com-20121029173714-qpr4rrhll576jxmm
2012-10-29 18:37:14 +01:00
084a4217a7
[FIX] fixed when select type opportunuty then opportunuty in draft mode
...
bzr revid: shp@tinyerp.com-20121029132313-5ctreoq9nv2fxvxc
2012-10-29 18:53:13 +05:30
55ce6a560f
[FIX] when user select lead and get draft mode
...
bzr revid: shp@tinyerp.com-20121029124226-cjn6s3sj434rm5q7
2012-10-29 18:12:26 +05:30
56eb30846e
[MERGE]Merge with project branch
...
bzr revid: tch@tinyerp.com-20121029060656-brq1zbwvzf29vp76
2012-10-29 11:36:56 +05:30
26a0484b6f
[MERGE] merge with lp:openobject-addons
...
bzr revid: cha@tinyerp.com-20121025111831-22x83vr8u9lpms5v
2012-10-25 16:48:31 +05:30
1ef9c07654
[REM]:Remove unwanted code
...
bzr revid: aja@tinyerp.com-20121025102636-gsbkpfs2q85yo3lu
2012-10-25 15:56:36 +05:30
8bc8b450ef
[IMP]:Improve onchange
...
bzr revid: aja@tinyerp.com-20121025100629-dxjw5wsgi10pv2zz
2012-10-25 15:36:29 +05:30
9954cd3d08
[IMp]:Improve code in crm
...
bzr revid: aja@tinyerp.com-20121025094231-ggp3s17n7r5ndkt5
2012-10-25 15:12:31 +05:30
c5b625c692
[IMP]Improve tooltip in opportunity
...
bzr revid: tch@tinyerp.com-20121023120257-z078b6vqjlxdy43p
2012-10-23 17:32:57 +05:30
8346293d72
[MERGE]: Merge with lp:openobject-addons
...
bzr revid: mma@tinyerp.com-20121015090200-irfaskfn9i1p68j9
bzr revid: mma@tinyerp.com-20121016052513-vl56jxtp7xbpa2ry
2012-10-16 10:55:13 +05:30
c25b2fe8ee
[Merge] Merge with main addons.
...
bzr revid: mdi@tinyerp.com-20121015053013-nxfzocsq58bhqzzu
2012-10-15 11:00:13 +05:30
0b87880029
[IMP]all: imporve string state to status
...
bzr revid: mma@tinyerp.com-20121012114258-w2q3hg1wb5wlt8wi
2012-10-12 17:12:58 +05:30
Thibault Delavallée
dle@openerp.com
Christophe Matthieu
Turkesh Patel (Open ERP)
Quentin (OpenERP)
Josse Colpaert
Vo Minh Thu
Antony Lesuisse
Randhir Mayatra (OpenERP)
Olivier Dony
Fabien Pinckaers
Anael Closson
Chris Biersbach
Raphael Collet
Foram Katharotiya (OpenERP)
Cecile Tonglet
Sanjay Gohel (Open ERP)
Antonin Bourguignon
Fabien Pinckaers
Khushboo Bhatt (Open ERP)
Divyesh Makwana (Open ERP)
Ajay Chauhan (OpenERP)
Cedric Snauwaert
pankita shah (Open ERP)
Jigar Amin
Twinkle Christian (OpenERP)
ajay javiya (OpenERP)
Mayur Maheshwari (OpenERP)