From 1fb866e0a9ef96d13505e6ed37edf50d7161a8c0 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 14 Jun 2006 00:13:43 +0000 Subject: [PATCH] =?UTF-8?q?Quelques=20am=E9lioration=20sur=20fonction=20se?= =?UTF-8?q?lection=20produit=20ajax:=20Suite...=20Inclusion=20patch=20Chri?= =?UTF-8?q?stophe=20Perez?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/commande/fiche.php | 20 ++++++++++---------- htdocs/lib/lib_head.js | 2 ++ htdocs/main.inc.php | 6 +++++- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index 25480f63606..d0c81a6464c 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/fiche.php @@ -580,19 +580,19 @@ if ($_GET['action'] == 'create' && $user->rights->commande->creer) print ""; // Adresse de livraison - print ''.$langs->trans('DeliveryAddress').''; + print ''.$langs->trans('DeliveryAddress').''; $numaddress = $html->select_adresse_livraison($soc->adresse_livraison_id, $_GET['socidp'],'adresse_livraison_id'); if ($numaddress==0) { - print '   id.'&action=create>'.$langs->trans("AddAddress").''; + print '   '.$langs->trans("AddAddress").''; } print ''; // Conditions de réglement - print ''.$langs->trans('PaymentConditionsShort').''; + print ''.$langs->trans('PaymentConditionsShort').''; $html->select_conditions_paiements($soc->cond_reglement,'cond_reglement_id',-1,1); print ''; @@ -870,7 +870,7 @@ else // Ref commande client print ''; - print '
'; + print ''; if ($_GET['action'] != 'refcdeclient' && $commande->brouillon) print ''; @@ -1196,7 +1196,7 @@ else print ''; print ''; print ''; - print ''; + print ''; print ''; print ''; @@ -1362,7 +1362,7 @@ else print ''; print ''; print ''; - print ''; + print ''; print ''; print ''; @@ -1378,15 +1378,15 @@ else print ''; print ''; print ''; - print ''; + print ''; print ''; print ''; diff --git a/htdocs/lib/lib_head.js b/htdocs/lib/lib_head.js index fc8ae062741..0d67924bc18 100644 --- a/htdocs/lib/lib_head.js +++ b/htdocs/lib/lib_head.js @@ -736,3 +736,5 @@ function parseDate(val) { } +// Fonction pour champ saisie en mode ajax +function publish_selvalue(obj) { $(obj.name).value = obj.options[obj.selectedIndex].value; } diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 5338440d109..3640686be17 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -323,10 +323,14 @@ function top_htmlhead($head, $title="", $target="") print ''."\n"; print ''."\n"; - if ($conf->use_javascript) + if ($conf->use_javascript || $conf->use_ajax) { print ''; } + if ($conf->use_ajax) + { + print ''; + } print "\n"; }
'; print $langs->trans('RefCustomer').''; print ''.img_edit($langs->trans('Edit')).'%%'; print '
%%
'; // multiprix if($conf->global->PRODUIT_MULTIPRICES == 1) - $html->select_produits('','p_idprod','',$conf->produit->limit_size,$soc->price_level); + $html->select_produits('','p_idprod','',$conf->produit->limit_size,$soc->price_level); else - $html->select_produits('','p_idprod','',$conf->produit->limit_size); - print '
'; + $html->select_produits('','p_idprod','',$conf->produit->limit_size); + if (! $conf->use_ajax) print '
'; print ''; print '		 %%