";
- print "propalid\">".img_object($langs->trans("ShowPropal"),"propal")." ".$objp->ref." \n";
+ print ''.img_object($langs->trans("ShowPropal"),"propal").' '.$objp->ref.' '."\n";
if ( ($db->jdate($objp->dp) < ($now - $conf->propal->cloture->warning_delay)) && $objp->fk_statut == 1 )
{
print " ".img_warning();
@@ -533,7 +535,7 @@ if ($socid > 0)
$sql.= " c.date_commande as dc";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande as c";
$sql.= " WHERE c.fk_soc = s.rowid ";
- $sql.= " AND s.rowid = ".$objsoc->id;
+ $sql.= " AND s.rowid = ".$object->id;
$sql.= " ORDER BY c.date_commande DESC";
$resql=$db->query($sql);
@@ -547,8 +549,8 @@ if ($socid > 0)
print '';
print '';
- print ''.$langs->trans("LastOrders",($num<=$MAXLIST?"":$MAXLIST)).' '.$langs->trans("AllOrders").' ('.$num.') '.img_picto($langs->trans("Statistics"),'stats').' ';
print ''.$langs->trans("AllContracts").' ('.$num.')
';
}
$i = 0;
@@ -642,7 +644,7 @@ if ($socid > 0)
$sql = "SELECT s.nom, s.rowid, f.rowid as id, f.ref, f.duree as duration, f.datei as startdate";
$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."fichinter as f";
$sql .= " WHERE f.fk_soc = s.rowid";
- $sql .= " AND s.rowid = ".$objsoc->id;
+ $sql .= " AND s.rowid = ".$object->id;
$sql .= " ORDER BY f.tms DESC";
$fichinter_static=new Fichinter($db);
@@ -657,7 +659,7 @@ if ($socid > 0)
print '';
print '';
- print ' ';
$var=!$var;
}
@@ -699,7 +701,7 @@ if ($socid > 0)
$sql.= ' SUM(pf.amount) as am';
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'paiement_facture as pf ON f.rowid=pf.fk_facture';
- $sql.= " WHERE f.fk_soc = s.rowid AND s.rowid = ".$objsoc->id;
+ $sql.= " WHERE f.fk_soc = s.rowid AND s.rowid = ".$object->id;
$sql.= ' GROUP BY f.rowid, f.facnumber, f.type, f.amount, f.total, f.total_ttc,';
$sql.= ' f.datef, f.datec, f.paye, f.fk_statut,';
$sql.= ' s.nom, s.rowid';
@@ -717,8 +719,8 @@ if ($socid > 0)
$tableaushown=1;
print '';
- print ''.$langs->trans("LastCustomersBills",($num<=$MAXLIST?"":$MAXLIST)).' '.$langs->trans("AllBills").' ('.$num.') '.img_picto($langs->trans("Statistics"),'stats').' '.$langs->trans("AddProp").' ';
+ print ''.$langs->trans("AddProp").' ';
}
if ($conf->commande->enabled && $user->rights->commande->creer)
{
$langs->load("orders");
- print ''.$langs->trans("AddOrder").' ';
+ print ''.$langs->trans("AddOrder").' ';
}
if ($user->rights->contrat->creer)
{
$langs->load("contracts");
- print ''.$langs->trans("AddContract").' ';
+ print ''.$langs->trans("AddContract").' ';
}
if ($conf->ficheinter->enabled && $user->rights->ficheinter->creer)
{
$langs->load("fichinter");
- print ''.$langs->trans("AddIntervention").' ';
+ print ''.$langs->trans("AddIntervention").' ';
}
// Add invoice
@@ -799,7 +801,7 @@ if ($socid > 0)
if ($conf->deplacement->enabled)
{
$langs->load("trips");
- print ''.$langs->trans("AddTrip").' ';
+ print ''.$langs->trans("AddTrip").' ';
}
if ($conf->facture->enabled)
@@ -807,7 +809,7 @@ if ($socid > 0)
if ($user->rights->facture->creer)
{
$langs->load("bills");
- if ($objsoc->client != 0) print ''.$langs->trans("AddBill").' ';
+ if ($object->client != 0) print ''.$langs->trans("AddBill").' ';
else print ''.$langs->trans("AddBill").' ';
}
else
@@ -822,7 +824,7 @@ if ($socid > 0)
{
if ($user->rights->agenda->myactions->create)
{
- print ''.$langs->trans("AddAction").' ';
+ print ''.$langs->trans("AddAction").' ';
}
else
{
@@ -832,7 +834,7 @@ if ($socid > 0)
/*if ($user->rights->societe->contact->creer)
{
- print ''.$langs->trans("AddContact").' ';
+ print ''.$langs->trans("AddContact").' ';
}*/
print '';
@@ -842,16 +844,16 @@ if ($socid > 0)
{
print ''.$langs->trans("Ref").' ';
print '';
- print $html->showrefnav($mil,'id');
+ print $form->showrefnav($mil,'id');
print ' '.$langs->trans("MailTitle").' '.$mil->titre.' '.$langs->trans("Ref").' ';
print '';
- print $html->showrefnav($mil,'id');
+ print $form->showrefnav($mil,'id');
print ' '.$html->editfieldkey("MailTitle",'desc',$mil->titre,'id',$mil->id,$user->rights->mailing->creer).' ';
- print $html->editfieldval("MailTitle",'desc',$mil->titre,'id',$mil->id,$user->rights->mailing->creer);
+ print ' '.$form->editfieldkey("MailTitle",'desc',$mil->titre,$mil,$user->rights->mailing->creer).' ';
+ print $form->editfieldval("MailTitle",'desc',$mil->titre,$mil,$user->rights->mailing->creer);
print ' '.$html->editfieldkey("MailFrom",'from',$mil->email_from,'id',$mil->id,$user->rights->mailing->creer && $mil->statut < 3,'email').' ';
- print $html->editfieldval("MailFrom",'from',$mil->email_from,'id',$mil->id,$user->rights->mailing->creer && $mil->statut < 3,'email');
+ print ' '.$form->editfieldkey("MailFrom",'from',$mil->email_from,$mil,$user->rights->mailing->creer && $mil->statut < 3,'email').' ';
+ print $form->editfieldval("MailFrom",'from',$mil->email_from,$mil,$user->rights->mailing->creer && $mil->statut < 3,'email');
print ' '.$html->editfieldkey("MailErrorsTo",'errorsto',$mil->email_errorsto,'id',$mil->id,$user->rights->mailing->creer && $mil->statut < 3,'email').' ';
- print $html->editfieldval("MailErrorsTo",'errorsto',$mil->email_errorsto,'id',$mil->id,$user->rights->mailing->creer && $mil->statut < 3,'email');
+ print ' '.$form->editfieldkey("MailErrorsTo",'errorsto',$mil->email_errorsto,$mil,$user->rights->mailing->creer && $mil->statut < 3,'email').' ';
+ print $form->editfieldval("MailErrorsTo",'errorsto',$mil->email_errorsto,$mil,$user->rights->mailing->creer && $mil->statut < 3,'email');
print ' '.$langs->trans('Ref').' ';
- print $html->showrefnav($object,'ref',$linkback,1,'ref','ref','');
+ print $form->showrefnav($object,'ref',$linkback,1,'ref','ref','');
print ' ';
if ($action == 'editconditions')
{
- $html->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->cond_reglement_id,'cond_reglement_id');
+ $form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->cond_reglement_id,'cond_reglement_id');
}
else
{
- $html->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->cond_reglement_id,'none');
+ $form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->cond_reglement_id,'none');
}
print ' ';
print '';
@@ -1270,7 +1270,7 @@ if ($id > 0 || ! empty($ref))
print '';
}
@@ -1295,11 +1295,11 @@ if ($id > 0 || ! empty($ref))
if ($action == 'editdelivery_address')
{
- $html->form_address($_SERVER['PHP_SELF'].'?id='.$object->id,$object->fk_delivery_address,GETPOST('socid'),'fk_address','propal',$object->id);
+ $form->form_address($_SERVER['PHP_SELF'].'?id='.$object->id,$object->fk_delivery_address,GETPOST('socid'),'fk_address','propal',$object->id);
}
else
{
- $html->form_address($_SERVER['PHP_SELF'].'?id='.$object->id,$object->fk_delivery_address,GETPOST('socid'),'none','propal',$object->id);
+ $form->form_address($_SERVER['PHP_SELF'].'?id='.$object->id,$object->fk_delivery_address,GETPOST('socid'),'none','propal',$object->id);
}
print '';
}
@@ -1315,11 +1315,11 @@ if ($id > 0 || ! empty($ref))
print '';
if ($action == 'editavailability')
{
- $html->form_availability($_SERVER['PHP_SELF'].'?id='.$object->id,$object->availability_id,'availability_id',1);
+ $form->form_availability($_SERVER['PHP_SELF'].'?id='.$object->id,$object->availability_id,'availability_id',1);
}
else
{
- $html->form_availability($_SERVER['PHP_SELF'].'?id='.$object->id,$object->availability_id,'none',1);
+ $form->form_availability($_SERVER['PHP_SELF'].'?id='.$object->id,$object->availability_id,'none',1);
}
print ' ';
@@ -1336,11 +1336,11 @@ if ($id > 0 || ! empty($ref))
//print $object->demand_reason_id;
if ($action == 'editdemandreason')
{
- $html->form_demand_reason($_SERVER['PHP_SELF'].'?id='.$object->id,$object->demand_reason_id,'demand_reason_id',1);
+ $form->form_demand_reason($_SERVER['PHP_SELF'].'?id='.$object->id,$object->demand_reason_id,'demand_reason_id',1);
}
else
{
- $html->form_demand_reason($_SERVER['PHP_SELF'].'?id='.$object->id,$object->demand_reason_id,'none');
+ $form->form_demand_reason($_SERVER['PHP_SELF'].'?id='.$object->id,$object->demand_reason_id,'none');
}
print '';
@@ -1357,11 +1357,11 @@ if ($id > 0 || ! empty($ref))
print '';
if ($action == 'editmode')
{
- $html->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->mode_reglement_id,'mode_reglement_id');
+ $form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->mode_reglement_id,'mode_reglement_id');
}
else
{
- $html->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->mode_reglement_id,'none');
+ $form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->mode_reglement_id,'none');
}
print ' ';
@@ -1379,11 +1379,11 @@ if ($id > 0 || ! empty($ref))
print '';
if ($action == 'classify')
{
- $html->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'projectid');
+ $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'projectid');
}
else
{
- $html->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none');
+ $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none');
}
print ' ';
}
@@ -1837,7 +1837,7 @@ else
print '';
print ' ';
print '';
- $html->select_propal_statut($viewstatut,1);
+ $form->select_propal_statut($viewstatut,1);
print ' ';
print ''.$langs->trans('Ref').' ';
- print $html->showrefnav($propal,'ref',$linkback,1,'ref','ref','');
+ print $form->showrefnav($propal,'ref',$linkback,1,'ref','ref','');
print ' ';
// On recupere les id des users deja selectionnes
//$userAlreadySelected = $propal->getListContactId('internal'); // On ne doit pas desactiver un contact deja selectionne car on doit pouvoir le selectionner une deuxieme fois pour un autre type
- $html->select_users($user->id,'contactid',0,$userAlreadySelected);
+ $form->select_users($user->id,'contactid',0,$userAlreadySelected);
print ' ';
print '';
$formcompany->selectTypeContact($propal, '', 'type','internal');
@@ -252,7 +252,7 @@ if ($id > 0 || ! empty($ref))
print ' ';
print '';
- $nbofcontacts=$html->select_contacts($selectedCompany, '', 'contactid');
+ $nbofcontacts=$form->select_contacts($selectedCompany, '', 'contactid');
if ($nbofcontacts == 0) print $langs->trans("NoContactDefined");
print ' ';
print '';
diff --git a/htdocs/comm/propal/document.php b/htdocs/comm/propal/document.php
index 05860909553..93eb16b0762 100644
--- a/htdocs/comm/propal/document.php
+++ b/htdocs/comm/propal/document.php
@@ -120,7 +120,7 @@ if ($action == 'confirm_deletefile' && $confirm == 'yes')
llxHeader();
-$html = new Form($db);
+$form = new Form($db);
if ($id > 0 || ! empty($ref))
{
@@ -149,7 +149,7 @@ if ($id > 0 || ! empty($ref))
// Ref
print ' '.$langs->trans('Ref').' ';
- print $html->showrefnav($object,'ref',$linkback,1,'ref','ref','');
+ print $form->showrefnav($object,'ref',$linkback,1,'ref','ref','');
print ' '.$langs->trans('Ref').' ';
- print $html->showrefnav($propal,'ref',$linkback,1,'ref','ref','');
+ print $form->showrefnav($propal,'ref',$linkback,1,'ref','ref','');
print ' '.$langs->trans("Ref").' ';
- print $html->showrefnav($commande,'ref','',1,'ref','ref');
+ print $form->showrefnav($commande,'ref','',1,'ref','ref');
print " ';
//$userAlreadySelected = $commande->getListContactId('internal'); // On ne doit pas desactiver un contact deja selectionne car on doit pouvoir le selectionner une deuxieme fois pour un autre type
- $html->select_users($user->id,'contactid',0,$userAlreadySelected);
+ $form->select_users($user->id,'contactid',0,$userAlreadySelected);
print ' ';
print '';
$formcompany->selectTypeContact($commande, '', 'type','internal');
@@ -244,7 +244,7 @@ if ($id > 0 || ! empty($ref))
print ' ';
print '';
- $nbofcontacts=$html->select_contacts($selectedCompany, '', 'contactid');
+ $nbofcontacts=$form->select_contacts($selectedCompany, '', 'contactid');
if ($nbofcontacts == 0) print $langs->trans("NoContactDefined");
print ' ';
print '';
diff --git a/htdocs/commande/document.php b/htdocs/commande/document.php
index 5c2e43f0431..2853ae6b0c3 100644
--- a/htdocs/commande/document.php
+++ b/htdocs/commande/document.php
@@ -123,7 +123,7 @@ if ($action == 'confirm_deletefile' && $confirm == 'yes')
llxHeader('',$langs->trans('Order'),'EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes');
-$html = new Form($db);
+$form = new Form($db);
if ($id > 0 || ! empty($ref))
{
@@ -150,7 +150,7 @@ if ($id > 0 || ! empty($ref))
// Ref
print ' '.$langs->trans('Ref').' ';
- print $html->showrefnav($object,'ref','',1,'ref','ref');
+ print $form->showrefnav($object,'ref','',1,'ref','ref');
print ' '.$langs->trans('Company').' '.$object->thirdparty->getNomUrl(1).' ".$langs->trans("DefaultContact").' ';
- $html->select_contacts($soc->id,$setcontact,'contactidp',1,$srccontactslist);
+ $form->select_contacts($soc->id,$setcontact,'contactidp',1,$srccontactslist);
print ' '.$langs->trans('Date').' ';
- $html->select_date('','re','','','',"crea_commande",1,1);
+ $form->select_date('','re','','','',"crea_commande",1,1);
print ' '.$langs->trans('DeliveryAddress').' ';
- $numaddress = $html->select_address($soc->fk_delivery_address, $socid,'fk_address',1);
+ $numaddress = $form->select_address($soc->fk_delivery_address, $socid,'fk_address',1);
print ' '.$langs->trans("AddAddress").' ';
print ' '.$langs->trans('PaymentConditionsShort').' ';
- $html->select_conditions_paiements($soc->cond_reglement,'cond_reglement_id',-1,1);
+ $form->select_conditions_paiements($soc->cond_reglement,'cond_reglement_id',-1,1);
print ' '.$langs->trans('PaymentMode').' ';
- $html->select_types_paiements($soc->mode_reglement,'mode_reglement_id');
+ $form->select_types_paiements($soc->mode_reglement,'mode_reglement_id');
print ' '.$langs->trans('AvailabilityPeriod').' ';
- $html->select_availability($propal->availability,'availability_id','',1);
+ $form->select_availability($propal->availability,'availability_id','',1);
print ' '.$langs->trans('Source').' ';
- $html->select_demand_reason((GETPOST("origin")=='propal'?'SRC_COMM':''),'demand_reason_id','',1);
+ $form->select_demand_reason((GETPOST("origin")=='propal'?'SRC_COMM':''),'demand_reason_id','',1);
print ' ';
// multiprix
if($conf->global->PRODUIT_MULTIPRICES)
- print $html->select_produits('','idprod'.$i,'',$conf->product->limit_size,$soc->price_level);
+ print $form->select_produits('','idprod'.$i,'',$conf->product->limit_size,$soc->price_level);
else
- print $html->select_produits('','idprod'.$i,'',$conf->product->limit_size);
+ print $form->select_produits('','idprod'.$i,'',$conf->product->limit_size);
print ' ';
print ''.$langs->trans('Ref').' ';
print '';
- print $html->showrefnav($object,'ref','',1,'ref','ref');
+ print $form->showrefnav($object,'ref','',1,'ref','ref');
print ' ';
print '';
if ($action == 'editconditions')
{
- $html->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->cond_reglement_id,'cond_reglement_id',1);
+ $form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->cond_reglement_id,'cond_reglement_id',1);
}
else
{
- $html->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->cond_reglement_id,'none',1);
+ $form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->cond_reglement_id,'none',1);
}
print ' ';
@@ -1729,11 +1729,11 @@ else
print '';
if ($action == 'editmode')
{
- $html->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->mode_reglement_id,'mode_reglement_id');
+ $form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->mode_reglement_id,'mode_reglement_id');
}
else
{
- $html->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->mode_reglement_id,'none');
+ $form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->mode_reglement_id,'none');
}
print ' ';
@@ -1747,11 +1747,11 @@ else
print '';
if ($action == 'editavailability')
{
- $html->form_availability($_SERVER['PHP_SELF'].'?id='.$object->id,$object->availability_id,'availability_id',1);
+ $form->form_availability($_SERVER['PHP_SELF'].'?id='.$object->id,$object->availability_id,'availability_id',1);
}
else
{
- $html->form_availability($_SERVER['PHP_SELF'].'?id='.$object->id,$object->availability_id,'none',1);
+ $form->form_availability($_SERVER['PHP_SELF'].'?id='.$object->id,$object->availability_id,'none',1);
}
print ' ';
@@ -1765,11 +1765,11 @@ else
print '';
if ($_GET['action'] == 'editdemandreason')
{
- $html->form_demand_reason($_SERVER['PHP_SELF'].'?id='.$object->id,$object->demand_reason_id,'demand_reason_id',1);
+ $form->form_demand_reason($_SERVER['PHP_SELF'].'?id='.$object->id,$object->demand_reason_id,'demand_reason_id',1);
}
else
{
- $html->form_demand_reason($_SERVER['PHP_SELF'].'?id='.$object->id,$object->demand_reason_id,'none');
+ $form->form_demand_reason($_SERVER['PHP_SELF'].'?id='.$object->id,$object->demand_reason_id,'none');
}
// Removed because using dictionnary is an admin feature, not a user feature. Ther is already the "star" to show info to admin users.
// This is to avoid too heavy screens and have an uniform look and feel for all screens.
@@ -1791,11 +1791,11 @@ else
//print "$object->id, $object->socid, $object->fk_project";
if ($action == 'classify')
{
- $html->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'projectid');
+ $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'projectid');
}
else
{
- $html->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none');
+ $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none');
}
print ' ';
}
diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php
index 3c3b8a0d709..2a3c6d91175 100644
--- a/htdocs/commande/index.php
+++ b/htdocs/commande/index.php
@@ -47,7 +47,7 @@ if ($user->societe_id > 0)
*/
$commandestatic=new Commande($db);
-$html = new Form($db);
+$form = new Form($db);
$formfile = new FormFile($db);
$help_url="EN:Module_Customers_Orders|FR:Module_Commandes_Clients|ES:Módulo Pedidos de clientes";
diff --git a/htdocs/commande/liste.php b/htdocs/commande/liste.php
index c4a1a6af40c..054499be001 100644
--- a/htdocs/commande/liste.php
+++ b/htdocs/commande/liste.php
@@ -69,7 +69,7 @@ $viewstatut=GETPOST('viewstatut');
$now=dol_now();
-$html = new Form($db);
+$form = new Form($db);
$formfile = new FormFile($db);
$companystatic = new Societe($db);
diff --git a/htdocs/commande/note.php b/htdocs/commande/note.php
index dfd1be92018..17d71af6cb7 100644
--- a/htdocs/commande/note.php
+++ b/htdocs/commande/note.php
@@ -81,7 +81,7 @@ if ($_POST["action"] == 'update' && $user->rights->commande->creer)
llxHeader('',$langs->trans('Order'),'EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes');
-$html = new Form($db);
+$form = new Form($db);
if ($id > 0 || ! empty($ref))
{
@@ -96,7 +96,7 @@ if ($id > 0 || ! empty($ref))
// Ref
print ''.$langs->trans("Ref").' ';
- print $html->showrefnav($commande,'ref','',1,'ref','ref');
+ print $form->showrefnav($commande,'ref','',1,'ref','ref');
print " '.$langs->trans("Ref").' ';
print '';
- print $html->showrefnav($acct,'ref','',1,'ref');
+ print $form->showrefnav($acct,'ref','',1,'ref');
print ' ';
print '';
- $html->select_date($dateop,'op',0,0,0,'transaction');
+ $form->select_date($dateop,'op',0,0,0,'transaction');
print ' ';
print '';
- $html->select_types_paiements((isset($_POST["operation"])?$_POST["operation"]:''),'operation','1,2',2,1);
+ $form->select_types_paiements((isset($_POST["operation"])?$_POST["operation"]:''),'operation','1,2',2,1);
print ' ';
print ' ';
print '';
@@ -409,7 +409,7 @@ if ($account || $_GET["ref"])
print ' ';
//$filtertype=array('TIP'=>'TIP','PRE'=>'PRE',...)
$filtertype='';
- print $html->select_types_paiements($_REQUEST['paiementtype'],'paiementtype',$filtertype,2,1,1,8);
+ print $form->select_types_paiements($_REQUEST['paiementtype'],'paiementtype',$filtertype,2,1,1,8);
print ' ';
print ''.$langs->trans("BackToModuleList").' ';
print_fiche_titre($langs->trans("BankSetupModule"),$linkback,'setup');
diff --git a/htdocs/compta/bank/fiche.php b/htdocs/compta/bank/fiche.php
index c7f9af67970..2ba2d61417c 100644
--- a/htdocs/compta/bank/fiche.php
+++ b/htdocs/compta/bank/fiche.php
@@ -191,7 +191,7 @@ $countrynotdefined=$langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("Se
llxHeader();
$form = new Form($db);
-$htmlcompany = new FormCompany($db);
+$formcompany = new FormCompany($db);
/* ************************************************************************** */
/* */
@@ -273,7 +273,7 @@ if ($action == 'create')
print ' '.$langs->trans('State').' ';
if ($selectedcode)
{
- $htmlcompany->select_departement(isset($_POST["account_departement_id"])?$_POST["account_departement_id"]:'',$selectedcode,'account_departement_id');
+ $formcompany->select_departement(isset($_POST["account_departement_id"])?$_POST["account_departement_id"]:'',$selectedcode,'account_departement_id');
}
else
{
@@ -544,7 +544,7 @@ else
print ' '.$langs->trans('State').' ';
if ($selectedcode)
{
- $htmlcompany->select_departement(isset($_POST["account_departement_id"])?$_POST["account_departement_id"]:$account->fk_departement,$selectedcode,'account_departement_id');
+ $formcompany->select_departement(isset($_POST["account_departement_id"])?$_POST["account_departement_id"]:$account->fk_departement,$selectedcode,'account_departement_id');
}
else
{
diff --git a/htdocs/compta/bank/ligne.php b/htdocs/compta/bank/ligne.php
index 9f500eea383..0f0e16af275 100644
--- a/htdocs/compta/bank/ligne.php
+++ b/htdocs/compta/bank/ligne.php
@@ -42,7 +42,7 @@ $orig_account=GETPOST("orig_account");
$accountid=GETPOST('accountid');
$confirm=GETPOST('confirm');
-$html = new Form($db);
+$form = new Form($db);
/*
* Actions
@@ -244,7 +244,7 @@ if ($result)
// Confirmations
if ($action == 'delete_categ')
{
- $ret=$html->form_confirm("ligne.php?rowid=".$rowid."&cat1=".GETPOST("fk_categ")."&orig_account=".$orig_account, $langs->trans("RemoveFromRubrique"), $langs->trans("RemoveFromRubriqueConfirm"), "confirm_delete_categ", '', 'yes', 1);
+ $ret=$form->form_confirm("ligne.php?rowid=".$rowid."&cat1=".GETPOST("fk_categ")."&orig_account=".$orig_account, $langs->trans("RemoveFromRubrique"), $langs->trans("RemoveFromRubriqueConfirm"), "confirm_delete_categ", '', 'yes', 1);
if ($ret == 'html') print ' '.$langs->trans("Ref")." ";
print '';
- print $html->showrefnav($bankline,'rowid','',1,'rowid','rowid');
+ print $form->showrefnav($bankline,'rowid','',1,'rowid','rowid');
print ' ';
print '';
- print $html->select_types_paiements($objp->fk_type,"value",'',2);
+ print $form->select_types_paiements($objp->fk_type,"value",'',2);
print ' ';
- print $html->select_date($db->jdate($objp->do),'dateo','','','','update',1,0,1,$objp->rappro);
+ print $form->select_date($db->jdate($objp->do),'dateo','','','','update',1,0,1,$objp->rappro);
print ' ';
}
else
@@ -420,7 +420,7 @@ if ($result)
if ($user->rights->banque->modifier || $user->rights->banque->consolidate)
{
print '';
- print $html->select_date($db->jdate($objp->dv),'datev','','','','update',1,0,1,$objp->rappro);
+ print $form->select_date($db->jdate($objp->dv),'datev','','','','update',1,0,1,$objp->rappro);
if (! $objp->rappro)
{
print ' ';
diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php
index 0db2c4ec816..c36cfb0fd40 100644
--- a/htdocs/compta/bank/releve.php
+++ b/htdocs/compta/bank/releve.php
@@ -70,7 +70,7 @@ $pagenext = $page + 1;
llxHeader();
-$html = new Form($db);
+$form = new Form($db);
// Load account
@@ -113,7 +113,7 @@ if (! isset($_GET["num"]))
// Ref
print ' '.$langs->trans("Ref").' ';
print '';
- print $html->showrefnav($acct,'ref','',1,'ref');
+ print $form->showrefnav($acct,'ref','',1,'ref');
print ' ';
print ' ';
print '';
- $html->select_types_paiements(empty($_REQUEST["type"])?'':$_REQUEST["type"], 'type', '', 2, 0, 1, 8);
+ $form->select_types_paiements(empty($_REQUEST["type"])?'':$_REQUEST["type"], 'type', '', 2, 0, 1, 8);
print ' ';
print '';
diff --git a/htdocs/compta/bank/treso.php b/htdocs/compta/bank/treso.php
index 6a6a1580f64..0d924bbc0d5 100644
--- a/htdocs/compta/bank/treso.php
+++ b/htdocs/compta/bank/treso.php
@@ -61,7 +61,7 @@ $facturestatic=new Facture($db);
$facturefournstatic=new FactureFournisseur($db);
$socialcontribstatic=new ChargeSociales($db);
-$html = new Form($db);
+$form = new Form($db);
if ($_REQUEST["account"] || $_REQUEST["ref"])
{
@@ -99,7 +99,7 @@ if ($_REQUEST["account"] || $_REQUEST["ref"])
// Ref
print ' '.$langs->trans("Ref").' ';
print '';
- print $html->showrefnav($acct,'ref','',1,'ref');
+ print $form->showrefnav($acct,'ref','',1,'ref');
print ' ';
-print $html->select_comptes($_POST['account_from'],'account_from',0,'',1);
+print $form->select_comptes($_POST['account_from'],'account_from',0,'',1);
print " ";
print "\n";
-print $html->select_comptes($_POST['account_to'],'account_to',0,'',1);
+print $form->select_comptes($_POST['account_to'],'account_to',0,'',1);
print " \n";
print "";
-$html->select_date($dateo,'','','','','add');
+$form->select_date($dateo,'','','','','add');
print " \n";
print '';
- print $form->editfieldkey("Type",'type',$langs->trans($object->type),'id',$object->id,$conf->global->MAIN_EDIT_ALSO_INLINE && $user->rights->deplacement->creer,'select:types_fees');
+ print $form->editfieldkey("Type",'type',$langs->trans($object->type),$object,$conf->global->MAIN_EDIT_ALSO_INLINE && $user->rights->deplacement->creer,'select:types_fees');
print ' ';
- print $form->editfieldval("Type",'type',$langs->trans($object->type),'id',$object->id,$conf->global->MAIN_EDIT_ALSO_INLINE && $user->rights->deplacement->creer,'select:types_fees');
+ print $form->editfieldval("Type",'type',$langs->trans($object->type),$object,$conf->global->MAIN_EDIT_ALSO_INLINE && $user->rights->deplacement->creer,'select:types_fees');
print ' ';
- print $form->editfieldkey("Date",'dated',$object->date,'id',$object->id,$conf->global->MAIN_EDIT_ALSO_INLINE && $user->rights->deplacement->creer,'datepicker');
+ print $form->editfieldkey("Date",'dated',$object->date,$object,$conf->global->MAIN_EDIT_ALSO_INLINE && $user->rights->deplacement->creer,'datepicker');
print ' ';
- print $form->editfieldval("Date",'dated',$object->date,'id',$object->id,$conf->global->MAIN_EDIT_ALSO_INLINE && $user->rights->deplacement->creer,'datepicker');
+ print $form->editfieldval("Date",'dated',$object->date,$object,$conf->global->MAIN_EDIT_ALSO_INLINE && $user->rights->deplacement->creer,'datepicker');
print ' ';
- print $form->editfieldkey("FeesKilometersOrAmout",'km',$object->km,'id',$object->id,$conf->global->MAIN_EDIT_ALSO_INLINE && $user->rights->deplacement->creer,'numeric:6');
+ print $form->editfieldkey("FeesKilometersOrAmout",'km',$object->km,$object,$conf->global->MAIN_EDIT_ALSO_INLINE && $user->rights->deplacement->creer,'numeric:6');
print ' ';
- print $form->editfieldval("FeesKilometersOrAmout",'km',$object->km,'id',$object->id,$conf->global->MAIN_EDIT_ALSO_INLINE && $user->rights->deplacement->creer,'numeric:6');
+ print $form->editfieldval("FeesKilometersOrAmout",'km',$object->km,$object,$conf->global->MAIN_EDIT_ALSO_INLINE && $user->rights->deplacement->creer,'numeric:6');
print " ';
- print $form->editfieldkey("NotePublic",'note_public',$object->note_public,'id',$object->id,$conf->global->MAIN_EDIT_ALSO_INLINE && $user->rights->deplacement->creer,'ckeditor:dolibarr_notes:600:180');
+ print $form->editfieldkey("NotePublic",'note_public',$object->note_public,$object,$conf->global->MAIN_EDIT_ALSO_INLINE && $user->rights->deplacement->creer,'ckeditor:dolibarr_notes:600:180');
print ' ';
- print $form->editfieldval("NotePublic",'note_public',$object->note_public,'id',$object->id,$conf->global->MAIN_EDIT_ALSO_INLINE && $user->rights->deplacement->creer,'ckeditor:dolibarr_notes:600:180');
+ print $form->editfieldval("NotePublic",'note_public',$object->note_public,$object,$conf->global->MAIN_EDIT_ALSO_INLINE && $user->rights->deplacement->creer,'ckeditor:dolibarr_notes:600:180');
print " ';
- print $form->editfieldkey("NotePrivate",'note',$object->note_private,'id',$object->id,$conf->global->MAIN_EDIT_ALSO_INLINE && $user->rights->deplacement->creer,'ckeditor:dolibarr_notes:600:180');
+ print $form->editfieldkey("NotePrivate",'note',$object->note_private,$object,$conf->global->MAIN_EDIT_ALSO_INLINE && $user->rights->deplacement->creer,'ckeditor:dolibarr_notes:600:180');
print ' ';
- print $form->editfieldval("NotePrivate",'note',$object->note_private,'id',$object->id,$conf->global->MAIN_EDIT_ALSO_INLINE && $user->rights->deplacement->creer,'ckeditor:dolibarr_notes:600:180');
+ print $form->editfieldval("NotePrivate",'note',$object->note_private,$object,$conf->global->MAIN_EDIT_ALSO_INLINE && $user->rights->deplacement->creer,'ckeditor:dolibarr_notes:600:180');
print " '.$langs->trans("Date").' ';
- $html->select_date($donation_date?$donation_date:-1,'','','','',"add",1,1);
+ $form->select_date($donation_date?$donation_date:-1,'','','','',"add",1,1);
print ' ';
print ''.$langs->trans("Comments").' : ".''.$langs->trans("Amount").' ';
print ''.$langs->trans("PublicDonation")." ";
- print $html->selectyesno("public",isset($_POST["public"])?$_POST["public"]:1,1);
+ print $form->selectyesno("public",isset($_POST["public"])?$_POST["public"]:1,1);
print " ".''.$langs->trans("Company").' ';
@@ -294,16 +294,16 @@ if ($_GET["action"] == 'create')
// Zip / Town
print ''.$langs->trans("Zip").' / '.$langs->trans("Town").' ';
- print $htmlcompany->select_ziptown((isset($_POST["zipcode"])?$_POST["zipcode"]:$don->zip),'zipcode',array('town','selectpays_id','departement_id'),6);
+ print $formcompany->select_ziptown((isset($_POST["zipcode"])?$_POST["zipcode"]:$don->zip),'zipcode',array('town','selectpays_id','departement_id'),6);
print ' ';
- print $htmlcompany->select_ziptown((isset($_POST["town"])?$_POST["town"]:$don->town),'town',array('zipcode','selectpays_id','departement_id'));
+ print $formcompany->select_ziptown((isset($_POST["town"])?$_POST["town"]:$don->town),'town',array('zipcode','selectpays_id','departement_id'));
print ' ".''.$langs->trans("Country").' ';
print "".''.$langs->trans("EMail").' ';
print "".$langs->trans("PaymentMode")." \n";
- $html->select_types_paiements('', 'modepaiement', 'CRDT', 0, 1);
+ $form->select_types_paiements('', 'modepaiement', 'CRDT', 0, 1);
print " ".''.$langs->trans("Date").' ';
- $html->select_date($don->date,'','','','',"update");
+ $form->select_date($don->date,'','','','',"update");
print ' ';
print ''.$langs->trans("Comments").' : ".''.$langs->trans("Amount").' ';
print ''.$langs->trans("PublicDonation")." ";
- print $html->selectyesno("public",1,1);
+ print $form->selectyesno("public",1,1);
print " ";
print "'.$langs->trans("Zip").' / '.$langs->trans("Town").' ';
- print $htmlcompany->select_ziptown((isset($_POST["zipcode"])?$_POST["zipcode"]:$don->zip),'zipcode',array('town','selectpays_id','departement_id'),6);
+ print $formcompany->select_ziptown((isset($_POST["zipcode"])?$_POST["zipcode"]:$don->zip),'zipcode',array('town','selectpays_id','departement_id'),6);
print ' ';
- print $htmlcompany->select_ziptown((isset($_POST["town"])?$_POST["town"]:$don->town),'town',array('zipcode','selectpays_id','departement_id'));
+ print $formcompany->select_ziptown((isset($_POST["town"])?$_POST["town"]:$don->town),'town',array('zipcode','selectpays_id','departement_id'));
print ' ".''.$langs->trans("Country").' ';
print "".''.$langs->trans("EMail").' ';
print "".$langs->trans("PaymentMode")." \n";
- $html->select_types_paiements('', 'modepaiement', 'CRDT', 0, 1);
+ $form->select_types_paiements('', 'modepaiement', 'CRDT', 0, 1);
print " ".''.$langs->trans("Status").' '.$don->getLibStatut(4).' ';
@@ -443,7 +443,7 @@ if ($_GET["rowid"] && $_GET["action"] != 'edit')
// Ref
print "".''.$langs->trans("Ref").' ';
- print $html->showrefnav($don,'rowid','',1,'rowid','ref','');
+ print $form->showrefnav($don,'rowid','',1,'rowid','ref','');
print ' ';
print ' ';
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 86848e8bbc9..285b44f38be 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -1422,7 +1422,7 @@ if (GETPOST('action') == 'builddoc') // En get ou en post
llxHeader('',$langs->trans('Bill'),'EN:Customers_Invoices|FR:Factures_Clients|ES:Facturas_a_clientes');
-$html = new Form($db);
+$form = new Form($db);
$htmlother = new FormOther($db);
$formfile = new FormFile($db);
$now=dol_now();
@@ -1604,7 +1604,7 @@ if ($action == 'create')
print '';
print ' ';
- $desc=$html->textwithpicto($langs->trans("InvoiceStandardAsk"),$langs->transnoentities("InvoiceStandardDesc"),1);
+ $desc=$form->textwithpicto($langs->trans("InvoiceStandardAsk"),$langs->transnoentities("InvoiceStandardDesc"),1);
print $desc;
print ' ';
print ' ';
- $desc=$html->textwithpicto($langs->trans("InvoiceDeposit"),$langs->transnoentities("InvoiceDepositDesc"),1);
+ $desc=$form->textwithpicto($langs->trans("InvoiceDeposit"),$langs->transnoentities("InvoiceDepositDesc"),1);
print $desc;
print ' ';
print ' ';
- $desc=$html->textwithpicto($langs->trans("InvoiceProForma"),$langs->transnoentities("InvoiceProFormaDesc"),1);
+ $desc=$form->textwithpicto($langs->trans("InvoiceProForma"),$langs->transnoentities("InvoiceProFormaDesc"),1);
print $desc;
print ' '.$langs->trans("NoReplacableInvoice").' ';
}
$text.='';
- $desc=$html->textwithpicto($text,$langs->transnoentities("InvoiceReplacementDesc"),1);
+ $desc=$form->textwithpicto($text,$langs->transnoentities("InvoiceReplacementDesc"),1);
print $desc;
print ''."\n";
@@ -1672,7 +1672,7 @@ if ($action == 'create')
$text.=''.$langs->trans("NoInvoiceToCorrect").' ';
}
$text.='';
- $desc=$html->textwithpicto($text,$langs->transnoentities("InvoiceAvoirDesc"),1);
+ $desc=$form->textwithpicto($text,$langs->transnoentities("InvoiceAvoirDesc"),1);
//.' ('.$langs->trans("FeatureNotYetAvailable").')',$langs->transnoentities("InvoiceAvoirDesc"),1);
print $desc;
print ''."\n";
@@ -1695,17 +1695,17 @@ if ($action == 'create')
// Date invoice
print ''.$langs->trans('Date').' ';
- $html->select_date($dateinvoice,'','','','',"add",1,1);
+ $form->select_date($dateinvoice,'','','','',"add",1,1);
print ' '.$langs->trans('PaymentConditionsShort').' ';
- $html->select_conditions_paiements(isset($_POST['cond_reglement_id'])?$_POST['cond_reglement_id']:$cond_reglement_id,'cond_reglement_id');
+ $form->select_conditions_paiements(isset($_POST['cond_reglement_id'])?$_POST['cond_reglement_id']:$cond_reglement_id,'cond_reglement_id');
print ' '.$langs->trans('PaymentMode').' ';
- $html->select_types_paiements(isset($_POST['mode_reglement_id'])?$_POST['mode_reglement_id']:$mode_reglement_id,'mode_reglement_id');
+ $form->select_types_paiements(isset($_POST['mode_reglement_id'])?$_POST['mode_reglement_id']:$mode_reglement_id,'mode_reglement_id');
print ' ';
include_once(DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php');
$liste=ModelePDFFactures::liste_modeles($db);
- print $html->selectarray('model',$liste,$conf->global->FACTURE_ADDON_PDF);
+ print $form->selectarray('model',$liste,$conf->global->FACTURE_ADDON_PDF);
print " ";
// Public note
@@ -1817,9 +1817,9 @@ if ($action == 'create')
print '';
// multiprix
if($conf->global->PRODUIT_MULTIPRICES)
- $html->select_produits('','idprod'.$i,'',$conf->product->limit_size,$soc->price_level);
+ $form->select_produits('','idprod'.$i,'',$conf->product->limit_size,$soc->price_level);
else
- $html->select_produits('','idprod'.$i,'',$conf->product->limit_size);
+ $form->select_produits('','idprod'.$i,'',$conf->product->limit_size);
print ' ';
print '';
print $langs->trans('From').' ';
print ' ';
- print $html->select_date('','date_start'.$i,$usehm,$usehm,1,"add");
+ print $form->select_date('','date_start'.$i,$usehm,$usehm,1,"add");
print ' ';
print '';
print $langs->trans('to').' ';
print ' ';
- print $html->select_date('','date_end'.$i,$usehm,$usehm,1,"add");
+ print $form->select_date('','date_end'.$i,$usehm,$usehm,1,"add");
print '
';
print ' ';
// Third party
@@ -2106,7 +2106,7 @@ else
print '';
if ($action == 'editthirdparty')
{
- $html->form_thirdparty($_SERVER['PHP_SELF'].'?facid='.$object->id,$object->socid,'socid');
+ $form->form_thirdparty($_SERVER['PHP_SELF'].'?facid='.$object->id,$object->socid,'socid');
}
else
{
@@ -2186,7 +2186,7 @@ else
{
$text=$langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->transnoentities("Currency".$conf->monnaie));
$text2=$langs->trans("AbsoluteDiscountUse");
- print $html->textwithpicto($text,$text2);
+ print $form->textwithpicto($text,$text2);
}
}
}
@@ -2195,7 +2195,7 @@ else
// Remise dispo de type remise fixe (not credit note)
$filter='fk_facture_source IS NULL';
print ' ';
- print $html->textwithpicto($langs->trans("Escompte").':',$langs->trans("HelpEscompte"),-1);
+ print $form->textwithpicto($langs->trans("Escompte").':',$langs->trans("HelpEscompte"),-1);
print ' '.price($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye).' ';
- print $html->textwithpicto($langs->trans("Abandoned").':',$langs->trans("HelpAbandonBadCustomer"),-1);
+ print $form->textwithpicto($langs->trans("Abandoned").':',$langs->trans("HelpAbandonBadCustomer"),-1);
print ' '.price($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye).' ';
- print $html->textwithpicto($langs->trans("ProductReturned").':',$langs->trans("HelpAbandonProductReturned"),-1);
+ print $form->textwithpicto($langs->trans("ProductReturned").':',$langs->trans("HelpAbandonProductReturned"),-1);
print ' '.price($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye).' ';
$text=$langs->trans("HelpAbandonOther");
if ($object->close_note) $text.=''.$langs->trans("Reason").' :'.$object->close_note;
- print $html->textwithpicto($langs->trans("Abandoned").':',$text,-1);
+ print $form->textwithpicto($langs->trans("Abandoned").':',$text,-1);
print ' '.price($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye).' ';
if ($action == 'editmode')
{
- $html->form_modes_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id,$object->mode_reglement_id,'mode_reglement_id');
+ $form->form_modes_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id,$object->mode_reglement_id,'mode_reglement_id');
}
else
{
- $html->form_modes_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id,$object->mode_reglement_id,'none');
+ $form->form_modes_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id,$object->mode_reglement_id,'none');
}
print ' ';
@@ -2562,11 +2562,11 @@ else
print '';
if ($action == 'classify')
{
- $html->form_project($_SERVER['PHP_SELF'].'?facid='.$object->id,$object->socid,$object->fk_project,'projectid');
+ $form->form_project($_SERVER['PHP_SELF'].'?facid='.$object->id,$object->socid,$object->fk_project,'projectid');
}
else
{
- $html->form_project($_SERVER['PHP_SELF'].'?facid='.$object->id,$object->socid,$object->fk_project,'none');
+ $form->form_project($_SERVER['PHP_SELF'].'?facid='.$object->id,$object->socid,$object->fk_project,'none');
}
print ' ';
print '';
diff --git a/htdocs/compta/facture/apercu.php b/htdocs/compta/facture/apercu.php
index bb0db249e39..b8f76d5c24b 100644
--- a/htdocs/compta/facture/apercu.php
+++ b/htdocs/compta/facture/apercu.php
@@ -50,7 +50,7 @@ $now=dol_now();
llxHeader('',$langs->trans("Bill"),'Facture');
-$html = new Form($db);
+$form = new Form($db);
/* *************************************************************************** */
/* */
@@ -162,7 +162,7 @@ if ($id > 0 || ! empty($ref))
{
$text=$langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->transnoentities("Currency".$conf->monnaie));
$text2=$langs->trans("AbsoluteDiscountUse");
- print $html->textwithpicto($text,$text2);
+ print $form->textwithpicto($text,$text2);
}
}
}
@@ -171,7 +171,7 @@ if ($id > 0 || ! empty($ref))
// Remise dispo de type remise fixe (not credit note)
$filter='fk_facture_source IS NULL';
print ''.$langs->trans("PaymentConditionsShort").' ';
- $html->form_conditions_reglement($_SERVER["PHP_SELF"]."?facid=$object->id",$object->cond_reglement_id,"none");
+ $form->form_conditions_reglement($_SERVER["PHP_SELF"]."?facid=$object->id",$object->cond_reglement_id,"none");
print ' ';
print '';
if ($action == 'editmode')
{
- $html->form_modes_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id,$object->mode_reglement_id,'mode_reglement_id');
+ $form->form_modes_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id,$object->mode_reglement_id,'mode_reglement_id');
}
else
{
- $html->form_modes_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id,$object->mode_reglement_id,'none');
+ $form->form_modes_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id,$object->mode_reglement_id,'none');
}
print ' ';
diff --git a/htdocs/compta/facture/contact.php b/htdocs/compta/facture/contact.php
index f826d454858..1787baa2208 100644
--- a/htdocs/compta/facture/contact.php
+++ b/htdocs/compta/facture/contact.php
@@ -112,7 +112,7 @@ if ($_GET["action"] == 'deleteline' && $user->rights->facture->creer)
llxHeader('', $langs->trans("Bill"), "Facture");
-$html = new Form($db);
+$form = new Form($db);
$formcompany = new FormCompany($db);
$contactstatic=new Contact($db);
$userstatic=new User($db);
@@ -157,7 +157,7 @@ if ($id > 0 || ! empty($ref))
{
dol_print_error('',$discount->error);
}
- print $html->showrefnav($facture,'ref','',1,'facnumber','ref',$morehtmlref);
+ print $form->showrefnav($facture,'ref','',1,'facnumber','ref',$morehtmlref);
print '';
// Customer
@@ -209,7 +209,7 @@ if ($id > 0 || ! empty($ref))
print '';
// Ge get ids of alreadey selected users
//$userAlreadySelected = $facture->getListContactId('internal'); // On ne doit pas desactiver un contact deja selectionner car on doit pouvoir le seclectionner une deuxieme fois pour un autre type
- $html->select_users($user->id,'contactid',0,$userAlreadySelected);
+ $form->select_users($user->id,'contactid',0,$userAlreadySelected);
print ' ';
print '';
$formcompany->selectTypeContact($facture, '', 'type','internal');
@@ -239,7 +239,7 @@ if ($id > 0 || ! empty($ref))
print ' ';
print '';
- $nbofcontacts=$html->select_contacts($selectedCompany, '', 'contactid');
+ $nbofcontacts=$form->select_contacts($selectedCompany, '', 'contactid');
if ($nbofcontacts == 0) print $langs->trans("NoContactDefined");
print ' ';
print '';
diff --git a/htdocs/compta/facture/document.php b/htdocs/compta/facture/document.php
index 14a47995a1b..17c0e3bdb8c 100644
--- a/htdocs/compta/facture/document.php
+++ b/htdocs/compta/facture/document.php
@@ -124,7 +124,7 @@ if ($action == 'confirm_deletefile' && $confirm == 'yes')
llxHeader();
-$html = new Form($db);
+$form = new Form($db);
$id = $_GET['facid']?$_GET['facid']:$_GET['id'];
$ref= $_GET['ref'];
@@ -166,7 +166,7 @@ if ($id > 0 || ! empty($ref))
{
dol_print_error('',$discount->error);
}
- print $html->showrefnav($object,'ref','',1,'facnumber','ref',$morehtmlref);
+ print $form->showrefnav($object,'ref','',1,'facnumber','ref',$morehtmlref);
print ' ';
// Company
@@ -184,7 +184,7 @@ if ($id > 0 || ! empty($ref))
*/
if ($action == 'delete')
{
- $ret=$html->form_confirm($_SERVER["PHP_SELF"].'?facid='.$id.'&urlfile='.urldecode($_GET["urlfile"]), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', 0, 1);
+ $ret=$form->form_confirm($_SERVER["PHP_SELF"].'?facid='.$id.'&urlfile='.urldecode($_GET["urlfile"]), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', 0, 1);
if ($ret == 'html') print '".$langs->trans("Author")." ".$user->getFullName($langs)." ".$langs->trans("PaymentConditions")." ";
- $html->form_conditions_reglement($_SERVER['PHP_SELF'].'?facid='.$facture->id,$facture->cond_reglement_id,'none');
+ $form->form_conditions_reglement($_SERVER['PHP_SELF'].'?facid='.$facture->id,$facture->cond_reglement_id,'none');
print " ".$langs->trans("PaymentMode")." ";
- $html->form_modes_reglement($_SERVER['PHP_SELF'].'?facid='.$facture->id,$facture->mode_reglement_id,'none');
+ $form->form_modes_reglement($_SERVER['PHP_SELF'].'?facid='.$facture->id,$facture->mode_reglement_id,'none');
print " '.$langs->trans("Customer").' ';
print ''.$soc->getNomUrl(1).' ';
print "". $langs->trans("PaymentConditions") ." : ";
- $html->form_conditions_reglement($_SERVER['PHP_SELF'].'?facid='.$fac->id,$fac->cond_reglement_id,'none');
+ $form->form_conditions_reglement($_SERVER['PHP_SELF'].'?facid='.$fac->id,$fac->cond_reglement_id,'none');
print " ".$langs->trans("Author")." ".$author->getFullName($langs)." ";
@@ -368,7 +368,7 @@ else
}
print $langs->trans("PaymentMode") ." : ";
- $html->form_modes_reglement($_SERVER['PHP_SELF'].'?facid='.$fac->id,$fac->mode_reglement_id,'none');
+ $form->form_modes_reglement($_SERVER['PHP_SELF'].'?facid='.$fac->id,$fac->mode_reglement_id,'none');
print "'.$langs->trans("AmountHT").' ';
@@ -435,7 +435,7 @@ else
$text=$product_static->getNomUrl(1);
$text.= ' - '.$fac->lines[$i]->libelle;
$description=($conf->global->PRODUIT_DESC_IN_FORM?'':dol_htmlentitiesbr($fac->lines[$i]->desc));
- print $html->textwithtooltip($text,$description,3,'','',$i);
+ print $form->textwithtooltip($text,$description,3,'','',$i);
// Show range
print_date_range($fac->lines[$i]->date_start,$fac->lines[$i]->date_end);
diff --git a/htdocs/compta/facture/impayees.php b/htdocs/compta/facture/impayees.php
index 8bfa5d75072..9641c2d2e59 100644
--- a/htdocs/compta/facture/impayees.php
+++ b/htdocs/compta/facture/impayees.php
@@ -138,7 +138,7 @@ if ($option=='late') $title=$langs->trans("BillsCustomersUnpaid");
llxHeader('',$title);
-$html = new Form($db);
+$form = new Form($db);
$formfile = new FormFile($db);
?>
diff --git a/htdocs/compta/facture/note.php b/htdocs/compta/facture/note.php
index 90b338b8ce6..ea22971c1bf 100644
--- a/htdocs/compta/facture/note.php
+++ b/htdocs/compta/facture/note.php
@@ -91,7 +91,7 @@ if ($_POST["action"] == 'update' && $user->rights->facture->creer)
llxHeader();
-$html = new Form($db);
+$form = new Form($db);
$id = $_GET['facid'];
$ref= $_GET['ref'];
@@ -123,7 +123,7 @@ if ($id > 0 || ! empty($ref))
{
dol_print_error('',$discount->error);
}
- print $html->showrefnav($fac,'ref','',1,'facnumber','ref',$morehtmlref);
+ print $form->showrefnav($fac,'ref','',1,'facnumber','ref',$morehtmlref);
print '';
if ($_GET['action'] == 'editmode')
{
- $html->form_modes_reglement($_SERVER['PHP_SELF'].'?facid='.$fac->id,$fac->mode_reglement_id,'mode_reglement_id');
+ $form->form_modes_reglement($_SERVER['PHP_SELF'].'?facid='.$fac->id,$fac->mode_reglement_id,'mode_reglement_id');
}
else
{
- $html->form_modes_reglement($_SERVER['PHP_SELF'].'?facid='.$fac->id,$fac->mode_reglement_id,'none');
+ $form->form_modes_reglement($_SERVER['PHP_SELF'].'?facid='.$fac->id,$fac->mode_reglement_id,'none');
}
print ' ';
diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index b5652adf2a9..4166a4ab130 100644
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -87,7 +87,7 @@ $now=dol_now();
$facturestatic=new Facture($db);
$facturesupplierstatic=new FactureFournisseur($db);
-$html = new Form($db);
+$form = new Form($db);
$formfile = new FormFile($db);
$thirdpartystatic = new Societe($db);
diff --git a/htdocs/compta/journal/purchasesjournal.php b/htdocs/compta/journal/purchasesjournal.php
index f48dda6de05..621287c39e4 100755
--- a/htdocs/compta/journal/purchasesjournal.php
+++ b/htdocs/compta/journal/purchasesjournal.php
@@ -55,7 +55,7 @@ if ($user->societe_id > 0)
llxHeader('','','');
-$html=new Form($db);
+$form=new Form($db);
$year_current = strftime("%Y",dol_now());
$pastmonth = strftime("%m",dol_now()) - 1;
@@ -78,7 +78,7 @@ $nom=$langs->trans("PurchasesJournal");
//$nomlink=;
$builddate=time();
$description=$langs->trans("DescPurchasesJournal");
-$period=$html->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$html->select_date($date_end,'date_end',0,0,0,'',1,0,1);
+$period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1);
report_header($nom,$nomlink,$period,$periodlink,$description,$builddate,$exportlink);
$p = explode(":", $conf->global->MAIN_INFO_SOCIETE_PAYS);
diff --git a/htdocs/compta/journal/sellsjournal.php b/htdocs/compta/journal/sellsjournal.php
index 6d42ecbe133..3357078459c 100755
--- a/htdocs/compta/journal/sellsjournal.php
+++ b/htdocs/compta/journal/sellsjournal.php
@@ -54,7 +54,7 @@ if ($user->societe_id > 0)
llxHeader('','','');
-$html=new Form($db);
+$form=new Form($db);
// Put here content of your page
// ...
@@ -80,7 +80,7 @@ $nom=$langs->trans("SellsJournal");
//$nomlink=;
$builddate=time();
$description=$langs->trans("DescSellsJournal");
-$period=$html->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$html->select_date($date_end,'date_end',0,0,0,'',1,0,1);
+$period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1);
report_header($nom,$nomlink,$period,$periodlink,$description,$builddate,$exportlink);
$p = explode(":", $conf->global->MAIN_INFO_SOCIETE_PAYS);
diff --git a/htdocs/compta/localtax/clients.php b/htdocs/compta/localtax/clients.php
index 6f2bbae3029..4e2f110e0ce 100644
--- a/htdocs/compta/localtax/clients.php
+++ b/htdocs/compta/localtax/clients.php
@@ -83,7 +83,7 @@ $result = restrictedArea($user, 'tax', '', '', 'charges');
* View
*/
-$html=new Form($db);
+$form=new Form($db);
$company_static=new Societe($db);
$morequerystring='';
@@ -105,7 +105,7 @@ $fsearch.=' ";
print ''.$langs->trans("DatePayment").' ';
- print $html->select_date($datep,"datep",'','','','add');
+ print $form->select_date($datep,"datep",'','','','add');
print ' ';
print ''.$langs->trans("DateValue").' ';
- print $html->select_date($datev,"datev",'','','','add');
+ print $form->select_date($datev,"datev",'','','','add');
print ' '.$langs->trans("Account").' ';
- $html->select_comptes($_POST["accountid"],"accountid",0,"courant=1",1); // Affiche liste des comptes courant
+ $form->select_comptes($_POST["accountid"],"accountid",0,"courant=1",1); // Affiche liste des comptes courant
print ' '.$langs->trans("PaymentMode").' ';
- $html->select_types_paiements($_POST["paiementtype"], "paiementtype");
+ $form->select_types_paiements($_POST["paiementtype"], "paiementtype");
print " \n";
print "'.$langs->trans('Date').' ';
$datepayment = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
$datepayment= ($datepayment == '' ? (empty($conf->global->MAIN_AUTOFILL_DATE)?-1:0) : $datepayment);
- $html->select_date($datepayment,'','','',0,"add_paiement",1,1);
+ $form->select_date($datepayment,'','','',0,"add_paiement",1,1);
print ' ';
print ''.$langs->trans('Comments').' '.$langs->trans('PaymentMode').' ';
- $html->select_types_paiements((GETPOST('paiementcode')?GETPOST('paiementcode'):$facture->mode_reglement_code),'paiementcode','',2);
+ $form->select_types_paiements((GETPOST('paiementcode')?GETPOST('paiementcode'):$facture->mode_reglement_code),'paiementcode','',2);
print " \n";
print '';
print ' ';
@@ -394,7 +394,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
if ($facture->type != 2) print ''.$langs->trans('AccountToCredit').' '.$langs->trans('AccountToDebit').' ';
- $html->select_comptes($accountid,'accountid',0,'',2);
+ $form->select_comptes($accountid,'accountid',0,'',2);
print ' ';
}
else
@@ -604,7 +604,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
$text.=''.$langs->trans('Date').' '.dol_print_date($now,'day').' '.$langs->trans("DateChequeReceived").' ';
- print $html->select_date($filterdate,'fd',0,0,1,'',1,1);
+ print $form->select_date($filterdate,'fd',0,0,1,'',1,1);
print ' '.$langs->trans("BankAccount").' ';
- print $html->select_comptes($filteraccountid,'accountid',0,'courant <> 2',1);
+ print $form->select_comptes($filteraccountid,'accountid',0,'courant <> 2',1);
print '
';
print '';
@@ -448,7 +448,7 @@ else
print '';
print ''.$langs->trans('Ref').' ';
- print $html->showrefnav($remisecheque,'ref',$linkback, 1, 'number');
+ print $form->showrefnav($remisecheque,'ref',$linkback, 1, 'number');
print " ";
print "';
print ''.$langs->trans('Ref').' '.$paiement->id.' '.$html->editfieldkey("Date",'date',$paiement->date,'id',$paiement->id,$user->rights->facture->paiement).' ';
-print $html->editfieldval("Date",'date',$paiement->date,'id',$paiement->id,$user->rights->facture->paiement,'day');
+print ' '.$form->editfieldkey("Date",'date',$paiement->date,$paiement,$user->rights->facture->paiement).' ';
+print $form->editfieldval("Date",'date',$paiement->date,$paiement,$user->rights->facture->paiement,'day');
print ' '.$langs->trans('PaymentMode').' '.$labeltype.' '.$html->editfieldkey("Numero",'num',$paiement->numero,'id',$paiement->id,$paiement->statut == 0 && $user->rights->fournisseur->facture->creer).' ';
-print $html->editfieldval("Numero",'num',$paiement->numero,'id',$paiement->id,$paiement->statut == 0 && $user->rights->fournisseur->facture->creer,'string');
+print ' '.$form->editfieldkey("Numero",'num',$paiement->numero,$paiement,$paiement->statut == 0 && $user->rights->fournisseur->facture->creer).' ';
+print $form->editfieldval("Numero",'num',$paiement->numero,$paiement,$paiement->statut == 0 && $user->rights->fournisseur->facture->creer,'string');
print ' '.$langs->trans('Amount').' '.price($paiement->montant).' '.$langs->trans('Currency'.$conf->monnaie).' '.$html->editfieldkey("Note",'note',$paiement->note,'id',$paiement->id,$user->rights->facture->paiement).' ';
-print $html->editfieldval("Note",'note',$paiement->note,'id',$paiement->id,$user->rights->facture->paiement,'text');
+print ' '.$form->editfieldkey("Note",'note',$paiement->note,$paiement,$user->rights->facture->paiement).' ';
+print $form->editfieldval("Note",'note',$paiement->note,$paiement,$user->rights->facture->paiement,'text');
print ' '.$langs->trans("Date").' ';
$datepaye = dol_mktime(12, 0, 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]);
$datepayment=empty($conf->global->MAIN_AUTOFILL_DATE)?(empty($_POST["remonth"])?-1:$datepaye):0;
- $html->select_date($datepayment,'','','','',"add_payment",1,1);
+ $form->select_date($datepayment,'','','','',"add_payment",1,1);
print " ";
print ''.$langs->trans("Comments").' '.$langs->trans("PaymentMode").' ';
- $html->select_types_paiements(isset($_POST["paiementtype"])?$_POST["paiementtype"]:$charge->paiementtype, "paiementtype");
+ $form->select_types_paiements(isset($_POST["paiementtype"])?$_POST["paiementtype"]:$charge->paiementtype, "paiementtype");
print " \n";
print '';
print ''.$langs->trans('AccountToDebit').' ';
print '';
- $html->select_comptes(isset($_POST["accountid"])?$_POST["accountid"]:$charge->accountid, "accountid", 0, '',1); // Show opend bank account list
+ $form->select_comptes(isset($_POST["accountid"])?$_POST["accountid"]:$charge->accountid, "accountid", 0, '',1); // Show opend bank account list
print ' ';
print ''.$langs->trans('Numero');
diff --git a/htdocs/compta/payment_sc/fiche.php b/htdocs/compta/payment_sc/fiche.php
index 577fe00342b..6c4a53fbb51 100644
--- a/htdocs/compta/payment_sc/fiche.php
+++ b/htdocs/compta/payment_sc/fiche.php
@@ -124,7 +124,7 @@ if ($result <= 0)
exit;
}
-$html = new Form($db);
+$form = new Form($db);
$h=0;
@@ -146,7 +146,7 @@ dol_fiche_head($head, $hselected, $langs->trans("PaymentSocialContribution"), 0,
*/
if ($_GET['action'] == 'delete')
{
- $ret=$html->form_confirm('fiche.php?id='.$paiement->id, $langs->trans("DeletePayment"), $langs->trans("ConfirmDeletePayment"), 'confirm_delete','',0,2);
+ $ret=$form->form_confirm('fiche.php?id='.$paiement->id, $langs->trans("DeletePayment"), $langs->trans("ConfirmDeletePayment"), 'confirm_delete','',0,2);
if ($ret == 'html') print '';
// Ref
print ''.$langs->trans('Ref').' ';
print '';
-print $html->showrefnav($paiement,'id','',1,'rowid','id');
+print $form->showrefnav($paiement,'id','',1,'rowid','id');
print ' ';
print ''.$langs->trans("NotifyTransmision").' ';
print ''.$langs->trans("TransData").' ';
- print $html->select_date('','','','','',"userfile");
+ print $form->select_date('','','','','',"userfile");
print ' '.$langs->trans("TransMetod").' ';
- print $html->selectarray("methode",$bon->methodes_trans);
+ print $form->selectarray("methode",$bon->methodes_trans);
print ' '.$langs->trans("File").' ';
print ' ';
print ''.$langs->trans("NotifyCredit").' ';
print ''.$langs->trans('CreditDate').' ';
- print $html->select_date('','','','','',"infocredit");
+ print $form->select_date('','','','','',"infocredit");
print '
'.$langs->trans("WithdrawalRefusedConfirm").' '.$soc->nom.' ? ';
print '';
- print $html->selectyesno("confirm",1,0);
+ print $form->selectyesno("confirm",1,0);
print ' '.$langs->trans("RefusedData").' ';
print '';
- print $html->select_date('','','','','',"confirm_rejet");
+ print $form->select_date('','','','','',"confirm_rejet");
print ' '.$langs->trans("RefusedReason").' ';
print '';
- print $html->selectarray("motif", $rej->motifs);
+ print $form->selectarray("motif", $rej->motifs);
print ' '.$langs->trans("RefusedInvoicing").' ';
print '';
- print $html->selectarray("facturer", $rej->facturer);
+ print $form->selectarray("facturer", $rej->facturer);
print '
'.$langs->trans('Ref').' ';
- print $html->showrefnav($object,'ref',$linkback,1,'ref','ref','');
+ print $form->showrefnav($object,'ref',$linkback,1,'ref','ref','');
print ' ';
if ($action == 'editconditions')
{
- $html->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->cond_reglement_id,'cond_reglement_id');
+ $form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->cond_reglement_id,'cond_reglement_id');
}
else
{
- $html->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->cond_reglement_id,'none');
+ $form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->cond_reglement_id,'none');
}
print ' ';
@@ -235,11 +235,11 @@ if ($id > 0 || ! empty($ref))
print '';
if ($action == 'editmode')
{
- $html->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->mode_reglement_id,'mode_reglement_id');
+ $form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->mode_reglement_id,'mode_reglement_id');
}
else
{
- $html->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->mode_reglement_id,'none');
+ $form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->mode_reglement_id,'none');
}
print ' ';
@@ -257,11 +257,11 @@ if ($id > 0 || ! empty($ref))
print '';
if ($action == 'classify')
{
- $html->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'projectid');
+ $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'projectid');
}
else
{
- $html->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none');
+ $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none');
}
print ' ';
}
@@ -385,7 +385,7 @@ if ($id > 0 || ! empty($ref))
$text=$product_static->getNomUrl(1);
$text.= ' - '.$objp->product_label;
$description=($conf->global->PRODUIT_DESC_IN_FORM?'':dol_htmlentitiesbr($objp->description));
- print $html->textwithtooltip($text,$description,3,'','',$i);
+ print $form->textwithtooltip($text,$description,3,'','',$i);
// Show range
print_date_range($objp->date_start,$objp->date_end);
@@ -624,7 +624,7 @@ else
print '';
- $html->select_propal_statut($viewstatut);
+ $form->select_propal_statut($viewstatut);
print ' ';
print '',' ').')';
- $period=$html->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$html->select_date($date_end,'date_end',0,0,0,'',1,0,1);
+ $period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1);
//$periodlink=''.img_previous().' '.img_next().' ';
$description=$langs->trans("RulesResultDue");
$builddate=time();
@@ -114,8 +114,8 @@ if ($modecompta=="CREANCES-DETTES")
else {
$nom=$langs->trans("AnnualByCompaniesInputOutputMode");
$nom.='',' ').')';
- //$period=$html->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$html->select_date($date_end,'date_end',1,1,0,'',1,0,1);
- $period=$html->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$html->select_date($date_end,'date_end',0,0,0,'',1,0,1);
+ //$period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',1,1,0,'',1,0,1);
+ $period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1);
//$periodlink=''.img_previous().' '.img_next().' ';
$description=$langs->trans("RulesResultInOut");
$builddate=time();
diff --git a/htdocs/compta/resultat/index.php b/htdocs/compta/resultat/index.php
index 35f3e1aedfe..df660159417 100644
--- a/htdocs/compta/resultat/index.php
+++ b/htdocs/compta/resultat/index.php
@@ -55,7 +55,7 @@ if ($_GET["modecompta"]) $modecompta=$_GET["modecompta"];
llxHeader();
-$html=new Form($db);
+$form=new Form($db);
// Affiche en-tete du rapport
if ($modecompta=="CREANCES-DETTES")
diff --git a/htdocs/compta/sociales/charges.php b/htdocs/compta/sociales/charges.php
index e173fb38739..565f5a933bd 100644
--- a/htdocs/compta/sociales/charges.php
+++ b/htdocs/compta/sociales/charges.php
@@ -169,7 +169,7 @@ if ($_GET["action"] == 'update' && ! $_POST["cancel"] && $user->rights->tax->cha
llxHeader('',$langs->trans("SocialContribution"));
-$html = new Form($db);
+$form = new Form($db);
// Mode creation
if ($_GET["action"] == 'create')
@@ -213,18 +213,18 @@ if ($_GET["action"] == 'create')
// Type
print '';
- $html->select_type_socialcontrib(isset($_POST["actioncode"])?$_POST["actioncode"]:'','actioncode',1);
+ $form->select_type_socialcontrib(isset($_POST["actioncode"])?$_POST["actioncode"]:'','actioncode',1);
print ' ';
// Date end period
print '';
- print $html->select_date(! empty($dateperiod)?$dateperiod:'-1', 'period', 0, 0, 0, 'charge', 1);
+ print $form->select_date(! empty($dateperiod)?$dateperiod:'-1', 'period', 0, 0, 0, 'charge', 1);
print ' ';
print '';
- print $html->select_date(! empty($dateech)?$dateech:'-1', 'ech', 0, 0, 0, 'charge', 1);
+ print $form->select_date(! empty($dateech)?$dateech:'-1', 'ech', 0, 0, 0, 'charge', 1);
print ' ';
print '".$langs->trans("Ref").' ';
- print $html->showrefnav($cha,'id');
+ print $form->showrefnav($cha,'id');
print " ";
if ($_GET['action'] == 'edit')
{
- print $html->select_date($cha->periode, 'period', 0, 0, 0, 'charge', 1);
+ print $form->select_date($cha->periode, 'period', 0, 0, 0, 'charge', 1);
}
else
{
@@ -382,7 +382,7 @@ if ($chid > 0)
if ($_GET['action'] == 'edit')
{
print ' '.$langs->trans("DateDue")." ";
- print $html->select_date($cha->date_ech, 'ech', 0, 0, 0, 'charge', 1);
+ print $form->select_date($cha->date_ech, 'ech', 0, 0, 0, 'charge', 1);
print " ';
- $html->select_type_socialcontrib($typeid,'typeid',1,16,0);
+ $form->select_type_socialcontrib($typeid,'typeid',1,16,0);
print ' ';
// Period end date
print ' ';
diff --git a/htdocs/compta/stats/cabyuser.php b/htdocs/compta/stats/cabyuser.php
index da20dd3a7cd..c0f2a76c933 100644
--- a/htdocs/compta/stats/cabyuser.php
+++ b/htdocs/compta/stats/cabyuser.php
@@ -99,14 +99,14 @@ else
llxHeader();
-$html=new Form($db);
+$form=new Form($db);
// Affiche en-tete du rapport
if ($modecompta=="CREANCES-DETTES")
{
$nom=$langs->trans("SalesTurnover").', '.$langs->trans("ByUserAuthorOfInvoice");
$nom.='',' ').')';
- $period=$html->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$html->select_date($date_end,'date_end',0,0,0,'',1,0,1);
+ $period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1);
//$periodlink="".img_previous()." ".img_next()." ";
$description=$langs->trans("RulesCADue");
$builddate=time();
@@ -115,7 +115,7 @@ if ($modecompta=="CREANCES-DETTES")
else {
$nom=$langs->trans("SalesTurnover").', '.$langs->trans("ByUserAuthorOfInvoice");
$nom.='',' ').')';
- $period=$html->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$html->select_date($date_end,'date_end',0,0,0,'',1,0,1);
+ $period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1);
//$periodlink="".img_previous()." ".img_next()." ";
$description=$langs->trans("RulesCAIn");
$builddate=time();
diff --git a/htdocs/compta/stats/casoc.php b/htdocs/compta/stats/casoc.php
index 4fbdbd7eaed..521045f1516 100644
--- a/htdocs/compta/stats/casoc.php
+++ b/htdocs/compta/stats/casoc.php
@@ -102,14 +102,14 @@ else
llxHeader();
-$html=new Form($db);
+$form=new Form($db);
// Affiche en-tete de rapport
if ($modecompta=="CREANCES-DETTES")
{
$nom=$langs->trans("SalesTurnover").', '.$langs->trans("ByThirdParties");
$nom.='',' ').')';
- $period=$html->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$html->select_date($date_end,'date_end',0,0,0,'',1,0,1);
+ $period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1);
//$periodlink=''.img_previous().' '.img_next().' ';
$description=$langs->trans("RulesCADue");
$builddate=time();
@@ -118,7 +118,7 @@ if ($modecompta=="CREANCES-DETTES")
else {
$nom=$langs->trans("SalesTurnover").', '.$langs->trans("ByThirdParties");
$nom.='',' ').')';
- $period=$html->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$html->select_date($date_end,'date_end',0,0,0,'',1,0,1);
+ $period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1);
//$periodlink=''.img_previous().' '.img_next().' ';
$description=$langs->trans("RulesCAIn");
$builddate=time();
diff --git a/htdocs/compta/stats/index.php b/htdocs/compta/stats/index.php
index a243cfedc34..52c571298ce 100644
--- a/htdocs/compta/stats/index.php
+++ b/htdocs/compta/stats/index.php
@@ -54,7 +54,7 @@ if ($_GET["modecompta"]) $modecompta=$_GET["modecompta"];
*/
llxHeader();
-$html=new Form($db);
+$form=new Form($db);
// Affiche en-tete du rapport
if ($modecompta=="CREANCES-DETTES")
diff --git a/htdocs/compta/tva/clients.php b/htdocs/compta/tva/clients.php
index 2a407140eb8..c6ee70849bf 100644
--- a/htdocs/compta/tva/clients.php
+++ b/htdocs/compta/tva/clients.php
@@ -88,7 +88,7 @@ $result = restrictedArea($user, 'tax', '', '', 'charges');
* View
*/
-$html=new Form($db);
+$form=new Form($db);
$company_static=new Societe($db);
$morequerystring='';
@@ -111,7 +111,7 @@ if ($modetax==1) // Calculate on invoice for goods and services
{
$nom=$langs->trans("VATReportByCustomersInDueDebtMode");
//$nom.='',' ').')';
- $period=$html->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$html->select_date($date_end,'date_end',0,0,0,'',1,0,1);
+ $period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1);
//$periodlink=($year_start?"".img_previous()." ".img_next()." ":"");
$description=$langs->trans("RulesVATDue");
//if ($conf->global->MAIN_MODULE_COMPTABILITE || $conf->global->MAIN_MODULE_ACCOUNTING) $description.='',' ').')';
- $period=$html->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$html->select_date($date_end,'date_end',0,0,0,'',1,0,1);
+ $period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1);
//$periodlink=($year_start?"".img_previous()." ".img_next()." ":"");
$description=$langs->trans("RulesVATIn");
//if ($conf->global->MAIN_MODULE_COMPTABILITE || $conf->global->MAIN_MODULE_ACCOUNTING) $description.='";
print ''.$langs->trans("DatePayment").' ';
- print $html->select_date($datep,"datep",'','','','add');
+ print $form->select_date($datep,"datep",'','','','add');
print ' ';
print ''.$langs->trans("DateValue").' ';
- print $html->select_date($datev,"datev",'','','','add');
+ print $form->select_date($datev,"datev",'','','','add');
print ' '.$langs->trans("Account").' ';
- $html->select_comptes($_POST["accountid"],"accountid",0,"courant=1",1); // Affiche liste des comptes courant
+ $form->select_comptes($_POST["accountid"],"accountid",0,"courant=1",1); // Affiche liste des comptes courant
print ' '.$langs->trans("PaymentMode").' ';
- $html->select_types_paiements($_POST["paiementtype"], "paiementtype");
+ $form->select_types_paiements($_POST["paiementtype"], "paiementtype");
print " \n";
print "'.$langs->trans("DateToBirth").' ';
- $html=new Form($db);
+ $form=new Form($db);
if ($object->birthday)
{
- print $html->select_date($object->birthday,'birthday',0,0,0,"perso");
+ print $form->select_date($object->birthday,'birthday',0,0,0,"perso");
}
else
{
- print $html->select_date('','birthday',0,0,1,"perso");
+ print $form->select_date('','birthday',0,0,1,"perso");
}
print ' ';
diff --git a/htdocs/contact/perso.php b/htdocs/contact/perso.php
index 9b6481b309b..50376df2e5c 100644
--- a/htdocs/contact/perso.php
+++ b/htdocs/contact/perso.php
@@ -131,8 +131,8 @@ if ($_GET["action"] == 'edit')
// Date To Birth
print ''.$langs->trans("DateToBirth").' ';
- $html=new Form($db);
- print $html->select_date($contact->birthday,'birthday',0,0,1,"perso");
+ $form=new Form($db);
+ print $form->select_date($contact->birthday,'birthday',0,0,1,"perso");
print ' ';
print ''.$langs->trans("Alert").': ';
diff --git a/htdocs/contrat/contact.php b/htdocs/contrat/contact.php
index bee4163db93..938010289ee 100644
--- a/htdocs/contrat/contact.php
+++ b/htdocs/contrat/contact.php
@@ -108,7 +108,7 @@ if ($_GET["action"] == 'deleteline' && $user->rights->contrat->creer)
llxHeader('', $langs->trans("ContractCard"), "Contrat");
-$html = new Form($db);
+$form = new Form($db);
$formcompany= new FormCompany($db);
$contactstatic=new Contact($db);
$userstatic=new User($db);
@@ -208,7 +208,7 @@ if ($id > 0)
print ' ';
//$userAlreadySelected = $contrat->getListContactId('internal'); // On ne doit pas desactiver un contact deja selectionner car on doit pouvoir le seclectionner une deuxieme fois pour un autre type
- $html->select_users($user->id,'contactid',0,$userAlreadySelected);
+ $form->select_users($user->id,'contactid',0,$userAlreadySelected);
print ' ';
print '';
$formcompany->selectTypeContact($contrat, '', 'type','internal');
@@ -238,7 +238,7 @@ if ($id > 0)
print ' ';
print '';
- $nbofcontacts=$html->select_contacts($selectedCompany, '', 'contactid');
+ $nbofcontacts=$form->select_contacts($selectedCompany, '', 'contactid');
if ($nbofcontacts == 0) print $langs->trans("NoContactDefined");
print ' ';
print '';
diff --git a/htdocs/contrat/document.php b/htdocs/contrat/document.php
index c8a7e6b6b0c..528106c56e7 100644
--- a/htdocs/contrat/document.php
+++ b/htdocs/contrat/document.php
@@ -102,7 +102,7 @@ if ($_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC))
*
*/
-$html = new Form($db);
+$form = new Form($db);
llxHeader("","",$langs->trans("CardProduct".$product->type));
diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php
index beccf9a85f8..33496cef4a0 100644
--- a/htdocs/contrat/fiche.php
+++ b/htdocs/contrat/fiche.php
@@ -464,7 +464,7 @@ if ($action == 'confirm_move' && $_REQUEST["confirm"] == 'yes')
llxHeader('',$langs->trans("ContractCard"),"Contrat");
$form = new Form($db);
-$html = new Form($db);
+$form = new Form($db);
$objectlignestatic=new ContratLigne($db);
@@ -644,7 +644,7 @@ else
// Ref du contrat
print ' '.$langs->trans("Ref").' ';
- print $html->showrefnav($object,'ref','',1,'ref','ref','');
+ print $form->showrefnav($object,'ref','',1,'ref','ref','');
print " '.$langs->trans("DateServiceActivate").' ';
- print $html->select_date($dateactstart,'',$usehm,$usehm,'',"active");
+ print $form->select_date($dateactstart,'',$usehm,$usehm,'',"active");
print ' ';
print ''.$langs->trans("DateEndPlanned").' ';
- print $html->select_date($dateactend,"end",$usehm,$usehm,'',"active");
+ print $form->select_date($dateactend,"end",$usehm,$usehm,'',"active");
print ' ';
print '';
diff --git a/htdocs/contrat/note.php b/htdocs/contrat/note.php
index 8c4cc75f721..6554e5ad8c1 100644
--- a/htdocs/contrat/note.php
+++ b/htdocs/contrat/note.php
@@ -88,7 +88,7 @@ if ($_POST["action"] == 'update' && $user->rights->contrat->creer)
llxHeader();
-$html = new Form($db);
+$form = new Form($db);
if ($_GET["id"])
{
diff --git a/htdocs/core/ajax/loadinplace.php b/htdocs/core/ajax/loadinplace.php
index e4ea090d0cf..166d6d3507d 100644
--- a/htdocs/core/ajax/loadinplace.php
+++ b/htdocs/core/ajax/loadinplace.php
@@ -66,8 +66,18 @@ if((isset($_GET['field']) && ! empty($_GET['field']))
$cachename = 'cache_'.GETPOST('method');
$form = new Form($db);
- $ret = $form->$methodname();
- if ($ret > 0) echo json_encode($form->$cachename);
+ if (method_exists($form, $methodname))
+ {
+ $ret = $form->$methodname();
+ if ($ret > 0) echo json_encode($form->$cachename);
+ }
+ else
+ {
+ dol_include_once('/'.$element.'/class/'.$element.'.class.php');
+ $classname = ucfirst($element);
+ $object = new $classname($db);
+ print_r($object);
+ }
}
else
{
diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index fc392775744..20f12c52180 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -63,10 +63,10 @@ class CMailFile
var $bodyCSS;
// Image
- var $html;
+ var $form;
var $image_boundary;
var $atleastoneimage=0;
- var $html_images=array();
+ var $form_images=array();
var $images_encoded=array();
var $image_types = array('gif' => 'image/gif',
'jpg' => 'image/jpeg',
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index ab459e2c2fc..8893dbdbbbd 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -1908,12 +1908,12 @@ abstract class CommonObject
* @param int $dateSelector 1=Show also date range input fields
* @param Societe $seller Object thirdparty who sell
* @param Societe $buyer Object thirdparty who buy
- * @param HookManager $hookmanager Hook manager instance
- */
- function formAddPredefinedProduct($dateSelector,$seller,$buyer,$hookmanager=false)
- {
- global $conf,$langs,$object;
- global $html,$bcnd,$var;
+ * @param HookManager $hookmanager Hook manager instance
+ */
+ function formAddPredefinedProduct($dateSelector,$seller,$buyer,$hookmanager=false)
+ {
+ global $conf,$langs,$object;
+ global $form,$bcnd,$var;
// Use global variables + $dateSelector + $seller and $buyer
include(DOL_DOCUMENT_ROOT.'/core/tpl/predefinedproductline_create.tpl.php');
@@ -1929,10 +1929,10 @@ abstract class CommonObject
* @param Societe $buyer Object thirdparty who buy
* @param HookManager $hookmanager Hook manager instance
*/
- function formAddFreeProduct($dateSelector,$seller,$buyer,$hookmanager=false)
- {
- global $conf,$langs,$object;
- global $html,$bcnd,$var;
+ function formAddFreeProduct($dateSelector,$seller,$buyer,$hookmanager=false)
+ {
+ global $conf,$langs,$object;
+ global $form,$bcnd,$var;
// Use global variables + $dateSelector + $seller and $buyer
include(DOL_DOCUMENT_ROOT.'/core/tpl/freeproductline_create.tpl.php');
@@ -2031,11 +2031,11 @@ abstract class CommonObject
* @param $seller Object of seller third party
* @param $buyer Object of buyer third party
* @param $selected Object line selected
- */
- function printLine($action='viewline',$line,$var=true,$num=0,$i=0,$dateSelector=0,$seller,$buyer,$selected=0,$hookmanager=false)
- {
- global $conf,$langs,$user;
- global $html,$bc,$bcdd;
+ */
+ function printLine($action='viewline',$line,$var=true,$num=0,$i=0,$dateSelector=0,$seller,$buyer,$selected=0,$hookmanager=false)
+ {
+ global $conf,$langs,$user;
+ global $form,$bc,$bcdd;
$element = $this->element;
if ($element == 'propal') $element = 'propale'; // To work with non standard path
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 3d75a31e99f..0983d2940da 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -68,16 +68,15 @@ class Form
/**
* Output key field for an editable field
*
- * @param string $text Text of label or key to translate
- * @param string $htmlname Name of select field
- * @param string $preselected Value to show/edit
- * @param string $paramkey Key of parameter for Url (unique if there is several parameter to show). In most cases "id".
- * @param string $paramvalue Value of parameter for Url
- * @param boolean $perm Permission to allow button to edit parameter
+ * @param string $text Text of label or key to translate
+ * @param string $htmlname Name of select field
+ * @param string $preselected Name of Value to show/edit (not used in this function)
+ * @param object $object Object
+ * @param boolean $perm Permission to allow button to edit parameter
* @param string $typeofdata Type of data ('string' by default, 'email', 'numeric:99', 'text' or 'textarea', 'day' or 'datepicker', 'ckeditor:dolibarr_zzz:width:height', 'select:xxx'...)
- * @return string HTML edit field
+ * @return string HTML edit field
*/
- function editfieldkey($text,$htmlname,$preselected,$paramkey,$paramvalue,$perm,$typeofdata='string')
+ function editfieldkey($text,$htmlname,$preselected,$object,$perm,$typeofdata='string')
{
global $conf,$langs;
@@ -102,7 +101,7 @@ class Form
$ret.='';
}
@@ -115,13 +114,13 @@ class Form
* @param string $text Text of label (not used in this function)
* @param string $htmlname Name of select field
* @param string $value Value to show/edit
- * @param string $paramkey Key of parameter (unique if there is several parameter to show). In most cases "id".
+ * @param object $object Object
* @param boolean $perm Permission to allow button to edit parameter
* @param string $typeofdata Type of data ('string' by default, 'email', 'numeric:99', 'text' or 'textarea', 'day' or 'datepicker', 'ckeditor:dolibarr_zzz:width:height', 'select:xxx'...)
* @param string $editvalue When in edit mode, use this value as $value instead of value
- * @return string HTML edit field
+ * @return string HTML edit field
*/
- function editfieldval($text,$htmlname,$value,$paramkey,$paramvalue,$perm,$typeofdata='string',$editvalue='')
+ function editfieldval($text,$htmlname,$value,$object,$perm,$typeofdata='string',$editvalue='')
{
global $conf,$langs,$db;
$ret='';
@@ -129,7 +128,7 @@ class Form
// When option to edit inline is activated
if (! empty($conf->global->MAIN_USE_JQUERY_JEDITABLE))
{
- $ret.=$this->editInPlace($value, $htmlname, $perm, $typeofdata);
+ $ret.=$this->editInPlace($object, $value, $htmlname, $perm, $typeofdata);
}
else
{
@@ -139,7 +138,7 @@ class Form
$ret.='