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

Uniformize code

Browse Source
This commit is contained in:
Laurent Destailleur 2015-04-07 03:00:11 +02:00
parent ad50810c7a
commit 6fa0234409
31 changed files with 96 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/admin/askpricesupplier.php
View File

@ -319,7 +319,6 @@ foreach ($dirmodels as $reldir)
// Info // Info
$htmltooltip=''; $htmltooltip='';
$htmltooltip.=''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>'; $htmltooltip.=''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
$askpricesupplier->type=0;
$nextval=$module->getNextValue($mysoc,$askpricesupplier); $nextval=$module->getNextValue($mysoc,$askpricesupplier);
if ("$nextval" != $langs->trans("NotAvailable")) { // Keep " on nextval if ("$nextval" != $langs->trans("NotAvailable")) { // Keep " on nextval
$htmltooltip.=''.$langs->trans("NextValue").': '; $htmltooltip.=''.$langs->trans("NextValue").': ';

2
htdocs/categories/categorie.php
View File

@ -341,7 +341,7 @@ else if ($id || $ref)
llxHeader("","",$langs->trans("CardProduct".$product->type)); llxHeader("","",$langs->trans("CardProduct".$product->type));
$head=product_prepare_head($product, $user); $head=product_prepare_head($product);
$titre=$langs->trans("CardProduct".$product->type); $titre=$langs->trans("CardProduct".$product->type);
$picto=($product->type== Product::TYPE_SERVICE?'service':'product'); $picto=($product->type== Product::TYPE_SERVICE?'service':'product');
dol_fiche_head($head, 'category', $titre,0,$picto); dol_fiche_head($head, 'category', $titre,0,$picto);

2
htdocs/compta/bank/class/account.class.php
View File

@ -781,8 +781,8 @@ class Account extends CommonObject
$result=$this->deleteExtraFields(); $result=$this->deleteExtraFields();
if ($result < 0) if ($result < 0)
{ {
return -1;
dol_syslog(get_class($this)."::delete error -4 ".$this->error, LOG_ERR); dol_syslog(get_class($this)."::delete error -4 ".$this->error, LOG_ERR);
return -1;
} }
} }

2
htdocs/compta/sociales/document.php
View File

@ -89,7 +89,7 @@ if ($object->id)
{ {
$alreadypayed=$object->getSommePaiement(); $alreadypayed=$object->getSommePaiement();
$head=tax_prepare_head($object, $user); $head=tax_prepare_head($object);
dol_fiche_head($head, 'documents', $langs->trans("SocialContribution"), 0, 'bill'); dol_fiche_head($head, 'documents', $langs->trans("SocialContribution"), 0, 'bill');

2
htdocs/contact/card.php
View File

@ -255,7 +255,7 @@ if (empty($reshook))
} }
else else
{ {
setEventMessage($object->error,$object->errors,'errors'); setEventMessages($object->error,$object->errors,'errors');
} }
} }

2
htdocs/contact/document.php
View File

@ -79,7 +79,7 @@ llxHeader("",$langs->trans("Contact"), $helpurl);
if ($object->id) if ($object->id)
{ {
$head = contact_prepare_head($object, $user); $head = contact_prepare_head($object);
dol_fiche_head($head, 'documents', $langs->trans("Contact"), 0, 'contact'); dol_fiche_head($head, 'documents', $langs->trans("Contact"), 0, 'contact');

5
htdocs/core/lib/product.lib.php
View File

@ -28,12 +28,11 @@
* Prepare array with list of tabs * Prepare array with list of tabs
* *
* @param Product $object Object related to tabs * @param Product $object Object related to tabs
* @param User $user Object user
* @return array Array of tabs to show * @return array Array of tabs to show
*/ */
function product_prepare_head($object, $user) function product_prepare_head($object)
{ {
global $langs, $conf; global $langs, $conf, $user;
$langs->load("products"); $langs->load("products");
$h = 0; $h = 0;

2
htdocs/core/lib/tax.lib.php
View File

@ -36,7 +36,7 @@
*/ */
function tax_prepare_head(ChargeSociales $object) function tax_prepare_head(ChargeSociales $object)
{ {
global $langs, $conf; global $langs, $conf, $user;
$h = 0; $h = 0;
$head = array(); $head = array();

2
htdocs/fichinter/document.php
View File

@ -88,7 +88,7 @@ if ($object->id)
{ {
$object->fetch_thirdparty(); $object->fetch_thirdparty();
$head=fichinter_prepare_head($object, $user); $head=fichinter_prepare_head($object);
dol_fiche_head($head, 'documents', $langs->trans("InterventionCard"), 0, 'intervention'); dol_fiche_head($head, 'documents', $langs->trans("InterventionCard"), 0, 'intervention');

2
htdocs/loan/document.php
View File

@ -82,7 +82,7 @@ if ($object->id)
{ {
$alreadypayed=$object->getSumPayment(); $alreadypayed=$object->getSumPayment();
$head = loan_prepare_head($object, $user); $head = loan_prepare_head($object);
dol_fiche_head($head, 'documents', $langs->trans("Loan"), 0, 'bill'); dol_fiche_head($head, 'documents', $langs->trans("Loan"), 0, 'bill');

2
htdocs/margin/tabs/productMargins.php
View File

@ -77,7 +77,7 @@ if ($id > 0 || ! empty($ref))
*/ */
if ($result > 0) if ($result > 0)
{ {
$head=product_prepare_head($object, $user); $head=product_prepare_head($object);
$titre=$langs->trans("CardProduct".$object->type); $titre=$langs->trans("CardProduct".$object->type);
$picto=($object->type== Product::TYPE_SERVICE?'service':'product'); $picto=($object->type== Product::TYPE_SERVICE?'service':'product');
dol_fiche_head($head, 'margin', $titre, 0, $picto); dol_fiche_head($head, 'margin', $titre, 0, $picto);

2
htdocs/product/canvas/product/actions_card_product.class.php
View File

@ -138,7 +138,7 @@ class ActionsCardProduct
if ($action == 'view') if ($action == 'view')
{ {
$head = product_prepare_head($this->object,$user); $head = product_prepare_head($this->object);
$this->tpl['showrefnav'] = $form->showrefnav($this->object,'ref','',1,'ref'); $this->tpl['showrefnav'] = $form->showrefnav($this->object,'ref','',1,'ref');

2
htdocs/product/canvas/service/actions_card_service.class.php
View File

@ -137,7 +137,7 @@ class ActionsCardService
if ($action == 'view') if ($action == 'view')
{ {
$head = product_prepare_head($this->object,$user); $head = product_prepare_head($this->object);
$this->tpl['showrefnav'] = $form->showrefnav($this->object,'ref','',1,'ref'); $this->tpl['showrefnav'] = $form->showrefnav($this->object,'ref','',1,'ref');

2
htdocs/product/card.php
View File

@ -1306,7 +1306,7 @@ else
// Fiche en mode visu // Fiche en mode visu
else else
{ {
$head=product_prepare_head($object, $user); $head=product_prepare_head($object);
$titre=$langs->trans("CardProduct".$object->type); $titre=$langs->trans("CardProduct".$object->type);
$picto=($object->type== Product::TYPE_SERVICE?'service':'product'); $picto=($object->type== Product::TYPE_SERVICE?'service':'product');
dol_fiche_head($head, 'card', $titre, 0, $picto); dol_fiche_head($head, 'card', $titre, 0, $picto);

2
htdocs/product/composition/card.php
View File

@ -174,7 +174,7 @@ if ($action == 'search')
llxHeader("","",$langs->trans("CardProduct".$object->type)); llxHeader("","",$langs->trans("CardProduct".$object->type));
$head=product_prepare_head($object, $user); $head=product_prepare_head($object);
$titre=$langs->trans("CardProduct".$object->type); $titre=$langs->trans("CardProduct".$object->type);
$picto=($object->type==Product::TYPE_SERVICE?'service':'product'); $picto=($object->type==Product::TYPE_SERVICE?'service':'product');
dol_fiche_head($head, 'subproduct', $titre, 0, $picto); dol_fiche_head($head, 'subproduct', $titre, 0, $picto);

2
htdocs/product/document.php
View File

@ -100,7 +100,7 @@ llxHeader("","",$langs->trans("CardProduct".$object->type));
if ($object->id) if ($object->id)
{ {
$head=product_prepare_head($object, $user); $head=product_prepare_head($object);
$titre=$langs->trans("CardProduct".$object->type); $titre=$langs->trans("CardProduct".$object->type);
$picto=($object->type== Product::TYPE_SERVICE?'service':'product'); $picto=($object->type== Product::TYPE_SERVICE?'service':'product');
dol_fiche_head($head, 'documents', $titre, 0, $picto); dol_fiche_head($head, 'documents', $titre, 0, $picto);

2
htdocs/product/fournisseurs.php
View File

@ -257,7 +257,7 @@ if ($id || $ref)
* En mode visu * En mode visu
*/ */
$head=product_prepare_head($product, $user); $head=product_prepare_head($product);
$titre=$langs->trans("CardProduct".$product->type); $titre=$langs->trans("CardProduct".$product->type);
$picto=($product->type== Product::TYPE_SERVICE?'service':'product'); $picto=($product->type== Product::TYPE_SERVICE?'service':'product');
dol_fiche_head($head, 'suppliers', $titre, 0, $picto); dol_fiche_head($head, 'suppliers', $titre, 0, $picto);

2
htdocs/product/photos.php
View File

@ -100,7 +100,7 @@ if ($object->id)
/* /*
* En mode visu * En mode visu
*/ */
$head=product_prepare_head($object, $user); $head=product_prepare_head($object);
$titre=$langs->trans("CardProduct".$object->type); $titre=$langs->trans("CardProduct".$object->type);
$picto=($object->type== Product::TYPE_SERVICE?'service':'product'); $picto=($object->type== Product::TYPE_SERVICE?'service':'product');
dol_fiche_head($head, 'photos', $titre, 0, $picto); dol_fiche_head($head, 'photos', $titre, 0, $picto);

2
htdocs/product/price.php
View File

@ -353,7 +353,7 @@ if (! empty($id) || ! empty($ref))
llxHeader("", "", $langs->trans("CardProduct" . $object->type)); llxHeader("", "", $langs->trans("CardProduct" . $object->type));
$head = product_prepare_head($object, $user); $head = product_prepare_head($object);
$titre = $langs->trans("CardProduct" . $object->type); $titre = $langs->trans("CardProduct" . $object->type);
$picto = ($object->type == Product::TYPE_SERVICE ? 'service' : 'product'); $picto = ($object->type == Product::TYPE_SERVICE ? 'service' : 'product');
dol_fiche_head($head, 'price', $titre, 0, $picto); dol_fiche_head($head, 'price', $titre, 0, $picto);

2
htdocs/product/stats/card.php
View File

@ -67,7 +67,7 @@ if (! empty($id) || ! empty($ref))
if ($result) if ($result)
{ {
$head=product_prepare_head($object, $user); $head=product_prepare_head($object);
$titre=$langs->trans("CardProduct".$object->type); $titre=$langs->trans("CardProduct".$object->type);
$picto=($object->type==Product::TYPE_SERVICE?'service':'product'); $picto=($object->type==Product::TYPE_SERVICE?'service':'product');

2
htdocs/product/stats/commande.php
View File

@ -89,7 +89,7 @@ if ($id > 0 || ! empty($ref))
if ($result > 0) if ($result > 0)
{ {
$head=product_prepare_head($product, $user); $head=product_prepare_head($product);
$titre=$langs->trans("CardProduct".$product->type); $titre=$langs->trans("CardProduct".$product->type);
$picto=($product->type==Product::TYPE_SERVICE?'service':'product'); $picto=($product->type==Product::TYPE_SERVICE?'service':'product');
dol_fiche_head($head, 'referers', $titre, 0, $picto); dol_fiche_head($head, 'referers', $titre, 0, $picto);

2
htdocs/product/stats/commande_fournisseur.php
View File

@ -96,7 +96,7 @@ if ($id > 0 || ! empty($ref)) {
llxHeader("", "", $langs->trans("CardProduct" . $product->type)); llxHeader("", "", $langs->trans("CardProduct" . $product->type));
if ($result > 0) { if ($result > 0) {
$head = product_prepare_head($product, $user); $head = product_prepare_head($product);
$titre = $langs->trans("CardProduct" . $product->type); $titre = $langs->trans("CardProduct" . $product->type);
$picto = ($product->type == Product::TYPE_SERVICE ? 'service' : 'product'); $picto = ($product->type == Product::TYPE_SERVICE ? 'service' : 'product');
dol_fiche_head($head, 'referers', $titre, 0, $picto); dol_fiche_head($head, 'referers', $titre, 0, $picto);

2
htdocs/product/stats/contrat.php
View File

@ -79,7 +79,7 @@ if ($id > 0 || ! empty($ref))
if ($result > 0) if ($result > 0)
{ {
$head=product_prepare_head($product,$user); $head=product_prepare_head($product);
$titre=$langs->trans("CardProduct".$product->type); $titre=$langs->trans("CardProduct".$product->type);
$picto=($product->type==Product::TYPE_SERVICE?'service':'product'); $picto=($product->type==Product::TYPE_SERVICE?'service':'product');
dol_fiche_head($head, 'referers', $titre, 0, $picto); dol_fiche_head($head, 'referers', $titre, 0, $picto);

2
htdocs/product/stats/facture.php
View File

@ -90,7 +90,7 @@ if ($id > 0 || ! empty($ref))
if ($result > 0) if ($result > 0)
{ {
$head=product_prepare_head($product, $user); $head=product_prepare_head($product);
$titre=$langs->trans("CardProduct".$product->type); $titre=$langs->trans("CardProduct".$product->type);
$picto=($product->type==Product::TYPE_SERVICE?'service':'product'); $picto=($product->type==Product::TYPE_SERVICE?'service':'product');
dol_fiche_head($head, 'referers', $titre, 0, $picto); dol_fiche_head($head, 'referers', $titre, 0, $picto);

2
htdocs/product/stats/facture_fournisseur.php
View File

@ -91,7 +91,7 @@ if ($id > 0 || ! empty($ref))
if ($result > 0) if ($result > 0)
{ {
$head = product_prepare_head($product, $user); $head = product_prepare_head($product);
$titre = $langs->trans("CardProduct" . $product->type); $titre = $langs->trans("CardProduct" . $product->type);
$picto = ($product->type == Product::TYPE_SERVICE ? 'service' : 'product'); $picto = ($product->type == Product::TYPE_SERVICE ? 'service' : 'product');
dol_fiche_head($head, 'referers', $titre, 0, $picto); dol_fiche_head($head, 'referers', $titre, 0, $picto);

2
htdocs/product/stats/propal.php
View File

@ -89,7 +89,7 @@ if ($id > 0 || ! empty($ref))
if ($result > 0) if ($result > 0)
{ {
$head = product_prepare_head($product, $user); $head = product_prepare_head($product);
$titre = $langs->trans("CardProduct" . $product->type); $titre = $langs->trans("CardProduct" . $product->type);
$picto = ($product->type == Product::TYPE_SERVICE ? 'service' : 'product'); $picto = ($product->type == Product::TYPE_SERVICE ? 'service' : 'product');
dol_fiche_head($head, 'referers', $titre, 0, $picto); dol_fiche_head($head, 'referers', $titre, 0, $picto);

2
htdocs/product/stock/product.php
View File

@ -384,7 +384,7 @@ if ($id > 0 || $ref)
if ($result > 0) if ($result > 0)
{ {
$head=product_prepare_head($product, $user); $head=product_prepare_head($product);
$titre=$langs->trans("CardProduct".$product->type); $titre=$langs->trans("CardProduct".$product->type);
$picto=($product->type==Product::TYPE_SERVICE?'service':'product'); $picto=($product->type==Product::TYPE_SERVICE?'service':'product');
dol_fiche_head($head, 'stock', $titre, 0, $picto); dol_fiche_head($head, 'stock', $titre, 0, $picto);

2
htdocs/product/traduction.php
View File

@ -168,7 +168,7 @@ llxHeader("","",$langs->trans("Translation"));
$form = new Form($db); $form = new Form($db);
$formadmin=new FormAdmin($db); $formadmin=new FormAdmin($db);
$head=product_prepare_head($product, $user); $head=product_prepare_head($product);
$titre=$langs->trans("CardProduct".$product->type); $titre=$langs->trans("CardProduct".$product->type);
$picto=($product->type==Product::TYPE_SERVICE?'service':'product'); $picto=($product->type==Product::TYPE_SERVICE?'service':'product');
dol_fiche_head($head, 'translation', $titre, 0, $picto); dol_fiche_head($head, 'translation', $titre, 0, $picto);

2
htdocs/societe/admin/societe.php
View File

@ -291,7 +291,7 @@ $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToM
print_fiche_titre($langs->trans("CompanySetup"),$linkback,'setup'); print_fiche_titre($langs->trans("CompanySetup"),$linkback,'setup');
$head = societe_admin_prepare_head(null); $head = societe_admin_prepare_head();
dol_fiche_head($head, 'general', $langs->trans("ThirdParties"), 0, 'company'); dol_fiche_head($head, 'general', $langs->trans("ThirdParties"), 0, 'company');

2
htdocs/societe/admin/societe_extrafields.php
View File

@ -69,7 +69,7 @@ $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToM
print_fiche_titre($langs->trans("CompanySetup"),$linkback,'setup'); print_fiche_titre($langs->trans("CompanySetup"),$linkback,'setup');
$head = societe_admin_prepare_head(null); $head = societe_admin_prepare_head();
dol_fiche_head($head, 'attributes', $langs->trans("ThirdParties"), 0, 'company'); dol_fiche_head($head, 'attributes', $langs->trans("ThirdParties"), 0, 'company');