From 904fd64eed73dc5d8e17668f5dc1e4218f3d3c19 Mon Sep 17 00:00:00 2001
From: marc_ocebo <marc_ocebo>
Date: Tue, 20 Jun 2006 10:37:05 +0000
Subject: [PATCH] =?UTF-8?q?fix:=20get=5Fdefault=5Ftva()=20donnait=20une=20?=
=?UTF-8?q?erreur=20lorsque=20l'on=20passait=20par=20la=20page=20fourn/fac?=
=?UTF-8?q?ture/fiche.php=20pour=20saisir=20une=20facture=20fournisseur=20?=
=?UTF-8?q?enh:=20si=20la=20variable=20de=20configuration=20USE=5FSHORT=5F?=
=?UTF-8?q?TITLE=20est=20d=E9finie=20=E0=200,=20alors=20on=20ne=20tronque?=
=?UTF-8?q?=20pas=20les=20cha=EEnes=20(utile=20lorsque=20les=20num=E9ros?=
=?UTF-8?q?=20de=20factures,=20propales,=20etc...=20sont=20"tr=E8s"=20long?=
=?UTF-8?q?s=20et=20que=20les=20chiffres=20significatifs=20sont=20=E0=20dr?=
=?UTF-8?q?oite)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
htdocs/lib/functions.inc.php | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/htdocs/lib/functions.inc.php b/htdocs/lib/functions.inc.php
index a4f364deeec..dfdba7216c8 100644
--- a/htdocs/lib/functions.inc.php
+++ b/htdocs/lib/functions.inc.php
@@ -509,6 +509,7 @@ function dolibarr_print_phone($phone,$country="FR")
}
elseif (strlen($phone) == 7)
{
+
return substr($phone,0,3)." ".substr($phone,3,2)." ".substr($phone,5,2);
}
elseif (strlen($phone) == 9)
@@ -536,8 +537,13 @@ function dolibarr_print_phone($phone,$country="FR")
function dolibarr_trunc($string,$size=40)
{
if ($size==0) return $string;
- if (strlen($string) > $size)
- return substr($string,0,$size).'...';
+ if ((!defined('USE_SHORT_TITLE')) || defined('USE_SHORT_TITLE') && USE_SHORT_TITLE)
+ {
+ if (strlen($string) > $size)
+ return substr($string,0,$size).'...';
+ else
+ return $string;
+ }
else
return $string;
}
@@ -1716,6 +1722,8 @@ function get_default_tva($societe_vendeuse, $societe_acheteuse, $taux_produit)
{
dolibarr_syslog("get_default_tva vendeur_assujeti=$societe_vendeuse->tva_assuj pays_vendeur=$societe_vendeuse->pays_id, pays_acheteur=$societe_acheteuse->pays_id, taux_produit=$taux_produit");
+ if (!is_object($societe_vendeuse))
+ return 0;
// Si vendeur non assujeti � TVA (tva_assuj vaut 0/1 ou franchise/reel)
if (is_numeric($societe_vendeuse->tva_assuj) && ! $societe_vendeuse->tva_assuj) return 0;
if (! is_numeric($societe_vendeuse->tva_assuj) && $societe_vendeuse->tva_assuj=='franchise') return 0;
--
GitLab