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

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

Browse Source
This commit is contained in:
florian HENRY 2019-09-09 14:53:30 +02:00
commit 5961c29d23
14 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -20,6 +20,7 @@ Following changes may create regressions for some external modules, but were nec
* The deprecated method get_OutstandingBill has been removed. You can use getOutstandingBills() instead. * The deprecated method get_OutstandingBill has been removed. You can use getOutstandingBills() instead.
* The hook "moreFamily" must return payment into var "totalpayment" and no more "paiement" (english replace french). * The hook "moreFamily" must return payment into var "totalpayment" and no more "paiement" (english replace french).
* Removed deprecated method actioncomm->add(), use create() instead * Removed deprecated method actioncomm->add(), use create() instead
* If you develop your own emailing target selector and used parent::add_to_target(...), you must now use parent::addToTargets(...)
***** ChangeLog for 10.0.1 compared to 10.0.0 ***** ***** ChangeLog for 10.0.1 compared to 10.0.0 *****

2
htdocs/comm/mailing/class/mailing.class.php
View File

@ -370,7 +370,7 @@ class Mailing extends CommonObject
return -1; return -1;
} }
$mailing_target->add_to_target($object->id, $target_array); $mailing_target->addTargetsToDatabase($object->id, $target_array);
} }
} }

3
htdocs/core/modules/mailings/README
View File

@ -43,6 +43,9 @@ $target[0]=array('email'=>'email_0','name'=>'name_0','firstname'=>'firstname_0',
$target[n]=array('email'=>'email_n','name'=>'name_n','firstname'=>'firstname_n', 'other'=>'other_n'); $target[n]=array('email'=>'email_n','name'=>'name_n','firstname'=>'firstname_n', 'other'=>'other_n');
// ----- Your code end here ----- // ----- Your code end here -----
and call the method
parent::addTargetsToDatabase($mailing_id, $target);
***** STEP 3 ***** ***** STEP 3 *****

11
htdocs/core/modules/mailings/advthirdparties.modules.php
View File

@ -65,7 +65,7 @@ class mailing_advthirdparties extends MailingTargets
// phpcs:enable // phpcs:enable
global $conf, $langs; global $conf, $langs;
dol_syslog(get_class($this)."::add_to_target socid=".var_export($socid, true).' contactid='.var_export($contactid, true)); dol_syslog(get_class($this)."::add_to_target_spec socid=".var_export($socid, true).' contactid='.var_export($contactid, true));
$cibles = array(); $cibles = array();
@ -86,7 +86,7 @@ class mailing_advthirdparties extends MailingTargets
$num = $this->db->num_rows($result); $num = $this->db->num_rows($result);
$i = 0; $i = 0;
dol_syslog(get_class($this)."::add_to_target mailing ".$num." targets found", LOG_DEBUG); dol_syslog(get_class($this)."::add_to_target_spec mailing ".$num." targets found", LOG_DEBUG);
$old = ''; $old = '';
while ($i < $num) while ($i < $num)
@ -142,7 +142,7 @@ class mailing_advthirdparties extends MailingTargets
$num = $this->db->num_rows($result); $num = $this->db->num_rows($result);
$i = 0; $i = 0;
dol_syslog(get_class($this)."::add_to_target mailing ".$num." targets found"); dol_syslog(get_class($this)."::add_to_target_spec mailing ".$num." targets found");
$old = ''; $old = '';
while ($i < $num) while ($i < $num)
@ -177,8 +177,9 @@ class mailing_advthirdparties extends MailingTargets
} }
dol_syslog(get_class($this)."::add_to_target mailing cibles=".var_export($cibles, true), LOG_DEBUG); dol_syslog(get_class($this)."::add_to_target_spec mailing cibles=".var_export($cibles, true), LOG_DEBUG);
return parent::add_to_target($mailing_id, $cibles);
return parent::addTargetsToDatabase($mailing_id, $cibles);
} }

2
htdocs/core/modules/mailings/contacts1.modules.php
View File

@ -447,6 +447,6 @@ class mailing_contacts1 extends MailingTargets
return -1; return -1;
} }
return parent::add_to_target($mailing_id, $cibles); return parent::addTargetsToDatabase($mailing_id, $cibles);
} }
} }

2
htdocs/core/modules/mailings/example.modules.php
View File

@ -80,7 +80,7 @@ class mailing_example extends MailingTargets
// ----- Your code end here ----- // ----- Your code end here -----
return parent::add_to_target($mailing_id, $target); return parent::addTargetsToDatabase($mailing_id, $target);
} }

2
htdocs/core/modules/mailings/fraise.modules.php
View File

@ -315,6 +315,6 @@ class mailing_fraise extends MailingTargets
return -1; return -1;
} }
return parent::add_to_target($mailing_id, $cibles); return parent::addTargetsToDatabase($mailing_id, $cibles);
} }
} }

6
htdocs/core/modules/mailings/modules_mailings.php
View File

@ -151,17 +151,15 @@ class MailingTargets // This can't be abstract as it is used for some method
return $nb; return $nb;
} }
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/** /**
* Ajoute destinataires dans table des cibles * Add a list of targets int the database
* *
* @param int $mailing_id Id of emailing * @param int $mailing_id Id of emailing
* @param array $cibles Array with targets * @param array $cibles Array with targets
* @return int < 0 si erreur, nb ajout si ok * @return int < 0 si erreur, nb ajout si ok
*/ */
public function add_to_target($mailing_id, $cibles) public function addTargetsToDatabase($mailing_id, $cibles)
{ {
// phpcs:enable
global $conf; global $conf;
$this->db->begin(); $this->db->begin();

2
htdocs/core/modules/mailings/pomme.modules.php
View File

@ -217,6 +217,6 @@ class mailing_pomme extends MailingTargets
return -1; return -1;
} }
return parent::add_to_target($mailing_id, $cibles); return parent::addTargetsToDatabase($mailing_id, $cibles);
} }
} }

2
htdocs/core/modules/mailings/thirdparties.modules.php
View File

@ -190,7 +190,7 @@ class mailing_thirdparties extends MailingTargets
return -1; return -1;
} }
return parent::add_to_target($mailing_id, $cibles); return parent::addTargetsToDatabase($mailing_id, $cibles);
} }

2
htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
View File

@ -159,7 +159,7 @@ class mailing_thirdparties_services_expired extends MailingTargets
// ----- Your code end here ----- // ----- Your code end here -----
return parent::add_to_target($mailing_id, $cibles); return parent::addTargetsToDatabase($mailing_id, $cibles);
} }

2
htdocs/core/modules/mailings/xinputfile.modules.php
View File

@ -221,6 +221,6 @@ class mailing_xinputfile extends MailingTargets
ini_set('auto_detect_line_endings', false); ini_set('auto_detect_line_endings', false);
return parent::add_to_target($mailing_id, $cibles); return parent::addTargetsToDatabase($mailing_id, $cibles);
} }
} }

5
htdocs/core/modules/mailings/xinputuser.modules.php
View File

@ -113,10 +113,9 @@ class mailing_xinputuser extends MailingTargets
* Ajoute destinataires dans table des cibles * Ajoute destinataires dans table des cibles
* *
* @param int $mailing_id Id of emailing * @param int $mailing_id Id of emailing
* @param array $cibles Array with targets
* @return int < 0 si erreur, nb ajout si ok * @return int < 0 si erreur, nb ajout si ok
*/ */
public function add_to_target($mailing_id, $cibles) public function add_to_target($mailing_id)
{ {
// phpcs:enable // phpcs:enable
global $conf,$langs,$_FILES; global $conf,$langs,$_FILES;
@ -144,7 +143,7 @@ class mailing_xinputuser extends MailingTargets
'source_type' => 'file' 'source_type' => 'file'
); );
return parent::add_to_target($mailing_id, $cibles); return parent::addTargetsToDatabase($mailing_id, $cibles);
} }
else else
{ {

2
htdocs/modulebuilder/template/core/modules/mailings/mailinglist_mymodule_myobject.modules.php
View File

@ -161,7 +161,7 @@ class mailing_mailinglist_mymodule_myobject extends MailingTargets
// ----- Your code end here ----- // ----- Your code end here -----
return parent::add_to_target($mailing_id, $target); return parent::addTargetsToDatabase($mailing_id, $target);
} }