diff --git a/htdocs/admin/livraison.php b/htdocs/admin/livraison.php index 0630c2965e1..86f29d246e9 100644 --- a/htdocs/admin/livraison.php +++ b/htdocs/admin/livraison.php @@ -134,6 +134,11 @@ if ($_GET["action"] == 'setdoc') } } +if ($_POST["action"] == 'set_DELIVERY_FREE_TEXT') +{ + dolibarr_set_const($db, "DELIVERY_FREE_TEXT",trim($_POST["DELIVERY_FREE_TEXT"])); +} + if ($_GET["action"] == 'setmod') { // \todo Verifier si module numerotation choisi peut etre activ� @@ -391,6 +396,29 @@ print ''; * * */ +print "
"; +print_titre($langs->trans("OtherOptions")); + +print ''; +print ''; +print ''; +print ''; +print ''; +print "\n"; +$var=true; + +$var=! $var; +print ''; +print ''; +print '\n"; +print ''; + +print '
'.$langs->trans("Parameter").''.$langs->trans("Value").' 
'; +print $langs->trans("FreeLegalTextOnDeliveryReceipts").'
'; +print ''; +print '
'; +print ''; +print "
'; $db->close(); diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 188bd608a70..6e8a891be2d 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -869,6 +869,7 @@ SendingsSetup=Sending module setup SendingsReceiptModel=Sending receipt model SendingsAbility=Support sendings sheets for customer deliveries NoNeedForDeliveryReceipts=In most cases, sendings receipts are used both as sheets for customer deliveries (list of products to send) and sheets that is recevied and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated. +FreeLegalTextOnDeliveryReceipts=Free text on delivery receipts ##### Deliveries ##### DeliveryOrderNumberingModules=Products deliveries receipt numbering module DeliveryOrderModel=Products deliveries receipt model diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index 4999ca1bbd1..47db41e1c9d 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -875,6 +875,7 @@ NoNeedForDeliveryReceipts=Dans la plupart des cas, ce sont les bons d'exp DeliveryOrderNumberingModules=Module de numérotation des bons de réception client DeliveryOrderModel=Modèle de bon de réception client DeliveriesOrderAbility=Prise en charge des bons de réception client +FreeLegalTextOnDeliveryReceipts=Mention complémentaire sur les bons de réception ##### FCKeditor ##### ActivateFCKeditor=Activer FCKeditor pour : FCKeditorForUsers=Création/édition WYSIWIG de la description et note des utilisateurs diff --git a/htdocs/livraison/mods/pdf/pdf_typhon.modules.php b/htdocs/livraison/mods/pdf/pdf_typhon.modules.php index 115efd947ef..c58f94ce7bd 100644 --- a/htdocs/livraison/mods/pdf/pdf_typhon.modules.php +++ b/htdocs/livraison/mods/pdf/pdf_typhon.modules.php @@ -451,7 +451,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder if (defined("FAC_PDF_SOCIETE_NOM") && FAC_PDF_SOCIETE_NOM) $pdf->MultiCell(80, 4, FAC_PDF_SOCIETE_NOM, 0, 'L'); else $pdf->MultiCell(80, 4, $mysoc->nom, 0, 'L'); - // Caract�ristiques emetteur + // Caracteristiques emetteur $carac_emetteur = ''; if (defined("FAC_PDF_ADRESSE") && FAC_PDF_ADRESSE) $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).FAC_PDF_ADRESSE; else { @@ -502,11 +502,11 @@ class pdf_typhon extends ModelePDFDeliveryOrder $pdf->SetFont('Arial','B',11); $pdf->MultiCell(106,4, $delivery->client->nom, 0, 'L'); - // Caract�ristiques client + // Caracteristiques client $carac_client=$delivery->client->adresse."\n"; $carac_client.=$delivery->client->cp . " " . $delivery->client->ville."\n"; - // Pays si diff�rent de l'�metteur + // Pays si different de l'emetteur if ($this->emetteur->pays_code != $delivery->client->pays_code) { $carac_client.=$delivery->client->pays."\n";