From 2b8efc302a173e57138e5be6c9de2af57b9838c8 Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Sat, 18 Apr 2015 11:24:55 +0200
Subject: [PATCH] Fix : shipment model selection
---
htdocs/expedition/class/expedition.class.php | 2 --
htdocs/expedition/fiche.php | 9 +++++++++
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index e5dbb540b85..fa25c48366d 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -164,8 +164,6 @@ class Expedition extends CommonObject
$now=dol_now();
- if (empty($this->model_pdf)) $this->model_pdf=$conf->global->EXPEDITION_ADDON_PDF;
-
require_once DOL_DOCUMENT_ROOT .'/product/stock/class/mouvementstock.class.php';
$error = 0;
diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php
index 4743ad5f25b..6200f2c3c5f 100644
--- a/htdocs/expedition/fiche.php
+++ b/htdocs/expedition/fiche.php
@@ -113,6 +113,7 @@ if ($action == 'add')
$object->socid = $objectsrc->socid;
$object->ref_customer = $objectsrc->ref_client;
+ $object->model_pdf = GETPOST('model');
$object->date_delivery = $date_delivery; // Date delivery planed
$object->fk_delivery_address = $objectsrc->fk_delivery_address;
$object->shipping_method_id = GETPOST('shipping_method_id','int');
@@ -662,6 +663,14 @@ if ($action == 'create')
print '<td colspan="3">';
print '<input name="tracking_number" size="20" value="'.GETPOST('tracking_number','alpha').'">';
print "</td></tr>\n";
+
+ // Document model
+ print "<tr><td>".$langs->trans("Model")."</td>";
+ print '<td colspan="3">';
+ include_once DOL_DOCUMENT_ROOT . '/core/modules/expedition/modules_expedition.php';
+ $liste = ModelePdfExpedition::liste_modeles($db);
+ print $form->selectarray('model', $liste, $conf->global->EXPEDITION_ADDON_PDF);
+ print "</td></tr>\n";
// Other attributes
$parameters=array('colspan' => ' colspan="3"');
--
GitLab