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

Merge pull request #1137 from FHenry/3.4

Browse Source 
Defaulted PDF model document with default value (set in admin) for
This commit is contained in:
Laurent Destailleur 2013-07-29 10:14:00 -07:00
commit 293f556d21
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
View File

@ -537,7 +537,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
*/ */
function _tableau_info(&$pdf, $object, $posy, $outputlangs) function _tableau_info(&$pdf, $object, $posy, $outputlangs)
{ {
global $conf; global $conf,$mysoc;
$default_font_size = pdf_getPDFFontSize($outputlangs); $default_font_size = pdf_getPDFFontSize($outputlangs);
$pdf->SetFont('','', $default_font_size); $pdf->SetFont('','', $default_font_size);

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

@ -59,6 +59,7 @@ class Expedition extends CommonObject
var $billed; var $billed;
var $note_public; var $note_public;
var $note_private; var $note_private;
var $model_pdf;
var $trueWeight; var $trueWeight;
var $weight_units; var $weight_units;
@ -163,6 +164,8 @@ class Expedition extends CommonObject
$now=dol_now(); $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'; require_once DOL_DOCUMENT_ROOT .'/product/stock/class/mouvementstock.class.php';
$error = 0; $error = 0;
@ -196,6 +199,7 @@ class Expedition extends CommonObject
$sql.= ", size_units"; $sql.= ", size_units";
$sql.= ", note_private"; $sql.= ", note_private";
$sql.= ", note_public"; $sql.= ", note_public";
$sql.= ", model_pdf";
$sql.= ") VALUES ("; $sql.= ") VALUES (";
$sql.= "'(PROV)'"; $sql.= "'(PROV)'";
$sql.= ", ".$conf->entity; $sql.= ", ".$conf->entity;
@ -217,6 +221,7 @@ class Expedition extends CommonObject
$sql.= ", ".$this->size_units; $sql.= ", ".$this->size_units;
$sql.= ", ".(!empty($this->note_private)?"'".$this->db->escape($this->note_private)."'":"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->note_public)?"'".$this->db->escape($this->note_public)."'":"null");
$sql.= ", ".(!empty($this->model_pdf)?"'".$this->db->escape($this->model_pdf)."'":"null");
$sql.= ")"; $sql.= ")";
$resql=$this->db->query($sql); $resql=$this->db->query($sql);

5
htdocs/livraison/class/livraison.class.php
View File

@ -59,6 +59,7 @@ class Livraison extends CommonObject
var $date_delivery; // Date really received var $date_delivery; // Date really received
var $date_creation; var $date_creation;
var $date_valid; var $date_valid;
var $model_pdf;
/** /**
@ -90,6 +91,8 @@ class Livraison extends CommonObject
dol_syslog("Livraison::create"); dol_syslog("Livraison::create");
if (empty($this->model_pdf)) $this->model_pdf=$conf->global->LIVRAISON_ADDON_PDF;
$error = 0; $error = 0;
$now=dol_now(); $now=dol_now();
@ -112,6 +115,7 @@ class Livraison extends CommonObject
$sql.= ", fk_address"; $sql.= ", fk_address";
$sql.= ", note_private"; $sql.= ", note_private";
$sql.= ", note_public"; $sql.= ", note_public";
$sql.= ", model_pdf";
$sql.= ") VALUES ("; $sql.= ") VALUES (";
$sql.= "'(PROV)'"; $sql.= "'(PROV)'";
$sql.= ", ".$conf->entity; $sql.= ", ".$conf->entity;
@ -123,6 +127,7 @@ class Livraison extends CommonObject
$sql.= ", ".($this->fk_delivery_address > 0 ? $this->fk_delivery_address : "null"); $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_private)?"'".$this->db->escape($this->note_private)."'":"null");
$sql.= ", ".(!empty($this->note_public)?"'".$this->db->escape($this->note_public)."'":"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.= ")"; $sql.= ")";
dol_syslog("Livraison::create sql=".$sql, LOG_DEBUG); dol_syslog("Livraison::create sql=".$sql, LOG_DEBUG);