diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 05b60d4d159..9ef21f4823f 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -1803,7 +1803,7 @@ if ($action == 'create') {
// Confirm deletion
if ($action == 'delete') {
$formquestion = array();
- if ($object->statut == Expedition::STATUS_CLOSED && getDolGlobalString('STOCK_CALCULATE_ON_SHIPMENT_CLOSE')) {
+ if ($object->status == Expedition::STATUS_CLOSED && getDolGlobalString('STOCK_CALCULATE_ON_SHIPMENT_CLOSE')) {
$formquestion = array(
array(
'label' => $langs->trans('ShipmentIncrementStockOnDelete'),
@@ -2184,7 +2184,7 @@ if ($action == 'create') {
$editColspan--;
}
print '
';
- if ($object->statut <= 1) {
+ if ($object->status <= 1) {
print $langs->trans("QtyToShip").' - ';
} else {
print $langs->trans("QtyShipped").' - ';
@@ -2197,7 +2197,7 @@ if ($action == 'create') {
}
print ' | ';
} else {
- if ($object->statut <= 1) {
+ if ($object->status <= 1) {
print ''.$langs->trans("QtyToShip").' | ';
} else {
print ''.$langs->trans("QtyShipped").' | ';
@@ -2213,7 +2213,7 @@ if ($action == 'create') {
print ''.$langs->trans("CalculatedWeight").' | ';
print ''.$langs->trans("CalculatedVolume").' | ';
//print ''.$langs->trans("Size").' | ';
- if ($object->statut == 0) {
+ if ($object->status == 0) {
print ' | ';
print ' | ';
}
@@ -2574,7 +2574,7 @@ if ($action == 'create') {
print '
';
print '
';
print '';
- } elseif ($object->statut == Expedition::STATUS_DRAFT) {
+ } elseif ($object->status == Expedition::STATUS_DRAFT) {
// edit-delete buttons
print '';
print 'id.'&action=editline&token='.newToken().'&lineid='.$lines[$i]->id.'">'.img_edit().'';
@@ -2647,7 +2647,7 @@ if ($action == 'create') {
$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been
// modified by hook
if (empty($reshook)) {
- if ($object->statut == Expedition::STATUS_DRAFT && $num_prod > 0) {
+ if ($object->status == Expedition::STATUS_DRAFT && $num_prod > 0) {
if ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('expedition', 'creer'))
|| (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('expedition', 'shipping_advance', 'validate'))) {
print dolGetButtonAction('', $langs->trans('Validate'), 'default', $_SERVER["PHP_SELF"].'?action=valid&token='.newToken().'&id='.$object->id, '');
@@ -2657,12 +2657,12 @@ if ($action == 'create') {
}
// 0=draft, 1=validated/delivered, 2=closed/delivered
- if ($object->statut == Expedition::STATUS_VALIDATED && !getDolGlobalString('STOCK_CALCULATE_ON_SHIPMENT')) {
+ if ($object->status == Expedition::STATUS_VALIDATED && !getDolGlobalString('STOCK_CALCULATE_ON_SHIPMENT')) {
if ($user->hasRight('expedition', 'creer')) {
print dolGetButtonAction('', $langs->trans('SetToDraft'), 'default', $_SERVER["PHP_SELF"].'?action=setdraft&token='.newToken().'&id='.$object->id, '');
}
}
- if ($object->statut == Expedition::STATUS_CLOSED) {
+ if ($object->status == Expedition::STATUS_CLOSED) {
if ($user->hasRight('expedition', 'creer')) {
print dolGetButtonAction('', $langs->trans('ReOpen'), 'default', $_SERVER["PHP_SELF"].'?action=reopen&token='.newToken().'&id='.$object->id, '');
}
@@ -2670,7 +2670,7 @@ if ($action == 'create') {
// Send
if (empty($user->socid)) {
- if ($object->statut > 0) {
+ if ($object->status > 0) {
if (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') || $user->hasRight('expedition', 'shipping_advance', 'send')) {
print dolGetButtonAction('', $langs->trans('SendMail'), 'default', $_SERVER["PHP_SELF"].'?action=presend&token='.newToken().'&id='.$object->id.'&mode=init#formmailbeforetitle', '');
} else {
@@ -2680,7 +2680,7 @@ if ($action == 'create') {
}
// Create bill
- if (isModEnabled('invoice') && ($object->statut == Expedition::STATUS_VALIDATED || $object->statut == Expedition::STATUS_CLOSED)) {
+ if (isModEnabled('invoice') && ($object->status == Expedition::STATUS_VALIDATED || $object->status == Expedition::STATUS_CLOSED)) {
if ($user->hasRight('facture', 'creer')) {
if (getDolGlobalString('WORKFLOW_BILL_ON_SHIPMENT') !== '0') {
print dolGetButtonAction('', $langs->trans('CreateBill'), 'default', DOL_URL_ROOT.'/compta/facture/card.php?action=create&origin='.$object->element.'&originid='.$object->id.'&socid='.$object->socid, '');
@@ -2690,13 +2690,13 @@ if ($action == 'create') {
// This is just to generate a delivery receipt
//var_dump($object->linkedObjectsIds['delivery']);
- if (getDolGlobalInt('MAIN_SUBMODULE_DELIVERY') && ($object->statut == Expedition::STATUS_VALIDATED || $object->statut == Expedition::STATUS_CLOSED) && $user->hasRight('expedition', 'delivery', 'creer') && empty($object->linkedObjectsIds['delivery'])) {
+ if (getDolGlobalInt('MAIN_SUBMODULE_DELIVERY') && ($object->status == Expedition::STATUS_VALIDATED || $object->status == Expedition::STATUS_CLOSED) && $user->hasRight('expedition', 'delivery', 'creer') && empty($object->linkedObjectsIds['delivery'])) {
print dolGetButtonAction('', $langs->trans('CreateDeliveryOrder'), 'default', $_SERVER["PHP_SELF"].'?action=create_delivery&token='.newToken().'&id='.$object->id, '');
}
// Set Billed and Closed
- if ($object->statut == Expedition::STATUS_VALIDATED) {
- if ($user->hasRight('expedition', 'creer') && $object->statut > 0) {
+ if ($object->status == Expedition::STATUS_VALIDATED) {
+ if ($user->hasRight('expedition', 'creer') && $object->status > 0) {
if (!$object->billed && getDolGlobalString('WORKFLOW_BILL_ON_SHIPMENT') !== '0') {
print dolGetButtonAction('', $langs->trans('ClassifyBilled'), 'default', $_SERVER["PHP_SELF"].'?action=classifybilled&token='.newToken().'&id='.$object->id, '');
}
@@ -2705,7 +2705,7 @@ if ($action == 'create') {
}
// Cancel
- if ($object->statut == Expedition::STATUS_VALIDATED) {
+ if ($object->status == Expedition::STATUS_VALIDATED) {
if ($user->hasRight('expedition', 'creer')) {
print dolGetButtonAction('', $langs->trans('Cancel'), 'danger', $_SERVER["PHP_SELF"].'?action=cancel&token='.newToken().'&id='.$object->id.'&mode=init#formmailbeforetitle', '');
}
|