6ebeb076c3
[MERGE] with trunk
...
bzr revid: fka@tinyerp.com-20121217051643-o8j4hz7w8thwbymi
2012-12-17 10:46:43 +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
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
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
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
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
342680e244
[IMP] code style and documentation
...
bzr revid: abo@openerp.com-20121120181536-vmgw4a5qo03qs5ga
2012-11-20 19:15:36 +01:00
Foram Katharotiya (OpenERP)
Fabien Pinckaers
Antony Lesuisse
Olivier Dony
Antonin Bourguignon
Thibault Delavallée
Fabien Pinckaers
Khushboo Bhatt (Open ERP)
Sanjay Gohel (Open ERP)
Divyesh Makwana (Open ERP)