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

Merge pull request #12533 from frederic34/patch-16

Browse Source 
remove deprecated
This commit is contained in:
Laurent Destailleur 2019-11-28 12:22:27 +01:00 committed by GitHub
commit 337666790e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/product/stock/card.php
View File

@ -355,10 +355,10 @@ else
$formconfirm = ''; $formconfirm = '';
// Confirm delete third party // Confirm delete warehouse
if ($action == 'delete') if ($action == 'delete')
{ {
$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans("DeleteAWarehouse"), $langs->trans("ConfirmDeleteWarehouse", $object->libelle), "confirm_delete", '', 0, 2); $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans("DeleteAWarehouse"), $langs->trans("ConfirmDeleteWarehouse", $object->label), "confirm_delete", '', 0, 2);
} }
// Call Hook formConfirm // Call Hook formConfirm
@ -389,10 +389,10 @@ else
print '<table class="border centpercent">'; print '<table class="border centpercent">';
// Parent entrepot // Parent entrepot
$e = new Entrepot($db); $parentwarehouse = new Entrepot($db);
if(!empty($object->fk_parent) && $e->fetch($object->fk_parent) > 0) { if(!empty($object->fk_parent) && $parentwarehouse->fetch($object->fk_parent) > 0) {
print '<tr><td>'.$langs->trans("ParentWarehouse").'</td><td>'; print '<tr><td>'.$langs->trans("ParentWarehouse").'</td><td>';
print $e->getNomUrl(3); print $parentwarehouse->getNomUrl(3);
print '</td></tr>'; print '</td></tr>';
} }
@ -668,7 +668,7 @@ else
print '<table class="border centpercent">'; print '<table class="border centpercent">';
// Ref // Ref
print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("Ref").'</td><td><input name="libelle" size="20" value="'.$object->libelle.'"></td></tr>'; print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("Ref").'</td><td><input name="libelle" size="20" value="'.$object->label.'"></td></tr>';
print '<tr><td>'.$langs->trans("LocationSummary").'</td><td><input name="lieu" size="40" value="'.$object->lieu.'"></td></tr>'; print '<tr><td>'.$langs->trans("LocationSummary").'</td><td><input name="lieu" size="40" value="'.$object->lieu.'"></td></tr>';

14
htdocs/product/stock/class/entrepot.class.php
View File

@ -53,9 +53,13 @@ class Entrepot extends CommonObject
/** /**
* @var string Label * @var string Label
* @deprecated * @deprecated
* @see $label
*/ */
public $libelle; public $libelle;
/**
* @var string Label
*/
public $label; public $label;
/** /**
@ -64,6 +68,10 @@ class Entrepot extends CommonObject
public $description; public $description;
public $statut; public $statut;
/**
* @var string Place
*/
public $lieu; public $lieu;
/** /**
@ -82,11 +90,13 @@ class Entrepot extends CommonObject
public $town; public $town;
/** /**
* @var int ID * @var int ID of parent
*/ */
public $fk_parent; public $fk_parent;
// List of short language codes for status /**
* @var array List of short language codes for status
*/
public $statuts = array(); public $statuts = array();
/** /**