diff --git a/htdocs/compta/prelevement/class/bon-prelevement.class.php b/htdocs/compta/prelevement/class/bon-prelevement.class.php index 185d9f25b05..3e06dc78cd6 100644 --- a/htdocs/compta/prelevement/class/bon-prelevement.class.php +++ b/htdocs/compta/prelevement/class/bon-prelevement.class.php @@ -98,7 +98,7 @@ class BonPrelevement extends CommonObject $result = 0; $line_id = 0; - $result = $this->AddLigne($line_id, $client_id, $client_nom, $amount, $code_banque, $code_guichet, $number); + $result = $this->addline($line_id, $client_id, $client_nom, $amount, $code_banque, $code_guichet, $number); if ($result == 0) { @@ -149,7 +149,7 @@ class BonPrelevement extends CommonObject * @param number bank account number * @return int >0 if OK, <0 if KO */ - function AddLigne(&$line_id, $client_id, $client_nom, $amount, $code_banque, $code_guichet, $number) + function addline(&$line_id, $client_id, $client_nom, $amount, $code_banque, $code_guichet, $number) { $result = -1; $concat = 0; @@ -207,7 +207,7 @@ class BonPrelevement extends CommonObject } else { - dol_syslog("BonPrelevement::AddLigne Error -2"); + dol_syslog("BonPrelevement::addline Error -2"); $result = -2; } diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php index 21d92ad47f5..d456d29c585 100644 --- a/htdocs/contrat/fiche.php +++ b/htdocs/contrat/fiche.php @@ -179,7 +179,7 @@ if ($_POST["action"] == 'classin') $contrat->setProject($_POST["projectid"]); } -if ($_POST["action"] == 'addligne' && $user->rights->contrat->creer) +if ($_POST["action"] == 'addline' && $user->rights->contrat->creer) { if ($_POST["pqty"] && (($_POST["pu"] != '' && $_POST["desc"]) || $_POST["p_idprod"])) { @@ -1215,9 +1215,9 @@ else $var=false; // Service sur produit predefini - print '
'; diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php index d564ba28c36..94d442e0213 100644 --- a/htdocs/fourn/commande/fiche.php +++ b/htdocs/fourn/commande/fiche.php @@ -973,7 +973,7 @@ if ($id > 0 || ! empty($ref)) */ print '| ';
- if ($commandline->fk_product > 0)
+ if ($line->fk_product > 0)
{
- print ''; // ancre pour retourner sur la ligne
+ print ''; // ancre pour retourner sur la ligne
$product_static=new ProductFournisseur($db);
- $product_static->fetch($commandline->fk_product);
+ $product_static->fetch($line->fk_product);
$text=$product_static->getNomUrl(1,'supplier');
$text.= ' - '.$product_static->libelle;
- $description=($conf->global->PRODUIT_DESC_IN_FORM?'':dol_htmlentitiesbr($commandline->description));
+ $description=($conf->global->PRODUIT_DESC_IN_FORM?'':dol_htmlentitiesbr($line->description));
print $html->textwithtooltip($text,$description,3,'','',$i);
// Show range
- print_date_range($commandline->date_start,$commandline->date_end);
+ print_date_range($line->date_start,$line->date_end);
// Add description in form
- if ($conf->global->PRODUIT_DESC_IN_FORM) print ($commandline->description && $commandline->description!=$product_static->libelle)?' '.dol_htmlentitiesbr($commandline->description):''; + if ($conf->global->PRODUIT_DESC_IN_FORM) print ($line->description && $line->description!=$product_static->libelle)?' '.dol_htmlentitiesbr($line->description):''; } // Description - Editor wysiwyg - if (! $commandline->fk_product) + if (! $line->fk_product) { if ($type==1) $text = img_object($langs->trans('Service'),'service'); else $text = img_object($langs->trans('Product'),'product'); - print $text.' '.nl2br($commandline->description); + print $text.' '.nl2br($line->description); // Show range - print_date_range($commandline->date_start,$commandline->date_end); + print_date_range($line->date_start,$line->date_end); } print ' | ';
- print ''.vatrate($commandline->tva_tx).'% | '; + print ''.vatrate($line->tva_tx).'% | '; - print ''.price($commandline->subprice)." | \n"; + print ''.price($line->subprice)." | \n"; - print ''.$commandline->qty.' | '; + print ''.$line->qty.' | '; - if ($commandline->remise_percent > 0) + if ($line->remise_percent > 0) { - print ''.dol_print_reduction($commandline->remise_percent,$langs)." | \n"; + print ''.dol_print_reduction($line->remise_percent,$langs)." | \n"; } else { print ''; } - print ' | '.price($commandline->total_ht).' | '; + print ''.price($line->total_ht).' | '; if ($commande->statut == 0 && $user->rights->fournisseur->commande->creer) { - print 'id.'&action=editline&rowid='.$commandline->id.'#'.$commandline->id.'">'; + print ' | id.'&action=editline&rowid='.$line->id.'#'.$line->id.'">'; print img_edit(); print ' | '; $actiondelete='delete_product_line'; - print 'id.'&action='.$actiondelete.'&lineid='.$commandline->id.'">'; + print ' | id.'&action='.$actiondelete.'&lineid='.$line->id.'">'; print img_delete(); print ' | '; } @@ -1074,33 +1074,33 @@ if ($id > 0 || ! empty($ref)) } // Ligne en mode update - if ($_GET["action"] == 'editline' && $user->rights->fournisseur->commande->creer && ($_GET["rowid"] == $commandline->id)) + if ($_GET["action"] == 'editline' && $user->rights->fournisseur->commande->creer && ($_GET["rowid"] == $line->id)) { print "\n"; - print '