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

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

Browse Source 
develop
This commit is contained in:
Laurent Destailleur 2022-01-06 16:08:49 +01:00
commit 18978ac84e
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/expedition/class/expedition.class.php
View File

@ -1460,6 +1460,7 @@ class Expedition extends CommonObject
// delete batch expedition line
if (!$error) {
$shipmentlinebatch = new ExpeditionLineBatch($this->db);
if ($shipmentlinebatch->deleteFromShipment($this->id) < 0) {
$error++; $this->errors[] = "Error ".$this->db->lasterror();
}

24
htdocs/fourn/commande/card.php
View File

@ -8,7 +8,8 @@
* Copyright (C) 2012-2016 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
* Copyright (C) 2014 Ion Agorria <ion@agorria.com>
* Copyright (C) 2018-2019 Frédéric France <frederic.france@netlogic.fr>
* Copyright (C) 2018-2019 Frédéric France <frederic.france@netlogic.fr>
* Copyright (C) 2022 Charlene Benke <charlene@patas-monkey.com>
*
* 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
@ -1211,13 +1212,17 @@ if (empty($reshook)) {
if (!$error) {
// If creation from another object of another module (Example: origin=propal, originid=1)
if (!empty($origin) && !empty($originid)) {
$element = $subelement = $origin;
$classname = ucfirst($subelement);
if ($origin == 'propal' || $origin == 'proposal') {
$classname = 'Propal';
$element = 'comm/propal'; $subelement = 'propal';
} elseif ($origin == 'order' || $origin == 'commande') {
$classname = 'Commande';
$classname = 'Propal';
}
if ($origin == 'order' || $origin == 'commande') {
$element = $subelement = 'commande';
} else {
$classname = 'Commande';
}
if ($origin == 'supplier_proposal') {
$classname = 'SupplierProposal';
$element = 'supplier_proposal';
$subelement = 'supplier_proposal';
@ -1529,6 +1534,7 @@ if ($action == 'create') {
if (!empty($origin) && !empty($originid)) {
// Parse element/subelement (ex: project_task)
$element = $subelement = $origin;
$classname = ucfirst($subelement);
$regs = array();
if (preg_match('/^([^_]+)_([^_]+)/i', $origin, $regs)) {
$element = $regs[1];
@ -1538,15 +1544,19 @@ if ($action == 'create') {
if ($origin == 'propal' || $origin == 'proposal') {
$classname = 'Propal';
$element = 'comm/propal'; $subelement = 'propal';
} elseif ($origin == 'order' || $origin == 'commande') {
}
if ($origin == 'order' || $origin == 'commande') {
$classname = 'Commande';
$element = $subelement = 'commande';
} else {
}
if ($origin == 'supplier_proposal') {
$classname = 'SupplierProposal';
$element = 'supplier_proposal';
$subelement = 'supplier_proposal';
}
dol_include_once('/'.$element.'/class/'.$subelement.'.class.php');
$objectsrc = new $classname($db);