From bbaa344801c7a7c824db748759acee6374a88ab7 Mon Sep 17 00:00:00 2001
From: Florian Henry <florian.henry@open-concept.pro>
Date: Mon, 29 Jul 2013 12:17:24 +0200
Subject: [PATCH] Defaulted PDF model document with default value (set in
admin) for Shipping and delivery
---
htdocs/expedition/class/expedition.class.php | 5 +++++
htdocs/livraison/class/livraison.class.php | 5 +++++
2 files changed, 10 insertions(+)
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 18147a67061..0fe0dbc1cc9 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -59,6 +59,7 @@ class Expedition extends CommonObject
var $billed;
var $note_public;
var $note_private;
+ var $model_pdf;
var $trueWeight;
var $weight_units;
@@ -162,6 +163,8 @@ class Expedition extends CommonObject
global $conf, $langs;
$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;
@@ -196,6 +199,7 @@ class Expedition extends CommonObject
$sql.= ", size_units";
$sql.= ", note_private";
$sql.= ", note_public";
+ $sql.= ", model_pdf";
$sql.= ") VALUES (";
$sql.= "'(PROV)'";
$sql.= ", ".$conf->entity;
@@ -217,6 +221,7 @@ class Expedition extends CommonObject
$sql.= ", ".$this->size_units;
$sql.= ", ".(!empty($this->note_private)?"'".$this->db->escape($this->note_private)."'":"null");
$sql.= ", ".(!empty($this->note_public)?"'".$this->db->escape($this->note_public)."'":"null");
+ $sql.= ", ".(!empty($this->model_pdf)?"'".$this->db->escape($this->model_pdf)."'":"null");
$sql.= ")";
$resql=$this->db->query($sql);
diff --git a/htdocs/livraison/class/livraison.class.php b/htdocs/livraison/class/livraison.class.php
index ea1962be34c..9bcf349e373 100644
--- a/htdocs/livraison/class/livraison.class.php
+++ b/htdocs/livraison/class/livraison.class.php
@@ -59,6 +59,7 @@ class Livraison extends CommonObject
var $date_delivery; // Date really received
var $date_creation;
var $date_valid;
+ var $model_pdf;
/**
@@ -89,6 +90,8 @@ class Livraison extends CommonObject
global $conf;
dol_syslog("Livraison::create");
+
+ if (empty($this->model_pdf)) $this->model_pdf=$conf->global->LIVRAISON_ADDON_PDF;
$error = 0;
@@ -112,6 +115,7 @@ class Livraison extends CommonObject
$sql.= ", fk_address";
$sql.= ", note_private";
$sql.= ", note_public";
+ $sql.= ", model_pdf";
$sql.= ") VALUES (";
$sql.= "'(PROV)'";
$sql.= ", ".$conf->entity;
@@ -123,6 +127,7 @@ class Livraison extends CommonObject
$sql.= ", ".($this->fk_delivery_address > 0 ? $this->fk_delivery_address : "null");
$sql.= ", ".(!empty($this->note_private)?"'".$this->db->escape($this->note_private)."'":"null");
$sql.= ", ".(!empty($this->note_public)?"'".$this->db->escape($this->note_public)."'":"null");
+ $sql.= ", ".(!empty($this->model_pdf)?"'".$this->db->escape($this->model_pdf)."'":"null");
$sql.= ")";
dol_syslog("Livraison::create sql=".$sql, LOG_DEBUG);
--
GitLab