diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php index 0c133fac6df122d8abe472a5fe43d4e4a63b6b9e..1282aab5558227a6cd8dcac63c060d768cdd392b 100644 --- a/htdocs/comm/mailing/cibles.php +++ b/htdocs/comm/mailing/cibles.php @@ -540,7 +540,7 @@ if ($object->fetch($id) >= 0) print '</td>'; } - //Sreach Icon + // Search Icon print '<td align="right">'; if ($obj->statut == 0) { diff --git a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql index bf81785d3e30448dbcdf0255f57e0896c4c91290..895f2869b48f7efec6f23d9f906f22e75db7d73c 100644 --- a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql +++ b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql @@ -423,3 +423,18 @@ ALTER TABLE llx_resource ADD COLUMN extraparams varchar(255); ALTER TABLE llx_element_resources ADD COLUMN duree real; -- total duration of using ressource + +CREATE TABLE llx_advtargetemailing +( + rowid integer NOT NULL auto_increment PRIMARY KEY, + name varchar(200) NOT NULL, + entity integer NOT NULL DEFAULT 1, + fk_mailing integer NOT NULL, + filtervalue text, + fk_user_author integer NOT NULL, + datec datetime NOT NULL, + fk_user_mod integer NOT NULL, + tms timestamp NOT NULL +)ENGINE=InnoDB; + +ALTER TABLE llx_advtargetemailing ADD UNIQUE INDEX uk_advtargetemailing_name (name); diff --git a/htdocs/install/mysql/tables/llx_advtargetemailing.sql b/htdocs/install/mysql/tables/llx_advtargetemailing.sql index 2e4ad9587559be89f0eed2395c06baec81eeff19..d22503bb54836e6a3ed0abe876d87c15506043c5 100644 --- a/htdocs/install/mysql/tables/llx_advtargetemailing.sql +++ b/htdocs/install/mysql/tables/llx_advtargetemailing.sql @@ -17,7 +17,7 @@ -- Table of "Plan de comptes" for accountancy expert module -- ============================================================================ -CREATE TABLE IF NOT EXISTS llx_advtargetemailing +CREATE TABLE llx_advtargetemailing ( rowid integer NOT NULL auto_increment PRIMARY KEY, name varchar(200) NOT NULL, diff --git a/htdocs/langs/en_US/mails.lang b/htdocs/langs/en_US/mails.lang index 16c1d089854568b92e23c0ecf8663d693a0058bb..ff87db130b565240b5d03ce9768f72e51c5228f2 100644 --- a/htdocs/langs/en_US/mails.lang +++ b/htdocs/langs/en_US/mails.lang @@ -147,8 +147,8 @@ MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Se MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s. YouCanAlsoUseSupervisorKeyword=You can also add the keyword <strong>__SUPERVISOREMAIL__</strong> to have email being sent to the supervisor of user (works only if an email is defined for this supervisor) NbOfTargetedContacts=Current number of targeted contact emails -MailAdvTargetRecipients=Advance recipients targeting -AdvTgtTitle=Fill the input ro preselect the customer (or contact) destinaries +MailAdvTargetRecipients=Recipients (advanced selection) +AdvTgtTitle=Fill input fields to preselect the thirdparties or contacts/addresses to target AdvTgtSearchTextHelp=Use %% as magic caracters. For exemple to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For exemple <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everythnig taht start by jima AdvTgtSearchIntHelp=Use interval to select int or float value AdvTgtMinVal=Minimum value @@ -163,7 +163,7 @@ AddAll=Add all RemoveAll=Remove all ItemsCount=Item(s) AdvTgtNameTemplate=Filter name -AdvTgtAddContact=Add email according filter criteria +AdvTgtAddContact=Add emails according to criterias AdvTgtLoadFilter=Load filter AdvTgtDeleteFilter=Delete filter AdvTgtSaveFilter=Save filter