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

ChangeLog

@@ -112,6 +112,7 @@ NEW: When you create product or service, sell accountancy account by default is
 NEW: Widget birthdays of the month.
 NEW: Option in workflow module to set a reception billed on validate supplier bill.
 NEW: Autocompletion on lists should be available on mobile applications.
+NEW: Add mass action to close several members.
 
 For Developers:
 NEW: Module "DebugBar" is available as a stable module.

htdocs/adherents/card.php

@@ -1567,7 +1567,7 @@ else
 			$formquestion=array();
 			if ($object->email) $formquestion[]=array('type' => 'checkbox', 'name' => 'send_mail', 'label' => $label, 'value' => (! empty($conf->global->ADHERENT_DEFAULT_SENDINFOBYMAIL)?'true':'false'));
 			if ($backtopage)    $formquestion[]=array('type' => 'hidden', 'name' => 'backtopage', 'value' => ($backtopage != '1' ? $backtopage : $_SERVER["HTTP_REFERER"]));
-			print $form->formconfirm("card.php?rowid=".$id, $langs->trans("ResiliateMember"), $langs->trans("ConfirmResiliateMember"), "confirm_resign", $formquestion, 'no', 1, 220);
+			print $form->formconfirm("card.php?rowid=".$id, $langs->trans("ResiliateMember"), $langs->trans("ConfirmResiliateMember"), "confirm_resign", $formquestion, 'no', 1, 240);
 		}
 
 		// Confirm remove member

htdocs/adherents/list.php

@@ -189,6 +189,42 @@ if (empty($reshook))
 		$search_array_options=array();
 	}
 
+	// Close
+	if ($massaction == 'close' && $user->rights->adherent->creer)
+	{
+	    $tmpmember = new Adherent($db);
+	    $error=0;
+	    $nbclose=0;
+
+	    $db->begin();
+
+        foreach($toselect as $idtoclose)
+        {
+            $tmpmember->fetch($idtoclose);
+            $result=$tmpmember->resiliate($user);
+
+            if ($result < 0 && ! count($tmpmember->errors))
+    	    {
+    	        setEventMessages($tmpmember->error, $tmpmember->errors, 'errors');
+    	    }
+    	    else
+    	    {
+    	        if ($result > 0) $nbclose++;
+    	    }
+        }
+
+        if (! $error)
+        {
+            setEventMessages($langs->trans("XMembersClosed", $nbclose), null, 'mesgs');
+
+            $db->commit();
+        }
+        else
+        {
+            $db->rollback();
+        }
+	}
+
 	// Mass actions
 	$objectclass='Adherent';
 	$objectlabel='Members';
@@ -326,12 +362,11 @@ if ($search_type > 0)
 }
 
 $param='';
-if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
+if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
-if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
+if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.urlencode($limit);
 if ($sall != "") $param.="&sall=".urlencode($sall);
 if ($statut != "") $param.="&statut=".urlencode($statut);
 if ($search_ref)   $param.="&search_ref=".urlencode($search_ref);
-if ($search_nom)   $param.="&search_nom=".urlencode($search_nom);
 if ($search_civility) $param.="&search_civility=".urlencode($search_civility);
 if ($search_firstname) $param.="&search_firstname=".urlencode($search_firstname);
 if ($search_lastname)  $param.="&search_lastname=".urlencode($search_lastname);
@@ -358,6 +393,7 @@ $arrayofmassactions =  array(
 	//'presend'=>$langs->trans("SendByMail"),
 	//'builddoc'=>$langs->trans("PDFMerge"),
 );
+if ($user->rights->adherent->creer) $arrayofmassactions['close']=$langs->trans("Resiliate");
 if ($user->rights->adherent->supprimer) $arrayofmassactions['predelete']='<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
 if (in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array();
 $massactionbutton=$form->selectMassAction('', $arrayofmassactions);
@@ -455,7 +491,7 @@ if (! empty($arrayfields['d.lastname']['checked']))
 if (! empty($arrayfields['d.gender']['checked']))
 {
 	print '<td class="liste_titre">';
-	$arraygender=array('man'=>$langs->trans("Genderman"),'woman'=>$langs->trans("Genderwoman"));
+	$arraygender=array('man'=>$langs->trans("Genderman"), 'woman'=>$langs->trans("Genderwoman"));
 	print $form->selectarray('search_gender', $arraygender, $search_gender, 1);
 	print '</td>';
 }

htdocs/comm/action/class/actioncomm.class.php

@@ -95,6 +95,20 @@ class ActionComm extends CommonObject
      */
     public $datec;
 
+    /**
+     * Date end record (datef)
+     *
+     * @var integer
+     */
+    public $datef;
+
+    /**
+     * Duration (duree)
+     *
+     * @var integer
+     */
+    public $duree;
+
     /**
      * Date modification record (tms)
      *

htdocs/contact/class/contact.class.php

@@ -698,9 +698,9 @@ class Contact extends CommonObject
 
         $langs->load("dict");
 
-		dol_syslog(get_class($this)."::fetch id=".$id, LOG_DEBUG);
+		dol_syslog(get_class($this) . "::fetch id=" . $id . " ref_ext=" . $ref_ext . " email=" . $email, LOG_DEBUG);
 
-		if (empty($id) && empty($ref_ext))
+		if (empty($id) && empty($ref_ext) && empty($email))
 		{
 			$this->error='BadParameter';
 			return -1;

htdocs/core/lib/admin.lib.php

@@ -1044,9 +1044,9 @@ function unActivateModule($value, $requiredby = 1)
         $result=$objMod->remove();
         if ($result <= 0) $ret=$objMod->error;
     }
-    else
+    else    // We come here when we try to unactivate a module when module does not exists anymore in sources
     {
-        //print $dir.$modFile;
+        //print $dir.$modFile;exit;
     	// TODO Replace this after DolibarrModules is moved as abstract class with a try catch to show module we try to disable has not been found or could not be loaded
         include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
     	$genericMod = new DolibarrModules($db);
@@ -1054,11 +1054,11 @@ function unActivateModule($value, $requiredby = 1)
         $genericMod->rights_class=strtolower(preg_replace('/^mod/i', '', $modName));
         $genericMod->const_name='MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i', '', $modName));
         dol_syslog("modules::unActivateModule Failed to find module file, we use generic function with name " . $modName);
-        $genericMod->_remove(array());
+        $genericMod->remove('');
     }
 
-    // Desactivation des modules qui dependent de lui
+    // Disable modules that depends on module we disable
-    if (! $ret && $requiredby)
+    if (! $ret && $requiredby && is_object($objMod) && is_array($objMod->requiredby))
     {
         $countrb=count($objMod->requiredby);
         for ($i = 0; $i < $countrb; $i++)

htdocs/emailcollector/class/emailcollector.class.php

@@ -1287,13 +1287,14 @@ class EmailCollector extends CommonObject
                 if (empty($contactid))		// Try to find contact using email
                 {
                     $result = $contactstatic->fetch(0, null, '', $from);
+
                     if ($result > 0)
                     {
                         $contactid = $contactstatic->id;
                         $contactfoundby = 'email of contact ('.$from.')';
-                        if ($contactstatic->fk_soc > 0)
+	                    if ($contactstatic->socid > 0)
                         {
-                            $result = $thirdpartystatic->fetch($contactstatic->fk_soc);
+	                        $result = $thirdpartystatic->fetch($contactstatic->socid);
                             if ($result > 0)
                             {
                                 $thirdpartyid = $thirdpartystatic->id;
@@ -1309,7 +1310,6 @@ class EmailCollector extends CommonObject
                     if ($result > 0) $thirdpartyfoundby = 'email ('.$from.')';
                 }
 
-
                 // Do operations
                 foreach($this->actions as $operation)
                 {
@@ -1492,7 +1492,6 @@ class EmailCollector extends CommonObject
 
                         // Insert record of emails sent
                         $actioncomm = new ActionComm($this->db);
-
                         $actioncomm->type_code   = 'AC_OTH_AUTO';		// Type of event ('AC_OTH', 'AC_OTH_AUTO', 'AC_XXX'...)
                         $actioncomm->code        = 'AC_'.$actioncode;
                         $actioncomm->label       = $langs->trans("ActionAC_".$actioncode).' - '.$langs->trans("MailFrom").' '.$from;
@@ -1503,6 +1502,7 @@ class EmailCollector extends CommonObject
                         $actioncomm->percentage  = -1;   // Not applicable
                         $actioncomm->socid       = $thirdpartystatic->id;
                         $actioncomm->contactid   = $contactstatic->id;
+	                    $actioncomm->socpeopleassigned = (!empty($contactstatic->id) ? array($contactstatic->id => '') : array());
                         $actioncomm->authorid    = $user->id;   // User saving action
                         $actioncomm->userownerid = $user->id;	// Owner of action
                         // Fields when action is an email (content should be added into note)

htdocs/install/mysql/data/llx_c_type_contact.sql

@@ -92,3 +92,10 @@ INSERT INTO llx_c_type_contact (rowid, element, source, code, libelle, active, m
 INSERT INTO llx_c_type_contact (rowid, element, source, code, libelle, active, module) VALUES(157, 'ticket', 'external', 'SUPPORTCLI', 'Contact client suivi incident', 1, NULL);
 INSERT INTO llx_c_type_contact (rowid, element, source, code, libelle, active, module) VALUES(158, 'ticket', 'external', 'CONTRIBUTOR', 'Intervenant', 1, NULL);
 
+-- Supplier proposal
+
+insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (110, 'supplier_proposal', 'internal', 'SALESREPFOLL',  'Responsable suivi de la demande', 1);
+insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (111, 'supplier_proposal', 'external', 'BILLING',       'Contact fournisseur facturation', 1);
+insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (112, 'supplier_proposal', 'external', 'SHIPPING',      'Contact fournisseur livraison', 1);
+insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (113, 'supplier_proposal', 'external', 'SERVICE',       'Contact fournisseur prestation', 1);
+

htdocs/install/mysql/migration/9.0.0-10.0.0.sql

@@ -368,4 +368,10 @@ ALTER TABLE llx_reception_extrafields ADD INDEX idx_reception_extrafields (fk_ob
 ALTER TABLE llx_commande_fournisseur_dispatch ADD COLUMN fk_projet integer DEFAULT NULL;
 ALTER TABLE llx_commande_fournisseur_dispatch ADD COLUMN fk_reception integer DEFAULT NULL;
 
+
+
+insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (110, 'supplier_proposal', 'internal', 'SALESREPFOLL',  'Responsable suivi de la demande', 1);
+insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (111, 'supplier_proposal', 'external', 'BILLING',       'Contact fournisseur facturation', 1);
+insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (112, 'supplier_proposal', 'external', 'SHIPPING',      'Contact fournisseur livraison', 1);
+insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (113, 'supplier_proposal', 'external', 'SERVICE',       'Contact fournisseur prestation', 1);
   

htdocs/langs/en_US/members.lang

@@ -196,4 +196,5 @@ EmailSentToMember=Email sent to member at %s
 SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
 SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind. It can be a list of days separated by a semicolon, for example '10;5;0;-5')
 MembershipPaid=Membership paid for current period (until %s)
-YouMayFindYourInvoiceInThisEmail=You may find your invoice attached to this email
+YouMayFindYourInvoiceInThisEmail=You may find your invoice attached to this email
+XMembersClosed=%s member(s) closed

htdocs/public/payment/newpayment.php

@@ -1950,21 +1950,21 @@ if (preg_match('/^dopayment/', $action))
 		else
 		{
     		print '<script src="https://js.stripe.com/v3/"></script>'."\n";
-    
+
     	    // Code to ask the credit card. This use the default "API version". No way to force API version when using JS code.
     		print '<script type="text/javascript" language="javascript">'."\n";
-    
+
     		if (! empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION))
     		{
             ?>
     		// Code for payment with option STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION set
-    
+
     	    // Create a Stripe client.
     	    var stripe = Stripe('<?php echo $stripearrayofkeys['publishable_key']; // Defined into config.php ?>');
-    
+
     	    // Create an instance of Elements
     	    var elements = stripe.elements();
-    
+
     	    // Custom styling can be passed to options when creating an Element.
     	    // (Note that this demo uses a wider set of styles than the guide below.)
     	    var style = {
@@ -1983,12 +1983,12 @@ if (preg_match('/^dopayment/', $action))
     	        iconColor: '#fa755a'
     	      }
     	    };
-    
+
     		var cardElement = elements.create('card', {style: style});
-    
+
     		// Add an instance of the card Element into the `card-element` <div>
     		cardElement.mount('#card-element');
-    
+
     		// Handle real-time validation errors from the card Element.
     		cardElement.addEventListener('change', function(event) {
         		var displayError = document.getElementById('card-errors');
@@ -2000,16 +2000,16 @@ if (preg_match('/^dopayment/', $action))
         	        displayError.textContent = '';
         	      }
     	    });
-    
+
     		// Handle form submission
             var cardholderName = document.getElementById('cardholder-name');
             var cardButton = document.getElementById('buttontopay');
             var clientSecret = cardButton.dataset.secret;
-    
+
             cardButton.addEventListener('click', function(event) {
             	console.log("We click on buttontopay");
             	event.preventDefault();
-    
+
             	if (cardholderName.value == '')
             	{
     				console.log("Field Card holder is empty");
@@ -2055,21 +2055,21 @@ if (preg_match('/^dopayment/', $action))
                   });
                 }
             });
-    
+
-    
+
     		<?php
     		}
     		else
     		{
     		?>
     		// Code for payment with option STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION off
-    
+
     	    // Create a Stripe client.
     	    var stripe = Stripe('<?php echo $stripearrayofkeys['publishable_key']; // Defined into config.php ?>');
-    
+
     	    // Create an instance of Elements
     	    var elements = stripe.elements();
-    
+
     	    // Custom styling can be passed to options when creating an Element.
     	    // (Note that this demo uses a wider set of styles than the guide below.)
     	    var style = {
@@ -2088,13 +2088,13 @@ if (preg_match('/^dopayment/', $action))
     	        iconColor: '#fa755a'
     	      }
     	    };
-    
+
     	    // Create an instance of the card Element
     	    var card = elements.create('card', {style: style});
-    
+
     	    // Add an instance of the card Element into the `card-element` <div>
     	    card.mount('#card-element');
-    
+
     	    // Handle real-time validation errors from the card Element.
     	    card.addEventListener('change', function(event) {
     	      var displayError = document.getElementById('card-errors');
@@ -2104,7 +2104,7 @@ if (preg_match('/^dopayment/', $action))
     	        displayError.textContent = '';
     	      }
     	    });
-    
+
     	    // Handle form submission
     	    var form = document.getElementById('payment-form');
     	    console.log(form);
@@ -2145,8 +2145,8 @@ if (preg_match('/^dopayment/', $action))
     			}
     			?>
     	    });
-    
+
-    
+
     		/* Insert the Token into the form so it gets submitted to the server */
     	    function stripeTokenHandler(token) {
     	      // Insert the token ID into the form so it gets submitted to the server
@@ -2156,14 +2156,14 @@ if (preg_match('/^dopayment/', $action))
     	      hiddenInput.setAttribute('name', 'stripeToken');
     	      hiddenInput.setAttribute('value', token.id);
     	      form.appendChild(hiddenInput);
-    
+
     	      // Submit the form
     	      jQuery('#buttontopay').hide();
     	      jQuery('#hourglasstopay').show();
     	      console.log("submit token");
     	      form.submit();
     	    }
-    
+
     		/* Insert the Source into the form so it gets submitted to the server */
     		function stripeSourceHandler(source) {
     		  // Insert the source ID into the form so it gets submitted to the server
@@ -2173,17 +2173,17 @@ if (preg_match('/^dopayment/', $action))
     		  hiddenInput.setAttribute('name', 'stripeSource');
     		  hiddenInput.setAttribute('value', source.id);
     		  form.appendChild(hiddenInput);
-    
+
     		  // Submit the form
     	      jQuery('#buttontopay').hide();
     	      jQuery('#hourglasstopay').show();
     	      console.log("submit source");
     		  form.submit();
     		}
-    
+
     	    <?php
     		}
-    
+
     		print '</script>';
 		}
 	}