Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-07 16:41:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0

Browse Source
This commit is contained in:
ldestailleur
2025-02-25 02:39:50 +01:00
parent 054010f8ec 00ccb45bc4
commit b1492818f6
6 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/fourn/class/fournisseur.commande.class.php
View File

@@ -1597,8 +1597,13 @@ class CommandeFournisseur extends CommonOrder
// End call triggers
}
$this->db->commit();
return $this->id;
if (!$error) {
$this->db->commit();
return $this->id;
} else {
$this->db->rollback();
return -4;
}
} else {
$this->error = $this->db->lasterror();
$this->db->rollback();

6
htdocs/fourn/facture/card.php
View File

@@ -1111,7 +1111,7 @@ if (empty($reshook)) {
$object->origin_id = GETPOST('originid', 'int');
require_once DOL_DOCUMENT_ROOT.'/'.$element.'/class/'.$subelement.'.class.php';
dol_include_once('/'.$element.'/class/'.$subelement.'.class.php');
$classname = ucfirst($subelement);
if ($classname == 'Fournisseur.commande') {
$classname = 'CommandeFournisseur';
@@ -1139,7 +1139,7 @@ if (empty($reshook)) {
// Add lines
if ($id > 0) {
require_once DOL_DOCUMENT_ROOT.'/'.$element.'/class/'.$subelement.'.class.php';
dol_include_once('/'.$element.'/class/'.$subelement.'.class.php');
$classname = ucfirst($subelement);
if ($classname == 'Fournisseur.commande') {
$classname = 'CommandeFournisseur';
@@ -2097,7 +2097,7 @@ if ($action == 'create') {
$subelement = 'fournisseur.commande';
}
require_once DOL_DOCUMENT_ROOT.'/'.$element.'/class/'.$subelement.'.class.php';
dol_include_once('/'.$element.'/class/'.$subelement.'.class.php');
$classname = ucfirst($subelement);
if ($classname == 'Fournisseur.commande') {
$classname = 'CommandeFournisseur';