From aec1bdb3c4bf2608963ca28fd3a771fd043135f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
<marcosgdf@gmail.com>
Date: Thu, 25 Dec 2014 23:08:07 +0100
Subject: [PATCH] Fixed [ bug #1766 ] PHP Warning when adding a service to a
supplier invoice
---
htdocs/comm/propal.php | 5 +----
htdocs/commande/card.php | 4 ++--
htdocs/compta/facture.php | 6 +++---
htdocs/expedition/card.php | 4 +---
htdocs/fourn/commande/card.php | 12 +++---------
htdocs/fourn/facture/card.php | 8 ++------
htdocs/livraison/card.php | 4 +---
7 files changed, 13 insertions(+), 30 deletions(-)
diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index 5d20743d029..3744a9e4bab 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -189,8 +189,8 @@ else if ($action == 'confirm_validate' && $confirm == 'yes' && $user->rights->pr
$outputlangs->setDefaultLang($newlang);
}
$model=$object->modelpdf;
- if (empty($model)) { $tmp=getListOfModels($db, 'propal'); $keys=array_keys($tmp); $model=$keys[0]; }
$ret = $object->fetch($id); // Reload to get new records
+
$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
}
}
@@ -499,9 +499,6 @@ else if ($action == 'add' && $user->rights->propal->creer)
$outputlangs->setDefaultLang($newlang);
}
$model=$object->modelpdf;
- if (empty($model)) {
- $tmp=getListOfModels($db, 'propal'); $keys=array_keys($tmp); $model=$keys[0];
- }
$ret = $object->fetch($id); // Reload to get new records
$result=$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 1291d6cce26..62577387bbd 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -922,8 +922,8 @@ else if ($action == 'confirm_validate' && $confirm == 'yes' && $user->rights->co
$outputlangs->setDefaultLang($newlang);
}
$model=$object->modelpdf;
- if (empty($model)) { $tmp=getListOfModels($db, 'order'); $keys=array_keys($tmp); $model=$keys[0]; }
$ret = $object->fetch($id); // Reload to get new records
+
$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
}
}
@@ -971,8 +971,8 @@ else if ($action == 'confirm_modif' && $user->rights->commande->creer) {
$outputlangs->setDefaultLang($newlang);
}
$model=$object->modelpdf;
- if (empty($model)) { $tmp=getListOfModels($db, 'order'); $keys=array_keys($tmp); $model=$keys[0]; }
$ret = $object->fetch($id); // Reload to get new records
+
$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
}
}
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 4f8eb73a8db..000b1f7de90 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -417,8 +417,8 @@ else if ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->factu
$outputlangs->setDefaultLang($newlang);
}
$model=$object->modelpdf;
- if (empty($model)) { $tmp=getListOfModels($db, 'invoice'); $keys=array_keys($tmp); $model=$keys[0]; }
$ret = $object->fetch($id); // Reload to get new records
+
$result = $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
if ($result < 0) dol_print_error($db,$result);
}
@@ -500,8 +500,8 @@ else if ($action == 'confirm_modif' && ((empty($conf->global->MAIN_USE_ADVANCED_
$outputlangs->setDefaultLang($newlang);
}
$model=$object->modelpdf;
- if (empty($model)) { $tmp=getListOfModels($db, 'invoice'); $keys=array_keys($tmp); $model=$keys[0]; }
$ret = $object->fetch($id); // Reload to get new records
+
$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
}
}
@@ -1328,8 +1328,8 @@ else if ($action == 'addline' && $user->rights->facture->creer)
$outputlangs->setDefaultLang($newlang);
}
$model=$object->modelpdf;
- if (empty($model)) { $tmp=getListOfModels($db, 'invoice'); $keys=array_keys($tmp); $model=$keys[0]; }
$ret = $object->fetch($id); // Reload to get new records
+
$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
}
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 6ee45778d18..423d1565f8c 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -279,10 +279,8 @@ else if ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->exped
$outputlangs->setDefaultLang($newlang);
}
$model=$object->modelpdf;
- if (empty($model)) {
- $tmp=getListOfModels($db, 'shipping'); $keys=array_keys($tmp); $model=$keys[0];
- }
$ret = $object->fetch($id); // Reload to get new records
+
$result=$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
if ($result < 0) dol_print_error($db,$result);
}
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 753f91fbdda..09556bd9125 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -357,10 +357,8 @@ else if ($action == 'addline' && $user->rights->fournisseur->commande->creer)
$outputlangs->setDefaultLang($newlang);
}
$model=$object->modelpdf;
- if (empty($model)) {
- $tmp=getListOfModels($db, 'order_supplier'); $keys=array_keys($tmp); $model=$keys[0];
- }
$ret = $object->fetch($id); // Reload to get new records
+
$result=$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
if ($result < 0) dol_print_error($db,$result);
}
@@ -462,10 +460,8 @@ else if ($action == 'update_line' && $user->rights->fournisseur->commande->creer
$outputlangs->setDefaultLang($newlang);
}
$model=$object->modelpdf;
- if (empty($model)) {
- $tmp=getListOfModels($db, 'order_supplier'); $keys=array_keys($tmp); $model=$keys[0];
- }
$ret = $object->fetch($id); // Reload to get new records
+
$result=$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
if ($result < 0) dol_print_error($db,$result);
}
@@ -526,10 +522,8 @@ else if ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->fourn
$outputlangs->setDefaultLang($newlang);
}
$model=$object->modelpdf;
- if (empty($model)) {
- $tmp=getListOfModels($db, 'order_supplier'); $keys=array_keys($tmp); $model=$keys[0];
- }
$ret = $object->fetch($id); // Reload to get new records
+
$result=$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
if ($result < 0) dol_print_error($db,$result);
}
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 38a0f79a6ea..9542fc062e7 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -711,10 +711,8 @@ elseif ($action == 'addline' && $user->rights->fournisseur->facture->creer)
$outputlangs->setDefaultLang($newlang);
}
$model=$object->modelpdf;
- if (empty($model)) {
- $tmp=getListOfModels($db, 'invoice_supplier'); $keys=array_keys($tmp); $model=$keys[0];
- }
$ret = $object->fetch($id); // Reload to get new records
+
$result=$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
if ($result < 0) dol_print_error($db,$result);
}
@@ -793,10 +791,8 @@ elseif ($action == 'edit' && $user->rights->fournisseur->facture->creer)
$outputlangs->setDefaultLang($newlang);
}
$model=$object->modelpdf;
- if (empty($model)) {
- $tmp=getListOfModels($db, 'invoice_supplier'); $keys=array_keys($tmp); $model=$keys[0];
- }
$ret = $object->fetch($id); // Reload to get new records
+
$result=$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
if ($result < 0) dol_print_error($db,$result);
}
diff --git a/htdocs/livraison/card.php b/htdocs/livraison/card.php
index 2b6a74a519e..1a89a377fef 100644
--- a/htdocs/livraison/card.php
+++ b/htdocs/livraison/card.php
@@ -135,10 +135,8 @@ else if ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->exped
$outputlangs->setDefaultLang($newlang);
}
$model=$object->modelpdf;
- if (empty($model)) {
- $tmp=getListOfModels($db, 'delivery'); $keys=array_keys($tmp); $model=$keys[0];
- }
$ret = $object->fetch($id); // Reload to get new records
+
$result=$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
if ($result < 0) dol_print_error($db,$result);
}
--
GitLab