Commit Graph

4702 Commits

Author SHA1 Message Date
Launchpad Translations on behalf of openerp cc8025387b Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121214053905-mac64ijay9566opr
bzr revid: launchpad_translations_on_behalf_of_openerp-20121214054902-12ndwftreb4g1964
2012-12-14 05:49:02 +00:00
Fabien Pinckaers 8579f12ce7 [IMP] color in CRM opportunities
bzr revid: fp@tinyerp.com-20121213142314-x9sc2g8l9kbnikpb
2012-12-13 15:23:14 +01:00
Launchpad Translations on behalf of openerp d6ea61789f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121213044507-t1hpxi43gks88w2e
bzr revid: launchpad_translations_on_behalf_of_openerp-20121213050131-3r9t674ehhnkneky
2012-12-13 05:01:31 +00:00
Launchpad Translations on behalf of openerp 2e7f68e09f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121212043903-maiyd94p4ifgdqew
bzr revid: launchpad_translations_on_behalf_of_openerp-20121212044145-k216g0bcavdlf2o3
bzr revid: launchpad_translations_on_behalf_of_openerp-20121212045414-tgg69aaw4dz72b0p
2012-12-12 04:54:14 +00:00
Launchpad Translations on behalf of openerp cc69fe1b25 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121211044948-8q9vf1f9ftrzq4wm
bzr revid: launchpad_translations_on_behalf_of_openerp-20121211050318-3noic2ymt0j497rw
2012-12-11 05:03:18 +00:00
Thibault Delavallée 0e85b997ef [MERGE] Sync with trunk.
bzr revid: tde@openerp.com-20121210083743-9xcv6bhxkh75ay66
2012-12-10 09:37:43 +01:00
Launchpad Translations on behalf of openerp 7f1d5daf2f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121210043931-72a32pz7q282df45
bzr revid: launchpad_translations_on_behalf_of_openerp-20121210044428-d9bzm1dnqc26voci
2012-12-10 04:44:28 +00:00
Fabien Pinckaers f3fc080ef7 [MERGE] module desc + stock
bzr revid: fp@tinyerp.com-20121209105527-4ot27zsv5vqr38ls
2012-12-09 11:55:27 +01:00
Launchpad Translations on behalf of openerp 87009adb89 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121209043953-q5uis2ecp5c7g9xg
2012-12-09 04:39:53 +00:00
Fabien Pinckaers c270aa7693 [MERGE]
bzr revid: fp@tinyerp.com-20121208162456-f544eem3hs4sm8i7
2012-12-08 17:24:56 +01:00
Antony Lesuisse e6efcaeabc [MERGE] improve_crm_leads_flux by abo
bzr revid: al@openerp.com-20121208144139-o9zr10b7qbij48d5
2012-12-08 15:41:39 +01:00
Antony Lesuisse 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
Fabien Pinckaers 56f5c12020 fix
bzr revid: fp@tinyerp.com-20121208133604-w17o1fd3gn4uxe1s
2012-12-08 14:36:04 +01:00
Fabien Pinckaers 01b1ee9e3f [MERGE] Misc Fixes
bzr revid: fp@tinyerp.com-20121208131449-4mly488l1o5benuw
2012-12-08 14:14:49 +01:00
Fabien Pinckaers 5c98593604 [IMP] fields name
bzr revid: fp@tinyerp.com-20121208104558-2jr4j84go4gcemrb
2012-12-08 11:45:58 +01:00
Antony Lesuisse 0cc0dda679 crm non translatable string
bzr revid: al@openerp.com-20121208083038-9hm7uausdmbgclc2
2012-12-08 09:30:38 +01:00
Antony Lesuisse 3fa8c94859 [MERGE] trunk
bzr revid: al@openerp.com-20121208082814-qftvqsdht91lxvcc
2012-12-08 09:28:14 +01:00
Olivier Dony 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
Quentin (OpenERP) 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
Quentin (OpenERP) 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
Tejas Tank 392f1913f3 Merged Latest.
bzr revid: tta@openerp.com-20121207112002-jtes7j1er6leyd89
2012-12-07 16:20:02 +05:00
Thibault Delavallée 3177ffc800 [MERGE] Sync with trunk.
bzr revid: tde@openerp.com-20121207093430-7y1xu8nrxfm74pkn
2012-12-07 10:34:30 +01:00
Launchpad Translations on behalf of openerp 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
Antonin Bourguignon 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
Olivier Dony 5db87bea9c [MERGE] Bugfixes from 6.1 until revision 6800
bzr revid: odo@openerp.com-20121206153856-9y9v8ok6yxo6l5f0
2012-12-06 16:38:56 +01:00
Antonin Bourguignon 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
Antonin Bourguignon 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
Antonin Bourguignon 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
Tejas Tank 1a8e876957 Make crm.lead's stage unclickable.
bzr revid: tta@openerp.com-20121206091351-r30zftxqdguvxvcl
2012-12-06 14:13:51 +05:00
Thibault Delavallée 08e746f4e9 [MERGE] Sync with trunk.
bzr revid: tde@openerp.com-20121206090336-g1yb1hjzmw54y3ut
2012-12-06 10:03:36 +01:00
Launchpad Translations on behalf of openerp 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
Antonin Bourguignon 09e2b82331 [FIX] typo in a comment
bzr revid: abo@openerp.com-20121205192454-qhge3cef8c6hd070
2012-12-05 20:24:54 +01:00
Antonin Bourguignon 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
Antonin Bourguignon fdfb872c68 [IMP] code style
bzr revid: abo@openerp.com-20121205184617-ohe292g8zp2x83jq
2012-12-05 19:46:17 +01:00
Antonin Bourguignon aef3c22f7f [IMP] identation and doc
bzr revid: abo@openerp.com-20121205183545-uyu9a1t5gl182s1m
2012-12-05 19:35:45 +01:00
Antonin Bourguignon 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
Antonin Bourguignon 9f3688a692 [FIX] forgot a %
bzr revid: abo@openerp.com-20121205170912-ttwnyvma0472mjpe
2012-12-05 18:09:12 +01:00
Antonin Bourguignon d304fedd60 [IMP] there is no 'lead2partner' wizard anymore
bzr revid: abo@openerp.com-20121205164045-agkbtpkoiv6fim3o
2012-12-05 17:40:45 +01:00
Antonin Bourguignon 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
Antonin Bourguignon cc4b35e30a [IMP] code style
bzr revid: abo@openerp.com-20121205155043-ab3twinl6ghatrez
2012-12-05 16:50:43 +01:00
Antonin Bourguignon 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
vta vta@openerp.com 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
Antonin Bourguignon 9ea1cb2879 [MERGE] trunk
bzr revid: abo@openerp.com-20121205130321-wj2xt8iz17u0bhix
2012-12-05 14:03:21 +01:00
Bhumi Thakkar (Open ERP) 4a0cc32042 [MERGE] Merge lp:openobject-addons.
bzr revid: bth@tinyerp.com-20121205120419-6yyfl0ik2uars793
2012-12-05 17:34:19 +05:30
Thibault Delavallée 3e2651998f [MERGE] Merged addons branch trunk-join-speedup-tde, holding mail_message modifications to have favorite_user_ids -> starred, functional searchable field. This field checks if there is a related notification, for the current user, about the starred flag.
bzr revid: tde@openerp.com-20121205095554-80pxwnuaaq2lz638
2012-12-05 10:55:54 +01:00
Bhumi Thakkar (Open ERP) 149525095c [IMP] Replaced String.
bzr revid: bth@tinyerp.com-20121205090114-8xq7fsntg4xn3dzr
2012-12-05 14:31:14 +05:30
Launchpad Translations on behalf of openerp 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
Antonin Bourguignon 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
Antonin Bourguignon 1dba8eb0c3 [FIX] typo in docstring
bzr revid: abo@openerp.com-20121204153544-ungdrl3sf88h3ej0
2012-12-04 16:35:44 +01:00
Antonin Bourguignon 6f8c5baffe [IMP] use fields.datetime.now()
bzr revid: abo@openerp.com-20121204153351-ckl04lewsl83a19l
2012-12-04 16:33:51 +01:00