diff --git a/apps/maarch_entreprise/lang/en.php b/apps/maarch_entreprise/lang/en.php index 19586c6619beb9ef61372570ed207e6b0d0b2f3c..290c967d9b2cacc420bc7ecd744c90eda44e84d7 100755 --- a/apps/maarch_entreprise/lang/en.php +++ b/apps/maarch_entreprise/lang/en.php @@ -2055,8 +2055,6 @@ if (!defined('_DOC_CREATED')) if (!defined("_SAVE_POSITION")) define("_SAVE_POSITION", "Save"); -if (!defined("_NO_ADDRESS_GIVEN")) - define("_NO_ADDRESS_GIVEN", "No address"); /***** History *****/ if (!defined('_UPDATE_STATUS')) define('_UPDATE_STATUS', 'Status update'); diff --git a/apps/maarch_entreprise/lang/fr.php b/apps/maarch_entreprise/lang/fr.php index 90f384d5c9e4d8a405133e96c39e429b592b7830..a354003283d37f6a297c132c48aa7836ea5ccf51 100755 --- a/apps/maarch_entreprise/lang/fr.php +++ b/apps/maarch_entreprise/lang/fr.php @@ -2113,8 +2113,6 @@ if (!defined('_DOC_CREATED')) if (!defined("_SAVE_POSITION")) define("_SAVE_POSITION", "Enregistrer"); -if (!defined("_NO_ADDRESS_GIVEN")) - define("_NO_ADDRESS_GIVEN", "Aucune adresse"); /***** History *****/ if (!defined('_UPDATE_STATUS')) - define('_UPDATE_STATUS', 'Modification du status'); + define('_UPDATE_STATUS', 'Modification du statut'); diff --git a/modules/attachments/xml/config.xml b/modules/attachments/xml/config.xml index 966fe7c6036c49279d72fc3394645719ee60515e..b3dd32a9b23b16c5759ddfbcd8c4d569101275b4 100755 --- a/modules/attachments/xml/config.xml +++ b/modules/attachments/xml/config.xml @@ -10,7 +10,7 @@ <loaded>true</loaded> <watermark> <enabled>false</enabled> <!-- If true, a watermark is applied on the document /!\ WARNING /!\ BUG WITH SIGNATUREBOOK IF TRUE --> - <text>Copie conforme de [title] [alt_identifier] au statut [status] le [date_now] [hour_now]</text> <!-- text with fusion fields [column_name] or [date_now], ex : [alt_identifier] with status [status] the [date_now] [hour_now]--> + <text>Copie conforme de [alt_identifier] au statut [status] le [date_now] [hour_now]</text> <!-- text with fusion fields [column_name] or [date_now], ex : [alt_identifier] with status [status] the [date_now] [hour_now]--> <position>30,35,0,0.5</position> <!-- Setup position with X, Y, angle, opacity ; ex : 50,450,30,0.5 --> <font>helvetica,10</font> <!-- Setup the font name and her size, ex: helvetica,10 --> <text_color>20,192,30</text_color> <!-- Setup the color of the text, ex: 192,192,192 --> diff --git a/modules/life_cycle/batch/process_emails.php b/modules/life_cycle/batch/process_emails.php index b82a4f6c4f84c8bfd3728d10f7eb31268a06f7f4..9d292372c10fc54ac3762a75c63ca79a8b2f2699 100755 --- a/modules/life_cycle/batch/process_emails.php +++ b/modules/life_cycle/batch/process_emails.php @@ -21,6 +21,7 @@ while ($state <> 'END') { $totalEmailsToProcess = 1; $currentEmail = 0; $GLOBALS['emails'] = array(); + $emailRecordset = new stdClass(); $emailRecordset->to_list=$GLOBALS['MailToNotify']; $emailRecordset->email_object='statistiques du '.date('d/m/Y'); $emailRecordset->email_body='Ci-joint.';