Fix consistency of label of proposal status

This commit is contained in:
Laurent Destailleur 2018-10-09 14:06:45 +02:00
parent 923b561aff
commit 4d959bbea7
4 changed files with 4 additions and 4 deletions

View File

@ -3109,7 +3109,7 @@ class Propal extends CommonObject
$this->labelstatut[3]=$langs->trans("PropalStatusNotSigned"); $this->labelstatut[3]=$langs->trans("PropalStatusNotSigned");
$this->labelstatut[4]=$langs->trans("PropalStatusBilled"); $this->labelstatut[4]=$langs->trans("PropalStatusBilled");
$this->labelstatut_short[0]=$langs->trans("PropalStatusDraftShort"); $this->labelstatut_short[0]=$langs->trans("PropalStatusDraftShort");
$this->labelstatut_short[1]=$langs->trans("Opened"); $this->labelstatut_short[1]=$langs->trans("PropalStatusValidatedShort");
$this->labelstatut_short[2]=$langs->trans("PropalStatusSignedShort"); $this->labelstatut_short[2]=$langs->trans("PropalStatusSignedShort");
$this->labelstatut_short[3]=$langs->trans("PropalStatusNotSignedShort"); $this->labelstatut_short[3]=$langs->trans("PropalStatusNotSignedShort");
$this->labelstatut_short[4]=$langs->trans("PropalStatusBilledShort"); $this->labelstatut_short[4]=$langs->trans("PropalStatusBilledShort");

View File

@ -990,7 +990,7 @@ if ($resql)
} }
// Show total line // Show total line
if (isset($totalarray['totalhtfield']) if (isset($totalarray['totalhtfield'])
|| isset($totalarray['totalvatfield']) || isset($totalarray['totalvatfield'])
|| isset($totalarray['totalttcfield']) || isset($totalarray['totalttcfield'])
|| isset($totalarray['totalamfield']) || isset($totalarray['totalamfield'])

View File

@ -33,7 +33,7 @@ PropalStatusSigned=Signed (needs billing)
PropalStatusNotSigned=Not signed (closed) PropalStatusNotSigned=Not signed (closed)
PropalStatusBilled=Billed PropalStatusBilled=Billed
PropalStatusDraftShort=Draft PropalStatusDraftShort=Draft
PropalStatusValidatedShort=Validated PropalStatusValidatedShort=Validated (open)
PropalStatusClosedShort=Closed PropalStatusClosedShort=Closed
PropalStatusSignedShort=Signed PropalStatusSignedShort=Signed
PropalStatusNotSignedShort=Not signed PropalStatusNotSignedShort=Not signed

View File

@ -33,7 +33,7 @@ PropalStatusSigned=Signée (à facturer)
PropalStatusNotSigned=Non signée (fermée) PropalStatusNotSigned=Non signée (fermée)
PropalStatusBilled=Facturée PropalStatusBilled=Facturée
PropalStatusDraftShort=Brouillon PropalStatusDraftShort=Brouillon
PropalStatusValidatedShort=Validé PropalStatusValidatedShort=Validée (ouverte)
PropalStatusClosedShort=Fermée PropalStatusClosedShort=Fermée
PropalStatusSignedShort=Signée PropalStatusSignedShort=Signée
PropalStatusNotSignedShort=Non signée PropalStatusNotSignedShort=Non signée