Commit Graph

210 Commits

Author SHA1 Message Date
Fabien Meghazi b7003a382a [MERGE] upstream
bzr revid: fme@openerp.com-20140429154104-csm3jq6uxy9tk1ea
2014-04-29 17:41:04 +02:00
Richard Mathot (OpenERP) d0e9ba289f [MERGE] from trunk
bzr revid: rim@openerp.com-20140429124452-5cvpmtpyz2daj8w2
2014-04-29 14:44:52 +02:00
Richard Mathot (OpenERP) 65f2db5c21 [MERGE] from trunk
bzr revid: rim@openerp.com-20140429081937-hhqcg84o7iha78fq
2014-04-29 10:19:37 +02:00
Fabien Meghazi 1c4e2cfd22 [IMP] bundlify addons (except website)
bzr revid: fme@openerp.com-20140424172129-ze74eaz2eaidmxhm
2014-04-24 19:21:29 +02:00
Amit Vora 654cbcb880 [IMP] improve code
bzr revid: avo@tinyerp.com-20140313124505-x3q1r7ofms89bvvq
2014-03-13 18:15:05 +05:30
Amit Vora 9e03bc126b [IMP] improve code
bzr revid: avo@tinyerp.com-20140313121727-jpop13zj1h64qj6i
2014-03-13 17:47:27 +05:30
ajay javiya (OpenERP) e0f8d3f80a [MERGE] : with trunk
bzr revid: aja@tinyerp.com-20140303064742-klvoa7t5l6wnzrg9
2014-03-03 12:17:42 +05:30
Darshan Kalola (OpenERP) b3c6e20e36 [MERGE]sync with trunk and resolve conflicts.
bzr revid: dka@tinyerp.com-20140210084803-rjkt9e4rhni8nhlt
2014-02-10 14:18:03 +05:30
Sunil Sharma (OpenERP) 685121bea3 [rem]:sale and crm :remove image
bzr revid: sunilsharma.sharma07@gmail.com-20140129133115-mqozdx23ctzbmct5
2014-01-29 19:01:15 +05:30
Sunil Sharma (OpenERP) 936bd70967 [remove]crm:remove crm dashboard
bzr revid: sunilsharma.sharma07@gmail.com-20140129120947-f4bwceiddihtmmim
2014-01-29 17:39:47 +05:30
jke-openerp 46b0c7aa00 [REF] Rename model crm.meeting into calendar.event
Remove 2 unsused field from calendar.event model (dir,sequence)

bzr revid: jke@openerp.com-20140115093805-1g1j1oymyxsb6kgh
2014-01-15 10:38:05 +01:00
jke-openerp dd285d23af [TYPO] Rename base_calendar into calendar
bzr revid: jke@openerp.com-20131219144739-9ic700ycef8uklbc
2013-12-19 15:47:39 +01:00
Darshan Kalola (OpenERP) 960924195e [MERGE]merged with main addons
bzr revid: dka@tinyerp.com-20131030052926-i9c25mf6wpseioh3
2013-10-30 10:59:26 +05:30
Thibault Delavallée 0d7ea5d74e [REF] crm, sale_crm: updated modules due to move of gauge and sparkline modules into web modules
bzr revid: tde@openerp.com-20130913075915-bagnbdw6qsexcul0
2013-09-13 09:59:15 +02:00
Martin Trigaux c48504fdba [MERGE] sync with trunk (state -> stage removed some test)
bzr revid: mat@openerp.com-20130911110755-zf3ytf9m27im6x9k
2013-09-11 13:07:55 +02:00
Darshan Kalola f6aa7c8c99 [IMP]remove base_status from dependancy in crm/__openerp__.py
bzr revid: dka@tinyerp.com-20130829120009-u73x96rckfltfxvh
2013-08-29 17:30:09 +05:30
Darshan Kalola 40772276b8 [MERGE]merged with main addons
bzr revid: dka@tinyerp.com-20130829112644-ut06w1p0lf244zz1
2013-08-29 16:56:44 +05:30
ajay javiya (OpenERP) d810bea294 [FIX][IMP]: fix traceback and imp code for hide schduledcall menu
bzr revid: aja@tinyerp.com-20130822110308-pvkfhx89urg2w0f3
2013-08-22 16:33:08 +05:30
ajay javiya (OpenERP) a0ab757537 [REM] : remove wizard of schedule/log a call ,
[IMP] : Rename in Opportunity and in Partner form the 'Meeting' into 'Schedule a Meeting' ,

bzr revid: aja@tinyerp.com-20130822092259-it5a1e1v1ed9s60a
2013-08-22 14:52:59 +05:30
Thibault Delavallée 319a222c7c [REM] Removed base_status module.
bzr revid: tde@openerp.com-20130813095546-knv3pq2ljznfvuv4
2013-08-13 11:55:46 +02:00
Darshan Kalola 9b39fd9f7f [Process]remove process module and all process views
bzr revid: darshankalola@gmail.com-20130730072623-bf1u8y1z0lo4cwrw
2013-07-30 12:56:23 +05:30
Thibault Delavallée 0e9fd3d5d5 [IMP] crm: removed state field. Refactored code according to the new guidelines.
bzr revid: tde@openerp.com-20130716151003-c2df3nzgo1by0hyi
2013-07-16 17:10:03 +02:00
sgo@tinyerp.com 6a3cdf718c [MERGE]sync with trunk
bzr revid: sgo@tinyerp.com-20130605071905-o2ldzc6vxqnoe099
2013-06-05 12:49:05 +05:30
Thibault Delavallée 1d8cd3ec88 [FIX] crm: order of files in tertimonial
bzr revid: tde@openerp.com-20130604113516-v79kumeixy26538b
2013-06-04 13:35:16 +02:00
Thibault Delavallée 8480636380 [CLEAN] crm: removed minified file for sparkline as we use plain file; small changes in views.
bzr revid: tde@openerp.com-20130604105648-ytfhdb5wmdrzkyay
2013-06-04 12:56:48 +02:00
sgo@tinyerp.com 0f31215147 [IMP]done changes as per new yml changes in crm
bzr revid: sgo@tinyerp.com-20130507070446-ejlju0cnui74vy21
2013-05-07 12:34:46 +05:30
sgo@tinyerp.com 0efed0d61c [MERGE]sync with trunk
bzr revid: sgo@tinyerp.com-20130506104157-blng2gy9gyedmfqp
2013-05-06 16:11:57 +05:30
Christophe Matthieu 0c9110c7f7 [IMP] crm,sale_crm: kanban widget
bzr revid: chm@openerp.com-20130503154652-r9mv3zovs8lnpj3e
2013-05-03 17:46:52 +02:00
Christophe Matthieu a26c8d76b9 [MERGE] from trunk
bzr revid: chm@openerp.com-20130503140029-vv7u9gjmax73qyta
2013-05-03 16:00:29 +02:00
Stephane Wirtel 26e33ea7dc [IMP] This commit contains the new wizard for the merge of partners.
Via this wizard, you will be able to merge a lot of partners via the email,
    name, vat or other columns.

It is available in the "Sales/Tools" menu.

bzr revid: stw@openerp.com-20130502103044-ljnj5n7pvs1vsbed
2013-05-02 12:30:44 +02:00
Christophe Matthieu 57fdf11635 [IMP] salesteams: add demo data
bzr revid: chm@openerp.com-20130419103600-71j6munkzygnffe4
2013-04-19 12:36:00 +02:00
sgo@tinyerp.com d5451cf7f2 [MERGE]sync with trunk
bzr revid: sgo@tinyerp.com-20130417060441-6vnz2tiym5fawr2n
2013-04-17 11:34:41 +05:30
Christophe Matthieu 84ac4daf19 [IMP] crm_case_section: add js libraries JustGage
bzr revid: chm@openerp.com-20130412161730-lrx5tqr6wn784glq
2013-04-12 18:17:30 +02:00
Thibault Delavallée d50b159f81 [MERGE] Sync with trunk.
bzr revid: tde@openerp.com-20130405111048-kqxll4mdwnsq2r8o
2013-04-05 13:10:48 +02:00
Thibault Delavallée ba9412cb5d [CLEAN] addons: various linkt cleanup (indentation, spaces, ...).
bzr revid: tde@openerp.com-20130403081009-jy35sm7dl4pq7eyu
2013-04-03 10:10:09 +02:00
Christophe Matthieu a45ad6ec82 [IMP] crm: clean code
bzr revid: chm@openerp.com-20130322123803-43mz918j3ez9muvg
2013-03-22 13:38:03 +01:00
Foram Katharotiya (OpenERP) fad27029fa [IMP] add yml file & improve code in crm
bzr revid: fka@tinyerp.com-20130220045734-auwnnd55vpimt3ep
2013-02-20 10:27:34 +05:30
Christophe Matthieu 1c58057325 [MERGE] from trunk
bzr revid: chm@openerp.com-20130206101612-by10wynzt652kh67
2013-02-06 11:16:12 +01:00
Christophe Matthieu 18da8cdc5b [IMP] crm,project,mail: css for alias
bzr revid: chm@openerp.com-20130201115642-n1wijg4exsibju84
2013-02-01 12:56:42 +01:00
Christophe Simonis 1358a99d07 [cherry picking] manual merge of lp:~openerp-dev/openobject-addons/trunk-screenshots-main-modules-vba
Update the screenshots of apps

bzr revid: chs@openerp.com-20130131184141-hnehdtpb2kjgbfjp
2013-01-31 19:41:41 +01:00
Christophe Matthieu 21938b80ff [IMP] crm: Sales Teams menu with breadcrum
bzr revid: chm@openerp.com-20130125110434-whqnmhrvdqj0r9gh
2013-01-25 12:04:34 +01:00
Quentin (OpenERP) a186503285 [FIX] crm: fixed dependancies. The email_template module is auto installed by mail, but it's not a real dependancy and email_template could be uninstalled, what would lead to a crash in crm because it is using this feature (revno 8287.1.11, merged in v7 in revision 8382). To solve this issue, i just add the dependancy... even if it's a stable version, because we hope that the exception case explainde before cannot be found yet.
bzr revid: qdp-launchpad@openerp.com-20130116145451-vmk17f4mmor6ulpy
2013-01-16 15:54:51 +01:00
Raphael Collet 49b843d65f [IMP] crm: remove inheritance on base.action.rule, and change demo action rules to use standard stuff
bzr revid: rco@openerp.com-20121221102151-fxepq652rkeba62z
2012-12-21 11:21:51 +01:00
Antony Lesuisse 2df511c1e3 [FIX] crm stage display on lead, default stages, rename test files
bzr revid: al@openerp.com-20130321112647-5f3maiqmp6ficpwr
2013-03-21 12:26:47 +01:00
Raphael Collet 29ee76d744 [MERGE] from trunk
bzr revid: rco@openerp.com-20121219130953-tq0e2mzw145j1ewx
2012-12-19 14:09:53 +01:00
Fabien Pinckaers f3fc080ef7 [MERGE] module desc + stock
bzr revid: fp@tinyerp.com-20121209105527-4ot27zsv5vqr38ls
2012-12-09 11:55:27 +01:00
Arnaud Pineux 0ca480a80d [FIX] base_stage & state
bzr revid: api@openerp.com-20121204162327-uu941ixjjojgc15v
2012-12-04 17:23:27 +01:00
Antonin Bourguignon a38bdc15c5 [IMP] introduce tests for the salesmen assignations
bzr revid: abo@openerp.com-20121130170034-7f5ytzptsks997oq
2012-11-30 18:00:34 +01:00
Thibault Delavallée 79c275c0ca [CLEAN] mail: cleaned demo data about files and noupdate: fixed some typos.
bzr revid: tde@openerp.com-20121119092457-lgiijzl4c6c90nuk
2012-11-19 10:24:57 +01:00
Thibault Delavallée 61835e0080 [IMP] mail, crm: improved demo data.
bzr revid: tde@openerp.com-20121116153141-n8nxkg6g8uypex1a
2012-11-16 16:31:41 +01:00