From 79ca1fe1476c2cb7988faaee0118f9b4b1e63c85 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur <eldy@destailleur.fr> Date: Sun, 15 Mar 2015 23:32:43 +0100 Subject: [PATCH] Clean code. --- htdocs/comm/card.php | 2 +- htdocs/fourn/card.php | 1 - htdocs/fourn/class/fournisseur.class.php | 3 +++ htdocs/societe/class/client.class.php | 9 ++++++--- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php index 9b7c3150c71..3ea63caf256 100644 --- a/htdocs/comm/card.php +++ b/htdocs/comm/card.php @@ -31,6 +31,7 @@ require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/societe/class/client.class.php'; require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; if (! empty($conf->facture->enabled)) require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; @@ -220,7 +221,6 @@ if ($id > 0) print '<table class="border" width="100%">'; print '<tr><td width="30%">'.$langs->trans("ThirdPartyName").'</td><td width="70%" colspan="3">'; - $object->next_prev_filter="te.client in (1,2,3)"; print $form->showrefnav($object,'socid','',($user->societe_id?0:1),'rowid','nom','',''); print '</td></tr>'; diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php index 1825349e83b..b9957c12134 100644 --- a/htdocs/fourn/card.php +++ b/htdocs/fourn/card.php @@ -134,7 +134,6 @@ if ($object->id > 0) print '<table width="100%" class="border">'; print '<tr><td width="30%">'.$langs->trans("ThirdPartyName").'</td><td width="70%" colspan="3">'; - $object->next_prev_filter="te.fournisseur = 1"; print $form->showrefnav($object,'socid','',($user->societe_id?0:1),'rowid','nom','',''); print '</td></tr>'; diff --git a/htdocs/fourn/class/fournisseur.class.php b/htdocs/fourn/class/fournisseur.class.php index 35620bf91fb..5fc0b3e43dd 100644 --- a/htdocs/fourn/class/fournisseur.class.php +++ b/htdocs/fourn/class/fournisseur.class.php @@ -35,6 +35,9 @@ class Fournisseur extends Societe { var $db; + var $next_prev_filter="te.fournisseur = 1"; // Used to add a filter in Form::showrefnav method + + /** * Constructor * diff --git a/htdocs/societe/class/client.class.php b/htdocs/societe/class/client.class.php index 27209c05abd..d5ac33227c5 100644 --- a/htdocs/societe/class/client.class.php +++ b/htdocs/societe/class/client.class.php @@ -29,9 +29,12 @@ include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; */ class Client extends Societe { - var $nb; - - /** + var $db; + + var $next_prev_filter="te.client in (1,2,3)"; // Used to add a filter in Form::showrefnav method + + + /** * Constructor * * @param DoliDB $db Database handler -- GitLab