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

Fix label of set to status mass action

Browse Source
This commit is contained in:
Laurent Destailleur 2022-12-16 12:32:06 +01:00
parent d07669a92c
commit f34253796f
3 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
htdocs/langs/en_US/main.lang
View File

@ -1147,18 +1147,18 @@ EventReminder=Event Reminder
UpdateForAllLines=Update for all lines UpdateForAllLines=Update for all lines
OnHold=On hold OnHold=On hold
Civility=Civility Civility=Civility
AffectTag=Affect Tag AffectTag=Assign Tag
AffectUser=Affect User AffectUser=Assign User
SetSupervisor=Set Supervisor SetSupervisor=Set Supervisor
CreateExternalUser=Create external user CreateExternalUser=Create external user
ConfirmAffectTag=Bulk Tag Affect ConfirmAffectTag=Bulk Tag Assignement
ConfirmAffectUser=Bulk User Affect ConfirmAffectUser=Bulk User Assignement
ProjectRole=Role assigned on each project ProjectRole=Role assigned on each project
TasksRole=Role assigned on each task of each project TasksRole=Role assigned on each task of each project
ConfirmSetSupervisor=Bulk Supervisor Set ConfirmSetSupervisor=Bulk Supervisor Set
ConfirmUpdatePrice=Choose a increase/decrease price rate ConfirmUpdatePrice=Choose a increase/decrease price rate
ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)? ConfirmAffectTagQuestion=Are you sure you want to assign tags to the %s selected record(s)?
ConfirmAffectUserQuestion=Are you sure you want to affect users to the %s selected record(s)? ConfirmAffectUserQuestion=Are you sure you want to assign users to the %s selected record(s)?
ConfirmSetSupervisorQuestion=Are you sure you want to set supervisor to the %s selected record(s)? ConfirmSetSupervisorQuestion=Are you sure you want to set supervisor to the %s selected record(s)?
ConfirmUpdatePriceQuestion=Are you sure you want to update the price of the %s selected record(s)? ConfirmUpdatePriceQuestion=Are you sure you want to update the price of the %s selected record(s)?
CategTypeNotFound=No tag type found for type of records CategTypeNotFound=No tag type found for type of records
@ -1169,6 +1169,7 @@ InformationOnLinkToContract=This amount is only the total of all the lines of th
ConfirmCancel=Are you sure you want to cancel ConfirmCancel=Are you sure you want to cancel
EmailMsgID=Email MsgID EmailMsgID=Email MsgID
EmailDate=Email date EmailDate=Email date
SetToStatus=Set to status %s
SetToEnabled=Set to enabled SetToEnabled=Set to enabled
SetToDisabled=Set to disabled SetToDisabled=Set to disabled
ConfirmMassEnabling=mass enabling confirmation ConfirmMassEnabling=mass enabling confirmation
@ -1197,8 +1198,8 @@ Terminated=Terminated
AddLineOnPosition=Add line on position (at the end if empty) AddLineOnPosition=Add line on position (at the end if empty)
ConfirmAllocateCommercial=Assign sales representative confirmation ConfirmAllocateCommercial=Assign sales representative confirmation
ConfirmAllocateCommercialQuestion=Are you sure you want to assign the %s selected record(s)? ConfirmAllocateCommercialQuestion=Are you sure you want to assign the %s selected record(s)?
CommercialsAffected=Sales representatives affected CommercialsAffected=Sales representatives assigned
CommercialAffected=Sales representative affected CommercialAffected=Sales representative assigned
YourMessage=Your message YourMessage=Your message
YourMessageHasBeenReceived=Your message has been received. We will answer or contact you as soon as possible. YourMessageHasBeenReceived=Your message has been received. We will answer or contact you as soon as possible.
UrlToCheck=Url to check UrlToCheck=Url to check

17
htdocs/societe/class/societe.class.php
View File

@ -796,36 +796,41 @@ class Societe extends CommonObject
*/ */
public $bank_account; public $bank_account;
const STATUS_CEASED = 0;
const STATUS_INACTIVITY = 1;
/** /**
* Third party is no customer * Third party type is no customer
*/ */
const NO_CUSTOMER = 0; const NO_CUSTOMER = 0;
/** /**
* Third party is a customer * Third party type is a customer
*/ */
const CUSTOMER = 1; const CUSTOMER = 1;
/** /**
* Third party is a prospect * Third party type is a prospect
*/ */
const PROSPECT = 2; const PROSPECT = 2;
/** /**
* Third party is a customer and a prospect * Third party type is a customer and a prospect
*/ */
const CUSTOMER_AND_PROSPECT = 3; const CUSTOMER_AND_PROSPECT = 3;
/** /**
* Third party is no supplier * Third party supplier flag is not supplier
*/ */
const NO_SUPPLIER = 0; const NO_SUPPLIER = 0;
/** /**
* Third party is a supplier * Third party supplier flag is a supplier
*/ */
const SUPPLIER = 1; const SUPPLIER = 1;
/** /**
* Constructor * Constructor
* *

7
htdocs/societe/list.php
View File

@ -321,7 +321,8 @@ if ($action == "change") { // Change customer for TakePOS
} }
if (GETPOST('cancel', 'alpha')) { if (GETPOST('cancel', 'alpha')) {
$action = 'list'; $massaction = ''; $action = 'list';
$massaction = '';
} }
if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
$massaction = ''; $massaction = '';
@ -934,10 +935,10 @@ if (isModEnabled('category') && $user->hasRight("societe", "creer")) {
$arrayofmassactions['preaffecttag'] = img_picto('', 'category', 'class="pictofixedwidth"').$langs->trans("AffectTag"); $arrayofmassactions['preaffecttag'] = img_picto('', 'category', 'class="pictofixedwidth"').$langs->trans("AffectTag");
} }
if ($user->hasRight("societe", "creer")) { if ($user->hasRight("societe", "creer")) {
$arrayofmassactions['preenable'] = img_picto('', 'stop-circle', 'class="pictofixedwidth"').$langs->trans("SetToEnabled"); $arrayofmassactions['preenable'] = img_picto('', 'stop-circle', 'class="pictofixedwidth"').$langs->trans("SetToStatus", $object->LibStatut($object::STATUS_INACTIVITY));
} }
if ($user->hasRight("societe", "creer")) { if ($user->hasRight("societe", "creer")) {
$arrayofmassactions['predisable'] = img_picto('', 'stop-circle', 'class="pictofixedwidth"').$langs->trans("SetToDisabled"); $arrayofmassactions['predisable'] = img_picto('', 'stop-circle', 'class="pictofixedwidth"').$langs->trans("SetToStatus", $object->LibStatut($object::STATUS_CEASED));
} }
if ($user->hasRight("societe", "creer")) { if ($user->hasRight("societe", "creer")) {
$arrayofmassactions['presetcommercial'] = img_picto('', 'user', 'class="pictofixedwidth"').$langs->trans("AllocateCommercial"); $arrayofmassactions['presetcommercial'] = img_picto('', 'user', 'class="pictofixedwidth"').$langs->trans("AllocateCommercial");