Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix move of files after a merge of products

Browse Source
This commit is contained in:
Laurent Destailleur (aka Eldy) 2025-01-23 20:21:23 +01:00
parent 6198d18544
commit 132b4f95fe
2 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
htdocs/product/card.php
View File

@ -361,7 +361,7 @@ if (empty($reshook)) {
'SupplierProposal' => '/supplier_proposal/class/supplier_proposal.class.php',
);
//First, all core objects must update their tables
// First, all core objects must update their tables
foreach ($objects as $object_name => $object_file) {
require_once DOL_DOCUMENT_ROOT.$object_file;
@ -406,13 +406,30 @@ if (empty($reshook)) {
}
if (!$error) {
// We finally remove the old product
// TODO merge attached files from old product into new one before delete
// Delete the product
if ($productOrigin->delete($user) < 1) {
$error++;
}
}
if ($error) {
// Move files from the dir of the third party to delete into the dir of the third party to keep
if (!empty($conf->product->multidir_output[$productOrigin->entity])) {
$srcdir = $conf->product->multidir_output[$productOrigin->entity]."/".$productOrigin->ref;
$destdir = $conf->product->multidir_output[$object->entity]."/".$object->ref;
if (dol_is_dir($srcdir)) {
$dirlist = dol_dir_list($srcdir, 'files', 1);
foreach ($dirlist as $filetomove) {
$destfile = $destdir.'/'.$filetomove['relativename'];
//var_dump('Move file '.$filetomove['relativename'].' into '.$destfile);
dol_move($filetomove['fullname'], $destfile, '0', 0, 0, 1);
}
//exit;
}
}
}
if (!$error) {
setEventMessages($langs->trans('ProductsMergeSuccess'), null, 'mesgs');
$db->commit();

20
htdocs/societe/class/societe.class.php
View File

@ -5711,6 +5711,16 @@ class Societe extends CommonObject
// End call triggers
}
if (!$error) {
// We finally remove the old thirdparty
if ($soc_origin->delete($soc_origin->id, $user) < 1) {
$this->error = $soc_origin->error;
$this->errors = $soc_origin->errors;
$error++;
}
}
if (!$error) {
// Move files from the dir of the third party to delete into the dir of the third party to keep
if (!empty($conf->societe->multidir_output[$this->entity])) {
@ -5729,16 +5739,6 @@ class Societe extends CommonObject
}
}
if (!$error) {
// We finally remove the old thirdparty
if ($soc_origin->delete($soc_origin->id, $user) < 1) {
$this->error = $soc_origin->error;
$this->errors = $soc_origin->errors;
$error++;
}
}
if (!$error) {
$this->db->commit();
return 0;