c270aa7693
[MERGE]
...
bzr revid: fp@tinyerp.com-20121208162456-f544eem3hs4sm8i7
2012-12-08 17:24:56 +01:00
e6efcaeabc
[MERGE] improve_crm_leads_flux by abo
...
bzr revid: al@openerp.com-20121208144139-o9zr10b7qbij48d5
2012-12-08 15:41:39 +01:00
d30c3a32db
crm change stupid base action rule, this will be completed in the base action rule branch
...
bzr revid: al@openerp.com-20121208141610-o5driggb14sx7e1s
2012-12-08 15:16:10 +01:00
56f5c12020
fix
...
bzr revid: fp@tinyerp.com-20121208133604-w17o1fd3gn4uxe1s
2012-12-08 14:36:04 +01:00
01b1ee9e3f
[MERGE] Misc Fixes
...
bzr revid: fp@tinyerp.com-20121208131449-4mly488l1o5benuw
2012-12-08 14:14:49 +01:00
5c98593604
[IMP] fields name
...
bzr revid: fp@tinyerp.com-20121208104558-2jr4j84go4gcemrb
2012-12-08 11:45:58 +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
e7b30b164e
[MERGE] Another batch of Bugfixes from 6.1
...
Up to 6.1 revision 6800 olt@tinyerp.com-20120516065727-ghvzjttnncj8ryj0
bzr revid: odo@openerp.com-20121207183024-adx8vnq9cytxi2lu
2012-12-07 19:30:24 +01:00
a778faec7c
[MERGE] part of addons 28: review some filters in phonecalls and account_analytic_analysis
...
bzr revid: qdp-launchpad@openerp.com-20121207133010-ma7a32po5om13blr
2012-12-07 14:30:10 +01:00
c082f008ac
[MERGE] removal of 'mark as read/unread' actions
...
bzr revid: qdp-launchpad@openerp.com-20121207130808-kdxocx9pdi2a47d7
2012-12-07 14:08:08 +01:00
392f1913f3
Merged Latest.
...
bzr revid: tta@openerp.com-20121207112002-jtes7j1er6leyd89
2012-12-07 16:20:02 +05:00
c09b9cb5f9
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121207043623-mrfjgzunwq1dlmmh
bzr revid: launchpad_translations_on_behalf_of_openerp-20121207044755-avo3gbucdjj6i0ms
2012-12-07 04:47:55 +00:00
808850ec54
[IMP] _find_matching_partner() method
...
also minor doc imp
bzr revid: abo@openerp.com-20121206160553-upxra7pkab3vhi1g
2012-12-06 17:05:53 +01:00
5db87bea9c
[MERGE] Bugfixes from 6.1 until revision 6800
...
bzr revid: odo@openerp.com-20121206153856-9y9v8ok6yxo6l5f0
2012-12-06 16:38:56 +01:00
2359a6deef
[IMP] implement the action_button_convert2opportunity button
...
phonecalls are now directly converted into opp without any wizards
bzr revid: abo@openerp.com-20121206153541-hni4xva3jlnq2xr9
2012-12-06 16:35:41 +01:00
d31a58c1f6
[FIX] change a button type 'action' to 'object'
...
also imp indentation
bzr revid: abo@openerp.com-20121206144321-19vha43sj317iwi5
2012-12-06 15:43:21 +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
1a8e876957
Make crm.lead's stage unclickable.
...
bzr revid: tta@openerp.com-20121206091351-r30zftxqdguvxvcl
2012-12-06 14:13:51 +05:00
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
fdfb872c68
[IMP] code style
...
bzr revid: abo@openerp.com-20121205184617-ohe292g8zp2x83jq
2012-12-05 19:46:17 +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
d304fedd60
[IMP] there is no 'lead2partner' wizard anymore
...
bzr revid: abo@openerp.com-20121205164045-agkbtpkoiv6fim3o
2012-12-05 17:40:45 +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
538834d9c3
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121206044118-gn1y04y813l6skve
bzr revid: launchpad_translations_on_behalf_of_openerp-20121206045406-0pzpwmkyyxre13hn
2012-12-06 04:54:06 +00:00
6a6b0127ef
[MERGE] lp:~openerp-dev/openobject-addons/trunk-bug-1038189-kbh-new
...
lp bug: https://launchpad.net/bugs/1038189 fixed
bzr revid: vta@openerp.com-20121205133723-97su5a0ulgc1prg1
2012-12-05 14:37:23 +01:00
9ea1cb2879
[MERGE] trunk
...
bzr revid: abo@openerp.com-20121205130321-wj2xt8iz17u0bhix
2012-12-05 14:03:21 +01:00
4a0cc32042
[MERGE] Merge lp:openobject-addons.
...
bzr revid: bth@tinyerp.com-20121205120419-6yyfl0ik2uars793
2012-12-05 17:34:19 +05:30
149525095c
[IMP] Replaced String.
...
bzr revid: bth@tinyerp.com-20121205090114-8xq7fsntg4xn3dzr
2012-12-05 14:31:14 +05:30
aec7ff5024
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121205052048-tvbqvj40zdyoxtf0
bzr revid: launchpad_translations_on_behalf_of_openerp-20121205054308-gayp86s3a2we62y7
2012-12-05 05:43:08 +00:00
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
1dba8eb0c3
[FIX] typo in docstring
...
bzr revid: abo@openerp.com-20121204153544-ungdrl3sf88h3ej0
2012-12-04 16:35:44 +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
7d27a761d9
[MERGE] trunk
...
bzr revid: abo@openerp.com-20121204103506-07ublj0x0r8r73rc
2012-12-04 11:35:06 +01:00
b7d32d62c0
[FIX]crm:onchange on tree view
...
bzr revid: kbh@tinyerp.com-20121204094428-5d4tyllzdwa05o9r
2012-12-04 15:14:28 +05:30
d7b4414f70
[REM]crm:method of phoncall
...
bzr revid: kbh@tinyerp.com-20121204085647-2a5x0fin6z6l03lc
2012-12-04 14:26:47 +05:30
4d3e27e478
[FIX]crm:onchange added on opportunity_id
...
bzr revid: kbh@tinyerp.com-20121204072442-bqs25ks3vkn5da0t
2012-12-04 12:54:42 +05:30
a865423e0f
[MERGE]merge with trunk
...
bzr revid: kbh@tinyerp.com-20121204061729-tl6loso2kr6imc2t
2012-12-04 11:47:29 +05:30
2d68dd89fe
[IMP]crm:onchange method for opportunity to set phone,mobile,sales team and partner
...
bzr revid: kbh@tinyerp.com-20121204060042-dgr2ibddolhk5yzg
2012-12-04 11:30:42 +05:30
683f31e51b
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121204055506-fin73s7n3o52fmuy
bzr revid: launchpad_translations_on_behalf_of_openerp-20121204055956-fsd4tp3felpk8pm5
2012-12-04 05:59:56 +00: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
308e4f1073
[I18N] Removed duplicated terms for inherited [_sql]_constraints -> 400 terms removed
...
bzr revid: odo@openerp.com-20121203162755-p71dnn0k0t2b98yp
2012-12-03 17:27:55 +01:00
Fabien Pinckaers
Antony Lesuisse
Olivier Dony
Quentin (OpenERP)
Tejas Tank
Launchpad Translations on behalf of openerp
Antonin Bourguignon
Bhumi Thakkar (Open ERP)
Khushboo Bhatt (Open ERP)