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

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2018-05-05 14:29:54 +02:00
commit e254d6951d
5 changed files with 35 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
htdocs/compta/facture/list.php
View File

@ -585,24 +585,19 @@ if ($resql)
'presend'=>$langs->trans("SendByMail"), 'presend'=>$langs->trans("SendByMail"),
'builddoc'=>$langs->trans("PDFMerge"), 'builddoc'=>$langs->trans("PDFMerge"),
); );
if ($conf->prelevement->enabled) if ($conf->prelevement->enabled) {
{
$langs->load("withdrawals"); $langs->load("withdrawals");
$arrayofmassactions['withdrawrequest']=$langs->trans("MakeWithdrawRequest"); $arrayofmassactions['withdrawrequest'] = $langs->trans("MakeWithdrawRequest");
} }
if ($user->rights->facture->supprimer) if ($user->rights->facture->supprimer) {
{ if (!empty($conf->global->INVOICE_CAN_REMOVE_DRAFT_ONLY)) {
//if (! empty($conf->global->STOCK_CALCULATE_ON_BILL) || empty($conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED)) $arrayofmassactions['predeletedraft'] = $langs->trans("Deletedraft");
if (empty($conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED))
{
// mass deletion never possible on invoices on such situation
} }
else elseif (!empty($conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED)) { // mass deletion never possible on invoices on such situation
{ $arrayofmassactions['predelete'] = $langs->trans("Delete");
$arrayofmassactions['predelete']=$langs->trans("Delete");
} }
} }
if (in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array(); if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
$massactionbutton=$form->selectMassAction('', $arrayofmassactions); $massactionbutton=$form->selectMassAction('', $arrayofmassactions);
$newcardbutton=''; $newcardbutton='';

9
htdocs/core/actions_massactions.inc.php
View File

@ -1079,17 +1079,16 @@ if (! $error && ($massaction == 'delete' || ($action == 'delete' && $confirm ==
$result=$objecttmp->fetch($toselectid); $result=$objecttmp->fetch($toselectid);
if ($result > 0) if ($result > 0)
{ {
// Refuse deletion for some status ? // Refuse deletion for some objects/status
/* if ($objectclass == 'Facture' && empty($conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED) && $objecttmp->status != Facture::STATUS_DRAFT))
if ($objectclass == 'Facture' && $objecttmp->status == Facture::STATUS_DRAFT)
{ {
$langs->load("errors"); $langs->load("errors");
$nbignored++; $nbignored++;
$resaction.='<div class="error">'.$langs->trans('ErrorOnlyDraftStatusCanBeDeletedInMassAction',$objecttmp->ref).'</div><br>'; $resaction.='<div class="error">'.$langs->trans('ErrorOnlyDraftStatusCanBeDeletedInMassAction',$objecttmp->ref).'</div><br>';
continue; continue;
}*/ }
if (in_array($objecttmp->element, array('societe','member'))) $result = $objecttmp->delete($objecttmp->id, $user, 1); if (in_array($objecttmp->element, array('societe', 'member'))) $result = $objecttmp->delete($objecttmp->id, $user, 1);
else $result = $objecttmp->delete($user); else $result = $objecttmp->delete($user);
if ($result <= 0) if ($result <= 0)

5
htdocs/core/tpl/massactions_pre.tpl.php
View File

@ -27,6 +27,11 @@
// $trackid='ord'.$object->id; // $trackid='ord'.$object->id;
if ($massaction == 'predeletedraft')
{
print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmMassDraftDeletion"), $langs->trans("ConfirmMassDeletionQuestion", count($toselect)), "delete", null, '', 0, 200, 500, 1);
}
if ($massaction == 'predelete') if ($massaction == 'predelete')
{ {
print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmMassDeletion"), $langs->trans("ConfirmMassDeletionQuestion", count($toselect)), "delete", null, '', 0, 200, 500, 1); print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmMassDeletion"), $langs->trans("ConfirmMassDeletionQuestion", count($toselect)), "delete", null, '', 0, 200, 500, 1);

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

@ -942,3 +942,5 @@ Remote=Remote
LocalAndRemote=Local and Remote LocalAndRemote=Local and Remote
KeyboardShortcut=Keyboard shortcut KeyboardShortcut=Keyboard shortcut
AssignedTo=Assigned to AssignedTo=Assigned to
Deletedraft=Delete draft
ConfirmMassDraftDeletion=Draft Bulk delete confirmation

2
htdocs/langs/fr_FR/main.lang
View File

@ -941,3 +941,5 @@ Remote=Distant
LocalAndRemote=Local et distant LocalAndRemote=Local et distant
KeyboardShortcut=Raccourci clavier KeyboardShortcut=Raccourci clavier
AssignedTo=Assigné à AssignedTo=Assigné à
Deletedraft=Supprimer brouillon
ConfirmMassDraftDeletion=Confirmation de suppression brouillons en masse