diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php index a66b265cd98..b059fa34bec 100644 --- a/htdocs/admin/contract.php +++ b/htdocs/admin/contract.php @@ -152,10 +152,10 @@ else if ($action == 'setmod') dolibarr_set_const($db, "CONTRACT_ADDON",$value,'chaine',0,'',$conf->entity); } -else if ($action == 'set_CONTRAT_FREE_TEXT') +else if ($action == 'set_CONTRACT_FREE_TEXT') { - $freetext= GETPOST('CONTRAT_FREE_TEXT','alpha'); - $res = dolibarr_set_const($db, "CONTRAT_FREE_TEXT",$freetext,'chaine',0,'',$conf->entity); + $freetext= GETPOST('CONTRACT_FREE_TEXT','alpha'); + $res = dolibarr_set_const($db, "CONTRACT_FREE_TEXT",$freetext,'chaine',0,'',$conf->entity); if (! $res > 0) $error++; @@ -169,11 +169,11 @@ else if ($action == 'set_CONTRAT_FREE_TEXT') } } -else if ($action == 'set_CONTRAT_DRAFT_WATERMARK') +else if ($action == 'set_CONTRACT_DRAFT_WATERMARK') { - $draft= GETPOST('CONTRAT_DRAFT_WATERMARK','alpha'); + $draft= GETPOST('CONTRACT_DRAFT_WATERMARK','alpha'); - $res = dolibarr_set_const($db, "CONTRAT_DRAFT_WATERMARK",trim($draft),'chaine',0,'',$conf->entity); + $res = dolibarr_set_const($db, "CONTRACT_DRAFT_WATERMARK",trim($draft),'chaine',0,'',$conf->entity); if (! $res > 0) $error++; @@ -489,10 +489,10 @@ $var=true; $var=! $var; print '
'; print ''; -print ''; +print ''; print ''; print $langs->trans("FreeLegalTextOnContracts").' ('.$langs->trans("AddCRIfTooLong").')
'; -print ''; +print ''; print ''; print ''; print "\n"; @@ -502,10 +502,10 @@ print '
'; $var=!$var; print "
"; print ''; -print ""; +print ""; print ''; print $langs->trans("WatermarkOnDraftContractCards").'
'; -print ''; +print ''; print ''; print ''; print "\n"; diff --git a/htdocs/core/modules/contract/doc/pdf_strato.modules.php b/htdocs/core/modules/contract/doc/pdf_strato.modules.php index 9591fd173e9..6976754285a 100644 --- a/htdocs/core/modules/contract/doc/pdf_strato.modules.php +++ b/htdocs/core/modules/contract/doc/pdf_strato.modules.php @@ -433,9 +433,9 @@ class pdf_strato extends ModelePDFContract pdf_pagehead($pdf,$outputlangs,$this->page_hauteur); //Affiche le filigrane brouillon - Print Draft Watermark - if($object->statut==0 && (! empty($conf->global->CONTRAT_DRAFT_WATERMARK)) ) + if($object->statut==0 && (! empty($conf->global->CONTRACT_DRAFT_WATERMARK)) ) { - pdf_watermark($pdf,$outputlangs,$this->page_hauteur,$this->page_largeur,'mm',$conf->global->CONTRAT_DRAFT_WATERMARK); + pdf_watermark($pdf,$outputlangs,$this->page_hauteur,$this->page_largeur,'mm',$conf->global->CONTRACT_DRAFT_WATERMARK); } //Prepare la suite @@ -601,7 +601,7 @@ class pdf_strato extends ModelePDFContract */ function _pagefoot(&$pdf,$object,$outputlangs,$hidefreetext=0) { - return pdf_pagefoot($pdf,$outputlangs,'CONTRAT_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,0,$hidefreetext); + return pdf_pagefoot($pdf,$outputlangs,'CONTRACT_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,0,$hidefreetext); } } diff --git a/htdocs/core/modules/contract/modules_contract.php b/htdocs/core/modules/contract/modules_contract.php index 341aa4daefc..35a03dd8337 100644 --- a/htdocs/core/modules/contract/modules_contract.php +++ b/htdocs/core/modules/contract/modules_contract.php @@ -25,7 +25,7 @@ /** * \file htdocs/core/modules/contract/modules_contract.php * \ingroup contract - * \brief Fichier contenant la classe mere de generation des fiches interventions en PDF and File of class to manage contract numbering + * \brief File with parent class for generating contracts to PDF and File of class to manage contract numbering */ require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php'; @@ -105,7 +105,7 @@ class ModelNumRefContracts /** * Test if existing numbers make problems with numbering * - * @return boolean false if conflit, true if ok + * @return boolean false if conflict, true if ok */ function canBeActivated() {