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

Add free text on delivery receipts

Browse Source
This commit is contained in:
Laurent Destailleur 2008-09-02 10:33:12 +00:00
parent 6f52dd70ca
commit 1cc23948b4
4 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
htdocs/admin/livraison.php
View File

@ -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<69>
@ -391,6 +396,29 @@ print '</table>';
*
*
*/
print "<br>";
print_titre($langs->trans("OtherOptions"));
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Parameter").'</td>';
print '<td align="center" width="60">'.$langs->trans("Value").'</td>';
print '<td width="80">&nbsp;</td>';
print "</tr>\n";
$var=true;
$var=! $var;
print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
print '<input type="hidden" name="action" value="set_DELIVERY_FREE_TEXT">';
print '<tr '.$bc[$var].'><td colspan="2">';
print $langs->trans("FreeLegalTextOnDeliveryReceipts").'<br>';
print '<textarea name="DELIVERY_FREE_TEXT" class="flat" cols="100">'.$conf->global->DELIVERY_FREE_TEXT.'</textarea>';
print '</td><td align="right">';
print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
print "</td></tr>\n";
print '</form>';
print '</table>';
$db->close();

1
htdocs/langs/en_US/admin.lang
View File

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

1
htdocs/langs/fr_FR/admin.lang
View File

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

6
htdocs/livraison/mods/pdf/pdf_typhon.modules.php
View File

@ -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<EFBFBD>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<EFBFBD>ristiques client
// Caracteristiques client
$carac_client=$delivery->client->adresse."\n";
$carac_client.=$delivery->client->cp . " " . $delivery->client->ville."\n";
// Pays si diff<EFBFBD>rent de l'<27>metteur
// Pays si different de l'emetteur
if ($this->emetteur->pays_code != $delivery->client->pays_code)
{
$carac_client.=$delivery->client->pays."\n";