Commit Graph

134 Commits

Author SHA1 Message Date
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
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 182b140010 [REF] crm: res_config refactored: located in crm/res_config, viewx in res_config_view, using a set_ method to manage two groups.
bzr revid: tde@openerp.com-20130328160704-ktp7btaswjiyyc6s
2013-03-28 17:07:04 +01:00
Thibault Delavallée 70a531e9ba [REV] crm: security: newline at end of file back, to avoid not necessary diff.
bzr revid: tde@openerp.com-20130328130922-4cbb6p1fyxe45imf
2013-03-28 14:09:22 +01:00
Thibault Delavallée acd180c43b [CLEAN] crm: moved group_multi_salesteam configuration from crm.py to res_config.py where it belongs. Also renamed from Use mutli sales team to Manage Sales Teams.
bzr revid: tde@openerp.com-20130328095502-87j32cqinunwgazh
2013-03-28 10:55:02 +01:00
Christophe Matthieu 454d3a0d4b [IMP] crm.case.section,salesteams: add groups multi_salesteams
bzr revid: chm@openerp.com-20130325165125-a5t5fdbnz9rqw1jp
2013-03-25 17:51:25 +01:00
Christophe Matthieu a98861a716 [IMP] crm: add settings options multi sales teams
bzr revid: chm@openerp.com-20130325163204-np98t3rywso3le35
2013-03-25 17:32:04 +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
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
Olivier Dony 97a708cbef [FIX] crm: remove default read access on Leads/Phonecalls for Employee, this was necessary only for the History tab on Customers in 6.1
The History tab does not contain PhoneCalls and Leads/Opportunities
anymore in 7.0 - they have been replaced by buttons on the top of
the form.

lp bug: https://launchpad.net/bugs/1066580 fixed

bzr revid: odo@openerp.com-20130325141943-r9q0ljz5x1pxeoqi
2013-03-25 15:19:43 +01:00
Olivier Dony 3fe6987ce7 [MERGE] Harmonization of noupdate flag on security XML data, courtesy of Alexis de Lattre (Akretion)
ir.rule records are in noupdate data blocks to let the admin
alter them without fear of them being reset at next update.
Other records such as groups are in normal mode, so they
can be updated whenever necessary

bzr revid: odo@openerp.com-20121218232001-t425t4hi7qbmsip2
2012-12-19 00:20:01 +01:00
Fabien Pinckaers d6daf0ff88 [MERGE]
bzr revid: fp@tinyerp.com-20120926085454-0tk5yhd664es3kk1
2012-09-26 10:54:54 +02:00
Divyesh Makwana (Open ERP) 96c82ce021 [ADD] crm : Added record rule on the phone calls to show only its own phone calls'.
bzr revid: mdi@tinyerp.com-20120925122116-mnrtftl4ygawfxr8
2012-09-25 17:51:16 +05:30
Fabien Pinckaers 260f175a36 [MERGE] sale fixes
bzr revid: fp@openerp.com-20120916144529-ho1p72gtake7j2in
2012-09-16 16:45:29 +02:00
Harry (OpenERP) d5166364b7 [FIX] crm: user name,commit should not confilcts from sale module
bzr revid: hmo@tinyerp.com-20120912122150-fa2bl1hcc9gpgiyv
2012-09-12 17:51:50 +05:30
Divyesh Makwana (Open ERP) 0deb439449 [IMP] crm : Added access rights for 'crm.payment.mode' object.
bzr revid: mdi@tinyerp.com-20120801100016-2fnvaz9lnavkj4bz
2012-08-01 15:30:16 +05:30
Divyesh Makwana (Open ERP) 7e6b21c4ec [IMP] crm : Added a new 'crm.group_fund_raising' group and added that group to Sales Configuration Wizard to visible a new tab 'Fund Raising' in 'Opportunity' form view.
bzr revid: mdi@tinyerp.com-20120731111645-glk765809s1gj8as
2012-07-31 16:46:45 +05:30
Olivier Dony da361d1042 [IMP] crm: crm.case.stage should be readable by all, to allow new statusbar widgets to work for stages
bzr revid: odo@openerp.com-20120724153405-8owoyo60bjgnq60r
2012-07-24 17:34:05 +02:00
Alexis de Lattre 5101771cd9 Harmonize the noupdate flag on security XML files :
- ir.rule objects are noupdate="1"
- all other objects are noupdate="0"

bzr revid: alexis@via.ecp.fr-20120713170838-pjsysliyt6twazrc
2012-07-13 19:08:38 +02:00
Thibault Delavallée 4fad550d69 [MERGE] Merged with main addons.
bzr revid: tde@openerp.com-20120709081834-18pf4bol39s50uno
2012-07-09 10:18:34 +02:00
Raphael Collet 7163de4d2c [FIX] base_calendar: define access rights for crm.meeting and crm.meeting.type
bzr revid: rco@openerp.com-20120705080616-k9rhleajvmdg0ieu
2012-07-05 10:06:16 +02:00
Thibault Delavallée 843c33d10b [REM] Removed mail.message access rights defined in various modules. mail.message access rights will be defined as attachments.
bzr revid: tde@openerp.com-20120508135509-ujeqpgh83uui6nbz
2012-05-08 15:55:09 +02:00
Raphael Collet ba1454149c [IMP] groups: remove auto-inclusion of admin in groups, and make the inclusion explicit in groups
bzr revid: rco@openerp.com-20120404090830-nteimn2kvz8nkk7h
2012-04-04 11:08:30 +02:00
Jigar Amin - OpenERP 108641b123 [FIX] crm annonymous address cleanup
bzr revid: jam@tinyerp.com-20120307054751-rtnddry36p7zhxf8
2012-03-07 11:17:51 +05:30
Kuldeep Joshi (OpenERP) 9b4ad84a3a [FIX] crm : crm.case.section right to base.group_user
lp bug: https://launchpad.net/bugs/908797 fixed

bzr revid: kjo@tinyerp.com-20120106093609-y706tlnwsn21p7k0
2012-01-06 15:06:09 +05:30
Raphael Collet 0f40729069 [MERGE] lp:899916 (crm: remove dot from xml_id in ir.model.access.csv)
bzr revid: rco@openerp.com-20111214151605-z3hd19ijqgqcweuj
2011-12-14 16:16:05 +01:00
Raphael Collet 0c1021806d [MERGE] trunk-user-groups-rco: add category_id to groups
bzr revid: rco@openerp.com-20111213141949-ohvn0c9iq6tcl7jj
2011-12-13 15:19:49 +01:00
Fabien Pinckaers f27318c8af [IMP] Security Rule: removed duplicates due to inheritancies of groups
bzr revid: fp@tinyerp.com-20111212181113-mhnnbps3ip8ls6pp
2011-12-12 19:11:13 +01:00
Raphael Collet 857e45e84c [IMP] base_contact, crm, document, event: add group categories
bzr revid: rco@openerp.com-20111212134354-49p2gyf93qozplll
2011-12-12 14:43:54 +01:00
Fabien Pinckaers 7f861f6233 [IMP] fixes on crm meeting: recurring events, show as free/busy, pricate/confidential
bzr revid: fp@tinyerp.com-20111211201237-gdi2te310wh2pa5z
2011-12-11 21:12:37 +01:00
Meera Trambadia (OpenERP) 01f54a04b9 [FIX] crm: improved ids of crm security rights in csv
lp bug: https://launchpad.net/bugs/899916 fixed

bzr revid: mtr@tinyerp.com-20111205062638-vsg1n2zwyak399rd
2011-12-05 11:56:38 +05:30
Antony Lesuisse 0fb7d6bdf1 [MERGE] partner manager only need read rights on crm lead
bzr revid: al@openerp.com-20111108194043-u9a1sqokxl69r6i6
2011-11-08 20:40:43 +01:00
Antony Lesuisse 4f5fa4f0d8 [MERGE] trunk
bzr revid: al@openerp.com-20110828025452-vkkj23005ct60wpb
2011-08-28 04:54:52 +02:00
Antony Lesuisse e83ea8f54c [IMP] res.partner.canal into crm.case.channel
bzr revid: al@openerp.com-20110827233130-end57de3i484r0kb
2011-08-28 01:31:30 +02:00
Olivier Dony 4fcb67bef1 [MERGE] latest trunk
bzr revid: odo@openerp.com-20110822171856-1zkyunpjyz5ffdth
2011-08-22 19:18:56 +02:00
fp fa7874cddc [IMP] Improved bank account management, report footer, stages by default on projects
bzr revid: fp@fp-laptop-20110815142141-938zg1laoe8wtbkd
2011-08-15 16:21:41 +02:00
Olivier Dony 50507512cb [MERGE] latest trunk
This was a helluva merge, with hundreds of conflicts resolved manually!!
I hope I did not break too many things, but a full review of the mail-related
features (where most of the conflicts occurred) must still be done before
this feature branch can be merged.

bzr revid: odo@openerp.com-20110809234428-3dsvxrt6t54ju0cf
2011-08-10 01:44:28 +02:00
Raphael Collet 690f42073d fixed implications between sales groups
bzr revid: rco@openerp.com-20110802132005-9f30si9s6luo2qvk
2011-08-02 15:20:05 +02:00
Raphael Collet ba6342174e add group implications
bzr revid: rco@openerp.com-20110802130811-pkdmw43ufifz0tpj
2011-08-02 15:08:11 +02:00
Olivier Dony 3e6b0297d0 [IMP] crm*: update crm modules to new mail module (wip)
bzr revid: odo@openerp.com-20110722182337-5irz3g2qva0cf45e
2011-07-22 20:23:37 +02:00
Rifakat Haradwala (Open ERP) 47a85e9f8f [IMP] mail: rename module email to mail because of parsing error
bzr revid: rha@tinyerp.com-20110404094552-j2rdq2sbeqrbffgn
2011-04-04 15:15:52 +05:30
Rifakat Haradwala (Open ERP) dfb7539e98 [IMP]: improvements
bzr revid: rha@tinyerp.com-20110331090350-uud2kept28bs1xv0
2011-03-31 14:33:50 +05:30
Rifakat Haradwala (Open ERP) 455fb2d6b3 [IMP] email: email cleanup
bzr revid: rha@tinyerp.com-20110318134419-78qmipdipsryqgnz
2011-03-18 19:14:19 +05:30
Yogesh (OpenERP) e1afe5828a [IMP] change module name emails to email and related to changes in addons all module. move email_gateway module file in email module and also related changes in related module..
bzr revid: ysa@tinyerp.com-20110310073900-ivesygpb7cdwpp43
2011-03-10 13:09:00 +05:30
Yogesh (OpenERP) 05336df19f [IMP] change module name email to emails.
bzr revid: ysa@tinyerp.com-20110208094016-7svkud5dzdf8a2uc
2011-02-08 15:10:16 +05:30
Yogesh (OpenERP) 93f54b8f03 [IMP] email, email_template and email_gateway related changes done in addons module..
bzr revid: ysa@tinyerp.com-20110207072906-knh218shj8ufyxu7
2011-02-07 12:59:06 +05:30
François Degrave 644e615762 [FIX] crm/security/ir.model.access.csv: ValueError: No references to base.group_hr_user
bzr revid: fde@openerp.com-20101228145612-f0akf0k22yjb8wlv
2010-12-28 15:56:12 +01:00
François Degrave 53ea5a328b [IMP] security groups for HR + 'group by' in extended views in some views (stock moves, mrp, documents)
bzr revid: fde@openerp.com-20101227104651-23h1xm7hh2qnr7m7
2010-12-27 11:46:51 +01:00
jam-openerp fc06d6a760 [BUG-FIX] lp:680988
bzr revid: jam@tinyerp.com-20101206053016-6t8ogufy7nmh2v40
2010-12-06 11:00:16 +05:30
Harry (OpenERP) 764b9f251e [FIX] correct regression on intalling module without demo data
bzr revid: hmo@tinyerp.com-20101114134821-7djwpr6nmmxu584q
2010-11-14 19:18:21 +05:30