lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Merge categories when merging thirds

Browse Source
This commit is contained in:
fmarcet 2018-03-14 13:25:05 +01:00 committed by Ferran Marcet
parent 4d4a204f7f
commit 5140c1c5d2
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/societe/card.php
View File

@ -11,6 +11,7 @@
* Copyright (C) 2015 Marcos García <marcosgdf@gmail.com> * Copyright (C) 2015 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2015 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr> * Copyright (C) 2015 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
* Copyright (C) 2018 Nicolas ZABOURI <info@inovea-conseil.com> * Copyright (C) 2018 Nicolas ZABOURI <info@inovea-conseil.com>
* Copyright (C) 2018 Ferran Marcet <fmarcet@2byte.es.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -180,9 +181,12 @@ if (empty($reshook))
// Merge categories // Merge categories
$static_cat = new Categorie($db); $static_cat = new Categorie($db);
$custcats = $static_cat->containing($soc_origin->id, 'customer', 'id'); $custcats_ori = $static_cat->containing($soc_origin->id, 'customer', 'id');
$custcats = $static_cat->containing($object->id, 'customer', 'id');
$custcats = array_merge($custcats,$custcats_ori);
$object->setCategories($custcats, 'customer'); $object->setCategories($custcats, 'customer');
$suppcats = $static_cat->containing($soc_origin->id, 'supplier', 'id'); $suppcats_ori = $static_cat->containing($soc_origin->id, 'supplier', 'id');
$suppcats = $static_cat->containing($object->id, 'supplier', 'id');
$object->setCategories($suppcats, 'supplier'); $object->setCategories($suppcats, 'supplier');
// If thirdparty has a new code that is same than origin, we clean origin code to avoid duplicate key from database unique keys. // If thirdparty has a new code that is same than origin, we clean origin code to avoid duplicate key from database unique keys.
@ -210,7 +214,7 @@ if (empty($reshook))
$objects = array( $objects = array(
'Adherent' => '/adherents/class/adherent.class.php', 'Adherent' => '/adherents/class/adherent.class.php',
'Societe' => '/societe/class/societe.class.php', 'Societe' => '/societe/class/societe.class.php',
'Categorie' => '/categories/class/categorie.class.php', //'Categorie' => '/categories/class/categorie.class.php',
'ActionComm' => '/comm/action/class/actioncomm.class.php', 'ActionComm' => '/comm/action/class/actioncomm.class.php',
'Propal' => '/comm/propal/class/propal.class.php', 'Propal' => '/comm/propal/class/propal.class.php',
'Commande' => '/commande/class/commande.class.php', 'Commande' => '/commande/class/commande.class.php',