From d343b76f912e3c81abe51c82f839f93dee8c437b Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Tue, 9 Oct 2012 00:28:52 +0200 Subject: [PATCH 1/3] Bug # 543 and # 570 : contact address is now used in recipient block and no more display bug on customer order ref until 36 digits --- .../expedition/doc/pdf_expedition_rouget.modules.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php b/htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php index 31fb518df1b..946bb1958bf 100644 --- a/htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php +++ b/htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php @@ -525,8 +525,8 @@ class pdf_expedition_rouget extends ModelePdfExpedition $text=$linkedobject->ref; if ($linkedobject->ref_client) $text.=' ('.$linkedobject->ref_client.')'; $Yoff = $Yoff+8; - $pdf->SetXY($this->page_largeur - $this->marge_droite - 60,$Yoff); - $pdf->MultiCell(60, 2, $outputlangs->transnoentities("RefOrder") ." : ".$outputlangs->transnoentities($text), 0, 'R'); + $pdf->SetXY($this->page_largeur - $this->marge_droite - 100,$Yoff); + $pdf->MultiCell(100, 2, $outputlangs->transnoentities("RefOrder") ." : ".$outputlangs->transnoentities($text), 0, 'R'); $Yoff = $Yoff+4; $pdf->SetXY($this->page_largeur - $this->marge_droite - 60,$Yoff); $pdf->MultiCell(60, 2, $outputlangs->transnoentities("Date")." : ".dol_print_date($object->commande->date,"daytext",false,$outputlangs,true), 0, 'R'); @@ -576,7 +576,7 @@ class pdf_expedition_rouget extends ModelePdfExpedition // If SHIPPING contact defined, we use it $usecontact=false; - $arrayidcontact=$object->getIdContact('external','SHIPPING'); + $arrayidcontact=$object->$origin->getIdContact('external','SHIPPING'); if (count($arrayidcontact) > 0) { $usecontact=true; From 229005b1a94f20976cfaf5f16908628919a0e7f0 Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Tue, 9 Oct 2012 00:54:02 +0200 Subject: [PATCH 2/3] Task # 186 : Forgot to add the new box in the mod definition... --- htdocs/core/modules/modProduct.class.php | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/core/modules/modProduct.class.php b/htdocs/core/modules/modProduct.class.php index a4f1e7d6978..c34d5eb907a 100644 --- a/htdocs/core/modules/modProduct.class.php +++ b/htdocs/core/modules/modProduct.class.php @@ -90,6 +90,7 @@ class modProduct extends DolibarrModules // Boxes $this->boxes = array(); $this->boxes[0][1] = "box_produits.php"; + $this->boxes[0][2] = "box_produits_alerte_stock.php"; // Permissions $this->rights = array(); From 67dbae44867d3a9f19ba32db2532aad1fe3cb487 Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Tue, 9 Oct 2012 00:58:07 +0200 Subject: [PATCH 3/3] Correction for new box inclusion --- htdocs/core/modules/modProduct.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/modules/modProduct.class.php b/htdocs/core/modules/modProduct.class.php index c34d5eb907a..72fe5a31249 100644 --- a/htdocs/core/modules/modProduct.class.php +++ b/htdocs/core/modules/modProduct.class.php @@ -90,7 +90,7 @@ class modProduct extends DolibarrModules // Boxes $this->boxes = array(); $this->boxes[0][1] = "box_produits.php"; - $this->boxes[0][2] = "box_produits_alerte_stock.php"; + $this->boxes[1][1] = "box_produits_alerte_stock.php"; // Permissions $this->rights = array();