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

fix on replacing thirdparty in attendees when merging multiple thirdparties

Browse Source
This commit is contained in:
Dorian Vabre 2021-05-10 16:25:44 +02:00
parent bf25fd0834
commit 48bbb500d3
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/eventorganization/class/conferenceorboothattendee.class.php
View File

@ -1082,7 +1082,7 @@ class ConferenceOrBoothAttendee extends CommonObject
public static function replaceThirdparty(DoliDB $db, $origin_id, $dest_id) public static function replaceThirdparty(DoliDB $db, $origin_id, $dest_id)
{ {
$tables = array( $tables = array(
'conferenceorboothattendee' 'eventorganization_conferenceorboothattendee'
); );
return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables); return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);

6
htdocs/societe/card.php
View File

@ -57,6 +57,10 @@ if (! empty($conf->accounting->enabled)) {
if (! empty($conf->accounting->enabled)) { if (! empty($conf->accounting->enabled)) {
require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php'; require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
} }
if (! empty($conf->eventorganization->enabled)) {
require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorboothattendee.class.php';
}
$langs->loadLangs(array("companies", "commercial", "bills", "banks", "users")); $langs->loadLangs(array("companies", "commercial", "bills", "banks", "users"));
if (!empty($conf->adherent->enabled)) { if (!empty($conf->adherent->enabled)) {
@ -271,7 +275,7 @@ if (empty($reshook)) {
'Project' => '/projet/class/project.class.php', 'Project' => '/projet/class/project.class.php',
'Ticket' => '/ticket/class/ticket.class.php', 'Ticket' => '/ticket/class/ticket.class.php',
'User' => '/user/class/user.class.php', 'User' => '/user/class/user.class.php',
'ConfOrBoothAttendee' => '/eventorganization/class/conferenceorboothattendee.class.php' 'ConferenceOrBoothAttendee' => '/eventorganization/class/conferenceorboothattendee.class.php'
); );
//First, all core objects must update their tables //First, all core objects must update their tables