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

Merge pull request #21011 from OPEN-DSI/14.0_fix_get_origin_when_add_supplier_proposal

Browse Source 
FIX: Fix get origin from other than supplier proposal when add a new supplier proposal
This commit is contained in:
Laurent Destailleur 2022-05-24 21:29:55 +02:00 committed by GitHub
commit 3ce58c2337
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
htdocs/supplier_proposal/card.php
View File

@ -303,8 +303,20 @@ if (empty($reshook)) {
if (!$error) { if (!$error) {
if ($origin && $originid) { if ($origin && $originid) {
$element = 'supplier_proposal'; $element = $subelement = $origin;
$subelement = 'supplier_proposal'; if (preg_match('/^([^_]+)_([^_]+)/i', $origin, $regs)) {
$element = $regs[1];
$subelement = $regs[2];
}
// For compatibility
if ($element == 'order') {
$element = $subelement = 'commande';
}
if ($element == 'propal') {
$element = 'comm/propal';
$subelement = 'propal';
}
$object->origin = $origin; $object->origin = $origin;
$object->origin_id = $originid; $object->origin_id = $originid;
@ -1063,8 +1075,20 @@ if ($action == 'create') {
// Load objectsrc // Load objectsrc
if (!empty($origin) && !empty($originid)) { if (!empty($origin) && !empty($originid)) {
$element = 'supplier_proposal'; $element = $subelement = GETPOST('origin');
$subelement = 'supplier_proposal'; if (preg_match('/^([^_]+)_([^_]+)/i', GETPOST('origin'), $regs)) {
$element = $regs[1];
$subelement = $regs[2];
}
// For compatibility
if ($element == 'order' || $element == 'commande') {
$element = $subelement = 'commande';
}
if ($element == 'propal') {
$element = 'comm/propal';
$subelement = 'propal';
}
dol_include_once('/'.$element.'/class/'.$subelement.'.class.php'); dol_include_once('/'.$element.'/class/'.$subelement.'.class.php');