Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-08 00:52:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix: The object deliverycompany was not used anymore and output of

Browse Source 
details for delivery reports was lost during 3.5. Rewrite code to
restore feature.

Conflicts:
	htdocs/core/modules/expedition/doc/pdf_merou.modules.php
	htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
This commit is contained in:
Laurent Destailleur
2014-06-20 12:48:08 +02:00
parent 11cb23f4ac
commit 8ce8bf47ee
4 changed files with 20 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -602,8 +602,7 @@ class pdf_merou extends ModelePdfExpedition
$carac_client_name=$outputlangs->convToOutputCharset($object->client->nom);
}
$carac_client=pdf_build_address($outputlangs,$this->emetteur,$object->client,$object->contact,$usecontact,'target');
$carac_client=pdf_build_address($outputlangs,$this->emetteur,$object->client,((!empty($object->contact))?$object->contact:null),$usecontact,'targetwithdetails');
$blDestX=$blExpX+55;
$blW=50;

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

@@ -504,7 +504,7 @@ class pdf_rouget extends ModelePdfExpedition
$pdf->SetTextColor(0,0,60);
$pdf->MultiCell(100, 4, $outputlangs->transnoentities("RefSending") ." : ".$object->ref, '', 'R');
//Date Expedition
// Date Expedition
$posy+=4;
$pdf->SetXY($posx,$posy);
$pdf->SetTextColor(0,0,60);
@@ -530,7 +530,7 @@ class pdf_rouget extends ModelePdfExpedition
$origin_id = $object->origin_id;
// TODO move to external function
if ($conf->$origin->enabled)
if (! empty($conf->$origin->enabled))
{
$outputlangs->load('orders');
@@ -616,7 +616,7 @@ class pdf_rouget extends ModelePdfExpedition
$carac_client_name=$outputlangs->convToOutputCharset($object->client->nom);
}
$carac_client=pdf_build_address($outputlangs,$this->emetteur,$object->client,$object->contact,$usecontact,'target');
$carac_client=pdf_build_address($outputlangs,$this->emetteur,$object->client,(!empty($object->contact)?$object->contact:null),$usecontact,'targetwithdetails');
// Show recipient
$widthrecbox=100;