From 9fc276d03b642409f4f702860e9fd008d1406823 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 9 Dec 2009 19:04:54 +0000 Subject: [PATCH] task #9916 : Add FREE text for interventions card --- ChangeLog | 3 ++- htdocs/admin/commande.php | 8 ++++---- htdocs/admin/fichinter.php | 19 ++++++++++++++++++- .../modules/fichinter/pdf_soleil.modules.php | 2 +- htdocs/langs/fr_FR/admin.lang | 1 + 5 files changed, 26 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index bc9d00b428d..b8a1dc52180 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,7 +11,8 @@ For users: with third party type. - New: VAT number is stored in one field. This is more "international". - New: task #9782 : Add possibility to delete a warehouse. -- New: Add label for stock movements. +- New: task #9640 : Add label for stock movements. +- New: task #9916 : Add FREE text for interventions card - Fix: bug #28055 : Unable to modify the date of a cloned command. - Fix: bug #27891. - Fix: Change of numbering module was not effective. diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php index f09a7ad66f7..84125fba181 100644 --- a/htdocs/admin/commande.php +++ b/htdocs/admin/commande.php @@ -23,10 +23,10 @@ */ /** - \file htdocs/admin/commande.php - \ingroup commande - \brief Page d'administration-configuration du module Commande - \version $Id$ + * \file htdocs/admin/commande.php + * \ingroup commande + * \brief Setup page of module Order + * \version $Id$ */ require("./pre.inc.php"); diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php index 0ba3004facd..b4415f0f851 100644 --- a/htdocs/admin/fichinter.php +++ b/htdocs/admin/fichinter.php @@ -24,7 +24,7 @@ /** * \file htdocs/admin/fichinter.php * \ingroup fichinter - * \brief Page d'administration/configuration du module FicheInter + * \brief Setup page of module Interventions * \version $Id$ */ @@ -51,6 +51,11 @@ if ($_POST["action"] == 'updateMask') if ($maskconst) dolibarr_set_const($db,$maskconst,$maskvalue,'chaine',0,'',$conf->entity); } +if ($_POST["action"] == 'set_FICHINTER_FREE_TEXT') +{ + dolibarr_set_const($db, "FICHINTER_FREE_TEXT",$_POST["FICHINTER_FREE_TEXT"],'chaine',0,'',$conf->entity); +} + if ($_POST["action"] == 'set_FICHINTER_DRAFT_WATERMARK') { dolibarr_set_const($db, "FICHINTER_DRAFT_WATERMARK",trim($_POST["FICHINTER_DRAFT_WATERMARK"]),'chaine',0,'',$conf->entity); @@ -387,6 +392,18 @@ print " \n"; print "\n"; $var=true; +$var=! $var; +print '
'; +print ''; +print ''; +print ''; +print $langs->trans("FreeLegalTextOnInterventions").' ('.$langs->trans("AddCRIfTooLong").')
'; +print ''; +print ''; +print ''; +print "\n"; +print '
'; + //Use draft Watermark $var=!$var; print "
"; diff --git a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php b/htdocs/includes/modules/fichinter/pdf_soleil.modules.php index 7902533839c..ab59975a5b0 100644 --- a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php +++ b/htdocs/includes/modules/fichinter/pdf_soleil.modules.php @@ -381,7 +381,7 @@ class pdf_soleil extends ModelePDFFicheinter */ function _pagefoot(&$pdf,$object,$outputlangs) { - return pdf_pagefoot($pdf,$outputlangs,'FICHEINTER_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object); + return pdf_pagefoot($pdf,$outputlangs,'FICHINTER_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object); } } diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index d2fa5294a0e..1dc4512d2c2 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -828,6 +828,7 @@ ClickToDialUrlDesc = Url appelée lors dun clic sur le picto téléphone. Dans l Bookmark4uSetup = Configuration du module Bookmark4u ##### Interventions ##### = undefined InterventionsSetup = Configuration du module Interventions +FreeLegalTextOnInterventions = Mention complémentaire sur les fiches d'intervention ##### Members ##### = undefined MembersSetup = Configuration du module Adhérents MemberMainOptions = Options principales