alxarafe / alixar

dolibarr/htdocs/core/ajax/selectsearchbox.php

Indentation +24 added lines, -24 removed lines

@@ -35,11 +35,11 @@ 
     $res=@include '../../main.inc.php';
     if ($res == 'ERROR_NOT_LOGGED')
     {
-    	$langs->load("other");
-    	$arrayresult['jumptologin']=array('img'=>'object_generic', 'label'=>$langs->trans("JumpToLogin"), 'text'=>'<span class="fa fa-sign-in"></span> '.$langs->trans("JumpToLogin"), 'url'=>DOL_URL_ROOT.'/index.php');
-    	print json_encode($arrayresult);
-    	if (is_object($db)) $db->close();
-    	exit;
+        $langs->load("other");
+        $arrayresult['jumptologin']=array('img'=>'object_generic', 'label'=>$langs->trans("JumpToLogin"), 'text'=>'<span class="fa fa-sign-in"></span> '.$langs->trans("JumpToLogin"), 'url'=>DOL_URL_ROOT.'/index.php');
+        print json_encode($arrayresult);
+        if (is_object($db)) $db->close();
+        exit;
     }
 }
 
@@ -56,85 +56,85 @@ 
 
 if (! empty($conf->adherent->enabled) && empty($conf->global->MAIN_SEARCHFORM_ADHERENT_DISABLED) && $user->rights->adherent->lire)
 {
-	$arrayresult['searchintomember']=array('position'=>8, 'shortcut'=>'M', 'img'=>'object_user', 'label'=>$langs->trans("SearchIntoMembers", $search_boxvalue), 'text'=>img_picto('','object_user').' '.$langs->trans("SearchIntoMembers", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/adherents/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
+    $arrayresult['searchintomember']=array('position'=>8, 'shortcut'=>'M', 'img'=>'object_user', 'label'=>$langs->trans("SearchIntoMembers", $search_boxvalue), 'text'=>img_picto('','object_user').' '.$langs->trans("SearchIntoMembers", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/adherents/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
 }
 
 if ((( ! empty($conf->societe->enabled) && (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))) || ! empty($conf->fournisseur->enabled)) && empty($conf->global->MAIN_SEARCHFORM_SOCIETE_DISABLED) && $user->rights->societe->lire)
 {
-	$arrayresult['searchintothirdparty']=array('position'=>10, 'shortcut'=>'T', 'img'=>'object_company', 'label'=>$langs->trans("SearchIntoThirdparties", $search_boxvalue), 'text'=>img_picto('','object_company').' '.$langs->trans("SearchIntoThirdparties", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/societe/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
+    $arrayresult['searchintothirdparty']=array('position'=>10, 'shortcut'=>'T', 'img'=>'object_company', 'label'=>$langs->trans("SearchIntoThirdparties", $search_boxvalue), 'text'=>img_picto('','object_company').' '.$langs->trans("SearchIntoThirdparties", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/societe/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
 }
 
 if (! empty($conf->societe->enabled) && empty($conf->global->MAIN_SEARCHFORM_CONTACT_DISABLED) && $user->rights->societe->lire)
 {
-	$arrayresult['searchintocontact']=array('position'=>15, 'shortcut'=>'A', 'img'=>'object_contact', 'label'=>$langs->trans("SearchIntoContacts", $search_boxvalue), 'text'=>img_picto('','object_contact').' '.$langs->trans("SearchIntoContacts", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/contact/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
+    $arrayresult['searchintocontact']=array('position'=>15, 'shortcut'=>'A', 'img'=>'object_contact', 'label'=>$langs->trans("SearchIntoContacts", $search_boxvalue), 'text'=>img_picto('','object_contact').' '.$langs->trans("SearchIntoContacts", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/contact/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
 }
 
 if (((! empty($conf->product->enabled) && $user->rights->produit->lire) || (! empty($conf->service->enabled) && $user->rights->service->lire))
 && empty($conf->global->MAIN_SEARCHFORM_PRODUITSERVICE_DISABLED))
 {
-	$arrayresult['searchintoproduct']=array('position'=>30, 'shortcut'=>'P', 'img'=>'object_product', 'label'=>$langs->trans("SearchIntoProductsOrServices", $search_boxvalue),'text'=>img_picto('','object_product').' '.$langs->trans("SearchIntoProductsOrServices", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/product/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
+    $arrayresult['searchintoproduct']=array('position'=>30, 'shortcut'=>'P', 'img'=>'object_product', 'label'=>$langs->trans("SearchIntoProductsOrServices", $search_boxvalue),'text'=>img_picto('','object_product').' '.$langs->trans("SearchIntoProductsOrServices", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/product/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
 }
 
 if (! empty($conf->projet->enabled) && empty($conf->global->MAIN_SEARCHFORM_PROJECT_DISABLED) && $user->rights->projet->lire)
 {
-	$arrayresult['searchintoprojects']=array('position'=>40, 'shortcut'=>'Q', 'img'=>'object_projectpub', 'label'=>$langs->trans("SearchIntoProjects", $search_boxvalue), 'text'=>img_picto('','object_projectpub').' '.$langs->trans("SearchIntoProjects", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/projet/list.php'.($search_boxvalue?'?search_all='.urlencode($search_boxvalue):''));
+    $arrayresult['searchintoprojects']=array('position'=>40, 'shortcut'=>'Q', 'img'=>'object_projectpub', 'label'=>$langs->trans("SearchIntoProjects", $search_boxvalue), 'text'=>img_picto('','object_projectpub').' '.$langs->trans("SearchIntoProjects", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/projet/list.php'.($search_boxvalue?'?search_all='.urlencode($search_boxvalue):''));
 }
 if (! empty($conf->projet->enabled) && empty($conf->global->MAIN_SEARCHFORM_TASK_DISABLED) && $user->rights->projet->lire)
 {
-	$arrayresult['searchintotasks']=array('position'=>45, 'img'=>'object_task', 'label'=>$langs->trans("SearchIntoTasks", $search_boxvalue), 'text'=>img_picto('','object_task').' '.$langs->trans("SearchIntoTasks", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/projet/tasks/list.php'.($search_boxvalue?'?search_all='.urlencode($search_boxvalue):''));
+    $arrayresult['searchintotasks']=array('position'=>45, 'img'=>'object_task', 'label'=>$langs->trans("SearchIntoTasks", $search_boxvalue), 'text'=>img_picto('','object_task').' '.$langs->trans("SearchIntoTasks", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/projet/tasks/list.php'.($search_boxvalue?'?search_all='.urlencode($search_boxvalue):''));
 }
 
 if (! empty($conf->propal->enabled) && empty($conf->global->MAIN_SEARCHFORM_CUSTOMER_PROPAL_DISABLED) && $user->rights->propal->lire)
 {
-	$arrayresult['searchintopropal']=array('position'=>60, 'img'=>'object_propal', 'label'=>$langs->trans("SearchIntoCustomerProposals", $search_boxvalue), 'text'=>img_picto('','object_propal').' '.$langs->trans("SearchIntoCustomerProposals", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/comm/propal/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
+    $arrayresult['searchintopropal']=array('position'=>60, 'img'=>'object_propal', 'label'=>$langs->trans("SearchIntoCustomerProposals", $search_boxvalue), 'text'=>img_picto('','object_propal').' '.$langs->trans("SearchIntoCustomerProposals", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/comm/propal/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
 }
 if (! empty($conf->commande->enabled) && empty($conf->global->MAIN_SEARCHFORM_CUSTOMER_ORDER_DISABLED) && $user->rights->commande->lire)
 {
-	$arrayresult['searchintoorder']=array('position'=>70, 'img'=>'object_order', 'label'=>$langs->trans("SearchIntoCustomerOrders", $search_boxvalue), 'text'=>img_picto('','object_order').' '.$langs->trans("SearchIntoCustomerOrders", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/commande/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
+    $arrayresult['searchintoorder']=array('position'=>70, 'img'=>'object_order', 'label'=>$langs->trans("SearchIntoCustomerOrders", $search_boxvalue), 'text'=>img_picto('','object_order').' '.$langs->trans("SearchIntoCustomerOrders", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/commande/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
 }
 if (! empty($conf->expedition->enabled) && empty($conf->global->MAIN_SEARCHFORM_CUSTOMER_SHIPMENT_DISABLED) && $user->rights->expedition->lire)
 {
-	$arrayresult['searchintoshipment']=array('position'=>80, 'img'=>'object_sending', 'label'=>$langs->trans("SearchIntoCustomerShipments", $search_boxvalue), 'text'=>img_picto('','object_sending').' '.$langs->trans("SearchIntoCustomerShipments", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/expedition/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
+    $arrayresult['searchintoshipment']=array('position'=>80, 'img'=>'object_sending', 'label'=>$langs->trans("SearchIntoCustomerShipments", $search_boxvalue), 'text'=>img_picto('','object_sending').' '.$langs->trans("SearchIntoCustomerShipments", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/expedition/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
 }
 if (! empty($conf->facture->enabled) && empty($conf->global->MAIN_SEARCHFORM_CUSTOMER_INVOICE_DISABLED) && $user->rights->facture->lire)
 {
-	$arrayresult['searchintoinvoice']=array('position'=>90, 'img'=>'object_bill', 'label'=>$langs->trans("SearchIntoCustomerInvoices", $search_boxvalue), 'text'=>img_picto('','object_bill').' '.$langs->trans("SearchIntoCustomerInvoices", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/compta/facture/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
+    $arrayresult['searchintoinvoice']=array('position'=>90, 'img'=>'object_bill', 'label'=>$langs->trans("SearchIntoCustomerInvoices", $search_boxvalue), 'text'=>img_picto('','object_bill').' '.$langs->trans("SearchIntoCustomerInvoices", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/compta/facture/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
 }
 
 if (! empty($conf->supplier_proposal->enabled) && empty($conf->global->MAIN_SEARCHFORM_SUPPLIER_PROPAL_DISABLED) && $user->rights->supplier_proposal->lire)
 {
-	$arrayresult['searchintosupplierpropal']=array('position'=>100, 'img'=>'object_propal', 'label'=>$langs->trans("SearchIntoSupplierProposals", $search_boxvalue), 'text'=>img_picto('','object_propal').' '.$langs->trans("SearchIntoSupplierProposals", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/supplier_proposal/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
+    $arrayresult['searchintosupplierpropal']=array('position'=>100, 'img'=>'object_propal', 'label'=>$langs->trans("SearchIntoSupplierProposals", $search_boxvalue), 'text'=>img_picto('','object_propal').' '.$langs->trans("SearchIntoSupplierProposals", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/supplier_proposal/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
 }
 if (! empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_SEARCHFORM_SUPPLIER_ORDER_DISABLED) && $user->rights->fournisseur->commande->lire)
 {
-	$arrayresult['searchintosupplierorder']=array('position'=>110, 'img'=>'object_order', 'label'=>$langs->trans("SearchIntoSupplierOrders", $search_boxvalue), 'text'=>img_picto('','object_order').' '.$langs->trans("SearchIntoSupplierOrders", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fourn/commande/list.php'.($search_boxvalue?'?search_all='.urlencode($search_boxvalue):''));
+    $arrayresult['searchintosupplierorder']=array('position'=>110, 'img'=>'object_order', 'label'=>$langs->trans("SearchIntoSupplierOrders", $search_boxvalue), 'text'=>img_picto('','object_order').' '.$langs->trans("SearchIntoSupplierOrders", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fourn/commande/list.php'.($search_boxvalue?'?search_all='.urlencode($search_boxvalue):''));
 }
 if (! empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_SEARCHFORM_SUPPLIER_INVOICE_DISABLED) && $user->rights->fournisseur->facture->lire)
 {
-	$arrayresult['searchintosupplierinvoice']=array('position'=>120, 'img'=>'object_bill', 'label'=>$langs->trans("SearchIntoSupplierInvoices", $search_boxvalue), 'text'=>img_picto('','object_bill').' '.$langs->trans("SearchIntoSupplierInvoices", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fourn/facture/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
+    $arrayresult['searchintosupplierinvoice']=array('position'=>120, 'img'=>'object_bill', 'label'=>$langs->trans("SearchIntoSupplierInvoices", $search_boxvalue), 'text'=>img_picto('','object_bill').' '.$langs->trans("SearchIntoSupplierInvoices", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fourn/facture/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
 }
 
 if (! empty($conf->contrat->enabled) && empty($conf->global->MAIN_SEARCHFORM_CONTRACT_DISABLED) && $user->rights->contrat->lire)
 {
-	$arrayresult['searchintocontract']=array('position'=>130, 'img'=>'object_contract', 'label'=>$langs->trans("SearchIntoContracts", $search_boxvalue), 'text'=>img_picto('','object_contract').' '.$langs->trans("SearchIntoContracts", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/contrat/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
+    $arrayresult['searchintocontract']=array('position'=>130, 'img'=>'object_contract', 'label'=>$langs->trans("SearchIntoContracts", $search_boxvalue), 'text'=>img_picto('','object_contract').' '.$langs->trans("SearchIntoContracts", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/contrat/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
 }
 if (! empty($conf->ficheinter->enabled) && empty($conf->global->MAIN_SEARCHFORM_FICHINTER_DISABLED) && $user->rights->ficheinter->lire)
 {
-	$arrayresult['searchintointervention']=array('position'=>140, 'img'=>'object_intervention', 'label'=>$langs->trans("SearchIntoInterventions", $search_boxvalue), 'text'=>img_picto('','object_intervention').' '.$langs->trans("SearchIntoInterventions", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fichinter/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
+    $arrayresult['searchintointervention']=array('position'=>140, 'img'=>'object_intervention', 'label'=>$langs->trans("SearchIntoInterventions", $search_boxvalue), 'text'=>img_picto('','object_intervention').' '.$langs->trans("SearchIntoInterventions", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fichinter/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
 }
 
 // HR
 if (! empty($conf->user->enabled) && empty($conf->global->MAIN_SEARCHFORM_USER_DISABLED) && $user->rights->user->user->lire)
 {
-	$arrayresult['searchintouser']=array('position'=>200, 'shortcut'=>'U', 'img'=>'object_user', 'label'=>$langs->trans("SearchIntoUsers", $search_boxvalue), 'text'=>img_picto('','object_user').' '.$langs->trans("SearchIntoUsers", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/user/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
+    $arrayresult['searchintouser']=array('position'=>200, 'shortcut'=>'U', 'img'=>'object_user', 'label'=>$langs->trans("SearchIntoUsers", $search_boxvalue), 'text'=>img_picto('','object_user').' '.$langs->trans("SearchIntoUsers", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/user/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
 }
 if (! empty($conf->expensereport->enabled) && empty($conf->global->MAIN_SEARCHFORM_EXPENSEREPORT_DISABLED) && $user->rights->expensereport->lire)
 {
-	$arrayresult['searchintoexpensereport']=array('position'=>210, 'img'=>'object_trip', 'label'=>$langs->trans("SearchIntoExpenseReports", $search_boxvalue), 'text'=>img_picto('','object_trip').' '.$langs->trans("SearchIntoExpenseReports", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/expensereport/list.php?mainmenu=hrm'.($search_boxvalue?'&sall='.urlencode($search_boxvalue):''));
+    $arrayresult['searchintoexpensereport']=array('position'=>210, 'img'=>'object_trip', 'label'=>$langs->trans("SearchIntoExpenseReports", $search_boxvalue), 'text'=>img_picto('','object_trip').' '.$langs->trans("SearchIntoExpenseReports", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/expensereport/list.php?mainmenu=hrm'.($search_boxvalue?'&sall='.urlencode($search_boxvalue):''));
 }
 if (! empty($conf->holiday->enabled) && empty($conf->global->MAIN_SEARCHFORM_HOLIDAY_DISABLED) && $user->rights->holiday->read)
 {
-	$arrayresult['searchintoleaves']=array('position'=>220, 'img'=>'object_holiday', 'label'=>$langs->trans("SearchIntoLeaves", $search_boxvalue), 'text'=>img_picto('','object_holiday').' '.$langs->trans("SearchIntoLeaves", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/holiday/list.php?mainmenu=hrm'.($search_boxvalue?'&sall='.urlencode($search_boxvalue):''));
+    $arrayresult['searchintoleaves']=array('position'=>220, 'img'=>'object_holiday', 'label'=>$langs->trans("SearchIntoLeaves", $search_boxvalue), 'text'=>img_picto('','object_holiday').' '.$langs->trans("SearchIntoLeaves", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/holiday/list.php?mainmenu=hrm'.($search_boxvalue?'&sall='.urlencode($search_boxvalue):''));
 }
 
 
@@ -151,7 +151,7 @@ 
 $reshook=$hookmanager->executeHooks('addSearchEntry',$parameters);
 if (empty($reshook))
 {
-	$arrayresult=array_merge($arrayresult, $hookmanager->resArray);
+    $arrayresult=array_merge($arrayresult, $hookmanager->resArray);
 }
 else $arrayresult=$hookmanager->resArray;
 

dolibarr/htdocs/core/ajax/fileupload.php

Indentation +3 added lines, -3 removed lines

@@ -51,14 +51,14 @@
 header('Access-Control-Allow-Headers: X-File-Name, X-File-Type, X-File-Size');
 
 switch ($_SERVER['REQUEST_METHOD']) {
-	case 'OPTIONS':
-		break;
+    case 'OPTIONS':
+        break;
     case 'HEAD':
     case 'GET':
         $upload_handler->get();
         break;
     case 'POST':
-    	if (isset($_REQUEST['_method']) && $_REQUEST['_method'] === 'DELETE') {
+        if (isset($_REQUEST['_method']) && $_REQUEST['_method'] === 'DELETE') {
             $upload_handler->delete();
         } else {
             $upload_handler->post();

dolibarr/htdocs/core/ajax/bankconciliate.php

Indentation +8 added lines, -8 removed lines

@@ -49,8 +49,8 @@ 
 
 if (($user->rights->banque->modifier || $user->rights->banque->consolidate) && $action == 'dvnext')
 {
-	// Increase date
-	$al = new AccountLine($db);
+    // Increase date
+    $al = new AccountLine($db);
     $al->datev_next(GETPOST('rowid','int'));
     $al->fetch(GETPOST('rowid','int'));
 
@@ -61,8 +61,8 @@ 
 
 if (($user->rights->banque->modifier || $user->rights->banque->consolidate) && $action == 'dvprev')
 {
-	// Decrease date
-	$al =new AccountLine($db);
+    // Decrease date
+    $al =new AccountLine($db);
     $al->datev_previous(GETPOST('rowid','int'));
     $al->fetch(GETPOST('rowid','int'));
 
@@ -73,8 +73,8 @@ 
 
 if (($user->rights->banque->modifier || $user->rights->banque->consolidate) && $action == 'donext')
 {
-	// Increase date
-	$al = new AccountLine($db);
+    // Increase date
+    $al = new AccountLine($db);
     $al->dateo_next(GETPOST('rowid','int'));
     $al->fetch(GETPOST('rowid','int'));
 
@@ -85,8 +85,8 @@ 
 
 if (($user->rights->banque->modifier || $user->rights->banque->consolidate) && $action == 'doprev')
 {
-	// Decrease date
-	$al =new AccountLine($db);
+    // Decrease date
+    $al =new AccountLine($db);
     $al->dateo_previous(GETPOST('rowid','int'));
     $al->fetch(GETPOST('rowid','int'));
 

dolibarr/htdocs/core/ajax/price.php

Indentation +16 added lines, -16 removed lines

@@ -42,25 +42,25 @@
 // Load original field value
 if (! empty($output) && isset($amount) && isset($tva_tx))
 {
-	$return=array();
-	$price='';
+    $return=array();
+    $price='';
 
-	if (is_numeric($amount) && $amount != '')
-	{
-		if ($output == 'price_ttc') {
+    if (is_numeric($amount) && $amount != '')
+    {
+        if ($output == 'price_ttc') {
 
-			$price = price2num($amount * (1 + ($tva_tx/100)), 'MU');
-			$return['price_ht'] = $amount;
-			$return['price_ttc'] = (isset($price) && $price != '' ? price($price) : '');
-		}
-		else if ($output == 'price_ht') {
+            $price = price2num($amount * (1 + ($tva_tx/100)), 'MU');
+            $return['price_ht'] = $amount;
+            $return['price_ttc'] = (isset($price) && $price != '' ? price($price) : '');
+        }
+        else if ($output == 'price_ht') {
 
-			$price = price2num($amount / (1 + ($tva_tx/100)), 'MU');
-			$return['price_ht'] = (isset($price) && $price != '' ? price($price) : '');
-			$return['price_ttc'] = ($tva_tx == 0 ? $price : $amount);
-		}
-	}
+            $price = price2num($amount / (1 + ($tva_tx/100)), 'MU');
+            $return['price_ht'] = (isset($price) && $price != '' ? price($price) : '');
+            $return['price_ttc'] = ($tva_tx == 0 ? $price : $amount);
+        }
+    }
 
-	echo json_encode($return);
+    echo json_encode($return);
 }
 

dolibarr/htdocs/core/ajax/vatrates.php

Indentation +18 added lines, -18 removed lines

@@ -43,28 +43,28 @@
 // Load original field value
 if (! empty($id) && ! empty($action) && ! empty($htmlname))
 {
-	$form = new Form($db);
-	$soc = new Societe($db);
+    $form = new Form($db);
+    $soc = new Societe($db);
 
-	$soc->fetch($id);
+    $soc->fetch($id);
 
-	if ($action == 'getSellerVATRates')
-	{
-		$seller = $mysoc;
-		$buyer = $soc;
-	}
-	else
-	{
-		$buyer = $mysoc;
-		$seller = $soc;
-	}
+    if ($action == 'getSellerVATRates')
+    {
+        $seller = $mysoc;
+        $buyer = $soc;
+    }
+    else
+    {
+        $buyer = $mysoc;
+        $seller = $soc;
+    }
 
-	$return=array();
+    $return=array();
 
-	$return['value']	= $form->load_tva('tva_tx',$selected,$seller,$buyer,$productid,0,'',true);
-	$return['num']		= $form->num;
-	$return['error']	= $form->error;
+    $return['value']	= $form->load_tva('tva_tx',$selected,$seller,$buyer,$productid,0,'',true);
+    $return['num']		= $form->num;
+    $return['error']	= $form->error;
 
-	echo json_encode($return);
+    echo json_encode($return);
 }
 

dolibarr/htdocs/core/ajax/contacts.php

Indentation +7 added lines, -7 removed lines

@@ -43,15 +43,15 @@
 // Load original field value
 if (! empty($id) && ! empty($action) && ! empty($htmlname))
 {
-	$form = new Form($db);
+    $form = new Form($db);
 
-	$return=array();
-	if (empty($showempty)) $showempty=0;
+    $return=array();
+    if (empty($showempty)) $showempty=0;
 
-	$return['value']	= $form->selectcontacts($id,'',$htmlname,$showempty,'','',0,'',true);
-	$return['num']		= $form->num;
-	$return['error']	= $form->error;
+    $return['value']	= $form->selectcontacts($id,'',$htmlname,$showempty,'','',0,'',true);
+    $return['num']		= $form->num;
+    $return['error']	= $form->error;
 
-	echo json_encode($return);
+    echo json_encode($return);
 }
 

dolibarr/htdocs/core/ajax/saveinplace.php

Indentation +164 added lines, -164 removed lines

@@ -58,175 +58,175 @@
 // Load original field value
 if (! empty($field) && ! empty($element) && ! empty($table_element) && ! empty($fk_element))
 {
-	$ext_element		= GETPOST('ext_element','alpha',2);
-	$field				= substr($field, 8); // remove prefix val_
-	$type				= GETPOST('type','alpha',2);
-	$value				= ($type == 'ckeditor' ? GETPOST('value','',2) : GETPOST('value','alpha',2));
-	$loadmethod			= GETPOST('loadmethod','alpha',2);
-	$savemethod			= GETPOST('savemethod','alpha',2);
-	$savemethodname		= (! empty($savemethod) ? $savemethod : 'setValueFrom');
-	$newelement			= $element;
-
-	$view='';
-	$format='text';
-	$return=array();
-	$error=0;
-
-	if ($element != 'order_supplier' && $element != 'invoice_supplier' && preg_match('/^([^_]+)_([^_]+)/i',$element,$regs))
-	{
-		$element = $regs[1];
-		$subelement = $regs[2];
-	}
-
-	if ($element == 'propal') $newelement = 'propale';
-	else if ($element == 'fichinter') $newelement = 'ficheinter';
-	else if ($element == 'product') $newelement = 'produit';
-	else if ($element == 'member') $newelement = 'adherent';
-	else if ($element == 'order_supplier') {
-		$newelement = 'fournisseur';
-		$subelement = 'commande';
-	}
-	else if ($element == 'invoice_supplier') {
-		$newelement = 'fournisseur';
-		$subelement = 'facture';
-	}
-	else $newelement = $element;
-
-	$_POST['action']='update';	// Hack so restrictarea will test permissions on write too
-	$feature = $newelement;
-	$feature2 = $subelement;
-	$object_id = $fk_element;
-	if ($feature == 'expedition' || $feature == 'shipping')
-	{
-		$feature = 'commande';
-		$object_id = 0;
-	}
-	if ($feature == 'shipping') $feature = 'commande';
-	if ($feature == 'payment') { $feature = 'facture'; }
-	if ($feature == 'payment_supplier') { $feature = 'fournisseur'; $feature2 = 'facture'; }
-	//var_dump(GETPOST('action','aZ09'));
-	//var_dump($newelement.'-'.$subelement."-".$feature."-".$object_id);
-	$check_access = restrictedArea($user, $feature, $object_id, '', $feature2);
-	//var_dump($user->rights);
-	/*
+    $ext_element		= GETPOST('ext_element','alpha',2);
+    $field				= substr($field, 8); // remove prefix val_
+    $type				= GETPOST('type','alpha',2);
+    $value				= ($type == 'ckeditor' ? GETPOST('value','',2) : GETPOST('value','alpha',2));
+    $loadmethod			= GETPOST('loadmethod','alpha',2);
+    $savemethod			= GETPOST('savemethod','alpha',2);
+    $savemethodname		= (! empty($savemethod) ? $savemethod : 'setValueFrom');
+    $newelement			= $element;
+
+    $view='';
+    $format='text';
+    $return=array();
+    $error=0;
+
+    if ($element != 'order_supplier' && $element != 'invoice_supplier' && preg_match('/^([^_]+)_([^_]+)/i',$element,$regs))
+    {
+        $element = $regs[1];
+        $subelement = $regs[2];
+    }
+
+    if ($element == 'propal') $newelement = 'propale';
+    else if ($element == 'fichinter') $newelement = 'ficheinter';
+    else if ($element == 'product') $newelement = 'produit';
+    else if ($element == 'member') $newelement = 'adherent';
+    else if ($element == 'order_supplier') {
+        $newelement = 'fournisseur';
+        $subelement = 'commande';
+    }
+    else if ($element == 'invoice_supplier') {
+        $newelement = 'fournisseur';
+        $subelement = 'facture';
+    }
+    else $newelement = $element;
+
+    $_POST['action']='update';	// Hack so restrictarea will test permissions on write too
+    $feature = $newelement;
+    $feature2 = $subelement;
+    $object_id = $fk_element;
+    if ($feature == 'expedition' || $feature == 'shipping')
+    {
+        $feature = 'commande';
+        $object_id = 0;
+    }
+    if ($feature == 'shipping') $feature = 'commande';
+    if ($feature == 'payment') { $feature = 'facture'; }
+    if ($feature == 'payment_supplier') { $feature = 'fournisseur'; $feature2 = 'facture'; }
+    //var_dump(GETPOST('action','aZ09'));
+    //var_dump($newelement.'-'.$subelement."-".$feature."-".$object_id);
+    $check_access = restrictedArea($user, $feature, $object_id, '', $feature2);
+    //var_dump($user->rights);
+    /*
 	if (! empty($user->rights->$newelement->creer) || ! empty($user->rights->$newelement->create) || ! empty($user->rights->$newelement->write)
 		|| (isset($subelement) && (! empty($user->rights->$newelement->$subelement->creer) || ! empty($user->rights->$newelement->$subelement->write)))
 		|| ($element == 'payment' && $user->rights->facture->paiement)
 		|| ($element == 'payment_supplier' && $user->rights->fournisseur->facture->creer))
 	*/
 
-	if ($check_access)
-	{
-		// Clean parameters
-		$newvalue = trim($value);
-
-		if ($type == 'numeric')
-		{
-			$newvalue = price2num($newvalue);
-
-			// Check parameters
-			if (! is_numeric($newvalue))
-			{
-				$error++;
-				$return['error'] = $langs->trans('ErrorBadValue');
-			}
-		}
-		else if ($type == 'datepicker')
-		{
-			$timestamp	= GETPOST('timestamp','int',2);
-			$format		= 'date';
-			$newvalue	= ($timestamp / 1000);
-		}
-		else if ($type == 'select')
-		{
-			$loadmethodname	= 'load_cache_'.$loadmethod;
-			$loadcachename	= 'cache_'.$loadmethod;
-			$loadviewname	= 'view_'.$loadmethod;
-
-			$form = new Form($db);
-			if (method_exists($form, $loadmethodname))
-			{
-				$ret = $form->$loadmethodname();
-				if ($ret > 0)
-				{
-					$loadcache = $form->$loadcachename;
-					$value = $loadcache[$newvalue];
-
-					if (! empty($form->$loadviewname))
-					{
-						$loadview = $form->$loadviewname;
-						$view = $loadview[$newvalue];
-					}
-				}
-				else
-				{
-					$error++;
-					$return['error'] = $form->error;
-				}
-			}
-			else
-			{
-				$module = $subelement = $ext_element;
-				if (preg_match('/^([^_]+)_([^_]+)/i',$ext_element,$regs))
-				{
-					$module = $regs[1];
-					$subelement = $regs[2];
-				}
-
-				dol_include_once('/'.$module.'/class/actions_'.$subelement.'.class.php');
-				$classname = 'Actions'.ucfirst($subelement);
-				$object = new $classname($db);
-				$ret = $object->$loadmethodname();
-				if ($ret > 0)
-				{
-					$loadcache = $object->$loadcachename;
-					$value = $loadcache[$newvalue];
-
-					if (! empty($object->$loadviewname))
-					{
-						$loadview = $object->$loadviewname;
-						$view = $loadview[$newvalue];
-					}
-				}
-				else
-				{
-					$error++;
-					$return['error'] = $object->error;
-				}
-			}
-		}
-
-		if (! $error)
-		{
-			if ((isset($object) && ! is_object($object)) || empty($savemethod)) $object = new GenericObject($db);
-
-			// Specific for add_object_linked()
-			// TODO add a function for variable treatment
-			$object->ext_fk_element = $newvalue;
-			$object->ext_element = $ext_element;
-			$object->fk_element = $fk_element;
-			$object->element = $element;
-
-			$ret=$object->$savemethodname($field, $newvalue, $table_element, $fk_element, $format);
-			if ($ret > 0)
-			{
-				if ($type == 'numeric') $value = price($newvalue);
-				else if ($type == 'textarea') $value = dol_nl2br($newvalue);
-
-				$return['value'] = $value;
-				$return['view'] = (! empty($view) ? $view : $value);
-			}
-			else
-			{
-				$return['error'] = $object->error;
-			}
-		}
-
-		echo json_encode($return);
-	}
-	else
-	{
-		echo $langs->trans('NotEnoughPermissions');
-	}
+    if ($check_access)
+    {
+        // Clean parameters
+        $newvalue = trim($value);
+
+        if ($type == 'numeric')
+        {
+            $newvalue = price2num($newvalue);
+
+            // Check parameters
+            if (! is_numeric($newvalue))
+            {
+                $error++;
+                $return['error'] = $langs->trans('ErrorBadValue');
+            }
+        }
+        else if ($type == 'datepicker')
+        {
+            $timestamp	= GETPOST('timestamp','int',2);
+            $format		= 'date';
+            $newvalue	= ($timestamp / 1000);
+        }
+        else if ($type == 'select')
+        {
+            $loadmethodname	= 'load_cache_'.$loadmethod;
+            $loadcachename	= 'cache_'.$loadmethod;
+            $loadviewname	= 'view_'.$loadmethod;
+
+            $form = new Form($db);
+            if (method_exists($form, $loadmethodname))
+            {
+                $ret = $form->$loadmethodname();
+                if ($ret > 0)
+                {
+                    $loadcache = $form->$loadcachename;
+                    $value = $loadcache[$newvalue];
+
+                    if (! empty($form->$loadviewname))
+                    {
+                        $loadview = $form->$loadviewname;
+                        $view = $loadview[$newvalue];
+                    }
+                }
+                else
+                {
+                    $error++;
+                    $return['error'] = $form->error;
+                }
+            }
+            else
+            {
+                $module = $subelement = $ext_element;
+                if (preg_match('/^([^_]+)_([^_]+)/i',$ext_element,$regs))
+                {
+                    $module = $regs[1];
+                    $subelement = $regs[2];
+                }
+
+                dol_include_once('/'.$module.'/class/actions_'.$subelement.'.class.php');
+                $classname = 'Actions'.ucfirst($subelement);
+                $object = new $classname($db);
+                $ret = $object->$loadmethodname();
+                if ($ret > 0)
+                {
+                    $loadcache = $object->$loadcachename;
+                    $value = $loadcache[$newvalue];
+
+                    if (! empty($object->$loadviewname))
+                    {
+                        $loadview = $object->$loadviewname;
+                        $view = $loadview[$newvalue];
+                    }
+                }
+                else
+                {
+                    $error++;
+                    $return['error'] = $object->error;
+                }
+            }
+        }
+
+        if (! $error)
+        {
+            if ((isset($object) && ! is_object($object)) || empty($savemethod)) $object = new GenericObject($db);
+
+            // Specific for add_object_linked()
+            // TODO add a function for variable treatment
+            $object->ext_fk_element = $newvalue;
+            $object->ext_element = $ext_element;
+            $object->fk_element = $fk_element;
+            $object->element = $element;
+
+            $ret=$object->$savemethodname($field, $newvalue, $table_element, $fk_element, $format);
+            if ($ret > 0)
+            {
+                if ($type == 'numeric') $value = price($newvalue);
+                else if ($type == 'textarea') $value = dol_nl2br($newvalue);
+
+                $return['value'] = $value;
+                $return['view'] = (! empty($view) ? $view : $value);
+            }
+            else
+            {
+                $return['error'] = $object->error;
+            }
+        }
+
+        echo json_encode($return);
+    }
+    else
+    {
+        echo $langs->trans('NotEnoughPermissions');
+    }
 }
 

dolibarr/htdocs/core/ajax/extraparams.php

Indentation +22 added lines, -22 removed lines

@@ -43,35 +43,35 @@
 
 if(! empty($id) && ! empty($element) && ! empty($htmlelement) && ! empty($type))
 {
-	$value = GETPOST('value','alpha');
-	$params=array();
+    $value = GETPOST('value','alpha');
+    $params=array();
 
-	dol_syslog("AjaxSetExtraParameters id=".$id." element=".$element." htmlelement=".$htmlelement." type=".$type." value=".$value, LOG_DEBUG);
+    dol_syslog("AjaxSetExtraParameters id=".$id." element=".$element." htmlelement=".$htmlelement." type=".$type." value=".$value, LOG_DEBUG);
 
-	$classpath = $subelement = $element;
+    $classpath = $subelement = $element;
 
-	// For compatibility
-	if ($element == 'order' || $element == 'commande')    { $classpath = $subelement = 'commande'; }
-	else if ($element == 'propal')				{ $classpath = 'comm/propal'; $subelement = 'propal'; }
-	else if ($element == 'facture')				{ $classpath = 'compta/facture'; $subelement = 'facture'; }
-	else if ($element == 'contract')			{ $classpath = $subelement = 'contrat'; }
-	else if ($element == 'shipping')			{ $classpath = $subelement = 'expedition'; }
-	else if ($element == 'deplacement')			{ $classpath = 'compta/deplacement'; $subelement = 'deplacement'; }
-	else if ($element == 'order_supplier')		{ $classpath = 'fourn'; $subelement = 'fournisseur.commande'; }
-	else if ($element == 'invoice_supplier')	{ $classpath = 'fourn'; $subelement = 'fournisseur.facture'; }
+    // For compatibility
+    if ($element == 'order' || $element == 'commande')    { $classpath = $subelement = 'commande'; }
+    else if ($element == 'propal')				{ $classpath = 'comm/propal'; $subelement = 'propal'; }
+    else if ($element == 'facture')				{ $classpath = 'compta/facture'; $subelement = 'facture'; }
+    else if ($element == 'contract')			{ $classpath = $subelement = 'contrat'; }
+    else if ($element == 'shipping')			{ $classpath = $subelement = 'expedition'; }
+    else if ($element == 'deplacement')			{ $classpath = 'compta/deplacement'; $subelement = 'deplacement'; }
+    else if ($element == 'order_supplier')		{ $classpath = 'fourn'; $subelement = 'fournisseur.commande'; }
+    else if ($element == 'invoice_supplier')	{ $classpath = 'fourn'; $subelement = 'fournisseur.facture'; }
 
-	dol_include_once('/'.$classpath.'/class/'.$subelement.'.class.php');
+    dol_include_once('/'.$classpath.'/class/'.$subelement.'.class.php');
 
-	if ($element == 'order_supplier')			{ $classname = 'CommandeFournisseur'; }
-	else if ($element == 'invoice_supplier')	{ $classname = 'FactureFournisseur'; }
-	else $classname = ucfirst($subelement);
+    if ($element == 'order_supplier')			{ $classname = 'CommandeFournisseur'; }
+    else if ($element == 'invoice_supplier')	{ $classname = 'FactureFournisseur'; }
+    else $classname = ucfirst($subelement);
 
-	$object	= new $classname($db);
-	$object->fetch($id);
+    $object	= new $classname($db);
+    $object->fetch($id);
 
-	$params[$htmlelement] = array($type => $value);
-	$object->extraparams = array_merge($object->extraparams, $params);
+    $params[$htmlelement] = array($type => $value);
+    $object->extraparams = array_merge($object->extraparams, $params);
 
-	$result=$object->setExtraParameters();
+    $result=$object->setExtraParameters();
 }
 

dolibarr/htdocs/core/ajax/box.php

Indentation +16 added lines, -16 removed lines

@@ -53,28 +53,28 @@
 // Add a box
 if ($boxid > 0 && $zone !='' && $userid > 0)
 {
-	$tmp=explode('-',$boxorder);
-	$nbboxonleft=substr_count($tmp[0],',');
-	$nbboxonright=substr_count($tmp[1],',');
-	print $nbboxonleft.'-'.$nbboxonright;
-	if ($nbboxonleft > $nbboxonright) $boxorder=preg_replace('/B:/','B:'.$boxid.',',$boxorder);    // Insert id of new box into list
+    $tmp=explode('-',$boxorder);
+    $nbboxonleft=substr_count($tmp[0],',');
+    $nbboxonright=substr_count($tmp[1],',');
+    print $nbboxonleft.'-'.$nbboxonright;
+    if ($nbboxonleft > $nbboxonright) $boxorder=preg_replace('/B:/','B:'.$boxid.',',$boxorder);    // Insert id of new box into list
     else $boxorder=preg_replace('/^A:/','A:'.$boxid.',',$boxorder);    // Insert id of new box into list
 }
 
 // Registering the location of boxes after a move
 if ($boxorder && $zone != '' &&  $userid > 0)
 {
-	// boxorder value is the target order: "A:idboxA1,idboxA2,A-B:idboxB1,idboxB2,B"
-	dol_syslog("AjaxBox boxorder=".$boxorder." zone=".$zone." userid=".$userid, LOG_DEBUG);
+    // boxorder value is the target order: "A:idboxA1,idboxA2,A-B:idboxB1,idboxB2,B"
+    dol_syslog("AjaxBox boxorder=".$boxorder." zone=".$zone." userid=".$userid, LOG_DEBUG);
 
-	$result=InfoBox::saveboxorder($db,$zone,$boxorder,$userid);
-	if ($result > 0)
-	{
-	    $langs->load("boxes");
-	    if (! GETPOST('closing'))
-	    {
-	       setEventMessages($langs->trans("BoxAdded"), null);
-	    }
-	}
+    $result=InfoBox::saveboxorder($db,$zone,$boxorder,$userid);
+    if ($result > 0)
+    {
+        $langs->load("boxes");
+        if (! GETPOST('closing'))
+        {
+            setEventMessages($langs->trans("BoxAdded"), null);
+        }
+    }
 }