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

Minor fixes

Browse Source
This commit is contained in:
Laurent Destailleur 2016-05-05 23:44:44 +02:00
parent f78bc16076
commit cdbbe8d87b
4 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -540,7 +540,7 @@ if ($object->fetch($id) >= 0)
print '</td>'; print '</td>';
} }
//Sreach Icon // Search Icon
print '<td align="right">'; print '<td align="right">';
if ($obj->statut == 0) if ($obj->statut == 0)
{ {

15
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
View File

@ -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 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);

2
htdocs/install/mysql/tables/llx_advtargetemailing.sql
View File

@ -17,7 +17,7 @@
-- Table of "Plan de comptes" for accountancy expert module -- 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, rowid integer NOT NULL auto_increment PRIMARY KEY,
name varchar(200) NOT NULL, name varchar(200) NOT NULL,

6
htdocs/langs/en_US/mails.lang
View File

@ -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. 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) 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 NbOfTargetedContacts=Current number of targeted contact emails
MailAdvTargetRecipients=Advance recipients targeting MailAdvTargetRecipients=Recipients (advanced selection)
AdvTgtTitle=Fill the input ro preselect the customer (or contact) destinaries 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 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 AdvTgtSearchIntHelp=Use interval to select int or float value
AdvTgtMinVal=Minimum value AdvTgtMinVal=Minimum value
@ -163,7 +163,7 @@ AddAll=Add all
RemoveAll=Remove all RemoveAll=Remove all
ItemsCount=Item(s) ItemsCount=Item(s)
AdvTgtNameTemplate=Filter name AdvTgtNameTemplate=Filter name
AdvTgtAddContact=Add email according filter criteria AdvTgtAddContact=Add emails according to criterias
AdvTgtLoadFilter=Load filter AdvTgtLoadFilter=Load filter
AdvTgtDeleteFilter=Delete filter AdvTgtDeleteFilter=Delete filter
AdvTgtSaveFilter=Save filter AdvTgtSaveFilter=Save filter