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 '
'; + print ''; print ''; - print ''; + print ''; print ''; print ''; @@ -1240,9 +1240,9 @@ else print ""; print ''; print $langs->trans("DateStartPlanned").' '; - $form->select_date('',"date_start",$usehm,$usehm,1,"addligne"); + $form->select_date('',"date_start",$usehm,$usehm,1,"addline"); print '   '.$langs->trans("DateEndPlanned").' '; - $form->select_date('',"date_end",$usehm,$usehm,1,"addligne"); + $form->select_date('',"date_end",$usehm,$usehm,1,"addline"); print ''; print ''; @@ -1251,9 +1251,9 @@ else $var=!$var; // Service libre - print ''; + print ''; print ''; - print ''; + print ''; print ''; print ''; @@ -1273,9 +1273,9 @@ else print ""; print ''; print $langs->trans("DateStartPlanned").' '; - $form->select_date('',"date_start_sl",$usehm,$usehm,1,"addligne_sl"); + $form->select_date('',"date_start_sl",$usehm,$usehm,1,"addline_sl"); print '   '.$langs->trans("DateEndPlanned").' '; - $form->select_date('',"date_end_sl",$usehm,$usehm,1,"addligne_sl"); + $form->select_date('',"date_end_sl",$usehm,$usehm,1,"addline_sl"); print ''; print ''; diff --git a/htdocs/fichinter/fiche.php b/htdocs/fichinter/fiche.php index 2c95076aaca..e8376dd64b3 100644 --- a/htdocs/fichinter/fiche.php +++ b/htdocs/fichinter/fiche.php @@ -244,7 +244,7 @@ if ($_POST['action'] == 'setdescription') } // Add line -if ($_POST['action'] == "addligne" && $user->rights->ficheinter->creer) +if ($_POST['action'] == "addline" && $user->rights->ficheinter->creer) { if ($_POST['np_desc'] && ($_POST['durationhour'] || $_POST['durationmin'])) { @@ -804,7 +804,7 @@ elseif ($fichinterid) print ''; print ''; print ''; - print ''; + print ''; $var=false; @@ -828,7 +828,7 @@ elseif ($fichinterid) $html->select_duration('duration',3600); print ''; - print ''; + print ''; print ''; 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 ''; - $num = sizeof($commande->lignes); + $num = sizeof($commande->lines); $i = 0; $total = 0; if ($num) @@ -991,78 +991,78 @@ if ($id > 0 || ! empty($ref)) $var=true; while ($i < $num) { - $commandline = $commande->lignes[$i]; + $line = $commande->lines[$i]; $var=!$var; // Show product and description - $type=$commandline->product_type?$commandline->product_type:$commandline->fk_product_type; + $type=$line->product_type?$line->product_type:$line->fk_product_type; // Try to enhance type detection using date_start and date_end for free lines where type // was not saved. - if (! empty($commandline->date_start)) $type=1; - if (! empty($commandline->date_end)) $type=1; + if (! empty($line->date_start)) $type=1; + if (! empty($line->date_end)) $type=1; // Ligne en mode visu - if ($_GET['action'] != 'editline' || $_GET['rowid'] != $commandline->id) + if ($_GET['action'] != 'editline' || $_GET['rowid'] != $line->id) { print ''; // Show product and description print ''; - print ''; + print ''; - print '\n"; + print '\n"; - print ''; + print ''; - if ($commandline->remise_percent > 0) + if ($line->remise_percent > 0) { - print '\n"; + print '\n"; } else { print ''; } - print ''; + print ''; if ($commande->statut == 0 && $user->rights->fournisseur->commande->creer) { - print ''; $actiondelete='delete_product_line'; - 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 'id.'" method="post">'; + print 'id.'" method="post">'; print ''; print ''; print ''; print ''; print ''; print ''; print ''; - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; print ''; print '' . "\n"; diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php index 1165fdf877f..15145ebcca3 100644 --- a/htdocs/fourn/facture/fiche.php +++ b/htdocs/fourn/facture/fiche.php @@ -1671,7 +1671,7 @@ else print ''; print ''; - print ''; + print ''; print ''; print ''; 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 '
'.vatrate($commandline->tva_tx).'%'.vatrate($line->tva_tx).'%'.price($commandline->subprice)."'.price($line->subprice)."'.$commandline->qty.''.$line->qty.''.dol_print_reduction($commandline->remise_percent,$langs)."'.dol_print_reduction($line->remise_percent,$langs)." '.price($commandline->total_ht).''.price($line->total_ht).'id.'#'.$commandline->id.'">'; + print 'id.'#'.$line->id.'">'; print img_edit(); print ''; + print ''; print img_delete(); print '
'; - print ''; // ancre pour retourner sur la ligne - if (($conf->product->enabled || $conf->service->enabled) && $commandline->fk_product > 0) + print ''; // ancre pour retourner sur la ligne + if (($conf->product->enabled || $conf->service->enabled) && $line->fk_product > 0) { $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); print '
'; } else { - print $html->select_type_of_lines($commandline->product_type,'type',1); + print $html->select_type_of_lines($line->product_type,'type',1); if ($conf->product->enabled && $conf->service->enabled) print '
'; } @@ -1108,16 +1108,16 @@ if ($id > 0 || ! empty($ref)) require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); $nbrows=ROWS_2; if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT; - $doleditor=new DolEditor('eldesc',$commandline->description,200,'dolibarr_details','',false,true,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS,$nbrows,70); + $doleditor=new DolEditor('eldesc',$line->description,200,'dolibarr_details','',false,true,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS,$nbrows,70); $doleditor->Create(); print '
'; - $html->select_tva('tva_tx',$commandline->tva_tx); + $html->select_tva('tva_tx',$line->tva_tx); print '%%'; print '