Commit Graph

20 Commits

Author SHA1 Message Date
Goffin Simon 0ae30c5997 [FIX] base_partner_merge: deduplicate contacts in multi company
When deduplicating contacts, the function _process_query doesn't use
the orm to fetch the partners to merge according to the criteria.
So there were some access error in multi company when trying to merge
contacts from a not allowed company.

Now a check is made with the orm before merging the contacts.

opw:708457
2017-04-19 15:45:38 +02:00
Goffin Simon bbb317c547 [FIX] crm: merge partner
It is not allowed to merge a partner with one of his parent.

opw:673104
2016-03-31 11:54:25 +02:00
Olivier Dony 2ae6481233 [FIX] account, crm, l10n_fr: avoid exceptions when processing parameters 2015-11-03 21:38:53 +01:00
Olivier Dony d544bb9b46 [FIX] base_partner_merge: cleaner test for function fields
After commit 0ed63d73a6,
the hack used to detect fields.function is not supported
anymore. Using `isinstance` is safer and cleaner anyway
(performance is not a concern here).
2015-03-24 15:43:37 +01:00
Martin Trigaux 8d23a3a86c [FIX] crm: avoid constraint errors when merging partners
As for the _update_foreign_keys, the _update_reference_fields method may raise an unique constraint when merging two partners.
In such case, the new record is not relevant and can be removed.
2014-09-03 08:44:33 +02:00
Denis Ledoux ae65be2b2a [MERGE] forward port of branch saas-5 up to 0739bc4 2014-08-11 15:58:02 +02:00
Martin Trigaux 54857ec409 [IMP] crm: clean after partner merge
When trying to merge partners, an sql error may be violated (e.g. unique constraints).
In this case, catch the error and delete the problematic record as it will no longer be relevant with the old partner and left unconsistant data in the database.
2014-08-07 18:17:39 +02:00
Olivier Dony 494ecc620f [MERGE] Foward-port saas-5 up to ee4df1e 2014-08-01 14:24:07 +02:00
Denis Ledoux 2d17c18c7d [FIX] crm: base_partner_merge, search with lowercase for name,email
and without spaces for vat
2014-07-31 19:38:00 +02:00
Raphael Collet cbe2dbb672 [MERGE] new v8 api by rco
A squashed merge is required as the conversion of the apiculture branch from
bzr to git was not correctly done. The git history contains irrelevant blobs
and commits. This branch brings a lot of changes and fixes, too many to list
exhaustively.

- New orm api, objects are now used instead of ids
- Environements to encapsulates cr uid context while maintaining backward compatibility
- Field compute attribute is a new object oriented way to define function fields
- Shared browse record cache
- New onchange protocol
- Optional copy flag on fields
- Documentation update
- Dead code cleanup
- Lots of fixes
2014-07-06 17:05:41 +02: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
Christophe Simonis 6322df1889 [FIX] crm: base_partner_merge: be tolerant to unknown model of field in ir.model.fields
bzr revid: chs@openerp.com-20131014141330-h4qk2iqhn5gywrim
2013-10-14 16:13:30 +02:00
Olivier Dony 0298755c67 [FIX] base_partner_merge: properly ignore computed fields when merging 2 partners
bzr revid: odo@openerp.com-20130605161622-7xj8b585sslvd3lj
2013-06-05 18:16:22 +02:00
Olivier Dony 8def4f274a [IMP] crm: partner merge wizard: prevent merging more than 3 contacts together + log note in partner history
bzr revid: odo@openerp.com-20130522115408-ef82getdyo2otg3q
2013-05-22 13:54:08 +02:00
Olivier Dony a5bf0f3181 [FIX] crm: partner merge wizard: fix detection of duplicate emails + improve error messages
bzr revid: odo@openerp.com-20130522111131-y1urx7qx280f3tdl
2013-05-22 13:11:31 +02:00
Christophe Matthieu b6f6b718ca [IMP] base_partner_merge: use SUPERUSER_ID for merged contact. Add exception when the active user is not the SUPERUSER_ID if the emails is differents or if they are more of one contact with Journal Items.
bzr revid: chm@openerp.com-20130517085040-u9n1v0a22uruqhca
2013-05-17 10:50:40 +02:00
Olivier Dony 4229cff81c [FIX] crm: simplify + fix multiple programming errors in partner merge wizard
bzr revid: odo@openerp.com-20130508162742-qxdrjg93r6md1tw5
2013-05-08 18:27:42 +02:00
Olivier Dony cffffc9cd6 [FIX] crm: missing context propagation
bzr revid: odo@openerp.com-20130508150037-qtdsx3gpirwr10re
2013-05-08 17:00:37 +02:00
Christophe Matthieu cc77560f43 [IMP] crm: base_partner_merge: The 'Automatic Merge' button open the wizard. Add field to choice the partner destination
bzr revid: chm@openerp.com-20130506122538-8hi7znmq4pjooasf
2013-05-06 14:25:38 +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