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

More accurate error code

Browse Source
This commit is contained in:
Laurent Destailleur 2017-10-04 00:51:25 +02:00
parent 8794e54eba
commit c08f33507f
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/compta/facture/card.php
View File

@ -4329,7 +4329,7 @@ else if ($id > 0 || ! empty($ref))
// Delete // Delete
if ($user->rights->facture->supprimer) if ($user->rights->facture->supprimer)
{ {
if (! $object->is_erasable()) { if ($object->is_erasable() <= 0) {
print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="' . $langs->trans("DisabledBecauseNotErasable") . '">' . $langs->trans('Delete') . '</a></div>'; print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="' . $langs->trans("DisabledBecauseNotErasable") . '">' . $langs->trans('Delete') . '</a></div>';
} else if ($objectidnext) { } else if ($objectidnext) {
print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="' . $langs->trans("DisabledBecauseReplacedInvoice") . '">' . $langs->trans('Delete') . '</a></div>'; print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="' . $langs->trans("DisabledBecauseReplacedInvoice") . '">' . $langs->trans('Delete') . '</a></div>';

8
htdocs/compta/facture/class/facture.class.php
View File

@ -3374,7 +3374,7 @@ class Facture extends CommonInvoice
* If hidden option INVOICE_CAN_ALWAYS_BE_REMOVED is on, we can. If hidden option INVOICE_CAN_NEVER_BE_REMOVED is on, we can't. * If hidden option INVOICE_CAN_ALWAYS_BE_REMOVED is on, we can. If hidden option INVOICE_CAN_NEVER_BE_REMOVED is on, we can't.
* If invoice has a definitive ref, is last, without payment and not dipatched into accountancy -> yes end of rule * If invoice has a definitive ref, is last, without payment and not dipatched into accountancy -> yes end of rule
* *
* @return int <0 if KO, 0=no, 1=yes * @return int <0 if KO, 0=no, >0=yes
*/ */
function is_erasable() function is_erasable()
{ {
@ -3388,7 +3388,7 @@ class Facture extends CommonInvoice
return 1; return 1;
} }
if (! empty($conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED)) return 1; if (! empty($conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED)) return 2;
if (! empty($conf->global->INVOICE_CAN_NEVER_BE_REMOVED)) return 0; if (! empty($conf->global->INVOICE_CAN_NEVER_BE_REMOVED)) return 0;
// TODO Test if there is at least one payment. If yes, refuse to delete. // TODO Test if there is at least one payment. If yes, refuse to delete.
@ -3401,9 +3401,9 @@ class Facture extends CommonInvoice
$ventilExportCompta = $this->getVentilExportCompta(); $ventilExportCompta = $this->getVentilExportCompta();
// If there is no invoice into the reset range and not already dispatched, we can delete // If there is no invoice into the reset range and not already dispatched, we can delete
if ($maxfacnumber == '' && $ventilExportCompta == 0) return 1; if ($maxfacnumber == '' && $ventilExportCompta == 0) return 3;
// If invoice to delete is last one and not already dispatched, we can delete // If invoice to delete is last one and not already dispatched, we can delete
if ($maxfacnumber == $this->ref && $ventilExportCompta == 0) return 1; if ($maxfacnumber == $this->ref && $ventilExportCompta == 0) return 4;
if ($this->situation_cycle_ref) { if ($this->situation_cycle_ref) {
$last = $this->is_last_in_cycle(); $last = $this->is_last_in_cycle();