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

Fixed: Tracking number restored on PDF shipments

Browse Source 
Fixed: Translation
This commit is contained in:
Laurent Destailleur 2015-01-23 18:33:33 +01:00
parent 5306220e5e
commit 083cf06908
7 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
htdocs/core/modules/expedition/doc/pdf_merou.modules.php
View File

@ -557,13 +557,18 @@ class pdf_merou extends ModelePdfExpedition
// Date Expedition // Date Expedition
$Yoff = $Yoff+7; $Yoff = $Yoff+7;
$pdf->SetXY($blSocX-80,$blSocY+20); $pdf->SetXY($blSocX-80,$blSocY+17);
$pdf->SetFont('','B', $default_font_size - 2); $pdf->SetFont('','B', $default_font_size - 2);
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
$pdf->MultiCell(50, 8, $outputlangs->transnoentities("Date")." : " . dol_print_date($object->date_delivery,'day',false,$outputlangs,true), '', 'L'); $pdf->MultiCell(50, 8, $outputlangs->transnoentities("Date")." : " . dol_print_date($object->date_delivery,'day',false,$outputlangs,true), '', 'L');
$pdf->SetXY($blSocX-80,$blSocY+20);
$pdf->SetFont('','B', $default_font_size - 2);
$pdf->SetTextColor(0,0,0);
$pdf->MultiCell(50, 8, $outputlangs->transnoentities("TrackingNumber")." : " . $object->tracking_number, '', 'L');
// Deliverer // Deliverer
$pdf->SetXY($blSocX-80,$blSocY+23); $pdf->SetXY($blSocX-80,$blSocY+24);
$pdf->SetFont('','', $default_font_size - 2); $pdf->SetFont('','', $default_font_size - 2);
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
@ -577,13 +582,8 @@ class pdf_merou extends ModelePdfExpedition
// Get code using getLabelFromKey // Get code using getLabelFromKey
$code=$outputlangs->getLabelFromKey($this->db,$object->shipping_method_id,'c_shipment_mode','rowid','code'); $code=$outputlangs->getLabelFromKey($this->db,$object->shipping_method_id,'c_shipment_mode','rowid','code');
$label=$outputlangs->trans("SendingMethod".strtoupper($code))." :"; $label=$outputlangs->trans("SendingMethod".strtoupper($code))." :";
$pdf->writeHTMLCell(50, 8, '', '', $label." ".$object->tracking_url, '', 'L');
} }
else
{
$label=$outputlangs->transnoentities("Deliverer");
}
$pdf->writeHTMLCell(50, 8, '', '', $label." ".$object->tracking_url, '', 'L');
} }
} }
else else

14
htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
View File

@ -191,11 +191,17 @@ class pdf_rouget extends ModelePdfExpedition
$tab_height = 130; $tab_height = 130;
$tab_height_newpage = 150; $tab_height_newpage = 150;
if (! empty($object->note_public) || (! empty($object->tracking_number) && ! empty($object->shipping_method_id))) if (! empty($object->note_public) || ! empty($object->tracking_number))
{ {
$tab_top = 88; $tab_top = 88;
$tab_top_alt = $tab_top; $tab_top_alt = $tab_top;
$pdf->SetFont('','B', $default_font_size - 2);
$pdf->writeHTMLCell(60, 4, $this->posxdesc-1, $tab_top-1, $outputlangs->transnoentities("TrackingNumber")." : " . $object->tracking_number, 0, 1, false, true, 'L');
$tab_top_alt = $pdf->GetY();
//$tab_top_alt += 1;
// Tracking number // Tracking number
if (! empty($object->tracking_number)) if (! empty($object->tracking_number))
{ {
@ -209,14 +215,14 @@ class pdf_rouget extends ModelePdfExpedition
$label=$outputlangs->trans("LinkToTrackYourPackage")."<br>"; $label=$outputlangs->trans("LinkToTrackYourPackage")."<br>";
$label.=$outputlangs->trans("SendingMethod".strtoupper($code))." :"; $label.=$outputlangs->trans("SendingMethod".strtoupper($code))." :";
$pdf->SetFont('','B', $default_font_size - 2); $pdf->SetFont('','B', $default_font_size - 2);
$pdf->writeHTMLCell(60, 7, $this->posxdesc-1, $tab_top-1, $label." ".$object->tracking_url, 0, 1, false, true, 'L'); $pdf->writeHTMLCell(60, 4, $this->posxdesc-1, $tab_top+6, $label." ".$object->tracking_url, 0, 1, false, true, 'L');
$tab_top_alt += 7; $tab_top_alt = $pdf->GetY();
} }
} }
} }
// Affiche notes // Notes
if (! empty($object->note_public)) if (! empty($object->note_public))
{ {
$pdf->SetFont('','', $default_font_size - 1); // Dans boucle pour gerer multi-page $pdf->SetFont('','', $default_font_size - 1); // Dans boucle pour gerer multi-page

2
htdocs/expedition/class/expedition.class.php
View File

@ -1522,7 +1522,7 @@ class Expedition extends CommonObject
} }
/** /**
* Get tracking url status * Forge an set tracking url
* *
* @param string $value Value * @param string $value Value
* @return void * @return void

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

@ -1397,9 +1397,9 @@ FixedEmailTarget=Fixed email target
SendingsSetup=Sending module setup SendingsSetup=Sending module setup
SendingsReceiptModel=Sending receipt model SendingsReceiptModel=Sending receipt model
SendingsNumberingModules=Sendings numbering modules SendingsNumberingModules=Sendings numbering modules
SendingsAbility=Support sendings sheets for customer deliveries SendingsAbility=Support shipment 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. 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.
FreeLegalTextOnShippings=Free text on shippings FreeLegalTextOnShippings=Free text on shipments
##### Deliveries ##### ##### Deliveries #####
DeliveryOrderNumberingModules=Products deliveries receipt numbering module DeliveryOrderNumberingModules=Products deliveries receipt numbering module
DeliveryOrderModel=Products deliveries receipt model DeliveryOrderModel=Products deliveries receipt model

4
htdocs/langs/en_US/agenda.lang
View File

@ -58,8 +58,8 @@ OrderSentByEMail=Customer order %s sent by EMail
InvoiceSentByEMail=Customer invoice %s sent by EMail InvoiceSentByEMail=Customer invoice %s sent by EMail
SupplierOrderSentByEMail=Supplier order %s sent by EMail SupplierOrderSentByEMail=Supplier order %s sent by EMail
SupplierInvoiceSentByEMail=Supplier invoice %s sent by EMail SupplierInvoiceSentByEMail=Supplier invoice %s sent by EMail
ShippingSentByEMail=Shipping %s sent by EMail ShippingSentByEMail=Shipment %s sent by EMail
ShippingValidated= Shipping %s validated ShippingValidated= Shipment %s validated
NewCompanyToDolibarr= Third party created NewCompanyToDolibarr= Third party created
DateActionPlannedStart= Planned start date DateActionPlannedStart= Planned start date
DateActionPlannedEnd= Planned end date DateActionPlannedEnd= Planned end date

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

@ -4,7 +4,7 @@ Sending=Shipment
Sendings=Shipments Sendings=Shipments
Shipment=Shipment Shipment=Shipment
Shipments=Shipments Shipments=Shipments
Receivings=Receivings Receivings=Receipts
SendingsArea=Shipments area SendingsArea=Shipments area
ListOfSendings=List of shipments ListOfSendings=List of shipments
SendingMethod=Shipping method SendingMethod=Shipping method
@ -14,7 +14,7 @@ SearchASending=Search for shipment
StatisticsOfSendings=Statistics for shipments StatisticsOfSendings=Statistics for shipments
NbOfSendings=Number of shipments NbOfSendings=Number of shipments
NumberOfShipmentsByMonth=Number of shipments by month NumberOfShipmentsByMonth=Number of shipments by month
SendingCard=Shipping card SendingCard=Shipment card
NewSending=New shipment NewSending=New shipment
CreateASending=Create a shipment CreateASending=Create a shipment
CreateSending=Create shipment CreateSending=Create shipment
@ -37,7 +37,7 @@ StatusSendingCanceledShort=Canceled
StatusSendingDraftShort=Draft StatusSendingDraftShort=Draft
StatusSendingValidatedShort=Validated StatusSendingValidatedShort=Validated
StatusSendingProcessedShort=Processed StatusSendingProcessedShort=Processed
SendingSheet=Sending sheet SendingSheet=Shipment sheet
Carriers=Carriers Carriers=Carriers
Carrier=Carrier Carrier=Carrier
CarriersArea=Carriers area CarriersArea=Carriers area
@ -58,7 +58,7 @@ SendShippingRef=Submission of shipment %s
ActionsOnShipping=Events on shipment ActionsOnShipping=Events on shipment
LinkToTrackYourPackage=Link to track your package LinkToTrackYourPackage=Link to track your package
ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the order card. ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the order card.
RelatedShippings=Related shippings RelatedShippings=Related shipments
ShipmentLine=Shipment line ShipmentLine=Shipment line
CarrierList=List of transporters CarrierList=List of transporters
SendingRunning=Product from customer order already sent SendingRunning=Product from customer order already sent

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

@ -116,7 +116,7 @@ MassMovement=Mass movement
MassStockMovement=Mass stock movement MassStockMovement=Mass stock movement
SelectProductInAndOutWareHouse=Select a product, a quantity, a source warehouse and a target warehouse, then click "%s". Once this is done for all required movements, click onto "%s". SelectProductInAndOutWareHouse=Select a product, a quantity, a source warehouse and a target warehouse, then click "%s". Once this is done for all required movements, click onto "%s".
RecordMovement=Record transfert RecordMovement=Record transfert
ReceivingForSameOrder=Receivings for this order ReceivingForSameOrder=Receipts for this order
StockMovementRecorded=Stock movements recorded StockMovementRecorded=Stock movements recorded
RuleForStockAvailability=Rules on stock requirements RuleForStockAvailability=Rules on stock requirements
StockMustBeEnoughForInvoice=Stock level must be enough to add product/service into invoice StockMustBeEnoughForInvoice=Stock level must be enough to add product/service into invoice