diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php index bd9a4b781f5..813eb826f72 100644 --- a/htdocs/contact/card.php +++ b/htdocs/contact/card.php @@ -343,7 +343,7 @@ if (empty($reshook)) } } - $object->oldcopy = clone$object; + $object->oldcopy = clone $object; $object->old_lastname = GETPOST("old_lastname"); $object->old_firstname = GETPOST("old_firstname"); diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 5078b5932c9..73b401025e9 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -5084,17 +5084,18 @@ class Form print ''; print ''; print ''; + print ''; print '' . $objp->ref . ''; print '' . $objp->ref_client . ''; print '' . price($objp->total_ht) . ''; print '' . $objp->name . ''; - print ''; print ''; $i ++; } print ''; print '
     
'; + print ''; $this->db->free($resqlorderlist); } else { @@ -5150,11 +5151,11 @@ class Form print ''; print ''; print ''; + print ''; print '' . $objp->ref . ''; print '' . $objp->ref_supplier . ''; print '' . price($objp->total_ht) . ''; print '' . $objp->name . ''; - print ''; print ''; $i ++; diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php index 6deaf7eae08..7bdb6cd5756 100644 --- a/htdocs/core/lib/product.lib.php +++ b/htdocs/core/lib/product.lib.php @@ -101,7 +101,7 @@ function product_prepare_head($object) $head[$h][2] = 'stats'; $h++; - $head[$h][0] = DOL_URL_ROOT."/product/stats/facture.php?id=".$object->id; + $head[$h][0] = DOL_URL_ROOT."/product/stats/facture.php?showmessage=1&id=".$object->id; $head[$h][1] = $langs->trans('Referers'); $head[$h][2] = 'referers'; $h++; @@ -201,22 +201,25 @@ function product_admin_prepare_head() * * @param Product $product Product object * @param int $socid Thirdparty id - * @return integer + * @return integer NB of lines shown into array */ function show_stats_for_company($product,$socid) { global $conf,$langs,$user,$db; + $nblines = 0; + print ''; print ''.$langs->trans("Referers").''; print ''.$langs->trans("NbOfThirdParties").''; - print ''.$langs->trans("NbOfReferers").''; + print ''.$langs->trans("NbOfObjectReferers").''; print ''.$langs->trans("TotalQuantity").''; print ''; // Propals if (! empty($conf->propal->enabled) && $user->rights->propale->lire) { + $nblines++; $ret=$product->load_stats_propale($socid); if ($ret < 0) dol_print_error($db); $langs->load("propal"); @@ -234,6 +237,7 @@ function show_stats_for_company($product,$socid) // Commandes clients if (! empty($conf->commande->enabled) && $user->rights->commande->lire) { + $nblines++; $ret=$product->load_stats_commande($socid); if ($ret < 0) dol_print_error($db); $langs->load("orders"); @@ -251,6 +255,7 @@ function show_stats_for_company($product,$socid) // Commandes fournisseurs if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->commande->lire) { + $nblines++; $ret=$product->load_stats_commande_fournisseur($socid); if ($ret < 0) dol_print_error($db); $langs->load("orders"); @@ -268,6 +273,7 @@ function show_stats_for_company($product,$socid) // Contrats if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire) { + $nblines++; $ret=$product->load_stats_contrat($socid); if ($ret < 0) dol_print_error($db); $langs->load("contracts"); @@ -285,6 +291,7 @@ function show_stats_for_company($product,$socid) // Factures clients if (! empty($conf->facture->enabled) && $user->rights->facture->lire) { + $nblines++; $ret=$product->load_stats_facture($socid); if ($ret < 0) dol_print_error($db); $langs->load("bills"); @@ -302,6 +309,7 @@ function show_stats_for_company($product,$socid) // Factures fournisseurs if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture->lire) { + $nblines++; $ret=$product->load_stats_facture_fournisseur($socid); if ($ret < 0) dol_print_error($db); $langs->load("bills"); @@ -317,7 +325,7 @@ function show_stats_for_company($product,$socid) print ''; } - return 0; + return $nblines++; } diff --git a/htdocs/expedition/tpl/linkedobjectblock.tpl.php b/htdocs/expedition/tpl/linkedobjectblock.tpl.php index f18ed1ea80f..aea4127b50a 100644 --- a/htdocs/expedition/tpl/linkedobjectblock.tpl.php +++ b/htdocs/expedition/tpl/linkedobjectblock.tpl.php @@ -74,7 +74,7 @@ foreach($linkedObjectBlock as $key => $objectlink) +--> - --> - + diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php index a0184662065..2edbcb0f249 100644 --- a/htdocs/fourn/class/fournisseur.commande.class.php +++ b/htdocs/fourn/class/fournisseur.commande.class.php @@ -4,7 +4,7 @@ * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2007 Franky Van Liedekerke * Copyright (C) 2010-2014 Juanjo Menent - * Copyright (C) 2010-2014 Philippe Grand + * Copyright (C) 2010-2016 Philippe Grand * Copyright (C) 2012-2015 Marcos García * Copyright (C) 2013 Florian Henry * Copyright (C) 2013 Cédric Salvador @@ -53,7 +53,7 @@ class CommandeFournisseur extends CommonOrder var $id; /** - * Supplier invoice reference + * Supplier order reference * @var string */ var $ref; @@ -103,7 +103,7 @@ class CommandeFournisseur extends CommonOrder var $user_approve_id; var $user_approve_id2; // Used when SUPPLIER_ORDER_DOUBLE_APPROVAL is set - //Incorterms + //Incoterms var $fk_incoterms; var $location_incoterms; var $libelle_incoterms; //Used into tooltip @@ -114,7 +114,7 @@ class CommandeFournisseur extends CommonOrder * @var CommandeFournisseurLigne[] */ public $lines = array(); - //Ajout pour supplier_proposal + //Add for supplier_proposal var $origin; var $origin_id; var $linked_objects=array(); @@ -243,7 +243,7 @@ class CommandeFournisseur extends CommonOrder $this->db->free($resql); - // Retreive all extrafield + // Retrieve all extrafields // fetch optionals attributes and labels require_once(DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'); $extrafields=new ExtraFields($this->db); @@ -390,7 +390,7 @@ class CommandeFournisseur extends CommonOrder { $this->db->begin(); - // Definition du nom de modele de numerotation de commande + // Definition of supplier order numbering model name $soc = new Societe($this->db); $soc->fetch($this->fourn_id); @@ -435,7 +435,7 @@ class CommandeFournisseur extends CommonOrder // Rename directory if dir was a temporary ref if (preg_match('/^[\(]?PROV/i', $this->ref)) { - // On renomme repertoire ($this->ref = ancienne ref, $num = nouvelle ref) + // We rename directory ($this->ref = ancienne ref, $num = nouvelle ref) // in order not to lose the attached files $oldref = dol_sanitizeFileName($this->ref); $newref = dol_sanitizeFileName($num); @@ -618,8 +618,8 @@ class CommandeFournisseur extends CommonOrder /** - * Renvoie la reference de commande suivante non utilisee en fonction du modele - * de numerotation actif defini dans COMMANDE_SUPPLIER_ADDON_NUMBER + * Returns the following order reference not used depending on the numbering model activated + * defined within COMMANDE_SUPPLIER_ADDON_NUMBER * * @param Societe $soc objet societe * @return string reference libre pour la facture diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index eebec1e7f88..834611558a2 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -537,6 +537,7 @@ NbOfCustomers=Number of customers NbOfLines=Number of lines NbOfObjects=Number of objects NbOfReferers=Number of referrers +NbOfObjectReferers=Number of refering objects Referers=Refering objects TotalQuantity=Total quantity DateFromTo=From %s to %s diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang index b8a7d377904..ea480222aa7 100644 --- a/htdocs/langs/en_US/products.lang +++ b/htdocs/langs/en_US/products.lang @@ -313,3 +313,4 @@ DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on WarningSelectOneDocument=Please select at least one document DefaultUnitToShow=Unit NbOfQtyInProposals=Qty in proposals +ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view... diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php index 590830702bb..57c426dc3a1 100644 --- a/htdocs/product/stats/facture.php +++ b/htdocs/product/stats/facture.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2010 Laurent Destailleur + * Copyright (C) 2004-2016 Laurent Destailleur * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2014 Juanjo Menent * Copyright (C) 2014 Florian Henry @@ -48,7 +48,7 @@ $result=restrictedArea($user,'produit|service',$fieldvalue,'product&product','', // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array $hookmanager->initHooks(array('productstatsinvoice')); -$mesg = ''; +$showmessage=GETPOST('showmessage'); $sortfield = GETPOST("sortfield",'alpha'); $sortorder = GETPOST("sortorder",'alpha'); @@ -67,6 +67,8 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) { $search_year=''; } + + /* * View */ @@ -107,7 +109,7 @@ if ($id > 0 || ! empty($ref)) print '
'; print ''; - show_stats_for_company($product,$socid); + $nboflines = show_stats_for_company($product,$socid); print "
"; @@ -116,8 +118,11 @@ if ($id > 0 || ! empty($ref)) dol_fiche_end(); - - if ($user->rights->facture->lire) + if ($showmessage && $nboflines > 1) + { + print $langs->trans("ClinkOnALinkOfColumn", $langs->transnoentitiesnoconv("Referers")); + } + elseif ($user->rights->facture->lire) { $sql = "SELECT DISTINCT s.nom as name, s.rowid as socid, s.code_client,"; $sql.= " f.facnumber, f.datef, f.paye, f.fk_statut as statut, f.rowid as facid,";