Browse Source

MMICRM : Authorize massaction email sending with documents in draft

Mathieu Moulin 2 years ago
parent
commit
db0856cc96
2 changed files with 4 additions and 4 deletions
  1. 3 3
      htdocs/core/actions_massactions.inc.php
  2. 1 1
      htdocs/custom/mmicrm

+ 3 - 3
htdocs/core/actions_massactions.inc.php

@@ -238,19 +238,19 @@ if (!$error && $massaction == 'confirm_presend') {
 
 			foreach ($listofobjectref[$thirdpartyid] as $objectid => $objectobj) {
 				//var_dump($thirdpartyid.' - '.$objectid.' - '.$objectobj->statut);
-				if ($objectclass == 'Propal' && $objectobj->statut == Propal::STATUS_DRAFT) {
+				if ($objectclass == 'Propal' && $objectobj->statut == Propal::STATUS_DRAFT && empty($conf->global->DOCUMENT_DRAFT_MASSACTION_CAN_SEND) && empty($conf->global->PROPAL_DRAFT_MASSACTION_CAN_SEND)) {
 					$langs->load("errors");
 					$nbignored++;
 					$resaction .= '<div class="error">'.$langs->trans('ErrorOnlyProposalNotDraftCanBeSentInMassAction', $objectobj->ref).'</div><br>';
 					continue; // Payment done or started or canceled
 				}
-				if ($objectclass == 'Commande' && $objectobj->statut == Commande::STATUS_DRAFT) {
+				if ($objectclass == 'Commande' && $objectobj->statut == Commande::STATUS_DRAFT && empty($conf->global->DOCUMENT_DRAFT_MASSACTION_CAN_SEND) && empty($conf->global->ORDER_DRAFT_MASSACTION_CAN_SEND)) {
 					$langs->load("errors");
 					$nbignored++;
 					$resaction .= '<div class="error">'.$langs->trans('ErrorOnlyOrderNotDraftCanBeSentInMassAction', $objectobj->ref).'</div><br>';
 					continue;
 				}
-				if ($objectclass == 'Facture' && $objectobj->statut == Facture::STATUS_DRAFT) {
+				if ($objectclass == 'Facture' && $objectobj->statut == Facture::STATUS_DRAFT && empty($conf->global->INVOICE_DRAFT_MASSACTION_CAN_SEND)) {
 					$langs->load("errors");
 					$nbignored++;
 					$resaction .= '<div class="error">'.$langs->trans('ErrorOnlyInvoiceValidatedCanBeSentInMassAction', $objectobj->ref).'</div><br>';

+ 1 - 1
htdocs/custom/mmicrm

@@ -1 +1 @@
-Subproject commit 1f96e79e937e60c1d33724430754517d3ddfd619
+Subproject commit b3f0236903f7a42403ff25b28e71e6c1e590daaf