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

Use a shorter key for column title

Browse Source
This commit is contained in:
Laurent Destailleur 2017-10-11 12:19:44 +02:00
parent 051d49732d
commit 99afa3a3e0
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
View File

@ -283,11 +283,11 @@ class pdf_typhon extends ModelePDFDeliveryOrder
$pdf->writeHTMLCell(190, 3, $this->posxdesc-1, $tab_top-1, dol_htmlentitiesbr($desc_incoterms), 0, 1); $pdf->writeHTMLCell(190, 3, $this->posxdesc-1, $tab_top-1, dol_htmlentitiesbr($desc_incoterms), 0, 1);
$nexY = $pdf->GetY(); $nexY = $pdf->GetY();
$height_incoterms=$nexY-$tab_top; $height_incoterms=$nexY-$tab_top;
// Rect prend une longueur en 3eme param // Rect prend une longueur en 3eme param
$pdf->SetDrawColor(192,192,192); $pdf->SetDrawColor(192,192,192);
$pdf->Rect($this->marge_gauche, $tab_top-1, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_incoterms+1); $pdf->Rect($this->marge_gauche, $tab_top-1, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_incoterms+1);
$tab_top = $nexY+6; $tab_top = $nexY+6;
$height_incoterms += 4; $height_incoterms += 4;
} }
@ -567,7 +567,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
@chmod($file, octdec($conf->global->MAIN_UMASK)); @chmod($file, octdec($conf->global->MAIN_UMASK));
$this->result = array('fullpath'=>$file); $this->result = array('fullpath'=>$file);
return 1; // pas d'erreur return 1; // pas d'erreur
} }
else else
@ -662,14 +662,14 @@ class pdf_typhon extends ModelePDFDeliveryOrder
$pdf->line($this->posxqty, $tab_top, $this->posxqty, $tab_top + $tab_height); $pdf->line($this->posxqty, $tab_top, $this->posxqty, $tab_top + $tab_height);
if (empty($hidetop)) { if (empty($hidetop)) {
$pdf->SetXY($this->posxqty, $tab_top+1); $pdf->SetXY($this->posxqty, $tab_top+1);
$pdf->MultiCell($this->posxremainingqty - $this->posxqty, 2, $outputlangs->transnoentities("QtyShipped"),'','R'); $pdf->MultiCell($this->posxremainingqty - $this->posxqty, 2, $outputlangs->transnoentities("QtyShippedShort"),'','R');
} }
// Remain to ship // Remain to ship
$pdf->line($this->posxremainingqty, $tab_top, $this->posxremainingqty, $tab_top + $tab_height); $pdf->line($this->posxremainingqty, $tab_top, $this->posxremainingqty, $tab_top + $tab_height);
if (empty($hidetop)) { if (empty($hidetop)) {
$pdf->SetXY($this->posxremainingqty, $tab_top+1); $pdf->SetXY($this->posxremainingqty, $tab_top+1);
$pdf->MultiCell($this->page_largeur-$this->marge_droite-$this->posxremainingqty, 2, $outputlangs->transnoentities("KeepToShip"),'','R'); $pdf->MultiCell($this->page_largeur-$this->marge_droite-$this->posxremainingqty, 2, $outputlangs->transnoentities("KeepToShipShort"),'','R');
} }
} }

2
htdocs/langs/en_US/sendings.lang
View File

@ -18,11 +18,13 @@ SendingCard=Shipment card
NewSending=New shipment NewSending=New shipment
CreateShipment=Create shipment CreateShipment=Create shipment
QtyShipped=Qty shipped QtyShipped=Qty shipped
QtyShippedShort=Qty ship.
QtyPreparedOrShipped=Qty prepared or shipped QtyPreparedOrShipped=Qty prepared or shipped
QtyToShip=Qty to ship QtyToShip=Qty to ship
QtyReceived=Qty received QtyReceived=Qty received
QtyInOtherShipments=Qty in other shipments QtyInOtherShipments=Qty in other shipments
KeepToShip=Remain to ship KeepToShip=Remain to ship
KeepToShipShort=Remain
OtherSendingsForSameOrder=Other shipments for this order OtherSendingsForSameOrder=Other shipments for this order
SendingsAndReceivingForSameOrder=Shipments and receipts for this order SendingsAndReceivingForSameOrder=Shipments and receipts for this order
SendingsToValidate=Shipments to validate SendingsToValidate=Shipments to validate