Commit Graph

479 Commits

Author SHA1 Message Date
Antonin Bourguignon 6f8c5baffe [IMP] use fields.datetime.now()
bzr revid: abo@openerp.com-20121204153351-ckl04lewsl83a19l
2012-12-04 16:33:51 +01:00
Antonin Bourguignon 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
Antonin Bourguignon c9c7b3e134 [FIX] docstring
bzr revid: abo@openerp.com-20121204133833-hwx10f4eqtm05ur9
2012-12-04 14:38:33 +01:00
Antonin Bourguignon 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
Antonin Bourguignon 60884cc4f6 [MERGE] trunk
bzr revid: abo@openerp.com-20121130170307-732mw3b7zjkc9l9l
2012-11-30 18:03:07 +01:00
Antonin Bourguignon 6c53679c84 [IMP] tests for the merge feature
bzr revid: abo@openerp.com-20121130151413-07ezgnoaiuopsd90
2012-11-30 16:14:13 +01:00
Fabien Pinckaers 33048d7c79 [IMP] merge addons23
bzr revid: fp@openerp.com-20121130100516-r0gspmovo8ebdqi0
2012-11-30 11:05:16 +01:00
Antonin Bourguignon 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
Antonin Bourguignon 34aa66449c [IMP] indentation
bzr revid: abo@openerp.com-20121127164940-g31ywi5abnfslyfl
2012-11-27 17:49:40 +01:00
Antonin Bourguignon 6fa5b85564 [IMP] add documentation
bzr revid: abo@openerp.com-20121127142628-ngmkhjyytrqyy9c0
2012-11-27 15:26:28 +01:00
Antonin Bourguignon 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
Antonin Bourguignon 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
Antonin Bourguignon fd1104d095 [MERGE] trunk
bzr revid: abo@openerp.com-20121126102027-lxpt4dh3jyetpbu2
2012-11-26 11:20:27 +01:00
Divyesh Makwana (Open ERP) 2068c1ae4b [Merge] Merge with main addons.
bzr revid: mdi@tinyerp.com-20121126044759-dk67dwd1mkk2rfo1
2012-11-26 10:17:59 +05:30
Fabien Pinckaers 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
Antonin Bourguignon 342680e244 [IMP] code style and documentation
bzr revid: abo@openerp.com-20121120181536-vmgw4a5qo03qs5ga
2012-11-20 19:15:36 +01:00
Antonin Bourguignon 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
Ajay Chauhan (OpenERP) df6c3c29ab [IMP] crm: changed _sql_constraints
bzr revid: cha@tinyerp.com-20121120122705-ioqxdvf4e1as30zy
2012-11-20 17:57:05 +05:30
Ajay Chauhan (OpenERP) 74825e615c [MERGE] merge with parent branch
bzr revid: cha@tinyerp.com-20121120115934-i1a6yru1p5cw6tp8
2012-11-20 17:29:34 +05:30
Ajay Chauhan (OpenERP) 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
Thibault Delavallée b9c07b1019 [MERGE] Sync with trunk.
bzr revid: tde@openerp.com-20121120090512-82lyg9jotfvlim0n
2012-11-20 10:05:12 +01:00
Thibault Delavallée 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
Antonin Bourguignon 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
Thibault Delavallée 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
Antonin Bourguignon 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
Cedric Snauwaert e298cdfa82 [MERGE]merge with latest addons trunk
bzr revid: csn@openerp.com-20121119125613-211aykfipa9l59q3
2012-11-19 13:56:13 +01:00
Ajay Chauhan (OpenERP) 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
Thibault Delavallée 101b1003b1 [IMP] crm: re-added message subtypes.
bzr revid: tde@openerp.com-20121116095041-3tu0mqhzrgsfjaei
2012-11-16 10:50:41 +01:00
Antonin Bourguignon 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
Antonin Bourguignon 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
Antonin Bourguignon 48bf8e72da [IMP] minor imp of code style
bzr revid: abo@openerp.com-20121107161142-c5iqr501mxbghy82
2012-11-07 17:11:42 +01:00
pankita shah (Open ERP) b0b9b61915 [FiX] get types fron context
bzr revid: shp@tinyerp.com-20121107125615-3hwvihesuqyblta4
2012-11-07 18:26:15 +05:30
Antonin Bourguignon 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
Fabien Pinckaers 0acbe74789 [MERGE] English typos
bzr revid: fp@openerp.com-20121102173701-b424fq3bn7ferxbd
2012-11-02 18:37:01 +01:00
Fabien Pinckaers f47bf0fd0b [MERGE] addons 16 sale
bzr revid: fp@openerp.com-20121102162611-3nt9oo1zcyzjh81l
2012-11-02 17:26:11 +01:00
Fabien Pinckaers 67fc9a997c [MERGE] crm improvements
bzr revid: fp@tinyerp.com-20121102091325-cesxnckhwg77tx6w
2012-11-02 10:13:25 +01:00
pankita shah (Open ERP) ccddcef5da [FIX] set the domain
bzr revid: shp@tinyerp.com-20121031121720-8w2kml7l5mihdjop
2012-10-31 17:47:20 +05:30
pankita shah (Open ERP) 2a03bc48b9 [IMP] or condition
bzr revid: shp@tinyerp.com-20121030093057-ybd2uhr926dnyt9u
2012-10-30 15:00:57 +05:30
Jigar Amin 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
pankita shah (Open ERP) 5569c20aa1 [FIXED] remove opportunity condition
bzr revid: shp@tinyerp.com-20121030070726-5s6ou598as1p4shb
2012-10-30 12:37:26 +05:30
Antonin Bourguignon 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
Antonin Bourguignon 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
pankita shah (Open ERP) 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
pankita shah (Open ERP) 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
Twinkle Christian (OpenERP) 56eb30846e [MERGE]Merge with project branch
bzr revid: tch@tinyerp.com-20121029060656-brq1zbwvzf29vp76
2012-10-29 11:36:56 +05:30
Ajay Chauhan (OpenERP) 26a0484b6f [MERGE] merge with lp:openobject-addons
bzr revid: cha@tinyerp.com-20121025111831-22x83vr8u9lpms5v
2012-10-25 16:48:31 +05:30
ajay javiya (OpenERP) 1ef9c07654 [REM]:Remove unwanted code
bzr revid: aja@tinyerp.com-20121025102636-gsbkpfs2q85yo3lu
2012-10-25 15:56:36 +05:30
ajay javiya (OpenERP) 8bc8b450ef [IMP]:Improve onchange
bzr revid: aja@tinyerp.com-20121025100629-dxjw5wsgi10pv2zz
2012-10-25 15:36:29 +05:30
ajay javiya (OpenERP) 9954cd3d08 [IMp]:Improve code in crm
bzr revid: aja@tinyerp.com-20121025094231-ggp3s17n7r5ndkt5
2012-10-25 15:12:31 +05:30
Twinkle Christian (OpenERP) c5b625c692 [IMP]Improve tooltip in opportunity
bzr revid: tch@tinyerp.com-20121023120257-z078b6vqjlxdy43p
2012-10-23 17:32:57 +05:30