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

FIX #15140

Browse Source
This commit is contained in:
Laurent Destailleur 2020-10-25 14:11:09 +01:00
parent d042562996
commit bb147d2599
7 changed files with 72 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/bom/class/bom.class.php
View File

@ -827,9 +827,9 @@ class BOM extends CommonObject
{
global $langs;
//$langs->load("mrp");
$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('Draft');
$this->labelStatus[self::STATUS_VALIDATED] = $langs->trans('Enabled');
$this->labelStatus[self::STATUS_CANCELED] = $langs->trans('Disabled');
$this->labelStatus[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
$this->labelStatus[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Enabled');
$this->labelStatus[self::STATUS_CANCELED] = $langs->transnoentitiesnoconv('Disabled');
}
$statusType = 'status'.$status;

24
htdocs/comm/propal/class/propal.class.php
View File

@ -3228,16 +3228,16 @@ class Propal extends CommonObject
{
global $langs;
$langs->load("propal");
$this->labelStatus[0] = $langs->trans("PropalStatusDraft");
$this->labelStatus[1] = $langs->trans("PropalStatusValidated");
$this->labelStatus[2] = $langs->trans("PropalStatusSigned");
$this->labelStatus[3] = $langs->trans("PropalStatusNotSigned");
$this->labelStatus[4] = $langs->trans("PropalStatusBilled");
$this->labelStatusShort[0] = $langs->trans("PropalStatusDraftShort");
$this->labelStatusShort[1] = $langs->trans("PropalStatusValidatedShort");
$this->labelStatusShort[2] = $langs->trans("PropalStatusSignedShort");
$this->labelStatusShort[3] = $langs->trans("PropalStatusNotSignedShort");
$this->labelStatusShort[4] = $langs->trans("PropalStatusBilledShort");
$this->labelStatus[0] = $langs->transnoentitiesnoconv("PropalStatusDraft");
$this->labelStatus[1] = $langs->transnoentitiesnoconv("PropalStatusValidated");
$this->labelStatus[2] = $langs->transnoentitiesnoconv("PropalStatusSigned");
$this->labelStatus[3] = $langs->transnoentitiesnoconv("PropalStatusNotSigned");
$this->labelStatus[4] = $langs->transnoentitiesnoconv("PropalStatusBilled");
$this->labelStatusShort[0] = $langs->transnoentitiesnoconv("PropalStatusDraftShort");
$this->labelStatusShort[1] = $langs->transnoentitiesnoconv("PropalStatusValidatedShort");
$this->labelStatusShort[2] = $langs->transnoentitiesnoconv("PropalStatusSignedShort");
$this->labelStatusShort[3] = $langs->transnoentitiesnoconv("PropalStatusNotSignedShort");
$this->labelStatusShort[4] = $langs->transnoentitiesnoconv("PropalStatusBilledShort");
}
$statusType = '';
@ -3291,8 +3291,8 @@ class Propal extends CommonObject
if ($mode == 'opened') {
$delay_warning = $conf->propal->cloture->warning_delay;
$status = self::STATUS_VALIDATED;
$label = $langs->trans("PropalsToClose");
$labelShort = $langs->trans("ToAcceptRefuse");
$label = $langs->transnoentitiesnoconv("PropalsToClose");
$labelShort = $langs->transnoentitiesnoconv("ToAcceptRefuse");
}
if ($mode == 'signed') {
$delay_warning = $conf->propal->facturation->warning_delay;

34
htdocs/commande/class/commande.class.php
View File

@ -3537,41 +3537,41 @@ class Commande extends CommonOrder
global $langs, $conf;
$billedtext = '';
if (empty($donotshowbilled)) $billedtext .= ($billed ? ' - '.$langs->trans("Billed") : '');
if (empty($donotshowbilled)) $billedtext .= ($billed ? ' - '.$langs->transnoentitiesnoconv("Billed") : '');
$labelTooltip = '';
if ($status == self::STATUS_CANCELED) {
$labelStatus = $langs->trans('StatusOrderCanceled');
$labelStatusShort = $langs->trans('StatusOrderCanceledShort');
$labelStatus = $langs->transnoentitiesnoconv('StatusOrderCanceled');
$labelStatusShort = $langs->transnoentitiesnoconv('StatusOrderCanceledShort');
$statusType = 'status9';
} elseif ($status == self::STATUS_DRAFT) {
$labelStatus = $langs->trans('StatusOrderDraft');
$labelStatusShort = $langs->trans('StatusOrderDraftShort');
$labelStatus = $langs->transnoentitiesnoconv('StatusOrderDraft');
$labelStatusShort = $langs->transnoentitiesnoconv('StatusOrderDraftShort');
$statusType = 'status0';
} elseif ($status == self::STATUS_VALIDATED) {
$labelStatus = $langs->trans('StatusOrderValidated').$billedtext;
$labelStatusShort = $langs->trans('StatusOrderValidatedShort').$billedtext;
$labelStatus = $langs->transnoentitiesnoconv('StatusOrderValidated').$billedtext;
$labelStatusShort = $langs->transnoentitiesnoconv('StatusOrderValidatedShort').$billedtext;
$statusType = 'status1';
} elseif ($status == self::STATUS_SHIPMENTONPROCESS) {
$labelStatus = $langs->trans('StatusOrderSent').$billedtext;
$labelStatusShort = $langs->trans('StatusOrderSentShort').$billedtext;
$labelTooltip = $langs->trans("StatusOrderSent").' - '.$langs->trans("DateDeliveryPlanned").dol_print_date($this->date_livraison).$billedtext;
$labelStatus = $langs->transnoentitiesnoconv('StatusOrderSent').$billedtext;
$labelStatusShort = $langs->transnoentitiesnoconv('StatusOrderSentShort').$billedtext;
$labelTooltip = $langs->transnoentitiesnoconv("StatusOrderSent").' - '.$langs->transnoentitiesnoconv("DateDeliveryPlanned").dol_print_date($this->date_livraison).$billedtext;
$statusType = 'status4';
} elseif ($status == self::STATUS_CLOSED && (!$billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) {
$labelStatus = $langs->trans('StatusOrderToBill');
$labelStatusShort = $langs->trans('StatusOrderToBillShort');
$labelStatus = $langs->transnoentitiesnoconv('StatusOrderToBill');
$labelStatusShort = $langs->transnoentitiesnoconv('StatusOrderToBillShort');
$statusType = 'status4';
} elseif ($status == self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) {
$labelStatus = $langs->trans('StatusOrderProcessed').$billedtext;
$labelStatusShort = $langs->trans('StatusOrderProcessedShort').$billedtext;
$labelStatus = $langs->transnoentitiesnoconv('StatusOrderProcessed').$billedtext;
$labelStatusShort = $langs->transnoentitiesnoconv('StatusOrderProcessedShort').$billedtext;
$statusType = 'status6';
} elseif ($status == self::STATUS_CLOSED && (!empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) {
$labelStatus = $langs->trans('StatusOrderDelivered');
$labelStatusShort = $langs->trans('StatusOrderDeliveredShort');
$labelStatus = $langs->transnoentitiesnoconv('StatusOrderDelivered');
$labelStatusShort = $langs->transnoentitiesnoconv('StatusOrderDeliveredShort');
$statusType = 'status6';
} else {
$labelStatus = $langs->trans('Unknown');
$labelStatus = $langs->transnoentitiesnoconv('Unknown');
$labelStatusShort = '';
$statusType = '';
$mode = 0;

12
htdocs/contrat/class/contrat.class.php
View File

@ -1905,12 +1905,12 @@ class Contrat extends CommonObject
{
global $langs;
$langs->load("contracts");
$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('ContractStatusDraft');
$this->labelStatus[self::STATUS_VALIDATED] = $langs->trans('ContractStatusValidated');
$this->labelStatus[self::STATUS_CLOSED] = $langs->trans('ContractStatusClosed');
$this->labelStatusShort[self::STATUS_DRAFT] = $langs->trans('ContractStatusDraft');
$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->trans('ContractStatusValidated');
$this->labelStatusShort[self::STATUS_CLOSED] = $langs->trans('ContractStatusClosed');
$this->labelStatus[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('ContractStatusDraft');
$this->labelStatus[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('ContractStatusValidated');
$this->labelStatus[self::STATUS_CLOSED] = $langs->transnoentitiesnoconv('ContractStatusClosed');
$this->labelStatusShort[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('ContractStatusDraft');
$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('ContractStatusValidated');
$this->labelStatusShort[self::STATUS_CLOSED] = $langs->transnoentitiesnoconv('ContractStatusClosed');
}
$statusType = 'status'.$status;

32
htdocs/core/class/commoninvoice.class.php
View File

@ -534,37 +534,37 @@ abstract class CommonInvoice extends CommonObject
$prefix = 'Short';
if (!$paye) {
if ($status == 0) {
$labelStatus = $langs->trans('BillStatusDraft');
$labelStatusShort = $langs->trans('Bill'.$prefix.'StatusDraft');
$labelStatus = $langs->transnoentitiesnoconv('BillStatusDraft');
$labelStatusShort = $langs->transnoentitiesnoconv('Bill'.$prefix.'StatusDraft');
} elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) {
$labelStatus = $langs->trans('BillStatusClosedUnpaid');
$labelStatusShort = $langs->trans('Bill'.$prefix.'StatusClosedUnpaid');
$labelStatus = $langs->transnoentitiesnoconv('BillStatusClosedUnpaid');
$labelStatusShort = $langs->transnoentitiesnoconv('Bill'.$prefix.'StatusClosedUnpaid');
$statusType = 'status5';
} elseif (($status == 3 || $status == 2) && $alreadypaid > 0) {
$labelStatus = $langs->trans('BillStatusClosedPaidPartially');
$labelStatusShort = $langs->trans('Bill'.$prefix.'StatusClosedPaidPartially');
$labelStatus = $langs->transnoentitiesnoconv('BillStatusClosedPaidPartially');
$labelStatusShort = $langs->transnoentitiesnoconv('Bill'.$prefix.'StatusClosedPaidPartially');
$statusType = 'status9';
} elseif ($alreadypaid == 0) {
$labelStatus = $langs->trans('BillStatusNotPaid');
$labelStatusShort = $langs->trans('Bill'.$prefix.'StatusNotPaid');
$labelStatus = $langs->transnoentitiesnoconv('BillStatusNotPaid');
$labelStatusShort = $langs->transnoentitiesnoconv('Bill'.$prefix.'StatusNotPaid');
$statusType = 'status1';
} else {
$labelStatus = $langs->trans('BillStatusStarted');
$labelStatusShort = $langs->trans('Bill'.$prefix.'StatusStarted');
$labelStatus = $langs->transnoentitiesnoconv('BillStatusStarted');
$labelStatusShort = $langs->transnoentitiesnoconv('Bill'.$prefix.'StatusStarted');
$statusType = 'status3';
}
} else {
$statusType = 'status6';
if ($type == self::TYPE_CREDIT_NOTE) {
$labelStatus = $langs->trans('BillStatusPaidBackOrConverted'); // credit note
$labelStatusShort = $langs->trans('Bill'.$prefix.'StatusPaidBackOrConverted'); // credit note
$labelStatus = $langs->transnoentitiesnoconv('BillStatusPaidBackOrConverted'); // credit note
$labelStatusShort = $langs->transnoentitiesnoconv('Bill'.$prefix.'StatusPaidBackOrConverted'); // credit note
} elseif ($type == self::TYPE_DEPOSIT) {
$labelStatus = $langs->trans('BillStatusConverted'); // deposit invoice
$labelStatusShort = $langs->trans('Bill'.$prefix.'StatusConverted'); // deposit invoice
$labelStatus = $langs->transnoentitiesnoconv('BillStatusConverted'); // deposit invoice
$labelStatusShort = $langs->transnoentitiesnoconv('Bill'.$prefix.'StatusConverted'); // deposit invoice
} else {
$labelStatus = $langs->trans('BillStatusPaid');
$labelStatusShort = $langs->trans('Bill'.$prefix.'StatusPaid');
$labelStatus = $langs->transnoentitiesnoconv('BillStatusPaid');
$labelStatusShort = $langs->transnoentitiesnoconv('Bill'.$prefix.'StatusPaid');
}
}

16
htdocs/fichinter/class/fichinter.class.php
View File

@ -733,14 +733,14 @@ class Fichinter extends CommonObject
global $langs;
$langs->load("fichinter");
$this->statuts[self::STATUS_DRAFT] = $langs->trans('Draft');
$this->statuts[self::STATUS_VALIDATED] = $langs->trans('Validated');
$this->statuts[self::STATUS_BILLED] = $langs->trans('StatusInterInvoiced');
$this->statuts[self::STATUS_CLOSED] = $langs->trans('Done');
$this->statuts_short[self::STATUS_DRAFT] = $langs->trans('Draft');
$this->statuts_short[self::STATUS_VALIDATED] = $langs->trans('Validated');
$this->statuts_short[self::STATUS_BILLED] = $langs->trans('StatusInterInvoiced');
$this->statuts_short[self::STATUS_CLOSED] = $langs->trans('Done');
$this->statuts[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
$this->statuts[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Validated');
$this->statuts[self::STATUS_BILLED] = $langs->transnoentitiesnoconv('StatusInterInvoiced');
$this->statuts[self::STATUS_CLOSED] = $langs->transnoentitiesnoconv('Done');
$this->statuts_short[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
$this->statuts_short[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Validated');
$this->statuts_short[self::STATUS_BILLED] = $langs->transnoentitiesnoconv('StatusInterInvoiced');
$this->statuts_short[self::STATUS_CLOSED] = $langs->transnoentitiesnoconv('Done');
$this->statuts_logo[self::STATUS_DRAFT] = 'status0';
$this->statuts_logo[self::STATUS_VALIDATED] = 'status1';
$this->statuts_logo[self::STATUS_BILLED] = 'status6';

20
htdocs/mrp/class/mo.class.php
View File

@ -1063,17 +1063,17 @@ class Mo extends CommonObject
{
global $langs;
//$langs->load("mrp");
$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('Draft');
$this->labelStatus[self::STATUS_VALIDATED] = $langs->trans('ValidatedToProduce');
$this->labelStatus[self::STATUS_INPROGRESS] = $langs->trans('InProgress');
$this->labelStatus[self::STATUS_PRODUCED] = $langs->trans('StatusMOProduced');
$this->labelStatus[self::STATUS_CANCELED] = $langs->trans('Canceled');
$this->labelStatus[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
$this->labelStatus[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('ValidatedToProduce');
$this->labelStatus[self::STATUS_INPROGRESS] = $langs->transnoentitiesnoconv('InProgress');
$this->labelStatus[self::STATUS_PRODUCED] = $langs->transnoentitiesnoconv('StatusMOProduced');
$this->labelStatus[self::STATUS_CANCELED] = $langs->transnoentitiesnoconv('Canceled');
$this->labelStatusShort[self::STATUS_DRAFT] = $langs->trans('Draft');
$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->trans('Validated');
$this->labelStatusShort[self::STATUS_INPROGRESS] = $langs->trans('InProgress');
$this->labelStatusShort[self::STATUS_PRODUCED] = $langs->trans('StatusMOProduced');
$this->labelStatusShort[self::STATUS_CANCELED] = $langs->trans('Canceled');
$this->labelStatusShort[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Validated');
$this->labelStatusShort[self::STATUS_INPROGRESS] = $langs->transnoentitiesnoconv('InProgress');
$this->labelStatusShort[self::STATUS_PRODUCED] = $langs->transnoentitiesnoconv('StatusMOProduced');
$this->labelStatusShort[self::STATUS_CANCELED] = $langs->transnoentitiesnoconv('Canceled');
}
$statusType = 'status'.$status;