diff --git a/htdocs/core/lib/doc.lib.php b/htdocs/core/lib/doc.lib.php
index 330d3d2ba39..76337ec2763 100644
--- a/htdocs/core/lib/doc.lib.php
+++ b/htdocs/core/lib/doc.lib.php
@@ -106,7 +106,7 @@ function doc_getlinedesc($line,$outputlangs,$hideref=0,$hidedesc=0,$issupplierli
$ref_prodserv = "";
if (! empty($conf->global->PRODUCT_ADD_TYPE_IN_DOCUMENTS)) // In standard mode, we do not show this
{
- if ($prodser->isservice())
+ if ($prodser->isService())
{
$prefix_prodserv = $outputlangs->transnoentitiesnoconv("Service")." ";
}
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 8e0eef6d53b..881415555bc 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -1166,7 +1166,7 @@ function pdf_getlinedesc($object,$i,$outputlangs,$hideref=0,$hidedesc=0,$issuppl
$ref_prodserv = "";
if (! empty($conf->global->PRODUCT_ADD_TYPE_IN_DOCUMENTS)) // In standard mode, we do not show this
{
- if ($prodser->isservice())
+ if ($prodser->isService())
{
$prefix_prodserv = $outputlangs->transnoentitiesnoconv("Service")." ";
}
diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php
index 69eb63717b2..d0bc74e77c3 100644
--- a/htdocs/core/lib/product.lib.php
+++ b/htdocs/core/lib/product.lib.php
@@ -98,7 +98,7 @@ function product_prepare_head($object)
$head[$h][2] = 'referers';
$h++;
- if ($object->isproduct() || ($object->isservice() && ! empty($conf->global->STOCK_SUPPORTS_SERVICES))) // If physical product we can stock (or service with option)
+ if ($object->isProduct() || ($object->isService() && ! empty($conf->global->STOCK_SUPPORTS_SERVICES))) // If physical product we can stock (or service with option)
{
if (! empty($conf->stock->enabled) && $user->rights->stock->lire)
{
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index a7291cc1895..4c30691318f 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1038,7 +1038,7 @@ else
require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
$type = $langs->trans('Product');
- if ($object->isservice()) $type = $langs->trans('Service');
+ if ($object->isService()) $type = $langs->trans('Service');
//print load_fiche_titre($langs->trans('Modify').' '.$type.' : '.(is_object($object->oldcopy)?$object->oldcopy->ref:$object->ref), "");
// Main official, simple, and not duplicated code
@@ -1144,7 +1144,7 @@ else
// Stock
/*
- if ($object->isproduct() && ! empty($conf->stock->enabled))
+ if ($object->isProduct() && ! empty($conf->stock->enabled))
{
print "
".'
'.$langs->trans("StockLimit").'
';
print '';
@@ -1169,7 +1169,7 @@ else
print '
';
}
- if ($object->isservice())
+ if ($object->isService())
{
// Duration
print '
'.$langs->trans("Duration").'
';
@@ -1435,7 +1435,7 @@ else
print '
';
}
- if ($object->isservice())
+ if ($object->isService())
{
// Duration
print '
'.$langs->trans("Duration").'
'.$object->duration_value.' ';
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 614ae63945d..be23fa6f06c 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -3804,7 +3804,7 @@ class Product extends CommonObject
*
* @return boolean True if it's a product
*/
- function isproduct()
+ function isProduct()
{
return ($this->type == Product::TYPE_PRODUCT ? true : false);
}
@@ -3814,7 +3814,7 @@ class Product extends CommonObject
*
* @return boolean True if it's a service
*/
- function isservice()
+ function isService()
{
return ($this->type == Product::TYPE_SERVICE ? true : false);
}
diff --git a/htdocs/product/composition/card.php b/htdocs/product/composition/card.php
index 276356d8bca..86dfb8a8fd4 100644
--- a/htdocs/product/composition/card.php
+++ b/htdocs/product/composition/card.php
@@ -193,8 +193,8 @@ if ($id > 0 || ! empty($ref))
print "
";
$nblignes=6;
- if ($object->isproduct() && ! empty($conf->stock->enabled)) $nblignes++;
- if ($object->isservice()) $nblignes++;
+ if ($object->isProduct() && ! empty($conf->stock->enabled)) $nblignes++;
+ if ($object->isService()) $nblignes++;
// Reference
print '
'.$langs->trans("Ref").'
';
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index dfbd5679ac4..96aa9aa6311 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -521,7 +521,7 @@ if ($id > 0 || $ref)
{
// Suppliers list title
print '
';
- if ($object->isproduct()) $nblignefour=4;
+ if ($object->isProduct()) $nblignefour=4;
else $nblignefour=4;
$param="&id=".$object->id;
diff --git a/htdocs/public/paybox/newpayment.php b/htdocs/public/paybox/newpayment.php
index 42ea013eade..481fd17f049 100644
--- a/htdocs/public/paybox/newpayment.php
+++ b/htdocs/public/paybox/newpayment.php
@@ -583,7 +583,7 @@ if (GETPOST("source") == 'contractline' && $valid)
$duration='';
if ($contractline->fk_product)
{
- if ($product->isservice() && $product->duration_value > 0)
+ if ($product->isService() && $product->duration_value > 0)
{
$label=$langs->trans("Duration");
diff --git a/htdocs/public/paypal/newpayment.php b/htdocs/public/paypal/newpayment.php
index 23f81c4295b..dcb43c07170 100644
--- a/htdocs/public/paypal/newpayment.php
+++ b/htdocs/public/paypal/newpayment.php
@@ -720,7 +720,7 @@ if (GETPOST("source") == 'contractline' && $valid)
$duration='';
if ($contractline->fk_product)
{
- if ($product->isservice() && $product->duration_value > 0)
+ if ($product->isService() && $product->duration_value > 0)
{
$label=$langs->trans("Duration");