clean code
This commit is contained in:
parent
6cbc3c6033
commit
21a3a6cc7a
@ -8038,6 +8038,8 @@ abstract class CommonObject
|
|||||||
if ($ignoreerrors) {
|
if ($ignoreerrors) {
|
||||||
return true; // TODO Not enough. If there is A-B on kept product and B-C on old one, we must get A-B-C after merge. Not A-B.
|
return true; // TODO Not enough. If there is A-B on kept product and B-C on old one, we must get A-B-C after merge. Not A-B.
|
||||||
}
|
}
|
||||||
|
print $sql;
|
||||||
|
|
||||||
//$this->errors = $db->lasterror();
|
//$this->errors = $db->lasterror();
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1374,23 +1374,6 @@ class Fichinter extends CommonObject
|
|||||||
|
|
||||||
return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
|
return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Function used to replace a product id with another one.
|
|
||||||
*
|
|
||||||
* @param DoliDB $db Database handler
|
|
||||||
* @param int $origin_id Old product id
|
|
||||||
* @param int $dest_id New product id
|
|
||||||
* @return bool
|
|
||||||
*/
|
|
||||||
public static function replaceProduct(DoliDB $db, $origin_id, $dest_id)
|
|
||||||
{
|
|
||||||
$tables = array(
|
|
||||||
'fichinterdet'
|
|
||||||
);
|
|
||||||
|
|
||||||
return CommonObject::commonReplaceProduct($db, $origin_id, $dest_id, $tables);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@ -320,8 +320,7 @@ if (empty($reshook)) {
|
|||||||
'Bom' => '/bom/class/bom.class.php',
|
'Bom' => '/bom/class/bom.class.php',
|
||||||
'Contrat' => '/contrat/class/contrat.class.php',
|
'Contrat' => '/contrat/class/contrat.class.php',
|
||||||
'Reception' => '/reception/class/reception.class.php',
|
'Reception' => '/reception/class/reception.class.php',
|
||||||
'Fichinter' => '/fichinter/class/fichinter.class.php',
|
'FichinterRec' => '/fichinter/class/fichinterrec.class.php',
|
||||||
'FichinterRec' => '/fichinter/class/fichinter.class.php',
|
|
||||||
'CommandeFournisseur' => '/fourn/class/fournisseur.commande.class.php',
|
'CommandeFournisseur' => '/fourn/class/fournisseur.commande.class.php',
|
||||||
'FactureFournisseur' => '/fourn/class/fournisseur.facture.class.php',
|
'FactureFournisseur' => '/fourn/class/fournisseur.facture.class.php',
|
||||||
'SupplierProposal' => '/supplier_proposal/class/supplier_proposal.class.php',
|
'SupplierProposal' => '/supplier_proposal/class/supplier_proposal.class.php',
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user