alxarafe / alixar

dolibarr/htdocs/admin/dict.php

Spacing +263 added lines, -263 removed lines

@@ -26,24 +26,24 @@ 
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-require_once DOL_BASE_PATH . '/core/lib/functions2.lib.php';
+require_once DOL_BASE_PATH.'/core/lib/functions2.lib.php';
 
 /**
  * 	    \file       htdocs/admin/dict.php
  * 		\ingroup    setup
  * 		\brief      Page to administer data tables
  */
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formadmin.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formcompany.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/functions2.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
 
 if (!empty($conf->accounting->enabled)) {
-    require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
+    require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
 }
 
 // Load translation files required by the page
@@ -58,11 +58,11 @@ 
 
 $allowed = $user->admin;
 if ($id == 7 && !empty($user->rights->accounting->chartofaccount)) {
-    $allowed = 1;     // Tax page allowed to manager of chart account
+    $allowed = 1; // Tax page allowed to manager of chart account
 }if ($id == 10 && !empty($user->rights->accounting->chartofaccount)) {
-    $allowed = 1;    // Vat page allowed to manager of chart account
+    $allowed = 1; // Vat page allowed to manager of chart account
 }if ($id == 17 && !empty($user->rights->accounting->chartofaccount)) {
-    $allowed = 1;    // Dictionary with type of expense report and accounting account allowed to manager of chart account
+    $allowed = 1; // Dictionary with type of expense report and accounting account allowed to manager of chart account
 }if (!$allowed) {
     accessforbidden();
 }
@@ -102,42 +102,42 @@ 
 
 // Name of SQL tables of dictionaries
 $tabname = array();
-$tabname[1] = MAIN_DB_PREFIX . "c_forme_juridique";
-$tabname[2] = MAIN_DB_PREFIX . "c_departements";
-$tabname[3] = MAIN_DB_PREFIX . "c_regions";
-$tabname[4] = MAIN_DB_PREFIX . "c_country";
-$tabname[5] = MAIN_DB_PREFIX . "c_civility";
-$tabname[6] = MAIN_DB_PREFIX . "c_actioncomm";
-$tabname[7] = MAIN_DB_PREFIX . "c_chargesociales";
-$tabname[8] = MAIN_DB_PREFIX . "c_typent";
-$tabname[9] = MAIN_DB_PREFIX . "c_currencies";
-$tabname[10] = MAIN_DB_PREFIX . "c_tva";
-$tabname[11] = MAIN_DB_PREFIX . "c_type_contact";
-$tabname[12] = MAIN_DB_PREFIX . "c_payment_term";
-$tabname[13] = MAIN_DB_PREFIX . "c_paiement";
-$tabname[14] = MAIN_DB_PREFIX . "c_ecotaxe";
-$tabname[15] = MAIN_DB_PREFIX . "c_paper_format";
-$tabname[16] = MAIN_DB_PREFIX . "c_prospectlevel";
-$tabname[17] = MAIN_DB_PREFIX . "c_type_fees";
-$tabname[18] = MAIN_DB_PREFIX . "c_shipment_mode";
-$tabname[19] = MAIN_DB_PREFIX . "c_effectif";
-$tabname[20] = MAIN_DB_PREFIX . "c_input_method";
-$tabname[21] = MAIN_DB_PREFIX . "c_availability";
-$tabname[22] = MAIN_DB_PREFIX . "c_input_reason";
-$tabname[23] = MAIN_DB_PREFIX . "c_revenuestamp";
-$tabname[24] = MAIN_DB_PREFIX . "c_type_resource";
-$tabname[25] = MAIN_DB_PREFIX . "c_type_container";
-$tabname[26] = MAIN_DB_PREFIX . "c_units";
-$tabname[27] = MAIN_DB_PREFIX . "c_stcomm";
-$tabname[28] = MAIN_DB_PREFIX . "c_holiday_types";
-$tabname[29] = MAIN_DB_PREFIX . "c_lead_status";
-$tabname[30] = MAIN_DB_PREFIX . "c_format_cards";
+$tabname[1] = MAIN_DB_PREFIX."c_forme_juridique";
+$tabname[2] = MAIN_DB_PREFIX."c_departements";
+$tabname[3] = MAIN_DB_PREFIX."c_regions";
+$tabname[4] = MAIN_DB_PREFIX."c_country";
+$tabname[5] = MAIN_DB_PREFIX."c_civility";
+$tabname[6] = MAIN_DB_PREFIX."c_actioncomm";
+$tabname[7] = MAIN_DB_PREFIX."c_chargesociales";
+$tabname[8] = MAIN_DB_PREFIX."c_typent";
+$tabname[9] = MAIN_DB_PREFIX."c_currencies";
+$tabname[10] = MAIN_DB_PREFIX."c_tva";
+$tabname[11] = MAIN_DB_PREFIX."c_type_contact";
+$tabname[12] = MAIN_DB_PREFIX."c_payment_term";
+$tabname[13] = MAIN_DB_PREFIX."c_paiement";
+$tabname[14] = MAIN_DB_PREFIX."c_ecotaxe";
+$tabname[15] = MAIN_DB_PREFIX."c_paper_format";
+$tabname[16] = MAIN_DB_PREFIX."c_prospectlevel";
+$tabname[17] = MAIN_DB_PREFIX."c_type_fees";
+$tabname[18] = MAIN_DB_PREFIX."c_shipment_mode";
+$tabname[19] = MAIN_DB_PREFIX."c_effectif";
+$tabname[20] = MAIN_DB_PREFIX."c_input_method";
+$tabname[21] = MAIN_DB_PREFIX."c_availability";
+$tabname[22] = MAIN_DB_PREFIX."c_input_reason";
+$tabname[23] = MAIN_DB_PREFIX."c_revenuestamp";
+$tabname[24] = MAIN_DB_PREFIX."c_type_resource";
+$tabname[25] = MAIN_DB_PREFIX."c_type_container";
+$tabname[26] = MAIN_DB_PREFIX."c_units";
+$tabname[27] = MAIN_DB_PREFIX."c_stcomm";
+$tabname[28] = MAIN_DB_PREFIX."c_holiday_types";
+$tabname[29] = MAIN_DB_PREFIX."c_lead_status";
+$tabname[30] = MAIN_DB_PREFIX."c_format_cards";
 //$tabname[31]= MAIN_DB_PREFIX."accounting_system";
 //$tabname[32]= MAIN_DB_PREFIX."c_accounting_category";
-$tabname[33] = MAIN_DB_PREFIX . "c_hrm_department";
-$tabname[34] = MAIN_DB_PREFIX . "c_hrm_function";
-$tabname[35] = MAIN_DB_PREFIX . "c_exp_tax_cat";
-$tabname[36] = MAIN_DB_PREFIX . "c_exp_tax_range";
+$tabname[33] = MAIN_DB_PREFIX."c_hrm_department";
+$tabname[34] = MAIN_DB_PREFIX."c_hrm_function";
+$tabname[35] = MAIN_DB_PREFIX."c_exp_tax_cat";
+$tabname[36] = MAIN_DB_PREFIX."c_exp_tax_range";
 
 // Dictionary labels
 $tablib = array();
@@ -180,42 +180,42 @@ 
 
 // Requests to extract data
 $tabsql = array();
-$tabsql[1] = "SELECT f.rowid as rowid, f.code, f.libelle, c.code as country_code, c.label as country, f.active FROM " . MAIN_DB_PREFIX . "c_forme_juridique as f, " . MAIN_DB_PREFIX . "c_country as c WHERE f.fk_pays=c.rowid";
-$tabsql[2] = "SELECT d.rowid as rowid, d.code_departement as code, d.nom as libelle, d.fk_region as region_id, r.nom as region, c.code as country_code, c.label as country, d.active FROM " . MAIN_DB_PREFIX . "c_departements as d, " . MAIN_DB_PREFIX . "c_regions as r, " . MAIN_DB_PREFIX . "c_country as c WHERE d.fk_region=r.code_region and r.fk_pays=c.rowid and r.active=1 and c.active=1";
-$tabsql[3] = "SELECT r.rowid as rowid, r.code_region as code, r.nom as libelle, r.fk_pays as country_id, c.code as country_code, c.label as country, r.active FROM " . MAIN_DB_PREFIX . "c_regions as r, " . MAIN_DB_PREFIX . "c_country as c WHERE r.fk_pays=c.rowid and c.active=1";
-$tabsql[4] = "SELECT c.rowid as rowid, c.code, c.label, c.active, c.favorite FROM " . MAIN_DB_PREFIX . "c_country AS c";
-$tabsql[5] = "SELECT c.rowid as rowid, c.code as code, c.label, c.active FROM " . MAIN_DB_PREFIX . "c_civility AS c";
-$tabsql[6] = "SELECT a.id    as rowid, a.code as code, a.libelle AS libelle, a.type, a.active, a.module, a.color, a.position FROM " . MAIN_DB_PREFIX . "c_actioncomm AS a";
-$tabsql[7] = "SELECT a.id    as rowid, a.code as code, a.libelle AS libelle, a.accountancy_code as accountancy_code, a.deductible, c.code as country_code, c.label as country, a.fk_pays as country_id, a.active FROM " . MAIN_DB_PREFIX . "c_chargesociales AS a, " . MAIN_DB_PREFIX . "c_country as c WHERE a.fk_pays=c.rowid and c.active=1";
-$tabsql[8] = "SELECT t.id	 as rowid, t.code as code, t.libelle, t.fk_country as country_id, c.code as country_code, c.label as country, t.position, t.active FROM " . MAIN_DB_PREFIX . "c_typent as t LEFT JOIN " . MAIN_DB_PREFIX . "c_country as c ON t.fk_country=c.rowid";
-$tabsql[9] = "SELECT c.code_iso as code, c.label, c.unicode, c.active FROM " . MAIN_DB_PREFIX . "c_currencies AS c";
-$tabsql[10] = "SELECT t.rowid, t.code, t.taux, t.localtax1_type, t.localtax1, t.localtax2_type, t.localtax2, c.label as country, c.code as country_code, t.fk_pays as country_id, t.recuperableonly, t.note, t.active, t.accountancy_code_sell, t.accountancy_code_buy FROM " . MAIN_DB_PREFIX . "c_tva as t, " . MAIN_DB_PREFIX . "c_country as c WHERE t.fk_pays=c.rowid";
-$tabsql[11] = "SELECT t.rowid as rowid, t.element, t.source, t.code, t.libelle, t.position, t.active FROM " . MAIN_DB_PREFIX . "c_type_contact AS t";
-$tabsql[12] = "SELECT c.rowid as rowid, c.code, c.libelle, c.libelle_facture, c.nbjour, c.type_cdr, c.decalage, c.active, c.sortorder, c.entity FROM " . MAIN_DB_PREFIX . "c_payment_term AS c WHERE c.entity = " . getEntity($tabname[12]);
-$tabsql[13] = "SELECT c.id    as rowid, c.code, c.libelle, c.type, c.active, c.entity FROM " . MAIN_DB_PREFIX . "c_paiement AS c WHERE c.entity = " . getEntity($tabname[13]);
-$tabsql[14] = "SELECT e.rowid as rowid, e.code as code, e.label, e.price, e.organization, e.fk_pays as country_id, c.code as country_code, c.label as country, e.active FROM " . MAIN_DB_PREFIX . "c_ecotaxe AS e, " . MAIN_DB_PREFIX . "c_country as c WHERE e.fk_pays=c.rowid and c.active=1";
-$tabsql[15] = "SELECT rowid   as rowid, code, label as libelle, width, height, unit, active FROM " . MAIN_DB_PREFIX . "c_paper_format";
-$tabsql[16] = "SELECT code, label as libelle, sortorder, active FROM " . MAIN_DB_PREFIX . "c_prospectlevel";
-$tabsql[17] = "SELECT id      as rowid, code, label, accountancy_code, active FROM " . MAIN_DB_PREFIX . "c_type_fees";
-$tabsql[18] = "SELECT rowid   as rowid, code, libelle, tracking, active FROM " . MAIN_DB_PREFIX . "c_shipment_mode";
-$tabsql[19] = "SELECT id      as rowid, code, libelle, active FROM " . MAIN_DB_PREFIX . "c_effectif";
-$tabsql[20] = "SELECT rowid   as rowid, code, libelle, active FROM " . MAIN_DB_PREFIX . "c_input_method";
-$tabsql[21] = "SELECT c.rowid as rowid, code, label, active FROM " . MAIN_DB_PREFIX . "c_availability AS c";
-$tabsql[22] = "SELECT rowid   as rowid, code, label, active FROM " . MAIN_DB_PREFIX . "c_input_reason";
-$tabsql[23] = "SELECT t.rowid as rowid, t.taux, t.revenuestamp_type, c.label as country, c.code as country_code, t.fk_pays as country_id, t.note, t.active, t.accountancy_code_sell, t.accountancy_code_buy FROM " . MAIN_DB_PREFIX . "c_revenuestamp as t, " . MAIN_DB_PREFIX . "c_country as c WHERE t.fk_pays=c.rowid";
-$tabsql[24] = "SELECT rowid   as rowid, code, label, active FROM " . MAIN_DB_PREFIX . "c_type_resource";
-$tabsql[25] = "SELECT rowid   as rowid, code, label, active, module FROM " . MAIN_DB_PREFIX . "c_type_container as t WHERE t.entity IN (" . getEntity('c_type_container') . ")";
-$tabsql[26] = "SELECT rowid   as rowid, code, label, short_label, active FROM " . MAIN_DB_PREFIX . "c_units";
-$tabsql[27] = "SELECT id      as rowid, code, libelle, active FROM " . MAIN_DB_PREFIX . "c_stcomm";
-$tabsql[28] = "SELECT h.rowid as rowid, h.code, h.label, h.affect, h.delay, h.newbymonth, h.fk_country as country_id, c.code as country_code, c.label as country, h.active FROM " . MAIN_DB_PREFIX . "c_holiday_types as h LEFT JOIN " . MAIN_DB_PREFIX . "c_country as c ON h.fk_country=c.rowid";
-$tabsql[29] = "SELECT rowid   as rowid, code, label, percent, position, active FROM " . MAIN_DB_PREFIX . "c_lead_status";
-$tabsql[30] = "SELECT rowid, code, name, paper_size, orientation, metric, leftmargin, topmargin, nx, ny, spacex, spacey, width, height, font_size, custom_x, custom_y, active FROM " . MAIN_DB_PREFIX . "c_format_cards";
+$tabsql[1] = "SELECT f.rowid as rowid, f.code, f.libelle, c.code as country_code, c.label as country, f.active FROM ".MAIN_DB_PREFIX."c_forme_juridique as f, ".MAIN_DB_PREFIX."c_country as c WHERE f.fk_pays=c.rowid";
+$tabsql[2] = "SELECT d.rowid as rowid, d.code_departement as code, d.nom as libelle, d.fk_region as region_id, r.nom as region, c.code as country_code, c.label as country, d.active FROM ".MAIN_DB_PREFIX."c_departements as d, ".MAIN_DB_PREFIX."c_regions as r, ".MAIN_DB_PREFIX."c_country as c WHERE d.fk_region=r.code_region and r.fk_pays=c.rowid and r.active=1 and c.active=1";
+$tabsql[3] = "SELECT r.rowid as rowid, r.code_region as code, r.nom as libelle, r.fk_pays as country_id, c.code as country_code, c.label as country, r.active FROM ".MAIN_DB_PREFIX."c_regions as r, ".MAIN_DB_PREFIX."c_country as c WHERE r.fk_pays=c.rowid and c.active=1";
+$tabsql[4] = "SELECT c.rowid as rowid, c.code, c.label, c.active, c.favorite FROM ".MAIN_DB_PREFIX."c_country AS c";
+$tabsql[5] = "SELECT c.rowid as rowid, c.code as code, c.label, c.active FROM ".MAIN_DB_PREFIX."c_civility AS c";
+$tabsql[6] = "SELECT a.id    as rowid, a.code as code, a.libelle AS libelle, a.type, a.active, a.module, a.color, a.position FROM ".MAIN_DB_PREFIX."c_actioncomm AS a";
+$tabsql[7] = "SELECT a.id    as rowid, a.code as code, a.libelle AS libelle, a.accountancy_code as accountancy_code, a.deductible, c.code as country_code, c.label as country, a.fk_pays as country_id, a.active FROM ".MAIN_DB_PREFIX."c_chargesociales AS a, ".MAIN_DB_PREFIX."c_country as c WHERE a.fk_pays=c.rowid and c.active=1";
+$tabsql[8] = "SELECT t.id	 as rowid, t.code as code, t.libelle, t.fk_country as country_id, c.code as country_code, c.label as country, t.position, t.active FROM ".MAIN_DB_PREFIX."c_typent as t LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON t.fk_country=c.rowid";
+$tabsql[9] = "SELECT c.code_iso as code, c.label, c.unicode, c.active FROM ".MAIN_DB_PREFIX."c_currencies AS c";
+$tabsql[10] = "SELECT t.rowid, t.code, t.taux, t.localtax1_type, t.localtax1, t.localtax2_type, t.localtax2, c.label as country, c.code as country_code, t.fk_pays as country_id, t.recuperableonly, t.note, t.active, t.accountancy_code_sell, t.accountancy_code_buy FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c WHERE t.fk_pays=c.rowid";
+$tabsql[11] = "SELECT t.rowid as rowid, t.element, t.source, t.code, t.libelle, t.position, t.active FROM ".MAIN_DB_PREFIX."c_type_contact AS t";
+$tabsql[12] = "SELECT c.rowid as rowid, c.code, c.libelle, c.libelle_facture, c.nbjour, c.type_cdr, c.decalage, c.active, c.sortorder, c.entity FROM ".MAIN_DB_PREFIX."c_payment_term AS c WHERE c.entity = ".getEntity($tabname[12]);
+$tabsql[13] = "SELECT c.id    as rowid, c.code, c.libelle, c.type, c.active, c.entity FROM ".MAIN_DB_PREFIX."c_paiement AS c WHERE c.entity = ".getEntity($tabname[13]);
+$tabsql[14] = "SELECT e.rowid as rowid, e.code as code, e.label, e.price, e.organization, e.fk_pays as country_id, c.code as country_code, c.label as country, e.active FROM ".MAIN_DB_PREFIX."c_ecotaxe AS e, ".MAIN_DB_PREFIX."c_country as c WHERE e.fk_pays=c.rowid and c.active=1";
+$tabsql[15] = "SELECT rowid   as rowid, code, label as libelle, width, height, unit, active FROM ".MAIN_DB_PREFIX."c_paper_format";
+$tabsql[16] = "SELECT code, label as libelle, sortorder, active FROM ".MAIN_DB_PREFIX."c_prospectlevel";
+$tabsql[17] = "SELECT id      as rowid, code, label, accountancy_code, active FROM ".MAIN_DB_PREFIX."c_type_fees";
+$tabsql[18] = "SELECT rowid   as rowid, code, libelle, tracking, active FROM ".MAIN_DB_PREFIX."c_shipment_mode";
+$tabsql[19] = "SELECT id      as rowid, code, libelle, active FROM ".MAIN_DB_PREFIX."c_effectif";
+$tabsql[20] = "SELECT rowid   as rowid, code, libelle, active FROM ".MAIN_DB_PREFIX."c_input_method";
+$tabsql[21] = "SELECT c.rowid as rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_availability AS c";
+$tabsql[22] = "SELECT rowid   as rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_input_reason";
+$tabsql[23] = "SELECT t.rowid as rowid, t.taux, t.revenuestamp_type, c.label as country, c.code as country_code, t.fk_pays as country_id, t.note, t.active, t.accountancy_code_sell, t.accountancy_code_buy FROM ".MAIN_DB_PREFIX."c_revenuestamp as t, ".MAIN_DB_PREFIX."c_country as c WHERE t.fk_pays=c.rowid";
+$tabsql[24] = "SELECT rowid   as rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_type_resource";
+$tabsql[25] = "SELECT rowid   as rowid, code, label, active, module FROM ".MAIN_DB_PREFIX."c_type_container as t WHERE t.entity IN (".getEntity('c_type_container').")";
+$tabsql[26] = "SELECT rowid   as rowid, code, label, short_label, active FROM ".MAIN_DB_PREFIX."c_units";
+$tabsql[27] = "SELECT id      as rowid, code, libelle, active FROM ".MAIN_DB_PREFIX."c_stcomm";
+$tabsql[28] = "SELECT h.rowid as rowid, h.code, h.label, h.affect, h.delay, h.newbymonth, h.fk_country as country_id, c.code as country_code, c.label as country, h.active FROM ".MAIN_DB_PREFIX."c_holiday_types as h LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON h.fk_country=c.rowid";
+$tabsql[29] = "SELECT rowid   as rowid, code, label, percent, position, active FROM ".MAIN_DB_PREFIX."c_lead_status";
+$tabsql[30] = "SELECT rowid, code, name, paper_size, orientation, metric, leftmargin, topmargin, nx, ny, spacex, spacey, width, height, font_size, custom_x, custom_y, active FROM ".MAIN_DB_PREFIX."c_format_cards";
 //$tabsql[31]= "SELECT s.rowid as rowid, pcg_version, s.label, s.active FROM ".MAIN_DB_PREFIX."accounting_system as s";
 //$tabsql[32]= "SELECT a.rowid as rowid, a.code as code, a.label, a.range_account, a.sens, a.category_type, a.formula, a.position as position, a.fk_country as country_id, c.code as country_code, c.label as country, a.active FROM ".MAIN_DB_PREFIX."c_accounting_category as a, ".MAIN_DB_PREFIX."c_country as c WHERE a.fk_country=c.rowid and c.active=1";
-$tabsql[33] = "SELECT rowid, pos, code, label, active FROM " . MAIN_DB_PREFIX . "c_hrm_department";
-$tabsql[34] = "SELECT rowid, pos, code, label, c_level, active FROM " . MAIN_DB_PREFIX . "c_hrm_function";
-$tabsql[35] = "SELECT c.rowid, c.label, c.active, c.entity FROM " . MAIN_DB_PREFIX . "c_exp_tax_cat c";
-$tabsql[36] = "SELECT r.rowid, r.fk_c_exp_tax_cat, r.range_ik, r.active, r.entity FROM " . MAIN_DB_PREFIX . "c_exp_tax_range r";
+$tabsql[33] = "SELECT rowid, pos, code, label, active FROM ".MAIN_DB_PREFIX."c_hrm_department";
+$tabsql[34] = "SELECT rowid, pos, code, label, c_level, active FROM ".MAIN_DB_PREFIX."c_hrm_function";
+$tabsql[35] = "SELECT c.rowid, c.label, c.active, c.entity FROM ".MAIN_DB_PREFIX."c_exp_tax_cat c";
+$tabsql[36] = "SELECT r.rowid, r.fk_c_exp_tax_cat, r.range_ik, r.active, r.entity FROM ".MAIN_DB_PREFIX."c_exp_tax_range r";
 
 // Criteria to sort dictionaries
 $tabsqlsort = array();
@@ -226,7 +226,7 @@ 
 $tabsqlsort[5] = "label ASC";
 $tabsqlsort[6] = "a.type ASC, a.module ASC, a.position ASC, a.code ASC";
 $tabsqlsort[7] = "country ASC, code ASC, a.libelle ASC";
-$tabsqlsort[8] = "country DESC," . (!empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? ' t.position ASC,' : '') . " libelle ASC";
+$tabsqlsort[8] = "country DESC,".(!empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? ' t.position ASC,' : '')." libelle ASC";
 $tabsqlsort[9] = "label ASC";
 $tabsqlsort[10] = "country ASC, code ASC, taux ASC, recuperableonly ASC, localtax1 ASC, localtax2 ASC";
 $tabsqlsort[11] = "t.element ASC, t.source ASC, t.position ASC, t.code ASC";
@@ -259,13 +259,13 @@ 
 // Nom des champs en resultat de select pour affichage du dictionnaire
 $tabfield = array();
 $tabfield[1] = "code,libelle,country";
-$tabfield[2] = "code,libelle,region_id,region,country";   // "code,libelle,region,country_code-country"
+$tabfield[2] = "code,libelle,region_id,region,country"; // "code,libelle,region,country_code-country"
 $tabfield[3] = "code,libelle,country_id,country";
 $tabfield[4] = "code,label";
 $tabfield[5] = "code,label";
 $tabfield[6] = "code,libelle,type,color,position";
 $tabfield[7] = "code,libelle,country,accountancy_code,deductible";
-$tabfield[8] = "code,libelle,country_id,country" . (!empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? ',position' : '');
+$tabfield[8] = "code,libelle,country_id,country".(!empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? ',position' : '');
 $tabfield[9] = "code,label,unicode";
 $tabfield[10] = "country_id,country,code,taux,localtax1_type,localtax1,localtax2_type,localtax2,recuperableonly,accountancy_code_sell,accountancy_code_buy,note";
 $tabfield[11] = "element,source,code,libelle,position";
@@ -298,13 +298,13 @@ 
 // Nom des champs d'edition pour modification d'un enregistrement
 $tabfieldvalue = array();
 $tabfieldvalue[1] = "code,libelle,country";
-$tabfieldvalue[2] = "code,libelle,region";   // "code,libelle,region"
+$tabfieldvalue[2] = "code,libelle,region"; // "code,libelle,region"
 $tabfieldvalue[3] = "code,libelle,country";
 $tabfieldvalue[4] = "code,label";
 $tabfieldvalue[5] = "code,label";
 $tabfieldvalue[6] = "code,libelle,type,color,position";
 $tabfieldvalue[7] = "code,libelle,country,accountancy_code,deductible";
-$tabfieldvalue[8] = "code,libelle,country" . (!empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? ',position' : '');
+$tabfieldvalue[8] = "code,libelle,country".(!empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? ',position' : '');
 $tabfieldvalue[9] = "code,label,unicode";
 $tabfieldvalue[10] = "country,code,taux,localtax1_type,localtax1,localtax2_type,localtax2,recuperableonly,accountancy_code_sell,accountancy_code_buy,note";
 $tabfieldvalue[11] = "element,source,code,libelle,position";
@@ -343,7 +343,7 @@ 
 $tabfieldinsert[5] = "code,label";
 $tabfieldinsert[6] = "code,libelle,type,color,position";
 $tabfieldinsert[7] = "code,libelle,fk_pays,accountancy_code,deductible";
-$tabfieldinsert[8] = "code,libelle,fk_country" . (!empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? ',position' : '');
+$tabfieldinsert[8] = "code,libelle,fk_country".(!empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? ',position' : '');
 $tabfieldinsert[9] = "code_iso,label,unicode";
 $tabfieldinsert[10] = "fk_pays,code,taux,localtax1_type,localtax1,localtax2_type,localtax2,recuperableonly,accountancy_code_sell,accountancy_code_buy,note";
 $tabfieldinsert[11] = "element,source,code,libelle,position";
@@ -585,12 +585,12 @@ 
 if ($id == 10) {
     $localtax_typeList = array(
         "0" => $langs->trans("No"),
-        "1" => $langs->trans("Yes") . ' (' . $langs->trans("Type") . " 1)", //$langs->trans("%ageOnAllWithoutVAT"),
-        "2" => $langs->trans("Yes") . ' (' . $langs->trans("Type") . " 2)", //$langs->trans("%ageOnAllBeforeVAT"),
-        "3" => $langs->trans("Yes") . ' (' . $langs->trans("Type") . " 3)", //$langs->trans("%ageOnProductsWithoutVAT"),
-        "4" => $langs->trans("Yes") . ' (' . $langs->trans("Type") . " 4)", //$langs->trans("%ageOnProductsBeforeVAT"),
-        "5" => $langs->trans("Yes") . ' (' . $langs->trans("Type") . " 5)", //$langs->trans("%ageOnServiceWithoutVAT"),
-        "6" => $langs->trans("Yes") . ' (' . $langs->trans("Type") . " 6)" //$langs->trans("%ageOnServiceBeforeVAT"),
+        "1" => $langs->trans("Yes").' ('.$langs->trans("Type")." 1)", //$langs->trans("%ageOnAllWithoutVAT"),
+        "2" => $langs->trans("Yes").' ('.$langs->trans("Type")." 2)", //$langs->trans("%ageOnAllBeforeVAT"),
+        "3" => $langs->trans("Yes").' ('.$langs->trans("Type")." 3)", //$langs->trans("%ageOnProductsWithoutVAT"),
+        "4" => $langs->trans("Yes").' ('.$langs->trans("Type")." 4)", //$langs->trans("%ageOnProductsBeforeVAT"),
+        "5" => $langs->trans("Yes").' ('.$langs->trans("Type")." 5)", //$langs->trans("%ageOnServiceWithoutVAT"),
+        "6" => $langs->trans("Yes").' ('.$langs->trans("Type")." 6)" //$langs->trans("%ageOnServiceBeforeVAT"),
     );
 }
 
@@ -616,9 +616,9 @@ 
     $ok = 1;
     foreach ($listfield as $f => $value) {
         if ($value == 'country_id' && in_array($tablib[$id], array('DictionaryVAT', 'DictionaryRegion', 'DictionaryCompanyType', 'DictionaryHolidayTypes', 'DictionaryRevenueStamp', 'DictionaryAccountancysystem', 'DictionaryAccountancyCategory')))
-            continue;  // For some pages, country is not mandatory
+            continue; // For some pages, country is not mandatory
         if ($value == 'country' && in_array($tablib[$id], array('DictionaryCanton', 'DictionaryCompanyType', 'DictionaryRevenueStamp')))
-            continue;  // For some pages, country is not mandatory
+            continue; // For some pages, country is not mandatory
         if ($value == 'localtax1' && empty($_POST['localtax1_type']))
             continue;
         if ($value == 'localtax2' && empty($_POST['localtax2_type']))
@@ -628,7 +628,7 @@ 
         if ($value == 'formula' && empty($_POST['formula']))
             continue;
         if ($value == 'sortorder')
-            continue;  // For a column name 'sortorder', we use the field name 'position'
+            continue; // For a column name 'sortorder', we use the field name 'position'
         if ((!isset($_POST[$value]) || $_POST[$value] == '') && (!in_array($listfield[$f], array('decalage', 'module', 'accountancy_code', 'accountancy_code_sell', 'accountancy_code_buy', 'tracking'))  // Fields that are not mandatory
             && (!($id == 10 && $listfield[$f] == 'code')) // Code is mandatory fir table 10
             )
@@ -671,7 +671,7 @@ 
         }
     }
     // Other checks
-    if (GETPOST('actionadd') && $tabname[$id] == MAIN_DB_PREFIX . "c_actioncomm" && isset($_POST["type"]) && in_array($_POST["type"], array('system', 'systemauto'))) {
+    if (GETPOST('actionadd') && $tabname[$id] == MAIN_DB_PREFIX."c_actioncomm" && isset($_POST["type"]) && in_array($_POST["type"], array('system', 'systemauto'))) {
         $ok = 0;
         setEventMessages($langs->transnoentities('ErrorReservedTypeSystemSystemAuto'), null, 'errors');
     }
@@ -719,7 +719,7 @@ 
         if ($tabrowid[$id]) {
             // Recupere id libre pour insertion
             $newid = 0;
-            $sql = "SELECT max(" . $tabrowid[$id] . ") newid from " . $tabname[$id];
+            $sql = "SELECT max(".$tabrowid[$id].") newid from ".$tabname[$id];
             $result = $db->query($sql);
             if ($result) {
                 $obj = $db->fetch_object($result);
@@ -730,17 +730,17 @@ 
         }
 
         // Add new entry
-        $sql = "INSERT INTO " . $tabname[$id] . " (";
+        $sql = "INSERT INTO ".$tabname[$id]." (";
         // List of fields
         if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldinsert))
-            $sql .= $tabrowid[$id] . ",";
+            $sql .= $tabrowid[$id].",";
         $sql .= $tabfieldinsert[$id];
         $sql .= ",active)";
         $sql .= " VALUES(";
 
         // List of values
         if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldinsert))
-            $sql .= $newid . ",";
+            $sql .= $newid.",";
         $i = 0;
         foreach ($listfieldinsert as $f => $value) {
             if ($value == 'price' || preg_match('/^amount/i', $value) || $value == 'taux') {
@@ -751,11 +751,11 @@ 
             if ($i)
                 $sql .= ",";
             if ($listfieldvalue[$i] == 'sortorder') {  // For column name 'sortorder', we use the field name 'position'
-                $sql .= "'" . (int) $db->escape($_POST['position']) . "'";
+                $sql .= "'".(int) $db->escape($_POST['position'])."'";
             } elseif ($_POST[$listfieldvalue[$i]] == '' && !($listfieldvalue[$i] == 'code' && $id == 10))
-                $sql .= "null";  // For vat, we want/accept code = ''
+                $sql .= "null"; // For vat, we want/accept code = ''
             else
-                $sql .= "'" . $db->escape($_POST[$listfieldvalue[$i]]) . "'";
+                $sql .= "'".$db->escape($_POST[$listfieldvalue[$i]])."'";
             $i++;
         }
         $sql .= ",1)";
@@ -783,11 +783,11 @@ 
         }
 
         // Modify entry
-        $sql = "UPDATE " . $tabname[$id] . " SET ";
+        $sql = "UPDATE ".$tabname[$id]." SET ";
         // Modifie valeur des champs
         if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldmodify)) {
-            $sql .= $tabrowid[$id] . "=";
-            $sql .= "'" . $db->escape($rowid) . "', ";
+            $sql .= $tabrowid[$id]."=";
+            $sql .= "'".$db->escape($rowid)."', ";
         }
         $i = 0;
         foreach ($listfieldmodify as $field) {
@@ -798,18 +798,18 @@ 
             }
             if ($i)
                 $sql .= ",";
-            $sql .= $field . "=";
+            $sql .= $field."=";
             if ($listfieldvalue[$i] == 'sortorder') {  // For column name 'sortorder', we use the field name 'position'
-                $sql .= "'" . (int) $db->escape($_POST['position']) . "'";
+                $sql .= "'".(int) $db->escape($_POST['position'])."'";
             } elseif ($_POST[$listfieldvalue[$i]] == '' && !($listfieldvalue[$i] == 'code' && $id == 10))
-                $sql .= "null";  // For vat, we want/accept code = ''
+                $sql .= "null"; // For vat, we want/accept code = ''
             else
-                $sql .= "'" . $db->escape($_POST[$listfieldvalue[$i]]) . "'";
+                $sql .= "'".$db->escape($_POST[$listfieldvalue[$i]])."'";
             $i++;
         }
-        $sql .= " WHERE " . $rowidcol . " = '" . $rowid . "'";
+        $sql .= " WHERE ".$rowidcol." = '".$rowid."'";
         if (in_array('entity', $listfieldmodify))
-            $sql .= " AND entity = '" . getEntity($tabname[$id]) . "'";
+            $sql .= " AND entity = '".getEntity($tabname[$id])."'";
 
         dol_syslog("actionmodify", LOG_DEBUG);
         //print $sql;
@@ -832,7 +832,7 @@ 
         $rowidcol = "rowid";
     }
 
-    $sql = "DELETE FROM " . $tabname[$id] . " WHERE " . $rowidcol . "='" . $rowid . "'" . ($entity != '' ? " AND entity = " . (int) $entity : '');
+    $sql = "DELETE FROM ".$tabname[$id]." WHERE ".$rowidcol."='".$rowid."'".($entity != '' ? " AND entity = ".(int) $entity : '');
 
     dol_syslog("delete", LOG_DEBUG);
     $result = $db->query($sql);
@@ -854,9 +854,9 @@ 
     }
 
     if ($rowid) {
-        $sql = "UPDATE " . $tabname[$id] . " SET active = 1 WHERE " . $rowidcol . "='" . $rowid . "'" . ($entity != '' ? " AND entity = " . (int) $entity : '');
+        $sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE ".$rowidcol."='".$rowid."'".($entity != '' ? " AND entity = ".(int) $entity : '');
     } elseif ($code) {
-        $sql = "UPDATE " . $tabname[$id] . " SET active = 1 WHERE code='" . dol_escape_htmltag($code) . "'" . ($entity != '' ? " AND entity = " . (int) $entity : '');
+        $sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE code='".dol_escape_htmltag($code)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
     }
 
     $result = $db->query($sql);
@@ -874,9 +874,9 @@ 
     }
 
     if ($rowid) {
-        $sql = "UPDATE " . $tabname[$id] . " SET active = 0 WHERE " . $rowidcol . "='" . $rowid . "'" . ($entity != '' ? " AND entity = " . (int) $entity : '');
+        $sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE ".$rowidcol."='".$rowid."'".($entity != '' ? " AND entity = ".(int) $entity : '');
     } elseif ($code) {
-        $sql = "UPDATE " . $tabname[$id] . " SET active = 0 WHERE code='" . dol_escape_htmltag($code) . "'" . ($entity != '' ? " AND entity = " . (int) $entity : '');
+        $sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE code='".dol_escape_htmltag($code)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
     }
 
     $result = $db->query($sql);
@@ -894,9 +894,9 @@ 
     }
 
     if ($rowid) {
-        $sql = "UPDATE " . $tabname[$id] . " SET favorite = 1 WHERE " . $rowidcol . "='" . $rowid . "'" . ($entity != '' ? " AND entity = " . (int) $entity : '');
+        $sql = "UPDATE ".$tabname[$id]." SET favorite = 1 WHERE ".$rowidcol."='".$rowid."'".($entity != '' ? " AND entity = ".(int) $entity : '');
     } elseif ($code) {
-        $sql = "UPDATE " . $tabname[$id] . " SET favorite = 1 WHERE code='" . dol_escape_htmltag($code) . "'" . ($entity != '' ? " AND entity = " . (int) $entity : '');
+        $sql = "UPDATE ".$tabname[$id]." SET favorite = 1 WHERE code='".dol_escape_htmltag($code)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
     }
 
     $result = $db->query($sql);
@@ -914,9 +914,9 @@ 
     }
 
     if ($rowid) {
-        $sql = "UPDATE " . $tabname[$id] . " SET favorite = 0 WHERE " . $rowidcol . "='" . $rowid . "'" . ($entity != '' ? " AND entity = " . (int) $entity : '');
+        $sql = "UPDATE ".$tabname[$id]." SET favorite = 0 WHERE ".$rowidcol."='".$rowid."'".($entity != '' ? " AND entity = ".(int) $entity : '');
     } elseif ($code) {
-        $sql = "UPDATE " . $tabname[$id] . " SET favorite = 0 WHERE code='" . dol_escape_htmltag($code) . "'" . ($entity != '' ? " AND entity = " . (int) $entity : '');
+        $sql = "UPDATE ".$tabname[$id]." SET favorite = 0 WHERE code='".dol_escape_htmltag($code)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
     }
 
     $result = $db->query($sql);
@@ -938,8 +938,8 @@ 
 $titre = $langs->trans("DictionarySetup");
 $linkback = '';
 if ($id) {
-    $titre .= ' - ' . $langs->trans($tablib[$id]);
-    $linkback = '<a href="' . $_SERVER['PHP_SELF'] . '">' . $langs->trans("BackToDictionaryList") . '</a>';
+    $titre .= ' - '.$langs->trans($tablib[$id]);
+    $linkback = '<a href="'.$_SERVER['PHP_SELF'].'">'.$langs->trans("BackToDictionaryList").'</a>';
 }
 $titlepicto = 'title_setup';
 if ($id == 10 && GETPOST('from') == 'accountancy') {
@@ -955,30 +955,30 @@ 
 
 if (empty($id)) {
     print $langs->trans("DictionaryDesc");
-    print " " . $langs->trans("OnlyActiveElementsAreShown") . "<br>\n";
+    print " ".$langs->trans("OnlyActiveElementsAreShown")."<br>\n";
     print '<br>';
 }
 
 
-$param = '&id=' . urlencode($id);
+$param = '&id='.urlencode($id);
 if ($search_country_id > 0)
-    $param .= '&search_country_id=' . urlencode($search_country_id);
+    $param .= '&search_country_id='.urlencode($search_country_id);
 if ($search_code != '')
-    $param .= '&search_code=' . urlencode($search_country_id);
+    $param .= '&search_code='.urlencode($search_country_id);
 if ($entity != '')
-    $param .= '&entity=' . (int) $entity;
+    $param .= '&entity='.(int) $entity;
 $paramwithsearch = $param;
 if ($sortorder)
-    $paramwithsearch .= '&sortorder=' . urlencode($sortorder);
+    $paramwithsearch .= '&sortorder='.urlencode($sortorder);
 if ($sortfield)
-    $paramwithsearch .= '&sortfield=' . urlencode($sortfield);
+    $paramwithsearch .= '&sortfield='.urlencode($sortfield);
 if (GETPOST('from'))
-    $paramwithsearch .= '&from=' . urlencode(GETPOST('from', 'alpha'));
+    $paramwithsearch .= '&from='.urlencode(GETPOST('from', 'alpha'));
 
 
 // Confirmation de la suppression de la ligne
 if ($action == 'delete') {
-    print $form->formconfirm($_SERVER["PHP_SELF"] . '?' . ($page ? 'page=' . $page . '&' : '') . 'rowid=' . $rowid . '&code=' . urlencode($code) . $paramwithsearch, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_delete', '', 0, 1);
+    print $form->formconfirm($_SERVER["PHP_SELF"].'?'.($page ? 'page='.$page.'&' : '').'rowid='.$rowid.'&code='.urlencode($code).$paramwithsearch, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_delete', '', 0, 1);
 }
 //var_dump($elementList);
 
@@ -992,7 +992,7 @@ 
     if (!preg_match('/ WHERE /', $sql))
         $sql .= " WHERE 1 = 1";
     if ($search_country_id > 0)
-        $sql .= " AND c.rowid = " . $search_country_id;
+        $sql .= " AND c.rowid = ".$search_country_id;
     if ($search_code != '' && $id != 9)
         $sql .= natural_search("code", $search_code);
     if ($search_code != '' && $id == 9)
@@ -1002,14 +1002,14 @@ 
         // If sort order is "country", we use country_code instead
         if ($sortfield == 'country')
             $sortfield = 'country_code';
-        $sql .= " ORDER BY " . $db->escape($sortfield);
+        $sql .= " ORDER BY ".$db->escape($sortfield);
         if ($sortorder) {
-            $sql .= " " . strtoupper($db->escape($sortorder));
+            $sql .= " ".strtoupper($db->escape($sortorder));
         }
         $sql .= ", ";
         // Clear the required sort criteria for the tabsqlsort to be able to force it with selected value
-        $tabsqlsort[$id] = preg_replace('/([a-z]+\.)?' . $sortfield . ' ' . $sortorder . ',/i', '', $tabsqlsort[$id]);
-        $tabsqlsort[$id] = preg_replace('/([a-z]+\.)?' . $sortfield . ',/i', '', $tabsqlsort[$id]);
+        $tabsqlsort[$id] = preg_replace('/([a-z]+\.)?'.$sortfield.' '.$sortorder.',/i', '', $tabsqlsort[$id]);
+        $tabsqlsort[$id] = preg_replace('/([a-z]+\.)?'.$sortfield.',/i', '', $tabsqlsort[$id]);
     } else {
         $sql .= " ORDER BY ";
     }
@@ -1018,15 +1018,15 @@ 
     //print $sql;
 
     if (empty($tabfield[$id])) {
-        dol_print_error($db, 'The table with id ' . $id . ' has no array tabfield defined');
+        dol_print_error($db, 'The table with id '.$id.' has no array tabfield defined');
         exit;
     }
     $fieldlist = explode(',', $tabfield[$id]);
 
     // print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">';
-    print '<form href="' . BASE_URI . '?controller=admin&method=dict&id=' . $id . '" method="POST">';
-    print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
-    print '<input type="hidden" name="from" value="' . dol_escape_htmltag(GETPOST('from', 'alpha')) . '">';
+    print '<form href="'.BASE_URI.'?controller=admin&method=dict&id='.$id.'" method="POST">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print '<input type="hidden" name="from" value="'.dol_escape_htmltag(GETPOST('from', 'alpha')).'">';
 
     if ($id == 10 && empty($conf->global->FACTURE_TVAOPTION)) {
         print info_admin($langs->trans("VATIsUsedIsOff", $langs->transnoentities("Setup"), $langs->transnoentities("CompanyFoundation")));
@@ -1054,8 +1054,8 @@ 
 
             // Determine le nom du champ par rapport aux noms possibles
             // dans les dictionnaires de donnees
-            $valuetoshow = ucfirst($fieldlist[$field]);   // Par defaut
-            $valuetoshow = $langs->trans($valuetoshow);   // try to translate
+            $valuetoshow = ucfirst($fieldlist[$field]); // Par defaut
+            $valuetoshow = $langs->trans($valuetoshow); // try to translate
             $class = '';
             if ($fieldlist[$field] == 'source') {
                 $valuetoshow = $langs->trans("Contact");
@@ -1064,28 +1064,28 @@ 
                 $valuetoshow = $langs->trans("PriceUHT");
             }
             if ($fieldlist[$field] == 'taux') {
-                if ($tabname[$id] != MAIN_DB_PREFIX . "c_revenuestamp")
+                if ($tabname[$id] != MAIN_DB_PREFIX."c_revenuestamp")
                     $valuetoshow = $langs->trans("Rate");
                 else
                     $valuetoshow = $langs->trans("Amount");
                 $class = 'center';
             }
             if ($fieldlist[$field] == 'localtax1_type') {
-                $valuetoshow = $langs->trans("UseLocalTax") . " 2";
+                $valuetoshow = $langs->trans("UseLocalTax")." 2";
                 $class = "center";
                 $sortable = 0;
             }
             if ($fieldlist[$field] == 'localtax1') {
-                $valuetoshow = $langs->trans("Rate") . " 2";
+                $valuetoshow = $langs->trans("Rate")." 2";
                 $class = "center";
             }
             if ($fieldlist[$field] == 'localtax2_type') {
-                $valuetoshow = $langs->trans("UseLocalTax") . " 3";
+                $valuetoshow = $langs->trans("UseLocalTax")." 3";
                 $class = "center";
                 $sortable = 0;
             }
             if ($fieldlist[$field] == 'localtax2') {
-                $valuetoshow = $langs->trans("Rate") . " 3";
+                $valuetoshow = $langs->trans("Rate")." 3";
                 $class = "center";
             }
             if ($fieldlist[$field] == 'organization') {
@@ -1095,7 +1095,7 @@ 
                 $valuetoshow = $langs->trans("Language");
             }
             if ($fieldlist[$field] == 'type') {
-                if ($tabname[$id] == MAIN_DB_PREFIX . "c_paiement")
+                if ($tabname[$id] == MAIN_DB_PREFIX."c_paiement")
                     $valuetoshow = $form->textwithtooltip($langs->trans("Type"), $langs->trans("TypePaymentDesc"), 2, 1, img_help(1, ''));
                 else
                     $valuetoshow = $langs->trans("Type");
@@ -1240,15 +1240,15 @@ 
                     $showfield = 1;
                 }
                 if ($fieldlist[$field] == 'region') {
-                    $valuetoshow = $langs->trans("Country") . '/' . $langs->trans("Region");
+                    $valuetoshow = $langs->trans("Country").'/'.$langs->trans("Region");
                     $showfield = 1;
                 }
             }
 
             if ($valuetoshow != '') {
-                print '<td' . ($class ? ' class="' . $class . '"' : '') . '>';
+                print '<td'.($class ? ' class="'.$class.'"' : '').'>';
                 if (!empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i', $tabhelp[$id][$value]))
-                    print '<a href="' . $tabhelp[$id][$value] . '" target="_blank">' . $valuetoshow . ' ' . img_help(1, $valuetoshow) . '</a>';
+                    print '<a href="'.$tabhelp[$id][$value].'" target="_blank">'.$valuetoshow.' '.img_help(1, $valuetoshow).'</a>';
                 else if (!empty($tabhelp[$id][$value]))
                     print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value]);
                 else
@@ -1262,9 +1262,9 @@ 
         if ($id == 4)
             print '<td></td>';
         print '<td>';
-        print '<input type="hidden" name="id" value="' . $id . '">';
+        print '<input type="hidden" name="id" value="'.$id.'">';
         if (!is_null($withentity))
-            print '<input type="hidden" name="entity" value="' . $withentity . '">';
+            print '<input type="hidden" name="entity" value="'.$withentity.'">';
         print '</td>';
         print '<td style="min-width: 26px;"></td>';
         print '<td style="min-width: 26px;"></td>';
@@ -1284,7 +1284,7 @@ 
 
         $tmpaction = 'create';
         $parameters = array('fieldlist' => $fieldlist, 'tabname' => $tabname[$id]);
-        $reshook = $hookmanager->executeHooks('createDictionaryFieldlist', $parameters, $obj, $tmpaction);    // Note that $action and $object may have been modified by some hooks
+        $reshook = $hookmanager->executeHooks('createDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
         $error = $hookmanager->error;
         $errors = $hookmanager->errors;
 
@@ -1299,7 +1299,7 @@ 
             print '<td></td>';
         print '<td colspan="3" align="center">';
         if ($action != 'edit') {
-            print '<input type="submit" class="button" name="actionadd" value="' . $langs->trans("Add") . '">';
+            print '<input type="submit" class="button" name="actionadd" value="'.$langs->trans("Add").'">';
         }
         print '</td>';
         print "</tr>";
@@ -1317,9 +1317,9 @@ 
     print '<br>';
 
     // print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">';
-    print '<form href="' . BASE_URI . '?controller=admin&method=dict&id=' . $id . '" method="POST">';
-    print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
-    print '<input type="hidden" name="from" value="' . dol_escape_htmltag(GETPOST('from', 'alpha')) . '">';
+    print '<form href="'.BASE_URI.'?controller=admin&method=dict&id='.$id.'" method="POST">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print '<input type="hidden" name="from" value="'.dol_escape_htmltag(GETPOST('from', 'alpha')).'">';
 
     // List of available record in database
     dol_syslog("htdocs/admin/dict", LOG_DEBUG);
@@ -1330,7 +1330,7 @@ 
 
         // There is several pages
         if ($num > $listlimit || $page) {
-            print_fleche_navigation($page, $_SERVER["PHP_SELF"], $paramwithsearch, ($num > $listlimit), '<li class="pagination"><span>' . $langs->trans("Page") . ' ' . ($page + 1) . '</span></li>');
+            print_fleche_navigation($page, $_SERVER["PHP_SELF"], $paramwithsearch, ($num > $listlimit), '<li class="pagination"><span>'.$langs->trans("Page").' '.($page + 1).'</span></li>');
             print '<div class="clearboth"></div>';
         }
 
@@ -1358,7 +1358,7 @@ 
                     $filterfound++;
                 } elseif ($value == 'code') {
                     print '<td class="liste_titre">';
-                    print '<input type="text" class="maxwidth100" name="search_code" value="' . dol_escape_htmltag($search_code) . '">';
+                    print '<input type="text" class="maxwidth100" name="search_code" value="'.dol_escape_htmltag($search_code).'">';
                     print '</td>';
                     $filterfound++;
                 } else {
@@ -1386,7 +1386,7 @@ 
 
             // Determine le nom du champ par rapport aux noms possibles
             // dans les dictionnaires de donnees
-            $showfield = 1;          // By defaut
+            $showfield = 1; // By defaut
             $align = "left";
             $sortable = 1;
             $valuetoshow = '';
@@ -1397,8 +1397,8 @@ 
               $align=$tmp['align'];
               $sortable=$tmp['sortable'];
              */
-            $valuetoshow = ucfirst($fieldlist[$field]);   // By defaut
-            $valuetoshow = $langs->trans($valuetoshow);   // try to translate
+            $valuetoshow = ucfirst($fieldlist[$field]); // By defaut
+            $valuetoshow = $langs->trans($valuetoshow); // try to translate
             if ($fieldlist[$field] == 'source') {
                 $valuetoshow = $langs->trans("Contact");
             }
@@ -1406,29 +1406,29 @@ 
                 $valuetoshow = $langs->trans("PriceUHT");
             }
             if ($fieldlist[$field] == 'taux') {
-                if ($tabname[$id] != MAIN_DB_PREFIX . "c_revenuestamp")
+                if ($tabname[$id] != MAIN_DB_PREFIX."c_revenuestamp")
                     $valuetoshow = $langs->trans("Rate");
                 else
                     $valuetoshow = $langs->trans("Amount");
                 $align = 'center';
             }
             if ($fieldlist[$field] == 'localtax1_type') {
-                $valuetoshow = $langs->trans("UseLocalTax") . " 2";
+                $valuetoshow = $langs->trans("UseLocalTax")." 2";
                 $align = "center";
                 $sortable = 0;
             }
             if ($fieldlist[$field] == 'localtax1') {
-                $valuetoshow = $langs->trans("Rate") . " 2";
+                $valuetoshow = $langs->trans("Rate")." 2";
                 $align = "center";
                 $sortable = 0;
             }
             if ($fieldlist[$field] == 'localtax2_type') {
-                $valuetoshow = $langs->trans("UseLocalTax") . " 3";
+                $valuetoshow = $langs->trans("UseLocalTax")." 3";
                 $align = "center";
                 $sortable = 0;
             }
             if ($fieldlist[$field] == 'localtax2') {
-                $valuetoshow = $langs->trans("Rate") . " 3";
+                $valuetoshow = $langs->trans("Rate")." 3";
                 $align = "center";
                 $sortable = 0;
             }
@@ -1578,14 +1578,14 @@ 
 
             // Affiche nom du champ
             if ($showfield) {
-                print getTitleFieldOfList($valuetoshow, 0, $_SERVER["PHP_SELF"], ($sortable ? $fieldlist[$field] : ''), ($page ? 'page=' . $page . '&' : ''), $param, "align=" . $align, $sortfield, $sortorder);
+                print getTitleFieldOfList($valuetoshow, 0, $_SERVER["PHP_SELF"], ($sortable ? $fieldlist[$field] : ''), ($page ? 'page='.$page.'&' : ''), $param, "align=".$align, $sortfield, $sortorder);
             }
         }
         // Favorite - Only activated on country dictionary
         if ($id == 4)
-            print getTitleFieldOfList($langs->trans("Favorite"), 0, $_SERVER["PHP_SELF"], "favorite", ($page ? 'page=' . $page . '&' : ''), $param, 'align="center"', $sortfield, $sortorder);
+            print getTitleFieldOfList($langs->trans("Favorite"), 0, $_SERVER["PHP_SELF"], "favorite", ($page ? 'page='.$page.'&' : ''), $param, 'align="center"', $sortfield, $sortorder);
 
-        print getTitleFieldOfList($langs->trans("Status"), 0, $_SERVER["PHP_SELF"], "active", ($page ? 'page=' . $page . '&' : ''), $param, 'align="center"', $sortfield, $sortorder);
+        print getTitleFieldOfList($langs->trans("Status"), 0, $_SERVER["PHP_SELF"], "active", ($page ? 'page='.$page.'&' : ''), $param, 'align="center"', $sortfield, $sortorder);
         print getTitleFieldOfList('');
         print getTitleFieldOfList('');
         print '</tr>';
@@ -1595,11 +1595,11 @@ 
             while ($i < $num) {
                 $obj = $db->fetch_object($resql);
                 //print_r($obj);
-                print '<tr class="oddeven" id="rowid-' . $obj->rowid . '">';
+                print '<tr class="oddeven" id="rowid-'.$obj->rowid.'">';
                 if ($action == 'edit' && ($rowid == (!empty($obj->rowid) ? $obj->rowid : $obj->code))) {
                     $tmpaction = 'edit';
                     $parameters = array('fieldlist' => $fieldlist, 'tabname' => $tabname[$id]);
-                    $reshook = $hookmanager->executeHooks('editDictionaryFieldlist', $parameters, $obj, $tmpaction);    // Note that $action and $object may have been modified by some hooks
+                    $reshook = $hookmanager->executeHooks('editDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
                     $error = $hookmanager->error;
                     $errors = $hookmanager->errors;
 
@@ -1609,19 +1609,19 @@ 
                     }
 
                     print '<td colspan="3" align="center">';
-                    print '<div name="' . (!empty($obj->rowid) ? $obj->rowid : $obj->code) . '"></div>';
-                    print '<input type="hidden" name="page" value="' . $page . '">';
-                    print '<input type="hidden" name="rowid" value="' . $rowid . '">';
+                    print '<div name="'.(!empty($obj->rowid) ? $obj->rowid : $obj->code).'"></div>';
+                    print '<input type="hidden" name="page" value="'.$page.'">';
+                    print '<input type="hidden" name="rowid" value="'.$rowid.'">';
                     if (!is_null($withentity))
-                        print '<input type="hidden" name="entity" value="' . $withentity . '">';
-                    print '<input type="submit" class="button" name="actionmodify" value="' . $langs->trans("Modify") . '">';
-                    print '<input type="submit" class="button" name="actioncancel" value="' . $langs->trans("Cancel") . '">';
+                        print '<input type="hidden" name="entity" value="'.$withentity.'">';
+                    print '<input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'">';
+                    print '<input type="submit" class="button" name="actioncancel" value="'.$langs->trans("Cancel").'">';
                     print '</td>';
                 }
                 else {
                     $tmpaction = 'view';
                     $parameters = array('fieldlist' => $fieldlist, 'tabname' => $tabname[$id]);
-                    $reshook = $hookmanager->executeHooks('viewDictionaryFieldlist', $parameters, $obj, $tmpaction);    // Note that $action and $object may have been modified by some hooks
+                    $reshook = $hookmanager->executeHooks('viewDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
 
                     $error = $hookmanager->error;
                     $errors = $hookmanager->errors;
@@ -1650,8 +1650,8 @@ 
                                 if (empty($obj->country_code)) {
                                     $valuetoshow = '-';
                                 } else {
-                                    $key = $langs->trans("Country" . strtoupper($obj->country_code));
-                                    $valuetoshow = ($key != "Country" . strtoupper($obj->country_code) ? $obj->country_code . " - " . $key : $obj->country);
+                                    $key = $langs->trans("Country".strtoupper($obj->country_code));
+                                    $valuetoshow = ($key != "Country".strtoupper($obj->country_code) ? $obj->country_code." - ".$key : $obj->country);
                                 }
                             } else if ($fieldlist[$field] == 'recuperableonly' || $fieldlist[$field] == 'deductible' || $fieldlist[$field] == 'category_type') {
                                 $valuetoshow = yn($valuetoshow);
@@ -1672,58 +1672,58 @@ 
                                 $valuetoshow = yn($elementList[$valuetoshow]);
                             } else if ($fieldlist[$field] == 'libelle_facture') {
                                 $langs->load("bills");
-                                $key = $langs->trans("PaymentCondition" . strtoupper($obj->code));
-                                $valuetoshow = ($obj->code && $key != "PaymentCondition" . strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
+                                $key = $langs->trans("PaymentCondition".strtoupper($obj->code));
+                                $valuetoshow = ($obj->code && $key != "PaymentCondition".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
                                 $valuetoshow = nl2br($valuetoshow);
-                            } else if ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX . 'c_country') {
-                                $key = $langs->trans("Country" . strtoupper($obj->code));
-                                $valuetoshow = ($obj->code && $key != "Country" . strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            } else if ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX . 'c_availability') {
+                            } else if ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_country') {
+                                $key = $langs->trans("Country".strtoupper($obj->code));
+                                $valuetoshow = ($obj->code && $key != "Country".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
+                            } else if ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_availability') {
                                 $langs->load("propal");
-                                $key = $langs->trans("AvailabilityType" . strtoupper($obj->code));
-                                $valuetoshow = ($obj->code && $key != "AvailabilityType" . strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            } else if ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX . 'c_actioncomm') {
-                                $key = $langs->trans("Action" . strtoupper($obj->code));
-                                $valuetoshow = ($obj->code && $key != "Action" . strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            } else if (!empty($obj->code_iso) && $fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX . 'c_currencies') {
-                                $key = $langs->trans("Currency" . strtoupper($obj->code_iso));
-                                $valuetoshow = ($obj->code_iso && $key != "Currency" . strtoupper($obj->code_iso) ? $key : $obj->{$fieldlist[$field]});
-                            } else if ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX . 'c_typent') {
+                                $key = $langs->trans("AvailabilityType".strtoupper($obj->code));
+                                $valuetoshow = ($obj->code && $key != "AvailabilityType".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
+                            } else if ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_actioncomm') {
+                                $key = $langs->trans("Action".strtoupper($obj->code));
+                                $valuetoshow = ($obj->code && $key != "Action".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
+                            } else if (!empty($obj->code_iso) && $fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_currencies') {
+                                $key = $langs->trans("Currency".strtoupper($obj->code_iso));
+                                $valuetoshow = ($obj->code_iso && $key != "Currency".strtoupper($obj->code_iso) ? $key : $obj->{$fieldlist[$field]});
+                            } else if ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_typent') {
                                 $key = $langs->trans(strtoupper($obj->code));
                                 $valuetoshow = ($key != strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            } else if ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX . 'c_prospectlevel') {
+                            } else if ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_prospectlevel') {
                                 $key = $langs->trans(strtoupper($obj->code));
                                 $valuetoshow = ($key != strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            } else if ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX . 'c_civility') {
-                                $key = $langs->trans("Civility" . strtoupper($obj->code));
-                                $valuetoshow = ($obj->code && $key != "Civility" . strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            } else if ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX . 'c_type_contact') {
+                            } else if ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_civility') {
+                                $key = $langs->trans("Civility".strtoupper($obj->code));
+                                $valuetoshow = ($obj->code && $key != "Civility".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
+                            } else if ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_type_contact') {
                                 $langs->load('agenda');
-                                $key = $langs->trans("TypeContact_" . $obj->element . "_" . $obj->source . "_" . strtoupper($obj->code));
-                                $valuetoshow = ($obj->code && $key != "TypeContact_" . $obj->element . "_" . $obj->source . "_" . strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            } else if ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX . 'c_payment_term') {
+                                $key = $langs->trans("TypeContact_".$obj->element."_".$obj->source."_".strtoupper($obj->code));
+                                $valuetoshow = ($obj->code && $key != "TypeContact_".$obj->element."_".$obj->source."_".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
+                            } else if ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_payment_term') {
                                 $langs->load("bills");
-                                $key = $langs->trans("PaymentConditionShort" . strtoupper($obj->code));
-                                $valuetoshow = ($obj->code && $key != "PaymentConditionShort" . strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            } else if ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX . 'c_paiement') {
+                                $key = $langs->trans("PaymentConditionShort".strtoupper($obj->code));
+                                $valuetoshow = ($obj->code && $key != "PaymentConditionShort".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
+                            } else if ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_paiement') {
                                 $langs->load("bills");
-                                $key = $langs->trans("PaymentType" . strtoupper($obj->code));
-                                $valuetoshow = ($obj->code && $key != "PaymentType" . strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            } else if ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX . 'c_input_reason') {
-                                $key = $langs->trans("DemandReasonType" . strtoupper($obj->code));
-                                $valuetoshow = ($obj->code && $key != "DemandReasonType" . strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            } else if ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX . 'c_input_method') {
+                                $key = $langs->trans("PaymentType".strtoupper($obj->code));
+                                $valuetoshow = ($obj->code && $key != "PaymentType".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
+                            } else if ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_input_reason') {
+                                $key = $langs->trans("DemandReasonType".strtoupper($obj->code));
+                                $valuetoshow = ($obj->code && $key != "DemandReasonType".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
+                            } else if ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_input_method') {
                                 $langs->load("orders");
                                 $key = $langs->trans($obj->code);
                                 $valuetoshow = ($obj->code && $key != $obj->code) ? $key : $obj->{$fieldlist[$field]};
-                            } else if ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX . 'c_shipment_mode') {
+                            } else if ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_shipment_mode') {
                                 $langs->load("sendings");
-                                $key = $langs->trans("SendingMethod" . strtoupper($obj->code));
-                                $valuetoshow = ($obj->code && $key != "SendingMethod" . strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            } else if ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX . 'c_paper_format') {
-                                $key = $langs->trans('PaperFormat' . strtoupper($obj->code));
-                                $valuetoshow = ($obj->code && $key != 'PaperFormat' . strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            } else if ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX . 'c_type_fees') {
+                                $key = $langs->trans("SendingMethod".strtoupper($obj->code));
+                                $valuetoshow = ($obj->code && $key != "SendingMethod".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
+                            } else if ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_paper_format') {
+                                $key = $langs->trans('PaperFormat'.strtoupper($obj->code));
+                                $valuetoshow = ($obj->code && $key != 'PaperFormat'.strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
+                            } else if ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_type_fees') {
                                 $langs->load('trips');
                                 $key = $langs->trans(strtoupper($obj->code));
                                 $valuetoshow = ($obj->code && $key != strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
@@ -1731,15 +1731,15 @@ 
                                 $showfield = 0;
                             } else if ($fieldlist[$field] == 'unicode') {
                                 $valuetoshow = $langs->getCurrencySymbol($obj->code, 1);
-                            } else if ($fieldlist[$field] == 'label' && $tabname[$_GET["id"]] == MAIN_DB_PREFIX . 'c_units') {
+                            } else if ($fieldlist[$field] == 'label' && $tabname[$_GET["id"]] == MAIN_DB_PREFIX.'c_units') {
                                 $langs->load("products");
                                 $valuetoshow = $langs->trans($obj->{$fieldlist[$field]});
-                            } else if ($fieldlist[$field] == 'short_label' && $tabname[$_GET["id"]] == MAIN_DB_PREFIX . 'c_units') {
+                            } else if ($fieldlist[$field] == 'short_label' && $tabname[$_GET["id"]] == MAIN_DB_PREFIX.'c_units') {
                                 $langs->load("products");
                                 $valuetoshow = $langs->trans($obj->{$fieldlist[$field]});
-                            } else if (($fieldlist[$field] == 'unit') && ($tabname[$id] == MAIN_DB_PREFIX . 'c_paper_format')) {
-                                $key = $langs->trans('SizeUnit' . strtolower($obj->unit));
-                                $valuetoshow = ($obj->code && $key != 'SizeUnit' . strtolower($obj->unit) ? $key : $obj->{$fieldlist[$field]});
+                            } else if (($fieldlist[$field] == 'unit') && ($tabname[$id] == MAIN_DB_PREFIX.'c_paper_format')) {
+                                $key = $langs->trans('SizeUnit'.strtolower($obj->unit));
+                                $valuetoshow = ($obj->code && $key != 'SizeUnit'.strtolower($obj->unit) ? $key : $obj->{$fieldlist[$field]});
                             } else if ($fieldlist[$field] == 'localtax1' || $fieldlist[$field] == 'localtax2') {
                                 $align = "center";
                             } else if ($fieldlist[$field] == 'localtax1_type') {
@@ -1771,9 +1771,9 @@ 
                                     }
                                 }
                             } elseif ($fieldlist[$field] == 'fk_c_exp_tax_cat') {
-                                $valuetoshow = getDictvalue(MAIN_DB_PREFIX . 'c_exp_tax_cat', 'label', $valuetoshow);
+                                $valuetoshow = getDictvalue(MAIN_DB_PREFIX.'c_exp_tax_cat', 'label', $valuetoshow);
                                 $valuetoshow = $langs->trans($valuetoshow);
-                            } elseif ($tabname[$id] == MAIN_DB_PREFIX . 'c_exp_tax_cat') {
+                            } elseif ($tabname[$id] == MAIN_DB_PREFIX.'c_exp_tax_cat') {
                                 $valuetoshow = $langs->trans($valuetoshow);
                             }
 
@@ -1792,7 +1792,7 @@ 
                                 $class .= ' nowrap';
                             // Show value for field
                             if ($showfield)
-                                print '<!-- ' . $fieldlist[$field] . ' --><td align="' . $align . '" class="' . $class . '">' . $valuetoshow . '</td>';
+                                print '<!-- '.$fieldlist[$field].' --><td align="'.$align.'" class="'.$class.'">'.$valuetoshow.'</td>';
                         }
                     }
 
@@ -1823,7 +1823,7 @@ 
                     $canbemodified = $iserasable;
                     if ($obj->code == 'RECEP')
                         $canbemodified = 1;
-                    if ($tabname[$id] == MAIN_DB_PREFIX . "c_actioncomm")
+                    if ($tabname[$id] == MAIN_DB_PREFIX."c_actioncomm")
                         $canbemodified = 1;
 
                     // Url
@@ -1831,11 +1831,11 @@ 
                     // If rowidcol not defined
                     if (empty($rowidcol) || in_array($id, array(6, 7, 8, 13, 17, 19, 27)))
                         $rowidcol = 'rowid';
-                    $url = $_SERVER["PHP_SELF"] . '?' . ($page ? 'page=' . $page . '&' : '') . 'sortfield=' . $sortfield . '&sortorder=' . $sortorder . '&rowid=' . ((!empty($obj->{$rowidcol}) || $obj->{$rowidcol} == '0') ? $obj->{$rowidcol} : (!empty($obj->code) ? urlencode($obj->code) : '')) . '&code=' . (!empty($obj->code) ? urlencode($obj->code) : '');
+                    $url = $_SERVER["PHP_SELF"].'?'.($page ? 'page='.$page.'&' : '').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.((!empty($obj->{$rowidcol}) || $obj->{$rowidcol} == '0') ? $obj->{$rowidcol} : (!empty($obj->code) ? urlencode($obj->code) : '')).'&code='.(!empty($obj->code) ? urlencode($obj->code) : '');
                     if (!empty($param))
-                        $url .= '&' . $param;
+                        $url .= '&'.$param;
                     if (!is_null($withentity))
-                        $url .= '&entity=' . $withentity;
+                        $url .= '&entity='.$withentity;
                     $url .= '&';
 
                     // Favorite
@@ -1843,7 +1843,7 @@ 
                     if ($id == 4) {
                         print '<td align="center" class="nowrap">';
                         if ($iserasable)
-                            print '<a href="' . $url . 'action=' . $acts[$obj->favorite] . '_favorite">' . $actl[$obj->favorite] . '</a>';
+                            print '<a href="'.$url.'action='.$acts[$obj->favorite].'_favorite">'.$actl[$obj->favorite].'</a>';
                         else
                             print $langs->trans("AlwaysActive");
                         print '</td>';
@@ -1852,7 +1852,7 @@ 
                     // Active
                     print '<td align="center" class="nowrap">';
                     if ($canbedisabled)
-                        print '<a href="' . $url . 'action=' . $acts[$obj->active] . '">' . $actl[$obj->active] . '</a>';
+                        print '<a href="'.$url.'action='.$acts[$obj->active].'">'.$actl[$obj->active].'</a>';
                     else {
                         if (in_array($obj->code, array('AC_OTH', 'AC_OTH_AUTO')))
                             print $langs->trans("AlwaysActive");
@@ -1867,7 +1867,7 @@ 
 
                     // Modify link
                     if ($canbemodified)
-                        print '<td align="center"><a class="reposition" href="' . $url . 'action=edit">' . img_edit() . '</a></td>';
+                        print '<td align="center"><a class="reposition" href="'.$url.'action=edit">'.img_edit().'</a></td>';
                     else
                         print '<td>&nbsp;</td>';
 
@@ -1875,7 +1875,7 @@ 
                     if ($iserasable) {
                         print '<td align="center">';
                         if ($user->admin)
-                            print '<a href="' . $url . 'action=delete">' . img_delete() . '</a>';
+                            print '<a href="'.$url.'action=delete">'.img_delete().'</a>';
                         //else print '<a href="#">'.img_delete().'</a>';    // Some dictionary can be edited by other profile than admin
                         print '</td>';
                     } else
@@ -1907,8 +1907,8 @@ 
     print '<table class="noborder" width="100%">';
     print '<tr class="liste_titre">';
     //print '<td>'.$langs->trans("Module").'</td>';
-    print '<td colspan="2">' . $langs->trans("Dictionary") . '</td>';
-    print '<td>' . $langs->trans("Table") . '</td>';
+    print '<td colspan="2">'.$langs->trans("Dictionary").'</td>';
+    print '<td>'.$langs->trans("Table").'</td>';
     print '</tr>';
 
     $showemptyline = '';
@@ -1927,7 +1927,7 @@ 
             $value = $tabname[$i];
             print '<tr class="oddeven"><td width="50%">';
             if (!empty($tabcond[$i])) {
-                print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $i . '">' . $langs->trans($tablib[$i]) . '</a>';
+                print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$i.'">'.$langs->trans($tablib[$i]).'</a>';
             } else {
                 print $langs->trans($tablib[$i]);
             }
@@ -1938,7 +1938,7 @@ 
               print info_admin($langs->trans("DictionaryDisabledSinceNoModuleNeedIt"),1);
               } */
             print '</td>';
-            print '<td>' . $tabname[$i] . '</td></tr>';
+            print '<td>'.$tabname[$i].'</td></tr>';
             $lastlineisempty = false;
         } else {
             if (!$lastlineisempty) {
@@ -1987,10 +1987,10 @@ 
             continue;
         }
 
-        if (in_array($fieldlist[$field], array('code', 'libelle', 'type')) && $tabname == MAIN_DB_PREFIX . "c_actioncomm" && in_array($obj->type, array('system', 'systemauto'))) {
+        if (in_array($fieldlist[$field], array('code', 'libelle', 'type')) && $tabname == MAIN_DB_PREFIX."c_actioncomm" && in_array($obj->type, array('system', 'systemauto'))) {
             $hidden = (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]} : '');
             print '<td>';
-            print '<input type="hidden" name="' . $fieldlist[$field] . '" value="' . $hidden . '">';
+            print '<input type="hidden" name="'.$fieldlist[$field].'" value="'.$hidden.'">';
             print $langs->trans($hidden);
             print '</td>';
         } elseif ($fieldlist[$field] == 'country') {
@@ -2008,7 +2008,7 @@ 
             if (!in_array('country', $fieldlist)) { // If there is already a field country, we don't show country_id (avoid duplicate)
                 $country_id = (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]} : 0);
                 print '<td class="tdoverflowmax100">';
-                print '<input type="hidden" name="' . $fieldlist[$field] . '" value="' . $country_id . '">';
+                print '<input type="hidden" name="'.$fieldlist[$field].'" value="'.$country_id.'">';
                 print '</td>';
             }
         } elseif ($fieldlist[$field] == 'region') {
@@ -2018,7 +2018,7 @@ 
         } elseif ($fieldlist[$field] == 'region_id') {
             $region_id = (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]} : 0);
             print '<td>';
-            print '<input type="hidden" name="' . $fieldlist[$field] . '" value="' . $region_id . '">';
+            print '<input type="hidden" name="'.$fieldlist[$field].'" value="'.$region_id.'">';
             print '</td>';
         } elseif ($fieldlist[$field] == 'lang') {
             print '<td>';
@@ -2040,10 +2040,10 @@ 
             print '<td>';
             print $form->selectyesno("private", (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]} : ''));
             print '</td>';
-        } elseif ($fieldlist[$field] == 'type' && $tabname == MAIN_DB_PREFIX . "c_actioncomm") {
+        } elseif ($fieldlist[$field] == 'type' && $tabname == MAIN_DB_PREFIX."c_actioncomm") {
             $type = (!empty($obj->type) ? $obj->type : 'user'); // Check if type is different of 'user' (external module)
             print '<td>';
-            print $type . '<input type="hidden" name="type" value="' . $type . '">';
+            print $type.'<input type="hidden" name="type" value="'.$type.'">';
             print '</td>';
         } elseif ($fieldlist[$field] == 'recuperableonly' || $fieldlist[$field] == 'type_cdr' || $fieldlist[$field] == 'deductible' || $fieldlist[$field] == 'category_type') {
             if ($fieldlist[$field] == 'type_cdr')
@@ -2060,30 +2060,30 @@ 
             $align = "left";
             if (in_array($fieldlist[$field], array('taux', 'localtax1', 'localtax2')))
                 $align = "center"; // Fields aligned on right
-            print '<td align="' . $align . '">';
-            print '<input type="text" class="flat" value="' . (isset($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]} : '') . '" size="3" name="' . $fieldlist[$field] . '">';
+            print '<td align="'.$align.'">';
+            print '<input type="text" class="flat" value="'.(isset($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]} : '').'" size="3" name="'.$fieldlist[$field].'">';
             print '</td>';
         }
         elseif (in_array($fieldlist[$field], array('libelle_facture'))) {
             print '<td>';
             $transfound = 0;
             // Special case for labels
-            if ($tabname == MAIN_DB_PREFIX . 'c_payment_term') {
+            if ($tabname == MAIN_DB_PREFIX.'c_payment_term') {
                 $langs->load("bills");
-                $transkey = "PaymentCondition" . strtoupper($obj->code);
+                $transkey = "PaymentCondition".strtoupper($obj->code);
                 if ($langs->trans($transkey) != $transkey) {
                     $transfound = 1;
                     print $form->textwithpicto($langs->trans($transkey), $langs->trans("GoIntoTranslationMenuToChangeThis"));
                 }
             }
             if (!$transfound) {
-                print '<textarea cols="30" rows="' . ROWS_2 . '" class="flat" name="' . $fieldlist[$field] . '">' . (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]} : '') . '</textarea>';
+                print '<textarea cols="30" rows="'.ROWS_2.'" class="flat" name="'.$fieldlist[$field].'">'.(!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]} : '').'</textarea>';
             }
             print '</td>';
         } elseif ($fieldlist[$field] == 'price' || preg_match('/^amount/i', $fieldlist[$field])) {
-            print '<td><input type="text" class="flat minwidth75" value="' . price((!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]} : '')) . '" name="' . $fieldlist[$field] . '"></td>';
+            print '<td><input type="text" class="flat minwidth75" value="'.price((!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]} : '')).'" name="'.$fieldlist[$field].'"></td>';
         } elseif ($fieldlist[$field] == 'code' && isset($obj->{$fieldlist[$field]})) {
-            print '<td class="maxxxx"><input type="text" class="flat minwidth75" value="' . (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]} : '') . '" name="' . $fieldlist[$field] . '"></td>';
+            print '<td class="maxxxx"><input type="text" class="flat minwidth75" value="'.(!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]} : '').'" name="'.$fieldlist[$field].'"></td>';
         } elseif ($fieldlist[$field] == 'unit') {
             print '<td>';
             $units = array(
@@ -2105,10 +2105,10 @@ 
             if (!empty($conf->accounting->enabled)) {
                 $fieldname = $fieldlist[$field];
                 $accountancy_account = (!empty($obj->$fieldname) ? $obj->$fieldname : 0);
-                print $formaccounting->select_account($accountancy_account, '.' . $fieldlist[$field], 1, '', 1, 1, 'maxwidth200 maxwidthonsmartphone');
+                print $formaccounting->select_account($accountancy_account, '.'.$fieldlist[$field], 1, '', 1, 1, 'maxwidth200 maxwidthonsmartphone');
             } else {
                 $fieldname = $fieldlist[$field];
-                print '<input type="text" size="10" class="flat" value="' . (isset($obj->$fieldname) ? $obj->$fieldname : '') . '" name="' . $fieldlist[$field] . '">';
+                print '<input type="text" size="10" class="flat" value="'.(isset($obj->$fieldname) ? $obj->$fieldname : '').'" name="'.$fieldlist[$field].'">';
             }
             print '</td>';
         } elseif ($fieldlist[$field] == 'fk_tva') {
@@ -2143,17 +2143,17 @@ 
                 $class = 'quatrevingtpercent';
             if ($fieldlist[$field] == 'sortorder' || $fieldlist[$field] == 'sens' || $fieldlist[$field] == 'category_type')
                 $class = 'maxwidth50';
-            print '<td class="' . $classtd . '">';
+            print '<td class="'.$classtd.'">';
             $transfound = 0;
             if (in_array($fieldlist[$field], array('label', 'libelle'))) {
                 $transkey = '';
                 // Special case for labels
-                if ($tabname == MAIN_DB_PREFIX . 'c_civility') {
-                    $transkey = "Civility" . strtoupper($obj->code);
+                if ($tabname == MAIN_DB_PREFIX.'c_civility') {
+                    $transkey = "Civility".strtoupper($obj->code);
                 }
-                if ($tabname == MAIN_DB_PREFIX . 'c_payment_term') {
+                if ($tabname == MAIN_DB_PREFIX.'c_payment_term') {
                     $langs->load("bills");
-                    $transkey = "PaymentCondition" . strtoupper($obj->code);
+                    $transkey = "PaymentCondition".strtoupper($obj->code);
                 }
                 if ($transkey && $langs->trans($transkey) != $transkey) {
                     $transfound = 1;
@@ -2161,7 +2161,7 @@ 
                 }
             }
             if (!$transfound) {
-                print '<input type="text" class="flat' . ($class ? ' ' . $class : '') . '" value="' . (isset($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]} : '') . '" name="' . $fieldlist[$field] . '">';
+                print '<input type="text" class="flat'.($class ? ' '.$class : '').'" value="'.(isset($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]} : '').'" name="'.$fieldlist[$field].'">';
             }
             print '</td>';
         }

Braces +333 added lines, -231 removed lines

@@ -568,8 +568,9 @@ 
         'fichinter' => $langs->trans('InterventionCard'),
         'contrat' => $langs->trans('Contract')
     );
-    if (!empty($conf->global->MAIN_SUPPORT_SHARED_CONTACT_BETWEEN_THIRDPARTIES))
-        $elementList["societe"] = $langs->trans('ThirdParty');
+    if (!empty($conf->global->MAIN_SUPPORT_SHARED_CONTACT_BETWEEN_THIRDPARTIES)) {
+            $elementList["societe"] = $langs->trans('ThirdParty');
+    }
 
     complete_elementList_with_modules($elementList);
 
@@ -615,20 +616,30 @@ 
     // Check that all fields are filled
     $ok = 1;
     foreach ($listfield as $f => $value) {
-        if ($value == 'country_id' && in_array($tablib[$id], array('DictionaryVAT', 'DictionaryRegion', 'DictionaryCompanyType', 'DictionaryHolidayTypes', 'DictionaryRevenueStamp', 'DictionaryAccountancysystem', 'DictionaryAccountancyCategory')))
-            continue;  // For some pages, country is not mandatory
-        if ($value == 'country' && in_array($tablib[$id], array('DictionaryCanton', 'DictionaryCompanyType', 'DictionaryRevenueStamp')))
-            continue;  // For some pages, country is not mandatory
-        if ($value == 'localtax1' && empty($_POST['localtax1_type']))
-            continue;
-        if ($value == 'localtax2' && empty($_POST['localtax2_type']))
-            continue;
-        if ($value == 'color' && empty($_POST['color']))
-            continue;
-        if ($value == 'formula' && empty($_POST['formula']))
-            continue;
-        if ($value == 'sortorder')
-            continue;  // For a column name 'sortorder', we use the field name 'position'
+        if ($value == 'country_id' && in_array($tablib[$id], array('DictionaryVAT', 'DictionaryRegion', 'DictionaryCompanyType', 'DictionaryHolidayTypes', 'DictionaryRevenueStamp', 'DictionaryAccountancysystem', 'DictionaryAccountancyCategory'))) {
+                    continue;
+        }
+        // For some pages, country is not mandatory
+        if ($value == 'country' && in_array($tablib[$id], array('DictionaryCanton', 'DictionaryCompanyType', 'DictionaryRevenueStamp'))) {
+                    continue;
+        }
+        // For some pages, country is not mandatory
+        if ($value == 'localtax1' && empty($_POST['localtax1_type'])) {
+                    continue;
+        }
+        if ($value == 'localtax2' && empty($_POST['localtax2_type'])) {
+                    continue;
+        }
+        if ($value == 'color' && empty($_POST['color'])) {
+                    continue;
+        }
+        if ($value == 'formula' && empty($_POST['formula'])) {
+                    continue;
+        }
+        if ($value == 'sortorder') {
+                    continue;
+        }
+        // For a column name 'sortorder', we use the field name 'position'
         if ((!isset($_POST[$value]) || $_POST[$value] == '') && (!in_array($listfield[$f], array('decalage', 'module', 'accountancy_code', 'accountancy_code_sell', 'accountancy_code_buy', 'tracking'))  // Fields that are not mandatory
             && (!($id == 10 && $listfield[$f] == 'code')) // Code is mandatory fir table 10
             )
@@ -636,36 +647,51 @@ 
             $ok = 0;
             $fieldnamekey = $listfield[$f];
             // We take translate key of field
-            if ($fieldnamekey == 'libelle' || ($fieldnamekey == 'label'))
-                $fieldnamekey = 'Label';
-            if ($fieldnamekey == 'libelle_facture')
-                $fieldnamekey = 'LabelOnDocuments';
-            if ($fieldnamekey == 'nbjour')
-                $fieldnamekey = 'NbOfDays';
-            if ($fieldnamekey == 'decalage')
-                $fieldnamekey = 'Offset';
-            if ($fieldnamekey == 'module')
-                $fieldnamekey = 'Module';
-            if ($fieldnamekey == 'code')
-                $fieldnamekey = 'Code';
-            if ($fieldnamekey == 'note')
-                $fieldnamekey = 'Note';
-            if ($fieldnamekey == 'taux')
-                $fieldnamekey = 'Rate';
-            if ($fieldnamekey == 'type')
-                $fieldnamekey = 'Type';
-            if ($fieldnamekey == 'position')
-                $fieldnamekey = 'Position';
-            if ($fieldnamekey == 'unicode')
-                $fieldnamekey = 'Unicode';
-            if ($fieldnamekey == 'deductible')
-                $fieldnamekey = 'Deductible';
-            if ($fieldnamekey == 'sortorder')
-                $fieldnamekey = 'SortOrder';
-            if ($fieldnamekey == 'category_type')
-                $fieldnamekey = 'Calculated';
-            if ($fieldnamekey == 'revenuestamp_type')
-                $fieldnamekey = 'TypeOfRevenueStamp';
+            if ($fieldnamekey == 'libelle' || ($fieldnamekey == 'label')) {
+                            $fieldnamekey = 'Label';
+            }
+            if ($fieldnamekey == 'libelle_facture') {
+                            $fieldnamekey = 'LabelOnDocuments';
+            }
+            if ($fieldnamekey == 'nbjour') {
+                            $fieldnamekey = 'NbOfDays';
+            }
+            if ($fieldnamekey == 'decalage') {
+                            $fieldnamekey = 'Offset';
+            }
+            if ($fieldnamekey == 'module') {
+                            $fieldnamekey = 'Module';
+            }
+            if ($fieldnamekey == 'code') {
+                            $fieldnamekey = 'Code';
+            }
+            if ($fieldnamekey == 'note') {
+                            $fieldnamekey = 'Note';
+            }
+            if ($fieldnamekey == 'taux') {
+                            $fieldnamekey = 'Rate';
+            }
+            if ($fieldnamekey == 'type') {
+                            $fieldnamekey = 'Type';
+            }
+            if ($fieldnamekey == 'position') {
+                            $fieldnamekey = 'Position';
+            }
+            if ($fieldnamekey == 'unicode') {
+                            $fieldnamekey = 'Unicode';
+            }
+            if ($fieldnamekey == 'deductible') {
+                            $fieldnamekey = 'Deductible';
+            }
+            if ($fieldnamekey == 'sortorder') {
+                            $fieldnamekey = 'SortOrder';
+            }
+            if ($fieldnamekey == 'category_type') {
+                            $fieldnamekey = 'Calculated';
+            }
+            if ($fieldnamekey == 'revenuestamp_type') {
+                            $fieldnamekey = 'TypeOfRevenueStamp';
+            }
 
             setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities($fieldnamekey)), null, 'errors');
         }
@@ -700,16 +726,26 @@ 
     }
 
     // Clean some parameters
-    if ((!empty($_POST["localtax1_type"]) || ($_POST['localtax1_type'] == '0')) && empty($_POST["localtax1"]))
-        $_POST["localtax1"] = '0'; // If empty, we force to 0
-    if ((!empty($_POST["localtax2_type"]) || ($_POST['localtax2_type'] == '0')) && empty($_POST["localtax2"]))
-        $_POST["localtax2"] = '0'; // If empty, we force to 0
-    if ($_POST["accountancy_code"] <= 0)
-        $_POST["accountancy_code"] = ''; // If empty, we force to null
-    if ($_POST["accountancy_code_sell"] <= 0)
-        $_POST["accountancy_code_sell"] = ''; // If empty, we force to null
-    if ($_POST["accountancy_code_buy"] <= 0)
-        $_POST["accountancy_code_buy"] = ''; // If empty, we force to null
+    if ((!empty($_POST["localtax1_type"]) || ($_POST['localtax1_type'] == '0')) && empty($_POST["localtax1"])) {
+            $_POST["localtax1"] = '0';
+    }
+    // If empty, we force to 0
+    if ((!empty($_POST["localtax2_type"]) || ($_POST['localtax2_type'] == '0')) && empty($_POST["localtax2"])) {
+            $_POST["localtax2"] = '0';
+    }
+    // If empty, we force to 0
+    if ($_POST["accountancy_code"] <= 0) {
+            $_POST["accountancy_code"] = '';
+    }
+    // If empty, we force to null
+    if ($_POST["accountancy_code_sell"] <= 0) {
+            $_POST["accountancy_code_sell"] = '';
+    }
+    // If empty, we force to null
+    if ($_POST["accountancy_code_buy"] <= 0) {
+            $_POST["accountancy_code_buy"] = '';
+    }
+    // If empty, we force to null
     if ($id == 10 && isset($_POST["code"])) {  // Spaces are not allowed into code
         $_POST["code"] = preg_replace('/\s/', '', $_POST["code"]);
     }
@@ -732,15 +768,17 @@ 
         // Add new entry
         $sql = "INSERT INTO " . $tabname[$id] . " (";
         // List of fields
-        if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldinsert))
-            $sql .= $tabrowid[$id] . ",";
+        if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldinsert)) {
+                    $sql .= $tabrowid[$id] . ",";
+        }
         $sql .= $tabfieldinsert[$id];
         $sql .= ",active)";
         $sql .= " VALUES(";
 
         // List of values
-        if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldinsert))
-            $sql .= $newid . ",";
+        if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldinsert)) {
+                    $sql .= $newid . ",";
+        }
         $i = 0;
         foreach ($listfieldinsert as $f => $value) {
             if ($value == 'price' || preg_match('/^amount/i', $value) || $value == 'taux') {
@@ -748,14 +786,18 @@ 
             } else if ($value == 'entity') {
                 $_POST[$listfieldvalue[$i]] = getEntity($tabname[$id]);
             }
-            if ($i)
-                $sql .= ",";
+            if ($i) {
+                            $sql .= ",";
+            }
             if ($listfieldvalue[$i] == 'sortorder') {  // For column name 'sortorder', we use the field name 'position'
                 $sql .= "'" . (int) $db->escape($_POST['position']) . "'";
-            } elseif ($_POST[$listfieldvalue[$i]] == '' && !($listfieldvalue[$i] == 'code' && $id == 10))
-                $sql .= "null";  // For vat, we want/accept code = ''
-            else
-                $sql .= "'" . $db->escape($_POST[$listfieldvalue[$i]]) . "'";
+            } elseif ($_POST[$listfieldvalue[$i]] == '' && !($listfieldvalue[$i] == 'code' && $id == 10)) {
+                            $sql .= "null";
+            }
+            // For vat, we want/accept code = ''
+            else {
+                            $sql .= "'" . $db->escape($_POST[$listfieldvalue[$i]]) . "'";
+            }
             $i++;
         }
         $sql .= ",1)";
@@ -796,20 +838,25 @@ 
             } else if ($field == 'entity') {
                 $_POST[$listfieldvalue[$i]] = getEntity($tabname[$id]);
             }
-            if ($i)
-                $sql .= ",";
+            if ($i) {
+                            $sql .= ",";
+            }
             $sql .= $field . "=";
             if ($listfieldvalue[$i] == 'sortorder') {  // For column name 'sortorder', we use the field name 'position'
                 $sql .= "'" . (int) $db->escape($_POST['position']) . "'";
-            } elseif ($_POST[$listfieldvalue[$i]] == '' && !($listfieldvalue[$i] == 'code' && $id == 10))
-                $sql .= "null";  // For vat, we want/accept code = ''
-            else
-                $sql .= "'" . $db->escape($_POST[$listfieldvalue[$i]]) . "'";
+            } elseif ($_POST[$listfieldvalue[$i]] == '' && !($listfieldvalue[$i] == 'code' && $id == 10)) {
+                            $sql .= "null";
+            }
+            // For vat, we want/accept code = ''
+            else {
+                            $sql .= "'" . $db->escape($_POST[$listfieldvalue[$i]]) . "'";
+            }
             $i++;
         }
         $sql .= " WHERE " . $rowidcol . " = '" . $rowid . "'";
-        if (in_array('entity', $listfieldmodify))
-            $sql .= " AND entity = '" . getEntity($tabname[$id]) . "'";
+        if (in_array('entity', $listfieldmodify)) {
+                    $sql .= " AND entity = '" . getEntity($tabname[$id]) . "'";
+        }
 
         dol_syslog("actionmodify", LOG_DEBUG);
         //print $sql;
@@ -961,19 +1008,25 @@ 
 
 
 $param = '&id=' . urlencode($id);
-if ($search_country_id > 0)
+if ($search_country_id > 0) {
     $param .= '&search_country_id=' . urlencode($search_country_id);
-if ($search_code != '')
+}
+if ($search_code != '') {
     $param .= '&search_code=' . urlencode($search_country_id);
-if ($entity != '')
+}
+if ($entity != '') {
     $param .= '&entity=' . (int) $entity;
+}
 $paramwithsearch = $param;
-if ($sortorder)
+if ($sortorder) {
     $paramwithsearch .= '&sortorder=' . urlencode($sortorder);
-if ($sortfield)
+}
+if ($sortfield) {
     $paramwithsearch .= '&sortfield=' . urlencode($sortfield);
-if (GETPOST('from'))
+}
+if (GETPOST('from')) {
     $paramwithsearch .= '&from=' . urlencode(GETPOST('from', 'alpha'));
+}
 
 
 // Confirmation de la suppression de la ligne
@@ -989,19 +1042,24 @@ 
     // Complete requete recherche valeurs avec critere de tri
     $sql = $tabsql[$id];
 
-    if (!preg_match('/ WHERE /', $sql))
-        $sql .= " WHERE 1 = 1";
-    if ($search_country_id > 0)
-        $sql .= " AND c.rowid = " . $search_country_id;
-    if ($search_code != '' && $id != 9)
-        $sql .= natural_search("code", $search_code);
-    if ($search_code != '' && $id == 9)
-        $sql .= natural_search("code_iso", $search_code);
+    if (!preg_match('/ WHERE /', $sql)) {
+            $sql .= " WHERE 1 = 1";
+    }
+    if ($search_country_id > 0) {
+            $sql .= " AND c.rowid = " . $search_country_id;
+    }
+    if ($search_code != '' && $id != 9) {
+            $sql .= natural_search("code", $search_code);
+    }
+    if ($search_code != '' && $id == 9) {
+            $sql .= natural_search("code_iso", $search_code);
+    }
 
     if ($sortfield) {
         // If sort order is "country", we use country_code instead
-        if ($sortfield == 'country')
-            $sortfield = 'country_code';
+        if ($sortfield == 'country') {
+                    $sortfield = 'country_code';
+        }
         $sql .= " ORDER BY " . $db->escape($sortfield);
         if ($sortorder) {
             $sql .= " " . strtoupper($db->escape($sortorder));
@@ -1064,10 +1122,11 @@ 
                 $valuetoshow = $langs->trans("PriceUHT");
             }
             if ($fieldlist[$field] == 'taux') {
-                if ($tabname[$id] != MAIN_DB_PREFIX . "c_revenuestamp")
-                    $valuetoshow = $langs->trans("Rate");
-                else
-                    $valuetoshow = $langs->trans("Amount");
+                if ($tabname[$id] != MAIN_DB_PREFIX . "c_revenuestamp") {
+                                    $valuetoshow = $langs->trans("Rate");
+                } else {
+                                    $valuetoshow = $langs->trans("Amount");
+                }
                 $class = 'center';
             }
             if ($fieldlist[$field] == 'localtax1_type') {
@@ -1095,10 +1154,11 @@ 
                 $valuetoshow = $langs->trans("Language");
             }
             if ($fieldlist[$field] == 'type') {
-                if ($tabname[$id] == MAIN_DB_PREFIX . "c_paiement")
-                    $valuetoshow = $form->textwithtooltip($langs->trans("Type"), $langs->trans("TypePaymentDesc"), 2, 1, img_help(1, ''));
-                else
-                    $valuetoshow = $langs->trans("Type");
+                if ($tabname[$id] == MAIN_DB_PREFIX . "c_paiement") {
+                                    $valuetoshow = $form->textwithtooltip($langs->trans("Type"), $langs->trans("TypePaymentDesc"), 2, 1, img_help(1, ''));
+                } else {
+                                    $valuetoshow = $langs->trans("Type");
+                }
             }
             if ($fieldlist[$field] == 'code') {
                 $valuetoshow = $langs->trans("Code");
@@ -1247,24 +1307,28 @@ 
 
             if ($valuetoshow != '') {
                 print '<td' . ($class ? ' class="' . $class . '"' : '') . '>';
-                if (!empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i', $tabhelp[$id][$value]))
-                    print '<a href="' . $tabhelp[$id][$value] . '" target="_blank">' . $valuetoshow . ' ' . img_help(1, $valuetoshow) . '</a>';
-                else if (!empty($tabhelp[$id][$value]))
-                    print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value]);
-                else
-                    print $valuetoshow;
+                if (!empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i', $tabhelp[$id][$value])) {
+                                    print '<a href="' . $tabhelp[$id][$value] . '" target="_blank">' . $valuetoshow . ' ' . img_help(1, $valuetoshow) . '</a>';
+                } else if (!empty($tabhelp[$id][$value])) {
+                                    print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value]);
+                } else {
+                                    print $valuetoshow;
+                }
                 print '</td>';
             }
-            if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label')
-                $alabelisused = 1;
+            if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') {
+                            $alabelisused = 1;
+            }
         }
 
-        if ($id == 4)
-            print '<td></td>';
+        if ($id == 4) {
+                    print '<td></td>';
+        }
         print '<td>';
         print '<input type="hidden" name="id" value="' . $id . '">';
-        if (!is_null($withentity))
-            print '<input type="hidden" name="entity" value="' . $withentity . '">';
+        if (!is_null($withentity)) {
+                    print '<input type="hidden" name="entity" value="' . $withentity . '">';
+        }
         print '</td>';
         print '<td style="min-width: 26px;"></td>';
         print '<td style="min-width: 26px;"></td>';
@@ -1277,8 +1341,9 @@ 
         // If data was already input, we define them in obj to populate input fields.
         if (GETPOST('actionadd')) {
             foreach ($fieldlist as $key => $val) {
-                if (GETPOST($val) != '')
-                    $obj->$val = GETPOST($val);
+                if (GETPOST($val) != '') {
+                                    $obj->$val = GETPOST($val);
+                }
             }
         }
 
@@ -1288,15 +1353,18 @@ 
         $error = $hookmanager->error;
         $errors = $hookmanager->errors;
 
-        if ($id == 3)
-            unset($fieldlist[2]); // Remove field ??? if dictionary Regions
+        if ($id == 3) {
+                    unset($fieldlist[2]);
+        }
+        // Remove field ??? if dictionary Regions
 
         if (empty($reshook)) {
             fieldList($fieldlist, $obj, $tabname[$id], 'add');
         }
 
-        if ($id == 4)
-            print '<td></td>';
+        if ($id == 4) {
+                    print '<td></td>';
+        }
         print '<td colspan="3" align="center">';
         if ($action != 'edit') {
             print '<input type="submit" class="button" name="actionadd" value="' . $langs->trans("Add") . '">';
@@ -1305,8 +1373,9 @@ 
         print "</tr>";
 
         $colspan = count($fieldlist) + 3;
-        if ($id == 4)
-            $colspan++;
+        if ($id == 4) {
+                    $colspan++;
+        }
 
         print '</table>';
         print '</div>';
@@ -1341,8 +1410,9 @@ 
         print '<tr class="liste_titre_filter">';
         $filterfound = 0;
         foreach ($fieldlist as $field => $value) {
-            if ($fieldlist[$field] == 'entity')
-                continue;
+            if ($fieldlist[$field] == 'entity') {
+                            continue;
+            }
 
             $showfield = 1; // By default
 
@@ -1367,8 +1437,9 @@ 
                 }
             }
         }
-        if ($id == 4)
-            print '<td></td>';
+        if ($id == 4) {
+                    print '<td></td>';
+        }
         print '<td class="liste_titre"></td>';
         print '<td class="liste_titre" colspan="2" align="right">';
         if ($filterfound) {
@@ -1381,8 +1452,9 @@ 
         // Title of lines
         print '<tr class="liste_titre">';
         foreach ($fieldlist as $field => $value) {
-            if ($fieldlist[$field] == 'entity')
-                continue;
+            if ($fieldlist[$field] == 'entity') {
+                            continue;
+            }
 
             // Determine le nom du champ par rapport aux noms possibles
             // dans les dictionnaires de donnees
@@ -1406,10 +1478,11 @@ 
                 $valuetoshow = $langs->trans("PriceUHT");
             }
             if ($fieldlist[$field] == 'taux') {
-                if ($tabname[$id] != MAIN_DB_PREFIX . "c_revenuestamp")
-                    $valuetoshow = $langs->trans("Rate");
-                else
-                    $valuetoshow = $langs->trans("Amount");
+                if ($tabname[$id] != MAIN_DB_PREFIX . "c_revenuestamp") {
+                                    $valuetoshow = $langs->trans("Rate");
+                } else {
+                                    $valuetoshow = $langs->trans("Amount");
+                }
                 $align = 'center';
             }
             if ($fieldlist[$field] == 'localtax1_type') {
@@ -1582,8 +1655,9 @@ 
             }
         }
         // Favorite - Only activated on country dictionary
-        if ($id == 4)
-            print getTitleFieldOfList($langs->trans("Favorite"), 0, $_SERVER["PHP_SELF"], "favorite", ($page ? 'page=' . $page . '&' : ''), $param, 'align="center"', $sortfield, $sortorder);
+        if ($id == 4) {
+                    print getTitleFieldOfList($langs->trans("Favorite"), 0, $_SERVER["PHP_SELF"], "favorite", ($page ? 'page=' . $page . '&' : ''), $param, 'align="center"', $sortfield, $sortorder);
+        }
 
         print getTitleFieldOfList($langs->trans("Status"), 0, $_SERVER["PHP_SELF"], "active", ($page ? 'page=' . $page . '&' : ''), $param, 'align="center"', $sortfield, $sortorder);
         print getTitleFieldOfList('');
@@ -1612,13 +1686,13 @@ 
                     print '<div name="' . (!empty($obj->rowid) ? $obj->rowid : $obj->code) . '"></div>';
                     print '<input type="hidden" name="page" value="' . $page . '">';
                     print '<input type="hidden" name="rowid" value="' . $rowid . '">';
-                    if (!is_null($withentity))
-                        print '<input type="hidden" name="entity" value="' . $withentity . '">';
+                    if (!is_null($withentity)) {
+                                            print '<input type="hidden" name="entity" value="' . $withentity . '">';
+                    }
                     print '<input type="submit" class="button" name="actionmodify" value="' . $langs->trans("Modify") . '">';
                     print '<input type="submit" class="button" name="actioncancel" value="' . $langs->trans("Cancel") . '">';
                     print '</td>';
-                }
-                else {
+                } else {
                     $tmpaction = 'view';
                     $parameters = array('fieldlist' => $fieldlist, 'tabname' => $tabname[$id]);
                     $reshook = $hookmanager->executeHooks('viewDictionaryFieldlist', $parameters, $obj, $tmpaction);    // Note that $action and $object may have been modified by some hooks
@@ -1657,15 +1731,15 @@ 
                                 $valuetoshow = yn($valuetoshow);
                                 $align = "center";
                             } else if ($fieldlist[$field] == 'type_cdr') {
-                                if (empty($valuetoshow))
-                                    $valuetoshow = $langs->trans('None');
-                                elseif ($valuetoshow == 1)
-                                    $valuetoshow = $langs->trans('AtEndOfMonth');
-                                elseif ($valuetoshow == 2)
-                                    $valuetoshow = $langs->trans('CurrentNext');
+                                if (empty($valuetoshow)) {
+                                                                    $valuetoshow = $langs->trans('None');
+                                } elseif ($valuetoshow == 1) {
+                                                                    $valuetoshow = $langs->trans('AtEndOfMonth');
+                                } elseif ($valuetoshow == 2) {
+                                                                    $valuetoshow = $langs->trans('CurrentNext');
+                                }
                                 $align = "center";
-                            }
-                            else if ($fieldlist[$field] == 'price' || preg_match('/^amount/i', $fieldlist[$field])) {
+                            } else if ($fieldlist[$field] == 'price' || preg_match('/^amount/i', $fieldlist[$field])) {
                                 $valuetoshow = price($valuetoshow);
                             }
                             if ($value == 'private') {
@@ -1743,20 +1817,20 @@ 
                             } else if ($fieldlist[$field] == 'localtax1' || $fieldlist[$field] == 'localtax2') {
                                 $align = "center";
                             } else if ($fieldlist[$field] == 'localtax1_type') {
-                                if ($obj->localtax1 != 0)
-                                    $valuetoshow = $localtax_typeList[$valuetoshow];
-                                else
-                                    $valuetoshow = '';
+                                if ($obj->localtax1 != 0) {
+                                                                    $valuetoshow = $localtax_typeList[$valuetoshow];
+                                } else {
+                                                                    $valuetoshow = '';
+                                }
                                 $align = "center";
-                            }
-                            else if ($fieldlist[$field] == 'localtax2_type') {
-                                if ($obj->localtax2 != 0)
-                                    $valuetoshow = $localtax_typeList[$valuetoshow];
-                                else
-                                    $valuetoshow = '';
+                            } else if ($fieldlist[$field] == 'localtax2_type') {
+                                if ($obj->localtax2 != 0) {
+                                                                    $valuetoshow = $localtax_typeList[$valuetoshow];
+                                } else {
+                                                                    $valuetoshow = '';
+                                }
                                 $align = "center";
-                            }
-                            else if ($fieldlist[$field] == 'taux') {
+                            } else if ($fieldlist[$field] == 'taux') {
                                 $valuetoshow = price($valuetoshow, 0, $langs, 0, 0);
                                 $align = "center";
                             } else if (in_array($fieldlist[$field], array('recuperableonly'))) {
@@ -1778,21 +1852,28 @@ 
                             }
 
                             $class = 'tddict';
-                            if ($fieldlist[$field] == 'note' && $id == 10)
-                                $class .= ' tdoverflowmax200';
-                            if ($fieldlist[$field] == 'tracking')
-                                $class .= ' tdoverflowauto';
-                            if ($fieldlist[$field] == 'code')
-                                $class .= ' width100';
-                            if ($fieldlist[$field] == 'position')
-                                $class .= ' right';
-                            if ($fieldlist[$field] == 'localtax1_type')
-                                $class .= ' nowrap';
-                            if ($fieldlist[$field] == 'localtax2_type')
-                                $class .= ' nowrap';
+                            if ($fieldlist[$field] == 'note' && $id == 10) {
+                                                            $class .= ' tdoverflowmax200';
+                            }
+                            if ($fieldlist[$field] == 'tracking') {
+                                                            $class .= ' tdoverflowauto';
+                            }
+                            if ($fieldlist[$field] == 'code') {
+                                                            $class .= ' width100';
+                            }
+                            if ($fieldlist[$field] == 'position') {
+                                                            $class .= ' right';
+                            }
+                            if ($fieldlist[$field] == 'localtax1_type') {
+                                                            $class .= ' nowrap';
+                            }
+                            if ($fieldlist[$field] == 'localtax2_type') {
+                                                            $class .= ' nowrap';
+                            }
                             // Show value for field
-                            if ($showfield)
-                                print '<!-- ' . $fieldlist[$field] . ' --><td align="' . $align . '" class="' . $class . '">' . $valuetoshow . '</td>';
+                            if ($showfield) {
+                                                            print '<!-- ' . $fieldlist[$field] . ' --><td align="' . $align . '" class="' . $class . '">' . $valuetoshow . '</td>';
+                            }
                         }
                     }
 
@@ -1821,65 +1902,75 @@ 
                         $canbedisabled = 0;
                     }
                     $canbemodified = $iserasable;
-                    if ($obj->code == 'RECEP')
-                        $canbemodified = 1;
-                    if ($tabname[$id] == MAIN_DB_PREFIX . "c_actioncomm")
-                        $canbemodified = 1;
+                    if ($obj->code == 'RECEP') {
+                                            $canbemodified = 1;
+                    }
+                    if ($tabname[$id] == MAIN_DB_PREFIX . "c_actioncomm") {
+                                            $canbemodified = 1;
+                    }
 
                     // Url
                     $rowidcol = $tabrowid[$id];
                     // If rowidcol not defined
-                    if (empty($rowidcol) || in_array($id, array(6, 7, 8, 13, 17, 19, 27)))
-                        $rowidcol = 'rowid';
+                    if (empty($rowidcol) || in_array($id, array(6, 7, 8, 13, 17, 19, 27))) {
+                                            $rowidcol = 'rowid';
+                    }
                     $url = $_SERVER["PHP_SELF"] . '?' . ($page ? 'page=' . $page . '&' : '') . 'sortfield=' . $sortfield . '&sortorder=' . $sortorder . '&rowid=' . ((!empty($obj->{$rowidcol}) || $obj->{$rowidcol} == '0') ? $obj->{$rowidcol} : (!empty($obj->code) ? urlencode($obj->code) : '')) . '&code=' . (!empty($obj->code) ? urlencode($obj->code) : '');
-                    if (!empty($param))
-                        $url .= '&' . $param;
-                    if (!is_null($withentity))
-                        $url .= '&entity=' . $withentity;
+                    if (!empty($param)) {
+                                            $url .= '&' . $param;
+                    }
+                    if (!is_null($withentity)) {
+                                            $url .= '&entity=' . $withentity;
+                    }
                     $url .= '&';
 
                     // Favorite
                     // Only activated on country dictionary
                     if ($id == 4) {
                         print '<td align="center" class="nowrap">';
-                        if ($iserasable)
-                            print '<a href="' . $url . 'action=' . $acts[$obj->favorite] . '_favorite">' . $actl[$obj->favorite] . '</a>';
-                        else
-                            print $langs->trans("AlwaysActive");
+                        if ($iserasable) {
+                                                    print '<a href="' . $url . 'action=' . $acts[$obj->favorite] . '_favorite">' . $actl[$obj->favorite] . '</a>';
+                        } else {
+                                                    print $langs->trans("AlwaysActive");
+                        }
                         print '</td>';
                     }
 
                     // Active
                     print '<td align="center" class="nowrap">';
-                    if ($canbedisabled)
-                        print '<a href="' . $url . 'action=' . $acts[$obj->active] . '">' . $actl[$obj->active] . '</a>';
-                    else {
-                        if (in_array($obj->code, array('AC_OTH', 'AC_OTH_AUTO')))
-                            print $langs->trans("AlwaysActive");
-                        else if (isset($obj->type) && in_array($obj->type, array('systemauto')) && empty($obj->active))
-                            print $langs->trans("Deprecated");
-                        else if (isset($obj->type) && in_array($obj->type, array('system')) && !empty($obj->active) && $obj->code != 'AC_OTH')
-                            print $langs->trans("UsedOnlyWithTypeOption");
-                        else
-                            print $langs->trans("AlwaysActive");
+                    if ($canbedisabled) {
+                                            print '<a href="' . $url . 'action=' . $acts[$obj->active] . '">' . $actl[$obj->active] . '</a>';
+                    } else {
+                        if (in_array($obj->code, array('AC_OTH', 'AC_OTH_AUTO'))) {
+                                                    print $langs->trans("AlwaysActive");
+                        } else if (isset($obj->type) && in_array($obj->type, array('systemauto')) && empty($obj->active)) {
+                                                    print $langs->trans("Deprecated");
+                        } else if (isset($obj->type) && in_array($obj->type, array('system')) && !empty($obj->active) && $obj->code != 'AC_OTH') {
+                                                    print $langs->trans("UsedOnlyWithTypeOption");
+                        } else {
+                                                    print $langs->trans("AlwaysActive");
+                        }
                     }
                     print "</td>";
 
                     // Modify link
-                    if ($canbemodified)
-                        print '<td align="center"><a class="reposition" href="' . $url . 'action=edit">' . img_edit() . '</a></td>';
-                    else
-                        print '<td>&nbsp;</td>';
+                    if ($canbemodified) {
+                                            print '<td align="center"><a class="reposition" href="' . $url . 'action=edit">' . img_edit() . '</a></td>';
+                    } else {
+                                            print '<td>&nbsp;</td>';
+                    }
 
                     // Delete link
                     if ($iserasable) {
                         print '<td align="center">';
-                        if ($user->admin)
-                            print '<a href="' . $url . 'action=delete">' . img_delete() . '</a>';
+                        if ($user->admin) {
+                                                    print '<a href="' . $url . 'action=delete">' . img_delete() . '</a>';
+                        }
                         //else print '<a href="#">'.img_delete().'</a>';    // Some dictionary can be edited by other profile than admin
                         print '</td>';
-                    } else
-                        print '<td>&nbsp;</td>';
+                    } else {
+                                            print '<td>&nbsp;</td>';
+                    }
 
                     print "</tr>\n";
                 }
@@ -1889,8 +1980,7 @@ 
 
         print '</table>';
         print '</div>';
-    }
-    else {
+    } else {
         dol_print_error($db);
     }
 
@@ -1913,8 +2003,9 @@ 
 
     $showemptyline = '';
     foreach ($taborder as $i) {
-        if (isset($tabname[$i]) && empty($tabcond[$i]))
-            continue;
+        if (isset($tabname[$i]) && empty($tabcond[$i])) {
+                    continue;
+        }
 
         if ($i) {
             if ($showemptyline) {
@@ -1976,8 +2067,9 @@ 
 
     $formadmin = new FormAdmin($db);
     $formcompany = new FormCompany($db);
-    if (!empty($conf->accounting->enabled))
-        $formaccounting = new FormAccounting($db);
+    if (!empty($conf->accounting->enabled)) {
+            $formaccounting = new FormAccounting($db);
+    }
 
     $withentity = '';
 
@@ -2046,10 +2138,11 @@ 
             print $type . '<input type="hidden" name="type" value="' . $type . '">';
             print '</td>';
         } elseif ($fieldlist[$field] == 'recuperableonly' || $fieldlist[$field] == 'type_cdr' || $fieldlist[$field] == 'deductible' || $fieldlist[$field] == 'category_type') {
-            if ($fieldlist[$field] == 'type_cdr')
-                print '<td align="center">';
-            else
-                print '<td>';
+            if ($fieldlist[$field] == 'type_cdr') {
+                            print '<td align="center">';
+            } else {
+                            print '<td>';
+            }
             if ($fieldlist[$field] == 'type_cdr') {
                 print $form->selectarray($fieldlist[$field], array(0 => $langs->trans('None'), 1 => $langs->trans('AtEndOfMonth'), 2 => $langs->trans('CurrentNext')), (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]} : ''));
             } else {
@@ -2058,13 +2151,14 @@ 
             print '</td>';
         } elseif (in_array($fieldlist[$field], array('nbjour', 'decalage', 'taux', 'localtax1', 'localtax2'))) {
             $align = "left";
-            if (in_array($fieldlist[$field], array('taux', 'localtax1', 'localtax2')))
-                $align = "center"; // Fields aligned on right
+            if (in_array($fieldlist[$field], array('taux', 'localtax1', 'localtax2'))) {
+                            $align = "center";
+            }
+            // Fields aligned on right
             print '<td align="' . $align . '">';
             print '<input type="text" class="flat" value="' . (isset($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]} : '') . '" size="3" name="' . $fieldlist[$field] . '">';
             print '</td>';
-        }
-        elseif (in_array($fieldlist[$field], array('libelle_facture'))) {
+        } elseif (in_array($fieldlist[$field], array('libelle_facture'))) {
             print '<td>';
             $transfound = 0;
             // Special case for labels
@@ -2124,25 +2218,33 @@ 
             print $form->selectExpenseRanges($obj->fk_range);
             print '</td>';
         } else {
-            if ($fieldlist[$field] == 'sortorder')
-                $fieldlist[$field] = 'position';
+            if ($fieldlist[$field] == 'sortorder') {
+                            $fieldlist[$field] = 'position';
+            }
 
             $classtd = '';
             $class = '';
-            if ($fieldlist[$field] == 'code')
-                $classtd = 'width100';
-            if ($fieldlist[$field] == 'affect')
-                $class = 'maxwidth50';
-            if ($fieldlist[$field] == 'delay')
-                $class = 'maxwidth50';
-            if ($fieldlist[$field] == 'position')
-                $class = 'maxwidth50';
-            if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label')
-                $class = 'quatrevingtpercent';
-            if ($fieldlist[$field] == 'tracking')
-                $class = 'quatrevingtpercent';
-            if ($fieldlist[$field] == 'sortorder' || $fieldlist[$field] == 'sens' || $fieldlist[$field] == 'category_type')
-                $class = 'maxwidth50';
+            if ($fieldlist[$field] == 'code') {
+                            $classtd = 'width100';
+            }
+            if ($fieldlist[$field] == 'affect') {
+                            $class = 'maxwidth50';
+            }
+            if ($fieldlist[$field] == 'delay') {
+                            $class = 'maxwidth50';
+            }
+            if ($fieldlist[$field] == 'position') {
+                            $class = 'maxwidth50';
+            }
+            if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') {
+                            $class = 'quatrevingtpercent';
+            }
+            if ($fieldlist[$field] == 'tracking') {
+                            $class = 'quatrevingtpercent';
+            }
+            if ($fieldlist[$field] == 'sortorder' || $fieldlist[$field] == 'sens' || $fieldlist[$field] == 'category_type') {
+                            $class = 'maxwidth50';
+            }
             print '<td class="' . $classtd . '">';
             $transfound = 0;
             if (in_array($fieldlist[$field], array('label', 'libelle'))) {

dolibarr/htdocs/comm/index.php

Spacing +234 added lines, -234 removed lines

@@ -26,36 +26,36 @@ 
  *	\brief      Home page of commercial area
  */
 
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/client.class.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php';
-if (! empty($conf->contrat->enabled)) require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
-if (! empty($conf->propal->enabled))  require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
-if (! empty($conf->supplier_proposal->enabled))  require_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
-if (! empty($conf->commande->enabled))  require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-if (! empty($conf->fournisseur->enabled)) require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
+if (!empty($conf->contrat->enabled)) require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
+if (!empty($conf->propal->enabled))  require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+if (!empty($conf->supplier_proposal->enabled))  require_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
+if (!empty($conf->commande->enabled))  require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+if (!empty($conf->fournisseur->enabled)) require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
 
-if (! $user->rights->societe->lire) accessforbidden();
+if (!$user->rights->societe->lire) accessforbidden();
 
 // Load translation files required by the page
 $langs->loadLangs(array("commercial", "propal"));
 
-$action=GETPOST('action', 'alpha');
-$bid=GETPOST('bid', 'int');
+$action = GETPOST('action', 'alpha');
+$bid = GETPOST('bid', 'int');
 
 // Securite acces client
-$socid=GETPOST('socid','int');
+$socid = GETPOST('socid', 'int');
 if (isset($user->societe_id) && $user->societe_id > 0)
 {
 	$action = '';
 	$socid = $user->societe_id;
 }
 
-$max=5;
-$now=dol_now();
+$max = 5;
+$now = dol_now();
 
 /*
  * Actions
@@ -68,49 +68,49 @@ 
 
 $form = new Form($db);
 $formfile = new FormFile($db);
-$companystatic=new Societe($db);
-if (! empty($conf->propal->enabled)) $propalstatic=new Propal($db);
-if (! empty($conf->supplier_proposal->enabled)) $supplierproposalstatic=new SupplierProposal($db);
-if (! empty($conf->commande->enabled)) $orderstatic=new Commande($db);
-if (! empty($conf->fournisseur->enabled)) $supplierorderstatic=new CommandeFournisseur($db);
+$companystatic = new Societe($db);
+if (!empty($conf->propal->enabled)) $propalstatic = new Propal($db);
+if (!empty($conf->supplier_proposal->enabled)) $supplierproposalstatic = new SupplierProposal($db);
+if (!empty($conf->commande->enabled)) $orderstatic = new Commande($db);
+if (!empty($conf->fournisseur->enabled)) $supplierorderstatic = new CommandeFournisseur($db);
 
-llxHeader("",$langs->trans("CommercialArea"));
+llxHeader("", $langs->trans("CommercialArea"));
 
-print load_fiche_titre($langs->trans("CommercialArea"),'','title_commercial.png');
+print load_fiche_titre($langs->trans("CommercialArea"), '', 'title_commercial.png');
 
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
-if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
+if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
 {
     // Search proposal
-    if (! empty($conf->propal->enabled) && $user->rights->propal->lire)
+    if (!empty($conf->propal->enabled) && $user->rights->propal->lire)
     {
-    	$listofsearchfields['search_proposal']=array('text'=>'Proposal');
+    	$listofsearchfields['search_proposal'] = array('text'=>'Proposal');
     }
     // Search customer order
-    if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
+    if (!empty($conf->commande->enabled) && $user->rights->commande->lire)
     {
-    	$listofsearchfields['search_customer_order']=array('text'=>'CustomerOrder');
+    	$listofsearchfields['search_customer_order'] = array('text'=>'CustomerOrder');
     }
     // Search supplier proposal
-    if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->lire)
+    if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->lire)
     {
-        $listofsearchfields['search_supplier_proposal']=array('text'=>'SupplierProposalShort');
+        $listofsearchfields['search_supplier_proposal'] = array('text'=>'SupplierProposalShort');
     }
     // Search supplier order
-    if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->commande->lire)
+    if (!empty($conf->fournisseur->enabled) && $user->rights->fournisseur->commande->lire)
     {
-    	$listofsearchfields['search_supplier_order']=array('text'=>'SupplierOrder');
+    	$listofsearchfields['search_supplier_order'] = array('text'=>'SupplierOrder');
     }
     // Search intervention
-    if (! empty($conf->ficheinter->enabled) && $user->rights->ficheinter->lire)
+    if (!empty($conf->ficheinter->enabled) && $user->rights->ficheinter->lire)
     {
-    	$listofsearchfields['search_intervention']=array('text'=>'Intervention');
+    	$listofsearchfields['search_intervention'] = array('text'=>'Intervention');
     }
     // Search contract
-    if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire)
+    if (!empty($conf->contrat->enabled) && $user->rights->contrat->lire)
     {
-        $listofsearchfields['search_contract']=array('text'=>'Contract');
+        $listofsearchfields['search_contract'] = array('text'=>'Contract');
     }
 
     if (count($listofsearchfields))
@@ -118,8 +118,8 @@ 
     	print '<form method="post" action="'.BASE_URI.'?controller=core&method=search">';
     	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
     	print '<table class="noborder nohover centpercent">';
-    	$i=0;
-    	foreach($listofsearchfields as $key => $value)
+    	$i = 0;
+    	foreach ($listofsearchfields as $key => $value)
     	{
     		if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
     		print '<tr '.$bc[false].'>';
@@ -138,22 +138,22 @@ 
 /*
  * Draft proposals
  */
-if (! empty($conf->propal->enabled) && $user->rights->propal->lire)
+if (!empty($conf->propal->enabled) && $user->rights->propal->lire)
 {
 	$langs->load("propal");
 
 	$sql = "SELECT p.rowid, p.ref, p.ref_client, p.total_ht, p.tva as total_tva, p.total as total_ttc, s.rowid as socid, s.nom as name, s.client, s.canvas";
-    $sql.= ", s.code_client";
-	$sql.= " FROM ".MAIN_DB_PREFIX."propal as p";
-	$sql.= ", ".MAIN_DB_PREFIX."societe as s";
-	if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	$sql.= " WHERE p.fk_statut = 0";
-	$sql.= " AND p.fk_soc = s.rowid";
-	$sql.= " AND p.entity IN (".getEntity('propal').")";
-	if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-	if ($socid)	$sql.= " AND s.rowid = ".$socid;
-
-	$resql=$db->query($sql);
+    $sql .= ", s.code_client";
+	$sql .= " FROM ".MAIN_DB_PREFIX."propal as p";
+	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
+	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	$sql .= " WHERE p.fk_statut = 0";
+	$sql .= " AND p.fk_soc = s.rowid";
+	$sql .= " AND p.entity IN (".getEntity('propal').")";
+	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	if ($socid)	$sql .= " AND s.rowid = ".$socid;
+
+	$resql = $db->query($sql);
 	if ($resql)
 	{
 		$total = 0;
@@ -162,7 +162,7 @@ 
 		print '<div class="div-table-responsive-no-min">';
 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre">';
-		print '<th colspan="3">'.$langs->trans("ProposalsDraft").($num?' <span class="badge">'.$num.'</span>':'').'</th></tr>';
+		print '<th colspan="3">'.$langs->trans("ProposalsDraft").($num ? ' <span class="badge">'.$num.'</span>' : '').'</th></tr>';
 
 		if ($num > 0)
 		{
@@ -172,28 +172,28 @@ 
 				$obj = $db->fetch_object($resql);
 
 				print '<tr class="oddeven"><td  class="nowrap">';
-				$propalstatic->id=$obj->rowid;
-				$propalstatic->ref=$obj->ref;
-                $propalstatic->ref_client=$obj->ref_client;
+				$propalstatic->id = $obj->rowid;
+				$propalstatic->ref = $obj->ref;
+                $propalstatic->ref_client = $obj->ref_client;
                 $propalstatic->total_ht = $obj->total_ht;
                 $propalstatic->total_tva = $obj->total_tva;
                 $propalstatic->total_ttc = $obj->total_ttc;
 				print $propalstatic->getNomUrl(1);
 				print '</td>';
 				print '<td class="nowrap">';
-				$companystatic->id=$obj->socid;
-				$companystatic->name=$obj->name;
-				$companystatic->client=$obj->client;
+				$companystatic->id = $obj->socid;
+				$companystatic->name = $obj->name;
+				$companystatic->client = $obj->client;
                 $companystatic->code_client = $obj->code_client;
                 $companystatic->code_fournisseur = $obj->code_fournisseur;
-				$companystatic->canvas=$obj->canvas;
-				print $companystatic->getNomUrl(1,'customer',16);
+				$companystatic->canvas = $obj->canvas;
+				print $companystatic->getNomUrl(1, 'customer', 16);
 				print '</td>';
 				print '<td align="right" class="nowrap">'.price($obj->total_ht).'</td></tr>';
 				$i++;
 				$total += $obj->total_ht;
 			}
-			if ($total>0)
+			if ($total > 0)
 			{
 
 				print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td colspan="2" align="right">'.price($total)."</td></tr>";
@@ -219,22 +219,22 @@ 
 /*
  * Draft supplier proposals
  */
-if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->lire)
+if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->lire)
 {
     $langs->load("supplier_proposal");
 
     $sql = "SELECT p.rowid, p.ref, p.total_ht, p.tva as total_tva, p.total as total_ttc, s.rowid as socid, s.nom as name, s.client, s.canvas";
-    $sql.= ", s.code_client";
-    $sql.= " FROM ".MAIN_DB_PREFIX."supplier_proposal as p";
-    $sql.= ", ".MAIN_DB_PREFIX."societe as s";
-    if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-    $sql.= " WHERE p.fk_statut = 0";
-    $sql.= " AND p.fk_soc = s.rowid";
-    $sql.= " AND p.entity IN (".getEntity('supplier_proposal').")";
-    if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-    if ($socid)	$sql.= " AND s.rowid = ".$socid;
-
-    $resql=$db->query($sql);
+    $sql .= ", s.code_client";
+    $sql .= " FROM ".MAIN_DB_PREFIX."supplier_proposal as p";
+    $sql .= ", ".MAIN_DB_PREFIX."societe as s";
+    if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+    $sql .= " WHERE p.fk_statut = 0";
+    $sql .= " AND p.fk_soc = s.rowid";
+    $sql .= " AND p.entity IN (".getEntity('supplier_proposal').")";
+    if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+    if ($socid)	$sql .= " AND s.rowid = ".$socid;
+
+    $resql = $db->query($sql);
     if ($resql)
     {
         $total = 0;
@@ -243,7 +243,7 @@ 
         print '<div class="div-table-responsive-no-min">';
         print '<table class="noborder" width="100%">';
         print '<tr class="liste_titre">';
-        print '<th colspan="3">'.$langs->trans("SupplierProposalsDraft").($num?' <span class="badge">'.$num.'</span>':'').'</th></tr>';
+        print '<th colspan="3">'.$langs->trans("SupplierProposalsDraft").($num ? ' <span class="badge">'.$num.'</span>' : '').'</th></tr>';
 
         if ($num > 0)
         {
@@ -253,27 +253,27 @@ 
                 $obj = $db->fetch_object($resql);
 
                 print '<tr class="oddeven"><td  class="nowrap">';
-                $supplierproposalstatic->id=$obj->rowid;
-                $supplierproposalstatic->ref=$obj->ref;
+                $supplierproposalstatic->id = $obj->rowid;
+                $supplierproposalstatic->ref = $obj->ref;
                 $supplierproposalstatic->total_ht = $obj->total_ht;
                 $supplierproposalstatic->total_tva = $obj->total_tva;
                 $supplierproposalstatic->total_ttc = $obj->total_ttc;
                 print $supplierproposalstatic->getNomUrl(1);
                 print '</td>';
                 print '<td class="nowrap">';
-                $companystatic->id=$obj->socid;
-                $companystatic->name=$obj->name;
-                $companystatic->client=$obj->client;
+                $companystatic->id = $obj->socid;
+                $companystatic->name = $obj->name;
+                $companystatic->client = $obj->client;
                 $companystatic->code_client = $obj->code_client;
                 $companystatic->code_fournisseur = $obj->code_fournisseur;
-                $companystatic->canvas=$obj->canvas;
-                print $companystatic->getNomUrl(1,'supplier',16);
+                $companystatic->canvas = $obj->canvas;
+                print $companystatic->getNomUrl(1, 'supplier', 16);
                 print '</td>';
                 print '<td align="right" class="nowrap">'.price($obj->total_ht).'</td></tr>';
                 $i++;
                 $total += $obj->total_ht;
             }
-            if ($total>0)
+            if ($total > 0)
             {
                 print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td colspan="2" align="right">'.price($total)."</td></tr>";
             }
@@ -296,20 +296,20 @@ 
 /*
  * Draft orders
  */
-if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
+if (!empty($conf->commande->enabled) && $user->rights->commande->lire)
 {
 	$langs->load("orders");
 
 	$sql = "SELECT c.rowid, c.ref, c.ref_client, c.total_ht, c.tva as total_tva, c.total_ttc, s.rowid as socid, s.nom as name, s.client, s.canvas";
-    $sql.= ", s.code_client";
-	$sql.= " FROM ".MAIN_DB_PREFIX."commande as c";
-	$sql.= ", ".MAIN_DB_PREFIX."societe as s";
-	if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	$sql.= " WHERE c.fk_soc = s.rowid";
-	$sql.= " AND c.fk_statut = 0";
-	$sql.= " AND c.entity IN (".getEntity('commande').")";
-	if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-	if ($socid)	$sql.= " AND c.fk_soc = ".$socid;
+    $sql .= ", s.code_client";
+	$sql .= " FROM ".MAIN_DB_PREFIX."commande as c";
+	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
+	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	$sql .= " WHERE c.fk_soc = s.rowid";
+	$sql .= " AND c.fk_statut = 0";
+	$sql .= " AND c.entity IN (".getEntity('commande').")";
+	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	if ($socid)	$sql .= " AND c.fk_soc = ".$socid;
 
 	$resql = $db->query($sql);
 	if ($resql)
@@ -320,7 +320,7 @@ 
 		print '<div class="div-table-responsive-no-min">';
 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre">';
-		print '<th colspan="3">'.$langs->trans("DraftOrders").($num?' <span class="badge">'.$num.'</span>':'').'</th></tr>';
+		print '<th colspan="3">'.$langs->trans("DraftOrders").($num ? ' <span class="badge">'.$num.'</span>' : '').'</th></tr>';
 
 		if ($num > 0)
 		{
@@ -330,24 +330,24 @@ 
 
 				$obj = $db->fetch_object($resql);
 				print '<tr class="oddeven"><td class="nowrap">';
-                $orderstatic->id=$obj->rowid;
-                $orderstatic->ref=$obj->ref;
-                $orderstatic->ref_client=$obj->ref_client;
+                $orderstatic->id = $obj->rowid;
+                $orderstatic->ref = $obj->ref;
+                $orderstatic->ref_client = $obj->ref_client;
                 $orderstatic->total_ht = $obj->total_ht;
                 $orderstatic->total_tva = $obj->total_tva;
                 $orderstatic->total_ttc = $obj->total_ttc;
                 print $orderstatic->getNomUrl(1);
                 print '</td>';
 				print '<td class="nowrap">';
-				$companystatic->id=$obj->socid;
-				$companystatic->name=$obj->name;
-				$companystatic->client=$obj->client;
+				$companystatic->id = $obj->socid;
+				$companystatic->name = $obj->name;
+				$companystatic->client = $obj->client;
                 $companystatic->code_client = $obj->code_client;
                 $companystatic->code_fournisseur = $obj->code_fournisseur;
-                $companystatic->canvas=$obj->canvas;
-				print $companystatic->getNomUrl(1,'customer',16);
+                $companystatic->canvas = $obj->canvas;
+				print $companystatic->getNomUrl(1, 'customer', 16);
 				print '</td>';
-				if(! empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT)) {
+				if (!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT)) {
 					print '<td align="right" class="nowrap">'.price($obj->total_ht).'</td></tr>';
 				}
 				else {
@@ -356,7 +356,7 @@ 
 				$i++;
 				$total += $obj->total_ttc;
 			}
-			if ($total>0)
+			if ($total > 0)
 			{
 
 				print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td colspan="2" align="right">'.price($total)."</td></tr>";
@@ -382,21 +382,21 @@ 
 /*
  * Draft suppliers orders
  */
-if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->commande->lire)
+if (!empty($conf->fournisseur->enabled) && $user->rights->fournisseur->commande->lire)
 {
     $langs->load("orders");
 
     $sql = "SELECT cf.rowid, cf.ref, cf.ref_supplier, cf.total_ttc, s.rowid as socid, s.nom as name, s.client, s.canvas";
-    $sql.= ", s.code_client";
-    $sql.= ", s.code_fournisseur";
-    $sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as cf";
-    $sql.= ", ".MAIN_DB_PREFIX."societe as s";
-    if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-    $sql.= " WHERE cf.fk_soc = s.rowid";
-    $sql.= " AND cf.fk_statut = 0";
-    $sql.= " AND cf.entity IN (".getEntity('supplier_order').")";
-    if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-    if ($socid)	$sql.= " AND cf.fk_soc = ".$socid;
+    $sql .= ", s.code_client";
+    $sql .= ", s.code_fournisseur";
+    $sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as cf";
+    $sql .= ", ".MAIN_DB_PREFIX."societe as s";
+    if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+    $sql .= " WHERE cf.fk_soc = s.rowid";
+    $sql .= " AND cf.fk_statut = 0";
+    $sql .= " AND cf.entity IN (".getEntity('supplier_order').")";
+    if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+    if ($socid)	$sql .= " AND cf.fk_soc = ".$socid;
 
     $resql = $db->query($sql);
     if ($resql)
@@ -407,7 +407,7 @@ 
         print '<div class="div-table-responsive-no-min">';
         print '<table class="noborder" width="100%">';
         print '<tr class="liste_titre">';
-        print '<th colspan="3">'.$langs->trans("DraftSuppliersOrders").($num?' <span class="badge">'.$num.'</span>':'').'</th></tr>';
+        print '<th colspan="3">'.$langs->trans("DraftSuppliersOrders").($num ? ' <span class="badge">'.$num.'</span>' : '').'</th></tr>';
 
         if ($num > 0)
         {
@@ -417,24 +417,24 @@ 
 
                 $obj = $db->fetch_object($resql);
                 print '<tr class="oddeven"><td class="nowrap">';
-                $supplierorderstatic->id=$obj->rowid;
-                $supplierorderstatic->ref=$obj->ref;
-                $supplierorderstatic->ref_supplier=$obj->ref_suppliert;
+                $supplierorderstatic->id = $obj->rowid;
+                $supplierorderstatic->ref = $obj->ref;
+                $supplierorderstatic->ref_supplier = $obj->ref_suppliert;
                 $supplierorderstatic->total_ht = $obj->total_ht;
                 $supplierorderstatic->total_tva = $obj->total_tva;
                 $supplierorderstatic->total_ttc = $obj->total_ttc;
                 print $supplierorderstatic->getNomUrl(1);
                 print '</td>';
                 print '<td class="nowrap">';
-                $companystatic->id=$obj->socid;
-                $companystatic->name=$obj->name;
-                $companystatic->client=$obj->client;
+                $companystatic->id = $obj->socid;
+                $companystatic->name = $obj->name;
+                $companystatic->client = $obj->client;
                 $companystatic->code_client = $obj->code_client;
                 $companystatic->code_fournisseur = $obj->code_fournisseur;
-                $companystatic->canvas=$obj->canvas;
-                print $companystatic->getNomUrl(1,'supplier',16);
+                $companystatic->canvas = $obj->canvas;
+                print $companystatic->getNomUrl(1, 'supplier', 16);
                 print '</td>';
-				if(! empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT)) {
+				if (!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT)) {
 					print '<td align="right" class="nowrap">'.price($obj->total_ht).'</td></tr>';
 				}
 				else {
@@ -443,7 +443,7 @@ 
                 $i++;
                 $total += $obj->total_ttc;
             }
-            if ($total>0)
+            if ($total > 0)
             {
 
                 print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td colspan="2" align="right">'.price($total)."</td></tr>";
@@ -467,25 +467,25 @@ 
 print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 
-$NBMAX=3;
-$max=3;
+$NBMAX = 3;
+$max = 3;
 
 
 /*
  * Last modified customers or prospects
  */
-if (! empty($conf->societe->enabled) && $user->rights->societe->lire)
+if (!empty($conf->societe->enabled) && $user->rights->societe->lire)
 {
 	$langs->load("boxes");
 
 	$sql = "SELECT s.rowid, s.nom as name, s.client, s.datec, s.tms, s.canvas";
-    $sql.= ", s.code_client";
-	$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-	if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	$sql.= " WHERE s.client IN (1, 2, 3)";
-	$sql.= " AND s.entity IN (".getEntity($companystatic->element).")";
-	if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-	if ($socid)	$sql.= " AND s.rowid = $socid";
+    $sql .= ", s.code_client";
+	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	$sql .= " WHERE s.client IN (1, 2, 3)";
+	$sql .= " AND s.entity IN (".getEntity($companystatic->element).")";
+	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	if ($socid)	$sql .= " AND s.rowid = $socid";
 	$sql .= " ORDER BY s.tms DESC";
 	$sql .= $db->plimit($max, 0);
 
@@ -499,9 +499,9 @@ 
 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre">';
 		print '<th colspan="2">';
-		if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) print $langs->trans("BoxTitleLastCustomersOrProspects",$max);
-        else if (! empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) print $langs->trans("BoxTitleLastModifiedProspects",$max);
-		else print $langs->trans("BoxTitleLastModifiedCustomers",$max);
+		if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) print $langs->trans("BoxTitleLastCustomersOrProspects", $max);
+        else if (!empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) print $langs->trans("BoxTitleLastModifiedProspects", $max);
+		else print $langs->trans("BoxTitleLastModifiedCustomers", $max);
 		print '</th>';
 		print '<th align="right"><a class="commonlink" href="'.DOL_URL_ROOT.'/societe/list.php?type=p,c">'.$langs->trans("FullList").'</a></th>';
 		print '</tr>';
@@ -510,18 +510,18 @@ 
 			while ($i < $num)
 			{
 				$objp = $db->fetch_object($resql);
-				$companystatic->id=$objp->rowid;
-				$companystatic->name=$objp->name;
-				$companystatic->client=$objp->client;
+				$companystatic->id = $objp->rowid;
+				$companystatic->name = $objp->name;
+				$companystatic->client = $objp->client;
                 $companystatic->code_client = $objp->code_client;
                 $companystatic->code_fournisseur = $objp->code_fournisseur;
-                $companystatic->canvas=$objp->canvas;
+                $companystatic->canvas = $objp->canvas;
 				print '<tr class="oddeven">';
-				print '<td class="nowrap">'.$companystatic->getNomUrl(1,'customer',48).'</td>';
+				print '<td class="nowrap">'.$companystatic->getNomUrl(1, 'customer', 48).'</td>';
 				print '<td align="right" nowrap>';
 				print $companystatic->getLibCustProspStatut();
 				print "</td>";
-				print '<td align="right" nowrap>'.dol_print_date($db->jdate($objp->tms),'day')."</td>";
+				print '<td align="right" nowrap>'.dol_print_date($db->jdate($objp->tms), 'day')."</td>";
 				print '</tr>';
 				$i++;
 			}
@@ -538,20 +538,20 @@ 
 }
 
 // Last suppliers
-if (! empty($conf->fournisseur->enabled) && $user->rights->societe->lire)
+if (!empty($conf->fournisseur->enabled) && $user->rights->societe->lire)
 {
 	$langs->load("boxes");
 
 	$sql = "SELECT s.nom as name, s.rowid, s.datec as dc, s.canvas, s.tms as dm";
-    $sql.= ", s.code_fournisseur";
-	$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-	if (! $user->rights->societe->client->voir && ! $user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	$sql.= " WHERE s.fournisseur = 1";
-	$sql.= " AND s.entity IN (".getEntity($companystatic->element).")";
-	if (! $user->rights->societe->client->voir && ! $user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-	if ($socid)	$sql.= " AND s.rowid = ".$socid;
-	$sql.= " ORDER BY s.datec DESC";
-	$sql.= $db->plimit($max, 0);
+    $sql .= ", s.code_fournisseur";
+	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+	if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	$sql .= " WHERE s.fournisseur = 1";
+	$sql .= " AND s.entity IN (".getEntity($companystatic->element).")";
+	if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	if ($socid)	$sql .= " AND s.rowid = ".$socid;
+	$sql .= " ORDER BY s.datec DESC";
+	$sql .= $db->plimit($max, 0);
 
 	$result = $db->query($sql);
 	if ($result)
@@ -562,7 +562,7 @@ 
 		print '<div class="div-table-responsive-no-min">';
 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre">';
-		print '<th>'.$langs->trans("BoxTitleLastModifiedSuppliers",min($max,$num)).'</th>';
+		print '<th>'.$langs->trans("BoxTitleLastModifiedSuppliers", min($max, $num)).'</th>';
 		print '<th align="right"><a class="commonlink" href="'.DOL_URL_ROOT.'/societe/list.php?type=f">'.$langs->trans("FullList").'</a></th>';
 		print '</tr>';
 		if ($num)
@@ -570,14 +570,14 @@ 
 			while ($i < $num && $i < $max)
 			{
 				$objp = $db->fetch_object($result);
-				$companystatic->id=$objp->rowid;
-                $companystatic->name=$objp->name;
+				$companystatic->id = $objp->rowid;
+                $companystatic->name = $objp->name;
                 $companystatic->code_client = $objp->code_client;
                 $companystatic->code_fournisseur = $objp->code_fournisseur;
-                $companystatic->canvas=$objp->canvas;
+                $companystatic->canvas = $objp->canvas;
                 print '<tr class="oddeven">';
-				print '<td class="nowrap">'.$companystatic->getNomUrl(1,'supplier',44).'</td>';
-				print '<td align="right">'.dol_print_date($db->jdate($objp->dm),'day').'</td>';
+				print '<td class="nowrap">'.$companystatic->getNomUrl(1, 'supplier', 44).'</td>';
+				print '<td align="right">'.dol_print_date($db->jdate($objp->dm), 'day').'</td>';
 				print '</tr>';
 
 				$i++;
@@ -614,26 +614,26 @@ 
 /*
  * Last contracts
  */
-if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire && 0) // TODO A REFAIRE DEPUIS NOUVEAU CONTRAT
+if (!empty($conf->contrat->enabled) && $user->rights->contrat->lire && 0) // TODO A REFAIRE DEPUIS NOUVEAU CONTRAT
 {
 	$langs->load("contracts");
 
 	$sql = "SELECT s.nom as name, s.rowid, s.canvas, ";
-    $sql.= ", s.code_client";
-	$sql.= " c.statut, c.rowid as contratid, p.ref, c.mise_en_service as datemes, c.fin_validite as datefin, c.date_cloture as dateclo";
-	$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-	$sql.= ", ".MAIN_DB_PREFIX."contrat as c";
-	$sql.= ", ".MAIN_DB_PREFIX."product as p";
-	if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	$sql.= " WHERE c.fk_soc = s.rowid";
-	$sql.= " AND c.entity IN (".getEntity('contract').")";
-	$sql.= " AND c.fk_product = p.rowid";
-	if (! $user->rights->societe->client->voir && ! $socid)	$sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-	if ($socid) $sql.= " AND s.rowid = ".$socid;
-	$sql.= " ORDER BY c.tms DESC";
-	$sql.= $db->plimit(5, 0);
-
-	$resql=$db->query($sql);
+    $sql .= ", s.code_client";
+	$sql .= " c.statut, c.rowid as contratid, p.ref, c.mise_en_service as datemes, c.fin_validite as datefin, c.date_cloture as dateclo";
+	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+	$sql .= ", ".MAIN_DB_PREFIX."contrat as c";
+	$sql .= ", ".MAIN_DB_PREFIX."product as p";
+	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	$sql .= " WHERE c.fk_soc = s.rowid";
+	$sql .= " AND c.entity IN (".getEntity('contract').")";
+	$sql .= " AND c.fk_product = p.rowid";
+	if (!$user->rights->societe->client->voir && !$socid)	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	if ($socid) $sql .= " AND s.rowid = ".$socid;
+	$sql .= " ORDER BY c.tms DESC";
+	$sql .= $db->plimit(5, 0);
+
+	$resql = $db->query($sql);
 	if ($resql)
 	{
 		$num = $db->num_rows($resql);
@@ -642,24 +642,24 @@ 
 		{
 			print '<div class="div-table-responsive-no-min">';
 			print '<table class="noborder" width="100%">';
-			print '<tr class="liste_titre"><th colspan="3">'.$langs->trans("LastContracts",5).'</th></tr>';
+			print '<tr class="liste_titre"><th colspan="3">'.$langs->trans("LastContracts", 5).'</th></tr>';
 			$i = 0;
 
-			$staticcontrat=new Contrat($db);
+			$staticcontrat = new Contrat($db);
 
 			while ($i < $num)
 			{
 				$obj = $db->fetch_object($resql);
 				print '<tr class="oddeven"><td><a href=\"../contrat/card.php?id=".$obj->contratid."\">".img_object($langs->trans("ShowContract","contract"), "contract")." ".$obj->ref."</a></td>';
 				print '<td>';
-                $companystatic->id=$objp->rowid;
-                $companystatic->name=$objp->name;
+                $companystatic->id = $objp->rowid;
+                $companystatic->name = $objp->name;
                 $companystatic->code_client = $objp->code_client;
                 $companystatic->code_fournisseur = $objp->code_fournisseur;
-                $companystatic->canvas=$objp->canvas;
-                print $companystatic->getNomUrl(1,'customer',44);
+                $companystatic->canvas = $objp->canvas;
+                print $companystatic->getNomUrl(1, 'customer', 44);
 				print '</td>'."\n";
-				print "<td align=\"right\">".$staticcontrat->LibStatut($obj->statut,3)."</td></tr>\n";
+				print "<td align=\"right\">".$staticcontrat->LibStatut($obj->statut, 3)."</td></tr>\n";
 
 				$i++;
 			}
@@ -676,23 +676,23 @@ 
 /*
  * Opened proposals
  */
-if (! empty($conf->propal->enabled) && $user->rights->propal->lire)
+if (!empty($conf->propal->enabled) && $user->rights->propal->lire)
 {
 	$langs->load("propal");
 
 	$sql = "SELECT s.nom as name, s.rowid, s.code_client";
-	$sql.= ", p.rowid as propalid, p.entity, p.total as total_ttc, p.total_ht, p.tva as total_tva, p.ref, p.ref_client, p.fk_statut, p.datep as dp, p.fin_validite as dfv";
-	$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-	$sql.= ", ".MAIN_DB_PREFIX."propal as p";
-	if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	$sql.= " WHERE p.fk_soc = s.rowid";
-	$sql.= " AND p.entity IN (".getEntity('propal').")";
-	$sql.= " AND p.fk_statut = 1";
-	if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-	if ($socid) $sql.= " AND s.rowid = ".$socid;
-	$sql.= " ORDER BY p.rowid DESC";
-
-	$result=$db->query($sql);
+	$sql .= ", p.rowid as propalid, p.entity, p.total as total_ttc, p.total_ht, p.tva as total_tva, p.ref, p.ref_client, p.fk_statut, p.datep as dp, p.fin_validite as dfv";
+	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+	$sql .= ", ".MAIN_DB_PREFIX."propal as p";
+	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	$sql .= " WHERE p.fk_soc = s.rowid";
+	$sql .= " AND p.entity IN (".getEntity('propal').")";
+	$sql .= " AND p.fk_statut = 1";
+	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	if ($socid) $sql .= " AND s.rowid = ".$socid;
+	$sql .= " ORDER BY p.rowid DESC";
+
+	$result = $db->query($sql);
 	if ($result)
 	{
 		$total = 0;
@@ -704,7 +704,7 @@ 
 			print '<table class="noborder" width="100%">';
 			print '<tr class="liste_titre"><th colspan="5">'.$langs->trans("ProposalsOpened").' <a href="'.DOL_URL_ROOT.'/comm/propal/list.php?viewstatut=1"><span class="badge">'.$num.'</span></th></tr>';
 
-			$nbofloop=min($num, (empty($conf->global->MAIN_MAXLIST_OVERLOAD)?500:$conf->global->MAIN_MAXLIST_OVERLOAD));
+			$nbofloop = min($num, (empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD));
 			while ($i < $nbofloop)
 			{
 				$obj = $db->fetch_object($result);
@@ -714,9 +714,9 @@ 
 				// Ref
 				print '<td class="nowrap" width="140">';
 
-				$propalstatic->id=$obj->propalid;
-				$propalstatic->ref=$obj->ref;
-                $propalstatic->ref_client=$obj->ref_client;
+				$propalstatic->id = $obj->propalid;
+				$propalstatic->ref = $obj->ref;
+                $propalstatic->ref_client = $obj->ref_client;
                 $propalstatic->total_ht = $obj->total_ht;
                 $propalstatic->total_tva = $obj->total_tva;
                 $propalstatic->total_ttc = $obj->total_ttc;
@@ -729,32 +729,32 @@ 
 				if ($db->jdate($obj->dfv) < ($now - $conf->propal->cloture->warning_delay)) print img_warning($langs->trans("Late"));
 				print '</td>';
 				print '<td width="16" align="center" class="nobordernopadding">';
-				$filename=dol_sanitizeFileName($obj->ref);
-				$filedir=$conf->propal->multidir_output[$obj->entity] . '/' . dol_sanitizeFileName($obj->ref);
-				$urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->propalid;
+				$filename = dol_sanitizeFileName($obj->ref);
+				$filedir = $conf->propal->multidir_output[$obj->entity].'/'.dol_sanitizeFileName($obj->ref);
+				$urlsource = $_SERVER['PHP_SELF'].'?id='.$obj->propalid;
 				print $formfile->getDocumentsLink($propalstatic->element, $filename, $filedir);
 				print '</td></tr></table>';
 
 				print "</td>";
 
                 print '<td class="nowrap">';
-                $companystatic->id=$obj->rowid;
-                $companystatic->name=$obj->name;
-                $companystatic->client=$obj->client;
+                $companystatic->id = $obj->rowid;
+                $companystatic->name = $obj->name;
+                $companystatic->client = $obj->client;
                 $companystatic->code_client = $obj->code_client;
                 $companystatic->code_fournisseur = $obj->code_fournisseur;
-                $companystatic->canvas=$obj->canvas;
+                $companystatic->canvas = $obj->canvas;
                 print $companystatic->getNomUrl(1, 'customer', 44);
                 print '</td>';
 				print '<td align="right">';
-				print dol_print_date($db->jdate($obj->dp),'day').'</td>'."\n";
-				if(! empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT)) {
+				print dol_print_date($db->jdate($obj->dp), 'day').'</td>'."\n";
+				if (!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT)) {
 					print '<td align="right">'.price($obj->total_ht).'</td>';
 				}
 				else {
 					print '<td align="right">'.price($obj->total_ttc).'</td>';
 				}
-				print '<td align="center" width="14">'.$propalstatic->LibStatut($obj->fk_statut,3).'</td>'."\n";
+				print '<td align="center" width="14">'.$propalstatic->LibStatut($obj->fk_statut, 3).'</td>'."\n";
 				print '</tr>'."\n";
 				$i++;
 				$total += $obj->total_ttc;
@@ -763,7 +763,7 @@ 
 			{
 				print '<tr class="liste_total"><td colspan="5">'.$langs->trans("XMoreLines", ($num - $nbofloop))."</td></tr>";
 			}
-			else if ($total>0)
+			else if ($total > 0)
 			{
 				print '<tr class="liste_total"><td colspan="3">'.$langs->trans("Total")."</td><td align=\"right\">".price($total)."</td><td>&nbsp;</td></tr>";
 			}
@@ -780,23 +780,23 @@ 
 /*
  * Opened Order
  */
-if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
+if (!empty($conf->commande->enabled) && $user->rights->commande->lire)
 {
 	$langs->load("orders");
 
 	$sql = "SELECT s.nom as name, s.rowid, c.rowid as commandeid, c.total_ttc, c.total_ht, c.tva as total_tva, c.ref, c.ref_client, c.fk_statut, c.date_valid as dv, c.facture as billed";
-    $sql.= ", s.code_client";
-	$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-	$sql.= ", ".MAIN_DB_PREFIX."commande as c";
-	if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	$sql.= " WHERE c.fk_soc = s.rowid";
-	$sql.= " AND c.entity IN (".getEntity('commande').")";
-	$sql.= " AND (c.fk_statut = ".Commande::STATUS_VALIDATED." or c.fk_statut = ".Commande::STATUS_SHIPMENTONPROCESS.")";
-	if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-	if ($socid) $sql.= " AND s.rowid = ".$socid;
-	$sql.= " ORDER BY c.rowid DESC";
-
-	$result=$db->query($sql);
+    $sql .= ", s.code_client";
+	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+	$sql .= ", ".MAIN_DB_PREFIX."commande as c";
+	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	$sql .= " WHERE c.fk_soc = s.rowid";
+	$sql .= " AND c.entity IN (".getEntity('commande').")";
+	$sql .= " AND (c.fk_statut = ".Commande::STATUS_VALIDATED." or c.fk_statut = ".Commande::STATUS_SHIPMENTONPROCESS.")";
+	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	if ($socid) $sql .= " AND s.rowid = ".$socid;
+	$sql .= " ORDER BY c.rowid DESC";
+
+	$result = $db->query($sql);
 	if ($result)
 	{
 		$total = 0;
@@ -808,7 +808,7 @@ 
 			print '<table class="noborder" width="100%">';
 			print '<tr class="liste_titre"><th class="liste_titre" colspan="5">'.$langs->trans("OrdersOpened").' <a href="'.DOL_URL_ROOT.'/commande/list.php?viewstatut=1"><span class="badge">'.$num.'</span></th></tr>';
 
-			$nbofloop=min($num, (empty($conf->global->MAIN_MAXLIST_OVERLOAD)?500:$conf->global->MAIN_MAXLIST_OVERLOAD));
+			$nbofloop = min($num, (empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD));
 			while ($i < $nbofloop)
 			{
 				$obj = $db->fetch_object($result);
@@ -818,9 +818,9 @@ 
 				// Ref
 				print '<td class="nowrap" width="140">';
 
-				$orderstatic->id=$obj->commandeid;
-				$orderstatic->ref=$obj->ref;
-                $orderstatic->ref_client=$obj->ref_client;
+				$orderstatic->id = $obj->commandeid;
+				$orderstatic->ref = $obj->ref;
+                $orderstatic->ref_client = $obj->ref_client;
                 $orderstatic->total_ht = $obj->total_ht;
                 $orderstatic->total_tva = $obj->total_tva;
                 $orderstatic->total_ttc = $obj->total_ttc;
@@ -833,32 +833,32 @@ 
 				//if ($db->jdate($obj->dfv) < ($now - $conf->propal->cloture->warning_delay)) print img_warning($langs->trans("Late"));
 				print '</td>';
 				print '<td width="16" align="center" class="nobordernopadding">';
-				$filename=dol_sanitizeFileName($obj->ref);
-				$filedir=$conf->commande->dir_output . '/' . dol_sanitizeFileName($obj->ref);
-				$urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->propalid;
+				$filename = dol_sanitizeFileName($obj->ref);
+				$filedir = $conf->commande->dir_output.'/'.dol_sanitizeFileName($obj->ref);
+				$urlsource = $_SERVER['PHP_SELF'].'?id='.$obj->propalid;
 				print $formfile->getDocumentsLink($orderstatic->element, $filename, $filedir);
 				print '</td></tr></table>';
 
 				print "</td>";
 
                 print '<td class="nowrap">';
-                $companystatic->id=$obj->rowid;
-                $companystatic->name=$obj->name;
-                $companystatic->client=$obj->client;
+                $companystatic->id = $obj->rowid;
+                $companystatic->name = $obj->name;
+                $companystatic->client = $obj->client;
                 $companystatic->code_client = $obj->code_client;
                 $companystatic->code_fournisseur = $obj->code_fournisseur;
-                $companystatic->canvas=$obj->canvas;
+                $companystatic->canvas = $obj->canvas;
                 print $companystatic->getNomUrl(1, 'customer', 44);
                 print '</td>';
 				print '<td align="right">';
-				print dol_print_date($db->jdate($obj->dp),'day').'</td>'."\n";
-				if(! empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT)) {
+				print dol_print_date($db->jdate($obj->dp), 'day').'</td>'."\n";
+				if (!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT)) {
 					print '<td align="right">'.price($obj->total_ht).'</td>';
 				}
 				else {
 					print '<td align="right">'.price($obj->total_ttc).'</td>';
 				}
-				print '<td align="center" width="14">'.$orderstatic->LibStatut($obj->fk_statut,$obj->billed,3).'</td>'."\n";
+				print '<td align="center" width="14">'.$orderstatic->LibStatut($obj->fk_statut, $obj->billed, 3).'</td>'."\n";
 				print '</tr>'."\n";
 				$i++;
 				$total += $obj->total_ttc;
@@ -867,7 +867,7 @@ 
 			{
 				print '<tr class="liste_total"><td colspan="5">'.$langs->trans("XMoreLines", ($num - $nbofloop))."</td></tr>";
 			}
-			else if ($total>0)
+			else if ($total > 0)
 			{
 				print '<tr class="liste_total"><td colspan="3">'.$langs->trans("Total")."</td><td align=\"right\">".price($total)."</td><td>&nbsp;</td></tr>";
 			}

dolibarr/htdocs/comm/card.php

Spacing +149 added lines, -149 removed lines

@@ -30,30 +30,30 @@ 
  *       \brief      Page to show customer card of a third party
  */
 
-require DOL_BASE_PATH . '/main.inc.php';
-
-require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/societe/class/client.class.php';
-require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formcompany.class.php';
-require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
+require DOL_BASE_PATH.'/main.inc.php';
+
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/societe/class/client.class.php';
+require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
+require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 if (!empty($conf->facture->enabled))
-    require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
+    require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 if (!empty($conf->facture->enabled))
-    require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture-rec.class.php';
+    require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture-rec.class.php';
 if (!empty($conf->propal->enabled))
-    require_once DOL_DOCUMENT_ROOT . '/comm/propal/class/propal.class.php';
+    require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 if (!empty($conf->commande->enabled))
-    require_once DOL_DOCUMENT_ROOT . '/commande/class/commande.class.php';
+    require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 if (!empty($conf->expedition->enabled))
-    require_once DOL_DOCUMENT_ROOT . '/expedition/class/expedition.class.php';
+    require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
 if (!empty($conf->contrat->enabled))
-    require_once DOL_DOCUMENT_ROOT . '/contrat/class/contrat.class.php';
+    require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 if (!empty($conf->adherent->enabled))
-    require_once DOL_DOCUMENT_ROOT . '/adherents/class/adherent.class.php';
+    require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 if (!empty($conf->ficheinter->enabled))
-    require_once DOL_DOCUMENT_ROOT . '/fichinter/class/fichinter.class.php';
+    require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array('companies', 'banks'));
@@ -258,7 +258,7 @@ 
 
     dol_fiche_head($head, 'customer', $langs->trans("ThirdParty"), -1, 'company');
 
-    $linkback = '<a href="' . DOL_URL_ROOT . '/societe/list.php">' . $langs->trans("BackToList") . '</a>';
+    $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php">'.$langs->trans("BackToList").'</a>';
 
     dol_banner_tab($object, 'socid', $linkback, ($user->societe_id ? 0 : 1), 'rowid', 'nom');
 
@@ -268,13 +268,13 @@ 
     print '<table class="border" width="100%">';
 
     // Prospect/Customer
-    print '<tr><td class="titlefield">' . $langs->trans('ProspectCustomer') . '</td><td>';
+    print '<tr><td class="titlefield">'.$langs->trans('ProspectCustomer').'</td><td>';
     print $object->getLibCustProspStatut();
     print '</td></tr>';
 
     // Prefix
     if (!empty($conf->global->SOCIETE_USEPREFIX)) {  // Old not used prefix field
-        print '<tr><td>' . $langs->trans("Prefix") . '</td><td>';
+        print '<tr><td>'.$langs->trans("Prefix").'</td><td>';
         print ($object->prefix_comm ? $object->prefix_comm : '&nbsp;');
         print '</td></tr>';
     }
@@ -283,10 +283,10 @@ 
         $langs->load("compta");
 
         print '<tr><td>';
-        print $langs->trans('CustomerCode') . '</td><td>';
+        print $langs->trans('CustomerCode').'</td><td>';
         print $object->code_client;
         if ($object->check_codeclient() <> 0)
-            print ' <font class="error">(' . $langs->trans("WrongCustomerCode") . ')</font>';
+            print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
         print '</td></tr>';
 
         print '<tr>';
@@ -316,19 +316,19 @@ 
     if ($mysoc->country_code == 'ES') {
         // Local Taxes
         if ($mysoc->localtax1_assuj == "1") {
-            print '<tr><td class="nowrap">' . $langs->transcountry("LocalTax1IsUsed", $mysoc->country_code) . '</td><td>';
+            print '<tr><td class="nowrap">'.$langs->transcountry("LocalTax1IsUsed", $mysoc->country_code).'</td><td>';
             print yn($object->localtax1_assuj);
             print '</td></tr>';
         }
         if ($mysoc->localtax1_assuj == "1") {
-            print '<tr><td class="nowrap">' . $langs->transcountry("LocalTax2IsUsed", $mysoc->country_code) . '</td><td>';
+            print '<tr><td class="nowrap">'.$langs->transcountry("LocalTax2IsUsed", $mysoc->country_code).'</td><td>';
             print yn($object->localtax2_assuj);
             print '</td></tr>';
         }
     }
 
     // TVA Intra
-    print '<tr><td class="nowrap">' . $langs->trans('VATIntra') . '</td><td>';
+    print '<tr><td class="nowrap">'.$langs->trans('VATIntra').'</td><td>';
     print $object->tva_intra;
     print '</td></tr>';
 
@@ -339,15 +339,15 @@ 
     print $langs->trans('PaymentConditions');
     print '<td>';
     if (($action != 'editconditions') && $user->rights->societe->creer)
-        print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editconditions&amp;socid=' . $object->id . '">' . img_edit($langs->trans('SetConditions'), 1) . '</a></td>';
+        print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editconditions&amp;socid='.$object->id.'">'.img_edit($langs->trans('SetConditions'), 1).'</a></td>';
     print '</tr></table>';
     print '</td><td>';
     if ($action == 'editconditions') {
         // $form->form_conditions_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->cond_reglement_id, 'cond_reglement_id',1);
-        $form->form_conditions_reglement($_SERVER['PHP_SELF'] . '&socid=' . $object->id, $object->cond_reglement_id, 'cond_reglement_id', 1);
+        $form->form_conditions_reglement($_SERVER['PHP_SELF'].'&socid='.$object->id, $object->cond_reglement_id, 'cond_reglement_id', 1);
     } else {
         // $form->form_conditions_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->cond_reglement_id, 'none');
-        $form->form_conditions_reglement($_SERVER['PHP_SELF'] . '&socid=' . $object->id, $object->cond_reglement_id, 'none');
+        $form->form_conditions_reglement($_SERVER['PHP_SELF'].'&socid='.$object->id, $object->cond_reglement_id, 'none');
     }
     print "</td>";
     print '</tr>';
@@ -358,15 +358,15 @@ 
     print $langs->trans('PaymentMode');
     print '<td>';
     if (($action != 'editmode') && $user->rights->societe->creer)
-        print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editmode&amp;socid=' . $object->id . '">' . img_edit($langs->trans('SetMode'), 1) . '</a></td>';
+        print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editmode&amp;socid='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>';
     print '</tr></table>';
     print '</td><td>';
     if ($action == 'editmode') {
         // $form->form_modes_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id,$object->mode_reglement_id,'mode_reglement_id', 'CRDT');
-        $form->form_modes_reglement($_SERVER['PHP_SELF'] . '&socid=' . $object->id, $object->mode_reglement_id, 'mode_reglement_id', 'CRDT');
+        $form->form_modes_reglement($_SERVER['PHP_SELF'].'&socid='.$object->id, $object->mode_reglement_id, 'mode_reglement_id', 'CRDT');
     } else {
         // $form->form_modes_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id,$object->mode_reglement_id,'none');
-        $form->form_modes_reglement($_SERVER['PHP_SELF'] . '&socid=' . $object->id, $object->mode_reglement_id, 'none');
+        $form->form_modes_reglement($_SERVER['PHP_SELF'].'&socid='.$object->id, $object->mode_reglement_id, 'none');
     }
     print "</td>";
     print '</tr>';
@@ -378,15 +378,15 @@ 
         print $langs->trans('PaymentBankAccount');
         print '<td>';
         if (($action != 'editbankaccount') && $user->rights->societe->creer)
-            print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editbankaccount&amp;socid=' . $object->id . '">' . img_edit($langs->trans('SetBankAccount'), 1) . '</a></td>';
+            print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&amp;socid='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'), 1).'</a></td>';
         print '</tr></table>';
         print '</td><td>';
         if ($action == 'editbankaccount') {
             // $form->formSelectAccount($_SERVER['PHP_SELF'].'?socid='.$object->id,$object->fk_account,'fk_account',1);
-            $form->formSelectAccount($_SERVER['PHP_SELF'] . '&socid=' . $object->id, $object->fk_account, 'fk_account', 1);
+            $form->formSelectAccount($_SERVER['PHP_SELF'].'&socid='.$object->id, $object->fk_account, 'fk_account', 1);
         } else {
             // $form->formSelectAccount($_SERVER['PHP_SELF'].'?socid='.$object->id,$object->fk_account,'none');
-            $form->formSelectAccount($_SERVER['PHP_SELF'] . '&socid=' . $object->id, $object->fk_account, 'none');
+            $form->formSelectAccount($_SERVER['PHP_SELF'].'&socid='.$object->id, $object->fk_account, 'none');
         }
         print "</td>";
         print '</tr>';
@@ -398,10 +398,10 @@ 
     print $langs->trans("CustomerRelativeDiscountShort");
     print '<td><td align="right">';
     if ($user->rights->societe->creer && !$user->societe_id > 0) {
-        print '<a href="' . DOL_URL_ROOT . '/comm/remise.php?id=' . $object->id . '">' . img_edit($langs->trans("Modify")) . '</a>';
+        print '<a href="'.DOL_URL_ROOT.'/comm/remise.php?id='.$object->id.'">'.img_edit($langs->trans("Modify")).'</a>';
     }
     print '</td></tr></table>';
-    print '</td><td>' . ($object->remise_percent ? '<a href="' . DOL_URL_ROOT . '/comm/remise.php?id=' . $object->id . '">' . $object->remise_percent . '%</a>' : '') . '</td>';
+    print '</td><td>'.($object->remise_percent ? '<a href="'.DOL_URL_ROOT.'/comm/remise.php?id='.$object->id.'">'.$object->remise_percent.'%</a>' : '').'</td>';
     print '</tr>';
 
     // Absolute discounts (Discounts-Drawbacks-Rebates)
@@ -412,7 +412,7 @@ 
     print '<td><td align="right">';
     if ($user->rights->societe->creer && !$user->societe_id > 0) {
         // print '<a href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?socid='.$object->id).'">'.img_edit($langs->trans("Modify")).'</a>';
-        print '<a href="' . BASE_URI . '?controller=comm&method=remx&id=' . $object->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '&socid=' . $object->id) . '">' . img_edit($langs->trans("Modify")) . '</a>';
+        print '<a href="'.BASE_URI.'?controller=comm&method=remx&id='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'&socid='.$object->id).'">'.img_edit($langs->trans("Modify")).'</a>';
     }
     print '</td></tr></table>';
     print '</td>';
@@ -423,7 +423,7 @@ 
     }
     if ($amount_discount > 0) {
         // print '<a href="' . DOL_URL_ROOT . '/comm/remx.php?id=' . $object->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?socid=' . $object->id) . '">' . price($amount_discount, 1, $langs, 1, -1, -1, $conf->currency) . '</a>';
-        print '<a href="' . BASE_URI . '?controller=comm&method=remx&id=' . $object->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '&socid=' . $object->id) . '">' . price($amount_discount, 1, $langs, 1, -1, -1, $conf->currency) . '</a>';
+        print '<a href="'.BASE_URI.'?controller=comm&method=remx&id='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'&socid='.$object->id).'">'.price($amount_discount, 1, $langs, 1, -1, -1, $conf->currency).'</a>';
     }
     //else print $langs->trans("DiscountNone");
     print '</td>';
@@ -445,7 +445,7 @@ 
 
     if ($object->client) {
         if (!empty($conf->commande->enabled) && !empty($conf->global->ORDER_MANAGE_MIN_AMOUNT)) {
-            print '<!-- Minimim amount for orders -->' . "\n";
+            print '<!-- Minimim amount for orders -->'."\n";
             print '<tr class="nowrap">';
             print '<td>';
             print $form->editfieldkey("OrderMinAmount", 'order_min_amount', $object->order_min_amount, $object, $user->rights->societe->creer);
@@ -464,14 +464,14 @@ 
         print $langs->trans("PriceLevel");
         print '<td><td align="right">';
         if ($user->rights->societe->creer) {
-            print '<a href="' . DOL_URL_ROOT . '/comm/multiprix.php?id=' . $object->id . '">' . img_edit($langs->trans("Modify")) . '</a>';
+            print '<a href="'.DOL_URL_ROOT.'/comm/multiprix.php?id='.$object->id.'">'.img_edit($langs->trans("Modify")).'</a>';
         }
         print '</td></tr></table>';
         print '</td><td>';
         print $object->price_level;
-        $keyforlabel = 'PRODUIT_MULTIPRICES_LABEL' . $object->price_level;
+        $keyforlabel = 'PRODUIT_MULTIPRICES_LABEL'.$object->price_level;
         if (!empty($conf->global->$keyforlabel))
-            print ' - ' . $langs->trans($conf->global->$keyforlabel);
+            print ' - '.$langs->trans($conf->global->$keyforlabel);
         print "</td>";
         print '</tr>';
     }
@@ -483,15 +483,15 @@ 
         print $langs->trans('SendingMethod');
         print '<td>';
         if (($action != 'editshipping') && $user->rights->societe->creer)
-            print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editshipping&amp;socid=' . $object->id . '">' . img_edit($langs->trans('SetMode'), 1) . '</a></td>';
+            print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editshipping&amp;socid='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>';
         print '</tr></table>';
         print '</td><td>';
         if ($action == 'editshipping') {
             // $form->formSelectShippingMethod($_SERVER['PHP_SELF'] . '?socid=' . $object->id, $object->shipping_method_id, 'shipping_method_id');
-            $form->formSelectShippingMethod($_SERVER['PHP_SELF'] . '&socid=' . $object->id, $object->shipping_method_id, 'shipping_method_id');
+            $form->formSelectShippingMethod($_SERVER['PHP_SELF'].'&socid='.$object->id, $object->shipping_method_id, 'shipping_method_id');
         } else {
             // $form->formSelectShippingMethod($_SERVER['PHP_SELF'] . '?socid=' . $object->id, $object->shipping_method_id, 'none');
-            $form->formSelectShippingMethod($_SERVER['PHP_SELF'] . '&socid=' . $object->id, $object->shipping_method_id, 'none');
+            $form->formSelectShippingMethod($_SERVER['PHP_SELF'].'&socid='.$object->id, $object->shipping_method_id, 'none');
         }
         print "</td>";
         print '</tr>';
@@ -500,7 +500,7 @@ 
     // Categories
     if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) {
         $langs->load("categories");
-        print '<tr><td>' . $langs->trans("CustomersCategoriesShort") . '</td>';
+        print '<tr><td>'.$langs->trans("CustomersCategoriesShort").'</td>';
         print '<td>';
         print $form->showCategories($object->id, 'customer', 1);
         print "</td></tr>";
@@ -508,17 +508,17 @@ 
 
     // Other attributes
     $parameters = array('socid' => $object->id);
-    include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
     // Sales representative
-    include DOL_DOCUMENT_ROOT . '/societe/tpl/linesalesrepresentative.tpl.php';
+    include DOL_DOCUMENT_ROOT.'/societe/tpl/linesalesrepresentative.tpl.php';
 
     // Module Adherent
     if (!empty($conf->adherent->enabled)) {
         $langs->load("members");
         $langs->load("users");
 
-        print '<tr><td class="titlefield">' . $langs->trans("LinkedToDolibarrMember") . '</td>';
+        print '<tr><td class="titlefield">'.$langs->trans("LinkedToDolibarrMember").'</td>';
         print '<td>';
         $adh = new Adherent($db);
         $result = $adh->fetch('', '', $object->id);
@@ -526,7 +526,7 @@ 
             $adh->ref = $adh->getFullName($langs);
             print $adh->getNomUrl(1);
         } else {
-            print '<span class="opacitymedium">' . $langs->trans("ThirdpartyNotLinkedToMember") . '</span>';
+            print '<span class="opacitymedium">'.$langs->trans("ThirdpartyNotLinkedToMember").'</span>';
         }
         print '</td>';
         print "</tr>\n";
@@ -546,12 +546,12 @@ 
         print $langs->trans('ProspectLevel');
         print '<td>';
         if ($action != 'editlevel' && $user->rights->societe->creer)
-            print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editlevel&amp;socid=' . $object->id . '">' . img_edit($langs->trans('Modify'), 1) . '</a></td>';
+            print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editlevel&amp;socid='.$object->id.'">'.img_edit($langs->trans('Modify'), 1).'</a></td>';
         print '</tr></table>';
         print '</td><td>';
         if ($action == 'editlevel') {
             // $formcompany->form_prospect_level($_SERVER['PHP_SELF'] . '?socid=' . $object->id, $object->fk_prospectlevel, 'prospect_level_id', 1);
-            $formcompany->form_prospect_level($_SERVER['PHP_SELF'] . '&socid=' . $object->id, $object->fk_prospectlevel, 'prospect_level_id', 1);
+            $formcompany->form_prospect_level($_SERVER['PHP_SELF'].'&socid='.$object->id, $object->fk_prospectlevel, 'prospect_level_id', 1);
         } else {
             print $object->getLibProspLevel();
         }
@@ -560,7 +560,7 @@ 
 
         // Status
         $object->loadCacheOfProspStatus();
-        print '<tr><td>' . $langs->trans("StatusProsp") . '</td><td>' . $object->getLibProspCommStatut(4, $object->cacheprospectstatus[$object->stcomm_id]['label']);
+        print '<tr><td>'.$langs->trans("StatusProsp").'</td><td>'.$object->getLibProspCommStatut(4, $object->cacheprospectstatus[$object->stcomm_id]['label']);
         print ' &nbsp; &nbsp; ';
         print '<div class="floatright">';
         foreach ($object->cacheprospectstatus as $key => $val) {
@@ -569,7 +569,7 @@ 
                 $titlealt = $val['label'];
             if ($object->stcomm_id != $val['id'])
             // print '<a class="pictosubstatus" href="' . $_SERVER["PHP_SELF"] . '?socid=' . $object->id . '&stcomm=' . $val['code'] . '&action=setstcomm">' . img_action($titlealt, $val['code']) . '</a>';
-                print '<a class="pictosubstatus" href="' . $_SERVER["PHP_SELF"] . '&socid=' . $object->id . '&stcomm=' . $val['code'] . '&action=setstcomm">' . img_action($titlealt, $val['code']) . '</a>';
+                print '<a class="pictosubstatus" href="'.$_SERVER["PHP_SELF"].'&socid='.$object->id.'&stcomm='.$val['code'].'&action=setstcomm">'.img_action($titlealt, $val['code']).'</a>';
         }
         print '</div></td></tr>';
         print "</table>";
@@ -585,7 +585,7 @@ 
 
     // Lien recap
     $boxstat .= '<div class="box">';
-    $boxstat .= '<table summary="' . dol_escape_htmltag($langs->trans("DolibarrStateBoard")) . '" class="border boxtable boxtablenobottom boxtablenotop" width="100%">';
+    $boxstat .= '<table summary="'.dol_escape_htmltag($langs->trans("DolibarrStateBoard")).'" class="border boxtable boxtablenobottom boxtablenotop" width="100%">';
     $boxstat .= '<tr class="impair"><td colspan="2" class="tdboxstats nohover">';
 
     if (!empty($conf->propal->enabled)) {
@@ -596,14 +596,14 @@ 
         $outstandingTotalIncTax = $tmp['total_ttc'];
         $text = $langs->trans("OverAllProposals");
         // $link = DOL_URL_ROOT . '/comm/propal/list.php?socid=' . $object->id;
-        $link = BASE_URI . '?controller=comm/propal&method=list&socid=' . $object->id;
+        $link = BASE_URI.'?controller=comm/propal&method=list&socid='.$object->id;
         $icon = 'bill';
         if ($link) {
-            $boxstat .= '<a href="' . $link . '" class="boxstatsindicator thumbstat nobold nounderline">';
+            $boxstat .= '<a href="'.$link.'" class="boxstatsindicator thumbstat nobold nounderline">';
         }
-        $boxstat .= '<div class="boxstats" title="' . dol_escape_htmltag($text) . '">';
-        $boxstat .= '<span class="boxstatstext">' . img_object("", $icon) . ' ' . $text . '</span><br>';
-        $boxstat .= '<span class="boxstatsindicator">' . price($outstandingTotal, 1, $langs, 1, -1, -1, $conf->currency) . '</span>';
+        $boxstat .= '<div class="boxstats" title="'.dol_escape_htmltag($text).'">';
+        $boxstat .= '<span class="boxstatstext">'.img_object("", $icon).' '.$text.'</span><br>';
+        $boxstat .= '<span class="boxstatsindicator">'.price($outstandingTotal, 1, $langs, 1, -1, -1, $conf->currency).'</span>';
         $boxstat .= '</div>';
         if ($link)
             $boxstat .= '</a>';
@@ -616,13 +616,13 @@ 
         $outstandingTotal = $tmp['total_ht'];
         $outstandingTotalIncTax = $tmp['total_ttc'];
         $text = $langs->trans("OverAllOrders");
-        $link = DOL_URL_ROOT . '/commande/list.php?socid=' . $object->id;
+        $link = DOL_URL_ROOT.'/commande/list.php?socid='.$object->id;
         $icon = 'bill';
         if ($link)
-            $boxstat .= '<a href="' . $link . '" class="boxstatsindicator thumbstat nobold nounderline">';
-        $boxstat .= '<div class="boxstats" title="' . dol_escape_htmltag($text) . '">';
-        $boxstat .= '<span class="boxstatstext">' . img_object("", $icon) . ' ' . $text . '</span><br>';
-        $boxstat .= '<span class="boxstatsindicator">' . price($outstandingTotal, 1, $langs, 1, -1, -1, $conf->currency) . '</span>';
+            $boxstat .= '<a href="'.$link.'" class="boxstatsindicator thumbstat nobold nounderline">';
+        $boxstat .= '<div class="boxstats" title="'.dol_escape_htmltag($text).'">';
+        $boxstat .= '<span class="boxstatstext">'.img_object("", $icon).' '.$text.'</span><br>';
+        $boxstat .= '<span class="boxstatsindicator">'.price($outstandingTotal, 1, $langs, 1, -1, -1, $conf->currency).'</span>';
         $boxstat .= '</div>';
         if ($link)
             $boxstat .= '</a>';
@@ -635,13 +635,13 @@ 
         $outstandingTotal = $tmp['total_ht'];
         $outstandingTotalIncTax = $tmp['total_ttc'];
         $text = $langs->trans("OverAllInvoices");
-        $link = DOL_URL_ROOT . '/compta/facture/list.php?socid=' . $object->id;
+        $link = DOL_URL_ROOT.'/compta/facture/list.php?socid='.$object->id;
         $icon = 'bill';
         if ($link)
-            $boxstat .= '<a href="' . $link . '" class="boxstatsindicator thumbstat nobold nounderline">';
-        $boxstat .= '<div class="boxstats" title="' . dol_escape_htmltag($text) . '">';
-        $boxstat .= '<span class="boxstatstext">' . img_object("", $icon) . ' ' . $text . '</span><br>';
-        $boxstat .= '<span class="boxstatsindicator">' . price($outstandingTotal, 1, $langs, 1, -1, -1, $conf->currency) . '</span>';
+            $boxstat .= '<a href="'.$link.'" class="boxstatsindicator thumbstat nobold nounderline">';
+        $boxstat .= '<div class="boxstats" title="'.dol_escape_htmltag($text).'">';
+        $boxstat .= '<span class="boxstatstext">'.img_object("", $icon).' '.$text.'</span><br>';
+        $boxstat .= '<span class="boxstatsindicator">'.price($outstandingTotal, 1, $langs, 1, -1, -1, $conf->currency).'</span>';
         $boxstat .= '</div>';
         if ($link)
             $boxstat .= '</a>';
@@ -649,16 +649,16 @@ 
         // Box outstanding bill
         $warn = '';
         if ($object->outstanding_limit != '' && $object->outstanding_limit < $outstandingOpened) {
-            $warn = ' ' . img_warning($langs->trans("OutstandingBillReached"));
+            $warn = ' '.img_warning($langs->trans("OutstandingBillReached"));
         }
         $text = $langs->trans("CurrentOutstandingBill");
-        $link = DOL_URL_ROOT . '/compta/recap-compta.php?socid=' . $object->id;
+        $link = DOL_URL_ROOT.'/compta/recap-compta.php?socid='.$object->id;
         $icon = 'bill';
         if ($link)
-            $boxstat .= '<a href="' . $link . '" class="boxstatsindicator thumbstat nobold nounderline">';
-        $boxstat .= '<div class="boxstats" title="' . dol_escape_htmltag($text) . '">';
-        $boxstat .= '<span class="boxstatstext">' . img_object("", $icon) . ' ' . $text . '</span><br>';
-        $boxstat .= '<span class="boxstatsindicator' . ($outstandingOpened > 0 ? ' amountremaintopay' : '') . '">' . price($outstandingOpened, 1, $langs, 1, -1, -1, $conf->currency) . $warn . '</span>';
+            $boxstat .= '<a href="'.$link.'" class="boxstatsindicator thumbstat nobold nounderline">';
+        $boxstat .= '<div class="boxstats" title="'.dol_escape_htmltag($text).'">';
+        $boxstat .= '<span class="boxstatstext">'.img_object("", $icon).' '.$text.'</span><br>';
+        $boxstat .= '<span class="boxstatsindicator'.($outstandingOpened > 0 ? ' amountremaintopay' : '').'">'.price($outstandingOpened, 1, $langs, 1, -1, -1, $conf->currency).$warn.'</span>';
         $boxstat .= '</div>';
         if ($link)
             $boxstat .= '</a>';
@@ -689,10 +689,10 @@ 
         $sql .= ", p.total as total_ttc";
         $sql .= ", p.ref, p.ref_client, p.remise";
         $sql .= ", p.datep as dp, p.fin_validite as datelimite";
-        $sql .= " FROM " . MAIN_DB_PREFIX . "societe as s, " . MAIN_DB_PREFIX . "propal as p, " . MAIN_DB_PREFIX . "c_propalst as c";
+        $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as p, ".MAIN_DB_PREFIX."c_propalst as c";
         $sql .= " WHERE p.fk_soc = s.rowid AND p.fk_statut = c.id";
-        $sql .= " AND s.rowid = " . $object->id;
-        $sql .= " AND p.entity IN (" . getEntity('propal') . ")";
+        $sql .= " AND s.rowid = ".$object->id;
+        $sql .= " AND p.entity IN (".getEntity('propal').")";
         $sql .= " ORDER BY p.datep DESC";
 
         $resql = $db->query($sql);
@@ -705,8 +705,8 @@ 
                 print '<table class="noborder" width="100%">';
 
                 print '<tr class="liste_titre">';
-                print '<td colspan="4"><table width="100%" class="nobordernopadding"><tr><td>' . $langs->trans("LastPropals", ($num <= $MAXLIST ? "" : $MAXLIST)) . '</td><td align="right"><a class="notasortlink" href="' . DOL_URL_ROOT . '/comm/propal/list.php?socid=' . $object->id . '">' . $langs->trans("AllPropals") . ' <span class="badge">' . $num . '</span></a></td>';
-                print '<td width="20px" align="right"><a href="' . DOL_URL_ROOT . '/comm/propal/stats/index.php?socid=' . $object->id . '">' . img_picto($langs->trans("Statistics"), 'stats') . '</a></td>';
+                print '<td colspan="4"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("LastPropals", ($num <= $MAXLIST ? "" : $MAXLIST)).'</td><td align="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/comm/propal/list.php?socid='.$object->id.'">'.$langs->trans("AllPropals").' <span class="badge">'.$num.'</span></a></td>';
+                print '<td width="20px" align="right"><a href="'.DOL_URL_ROOT.'/comm/propal/stats/index.php?socid='.$object->id.'">'.img_picto($langs->trans("Statistics"), 'stats').'</a></td>';
                 print '</tr></table></td>';
                 print '</tr>';
             }
@@ -725,11 +725,11 @@ 
                 $propal_static->total_ttc = $objp->total_ttc;
                 print $propal_static->getNomUrl(1);
                 if (($db->jdate($objp->datelimite) < ($now - $conf->propal->cloture->warning_delay)) && $objp->fk_statut == 1) {
-                    print " " . img_warning();
+                    print " ".img_warning();
                 }
-                print '</td><td align="right" width="80px">' . dol_print_date($db->jdate($objp->dp), 'day') . "</td>\n";
-                print '<td align="right" style="min-width: 60px">' . price($objp->total_ht) . '</td>';
-                print '<td align="right" style="min-width: 60px" class="nowrap">' . $propal_static->LibStatut($objp->fk_statut, 5) . '</td></tr>';
+                print '</td><td align="right" width="80px">'.dol_print_date($db->jdate($objp->dp), 'day')."</td>\n";
+                print '<td align="right" style="min-width: 60px">'.price($objp->total_ht).'</td>';
+                print '<td align="right" style="min-width: 60px" class="nowrap">'.$propal_static->LibStatut($objp->fk_statut, 5).'</td></tr>';
                 $i++;
             }
             $db->free($resql);
@@ -753,10 +753,10 @@ 
         $sql .= ", c.total_ttc";
         $sql .= ", c.ref, c.ref_client, c.fk_statut, c.facture";
         $sql .= ", c.date_commande as dc";
-        $sql .= " FROM " . MAIN_DB_PREFIX . "societe as s, " . MAIN_DB_PREFIX . "commande as c";
+        $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 = " . $object->id;
-        $sql .= " AND c.entity = " . $conf->entity;
+        $sql .= " AND s.rowid = ".$object->id;
+        $sql .= " AND c.entity = ".$conf->entity;
         $sql .= " ORDER BY c.date_commande DESC";
 
         $resql = $db->query($sql);
@@ -768,10 +768,10 @@ 
                 // Check if there are orders billable
                 $sql2 = 'SELECT s.nom, s.rowid as socid, s.client, c.rowid, c.ref, c.total_ht, c.ref_client,';
                 $sql2 .= ' c.date_valid, c.date_commande, c.date_livraison, c.fk_statut, c.facture as billed';
-                $sql2 .= ' FROM ' . MAIN_DB_PREFIX . 'societe as s';
-                $sql2 .= ', ' . MAIN_DB_PREFIX . 'commande as c';
+                $sql2 .= ' FROM '.MAIN_DB_PREFIX.'societe as s';
+                $sql2 .= ', '.MAIN_DB_PREFIX.'commande as c';
                 $sql2 .= ' WHERE c.fk_soc = s.rowid';
-                $sql2 .= ' AND s.rowid = ' . $object->id;
+                $sql2 .= ' AND s.rowid = '.$object->id;
                 // Show orders with status validated, shipping started and delivered (well any order we can bill)
                 $sql2 .= " AND ((c.fk_statut IN (1,2)) OR (c.fk_statut = 3 AND c.facture = 0))";
 
@@ -783,8 +783,8 @@ 
                 print '<table class="noborder" width="100%">';
 
                 print '<tr class="liste_titre">';
-                print '<td colspan="4"><table width="100%" class="nobordernopadding"><tr><td>' . $langs->trans("LastCustomerOrders", ($num <= $MAXLIST ? "" : $MAXLIST)) . '</td><td align="right"><a class="notasortlink" href="' . DOL_URL_ROOT . '/commande/list.php?socid=' . $object->id . '">' . $langs->trans("AllOrders") . ' <span class="badge">' . $num . '</span></a></td>';
-                print '<td width="20px" align="right"><a href="' . DOL_URL_ROOT . '/commande/stats/index.php?socid=' . $object->id . '">' . img_picto($langs->trans("Statistics"), 'stats') . '</a></td>';
+                print '<td colspan="4"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("LastCustomerOrders", ($num <= $MAXLIST ? "" : $MAXLIST)).'</td><td align="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/commande/list.php?socid='.$object->id.'">'.$langs->trans("AllOrders").' <span class="badge">'.$num.'</span></a></td>';
+                print '<td width="20px" align="right"><a href="'.DOL_URL_ROOT.'/commande/stats/index.php?socid='.$object->id.'">'.img_picto($langs->trans("Statistics"), 'stats').'</a></td>';
                 //if($num2 > 0) print '<td width="20px" align="right"><a href="'.DOL_URL_ROOT.'/commande/orderstoinvoice.php?socid='.$object->id.'">'.img_picto($langs->trans("CreateInvoiceForThisCustomer"),'object_bill').'</a></td>';
                 //else print '<td width="20px" align="right"><a href="#">'.img_picto($langs->trans("NoOrdersToInvoice"),'object_bill').'</a></td>';
                 print '</tr></table></td>';
@@ -806,9 +806,9 @@ 
                 print '<tr class="oddeven">';
                 print '<td class="nowrap">';
                 print $commande_static->getNomUrl(1);
-                print '</td><td align="right" width="80px">' . dol_print_date($db->jdate($objp->dc), 'day') . "</td>\n";
-                print '<td align="right" style="min-width: 60px">' . price($objp->total_ht) . '</td>';
-                print '<td align="right" style="min-width: 60px" class="nowrap">' . $commande_static->LibStatut($objp->fk_statut, $objp->facture, 5) . '</td></tr>';
+                print '</td><td align="right" width="80px">'.dol_print_date($db->jdate($objp->dc), 'day')."</td>\n";
+                print '<td align="right" style="min-width: 60px">'.price($objp->total_ht).'</td>';
+                print '<td align="right" style="min-width: 60px" class="nowrap">'.$commande_static->LibStatut($objp->fk_statut, $objp->facture, 5).'</td></tr>';
                 $i++;
             }
             $db->free($resql);
@@ -832,9 +832,9 @@ 
         $sql .= ', e.fk_statut as statut';
         $sql .= ', s.nom';
         $sql .= ', s.rowid as socid';
-        $sql .= " FROM " . MAIN_DB_PREFIX . "societe as s, " . MAIN_DB_PREFIX . "expedition as e";
-        $sql .= " WHERE e.fk_soc = s.rowid AND s.rowid = " . $object->id;
-        $sql .= " AND e.entity IN (" . getEntity('expedition') . ")";
+        $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."expedition as e";
+        $sql .= " WHERE e.fk_soc = s.rowid AND s.rowid = ".$object->id;
+        $sql .= " AND e.entity IN (".getEntity('expedition').")";
         $sql .= ' GROUP BY e.rowid';
         $sql .= ', e.ref';
         $sql .= ', e.date_creation';
@@ -853,8 +853,8 @@ 
                 print '<table class="noborder" width="100%">';
 
                 print '<tr class="liste_titre">';
-                print '<td colspan="4"><table width="100%" class="nobordernopadding"><tr><td>' . $langs->trans("LastSendings", ($num <= $MAXLIST ? "" : $MAXLIST)) . '</td><td align="right"><a class="notasortlink" href="' . DOL_URL_ROOT . '/expedition/list.php?socid=' . $object->id . '">' . $langs->trans("AllSendings") . ' <span class="badge">' . $num . '</span></a></td>';
-                print '<td width="20px" align="right"><a href="' . DOL_URL_ROOT . '/expedition/stats/index.php?socid=' . $object->id . '">' . img_picto($langs->trans("Statistics"), 'stats') . '</a></td>';
+                print '<td colspan="4"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("LastSendings", ($num <= $MAXLIST ? "" : $MAXLIST)).'</td><td align="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/expedition/list.php?socid='.$object->id.'">'.$langs->trans("AllSendings").' <span class="badge">'.$num.'</span></a></td>';
+                print '<td width="20px" align="right"><a href="'.DOL_URL_ROOT.'/expedition/stats/index.php?socid='.$object->id.'">'.img_picto($langs->trans("Statistics"), 'stats').'</a></td>';
                 print '</tr></table></td>';
                 print '</tr>';
             }
@@ -871,12 +871,12 @@ 
                 print $sendingstatic->getNomUrl(1);
                 print '</td>';
                 if ($objp->date_creation > 0) {
-                    print '<td align="right" width="80px">' . dol_print_date($db->jdate($objp->date_creation), 'day') . '</td>';
+                    print '<td align="right" width="80px">'.dol_print_date($db->jdate($objp->date_creation), 'day').'</td>';
                 } else {
                     print '<td align="right"><b>!!!</b></td>';
                 }
 
-                print '<td align="right" class="nowrap" width="100" >' . $sendingstatic->LibStatut($objp->statut, 5) . '</td>';
+                print '<td align="right" class="nowrap" width="100" >'.$sendingstatic->LibStatut($objp->statut, 5).'</td>';
                 print "</tr>\n";
                 $i++;
             }
@@ -896,10 +896,10 @@ 
      */
     if (!empty($conf->contrat->enabled) && $user->rights->contrat->lire) {
         $sql = "SELECT s.nom, s.rowid, c.rowid as id, c.ref as ref, c.statut, c.datec as dc, c.date_contrat as dcon, c.ref_customer as refcus, c.ref_supplier as refsup";
-        $sql .= " FROM " . MAIN_DB_PREFIX . "societe as s, " . MAIN_DB_PREFIX . "contrat as c";
+        $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as c";
         $sql .= " WHERE c.fk_soc = s.rowid ";
-        $sql .= " AND s.rowid = " . $object->id;
-        $sql .= " AND c.entity = " . $conf->entity;
+        $sql .= " AND s.rowid = ".$object->id;
+        $sql .= " AND c.entity = ".$conf->entity;
         $sql .= " ORDER BY c.datec DESC";
 
         $resql = $db->query($sql);
@@ -912,8 +912,8 @@ 
                 print '<table class="noborder" width="100%">';
 
                 print '<tr class="liste_titre">';
-                print '<td colspan="6"><table width="100%" class="nobordernopadding"><tr><td>' . $langs->trans("LastContracts", ($num <= $MAXLIST ? "" : $MAXLIST)) . '</td>';
-                print '<td align="right"><a class="notasortlink" href="' . DOL_URL_ROOT . '/contrat/list.php?socid=' . $object->id . '">' . $langs->trans("AllContracts") . ' <span class="badge">' . $num . '</span></a></td>';
+                print '<td colspan="6"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("LastContracts", ($num <= $MAXLIST ? "" : $MAXLIST)).'</td>';
+                print '<td align="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/contrat/list.php?socid='.$object->id.'">'.$langs->trans("AllContracts").' <span class="badge">'.$num.'</span></a></td>';
                 //print '<td width="20px" align="right"><a href="'.DOL_URL_ROOT.'/contract/stats/index.php?socid='.$object->id.'">'.img_picto($langs->trans("Statistics"),'stats').'</a></td>';
                 print '</tr></table></td>';
                 print '</tr>';
@@ -933,9 +933,9 @@ 
                 print '<td class="nowrap">';
                 print $contrat->getNomUrl(1, 12);
                 print "</td>\n";
-                print '<td class="nowrap">' . dol_trunc($objp->refsup, 12) . "</td>\n";
-                print '<td align="right" width="80px">' . dol_print_date($db->jdate($objp->dc), 'day') . "</td>\n";
-                print '<td align="right" width="80px">' . dol_print_date($db->jdate($objp->dcon), 'day') . "</td>\n";
+                print '<td class="nowrap">'.dol_trunc($objp->refsup, 12)."</td>\n";
+                print '<td align="right" width="80px">'.dol_print_date($db->jdate($objp->dc), 'day')."</td>\n";
+                print '<td align="right" width="80px">'.dol_print_date($db->jdate($objp->dcon), 'day')."</td>\n";
                 print '<td width="20">&nbsp;</td>';
                 print '<td align="right" class="nowraponall">';
                 print $contrat->getLibStatut(4);
@@ -959,10 +959,10 @@ 
      */
     if (!empty($conf->ficheinter->enabled) && $user->rights->ficheinter->lire) {
         $sql = "SELECT s.nom, s.rowid, f.rowid as id, f.ref, f.fk_statut, f.duree as duration, f.datei as startdate";
-        $sql .= " FROM " . MAIN_DB_PREFIX . "societe as s, " . MAIN_DB_PREFIX . "fichinter as f";
+        $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 = " . $object->id;
-        $sql .= " AND f.entity = " . $conf->entity;
+        $sql .= " AND s.rowid = ".$object->id;
+        $sql .= " AND f.entity = ".$conf->entity;
         $sql .= " ORDER BY f.tms DESC";
 
         $resql = $db->query($sql);
@@ -975,8 +975,8 @@ 
                 print '<table class="noborder" width="100%">';
 
                 print '<tr class="liste_titre">';
-                print '<td colspan="3"><table width="100%" class="nobordernopadding"><tr><td>' . $langs->trans("LastInterventions", ($num <= $MAXLIST ? "" : $MAXLIST)) . '</td><td align="right"><a class="notasortlink" href="' . DOL_URL_ROOT . '/fichinter/list.php?socid=' . $object->id . '">' . $langs->trans("AllInterventions") . ' <span class="badge">' . $num . '</span></td>';
-                print '<td width="20px" align="right"><a href="' . DOL_URL_ROOT . '/fichinter/stats/index.php?socid=' . $object->id . '">' . img_picto($langs->trans("Statistics"), 'stats') . '</a></td>';
+                print '<td colspan="3"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("LastInterventions", ($num <= $MAXLIST ? "" : $MAXLIST)).'</td><td align="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/fichinter/list.php?socid='.$object->id.'">'.$langs->trans("AllInterventions").' <span class="badge">'.$num.'</span></td>';
+                print '<td width="20px" align="right"><a href="'.DOL_URL_ROOT.'/fichinter/stats/index.php?socid='.$object->id.'">'.img_picto($langs->trans("Statistics"), 'stats').'</a></td>';
                 print '</tr></table></td>';
                 print '</tr>';
             }
@@ -989,10 +989,10 @@ 
                 $fichinter_static->statut = $objp->fk_statut;
 
                 print '<tr class="oddeven">';
-                print '<td class="nowrap"><a href="' . DOL_URL_ROOT . '/fichinter/card.php?id=' . $objp->id . '">' . img_object($langs->trans("ShowPropal"), "propal") . ' ' . $objp->ref . '</a></td>' . "\n";
+                print '<td class="nowrap"><a href="'.DOL_URL_ROOT.'/fichinter/card.php?id='.$objp->id.'">'.img_object($langs->trans("ShowPropal"), "propal").' '.$objp->ref.'</a></td>'."\n";
                 //print '<td align="right" width="80px">'.dol_print_date($db->jdate($objp->startdate)).'</td>'."\n";
-                print '<td align="right" style="min-width: 60px">' . convertSecondToTime($objp->duration) . '</td>' . "\n";
-                print '<td align="right" class="nowrap" style="min-width: 60px">' . $fichinter_static->getLibStatut(5) . '</td>' . "\n";
+                print '<td align="right" style="min-width: 60px">'.convertSecondToTime($objp->duration).'</td>'."\n";
+                print '<td align="right" class="nowrap" style="min-width: 60px">'.$fichinter_static->getLibStatut(5).'</td>'."\n";
                 print '</tr>';
 
                 $i++;
@@ -1022,9 +1022,9 @@ 
         $sql .= ', f.unit_frequency';
         $sql .= ', f.suspended as suspended';
         $sql .= ', s.nom, s.rowid as socid';
-        $sql .= " FROM " . MAIN_DB_PREFIX . "societe as s," . MAIN_DB_PREFIX . "facture_rec as f";
-        $sql .= " WHERE f.fk_soc = s.rowid AND s.rowid = " . $object->id;
-        $sql .= " AND f.entity = " . $conf->entity;
+        $sql .= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture_rec as f";
+        $sql .= " WHERE f.fk_soc = s.rowid AND s.rowid = ".$object->id;
+        $sql .= " AND f.entity = ".$conf->entity;
         $sql .= ' GROUP BY f.rowid, f.titre, f.amount, f.total, f.tva, f.total_ttc,';
         $sql .= ' f.date_last_gen, f.datec, f.frequency, f.unit_frequency,';
         $sql .= ' f.suspended,';
@@ -1041,7 +1041,7 @@ 
                 print '<table class="noborder" width="100%">';
 
                 print '<tr class="liste_titre">';
-                print '<td colspan="4"><table width="100%" class="nobordernopadding"><tr><td>' . $langs->trans("LatestCustomerTemplateInvoices", ($num <= $MAXLIST ? "" : $MAXLIST)) . '</td><td align="right"><a class="notasortlink" href="' . DOL_URL_ROOT . '/compta/facture/list.php?socid=' . $object->id . '">' . $langs->trans("AllCustomerTemplateInvoices") . ' <span class="badge">' . $num . '</span></a></td>';
+                print '<td colspan="4"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("LatestCustomerTemplateInvoices", ($num <= $MAXLIST ? "" : $MAXLIST)).'</td><td align="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/compta/facture/list.php?socid='.$object->id.'">'.$langs->trans("AllCustomerTemplateInvoices").' <span class="badge">'.$num.'</span></a></td>';
                 print '</tr></table></td>';
                 print '</tr>';
             }
@@ -1066,10 +1066,10 @@ 
                 print $invoicetemplate->getNomUrl(1);
                 print '</td>';
                 if ($objp->frequency && $objp->date_last_gen > 0) {
-                    print '<td align="right" width="80px">' . dol_print_date($db->jdate($objp->date_last_gen), 'day') . '</td>';
+                    print '<td align="right" width="80px">'.dol_print_date($db->jdate($objp->date_last_gen), 'day').'</td>';
                 } else {
                     if ($objp->dc > 0) {
-                        print '<td align="right" width="80px">' . dol_print_date($db->jdate($objp->dc), 'day') . '</td>';
+                        print '<td align="right" width="80px">'.dol_print_date($db->jdate($objp->dc), 'day').'</td>';
                     } else {
                         print '<td align="right"><b>!!!</b></td>';
                     }
@@ -1085,7 +1085,7 @@ 
                 }
 
                 print '<td align="right" class="nowrap" style="min-width: 60px">';
-                print $langs->trans('FrequencyPer_' . $invoicetemplate->unit_frequency, $invoicetemplate->frequency) . ' - ';
+                print $langs->trans('FrequencyPer_'.$invoicetemplate->unit_frequency, $invoicetemplate->frequency).' - ';
                 print ($invoicetemplate->LibStatut($invoicetemplate->frequency, $invoicetemplate->suspended, 5, 0));
                 print '</td>';
                 print "</tr>\n";
@@ -1113,10 +1113,10 @@ 
         $sql .= ', f.datef as df, f.datec as dc, f.paye as paye, f.fk_statut as statut';
         $sql .= ', s.nom, s.rowid as socid';
         $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 = " . $object->id;
-        $sql .= " AND f.entity = " . $conf->entity;
+        $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 = ".$object->id;
+        $sql .= " AND f.entity = ".$conf->entity;
         $sql .= ' GROUP BY f.rowid, f.ref, f.type, f.amount, f.total, f.tva, f.total_ttc,';
         $sql .= ' f.datef, f.datec, f.paye, f.fk_statut,';
         $sql .= ' s.nom, s.rowid';
@@ -1132,8 +1132,8 @@ 
                 print '<table class="noborder" width="100%">';
 
                 print '<tr class="liste_titre">';
-                print '<td colspan="5"><table width="100%" class="nobordernopadding"><tr><td>' . $langs->trans("LastCustomersBills", ($num <= $MAXLIST ? "" : $MAXLIST)) . '</td><td align="right"><a class="notasortlink" href="' . DOL_URL_ROOT . '/compta/facture/list.php?socid=' . $object->id . '">' . $langs->trans("AllBills") . ' <span class="badge">' . $num . '</span></a></td>';
-                print '<td width="20px" align="right"><a href="' . DOL_URL_ROOT . '/compta/facture/stats/index.php?socid=' . $object->id . '">' . img_picto($langs->trans("Statistics"), 'stats') . '</a></td>';
+                print '<td colspan="5"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("LastCustomersBills", ($num <= $MAXLIST ? "" : $MAXLIST)).'</td><td align="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/compta/facture/list.php?socid='.$object->id.'">'.$langs->trans("AllBills").' <span class="badge">'.$num.'</span></a></td>';
+                print '<td width="20px" align="right"><a href="'.DOL_URL_ROOT.'/compta/facture/stats/index.php?socid='.$object->id.'">'.img_picto($langs->trans("Statistics"), 'stats').'</a></td>';
                 print '</tr></table></td>';
                 print '</tr>';
             }
@@ -1154,7 +1154,7 @@ 
                 print $facturestatic->getNomUrl(1);
                 print '</td>';
                 if ($objp->df > 0) {
-                    print '<td align="right" width="80px">' . dol_print_date($db->jdate($objp->df), 'day') . '</td>';
+                    print '<td align="right" width="80px">'.dol_print_date($db->jdate($objp->df), 'day').'</td>';
                 } else {
                     print '<td align="right"><b>!!!</b></td>';
                 }
@@ -1168,7 +1168,7 @@ 
                     print '</td>';
                 }
 
-                print '<td align="right" class="nowrap" style="min-width: 60px">' . ($facturestatic->LibStatut($objp->paye, $objp->statut, 5, $objp->am)) . '</td>';
+                print '<td align="right" class="nowrap" style="min-width: 60px">'.($facturestatic->LibStatut($objp->paye, $objp->statut, 5, $objp->am)).'</td>';
                 print "</tr>\n";
                 $i++;
             }
@@ -1200,29 +1200,29 @@ 
 
     if (empty($reshook)) {
         if ($object->status != 1) {
-            print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="' . dol_escape_js($langs->trans("ThirdPartyIsClosed")) . '" href="#">' . $langs->trans("ThirdPartyIsClosed") . '</a></div>';
+            print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("ThirdPartyIsClosed")).'" href="#">'.$langs->trans("ThirdPartyIsClosed").'</a></div>';
         }
 
         if (!empty($conf->propal->enabled) && $user->rights->propal->creer && $object->status == 1) {
             $langs->load("propal");
-            print '<div class="inline-block divButAction"><a class="butAction" href="' . DOL_URL_ROOT . '/comm/propal/card.php?socid=' . $object->id . '&amp;action=create">' . $langs->trans("AddProp") . '</a></div>';
+            print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/comm/propal/card.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("AddProp").'</a></div>';
         }
 
         if (!empty($conf->commande->enabled) && $user->rights->commande->creer && $object->status == 1) {
             $langs->load("orders");
-            print '<div class="inline-block divButAction"><a class="butAction" href="' . DOL_URL_ROOT . '/commande/card.php?socid=' . $object->id . '&amp;action=create">' . $langs->trans("AddOrder") . '</a></div>';
+            print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/commande/card.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("AddOrder").'</a></div>';
         }
 
         if ($user->rights->contrat->creer && $object->status == 1) {
             $langs->load("contracts");
             // print '<div class="inline-block divButAction"><a class="butAction" href="' . DOL_URL_ROOT . '/contrat/card.php?socid=' . $object->id . '&amp;action=create">' . $langs->trans("AddContract") . '</a></div>';
-            print '<div class="inline-block divButAction"><a class="butAction" href="' . BASE_URI . '?controller=contrat&method=card&socid=' . $object->id . '&amp;action=create">' . $langs->trans("AddContract") . '</a></div>';
+            print '<div class="inline-block divButAction"><a class="butAction" href="'.BASE_URI.'?controller=contrat&method=card&socid='.$object->id.'&amp;action=create">'.$langs->trans("AddContract").'</a></div>';
         }
 
         if (!empty($conf->ficheinter->enabled) && $user->rights->ficheinter->creer && $object->status == 1) {
             $langs->load("fichinter");
             // print '<div class="inline-block divButAction"><a class="butAction" href="' . DOL_URL_ROOT . '/fichinter/card.php?socid=' . $object->id . '&amp;action=create">' . $langs->trans("AddIntervention") . '</a></div>';
-            print '<div class="inline-block divButAction"><a class="butAction" href="' . BASE_URI . '?controller=fichinter&method=card&socid=' . $object->id . '&amp;action=create">' . $langs->trans("AddIntervention") . '</a></div>';
+            print '<div class="inline-block divButAction"><a class="butAction" href="'.BASE_URI.'?controller=fichinter&method=card&socid='.$object->id.'&amp;action=create">'.$langs->trans("AddIntervention").'</a></div>';
         }
 
         // Add invoice
@@ -1230,12 +1230,12 @@ 
             if (!empty($conf->deplacement->enabled) && $object->status == 1) {
                 $langs->load("trips");
                 // print '<div class="inline-block divButAction"><a class="butAction" href="' . DOL_URL_ROOT . '/compta/deplacement/card.php?socid=' . $object->id . '&amp;action=create">' . $langs->trans("AddTrip") . '</a></div>';
-                print '<div class="inline-block divButAction"><a class="butAction" href="' . BASE_URI . '?controller=compta/deplacement&method=card&socid=' . $object->id . '&amp;action=create">' . $langs->trans("AddTrip") . '</a></div>';
+                print '<div class="inline-block divButAction"><a class="butAction" href="'.BASE_URI.'?controller=compta/deplacement&method=card&socid='.$object->id.'&amp;action=create">'.$langs->trans("AddTrip").'</a></div>';
             }
 
             if (!empty($conf->facture->enabled) && $object->status == 1) {
                 if (empty($user->rights->facture->creer)) {
-                    print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="' . dol_escape_js($langs->trans("NotAllowed")) . '" href="#">' . $langs->trans("AddBill") . '</a></div>';
+                    print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("NotAllowed")).'" href="#">'.$langs->trans("AddBill").'</a></div>';
                 } else {
                     $langs->load("bills");
                     $langs->load("orders");
@@ -1244,20 +1244,20 @@ 
                         if ($object->client != 0 && $object->client != 2) {
                             if (!empty($orders2invoice) && $orders2invoice > 0) {
                                 // print '<div class="inline-block divButAction"><a class="butAction" href="' . DOL_URL_ROOT . '/commande/orderstoinvoice.php?socid=' . $object->id . '">' . $langs->trans("CreateInvoiceForThisCustomer") . '</a></div>';
-                                print '<div class="inline-block divButAction"><a class="butAction" href="' . BASE_URI . '?controller=commande&method=orderstoinvoice&socid=' . $object->id . '">' . $langs->trans("CreateInvoiceForThisCustomer") . '</a></div>';
+                                print '<div class="inline-block divButAction"><a class="butAction" href="'.BASE_URI.'?controller=commande&method=orderstoinvoice&socid='.$object->id.'">'.$langs->trans("CreateInvoiceForThisCustomer").'</a></div>';
                             } else {
-                                print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="' . dol_escape_js($langs->trans("NoOrdersToInvoice")) . '" href="#">' . $langs->trans("CreateInvoiceForThisCustomer") . '</a></div>';
+                                print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("NoOrdersToInvoice")).'" href="#">'.$langs->trans("CreateInvoiceForThisCustomer").'</a></div>';
                             }
                         } else {
-                            print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="' . dol_escape_js($langs->trans("ThirdPartyMustBeEditAsCustomer")) . '" href="#">' . $langs->trans("AddBill") . '</a></div>';
+                            print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("ThirdPartyMustBeEditAsCustomer")).'" href="#">'.$langs->trans("AddBill").'</a></div>';
                         }
                     }
 
                     if ($object->client != 0 && $object->client != 2) {
                         // print '<div class="inline-block divButAction"><a class="butAction" href="' . DOL_URL_ROOT . '/compta/facture/card.php?action=create&socid=' . $object->id . '">' . $langs->trans("AddBill") . '</a></div>';
-                        print '<div class="inline-block divButAction"><a class="butAction" href="' . BASE_URI . '?controller=compta/facture&method=card&action=create&socid=' . $object->id . '">' . $langs->trans("AddBill") . '</a></div>';
+                        print '<div class="inline-block divButAction"><a class="butAction" href="'.BASE_URI.'?controller=compta/facture&method=card&action=create&socid='.$object->id.'">'.$langs->trans("AddBill").'</a></div>';
                     } else {
-                        print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="' . dol_escape_js($langs->trans("ThirdPartyMustBeEditAsCustomer")) . '" href="#">' . $langs->trans("AddBill") . '</a></div>';
+                        print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("ThirdPartyMustBeEditAsCustomer")).'" href="#">'.$langs->trans("AddBill").'</a></div>';
                     }
                 }
             }
@@ -1266,9 +1266,9 @@ 
         // Add action
         if (!empty($conf->agenda->enabled) && !empty($conf->global->MAIN_REPEATTASKONEACHTAB) && $object->status == 1) {
             if ($user->rights->agenda->myactions->create) {
-                print '<div class="inline-block divButAction"><a class="butAction" href="' . DOL_URL_ROOT . '/comm/action/card.php?action=create&socid=' . $object->id . '">' . $langs->trans("AddAction") . '</a></div>';
+                print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddAction").'</a></div>';
             } else {
-                print '<div class="inline-block divButAction"><a class="butAction" title="' . dol_escape_js($langs->trans("NotAllowed")) . '" href="#">' . $langs->trans("AddAction") . '</a></div>';
+                print '<div class="inline-block divButAction"><a class="butAction" title="'.dol_escape_js($langs->trans("NotAllowed")).'" href="#">'.$langs->trans("AddAction").'</a></div>';
             }
         }
     }
@@ -1278,13 +1278,13 @@ 
     if (!empty($conf->global->MAIN_DUPLICATE_CONTACTS_TAB_ON_CUSTOMER_CARD)) {
         // List of contacts
         // show_contacts($conf, $langs, $db, $object, $_SERVER["PHP_SELF"] . '?socid=' . $object->id);
-        show_contacts($conf, $langs, $db, $object, $_SERVER["PHP_SELF"] . '&socid=' . $object->id);
+        show_contacts($conf, $langs, $db, $object, $_SERVER["PHP_SELF"].'&socid='.$object->id);
     }
 
     // Addresses list
     if (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) && !empty($conf->global->MAIN_REPEATADDRESSONEACHTAB)) {
         // show_addresses($conf, $langs, $db, $object, $_SERVER["PHP_SELF"] . '?socid=' . $object->id);
-        show_addresses($conf, $langs, $db, $object, $_SERVER["PHP_SELF"] . '&socid=' . $object->id);
+        show_addresses($conf, $langs, $db, $object, $_SERVER["PHP_SELF"].'&socid='.$object->id);
     }
 
     if (!empty($conf->global->MAIN_REPEATTASKONEACHTAB)) {

dolibarr/htdocs/comm/propal/card.php

Spacing +238 added lines, -238 removed lines

@@ -35,27 +35,27 @@ 
  * \ingroup 	propale
  * \brief 		Page of commercial proposals card and list
  */
-require DOL_BASE_PATH . '/main.inc.php';
-
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formfile.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formpropal.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formmargin.class.php';
-require_once DOL_DOCUMENT_ROOT . '/comm/propal/class/propal.class.php';
-require_once DOL_DOCUMENT_ROOT . '/comm/action/class/actioncomm.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/modules/propale/modules_propale.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/propal.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/functions2.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/signature.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
+require DOL_BASE_PATH.'/main.inc.php';
+
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formpropal.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formmargin.class.php';
+require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/propale/modules_propale.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/propal.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/signature.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 if (!empty($conf->projet->enabled)) {
-    require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
-    require_once DOL_DOCUMENT_ROOT . '/core/class/html.formprojet.class.php';
+    require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+    require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
 
 if (!empty($conf->variants->enabled)) {
-    require_once DOL_DOCUMENT_ROOT . '/variants/class/ProductCombination.class.php';
+    require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination.class.php';
 }
 
 // Load translation files required by the page
@@ -144,17 +144,17 @@ 
 if (empty($reshook)) {
     if ($cancel) {
         if (!empty($backtopage)) {
-            header("Location: " . $backtopage);
+            header("Location: ".$backtopage);
             exit;
         }
         $action = '';
     }
 
-    include DOL_DOCUMENT_ROOT . '/core/actions_setnotes.inc.php'; // Must be include, not includ_once
+    include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not includ_once
 
-    include DOL_DOCUMENT_ROOT . '/core/actions_dellink.inc.php';  // Must be include, not include_once
+    include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; // Must be include, not include_once
 
-    include DOL_DOCUMENT_ROOT . '/core/actions_lineupdown.inc.php'; // Must be include, not include_once
+    include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php'; // Must be include, not include_once
     // Action clone object
     if ($action == 'confirm_clone' && $confirm == 'yes' && $usercancreate) {
         if (!GETPOST('socid', 3)) {
@@ -185,7 +185,7 @@ 
 
                 $result = $object->createFromClone($socid);
                 if ($result > 0) {
-                    header("Location: " . $_SERVER['PHP_SELF'] . '?id=' . $result);
+                    header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
                     exit();
                 } else {
                     if (count($object->errors) > 0) {
@@ -201,7 +201,7 @@ 
     else if ($action == 'confirm_delete' && $confirm == 'yes' && $usercandelete) {
         $result = $object->delete($user);
         if ($result > 0) {
-            header('Location: ' . DOL_URL_ROOT . '/comm/propal/list.php?restore_lastsearch_values=1');
+            header('Location: '.DOL_URL_ROOT.'/comm/propal/list.php?restore_lastsearch_values=1');
             exit();
         } else {
             $langs->load("errors");
@@ -229,7 +229,7 @@ 
             $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
         }
 
-        header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id);
+        header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
         exit();
     }
 
@@ -267,7 +267,7 @@ 
         $datep = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
 
         if (empty($datep)) {
-            $error ++;
+            $error++;
             setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
         }
 
@@ -314,19 +314,19 @@ 
         if (empty($datep)) {
             setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
             $action = 'create';
-            $error ++;
+            $error++;
         }
         if (empty($duration)) {
             setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ValidityDuration")), null, 'errors');
             $action = 'create';
-            $error ++;
+            $error++;
         }
 
         if ($socid < 1) {
             setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Customer")), null, 'errors');
 
             $action = 'create';
-            $error ++;
+            $error++;
         }
 
         if (!$error) {
@@ -398,7 +398,7 @@ 
                 // Fill array 'array_options' with data from add form
                 $ret = $extrafields->setOptionalsFromPost($extralabels, $object);
                 if ($ret < 0) {
-                    $error ++;
+                    $error++;
                     $action = 'create';
                 }
             }
@@ -441,12 +441,12 @@ 
 
                     $id = $object->create($user);
                     if ($id > 0) {
-                        dol_include_once('/' . $element . '/class/' . $subelement . '.class.php');
+                        dol_include_once('/'.$element.'/class/'.$subelement.'.class.php');
 
                         $classname = ucfirst($subelement);
                         $srcobject = new $classname($db);
 
-                        dol_syslog("Try to find source object origin=" . $object->origin . " originid=" . $object->origin_id . " to add lines");
+                        dol_syslog("Try to find source object origin=".$object->origin." originid=".$object->origin_id." to add lines");
                         $result = $srcobject->fetch($object->origin_id);
 
                         if ($result > 0) {
@@ -502,7 +502,7 @@ 
 
                                 $tva_tx = $lines[$i]->tva_tx;
                                 if (!empty($lines[$i]->vat_src_code) && !preg_match('/\(/', $tva_tx))
-                                    $tva_tx .= ' (' . $lines[$i]->vat_src_code . ')';
+                                    $tva_tx .= ' ('.$lines[$i]->vat_src_code.')';
 
                                 $result = $object->addline($desc, $lines[$i]->subprice, $lines[$i]->qty, $tva_tx, $lines[$i]->localtax1_tx, $lines[$i]->localtax2_tx, $lines[$i]->fk_product, $lines[$i]->remise_percent, 'HT', 0, $lines[$i]->info_bits, $product_type, $lines[$i]->rang, $lines[$i]->special_code, $fk_parent_line, $lines[$i]->fk_fournprice, $lines[$i]->pa_ht, $label, $date_start, $date_end, $array_options, $lines[$i]->fk_unit);
 
@@ -510,7 +510,7 @@ 
                                     $lineid = $result;
                                 } else {
                                     $lineid = 0;
-                                    $error ++;
+                                    $error++;
                                     break;
                                 }
 
@@ -525,15 +525,15 @@ 
                             $reshook = $hookmanager->executeHooks('createFrom', $parameters, $object, $action); // Note that $action and $object may have been
                             // modified by hook
                             if ($reshook < 0) {
-                                $error ++;
+                                $error++;
                             }
                         } else {
                             setEventMessages($srcobject->error, $srcobject->errors, 'errors');
-                            $error ++;
+                            $error++;
                         }
                     } else {
                         setEventMessages($object->error, $object->errors, 'errors');
-                        $error ++;
+                        $error++;
                     }
                 }    // Standard creation
                 else {
@@ -581,7 +581,7 @@ 
                                 dol_print_error($db, $result);
                         }
 
-                        header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $id);
+                        header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id);
                         exit();
                     }
                     else {
@@ -668,10 +668,10 @@ 
 
         if (!empty($importLines) && is_array($importLines) && !empty($fromElement) && ctype_alpha($fromElement) && !empty($fromElementid)) {
             if ($fromElement == 'commande') {
-                dol_include_once('/' . $fromElement . '/class/' . $fromElement . '.class.php');
+                dol_include_once('/'.$fromElement.'/class/'.$fromElement.'.class.php');
                 $lineClassName = 'OrderLine';
             } elseif ($fromElement == 'propal') {
-                dol_include_once('/comm/' . $fromElement . '/class/' . $fromElement . '.class.php');
+                dol_include_once('/comm/'.$fromElement.'/class/'.$fromElement.'.class.php');
                 $lineClassName = 'PropaleLigne';
             }
             $nextRang = count($object->lines) + 1;
@@ -730,14 +730,14 @@ 
         }
     }
 
-    include DOL_DOCUMENT_ROOT . '/core/actions_printing.inc.php';
+    include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
 
     // Actions to send emails
     $actiontypecode = 'AC_OTH_AUTO';
     $trigger_name = 'PROPAL_SENTBYMAIL';
     $autocopy = 'MAIN_MAIL_AUTOCOPY_PROPOSAL_TO';
-    $trackid = 'pro' . $object->id;
-    include DOL_DOCUMENT_ROOT . '/core/actions_sendmails.inc.php';
+    $trackid = 'pro'.$object->id;
+    include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 
 
     // Go back to draft
@@ -783,8 +783,8 @@ 
             $tva_tx = '';
         }
 
-        $qty = GETPOST('qty' . $predef);
-        $remise_percent = GETPOST('remise_percent' . $predef);
+        $qty = GETPOST('qty'.$predef);
+        $remise_percent = GETPOST('remise_percent'.$predef);
 
         // Extrafields
         $extrafieldsline = new ExtraFields($db);
@@ -794,22 +794,22 @@ 
         if (is_array($extralabelsline)) {
             // Get extra fields
             foreach ($extralabelsline as $key => $value) {
-                unset($_POST["options_" . $key]);
+                unset($_POST["options_".$key]);
             }
         }
 
         if ($prod_entry_mode == 'free' && empty($idprod) && GETPOST('type') < 0) {
             setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), null, 'errors');
-            $error ++;
+            $error++;
         }
 
         if ($prod_entry_mode == 'free' && empty($idprod) && $price_ht == '' && $price_ht_devise == '') {  // Unit price can be 0 but not ''. Also price can be negative for proposal.
             setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("UnitPriceHT")), null, 'errors');
-            $error ++;
+            $error++;
         }
         if ($prod_entry_mode == 'free' && empty($idprod) && empty($product_desc)) {
             setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Description")), null, 'errors');
-            $error ++;
+            $error++;
         }
 
         if (!$error && !empty($conf->variants->enabled) && $prod_entry_mode != 'free') {
@@ -821,7 +821,7 @@ 
                     $idprod = $res->fk_product_child;
                 } else {
                     setEventMessages($langs->trans('ErrorProductCombinationNotFound'), null, 'errors');
-                    $error ++;
+                    $error++;
                 }
             }
         }
@@ -872,7 +872,7 @@ 
                 }
                 // If price per customer
                 elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
-                    require_once DOL_DOCUMENT_ROOT . '/product/class/productcustomerprice.class.php';
+                    require_once DOL_DOCUMENT_ROOT.'/product/class/productcustomerprice.class.php';
 
                     $prodcustprice = new Productcustomerprice($db);
 
@@ -885,9 +885,9 @@ 
                             $pu_ht = price($prodcustprice->lines[0]->price);
                             $pu_ttc = price($prodcustprice->lines[0]->price_ttc);
                             $price_base_type = $prodcustprice->lines[0]->price_base_type;
-                            $tva_tx = ($prodcustprice->lines[0]->default_vat_code ? $prodcustprice->lines[0]->tva_tx . ' (' . $prodcustprice->lines[0]->default_vat_code . ' )' : $prodcustprice->lines[0]->tva_tx);
+                            $tva_tx = ($prodcustprice->lines[0]->default_vat_code ? $prodcustprice->lines[0]->tva_tx.' ('.$prodcustprice->lines[0]->default_vat_code.' )' : $prodcustprice->lines[0]->tva_tx);
                             if ($prodcustprice->lines[0]->default_vat_code && !preg_match('/\(.*\)/', $tva_tx))
-                                $tva_tx .= ' (' . $prodcustprice->lines[0]->default_vat_code . ')';
+                                $tva_tx .= ' ('.$prodcustprice->lines[0]->default_vat_code.')';
                             $tva_npr = $prodcustprice->lines[0]->recuperableonly;
                             if (empty($tva_tx))
                                 $tva_npr = 0;
@@ -1008,23 +1008,23 @@ 
                             $outputlangs->load('products');
                         }
                         if (!empty($prod->customcode)) {
-                            $tmptxt .= $outputlangs->transnoentitiesnoconv("CustomCode") . ': ' . $prod->customcode;
+                            $tmptxt .= $outputlangs->transnoentitiesnoconv("CustomCode").': '.$prod->customcode;
                         }
                         if (!empty($prod->customcode) && !empty($prod->country_code)) {
                             $tmptxt .= ' - ';
                         }
                         if (!empty($prod->country_code)) {
-                            $tmptxt .= $outputlangs->transnoentitiesnoconv("CountryOrigin") . ': ' . getCountry($prod->country_code, 0, $db, $outputlangs, 0);
+                            $tmptxt .= $outputlangs->transnoentitiesnoconv("CountryOrigin").': '.getCountry($prod->country_code, 0, $db, $outputlangs, 0);
                         }
                     } else {
                         if (!empty($prod->customcode)) {
-                            $tmptxt .= $langs->transnoentitiesnoconv("CustomCode") . ': ' . $prod->customcode;
+                            $tmptxt .= $langs->transnoentitiesnoconv("CustomCode").': '.$prod->customcode;
                         }
                         if (!empty($prod->customcode) && !empty($prod->country_code)) {
                             $tmptxt .= ' - ';
                         }
                         if (!empty($prod->country_code)) {
-                            $tmptxt .= $langs->transnoentitiesnoconv("CountryOrigin") . ': ' . getCountry($prod->country_code, 0, $db, $langs, 0);
+                            $tmptxt .= $langs->transnoentitiesnoconv("CountryOrigin").': '.getCountry($prod->country_code, 0, $db, $langs, 0);
                         }
                     }
                     $tmptxt .= ')';
@@ -1047,11 +1047,11 @@ 
             }
 
             // Margin
-            $fournprice = price2num(GETPOST('fournprice' . $predef) ? GETPOST('fournprice' . $predef) : '');
-            $buyingprice = price2num(GETPOST('buying_price' . $predef) != '' ? GETPOST('buying_price' . $predef) : '');    // If buying_price is '0', we muste keep this value
+            $fournprice = price2num(GETPOST('fournprice'.$predef) ? GETPOST('fournprice'.$predef) : '');
+            $buyingprice = price2num(GETPOST('buying_price'.$predef) != '' ? GETPOST('buying_price'.$predef) : ''); // If buying_price is '0', we muste keep this value
 
-            $date_start = dol_mktime(GETPOST('date_start' . $predef . 'hour'), GETPOST('date_start' . $predef . 'min'), GETPOST('date_start' . $predef . 'sec'), GETPOST('date_start' . $predef . 'month'), GETPOST('date_start' . $predef . 'day'), GETPOST('date_start' . $predef . 'year'));
-            $date_end = dol_mktime(GETPOST('date_end' . $predef . 'hour'), GETPOST('date_end' . $predef . 'min'), GETPOST('date_end' . $predef . 'sec'), GETPOST('date_end' . $predef . 'month'), GETPOST('date_end' . $predef . 'day'), GETPOST('date_end' . $predef . 'year'));
+            $date_start = dol_mktime(GETPOST('date_start'.$predef.'hour'), GETPOST('date_start'.$predef.'min'), GETPOST('date_start'.$predef.'sec'), GETPOST('date_start'.$predef.'month'), GETPOST('date_start'.$predef.'day'), GETPOST('date_start'.$predef.'year'));
+            $date_end = dol_mktime(GETPOST('date_end'.$predef.'hour'), GETPOST('date_end'.$predef.'min'), GETPOST('date_end'.$predef.'sec'), GETPOST('date_end'.$predef.'month'), GETPOST('date_end'.$predef.'day'), GETPOST('date_end'.$predef.'year'));
 
             // Local Taxes
             $localtax1_tx = get_localtax($tva_tx, 1, $object->thirdparty, $tva_npr);
@@ -1062,7 +1062,7 @@ 
                 $info_bits |= 0x01;
             }
 
-            if (((!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->produit->ignore_price_min_advance)) || empty($conf->global->MAIN_USE_ADVANCED_PERMS) ) && (!empty($price_min) && (price2num($pu_ht) * (1 - price2num($remise_percent) / 100) < price2num($price_min)))) {
+            if (((!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->produit->ignore_price_min_advance)) || empty($conf->global->MAIN_USE_ADVANCED_PERMS)) && (!empty($price_min) && (price2num($pu_ht) * (1 - price2num($remise_percent) / 100) < price2num($price_min)))) {
                 $mesg = $langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, - 1, $conf->currency));
                 setEventMessages($mesg, null, 'errors');
             } else {
@@ -1145,7 +1145,7 @@ 
 
         // Add buying price
         $fournprice = price2num(GETPOST('fournprice') ? GETPOST('fournprice') : '');
-        $buyingprice = price2num(GETPOST('buying_price') != '' ? GETPOST('buying_price') : '');    // If buying_price is '0', we muste keep this value
+        $buyingprice = price2num(GETPOST('buying_price') != '' ? GETPOST('buying_price') : ''); // If buying_price is '0', we muste keep this value
 
         $pu_ht_devise = GETPOST('multicurrency_subprice');
 
@@ -1160,7 +1160,7 @@ 
         if (is_array($extralabelsline)) {
             // Get extra fields
             foreach ($extralabelsline as $key => $value) {
-                unset($_POST["options_" . $key]);
+                unset($_POST["options_".$key]);
             }
         }
 
@@ -1183,9 +1183,9 @@ 
                 $price_min = $product->multiprices_min [$object->thirdparty->price_level];
             }
             $label = ((GETPOST('update_label') && GETPOST('product_label')) ? GETPOST('product_label') : '');
-            if (((!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->produit->ignore_price_min_advance)) || empty($conf->global->MAIN_USE_ADVANCED_PERMS) ) && ($price_min && (price2num($pu_ht) * (1 - price2num(GETPOST('remise_percent')) / 100) < price2num($price_min)))) {
+            if (((!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->produit->ignore_price_min_advance)) || empty($conf->global->MAIN_USE_ADVANCED_PERMS)) && ($price_min && (price2num($pu_ht) * (1 - price2num(GETPOST('remise_percent')) / 100) < price2num($price_min)))) {
                 setEventMessages($langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, - 1, $conf->currency)), null, 'errors');
-                $error ++;
+                $error++;
             }
         } else {
             $type = GETPOST('type');
@@ -1194,7 +1194,7 @@ 
             // Check parameters
             if (GETPOST('type') < 0) {
                 setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), null, 'errors');
-                $error ++;
+                $error++;
             }
         }
 
@@ -1260,7 +1260,7 @@ 
             }
         }
     } else if ($action == 'updateline' && $usercancreate && GETPOST('cancel', 'alpha')) {
-        header('Location: ' . $_SERVER['PHP_SELF'] . '?id=' . $object->id); // Pour reaffichage de la fiche en cours d'edition
+        header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id); // Pour reaffichage de la fiche en cours d'edition
         exit();
     }
 
@@ -1339,7 +1339,7 @@ 
             }
 
             if ($result >= 0) {
-                header("Location: " . $_SERVER['PHP_SELF'] . "?id=" . $object->id);
+                header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
                 exit();
             } else {
                 if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
@@ -1366,7 +1366,7 @@ 
             $result = $object->delete_contact($lineid);
 
             if ($result >= 0) {
-                header("Location: " . $_SERVER['PHP_SELF'] . "?id=" . $object->id);
+                header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
                 exit();
             } else {
                 dol_print_error($db);
@@ -1377,7 +1377,7 @@ 
     // Actions to build doc
     $upload_dir = $conf->propal->multidir_output[$object->entity];
     $permissioncreate = $usercancreate;
-    include DOL_DOCUMENT_ROOT . '/core/actions_builddoc.inc.php';
+    include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 }
 
 
@@ -1436,7 +1436,7 @@ 
                 $element = $subelement = 'expedition';
             }
 
-            dol_include_once('/' . $element . '/class/' . $subelement . '.class.php');
+            dol_include_once('/'.$element.'/class/'.$subelement.'.class.php');
 
             $classname = ucfirst($subelement);
             $objectsrc = new $classname($db);
@@ -1478,14 +1478,14 @@ 
     $object = new Propal($db);
 
     // print '<form name="addprop" action="' . $_SERVER["PHP_SELF"] . '" method="POST">';
-    print '<form name="addprop" href="' . BASE_PATH . '?controller=comm/propal&method=card" method="POST">';
-    print '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
+    print '<form name="addprop" href="'.BASE_PATH.'?controller=comm/propal&method=card" method="POST">';
+    print '<input type="hidden" name="token" value="'.$_SESSION ['newtoken'].'">';
     print '<input type="hidden" name="action" value="add">';
     if ($origin != 'project' && $originid) {
-        print '<input type="hidden" name="origin" value="' . $origin . '">';
-        print '<input type="hidden" name="originid" value="' . $originid . '">';
+        print '<input type="hidden" name="origin" value="'.$origin.'">';
+        print '<input type="hidden" name="originid" value="'.$originid.'">';
     } elseif ($origin == 'project' && !empty($projectid)) {
-        print '<input type="hidden" name="projectid" value="' . $projectid . '">';
+        print '<input type="hidden" name="projectid" value="'.$projectid.'">';
     }
 
     dol_fiche_head();
@@ -1493,20 +1493,20 @@ 
     print '<table class="border" width="100%">';
 
     // Reference
-    print '<tr><td class="titlefieldcreate fieldrequired">' . $langs->trans('Ref') . '</td><td>' . $langs->trans("Draft") . '</td></tr>';
+    print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans('Ref').'</td><td>'.$langs->trans("Draft").'</td></tr>';
 
     // Ref customer
-    print '<tr><td>' . $langs->trans('RefCustomer') . '</td><td>';
-    print '<input type="text" name="ref_client" value="' . GETPOST('ref_client') . '"></td>';
+    print '<tr><td>'.$langs->trans('RefCustomer').'</td><td>';
+    print '<input type="text" name="ref_client" value="'.GETPOST('ref_client').'"></td>';
     print '</tr>';
 
     // Third party
     print '<tr>';
-    print '<td class="fieldrequired">' . $langs->trans('Customer') . '</td>';
+    print '<td class="fieldrequired">'.$langs->trans('Customer').'</td>';
     if ($socid > 0) {
         print '<td>';
         print $soc->getNomUrl(1);
-        print '<input type="hidden" name="socid" value="' . $soc->id . '">';
+        print '<input type="hidden" name="socid" value="'.$soc->id.'">';
         print '</td>';
         if (!empty($conf->global->SOCIETE_ASK_FOR_SHIPPING_METHOD) && !empty($soc->shipping_method_id)) {
             $shipping_method_id = $soc->shipping_method_id;
@@ -1521,86 +1521,86 @@ 
 				$("#socid").change(function() {
 					var socid = $(this).val();
 					// reload page
-					window.location.href = "' . BASE_URI . '?controller=comm/propal&method=card&action=create&socid="+socid+"&ref_client="+$("input[name=ref_client]").val();
+					window.location.href = "' . BASE_URI.'?controller=comm/propal&method=card&action=create&socid="+socid+"&ref_client="+$("input[name=ref_client]").val();
 				});
 			});
 			</script>';
         }
         // print ' <a href="' . DOL_URL_ROOT . '/societe/card.php?action=create&client=3&fournisseur=0&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?action=create') . '">' . $langs->trans("AddThirdParty") . '</a>';
-        print ' <a href = "' . BASE_URI . '?controller=societe&method=card&action=create&client=3&fournisseur=0&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?action=create') . '">' . $langs->trans("AddThirdParty") . '</a>';
+        print ' <a href = "'.BASE_URI.'?controller=societe&method=card&action=create&client=3&fournisseur=0&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create').'">'.$langs->trans("AddThirdParty").'</a>';
         print '</td>';
     }
-    print '</tr>' . "\n";
+    print '</tr>'."\n";
 
     if ($socid > 0) {
         // Contacts (ask contact only if thirdparty already defined). TODO do this also into order and invoice.
-        print "<tr><td>" . $langs->trans("DefaultContact") . '</td><td>';
+        print "<tr><td>".$langs->trans("DefaultContact").'</td><td>';
         $form->select_contacts($soc->id, $contactid, 'contactid', 1, $srccontactslist);
         print '</td></tr>';
 
         // Ligne info remises tiers
-        print '<tr><td>' . $langs->trans('Discounts') . '</td><td>';
+        print '<tr><td>'.$langs->trans('Discounts').'</td><td>';
 
         $absolute_discount = $soc->getAvailableDiscounts();
 
         $thirdparty = $soc;
         $discount_type = 0;
-        $backtopage = urlencode($_SERVER["PHP_SELF"] . '?socid=' . $thirdparty->id . '&action=' . $action . '&origin=' . GETPOST('origin') . '&originid=' . GETPOST('originid'));
-        include DOL_DOCUMENT_ROOT . '/core/tpl/object_discounts.tpl.php';
+        $backtopage = urlencode($_SERVER["PHP_SELF"].'?socid='.$thirdparty->id.'&action='.$action.'&origin='.GETPOST('origin').'&originid='.GETPOST('originid'));
+        include DOL_DOCUMENT_ROOT.'/core/tpl/object_discounts.tpl.php';
         print '</td></tr>';
     }
 
     // Date
-    print '<tr><td class="fieldrequired">' . $langs->trans('Date') . '</td><td>';
+    print '<tr><td class="fieldrequired">'.$langs->trans('Date').'</td><td>';
     print $form->selectDate('', '', '', '', '', "addprop", 1, 1);
     print '</td></tr>';
 
     // Validaty duration
-    print '<tr><td class="fieldrequired">' . $langs->trans("ValidityDuration") . '</td><td><input name="duree_validite" size="5" value="' . $conf->global->PROPALE_VALIDITY_DURATION . '"> ' . $langs->trans("days") . '</td></tr>';
+    print '<tr><td class="fieldrequired">'.$langs->trans("ValidityDuration").'</td><td><input name="duree_validite" size="5" value="'.$conf->global->PROPALE_VALIDITY_DURATION.'"> '.$langs->trans("days").'</td></tr>';
 
     // Terms of payment
-    print '<tr><td class="nowrap fieldrequired">' . $langs->trans('PaymentConditionsShort') . '</td><td>';
+    print '<tr><td class="nowrap fieldrequired">'.$langs->trans('PaymentConditionsShort').'</td><td>';
     $form->select_conditions_paiements($soc->cond_reglement_id, 'cond_reglement_id');
     print '</td></tr>';
 
     // Mode of payment
-    print '<tr><td>' . $langs->trans('PaymentMode') . '</td><td>';
+    print '<tr><td>'.$langs->trans('PaymentMode').'</td><td>';
     $form->select_types_paiements($soc->mode_reglement_id, 'mode_reglement_id');
     print '</td></tr>';
 
     // Bank Account
     if (!empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL) && !empty($conf->banque->enabled)) {
-        print '<tr><td>' . $langs->trans('BankAccount') . '</td><td>';
+        print '<tr><td>'.$langs->trans('BankAccount').'</td><td>';
         $form->select_comptes($soc->fk_account, 'fk_account', 0, '', 1);
         print '</td></tr>';
     }
 
     // What trigger creation
-    print '<tr><td>' . $langs->trans('Source') . '</td><td>';
+    print '<tr><td>'.$langs->trans('Source').'</td><td>';
     $form->selectInputReason('', 'demand_reason_id', "SRC_PROP", 1);
     print '</td></tr>';
 
     // Delivery delay
-    print '<tr class="fielddeliverydelay"><td>' . $langs->trans('AvailabilityPeriod') . '</td><td>';
+    print '<tr class="fielddeliverydelay"><td>'.$langs->trans('AvailabilityPeriod').'</td><td>';
     $form->selectAvailabilityDelay('', 'availability_id', '', 1);
     print '</td></tr>';
 
     // Shipping Method
     if (!empty($conf->expedition->enabled)) {
-        print '<tr><td>' . $langs->trans('SendingMethod') . '</td><td>';
+        print '<tr><td>'.$langs->trans('SendingMethod').'</td><td>';
         print $form->selectShippingMethod($shipping_method_id, 'shipping_method_id', '', 1);
         print '</td></tr>';
     }
 
     // Delivery date (or manufacturing)
-    print '<tr><td>' . $langs->trans("DeliveryDate") . '</td>';
+    print '<tr><td>'.$langs->trans("DeliveryDate").'</td>';
     print '<td>';
     if ($conf->global->DATE_LIVRAISON_WEEK_DELAY != "") {
         $tmpdte = time() + ((7 * $conf->global->DATE_LIVRAISON_WEEK_DELAY) * 24 * 60 * 60);
         $syear = date("Y", $tmpdte);
         $smonth = date("m", $tmpdte);
         $sday = date("d", $tmpdte);
-        print $form->selectDate($syear . "-" . $smonth . "-" . $sday, 'date_livraison', '', '', '', "addprop");
+        print $form->selectDate($syear."-".$smonth."-".$sday, 'date_livraison', '', '', '', "addprop");
     } else {
         print $form->selectDate(-1, 'date_livraison', '', '', '', "addprop", 1, 1);
     }
@@ -1610,10 +1610,10 @@ 
     if (!empty($conf->projet->enabled)) {
         $langs->load("projects");
         print '<tr>';
-        print '<td>' . $langs->trans("Project") . '</td><td>';
+        print '<td>'.$langs->trans("Project").'</td><td>';
         $numprojet = $formproject->select_projects(($soc->id > 0 ? $soc->id : -1), $projectid, 'projectid', 0, 0, 1, 1);
         // print ' &nbsp; <a href="' . DOL_URL_ROOT . '/projet/card.php?socid=' . $soc->id . '&action=create&status=1&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?action=create&socid=' . $soc->id) . '">' . $langs->trans("AddProject") . '</a>';
-        print ' &nbsp; <a href = "' . BASE_URI . '?controller=projet&method=card&socid=' . $soc->id . '&action=create&status=1&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?action=create&socid=' . $soc->id) . '">' . $langs->trans("AddProject") . '</a>';
+        print ' &nbsp; <a href = "'.BASE_URI.'?controller=projet&method=card&socid='.$soc->id.'&action=create&status=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create&socid='.$soc->id).'">'.$langs->trans("AddProject").'</a>';
         print '</td>';
         print '</tr>';
     }
@@ -1621,7 +1621,7 @@ 
     // Incoterms
     if (!empty($conf->incoterm->enabled)) {
         print '<tr>';
-        print '<td><label for="incoterm_id">' . $form->textwithpicto($langs->trans("IncotermLabel"), $soc->libelle_incoterms, 1) . '</label></td>';
+        print '<td><label for="incoterm_id">'.$form->textwithpicto($langs->trans("IncotermLabel"), $soc->libelle_incoterms, 1).'</label></td>';
         print '<td class="maxwidthonsmartphone">';
         print $form->select_incoterms((!empty($soc->fk_incoterms) ? $soc->fk_incoterms : ''), (!empty($soc->location_incoterms) ? $soc->location_incoterms : ''));
         print '</td></tr>';
@@ -1629,7 +1629,7 @@ 
 
     // Template to use by default
     print '<tr>';
-    print '<td>' . $langs->trans("DefaultModel") . '</td>';
+    print '<td>'.$langs->trans("DefaultModel").'</td>';
     print '<td>';
     $liste = ModelePDFPropales::liste_modeles($db);
     print $form->selectarray('model', $liste, ($conf->global->PROPALE_ADDON_PDF_ODT_DEFAULT ? $conf->global->PROPALE_ADDON_PDF_ODT_DEFAULT : $conf->global->PROPALE_ADDON_PDF));
@@ -1638,7 +1638,7 @@ 
     // Multicurrency
     if (!empty($conf->multicurrency->enabled)) {
         print '<tr>';
-        print '<td>' . $form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0) . '</td>';
+        print '<td>'.$form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0).'</td>';
         print '<td class="maxwidthonsmartphone">';
         print $form->selectMultiCurrency($currency_code, 'multicurrency_code', 0);
         print '</td></tr>';
@@ -1646,7 +1646,7 @@ 
 
     // Public note
     print '<tr>';
-    print '<td class="tdtop">' . $langs->trans('NotePublic') . '</td>';
+    print '<td class="tdtop">'.$langs->trans('NotePublic').'</td>';
     print '<td valign="top">';
     $note_public = $object->getDefaultCreateValueFor('note_public', (is_object($objectsrc) ? $objectsrc->note_public : null));
     $doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
@@ -1655,7 +1655,7 @@ 
     // Private note
     if (empty($user->societe_id)) {
         print '<tr>';
-        print '<td class="tdtop">' . $langs->trans('NotePrivate') . '</td>';
+        print '<td class="tdtop">'.$langs->trans('NotePrivate').'</td>';
         print '<td valign="top">';
         $note_private = $object->getDefaultCreateValueFor('note_private', ((!empty($origin) && !empty($originid) && is_object($objectsrc)) ? $objectsrc->note_private : null));
         $doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
@@ -1665,7 +1665,7 @@ 
     }
 
     // Other attributes
-    include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_add.tpl.php';
+    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php';
 
     // Lines from source
     if (!empty($origin) && !empty($originid) && is_object($objectsrc)) {
@@ -1677,13 +1677,13 @@ 
             $objectsrc->update_price(1, - 1, 1);
         }
 
-        print "\n<!-- " . $classname . " info -->";
+        print "\n<!-- ".$classname." info -->";
         print "\n";
-        print '<input type="hidden" name="amount"         value="' . $objectsrc->total_ht . '">' . "\n";
-        print '<input type="hidden" name="total"          value="' . $objectsrc->total_ttc . '">' . "\n";
-        print '<input type="hidden" name="tva"            value="' . $objectsrc->total_tva . '">' . "\n";
-        print '<input type="hidden" name="origin"         value="' . $objectsrc->element . '">';
-        print '<input type="hidden" name="originid"       value="' . $objectsrc->id . '">';
+        print '<input type="hidden" name="amount"         value="'.$objectsrc->total_ht.'">'."\n";
+        print '<input type="hidden" name="total"          value="'.$objectsrc->total_ttc.'">'."\n";
+        print '<input type="hidden" name="tva"            value="'.$objectsrc->total_tva.'">'."\n";
+        print '<input type="hidden" name="origin"         value="'.$objectsrc->element.'">';
+        print '<input type="hidden" name="originid"       value="'.$objectsrc->id.'">';
 
         $newclassname = $classname;
         if ($newclassname == 'Propal')
@@ -1695,17 +1695,17 @@ 
         elseif ($newclassname == 'Fichinter')
             $newclassname = 'Intervention';
 
-        print '<tr><td>' . $langs->trans($newclassname) . '</td><td>' . $objectsrc->getNomUrl(1) . '</td></tr>';
-        print '<tr><td>' . $langs->trans('TotalHT') . '</td><td>' . price($objectsrc->total_ht, 0, $langs, 1, -1, -1, $conf->currency) . '</td></tr>';
-        print '<tr><td>' . $langs->trans('TotalVAT') . '</td><td>' . price($objectsrc->total_tva, 0, $langs, 1, -1, -1, $conf->currency) . "</td></tr>";
+        print '<tr><td>'.$langs->trans($newclassname).'</td><td>'.$objectsrc->getNomUrl(1).'</td></tr>';
+        print '<tr><td>'.$langs->trans('TotalHT').'</td><td>'.price($objectsrc->total_ht, 0, $langs, 1, -1, -1, $conf->currency).'</td></tr>';
+        print '<tr><td>'.$langs->trans('TotalVAT').'</td><td>'.price($objectsrc->total_tva, 0, $langs, 1, -1, -1, $conf->currency)."</td></tr>";
         if ($mysoc->localtax1_assuj == "1" || $objectsrc->total_localtax1 != 0) {   // Localtax1
-            print '<tr><td>' . $langs->transcountry("AmountLT1", $mysoc->country_code) . '</td><td>' . price($objectsrc->total_localtax1, 0, $langs, 1, -1, -1, $conf->currency) . "</td></tr>";
+            print '<tr><td>'.$langs->transcountry("AmountLT1", $mysoc->country_code).'</td><td>'.price($objectsrc->total_localtax1, 0, $langs, 1, -1, -1, $conf->currency)."</td></tr>";
         }
 
         if ($mysoc->localtax2_assuj == "1" || $objectsrc->total_localtax2 != 0) {   // Localtax2
-            print '<tr><td>' . $langs->transcountry("AmountLT2", $mysoc->country_code) . '</td><td>' . price($objectsrc->total_localtax2, 0, $langs, 1, -1, -1, $conf->currency) . "</td></tr>";
+            print '<tr><td>'.$langs->transcountry("AmountLT2", $mysoc->country_code).'</td><td>'.price($objectsrc->total_localtax2, 0, $langs, 1, -1, -1, $conf->currency)."</td></tr>";
         }
-        print '<tr><td>' . $langs->trans('TotalTTC') . '</td><td>' . price($objectsrc->total_ttc, 0, $langs, 1, -1, -1, $conf->currency) . "</td></tr>";
+        print '<tr><td>'.$langs->trans('TotalTTC').'</td><td>'.price($objectsrc->total_ttc, 0, $langs, 1, -1, -1, $conf->currency)."</td></tr>";
     }
 
     print "</table>\n";
@@ -1724,16 +1724,16 @@ 
         // For backward compatibility
         print '<tr>';
         print '<td><input type="radio" name="createmode" value="copy"></td>';
-        print '<td>' . $langs->trans("CopyPropalFrom") . ' </td>';
+        print '<td>'.$langs->trans("CopyPropalFrom").' </td>';
         print '<td>';
         $liste_propal = array();
         $liste_propal [0] = '';
 
         $sql = "SELECT p.rowid as id, p.ref, s.nom";
-        $sql .= " FROM " . MAIN_DB_PREFIX . "propal p";
-        $sql .= ", " . MAIN_DB_PREFIX . "societe s";
+        $sql .= " FROM ".MAIN_DB_PREFIX."propal p";
+        $sql .= ", ".MAIN_DB_PREFIX."societe s";
         $sql .= " WHERE s.rowid = p.fk_soc";
-        $sql .= " AND p.entity IN (" . getEntity('propal') . ")";
+        $sql .= " AND p.entity IN (".getEntity('propal').")";
         $sql .= " AND p.fk_statut <> 0";
         $sql .= " ORDER BY Id";
 
@@ -1743,9 +1743,9 @@ 
             $i = 0;
             while ($i < $num) {
                 $row = $db->fetch_row($resql);
-                $propalRefAndSocName = $row [1] . " - " . $row [2];
+                $propalRefAndSocName = $row [1]." - ".$row [2];
                 $liste_propal [$row [0]] = $propalRefAndSocName;
-                $i ++;
+                $i++;
             }
             print $form->selectarray("copie_propal", $liste_propal, 0);
         } else {
@@ -1754,7 +1754,7 @@ 
         print '</td></tr>';
 
         print '<tr><td class="tdtop"><input type="radio" name="createmode" value="empty" checked></td>';
-        print '<td valign="top" colspan="2">' . $langs->trans("CreateEmptyPropal") . '</td></tr>';
+        print '<td valign="top" colspan="2">'.$langs->trans("CreateEmptyPropal").'</td></tr>';
     }
 
     if (!empty($conf->global->PROPAL_CLONE_ON_CREATE_PAGE))
@@ -1764,9 +1764,9 @@ 
 
     $langs->load("bills");
     print '<div class="center">';
-    print '<input type="submit" class="button" value="' . $langs->trans("CreateDraft") . '">';
+    print '<input type="submit" class="button" value="'.$langs->trans("CreateDraft").'">';
     print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-    print '<input type="button" class="button" value="' . $langs->trans("Cancel") . '" onClick="javascript:history.go(-1)">';
+    print '<input type="button" class="button" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
     print '</div>';
 
     print "</form>";
@@ -1811,7 +1811,7 @@ 
             $formquestion[] = array('type' => 'date', 'name' => 'date_delivery', 'label' => $langs->trans("DeliveryDate"), 'value' => $object->date_livraison);
         }
         // Paiement incomplet. On demande si motif = escompte ou autre
-        $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('ClonePropal'), $langs->trans('ConfirmClonePropal', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);
+        $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ClonePropal'), $langs->trans('ConfirmClonePropal', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);
     }
 
     if ($action == 'statut') {
@@ -1822,29 +1822,29 @@ 
         );
 
         if (!empty($conf->notification->enabled)) {
-            require_once DOL_DOCUMENT_ROOT . '/core/class/notify.class.php';
+            require_once DOL_DOCUMENT_ROOT.'/core/class/notify.class.php';
             $notify = new Notify($db);
             $formquestion = array_merge($formquestion, array(
                 array('type' => 'onecolumn', 'value' => $notify->confirmMessage('PROPAL_CLOSE_SIGNED', $object->socid, $object)),
             ));
         }
 
-        $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('SetAcceptedRefused'), $text, 'setstatut', $formquestion, '', 1, 250);
+        $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('SetAcceptedRefused'), $text, 'setstatut', $formquestion, '', 1, 250);
     }
 
     // Confirm delete
     else if ($action == 'delete') {
-        $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('DeleteProp'), $langs->trans('ConfirmDeleteProp', $object->ref), 'confirm_delete', '', 0, 1);
+        $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteProp'), $langs->trans('ConfirmDeleteProp', $object->ref), 'confirm_delete', '', 0, 1);
     }
 
     // Confirm reopen
     else if ($action == 'reopen') {
-        $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('ReOpen'), $langs->trans('ConfirmReOpenProp', $object->ref), 'confirm_reopen', '', 0, 1);
+        $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ReOpen'), $langs->trans('ConfirmReOpenProp', $object->ref), 'confirm_reopen', '', 0, 1);
     }
 
     // Confirmation delete product/service line
     else if ($action == 'ask_deleteline') {
-        $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id . '&lineid=' . $lineid, $langs->trans('DeleteProductLine'), $langs->trans('ConfirmDeleteProductLine'), 'confirm_deleteline', '', 0, 1);
+        $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid, $langs->trans('DeleteProductLine'), $langs->trans('ConfirmDeleteProductLine'), 'confirm_deleteline', '', 0, 1);
     }
 
     // Confirm validate proposal
@@ -1856,7 +1856,7 @@ 
         if ($ref == 'PROV') {
             $numref = $object->getNextNumRef($soc);
             if (empty($numref)) {
-                $error ++;
+                $error++;
                 setEventMessages($object->error, $object->errors, 'errors');
             }
         } else {
@@ -1865,14 +1865,14 @@ 
 
         $text = $langs->trans('ConfirmValidateProp', $numref);
         if (!empty($conf->notification->enabled)) {
-            require_once DOL_DOCUMENT_ROOT . '/core/class/notify.class.php';
+            require_once DOL_DOCUMENT_ROOT.'/core/class/notify.class.php';
             $notify = new Notify($db);
             $text .= '<br>';
             $text .= $notify->confirmMessage('PROPAL_VALIDATE', $object->socid, $object);
         }
 
         if (!$error)
-            $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('ValidateProp'), $text, 'confirm_validate', '', 0, 1);
+            $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ValidateProp'), $text, 'confirm_validate', '', 0, 1);
     }
 
     // Call Hook formConfirm
@@ -1889,44 +1889,44 @@ 
 
     // Proposal card
 
-    $linkback = '<a href="' . DOL_URL_ROOT . '/comm/propal/list.php?restore_lastsearch_values=1' . (!empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+    $linkback = '<a href="'.DOL_URL_ROOT.'/comm/propal/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
     $morehtmlref = '<div class="refidno">';
     // Ref customer
     $morehtmlref .= $form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, $usercancreate, 'string', '', 0, 1);
     $morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, $usercancreate, 'string', '', null, null, '', 1);
     // Thirdparty
-    $morehtmlref .= '<br>' . $langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1, 'customer');
+    $morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'customer');
     if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0)
         // $morehtmlref .= ' (<a href="' . DOL_URL_ROOT . '/comm/propal/list.php?socid=' . $object->thirdparty->id . '&search_societe=' . urlencode($object->thirdparty->name) . '">' . $langs->trans("OtherProposals") . '</a>)';
-        $morehtmlref .= ' (<a href = "' . BASE_URI . '?controller=comm/propal&method=list&socid=' . $object->thirdparty->id . '&search_societe=' . urlencode($object->thirdparty->name) . '">' . $langs->trans("OtherProposals") . '</a>)';
+        $morehtmlref .= ' (<a href = "'.BASE_URI.'?controller=comm/propal&method=list&socid='.$object->thirdparty->id.'&search_societe='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherProposals").'</a>)';
     // Project
     if (!empty($conf->projet->enabled)) {
         $langs->load("projects");
-        $morehtmlref .= '<br>' . $langs->trans('Project') . ' ';
+        $morehtmlref .= '<br>'.$langs->trans('Project').' ';
         if ($usercancreate) {
             if ($action != 'classify') {
                 // $morehtmlref .= '<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
-                $morehtmlref .= '<a href = "' . BASE_URI . '?controller=comm/propal&method=card&action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+                $morehtmlref .= '<a href = "'.BASE_URI.'?controller=comm/propal&method=card&action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
             }
             if ($action == 'classify') {
                 //$morehtmlref.=$form->form_project(BASE_URI . '?controller=comm/propal&method=card&id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
                 //$morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-                $morehtmlref .= '<form method="post" href="' . BASE_PATH . '?controller=comm/propal&method=card&id=' . $object->id . '">';
+                $morehtmlref .= '<form method="post" href="'.BASE_PATH.'?controller=comm/propal&method=card&id='.$object->id.'">';
                 $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-                $morehtmlref .= '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
+                $morehtmlref .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
                 $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-                $morehtmlref .= '<input type="submit" class="button valignmiddle" value="' . $langs->trans("Modify") . '">';
+                $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
                 $morehtmlref .= '</form>';
             } else {
-                $morehtmlref .= $form->form_project(BASE_URI . '?controller=comm/propal&method=card&id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+                $morehtmlref .= $form->form_project(BASE_URI.'?controller=comm/propal&method=card&id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
             }
         } else {
             if (!empty($object->fk_project)) {
                 $proj = new Project($db);
                 $proj->fetch($object->fk_project);
                 // $morehtmlref .= '<a href="' . DOL_URL_ROOT . '/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
-                $morehtmlref .= '<a href = "' . BASE_URI . '?controller=projet&method=card&id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
+                $morehtmlref .= '<a href = "'.BASE_URI.'?controller=projet&method=card&id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
                 $morehtmlref .= $proj->ref;
                 $morehtmlref .= '</a>';
             } else {
@@ -1955,7 +1955,7 @@ 
         $filtercreditnote = "fk_facture_source IS NOT NULL AND (description NOT LIKE '(DEPOSIT)%' OR description LIKE '(EXCESS RECEIVED)%')";
     }
 
-    print '<tr><td class="titlefield">' . $langs->trans('Discounts') . '</td><td>';
+    print '<tr><td class="titlefield">'.$langs->trans('Discounts').'</td><td>';
 
     $absolute_discount = $soc->getAvailableDiscounts('', $filterabsolutediscount);
     $absolute_creditnote = $soc->getAvailableDiscounts('', $filtercreditnote);
@@ -1964,8 +1964,8 @@ 
 
     $thirdparty = $soc;
     $discount_type = 0;
-    $backtopage = urlencode($_SERVER["PHP_SELF"] . '?id=' . $object->id);
-    include DOL_DOCUMENT_ROOT . '/core/tpl/object_discounts.tpl.php';
+    $backtopage = urlencode($_SERVER["PHP_SELF"].'?id='.$object->id);
+    include DOL_DOCUMENT_ROOT.'/core/tpl/object_discounts.tpl.php';
 
     print '</td></tr>';
 
@@ -1977,15 +1977,15 @@ 
     print '</td>';
     if ($action != 'editdate' && !empty($object->brouillon) && $usercancreate)
         // print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editdate&amp;id=' . $object->id . '">' . img_edit($langs->trans('SetDate'), 1) . '</a></td>';
-        print '<td align="right"><a href = "' . BASE_URI . '?controller=comm/propal&method=card&action=editdate&amp;id=' . $object->id . '">' . img_edit($langs->trans('SetDate'), 1) . '</a></td>';
+        print '<td align="right"><a href = "'.BASE_URI.'?controller=comm/propal&method=card&action=editdate&amp;id='.$object->id.'">'.img_edit($langs->trans('SetDate'), 1).'</a></td>';
     print '</tr></table>';
     print '</td><td>';
     if (!empty($object->brouillon) && $action == 'editdate' && $usercancreate) {
-        print '<form name="editdate" href="' . BASE_PATH . '?controller=comm/propal&method=card&id=' . $object->id . '" method="post">';
-        print '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
+        print '<form name="editdate" href="'.BASE_PATH.'?controller=comm/propal&method=card&id='.$object->id.'" method="post">';
+        print '<input type="hidden" name="token" value="'.$_SESSION ['newtoken'].'">';
         print '<input type="hidden" name="action" value="setdate">';
         print $form->selectDate($object->date, 're', '', '', 0, "editdate");
-        print '<input type="submit" class="button" value="' . $langs->trans('Modify') . '">';
+        print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
         print '</form>';
     } else {
         if ($object->date) {
@@ -2004,16 +2004,16 @@ 
     print '</td>';
     if ($action != 'editecheance' && !empty($object->brouillon) && $usercancreate)
         // print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editecheance&amp;id=' . $object->id . '">' . img_edit($langs->trans('SetConditions'), 1) . '</a></td>';
-        print '<td align="right"><a href = "' . BASE_URI . '?controller=comm/propal&method=card&action=editecheance&amp;id=' . $object->id . '">' . img_edit($langs->trans('SetConditions'), 1) . '</a></td>';
+        print '<td align="right"><a href = "'.BASE_URI.'?controller=comm/propal&method=card&action=editecheance&amp;id='.$object->id.'">'.img_edit($langs->trans('SetConditions'), 1).'</a></td>';
     print '</tr></table>';
     print '</td><td>';
     if (!empty($object->brouillon) && $action == 'editecheance' && $usercancreate) {
         //print '<form name="editecheance" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '" method="post">';
-        print '<form name="editecheance" href="' . BASE_PATH . '?controller=comm/propal&method=card&id=' . $object->id . '" method="post">';
-        print '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
+        print '<form name="editecheance" href="'.BASE_PATH.'?controller=comm/propal&method=card&id='.$object->id.'" method="post">';
+        print '<input type="hidden" name="token" value="'.$_SESSION ['newtoken'].'">';
         print '<input type="hidden" name="action" value="setecheance">';
         print $form->selectDate($object->fin_validite, 'ech', '', '', '', "editecheance");
-        print '<input type="submit" class="button" value="' . $langs->trans('Modify') . '">';
+        print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
         print '</form>';
     } else {
         if (!empty($object->fin_validite)) {
@@ -2034,13 +2034,13 @@ 
     print '</td>';
     if ($action != 'editconditions' && !empty($object->brouillon) && $usercancreate)
         // print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editconditions&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetConditions'), 1) . '</a></td>';
-        print '<td align="right"><a href = "' . BASE_URI . '?controller=comm/propal&method=card&action=editconditions&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetConditions'), 1) . '</a></td>';
+        print '<td align="right"><a href = "'.BASE_URI.'?controller=comm/propal&method=card&action=editconditions&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetConditions'), 1).'</a></td>';
     print '</tr></table>';
     print '</td><td>';
     if (!empty($object->brouillon) && $action == 'editconditions' && $usercancreate) {
-        $form->form_conditions_reglement(BASE_URI . '?controller=comm/propal&method=card&id=' . $object->id, $object->cond_reglement_id, 'cond_reglement_id');
+        $form->form_conditions_reglement(BASE_URI.'?controller=comm/propal&method=card&id='.$object->id, $object->cond_reglement_id, 'cond_reglement_id');
     } else {
-        $form->form_conditions_reglement(BASE_URI . '?controller=comm/propal&method=card&id=' . $object->id, $object->cond_reglement_id, 'none');
+        $form->form_conditions_reglement(BASE_URI.'?controller=comm/propal&method=card&id='.$object->id, $object->cond_reglement_id, 'none');
     }
     print '</td>';
     print '</tr>';
@@ -2059,19 +2059,19 @@ 
     print '<table class="nobordernopadding" width="100%"><tr><td>';
     print $langs->trans('AvailabilityPeriod');
     if (!empty($conf->commande->enabled))
-        print ' (' . $langs->trans('AfterOrder') . ')';
+        print ' ('.$langs->trans('AfterOrder').')';
     print '</td>';
     if ($action != 'editavailability' && !empty($object->brouillon) && $usercancreate)
         // print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editavailability&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetAvailability'), 1) . '</a></td>';
-        print '<td align="right"><a href = "' . BASE_URI . '?controller=comm/propal&method=card&action=editavailability&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetAvailability'), 1) . '</a></td>';
+        print '<td align="right"><a href = "'.BASE_URI.'?controller=comm/propal&method=card&action=editavailability&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetAvailability'), 1).'</a></td>';
     print '</tr></table>';
     print '</td><td>';
     if (!empty($object->brouillon) && $action == 'editavailability' && $usercancreate) {
         // $form->form_availability(BASE_URI . '?controller=comm/propal&method=card&id=' . $object->id, $object->availability_id, 'availability_id', 1);
-        $form->form_availability(BASE_URI . '?controller=comm/propal&method=card&id=' . $object->id, $object->availability_id, 'availability_id', 1);
+        $form->form_availability(BASE_URI.'?controller=comm/propal&method=card&id='.$object->id, $object->availability_id, 'availability_id', 1);
     } else {
         // $form->form_availability(BASE_URI . '?controller=comm/propal&method=card&id=' . $object->id, $object->availability_id, 'none', 1);
-        $form->form_availability(BASE_URI . '?controller=comm/propal&method=card&id=' . $object->id, $object->availability_id, 'none', 1);
+        $form->form_availability(BASE_URI.'?controller=comm/propal&method=card&id='.$object->id, $object->availability_id, 'none', 1);
     }
 
     print '</td>';
@@ -2085,14 +2085,14 @@ 
         print '</td>';
         if ($action != 'editshippingmethod' && $usercancreate) {
             // print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editshippingmethod&amp;id=' . $object->id . '">' . img_edit($langs->trans('SetShippingMode'), 1) . '</a></td>';
-            print '<td align="right"><a href = "' . BASE_URI . '?controller=comm/propal&method=card&action=editshippingmethod&amp;id=' . $object->id . '">' . img_edit($langs->trans('SetShippingMode'), 1) . '</a></td>';
+            print '<td align="right"><a href = "'.BASE_URI.'?controller=comm/propal&method=card&action=editshippingmethod&amp;id='.$object->id.'">'.img_edit($langs->trans('SetShippingMode'), 1).'</a></td>';
         }
         print '</tr></table>';
         print '</td><td>';
         if ($action == 'editshippingmethod' && $usercancreate) {
-            $form->formSelectShippingMethod(BASE_URI . '?controller=comm/propal&method=card&id=' . $object->id, $object->shipping_method_id, 'shipping_method_id', 1);
+            $form->formSelectShippingMethod(BASE_URI.'?controller=comm/propal&method=card&id='.$object->id, $object->shipping_method_id, 'shipping_method_id', 1);
         } else {
-            $form->formSelectShippingMethod(BASE_URI . '?controller=comm/propal&method=card&id=' . $object->id, $object->shipping_method_id, 'none');
+            $form->formSelectShippingMethod(BASE_URI.'?controller=comm/propal&method=card&id='.$object->id, $object->shipping_method_id, 'none');
         }
         print '</td>';
         print '</tr>';
@@ -2105,14 +2105,14 @@ 
     print '</td>';
     if ($action != 'editdemandreason' && !empty($object->brouillon) && $usercancreate) {
         // print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editdemandreason&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetDemandReason'), 1) . '</a></td>';
-        print '<td align="right"><a href = "' . BASE_URI . '?controller=comm/propal&method=card&action=editdemandreason&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetDemandReason'), 1) . '</a></td>';
+        print '<td align="right"><a href = "'.BASE_URI.'?controller=comm/propal&method=card&action=editdemandreason&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetDemandReason'), 1).'</a></td>';
     }
     print '</tr></table>';
     print '</td><td>';
     if (!empty($object->brouillon) && $action == 'editdemandreason' && $usercancreate) {
-        $form->formInputReason(BASE_URI . '?controller=comm/propal&method=card&id=' . $object->id, $object->demand_reason_id, 'demand_reason_id', 1);
+        $form->formInputReason(BASE_URI.'?controller=comm/propal&method=card&id='.$object->id, $object->demand_reason_id, 'demand_reason_id', 1);
     } else {
-        $form->formInputReason(BASE_URI . '?controller=comm/propal&method=card&id=' . $object->id, $object->demand_reason_id, 'none');
+        $form->formInputReason(BASE_URI.'?controller=comm/propal&method=card&id='.$object->id, $object->demand_reason_id, 'none');
     }
     print '</td>';
     print '</tr>';
@@ -2125,14 +2125,14 @@ 
     print '</td>';
     if ($action != 'editmode' && !empty($object->brouillon) && $usercancreate) {
         // print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editmode&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetMode'), 1) . '</a></td>';
-        print '<td align="right"><a href = "' . BASE_URI . '?controller=comm/propal&method=card&action=editmode&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetMode'), 1) . '</a></td>';
+        print '<td align="right"><a href = "'.BASE_URI.'?controller=comm/propal&method=card&action=editmode&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetMode'), 1).'</a></td>';
     }
     print '</tr></table>';
     print '</td><td>';
     if (!empty($object->brouillon) && $action == 'editmode' && $usercancreate) {
-        $form->form_modes_reglement(BASE_URI . '?controller=comm/propal&method=card&id=' . $object->id, $object->mode_reglement_id, 'mode_reglement_id', 'CRDT');
+        $form->form_modes_reglement(BASE_URI.'?controller=comm/propal&method=card&id='.$object->id, $object->mode_reglement_id, 'mode_reglement_id', 'CRDT');
     } else {
-        $form->form_modes_reglement(BASE_URI . '?controller=comm/propal&method=card&id=' . $object->id, $object->mode_reglement_id, 'none');
+        $form->form_modes_reglement(BASE_URI.'?controller=comm/propal&method=card&id='.$object->id, $object->mode_reglement_id, 'none');
     }
     print '</td></tr>';
 
@@ -2146,14 +2146,14 @@ 
         print '</td>';
         if ($action != 'editmulticurrencycode' && !empty($object->brouillon) && $usercancreate) {
             // print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editmulticurrencycode&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1) . '</a></td>';
-            print '<td align="right"><a href = "' . BASE_URI . '?controller=comm/propal&method=card&action=editmulticurrencycode&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1) . '</a></td>';
+            print '<td align="right"><a href = "'.BASE_URI.'?controller=comm/propal&method=card&action=editmulticurrencycode&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1).'</a></td>';
         }
         print '</tr></table>';
         print '</td><td>';
         if (!empty($object->brouillon) && $action == 'editmulticurrencycode' && $usercancreate) {
-            $form->form_multicurrency_code(BASE_URI . '?controller=comm/propal&method=card&id=' . $object->id, $object->multicurrency_code, 'multicurrency_code');
+            $form->form_multicurrency_code(BASE_URI.'?controller=comm/propal&method=card&id='.$object->id, $object->multicurrency_code, 'multicurrency_code');
         } else {
-            $form->form_multicurrency_code(BASE_URI . '?controller=comm/propal&method=card&id=' . $object->id, $object->multicurrency_code, 'none');
+            $form->form_multicurrency_code(BASE_URI.'?controller=comm/propal&method=card&id='.$object->id, $object->multicurrency_code, 'none');
         }
         print '</td></tr>';
 
@@ -2165,7 +2165,7 @@ 
         print '</td>';
         if ($action != 'editmulticurrencyrate' && !empty($object->brouillon) && $object->multicurrency_code && $object->multicurrency_code != $conf->currency && $usercancreate) {
             // print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editmulticurrencyrate&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1) . '</a></td>';
-            print '<td align="right"><a href = "' . BASE_URI . '?controller=comm/propal&method=card&action=editmulticurrencyrate&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1) . '</a></td>';
+            print '<td align="right"><a href = "'.BASE_URI.'?controller=comm/propal&method=card&action=editmulticurrencyrate&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1).'</a></td>';
         }
         print '</tr></table>';
         print '</td><td>';
@@ -2173,13 +2173,13 @@ 
             if ($action == 'actualizemulticurrencyrate') {
                 list($object->fk_multicurrency, $object->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($object->db, $object->multicurrency_code);
             }
-            $form->form_multicurrency_rate(BASE_URI . '?controller=comm/propal&method=card&id=' . $object->id, $object->multicurrency_tx, 'multicurrency_tx', $object->multicurrency_code);
+            $form->form_multicurrency_rate(BASE_URI.'?controller=comm/propal&method=card&id='.$object->id, $object->multicurrency_tx, 'multicurrency_tx', $object->multicurrency_code);
         } else {
-            $form->form_multicurrency_rate(BASE_URI . '?controller=comm/propal&method=card&id=' . $object->id, $object->multicurrency_tx, 'none', $object->multicurrency_code);
+            $form->form_multicurrency_rate(BASE_URI.'?controller=comm/propal&method=card&id='.$object->id, $object->multicurrency_tx, 'none', $object->multicurrency_code);
             if ($object->statut == $object::STATUS_DRAFT && $object->multicurrency_code && $object->multicurrency_code != $conf->currency) {
                 print '<div class="inline-block"> &nbsp; &nbsp; &nbsp; &nbsp; ';
                 // print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=actualizemulticurrencyrate">' . $langs->trans("ActualizeCurrency") . '</a>';
-                print '<a href = "' . BASE_URI . '?controller=comm/propal&method=card&id=' . $object->id . '&action=actualizemulticurrencyrate">' . $langs->trans("ActualizeCurrency") . '</a>';
+                print '<a href = "'.BASE_URI.'?controller=comm/propal&method=card&id='.$object->id.'&action=actualizemulticurrencyrate">'.$langs->trans("ActualizeCurrency").'</a>';
                 print '</div>';
             }
         }
@@ -2191,7 +2191,7 @@ 
         print '<tr><td>';
         print $langs->trans('OutstandingBill');
         print '</td><td align="right">';
-        print price($soc->get_OutstandingBill()) . ' / ';
+        print price($soc->get_OutstandingBill()).' / ';
         print price($soc->outstanding_limit, 0, $langs, 1, - 1, - 1, $conf->currency);
         print '</td>';
         print '</tr>';
@@ -2205,14 +2205,14 @@ 
         print '</td>';
         if ($action != 'editbankaccount' && $usercancreate) {
             // print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editbankaccount&amp;id=' . $object->id . '">' . img_edit($langs->trans('SetBankAccount'), 1) . '</a></td>';
-            print '<td align="right"><a href = "' . BASE_URI . '?controller=comm/propal&method=card&action=editbankaccount&amp;id=' . $object->id . '">' . img_edit($langs->trans('SetBankAccount'), 1) . '</a></td>';
+            print '<td align="right"><a href = "'.BASE_URI.'?controller=comm/propal&method=card&action=editbankaccount&amp;id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'), 1).'</a></td>';
         }
         print '</tr></table>';
         print '</td><td>';
         if ($action == 'editbankaccount') {
-            $form->formSelectAccount(BASE_URI . '?controller=comm/propal&method=card&id=' . $object->id, $object->fk_account, 'fk_account', 1);
+            $form->formSelectAccount(BASE_URI.'?controller=comm/propal&method=card&id='.$object->id, $object->fk_account, 'fk_account', 1);
         } else {
-            $form->formSelectAccount(BASE_URI . '?controller=comm/propal&method=card&id=' . $object->id, $object->fk_account, 'none');
+            $form->formSelectAccount(BASE_URI.'?controller=comm/propal&method=card&id='.$object->id, $object->fk_account, 'none');
         }
         print '</td>';
         print '</tr>';
@@ -2222,13 +2222,13 @@ 
     $totalWeight = $tmparray['weight'];
     $totalVolume = $tmparray['volume'];
     if ($totalWeight) {
-        print '<tr><td>' . $langs->trans("CalculatedWeight") . '</td>';
+        print '<tr><td>'.$langs->trans("CalculatedWeight").'</td>';
         print '<td>';
         print showDimensionInBestUnit($totalWeight, 0, "weight", $langs, isset($conf->global->MAIN_WEIGHT_DEFAULT_ROUND) ? $conf->global->MAIN_WEIGHT_DEFAULT_ROUND : -1, isset($conf->global->MAIN_WEIGHT_DEFAULT_UNIT) ? $conf->global->MAIN_WEIGHT_DEFAULT_UNIT : 'no');
         print '</td></tr>';
     }
     if ($totalVolume) {
-        print '<tr><td>' . $langs->trans("CalculatedVolume") . '</td>';
+        print '<tr><td>'.$langs->trans("CalculatedVolume").'</td>';
         print '<td>';
         print showDimensionInBestUnit($totalVolume, 0, "volume", $langs, isset($conf->global->MAIN_VOLUME_DEFAULT_ROUND) ? $conf->global->MAIN_VOLUME_DEFAULT_ROUND : -1, isset($conf->global->MAIN_VOLUME_DEFAULT_UNIT) ? $conf->global->MAIN_VOLUME_DEFAULT_UNIT : 'no');
         print '</td></tr>';
@@ -2241,7 +2241,7 @@ 
         print $langs->trans('IncotermLabel');
         print '<td><td align="right">';
         if ($usercancreate) {
-            print '<a href = "' . BASE_URI . '?controller=comm/propal&method=card&id=' . $object->id . '&action=editincoterm">' . img_edit() . '</a>';
+            print '<a href = "'.BASE_URI.'?controller=comm/propal&method=card&id='.$object->id.'&action=editincoterm">'.img_edit().'</a>';
         } else {
             print '&nbsp;';
         }
@@ -2251,13 +2251,13 @@ 
         if ($action != 'editincoterm') {
             print $form->textwithpicto($object->display_incoterms(), $object->libelle_incoterms, 1);
         } else {
-            print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''), $_SERVER['PHP_SELF'] . '?id=' . $object->id);
+            print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''), $_SERVER['PHP_SELF'].'?id='.$object->id);
         }
         print '</td></tr>';
     }
 
     // Other attributes
-    include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
     print '</table>';
 
@@ -2270,46 +2270,46 @@ 
 
     if (!empty($conf->multicurrency->enabled) && ($object->multicurrency_code != $conf->currency)) {
         // Multicurrency Amount HT
-        print '<tr><td class="titlefieldmiddle">' . $form->editfieldkey('MulticurrencyAmountHT', 'multicurrency_total_ht', '', $object, 0) . '</td>';
-        print '<td class="nowrap">' . price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
+        print '<tr><td class="titlefieldmiddle">'.$form->editfieldkey('MulticurrencyAmountHT', 'multicurrency_total_ht', '', $object, 0).'</td>';
+        print '<td class="nowrap">'.price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
         print '</tr>';
 
         // Multicurrency Amount VAT
-        print '<tr><td>' . $form->editfieldkey('MulticurrencyAmountVAT', 'multicurrency_total_tva', '', $object, 0) . '</td>';
-        print '<td class="nowrap">' . price($object->multicurrency_total_tva, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
+        print '<tr><td>'.$form->editfieldkey('MulticurrencyAmountVAT', 'multicurrency_total_tva', '', $object, 0).'</td>';
+        print '<td class="nowrap">'.price($object->multicurrency_total_tva, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
         print '</tr>';
 
         // Multicurrency Amount TTC
-        print '<tr><td>' . $form->editfieldkey('MulticurrencyAmountTTC', 'multicurrency_total_ttc', '', $object, 0) . '</td>';
-        print '<td class="nowrap">' . price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
+        print '<tr><td>'.$form->editfieldkey('MulticurrencyAmountTTC', 'multicurrency_total_ttc', '', $object, 0).'</td>';
+        print '<td class="nowrap">'.price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
         print '</tr>';
     }
 
     // Amount HT
-    print '<tr><td class="titlefieldmiddle">' . $langs->trans('AmountHT') . '</td>';
-    print '<td class="nowrap">' . price($object->total_ht, '', $langs, 0, - 1, - 1, $conf->currency) . '</td>';
+    print '<tr><td class="titlefieldmiddle">'.$langs->trans('AmountHT').'</td>';
+    print '<td class="nowrap">'.price($object->total_ht, '', $langs, 0, - 1, - 1, $conf->currency).'</td>';
     print '</tr>';
 
     // Amount VAT
-    print '<tr><td>' . $langs->trans('AmountVAT') . '</td>';
-    print '<td class="nowrap">' . price($object->total_tva, '', $langs, 0, - 1, - 1, $conf->currency) . '</td>';
+    print '<tr><td>'.$langs->trans('AmountVAT').'</td>';
+    print '<td class="nowrap">'.price($object->total_tva, '', $langs, 0, - 1, - 1, $conf->currency).'</td>';
     print '</tr>';
 
     // Amount Local Taxes
     if ($mysoc->localtax1_assuj == "1" || $object->total_localtax1 != 0) {  // Localtax1
-        print '<tr><td>' . $langs->transcountry("AmountLT1", $mysoc->country_code) . '</td>';
-        print '<td class="nowrap">' . price($object->total_localtax1, '', $langs, 0, - 1, - 1, $conf->currency) . '</td>';
+        print '<tr><td>'.$langs->transcountry("AmountLT1", $mysoc->country_code).'</td>';
+        print '<td class="nowrap">'.price($object->total_localtax1, '', $langs, 0, - 1, - 1, $conf->currency).'</td>';
         print '</tr>';
     }
     if ($mysoc->localtax2_assuj == "1" || $object->total_localtax2 != 0) {  // Localtax2
-        print '<tr><td>' . $langs->transcountry("AmountLT2", $mysoc->country_code) . '</td>';
-        print '<td class="nowrap">' . price($object->total_localtax2, '', $langs, 0, - 1, - 1, $conf->currency) . '</td>';
+        print '<tr><td>'.$langs->transcountry("AmountLT2", $mysoc->country_code).'</td>';
+        print '<td class="nowrap">'.price($object->total_localtax2, '', $langs, 0, - 1, - 1, $conf->currency).'</td>';
         print '</tr>';
     }
 
     // Amount TTC
-    print '<tr><td>' . $langs->trans('AmountTTC') . '</td>';
-    print '<td class="nowrap">' . price($object->total_ttc, '', $langs, 0, - 1, - 1, $conf->currency) . '</td>';
+    print '<tr><td>'.$langs->trans('AmountTTC').'</td>';
+    print '<td class="nowrap">'.price($object->total_ttc, '', $langs, 0, - 1, - 1, $conf->currency).'</td>';
     print '</tr>';
 
     // Statut
@@ -2331,13 +2331,13 @@ 
     if (!empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) {
         $blocname = 'contacts';
         $title = $langs->trans('ContactsAddresses');
-        include DOL_DOCUMENT_ROOT . '/core/tpl/bloc_showhide.tpl.php';
+        include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
     }
 
     if (!empty($conf->global->MAIN_DISABLE_NOTES_TAB)) {
         $blocname = 'notes';
         $title = $langs->trans('Notes');
-        include DOL_DOCUMENT_ROOT . '/core/tpl/bloc_showhide.tpl.php';
+        include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
     }
 
     /*
@@ -2348,15 +2348,15 @@ 
     $result = $object->getLinesArray();
 
     // print '	<form name="addproduct" id="addproduct" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . (($action != 'editline') ? '#addline' : '#line_' . GETPOST('lineid')) . '" method="POST">
-    print '	<form name="addproduct" id="addproduct" href="' . BASE_PATH . '?controller=comm/propal&method=card&id=' . $object->id . (($action != 'editline') ? '#addline' : '#line_' . GETPOST('lineid')) . '" method="POST">
-	<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">
-	<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline') . '">
+    print '	<form name="addproduct" id="addproduct" href="'.BASE_PATH.'?controller=comm/propal&method=card&id='.$object->id.(($action != 'editline') ? '#addline' : '#line_'.GETPOST('lineid')).'" method="POST">
+	<input type="hidden" name="token" value="' . $_SESSION ['newtoken'].'">
+	<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline').'">
 	<input type="hidden" name="mode" value="">
-	<input type="hidden" name="id" value="' . $object->id . '">
+	<input type="hidden" name="id" value="' . $object->id.'">
 	';
 
     if (!empty($conf->use_javascript_ajax) && $object->statut == Propal::STATUS_DRAFT) {
-        include DOL_DOCUMENT_ROOT . '/core/tpl/ajaxrow.tpl.php';
+        include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php';
     }
 
     print '<div class="div-table-responsive-no-min">';
@@ -2398,9 +2398,9 @@ 
                 if ($object->statut == Propal::STATUS_DRAFT && $object->total_ttc >= 0 && count($object->lines) > 0) {
                     if ($usercanvalidate) {
                         // print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=validate">' . $langs->trans('Validate') . '</a></div>';
-                        print '<div class="inline-block divButAction"><a class="butAction" href = "' . BASE_URI . '?controller=comm/propal&method=card&id=' . $object->id . '&amp;action=validate">' . $langs->trans('Validate') . '</a></div>';
+                        print '<div class="inline-block divButAction"><a class="butAction" href = "'.BASE_URI.'?controller=comm/propal&method=card&id='.$object->id.'&amp;action=validate">'.$langs->trans('Validate').'</a></div>';
                     } else
-                        print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">' . $langs->trans('Validate') . '</a></div>';
+                        print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans('Validate').'</a></div>';
                 }
                 // Create event
                 /* if ($conf->agenda->enabled && ! empty($conf->global->MAIN_ADD_EVENT_ON_ELEMENT_CARD)) 	// Add hidden condition because this is not a "workflow" action so should appears somewhere else on page.
@@ -2410,30 +2410,30 @@ 
                 // Edit
                 if ($object->statut == Propal::STATUS_VALIDATED && $usercancreate) {
                     // print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=modif">' . $langs->trans('Modify') . '</a></div>';
-                    print '<div class="inline-block divButAction"><a class="butAction" href = "' . BASE_URI . '?controller=comm/propal&method=card&id=' . $object->id . '&amp;action=modif">' . $langs->trans('Modify') . '</a></div>';
+                    print '<div class="inline-block divButAction"><a class="butAction" href = "'.BASE_URI.'?controller=comm/propal&method=card&id='.$object->id.'&amp;action=modif">'.$langs->trans('Modify').'</a></div>';
                 }
 
                 // ReOpen
                 if (($object->statut == Propal::STATUS_SIGNED || $object->statut == Propal::STATUS_NOTSIGNED || $object->statut == Propal::STATUS_BILLED) && $usercanclose) {
                     // print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=reopen' . (empty($conf->global->MAIN_JUMP_TAG) ? '' : '#reopen') . '"';
-                    print '<div class="inline-block divButAction"><a class="butAction" href = "' . BASE_URI . '?controller=comm/propal&method=card&id=' . $object->id . '&amp;action=reopen' . (empty($conf->global->MAIN_JUMP_TAG) ? '' : '#reopen') . '"';
-                    print '>' . $langs->trans('ReOpen') . '</a></div>';
+                    print '<div class="inline-block divButAction"><a class="butAction" href = "'.BASE_URI.'?controller=comm/propal&method=card&id='.$object->id.'&amp;action=reopen'.(empty($conf->global->MAIN_JUMP_TAG) ? '' : '#reopen').'"';
+                    print '>'.$langs->trans('ReOpen').'</a></div>';
                 }
 
                 // Send
                 if ($object->statut == Propal::STATUS_VALIDATED || $object->statut == Propal::STATUS_SIGNED) {
                     if ($usercansend) {
                         // print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=presend&mode=init#formmailbeforetitle">' . $langs->trans('SendMail') . '</a></div>';
-                        print '<div class="inline-block divButAction"><a class="butAction" href = "' . BASE_URI . '?controller=comm/propal&method=card&id=' . $object->id . '&action=presend&mode=init#formmailbeforetitle">' . $langs->trans('SendMail') . '</a></div>';
+                        print '<div class="inline-block divButAction"><a class="butAction" href = "'.BASE_URI.'?controller=comm/propal&method=card&id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a></div>';
                     } else
-                        print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">' . $langs->trans('SendMail') . '</a></div>';
+                        print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans('SendMail').'</a></div>';
                 }
 
                 // Create an order
                 if (!empty($conf->commande->enabled) && $object->statut == Propal::STATUS_SIGNED) {
                     if ($usercancreateorder) {
                         // print '<div class="inline-block divButAction"><a class="butAction" href="' . DOL_URL_ROOT . '/commande/card.php?action=create&amp;origin=' . $object->element . '&amp;originid=' . $object->id . '&amp;socid=' . $object->socid . '">' . $langs->trans("AddOrder") . '</a></div>';
-                        print '<div class="inline-block divButAction"><a class="butAction" href = "' . BASE_URI . '?controller=commande&method=card&action=create&amp;origin=' . $object->element . '&amp;originid=' . $object->id . '&amp;socid=' . $object->socid . '">' . $langs->trans("AddOrder") . '</a></div>';
+                        print '<div class="inline-block divButAction"><a class="butAction" href = "'.BASE_URI.'?controller=commande&method=card&action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid.'">'.$langs->trans("AddOrder").'</a></div>';
                     }
                 }
 
@@ -2442,7 +2442,7 @@ 
                     if ($usercancreateintervention) {
                         $langs->load("interventions");
                         // print '<div class="inline-block divButAction"><a class="butAction" href="' . DOL_URL_ROOT . '/fichinter/card.php?action=create&amp;origin=' . $object->element . '&amp;originid=' . $object->id . '&amp;socid=' . $object->socid . '">' . $langs->trans("AddIntervention") . '</a></div>';
-                        print '<div class="inline-block divButAction"><a class="butAction" href = "' . BASE_URI . '?controller=fichinter&method=card&action=create&amp;origin=' . $object->element . '&amp;originid=' . $object->id . '&amp;socid=' . $object->socid . '">' . $langs->trans("AddIntervention") . '</a></div>';
+                        print '<div class="inline-block divButAction"><a class="butAction" href = "'.BASE_URI.'?controller=fichinter&method=card&action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid.'">'.$langs->trans("AddIntervention").'</a></div>';
                     }
                 }
 
@@ -2452,7 +2452,7 @@ 
 
                     if ($usercancreatecontract) {
                         // print '<div class="inline-block divButAction"><a class="butAction" href="' . DOL_URL_ROOT . '/contrat/card.php?action=create&amp;origin=' . $object->element . '&amp;originid=' . $object->id . '&amp;socid=' . $object->socid . '">' . $langs->trans('AddContract') . '</a></div>';
-                        print '<div class="inline-block divButAction"><a class="butAction" href = "' . BASE_URI . '?controller=contrat&method=card&action=create&amp;origin=' . $object->element . '&amp;originid=' . $object->id . '&amp;socid=' . $object->socid . '">' . $langs->trans('AddContract') . '</a></div>';
+                        print '<div class="inline-block divButAction"><a class="butAction" href = "'.BASE_URI.'?controller=contrat&method=card&action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid.'">'.$langs->trans('AddContract').'</a></div>';
                     }
                 }
 
@@ -2460,34 +2460,34 @@ 
                 if ($object->statut == Propal::STATUS_SIGNED) {
                     if (!empty($conf->facture->enabled) && $usercancreateinvoice) {
                         // print '<div class="inline-block divButAction"><a class="butAction" href="' . DOL_URL_ROOT . '/compta/facture/card.php?action=create&amp;origin=' . $object->element . '&amp;originid=' . $object->id . '&amp;socid=' . $object->socid . '">' . $langs->trans("AddBill") . '</a></div>';
-                        print '<div class="inline-block divButAction"><a class="butAction" href = "' . BASE_URI . '?controller=compta/facture&method=card&action=create&amp;origin=' . $object->element . '&amp;originid=' . $object->id . '&amp;socid=' . $object->socid . '">' . $langs->trans("AddBill") . '</a></div>';
+                        print '<div class="inline-block divButAction"><a class="butAction" href = "'.BASE_URI.'?controller=compta/facture&method=card&action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid.'">'.$langs->trans("AddBill").'</a></div>';
                     }
 
                     $arrayofinvoiceforpropal = $object->getInvoiceArrayList();
                     if ((is_array($arrayofinvoiceforpropal) && count($arrayofinvoiceforpropal) > 0) || empty($conf->global->WORKFLOW_PROPAL_NEED_INVOICE_TO_BE_CLASSIFIED_BILLED)) {
                         // print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=classifybilled&amp;socid=' . $object->socid . '">' . $langs->trans("ClassifyBilled") . '</a></div>';
-                        print '<div class="inline-block divButAction"><a class="butAction" href = "' . BASE_URI . '?controller=comm/propal&method=card&id=' . $object->id . '&amp;action=classifybilled&amp;socid=' . $object->socid . '">' . $langs->trans("ClassifyBilled") . '</a></div>';
+                        print '<div class="inline-block divButAction"><a class="butAction" href = "'.BASE_URI.'?controller=comm/propal&method=card&id='.$object->id.'&amp;action=classifybilled&amp;socid='.$object->socid.'">'.$langs->trans("ClassifyBilled").'</a></div>';
                     }
                 }
 
                 // Set accepted/refused
                 if ($object->statut == Propal::STATUS_VALIDATED && $usercanclose) {
                     // print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=statut' . (empty($conf->global->MAIN_JUMP_TAG) ? '' : '#close') . '"';
-                    print '<div class="inline-block divButAction"><a class="butAction" href = "' . BASE_URI . '?controller=comm/propal&method=card&id=' . $object->id . '&amp;action=statut' . (empty($conf->global->MAIN_JUMP_TAG) ? '' : '#close') . '"';
-                    print '>' . $langs->trans('SetAcceptedRefused') . '</a></div>';
+                    print '<div class="inline-block divButAction"><a class="butAction" href = "'.BASE_URI.'?controller=comm/propal&method=card&id='.$object->id.'&amp;action=statut'.(empty($conf->global->MAIN_JUMP_TAG) ? '' : '#close').'"';
+                    print '>'.$langs->trans('SetAcceptedRefused').'</a></div>';
                 }
 
                 // Clone
                 if ($usercancreate) {
                     // print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&amp;socid=' . $object->socid . '&amp;action=clone&amp;object=' . $object->element . '">' . $langs->trans("ToClone") . '</a></div>';
-                    print '<div class="inline-block divButAction"><a class="butAction" href = "' . BASE_URI . '?controller=comm/propal&method=card&id=' . $object->id . '&amp;socid=' . $object->socid . '&amp;action=clone&amp;object=' . $object->element . '">' . $langs->trans("ToClone") . '</a></div>';
+                    print '<div class="inline-block divButAction"><a class="butAction" href = "'.BASE_URI.'?controller=comm/propal&method=card&id='.$object->id.'&amp;socid='.$object->socid.'&amp;action=clone&amp;object='.$object->element.'">'.$langs->trans("ToClone").'</a></div>';
                 }
 
                 // Delete
                 if ($usercandelete) {
                     // print '<div class="inline-block divButAction"><a class="butActionDelete" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=delete"';
-                    print '<div class="inline-block divButAction"><a class="butActionDelete" href = "' . BASE_URI . '?controller=comm/propal&method=card&id=' . $object->id . '&amp;action=delete"';
-                    print '>' . $langs->trans('Delete') . '</a></div>';
+                    print '<div class="inline-block divButAction"><a class="butActionDelete" href = "'.BASE_URI.'?controller=comm/propal&method=card&id='.$object->id.'&amp;action=delete"';
+                    print '>'.$langs->trans('Delete').'</a></div>';
                 }
             }
         }
@@ -2506,8 +2506,8 @@ 
          * Documents generes
          */
         $filename = dol_sanitizeFileName($object->ref);
-        $filedir = $conf->propal->multidir_output[$object->entity] . "/" . dol_sanitizeFileName($object->ref);
-        $urlsource = $_SERVER["PHP_SELF"] . "?id=" . $object->id;
+        $filedir = $conf->propal->multidir_output[$object->entity]."/".dol_sanitizeFileName($object->ref);
+        $urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
         $genallowed = $usercanread;
         $delallowed = $usercancreate;
 
@@ -2527,20 +2527,20 @@ 
 
         if ($object->statut != Propal::STATUS_DRAFT && $useonlinesignature) {
             print '<br><!-- Link to sign -->';
-            require_once DOL_DOCUMENT_ROOT . '/core/lib/payments.lib.php';
-            print showOnlineSignatureUrl('proposal', $object->ref) . '<br>';
+            require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
+            print showOnlineSignatureUrl('proposal', $object->ref).'<br>';
         }
 
         // Show direct download link
         if ($object->statut != Propal::STATUS_DRAFT && !empty($conf->global->PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD)) {
-            print '<br><!-- Link to download main doc -->' . "\n";
-            print showDirectDownloadLink($object) . '<br>';
+            print '<br><!-- Link to download main doc -->'."\n";
+            print showDirectDownloadLink($object).'<br>';
         }
 
         print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 
         // List of actions on element
-        include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
+        include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
         $formactions = new FormActions($db);
         $somethingshown = $formactions->showactions($object, 'propal', $socid, 1);
 
@@ -2551,9 +2551,9 @@ 
     $modelmail = 'propal_send';
     $defaulttopic = 'SendPropalRef';
     $diroutput = $conf->propal->multidir_output[$object->entity];
-    $trackid = 'pro' . $object->id;
+    $trackid = 'pro'.$object->id;
 
-    include DOL_DOCUMENT_ROOT . '/core/tpl/card_presend.tpl.php';
+    include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
 }
 
 // End of page

Braces +126 added lines, -90 removed lines

@@ -60,10 +60,12 @@ 
 
 // Load translation files required by the page
 $langs->loadLangs(array('companies', 'propal', 'compta', 'bills', 'orders', 'products', 'deliveries', 'sendings'));
-if (!empty($conf->incoterm->enabled))
+if (!empty($conf->incoterm->enabled)) {
     $langs->load('incoterm');
-if (!empty($conf->margin->enabled))
+}
+if (!empty($conf->margin->enabled)) {
     $langs->load('margins');
+}
 
 $error = 0;
 
@@ -174,10 +176,12 @@ 
                         if ($difference != 0) {
                             $object->date_livraison = $date_delivery;
                             foreach ($object->lines as $line) {
-                                if (isset($line->date_start))
-                                    $line->date_start = $line->date_start + $difference;
-                                if (isset($line->date_end))
-                                    $line->date_end = $line->date_end + $difference;
+                                if (isset($line->date_start)) {
+                                                                    $line->date_start = $line->date_start + $difference;
+                                }
+                                if (isset($line->date_end)) {
+                                                                    $line->date_end = $line->date_end + $difference;
+                                }
                             }
                         }
                     }
@@ -273,11 +277,11 @@ 
 
         if (!$error) {
             $result = $object->set_date($user, $datep);
-            if ($result < 0)
-                dol_print_error($db, $object->error);
+            if ($result < 0) {
+                            dol_print_error($db, $object->error);
+            }
         }
-    }
-    else if ($action == 'setecheance' && $usercancreate) {
+    } else if ($action == 'setecheance' && $usercancreate) {
         $result = $object->set_echeance($user, dol_mktime(12, 0, 0, $_POST['echmonth'], $_POST['echday'], $_POST['echyear']));
         if ($result < 0) {
             dol_print_error($db, $object->error);
@@ -501,8 +505,9 @@ 
                                 }
 
                                 $tva_tx = $lines[$i]->tva_tx;
-                                if (!empty($lines[$i]->vat_src_code) && !preg_match('/\(/', $tva_tx))
-                                    $tva_tx .= ' (' . $lines[$i]->vat_src_code . ')';
+                                if (!empty($lines[$i]->vat_src_code) && !preg_match('/\(/', $tva_tx)) {
+                                                                    $tva_tx .= ' (' . $lines[$i]->vat_src_code . ')';
+                                }
 
                                 $result = $object->addline($desc, $lines[$i]->subprice, $lines[$i]->qty, $tva_tx, $lines[$i]->localtax1_tx, $lines[$i]->localtax2_tx, $lines[$i]->fk_product, $lines[$i]->remise_percent, 'HT', 0, $lines[$i]->info_bits, $product_type, $lines[$i]->rang, $lines[$i]->special_code, $fk_parent_line, $lines[$i]->fk_fournprice, $lines[$i]->pa_ht, $label, $date_start, $date_end, $array_options, $lines[$i]->fk_unit);
 
@@ -565,10 +570,12 @@ 
                         if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
                             $outputlangs = $langs;
                             $newlang = '';
-                            if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09'))
-                                $newlang = GETPOST('lang_id', 'aZ09');
-                            if ($conf->global->MAIN_MULTILANGS && empty($newlang))
-                                $newlang = $object->thirdparty->default_lang;
+                            if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
+                                                            $newlang = GETPOST('lang_id', 'aZ09');
+                            }
+                            if ($conf->global->MAIN_MULTILANGS && empty($newlang)) {
+                                                            $newlang = $object->thirdparty->default_lang;
+                            }
                             if (!empty($newlang)) {
                                 $outputlangs = new Translate("", $conf);
                                 $outputlangs->setDefaultLang($newlang);
@@ -577,14 +584,14 @@ 
 
                             $ret = $object->fetch($id); // Reload to get new records
                             $result = $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
-                            if ($result < 0)
-                                dol_print_error($db, $result);
+                            if ($result < 0) {
+                                                            dol_print_error($db, $result);
+                            }
                         }
 
                         header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $id);
                         exit();
-                    }
-                    else {
+                    } else {
                         $db->rollback();
                         $action = 'create';
                     }
@@ -848,8 +855,9 @@ 
                 // Update if prices fields are defined
                 $tva_tx = get_default_tva($mysoc, $object->thirdparty, $prod->id);
                 $tva_npr = get_default_npr($mysoc, $object->thirdparty, $prod->id);
-                if (empty($tva_tx))
-                    $tva_npr = 0;
+                if (empty($tva_tx)) {
+                                    $tva_npr = 0;
+                }
 
                 // Price unique per product
                 $pu_ht = $prod->price;
@@ -864,10 +872,12 @@ 
                     $price_min = $prod->multiprices_min[$object->thirdparty->price_level];
                     $price_base_type = $prod->multiprices_base_type[$object->thirdparty->price_level];
                     if (!empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL)) {  // using this option is a bug. kept for backward compatibility
-                        if (isset($prod->multiprices_tva_tx[$object->thirdparty->price_level]))
-                            $tva_tx = $prod->multiprices_tva_tx[$object->thirdparty->price_level];
-                        if (isset($prod->multiprices_recuperableonly[$object->thirdparty->price_level]))
-                            $tva_npr = $prod->multiprices_recuperableonly[$object->thirdparty->price_level];
+                        if (isset($prod->multiprices_tva_tx[$object->thirdparty->price_level])) {
+                                                    $tva_tx = $prod->multiprices_tva_tx[$object->thirdparty->price_level];
+                        }
+                        if (isset($prod->multiprices_recuperableonly[$object->thirdparty->price_level])) {
+                                                    $tva_npr = $prod->multiprices_recuperableonly[$object->thirdparty->price_level];
+                        }
                     }
                 }
                 // If price per customer
@@ -886,11 +896,13 @@ 
                             $pu_ttc = price($prodcustprice->lines[0]->price_ttc);
                             $price_base_type = $prodcustprice->lines[0]->price_base_type;
                             $tva_tx = ($prodcustprice->lines[0]->default_vat_code ? $prodcustprice->lines[0]->tva_tx . ' (' . $prodcustprice->lines[0]->default_vat_code . ' )' : $prodcustprice->lines[0]->tva_tx);
-                            if ($prodcustprice->lines[0]->default_vat_code && !preg_match('/\(.*\)/', $tva_tx))
-                                $tva_tx .= ' (' . $prodcustprice->lines[0]->default_vat_code . ')';
+                            if ($prodcustprice->lines[0]->default_vat_code && !preg_match('/\(.*\)/', $tva_tx)) {
+                                                            $tva_tx .= ' (' . $prodcustprice->lines[0]->default_vat_code . ')';
+                            }
                             $tva_npr = $prodcustprice->lines[0]->recuperableonly;
-                            if (empty($tva_tx))
-                                $tva_npr = 0;
+                            if (empty($tva_tx)) {
+                                                            $tva_npr = 0;
+                            }
                         }
                     }
                 }
@@ -902,8 +914,9 @@ 
 
                         // Search price into product_price_by_qty from $prod->id
                         foreach ($prod->prices_by_qty_list[0] as $priceforthequantityarray) {
-                            if ($priceforthequantityarray['rowid'] != $pqp)
-                                continue;
+                            if ($priceforthequantityarray['rowid'] != $pqp) {
+                                                            continue;
+                            }
                             // We found the price
                             if ($priceforthequantityarray['price_base_type'] == 'HT') {
                                 $pu_ht = $priceforthequantityarray['unitprice'];
@@ -923,8 +936,9 @@ 
 
                         // Search price into product_price_by_qty from $prod->id
                         foreach ($prod->prices_by_qty_list[$object->thirdparty->price_level] as $priceforthequantityarray) {
-                            if ($priceforthequantityarray['rowid'] != $pqp)
-                                continue;
+                            if ($priceforthequantityarray['rowid'] != $pqp) {
+                                                            continue;
+                            }
                             // We found the price
                             if ($priceforthequantityarray['price_base_type'] == 'HT') {
                                 $pu_ht = $priceforthequantityarray['unitprice'];
@@ -961,10 +975,12 @@ 
                 if (!empty($conf->global->MAIN_MULTILANGS) && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
                     $outputlangs = $langs;
                     $newlang = '';
-                    if (empty($newlang) && GETPOST('lang_id', 'aZ09'))
-                        $newlang = GETPOST('lang_id', 'aZ09');
-                    if (empty($newlang))
-                        $newlang = $object->thirdparty->default_lang;
+                    if (empty($newlang) && GETPOST('lang_id', 'aZ09')) {
+                                            $newlang = GETPOST('lang_id', 'aZ09');
+                    }
+                    if (empty($newlang)) {
+                                            $newlang = $object->thirdparty->default_lang;
+                    }
                     if (!empty($newlang)) {
                         $outputlangs = new Translate("", $conf);
                         $outputlangs->setDefaultLang($newlang);
@@ -1327,8 +1343,9 @@ 
                 $error++;
             }
         }
-        if ($error)
-            $action = 'edit_extras';
+        if ($error) {
+                    $action = 'edit_extras';
+        }
     }
 
     if (!empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $usercancreate) {
@@ -1406,8 +1423,9 @@ 
     print load_fiche_titre($langs->trans("NewProp"));
 
     $soc = new Societe($db);
-    if ($socid > 0)
-        $res = $soc->fetch($socid);
+    if ($socid > 0) {
+            $res = $soc->fetch($socid);
+    }
 
     // Load objectsrc
     if (!empty($origin) && !empty($originid)) {
@@ -1463,16 +1481,18 @@ 
             $object->array_options = $objectsrc->array_options;
 
             if (!empty($conf->multicurrency->enabled)) {
-                if (!empty($objectsrc->multicurrency_code))
-                    $currency_code = $objectsrc->multicurrency_code;
-                if (!empty($conf->global->MULTICURRENCY_USE_ORIGIN_TX) && !empty($objectsrc->multicurrency_tx))
-                    $currency_tx = $objectsrc->multicurrency_tx;
+                if (!empty($objectsrc->multicurrency_code)) {
+                                    $currency_code = $objectsrc->multicurrency_code;
+                }
+                if (!empty($conf->global->MULTICURRENCY_USE_ORIGIN_TX) && !empty($objectsrc->multicurrency_tx)) {
+                                    $currency_tx = $objectsrc->multicurrency_tx;
+                }
             }
         }
-    }
-    else {
-        if (!empty($conf->multicurrency->enabled) && !empty($soc->multicurrency_code))
-            $currency_code = $soc->multicurrency_code;
+    } else {
+        if (!empty($conf->multicurrency->enabled) && !empty($soc->multicurrency_code)) {
+                    $currency_code = $soc->multicurrency_code;
+        }
     }
 
     $object = new Propal($db);
@@ -1686,14 +1706,15 @@ 
         print '<input type="hidden" name="originid"       value="' . $objectsrc->id . '">';
 
         $newclassname = $classname;
-        if ($newclassname == 'Propal')
-            $newclassname = 'CommercialProposal';
-        elseif ($newclassname == 'Commande')
-            $newclassname = 'Order';
-        elseif ($newclassname == 'Expedition')
-            $newclassname = 'Sending';
-        elseif ($newclassname == 'Fichinter')
-            $newclassname = 'Intervention';
+        if ($newclassname == 'Propal') {
+                    $newclassname = 'CommercialProposal';
+        } elseif ($newclassname == 'Commande') {
+                    $newclassname = 'Order';
+        } elseif ($newclassname == 'Expedition') {
+                    $newclassname = 'Sending';
+        } elseif ($newclassname == 'Fichinter') {
+                    $newclassname = 'Intervention';
+        }
 
         print '<tr><td>' . $langs->trans($newclassname) . '</td><td>' . $objectsrc->getNomUrl(1) . '</td></tr>';
         print '<tr><td>' . $langs->trans('TotalHT') . '</td><td>' . price($objectsrc->total_ht, 0, $langs, 1, -1, -1, $conf->currency) . '</td></tr>';
@@ -1715,8 +1736,9 @@ 
      * Combobox pour la fonction de copie
      */
 
-    if (empty($conf->global->PROPAL_CLONE_ON_CREATE_PAGE))
-        print '<input type="hidden" name="createmode" value="empty">';
+    if (empty($conf->global->PROPAL_CLONE_ON_CREATE_PAGE)) {
+            print '<input type="hidden" name="createmode" value="empty">';
+    }
 
     if (!empty($conf->global->PROPAL_CLONE_ON_CREATE_PAGE)) {
         print '<br><table>';
@@ -1757,8 +1779,9 @@ 
         print '<td valign="top" colspan="2">' . $langs->trans("CreateEmptyPropal") . '</td></tr>';
     }
 
-    if (!empty($conf->global->PROPAL_CLONE_ON_CREATE_PAGE))
-        print '</table>';
+    if (!empty($conf->global->PROPAL_CLONE_ON_CREATE_PAGE)) {
+            print '</table>';
+    }
 
     dol_fiche_end();
 
@@ -1871,17 +1894,19 @@ 
             $text .= $notify->confirmMessage('PROPAL_VALIDATE', $object->socid, $object);
         }
 
-        if (!$error)
-            $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('ValidateProp'), $text, 'confirm_validate', '', 0, 1);
+        if (!$error) {
+                    $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('ValidateProp'), $text, 'confirm_validate', '', 0, 1);
+        }
     }
 
     // Call Hook formConfirm
     $parameters = array('lineid' => $lineid);
     $reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-    if (empty($reshook))
-        $formconfirm .= $hookmanager->resPrint;
-    elseif ($reshook > 0)
-        $formconfirm = $hookmanager->resPrint;
+    if (empty($reshook)) {
+            $formconfirm .= $hookmanager->resPrint;
+    } elseif ($reshook > 0) {
+            $formconfirm = $hookmanager->resPrint;
+    }
 
     // Print form confirm
     print $formconfirm;
@@ -1897,9 +1922,10 @@ 
     $morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, $usercancreate, 'string', '', null, null, '', 1);
     // Thirdparty
     $morehtmlref .= '<br>' . $langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1, 'customer');
-    if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0)
-        // $morehtmlref .= ' (<a href="' . DOL_URL_ROOT . '/comm/propal/list.php?socid=' . $object->thirdparty->id . '&search_societe=' . urlencode($object->thirdparty->name) . '">' . $langs->trans("OtherProposals") . '</a>)';
+    if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) {
+            // $morehtmlref .= ' (<a href="' . DOL_URL_ROOT . '/comm/propal/list.php?socid=' . $object->thirdparty->id . '&search_societe=' . urlencode($object->thirdparty->name) . '">' . $langs->trans("OtherProposals") . '</a>)';
         $morehtmlref .= ' (<a href = "' . BASE_URI . '?controller=comm/propal&method=list&socid=' . $object->thirdparty->id . '&search_societe=' . urlencode($object->thirdparty->name) . '">' . $langs->trans("OtherProposals") . '</a>)';
+    }
     // Project
     if (!empty($conf->projet->enabled)) {
         $langs->load("projects");
@@ -1975,9 +2001,10 @@ 
     print '<table class="nobordernopadding" width="100%"><tr><td>';
     print $langs->trans('Date');
     print '</td>';
-    if ($action != 'editdate' && !empty($object->brouillon) && $usercancreate)
-        // print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editdate&amp;id=' . $object->id . '">' . img_edit($langs->trans('SetDate'), 1) . '</a></td>';
+    if ($action != 'editdate' && !empty($object->brouillon) && $usercancreate) {
+            // print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editdate&amp;id=' . $object->id . '">' . img_edit($langs->trans('SetDate'), 1) . '</a></td>';
         print '<td align="right"><a href = "' . BASE_URI . '?controller=comm/propal&method=card&action=editdate&amp;id=' . $object->id . '">' . img_edit($langs->trans('SetDate'), 1) . '</a></td>';
+    }
     print '</tr></table>';
     print '</td><td>';
     if (!empty($object->brouillon) && $action == 'editdate' && $usercancreate) {
@@ -2002,9 +2029,10 @@ 
     print '<table class="nobordernopadding" width="100%"><tr><td>';
     print $langs->trans('DateEndPropal');
     print '</td>';
-    if ($action != 'editecheance' && !empty($object->brouillon) && $usercancreate)
-        // print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editecheance&amp;id=' . $object->id . '">' . img_edit($langs->trans('SetConditions'), 1) . '</a></td>';
+    if ($action != 'editecheance' && !empty($object->brouillon) && $usercancreate) {
+            // print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editecheance&amp;id=' . $object->id . '">' . img_edit($langs->trans('SetConditions'), 1) . '</a></td>';
         print '<td align="right"><a href = "' . BASE_URI . '?controller=comm/propal&method=card&action=editecheance&amp;id=' . $object->id . '">' . img_edit($langs->trans('SetConditions'), 1) . '</a></td>';
+    }
     print '</tr></table>';
     print '</td><td>';
     if (!empty($object->brouillon) && $action == 'editecheance' && $usercancreate) {
@@ -2018,8 +2046,9 @@ 
     } else {
         if (!empty($object->fin_validite)) {
             print dol_print_date($object->fin_validite, 'day');
-            if ($object->statut == Propal::STATUS_VALIDATED && $object->fin_validite < ($now - $conf->propal->cloture->warning_delay))
-                print img_warning($langs->trans("Late"));
+            if ($object->statut == Propal::STATUS_VALIDATED && $object->fin_validite < ($now - $conf->propal->cloture->warning_delay)) {
+                            print img_warning($langs->trans("Late"));
+            }
         } else {
             print '&nbsp;';
         }
@@ -2032,9 +2061,10 @@ 
     print '<table class="nobordernopadding" width="100%"><tr><td>';
     print $langs->trans('PaymentConditionsShort');
     print '</td>';
-    if ($action != 'editconditions' && !empty($object->brouillon) && $usercancreate)
-        // print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editconditions&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetConditions'), 1) . '</a></td>';
+    if ($action != 'editconditions' && !empty($object->brouillon) && $usercancreate) {
+            // print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editconditions&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetConditions'), 1) . '</a></td>';
         print '<td align="right"><a href = "' . BASE_URI . '?controller=comm/propal&method=card&action=editconditions&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetConditions'), 1) . '</a></td>';
+    }
     print '</tr></table>';
     print '</td><td>';
     if (!empty($object->brouillon) && $action == 'editconditions' && $usercancreate) {
@@ -2058,12 +2088,14 @@ 
     print '<tr class="fielddeliverydelay"><td>';
     print '<table class="nobordernopadding" width="100%"><tr><td>';
     print $langs->trans('AvailabilityPeriod');
-    if (!empty($conf->commande->enabled))
-        print ' (' . $langs->trans('AfterOrder') . ')';
+    if (!empty($conf->commande->enabled)) {
+            print ' (' . $langs->trans('AfterOrder') . ')';
+    }
     print '</td>';
-    if ($action != 'editavailability' && !empty($object->brouillon) && $usercancreate)
-        // print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editavailability&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetAvailability'), 1) . '</a></td>';
+    if ($action != 'editavailability' && !empty($object->brouillon) && $usercancreate) {
+            // print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editavailability&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetAvailability'), 1) . '</a></td>';
         print '<td align="right"><a href = "' . BASE_URI . '?controller=comm/propal&method=card&action=editavailability&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetAvailability'), 1) . '</a></td>';
+    }
     print '</tr></table>';
     print '</td><td>';
     if (!empty($object->brouillon) && $action == 'editavailability' && $usercancreate) {
@@ -2362,8 +2394,9 @@ 
     print '<div class="div-table-responsive-no-min">';
     print '<table id="tablelines" class="noborder noshadow" width="100%">';
 
-    if (!empty($object->lines))
-        $ret = $object->printObjectLines($action, $mysoc, $soc, $lineid, 1);
+    if (!empty($object->lines)) {
+            $ret = $object->printObjectLines($action, $mysoc, $soc, $lineid, 1);
+    }
 
     // Form to add new line
     if ($object->statut == Propal::STATUS_DRAFT && $usercancreate && $action != 'selectlines') {
@@ -2399,8 +2432,9 @@ 
                     if ($usercanvalidate) {
                         // print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=validate">' . $langs->trans('Validate') . '</a></div>';
                         print '<div class="inline-block divButAction"><a class="butAction" href = "' . BASE_URI . '?controller=comm/propal&method=card&id=' . $object->id . '&amp;action=validate">' . $langs->trans('Validate') . '</a></div>';
-                    } else
-                        print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">' . $langs->trans('Validate') . '</a></div>';
+                    } else {
+                                            print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">' . $langs->trans('Validate') . '</a></div>';
+                    }
                 }
                 // Create event
                 /* if ($conf->agenda->enabled && ! empty($conf->global->MAIN_ADD_EVENT_ON_ELEMENT_CARD)) 	// Add hidden condition because this is not a "workflow" action so should appears somewhere else on page.
@@ -2425,8 +2459,9 @@ 
                     if ($usercansend) {
                         // print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=presend&mode=init#formmailbeforetitle">' . $langs->trans('SendMail') . '</a></div>';
                         print '<div class="inline-block divButAction"><a class="butAction" href = "' . BASE_URI . '?controller=comm/propal&method=card&id=' . $object->id . '&action=presend&mode=init#formmailbeforetitle">' . $langs->trans('SendMail') . '</a></div>';
-                    } else
-                        print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">' . $langs->trans('SendMail') . '</a></div>';
+                    } else {
+                                            print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">' . $langs->trans('SendMail') . '</a></div>';
+                    }
                 }
 
                 // Create an order
@@ -2496,8 +2531,9 @@ 
     }
 
     //Select mail models is same action as presend
-    if (GETPOST('modelselected'))
-        $action = 'presend';
+    if (GETPOST('modelselected')) {
+            $action = 'presend';
+    }
 
     if ($action != 'presend') {
         print '<div class="fichecenter"><div class="fichehalfleft">';

dolibarr/htdocs/comm/propal/class/propal.class.php

Spacing +377 added lines, -377 removed lines

@@ -36,12 +36,12 @@ 
  * 	\file       htdocs/comm/propal/class/propal.class.php
  * 	\brief      File of class to manage proposals
  */
-require_once DOL_DOCUMENT_ROOT . '/core/class/commonobject.class.php';
-require_once DOL_DOCUMENT_ROOT . "/core/class/commonobjectline.class.php";
-require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
-require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';
-require_once DOL_DOCUMENT_ROOT . '/margin/lib/margins.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/multicurrency/class/multicurrency.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
+require_once DOL_DOCUMENT_ROOT."/core/class/commonobjectline.class.php";
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+require_once DOL_DOCUMENT_ROOT.'/margin/lib/margins.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';
 
 /**
  * 	Class to manage proposals
@@ -227,7 +227,7 @@ 
     /**
      * Billed or processed quote
      */
-    const STATUS_BILLED = 4;   // Todo rename into STATUS_CLOSE
+    const STATUS_BILLED = 4; // Todo rename into STATUS_CLOSE
 
 
     /**
@@ -272,7 +272,7 @@ 
         if (!$qty)
             $qty = 1;
 
-        dol_syslog(get_class($this) . "::add_product $idproduct, $qty, $remise_percent");
+        dol_syslog(get_class($this)."::add_product $idproduct, $qty, $remise_percent");
         if ($idproduct > 0) {
             $prod = new Product($this->db);
             $prod->fetch($idproduct);
@@ -283,7 +283,7 @@ 
             $tva_npr = get_default_npr($mysoc, $this->thirdparty, $prod->id);
             if (empty($tva_tx))
                 $tva_npr = 0;
-            $vat_src_code = '';     // May be defined into tva_tx
+            $vat_src_code = ''; // May be defined into tva_tx
 
             $localtax1_tx = get_localtax($tva_tx, 1, $mysoc, $this->thirdparty, $tva_npr);
             $localtax2_tx = get_localtax($tva_tx, 2, $mysoc, $this->thirdparty, $tva_npr);
@@ -324,8 +324,8 @@ 
         // phpcs:enable
         global $langs;
 
-        include_once DOL_DOCUMENT_ROOT . '/core/lib/price.lib.php';
-        include_once DOL_DOCUMENT_ROOT . '/core/class/discount.class.php';
+        include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
+        include_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
 
         $this->db->begin();
 
@@ -345,11 +345,11 @@ 
 
             $line->fk_propal = $this->id;
             $line->fk_remise_except = $remise->id;
-            $line->desc = $remise->description;    // Description ligne
+            $line->desc = $remise->description; // Description ligne
             $line->vat_src_code = $remise->vat_src_code;
             $line->tva_tx = $remise->tva_tx;
             $line->subprice = -$remise->amount_ht;
-            $line->fk_product = 0;     // Id produit predefined
+            $line->fk_product = 0; // Id produit predefined
             $line->qty = 1;
             $line->remise = 0;
             $line->remise_percent = 0;
@@ -424,9 +424,9 @@ 
     {
         global $mysoc, $conf, $langs;
 
-        dol_syslog(get_class($this) . "::addline propalid=$this->id, desc=$desc, pu_ht=$pu_ht, qty=$qty, txtva=$txtva, fk_product=$fk_product, remise_except=$remise_percent, price_base_type=$price_base_type, pu_ttc=$pu_ttc, info_bits=$info_bits, type=$type, fk_remise_except=" . $fk_remise_except);
+        dol_syslog(get_class($this)."::addline propalid=$this->id, desc=$desc, pu_ht=$pu_ht, qty=$qty, txtva=$txtva, fk_product=$fk_product, remise_except=$remise_percent, price_base_type=$price_base_type, pu_ttc=$pu_ttc, info_bits=$info_bits, type=$type, fk_remise_except=".$fk_remise_except);
         if ($this->statut == self::STATUS_DRAFT) {
-            include_once DOL_DOCUMENT_ROOT . '/core/lib/price.lib.php';
+            include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
             // Clean parameters
             if (empty($remise_percent))
@@ -446,7 +446,7 @@ 
             $pu_ht_devise = price2num($pu_ht_devise);
             $pu_ttc = price2num($pu_ttc);
             if (!preg_match('/\((.*)\)/', $txtva)) {
-                $txtva = price2num($txtva);               // $txtva can have format '5,1' or '5.1' or '5.1(XXX)', we must clean only if '5,1'
+                $txtva = price2num($txtva); // $txtva can have format '5,1' or '5.1' or '5.1(XXX)', we must clean only if '5,1'
             }
             $txlocaltax1 = price2num($txlocaltax1);
             $txlocaltax2 = price2num($txlocaltax2);
@@ -488,7 +488,7 @@ 
             $vat_src_code = '';
             if (preg_match('/\((.*)\)/', $txtva, $reg)) {
                 $vat_src_code = $reg[1];
-                $txtva = preg_replace('/\s*\(.*\)/', '', $txtva);    // Remove code into vatrate.
+                $txtva = preg_replace('/\s*\(.*\)/', '', $txtva); // Remove code into vatrate.
             }
 
             $tabprice = calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $product_type, $mysoc, $localtaxes_type, 100, $this->multicurrency_tx, $pu_ht_devise);
@@ -607,7 +607,7 @@ 
                 return -2;
             }
         } else {
-            dol_syslog(get_class($this) . "::addline status of order must be Draft to allow use of ->addline()", LOG_ERR);
+            dol_syslog(get_class($this)."::addline status of order must be Draft to allow use of ->addline()", LOG_ERR);
             return -3;
         }
     }
@@ -644,9 +644,9 @@ 
     {
         global $mysoc;
 
-        dol_syslog(get_class($this) . "::updateLine rowid=$rowid, pu=$pu, qty=$qty, remise_percent=$remise_percent,
+        dol_syslog(get_class($this)."::updateLine rowid=$rowid, pu=$pu, qty=$qty, remise_percent=$remise_percent,
         txtva=$txtva, desc=$desc, price_base_type=$price_base_type, info_bits=$info_bits, special_code=$special_code, fk_parent_line=$fk_parent_line, pa_ht=$pa_ht, type=$type, date_start=$date_start, date_end=$date_end");
-        include_once DOL_DOCUMENT_ROOT . '/core/lib/price.lib.php';
+        include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
         // Clean parameters
         $remise_percent = price2num($remise_percent);
@@ -658,9 +658,9 @@ 
         $txlocaltax2 = price2num($txlocaltax2);
         $pa_ht = price2num($pa_ht);
         if (empty($qty) && empty($special_code))
-            $special_code = 3;    // Set option tag
+            $special_code = 3; // Set option tag
         if (!empty($qty) && $special_code == 3)
-            $special_code = 0;    // Remove option tag
+            $special_code = 0; // Remove option tag
         if (empty($type))
             $type = 0;
 
@@ -678,7 +678,7 @@ 
             $vat_src_code = '';
             if (preg_match('/\((.*)\)/', $txtva, $reg)) {
                 $vat_src_code = $reg[1];
-                $txtva = preg_replace('/\s*\(.*\)/', '', $txtva);    // Remove code into vatrate.
+                $txtva = preg_replace('/\s*\(.*\)/', '', $txtva); // Remove code into vatrate.
             }
 
             $tabprice = calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $mysoc, $localtaxes_type, 100, $this->multicurrency_tx, $pu_ht_devise);
@@ -788,7 +788,7 @@ 
                 return -1;
             }
         } else {
-            dol_syslog(get_class($this) . "::updateline Erreur -2 Propal en mode incompatible pour cette action");
+            dol_syslog(get_class($this)."::updateline Erreur -2 Propal en mode incompatible pour cette action");
             return -2;
         }
     }
@@ -863,13 +863,13 @@ 
             $this->multicurrency_tx = 1;
         }
 
-        dol_syslog(get_class($this) . "::create");
+        dol_syslog(get_class($this)."::create");
 
         // Check parameters
         $result = $this->fetch_thirdparty();
         if ($result < 0) {
             $this->error = "Failed to fetch company";
-            dol_syslog(get_class($this) . "::create " . $this->error, LOG_ERR);
+            dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
             return -3;
         }
 
@@ -878,7 +878,7 @@ 
             $result = self::isExistingObject($this->element, 0, $this->ref); // Check ref is not yet used
             if ($result > 0) {
                 $this->error = 'ErrorRefAlreadyExists';
-                dol_syslog(get_class($this) . "::create " . $this->error, LOG_WARNING);
+                dol_syslog(get_class($this)."::create ".$this->error, LOG_WARNING);
                 $this->db->rollback();
                 return -1;
             }
@@ -886,7 +886,7 @@ 
 
         if (empty($this->date)) {
             $this->error = "Date of proposal is required";
-            dol_syslog(get_class($this) . "::create " . $this->error, LOG_ERR);
+            dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
             return -4;
         }
 
@@ -894,7 +894,7 @@ 
         $this->db->begin();
 
         // Insert into database
-        $sql = "INSERT INTO " . MAIN_DB_PREFIX . "propal (";
+        $sql = "INSERT INTO ".MAIN_DB_PREFIX."propal (";
         $sql .= "fk_soc";
         $sql .= ", price";
         $sql .= ", remise";
@@ -929,46 +929,46 @@ 
         $sql .= " VALUES (";
         $sql .= $this->socid;
         $sql .= ", 0";
-        $sql .= ", " . $this->remise;
-        $sql .= ", " . ($this->remise_percent ? $this->db->escape($this->remise_percent) : 'NULL');
-        $sql .= ", " . ($this->remise_absolue ? $this->db->escape($this->remise_absolue) : 'NULL');
+        $sql .= ", ".$this->remise;
+        $sql .= ", ".($this->remise_percent ? $this->db->escape($this->remise_percent) : 'NULL');
+        $sql .= ", ".($this->remise_absolue ? $this->db->escape($this->remise_absolue) : 'NULL');
         $sql .= ", 0";
         $sql .= ", 0";
-        $sql .= ", '" . $this->db->idate($this->date) . "'";
-        $sql .= ", '" . $this->db->idate($now) . "'";
+        $sql .= ", '".$this->db->idate($this->date)."'";
+        $sql .= ", '".$this->db->idate($now)."'";
         $sql .= ", '(PROV)'";
-        $sql .= ", " . ($user->id > 0 ? "'" . $user->id . "'" : "NULL");
-        $sql .= ", '" . $this->db->escape($this->note_private) . "'";
-        $sql .= ", '" . $this->db->escape($this->note_public) . "'";
-        $sql .= ", '" . $this->db->escape($this->modelpdf) . "'";
-        $sql .= ", " . ($this->fin_validite != '' ? "'" . $this->db->idate($this->fin_validite) . "'" : "NULL");
-        $sql .= ", " . ($this->cond_reglement_id > 0 ? $this->cond_reglement_id : 'NULL');
-        $sql .= ", " . ($this->mode_reglement_id > 0 ? $this->mode_reglement_id : 'NULL');
-        $sql .= ", " . ($this->fk_account > 0 ? $this->fk_account : 'NULL');
-        $sql .= ", '" . $this->db->escape($this->ref_client) . "'";
-        $sql .= ", " . ($this->date_livraison != '' ? "'" . $this->db->idate($this->date_livraison) . "'" : "NULL");
-        $sql .= ", " . ($this->shipping_method_id > 0 ? $this->shipping_method_id : 'NULL');
-        $sql .= ", " . $this->availability_id;
-        $sql .= ", " . $this->demand_reason_id;
-        $sql .= ", " . ($this->fk_project ? $this->fk_project : "null");
-        $sql .= ", " . (int) $this->fk_incoterms;
-        $sql .= ", '" . $this->db->escape($this->location_incoterms) . "'";
-        $sql .= ", " . $this->entity;
-        $sql .= ", " . (int) $this->fk_multicurrency;
-        $sql .= ", '" . $this->db->escape($this->multicurrency_code) . "'";
-        $sql .= ", " . (double) $this->multicurrency_tx;
+        $sql .= ", ".($user->id > 0 ? "'".$user->id."'" : "NULL");
+        $sql .= ", '".$this->db->escape($this->note_private)."'";
+        $sql .= ", '".$this->db->escape($this->note_public)."'";
+        $sql .= ", '".$this->db->escape($this->modelpdf)."'";
+        $sql .= ", ".($this->fin_validite != '' ? "'".$this->db->idate($this->fin_validite)."'" : "NULL");
+        $sql .= ", ".($this->cond_reglement_id > 0 ? $this->cond_reglement_id : 'NULL');
+        $sql .= ", ".($this->mode_reglement_id > 0 ? $this->mode_reglement_id : 'NULL');
+        $sql .= ", ".($this->fk_account > 0 ? $this->fk_account : 'NULL');
+        $sql .= ", '".$this->db->escape($this->ref_client)."'";
+        $sql .= ", ".($this->date_livraison != '' ? "'".$this->db->idate($this->date_livraison)."'" : "NULL");
+        $sql .= ", ".($this->shipping_method_id > 0 ? $this->shipping_method_id : 'NULL');
+        $sql .= ", ".$this->availability_id;
+        $sql .= ", ".$this->demand_reason_id;
+        $sql .= ", ".($this->fk_project ? $this->fk_project : "null");
+        $sql .= ", ".(int) $this->fk_incoterms;
+        $sql .= ", '".$this->db->escape($this->location_incoterms)."'";
+        $sql .= ", ".$this->entity;
+        $sql .= ", ".(int) $this->fk_multicurrency;
+        $sql .= ", '".$this->db->escape($this->multicurrency_code)."'";
+        $sql .= ", ".(double) $this->multicurrency_tx;
         $sql .= ")";
 
-        dol_syslog(get_class($this) . "::create", LOG_DEBUG);
+        dol_syslog(get_class($this)."::create", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql) {
-            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . "propal");
+            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."propal");
 
             if ($this->id) {
-                $this->ref = '(PROV' . $this->id . ')';
-                $sql = 'UPDATE ' . MAIN_DB_PREFIX . "propal SET ref='" . $this->db->escape($this->ref) . "' WHERE rowid=" . $this->id;
+                $this->ref = '(PROV'.$this->id.')';
+                $sql = 'UPDATE '.MAIN_DB_PREFIX."propal SET ref='".$this->db->escape($this->ref)."' WHERE rowid=".$this->id;
 
-                dol_syslog(get_class($this) . "::create", LOG_DEBUG);
+                dol_syslog(get_class($this)."::create", LOG_DEBUG);
                 $resql = $this->db->query($sql);
                 if (!$resql)
                     $error++;
@@ -1028,7 +1028,7 @@ 
                         // Complete vat rate with code
                         $vatrate = $line->tva_tx;
                         if ($line->vat_src_code && !preg_match('/\(.*\)/', $vatrate))
-                            $vatrate .= ' (' . $line->vat_src_code . ')';
+                            $vatrate .= ' ('.$line->vat_src_code.')';
 
                         $result = $this->addline(
                             $line->desc, $line->subprice, $line->qty, $vatrate, $line->localtax1_tx, $line->localtax2_tx, $line->fk_product, $line->remise_percent, 'HT', 0, $line->info_bits, $line->product_type, $line->rang, $line->special_code, $fk_parent_line, $line->fk_fournprice, $line->pa_ht, $line->label, $line->date_start, $line->date_end, $line->array_options, $line->fk_unit, $this->element, $line->id
@@ -1049,10 +1049,10 @@ 
 
                 // Set delivery address
                 if (!$error && $this->fk_delivery_address) {
-                    $sql = "UPDATE " . MAIN_DB_PREFIX . "propal";
-                    $sql .= " SET fk_delivery_address = " . $this->fk_delivery_address;
-                    $sql .= " WHERE ref = '" . $this->db->escape($this->ref) . "'";
-                    $sql .= " AND entity = " . $conf->entity;
+                    $sql = "UPDATE ".MAIN_DB_PREFIX."propal";
+                    $sql .= " SET fk_delivery_address = ".$this->fk_delivery_address;
+                    $sql .= " WHERE ref = '".$this->db->escape($this->ref)."'";
+                    $sql .= " AND entity = ".$conf->entity;
 
                     $result = $this->db->query($sql);
                 }
@@ -1093,7 +1093,7 @@ 
 
             if (!$error) {
                 $this->db->commit();
-                dol_syslog(get_class($this) . "::create done id=" . $this->id);
+                dol_syslog(get_class($this)."::create done id=".$this->id);
                 return $this->id;
             } else {
                 $this->db->rollback();
@@ -1169,7 +1169,7 @@ 
                   $clonedObj->fk_project = '';
                   }
                   } */
-                $clonedObj->fk_project = '';    // A cloned proposal is set by default to no project.
+                $clonedObj->fk_project = ''; // A cloned proposal is set by default to no project.
             }
 
             // reset ref_client
@@ -1188,7 +1188,7 @@ 
         $clonedObj->user_author = $user->id;
         $clonedObj->user_valid = '';
         $clonedObj->date = $now;
-        $clonedObj->datep = $now;    // deprecated
+        $clonedObj->datep = $now; // deprecated
         $clonedObj->fin_validite = $clonedObj->date + ($clonedObj->duree_validite * 24 * 3600);
         if (empty($conf->global->MAIN_KEEP_REF_CUSTOMER_ON_CLONING))
             $clonedObj->ref_client = '';
@@ -1214,7 +1214,7 @@ 
             if (is_object($hookmanager)) {
                 $parameters = array('objFrom' => $this, 'clonedObj' => $clonedObj);
                 $action = '';
-                $reshook = $hookmanager->executeHooks('createFrom', $parameters, $clonedObj, $action);    // Note that $action and $object may have been modified by some hooks
+                $reshook = $hookmanager->executeHooks('createFrom', $parameters, $clonedObj, $action); // Note that $action and $object may have been modified by some hooks
                 if ($reshook < 0)
                     $error++;
             }
@@ -1269,21 +1269,21 @@ 
         $sql .= ", dr.code as demand_reason_code, dr.label as demand_reason";
         $sql .= ", cr.code as cond_reglement_code, cr.libelle as cond_reglement, cr.libelle_facture as cond_reglement_libelle_doc";
         $sql .= ", cp.code as mode_reglement_code, cp.libelle as mode_reglement";
-        $sql .= " FROM " . MAIN_DB_PREFIX . "propal as p";
-        $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'c_propalst as c ON p.fk_statut = c.id';
-        $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'c_paiement as cp ON p.fk_mode_reglement = cp.id AND cp.entity IN (' . getEntity('c_paiement') . ')';
-        $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'c_payment_term as cr ON p.fk_cond_reglement = cr.rowid AND cr.entity IN (' . getEntity('c_payment_term') . ')';
-        $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'c_availability as ca ON p.fk_availability = ca.rowid';
-        $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'c_input_reason as dr ON p.fk_input_reason = dr.rowid';
-        $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'c_incoterms as i ON p.fk_incoterms = i.rowid';
+        $sql .= " FROM ".MAIN_DB_PREFIX."propal as p";
+        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_propalst as c ON p.fk_statut = c.id';
+        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as cp ON p.fk_mode_reglement = cp.id AND cp.entity IN ('.getEntity('c_paiement').')';
+        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_payment_term as cr ON p.fk_cond_reglement = cr.rowid AND cr.entity IN ('.getEntity('c_payment_term').')';
+        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_availability as ca ON p.fk_availability = ca.rowid';
+        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_input_reason as dr ON p.fk_input_reason = dr.rowid';
+        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON p.fk_incoterms = i.rowid';
 
         if ($ref) {
-            $sql .= " WHERE p.entity IN (" . getEntity('propal') . ")"; // Dont't use entity if you use rowid
-            $sql .= " AND p.ref='" . $this->db->escape($ref) . "'";
+            $sql .= " WHERE p.entity IN (".getEntity('propal').")"; // Dont't use entity if you use rowid
+            $sql .= " AND p.ref='".$this->db->escape($ref)."'";
         } else
-            $sql .= " WHERE p.rowid=" . $rowid;
+            $sql .= " WHERE p.rowid=".$rowid;
 
-        dol_syslog(get_class($this) . "::fetch", LOG_DEBUG);
+        dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql) {
             if ($this->db->num_rows($resql)) {
@@ -1319,7 +1319,7 @@ 
                 $this->date_validation = $this->db->jdate($obj->datev); //Validation date
                 $this->date_modification = $this->db->jdate($obj->date_modification); // tms
                 $this->date = $this->db->jdate($obj->dp); // Proposal date
-                $this->datep = $this->db->jdate($obj->dp);    // deprecated
+                $this->datep = $this->db->jdate($obj->dp); // deprecated
                 $this->fin_validite = $this->db->jdate($obj->dfv);
                 $this->date_livraison = $this->db->jdate($obj->date_livraison);
                 $this->shipping_method_id = ($obj->fk_shipping_method > 0) ? $obj->fk_shipping_method : null;
@@ -1420,39 +1420,39 @@ 
         // Check parameters
         // Put here code to add control on parameters values
         // Update request
-        $sql = "UPDATE " . MAIN_DB_PREFIX . "propal SET";
-
-        $sql .= " ref=" . (isset($this->ref) ? "'" . $this->db->escape($this->ref) . "'" : "null") . ",";
-        $sql .= " ref_client=" . (isset($this->ref_client) ? "'" . $this->db->escape($this->ref_client) . "'" : "null") . ",";
-        $sql .= " ref_ext=" . (isset($this->ref_ext) ? "'" . $this->db->escape($this->ref_ext) . "'" : "null") . ",";
-        $sql .= " fk_soc=" . (isset($this->socid) ? $this->socid : "null") . ",";
-        $sql .= " datep=" . (strval($this->datep) != '' ? "'" . $this->db->idate($this->datep) . "'" : 'null') . ",";
-        $sql .= " date_valid=" . (strval($this->date_validation) != '' ? "'" . $this->db->idate($this->date_validation) . "'" : 'null') . ",";
-        $sql .= " tva=" . (isset($this->total_tva) ? $this->total_tva : "null") . ",";
-        $sql .= " localtax1=" . (isset($this->total_localtax1) ? $this->total_localtax1 : "null") . ",";
-        $sql .= " localtax2=" . (isset($this->total_localtax2) ? $this->total_localtax2 : "null") . ",";
-        $sql .= " total_ht=" . (isset($this->total_ht) ? $this->total_ht : "null") . ",";
-        $sql .= " total=" . (isset($this->total_ttc) ? $this->total_ttc : "null") . ",";
-        $sql .= " fk_statut=" . (isset($this->statut) ? $this->statut : "null") . ",";
-        $sql .= " fk_user_author=" . (isset($this->user_author_id) ? $this->user_author_id : "null") . ",";
-        $sql .= " fk_user_valid=" . (isset($this->user_valid) ? $this->user_valid : "null") . ",";
-        $sql .= " fk_projet=" . (isset($this->fk_project) ? $this->fk_project : "null") . ",";
-        $sql .= " fk_cond_reglement=" . (isset($this->cond_reglement_id) ? $this->cond_reglement_id : "null") . ",";
-        $sql .= " fk_mode_reglement=" . (isset($this->mode_reglement_id) ? $this->mode_reglement_id : "null") . ",";
-        $sql .= " note_private=" . (isset($this->note_private) ? "'" . $this->db->escape($this->note_private) . "'" : "null") . ",";
-        $sql .= " note_public=" . (isset($this->note_public) ? "'" . $this->db->escape($this->note_public) . "'" : "null") . ",";
-        $sql .= " model_pdf=" . (isset($this->modelpdf) ? "'" . $this->db->escape($this->modelpdf) . "'" : "null") . ",";
-        $sql .= " import_key=" . (isset($this->import_key) ? "'" . $this->db->escape($this->import_key) . "'" : "null") . "";
-
-        $sql .= " WHERE rowid=" . $this->id;
+        $sql = "UPDATE ".MAIN_DB_PREFIX."propal SET";
+
+        $sql .= " ref=".(isset($this->ref) ? "'".$this->db->escape($this->ref)."'" : "null").",";
+        $sql .= " ref_client=".(isset($this->ref_client) ? "'".$this->db->escape($this->ref_client)."'" : "null").",";
+        $sql .= " ref_ext=".(isset($this->ref_ext) ? "'".$this->db->escape($this->ref_ext)."'" : "null").",";
+        $sql .= " fk_soc=".(isset($this->socid) ? $this->socid : "null").",";
+        $sql .= " datep=".(strval($this->datep) != '' ? "'".$this->db->idate($this->datep)."'" : 'null').",";
+        $sql .= " date_valid=".(strval($this->date_validation) != '' ? "'".$this->db->idate($this->date_validation)."'" : 'null').",";
+        $sql .= " tva=".(isset($this->total_tva) ? $this->total_tva : "null").",";
+        $sql .= " localtax1=".(isset($this->total_localtax1) ? $this->total_localtax1 : "null").",";
+        $sql .= " localtax2=".(isset($this->total_localtax2) ? $this->total_localtax2 : "null").",";
+        $sql .= " total_ht=".(isset($this->total_ht) ? $this->total_ht : "null").",";
+        $sql .= " total=".(isset($this->total_ttc) ? $this->total_ttc : "null").",";
+        $sql .= " fk_statut=".(isset($this->statut) ? $this->statut : "null").",";
+        $sql .= " fk_user_author=".(isset($this->user_author_id) ? $this->user_author_id : "null").",";
+        $sql .= " fk_user_valid=".(isset($this->user_valid) ? $this->user_valid : "null").",";
+        $sql .= " fk_projet=".(isset($this->fk_project) ? $this->fk_project : "null").",";
+        $sql .= " fk_cond_reglement=".(isset($this->cond_reglement_id) ? $this->cond_reglement_id : "null").",";
+        $sql .= " fk_mode_reglement=".(isset($this->mode_reglement_id) ? $this->mode_reglement_id : "null").",";
+        $sql .= " note_private=".(isset($this->note_private) ? "'".$this->db->escape($this->note_private)."'" : "null").",";
+        $sql .= " note_public=".(isset($this->note_public) ? "'".$this->db->escape($this->note_public)."'" : "null").",";
+        $sql .= " model_pdf=".(isset($this->modelpdf) ? "'".$this->db->escape($this->modelpdf)."'" : "null").",";
+        $sql .= " import_key=".(isset($this->import_key) ? "'".$this->db->escape($this->import_key)."'" : "null")."";
+
+        $sql .= " WHERE rowid=".$this->id;
 
         $this->db->begin();
 
-        dol_syslog(get_class($this) . "::update", LOG_DEBUG);
+        dol_syslog(get_class($this)."::update", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if (!$resql) {
             $error++;
-            $this->errors[] = "Error " . $this->db->lasterror();
+            $this->errors[] = "Error ".$this->db->lasterror();
         }
 
         if (!$error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($this->array_options) && count($this->array_options) > 0) {
@@ -1473,8 +1473,8 @@ 
         // Commit or rollback
         if ($error) {
             foreach ($this->errors as $errmsg) {
-                dol_syslog(get_class($this) . "::update " . $errmsg, LOG_ERR);
-                $this->error .= ($this->error ? ', ' . $errmsg : $errmsg);
+                dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
+                $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
             }
             $this->db->rollback();
             return -1 * $error;
@@ -1503,17 +1503,17 @@ 
         $sql .= ' p.weight, p.weight_units, p.volume, p.volume_units,';
         $sql .= ' d.date_start, d.date_end,';
         $sql .= ' d.fk_multicurrency, d.multicurrency_code, d.multicurrency_subprice, d.multicurrency_total_ht, d.multicurrency_total_tva, d.multicurrency_total_ttc';
-        $sql .= ' FROM ' . MAIN_DB_PREFIX . 'propaldet as d';
-        $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'product as p ON (d.fk_product = p.rowid)';
-        $sql .= ' WHERE d.fk_propal = ' . $this->id;
+        $sql .= ' FROM '.MAIN_DB_PREFIX.'propaldet as d';
+        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON (d.fk_product = p.rowid)';
+        $sql .= ' WHERE d.fk_propal = '.$this->id;
         if ($only_product)
             $sql .= ' AND p.fk_product_type = 0';
         $sql .= ' ORDER by d.rang';
 
-        dol_syslog(get_class($this) . "::fetch_lines", LOG_DEBUG);
+        dol_syslog(get_class($this)."::fetch_lines", LOG_DEBUG);
         $result = $this->db->query($sql);
         if ($result) {
-            require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
+            require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
             $num = $this->db->num_rows($result);
 
@@ -1529,8 +1529,8 @@ 
                 $line->fk_parent_line = $objp->fk_parent_line;
                 $line->product_type = $objp->product_type;
                 $line->label = $objp->custom_label;
-                $line->desc = $objp->description;  // Description ligne
-                $line->description = $objp->description;  // Description ligne
+                $line->desc = $objp->description; // Description ligne
+                $line->description = $objp->description; // Description ligne
                 $line->qty = $objp->qty;
                 $line->vat_src_code = $objp->vat_src_code;
                 $line->tva_tx = $objp->tva_tx;
@@ -1541,7 +1541,7 @@ 
                 $line->subprice = $objp->subprice;
                 $line->fk_remise_except = $objp->fk_remise_except;
                 $line->remise_percent = $objp->remise_percent;
-                $line->price = $objp->price;  // TODO deprecated
+                $line->price = $objp->price; // TODO deprecated
 
                 $line->info_bits = $objp->info_bits;
                 $line->total_ht = $objp->total_ht;
@@ -1559,11 +1559,11 @@ 
 
                 $line->fk_product = $objp->fk_product;
 
-                $line->ref = $objp->product_ref;  // TODO deprecated
+                $line->ref = $objp->product_ref; // TODO deprecated
                 $line->product_ref = $objp->product_ref;
-                $line->libelle = $objp->product_label;  // TODO deprecated
+                $line->libelle = $objp->product_label; // TODO deprecated
                 $line->product_label = $objp->product_label;
-                $line->product_desc = $objp->product_desc;   // Description produit
+                $line->product_desc = $objp->product_desc; // Description produit
                 $line->product_tobatch = $objp->product_tobatch;
                 $line->fk_product_type = $objp->fk_product_type; // TODO deprecated
                 $line->fk_unit = $objp->fk_unit;
@@ -1609,7 +1609,7 @@ 
      */
     function valid($user, $notrigger = 0)
     {
-        require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
         global $conf;
 
@@ -1617,13 +1617,13 @@ 
 
         // Protection
         if ($this->statut == self::STATUS_VALIDATED) {
-            dol_syslog(get_class($this) . "::valid action abandonned: already validated", LOG_WARNING);
+            dol_syslog(get_class($this)."::valid action abandonned: already validated", LOG_WARNING);
             return 0;
         }
 
         if (!((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->propal->creer)) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->propal->propal_advance->validate)))) {
             $this->error = 'ErrorPermissionDenied';
-            dol_syslog(get_class($this) . "::valid " . $this->error, LOG_ERR);
+            dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
             return -1;
         }
 
@@ -1643,12 +1643,12 @@ 
         }
         $this->newref = $num;
 
-        $sql = "UPDATE " . MAIN_DB_PREFIX . "propal";
-        $sql .= " SET ref = '" . $num . "',";
-        $sql .= " fk_statut = " . self::STATUS_VALIDATED . ", date_valid='" . $this->db->idate($now) . "', fk_user_valid=" . $user->id;
-        $sql .= " WHERE rowid = " . $this->id . " AND fk_statut = " . self::STATUS_DRAFT;
+        $sql = "UPDATE ".MAIN_DB_PREFIX."propal";
+        $sql .= " SET ref = '".$num."',";
+        $sql .= " fk_statut = ".self::STATUS_VALIDATED.", date_valid='".$this->db->idate($now)."', fk_user_valid=".$user->id;
+        $sql .= " WHERE rowid = ".$this->id." AND fk_statut = ".self::STATUS_DRAFT;
 
-        dol_syslog(get_class($this) . "::valid", LOG_DEBUG);
+        dol_syslog(get_class($this)."::valid", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if (!$resql) {
             dol_print_error($this->db);
@@ -1674,20 +1674,20 @@ 
                 // to  not lose the linked files
                 $oldref = dol_sanitizeFileName($this->ref);
                 $newref = dol_sanitizeFileName($num);
-                $dirsource = $conf->propal->multidir_output[$this->entity] . '/' . $oldref;
-                $dirdest = $conf->propal->multidir_output[$this->entity] . '/' . $newref;
+                $dirsource = $conf->propal->multidir_output[$this->entity].'/'.$oldref;
+                $dirdest = $conf->propal->multidir_output[$this->entity].'/'.$newref;
 
                 if (file_exists($dirsource)) {
-                    dol_syslog(get_class($this) . "::validate rename dir " . $dirsource . " into " . $dirdest);
+                    dol_syslog(get_class($this)."::validate rename dir ".$dirsource." into ".$dirdest);
                     if (@rename($dirsource, $dirdest)) {
                         dol_syslog("Rename ok");
                         // Rename docs starting with $oldref with $newref
-                        $listoffiles = dol_dir_list($dirdest, 'files', 1, '^' . preg_quote($oldref, '/'));
+                        $listoffiles = dol_dir_list($dirdest, 'files', 1, '^'.preg_quote($oldref, '/'));
                         foreach ($listoffiles as $fileentry) {
                             $dirsource = $fileentry['name'];
-                            $dirdest = preg_replace('/^' . preg_quote($oldref, '/') . '/', $newref, $dirsource);
-                            $dirsource = $fileentry['path'] . '/' . $dirsource;
-                            $dirdest = $fileentry['path'] . '/' . $dirdest;
+                            $dirdest = preg_replace('/^'.preg_quote($oldref, '/').'/', $newref, $dirsource);
+                            $dirsource = $fileentry['path'].'/'.$dirsource;
+                            $dirdest = $fileentry['path'].'/'.$dirdest;
                             @rename($dirsource, $dirdest);
                         }
                     }
@@ -1722,7 +1722,7 @@ 
         // phpcs:enable
         if (empty($date)) {
             $this->error = 'ErrorBadParameter';
-            dol_syslog(get_class($this) . "::set_date " . $this->error, LOG_ERR);
+            dol_syslog(get_class($this)."::set_date ".$this->error, LOG_ERR);
             return -1;
         }
 
@@ -1731,8 +1731,8 @@ 
 
             $this->db->begin();
 
-            $sql = "UPDATE " . MAIN_DB_PREFIX . "propal SET datep = '" . $this->db->idate($date) . "'";
-            $sql .= " WHERE rowid = " . $this->id . " AND fk_statut = " . self::STATUS_DRAFT;
+            $sql = "UPDATE ".MAIN_DB_PREFIX."propal SET datep = '".$this->db->idate($date)."'";
+            $sql .= " WHERE rowid = ".$this->id." AND fk_statut = ".self::STATUS_DRAFT;
 
             dol_syslog(__METHOD__, LOG_DEBUG);
             $resql = $this->db->query($sql);
@@ -1744,7 +1744,7 @@ 
             if (!$error) {
                 $this->oldcopy = clone $this;
                 $this->date = $date;
-                $this->datep = $date;    // deprecated
+                $this->datep = $date; // deprecated
             }
 
             if (!$notrigger && empty($error)) {
@@ -1760,8 +1760,8 @@ 
                 return 1;
             } else {
                 foreach ($this->errors as $errmsg) {
-                    dol_syslog(__METHOD__ . ' Error: ' . $errmsg, LOG_ERR);
-                    $this->error .= ($this->error ? ', ' . $errmsg : $errmsg);
+                    dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
+                    $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
                 }
                 $this->db->rollback();
                 return -1 * $error;
@@ -1786,8 +1786,8 @@ 
 
             $this->db->begin();
 
-            $sql = "UPDATE " . MAIN_DB_PREFIX . "propal SET fin_validite = " . ($date_fin_validite != '' ? "'" . $this->db->idate($date_fin_validite) . "'" : 'null');
-            $sql .= " WHERE rowid = " . $this->id . " AND fk_statut = " . self::STATUS_DRAFT;
+            $sql = "UPDATE ".MAIN_DB_PREFIX."propal SET fin_validite = ".($date_fin_validite != '' ? "'".$this->db->idate($date_fin_validite)."'" : 'null');
+            $sql .= " WHERE rowid = ".$this->id." AND fk_statut = ".self::STATUS_DRAFT;
 
             dol_syslog(__METHOD__, LOG_DEBUG);
             $resql = $this->db->query($sql);
@@ -1815,8 +1815,8 @@ 
                 return 1;
             } else {
                 foreach ($this->errors as $errmsg) {
-                    dol_syslog(__METHOD__ . ' Error: ' . $errmsg, LOG_ERR);
-                    $this->error .= ($this->error ? ', ' . $errmsg : $errmsg);
+                    dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
+                    $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
                 }
                 $this->db->rollback();
                 return -1 * $error;
@@ -1841,9 +1841,9 @@ 
 
             $this->db->begin();
 
-            $sql = "UPDATE " . MAIN_DB_PREFIX . "propal ";
-            $sql .= " SET date_livraison = " . ($date_livraison != '' ? "'" . $this->db->idate($date_livraison) . "'" : 'null');
-            $sql .= " WHERE rowid = " . $this->id;
+            $sql = "UPDATE ".MAIN_DB_PREFIX."propal ";
+            $sql .= " SET date_livraison = ".($date_livraison != '' ? "'".$this->db->idate($date_livraison)."'" : 'null');
+            $sql .= " WHERE rowid = ".$this->id;
 
             dol_syslog(__METHOD__, LOG_DEBUG);
             $resql = $this->db->query($sql);
@@ -1870,8 +1870,8 @@ 
                 return 1;
             } else {
                 foreach ($this->errors as $errmsg) {
-                    dol_syslog(__METHOD__ . ' Error: ' . $errmsg, LOG_ERR);
-                    $this->error .= ($this->error ? ', ' . $errmsg : $errmsg);
+                    dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
+                    $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
                 }
                 $this->db->rollback();
                 return -1 * $error;
@@ -1896,11 +1896,11 @@ 
 
             $this->db->begin();
 
-            $sql = "UPDATE " . MAIN_DB_PREFIX . "propal ";
-            $sql .= " SET fk_availability = '" . $id . "'";
-            $sql .= " WHERE rowid = " . $this->id;
+            $sql = "UPDATE ".MAIN_DB_PREFIX."propal ";
+            $sql .= " SET fk_availability = '".$id."'";
+            $sql .= " WHERE rowid = ".$this->id;
 
-            dol_syslog(__METHOD__ . ' availability(' . $id . ')', LOG_DEBUG);
+            dol_syslog(__METHOD__.' availability('.$id.')', LOG_DEBUG);
             $resql = $this->db->query($sql);
             if (!$resql) {
                 $this->errors[] = $this->db->error();
@@ -1926,15 +1926,15 @@ 
                 return 1;
             } else {
                 foreach ($this->errors as $errmsg) {
-                    dol_syslog(__METHOD__ . ' Error: ' . $errmsg, LOG_ERR);
-                    $this->error .= ($this->error ? ', ' . $errmsg : $errmsg);
+                    dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
+                    $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
                 }
                 $this->db->rollback();
                 return -1 * $error;
             }
         } else {
-            $error_str = 'Propal status do not meet requirement ' . $this->statut;
-            dol_syslog(__METHOD__ . $error_str, LOG_ERR);
+            $error_str = 'Propal status do not meet requirement '.$this->statut;
+            dol_syslog(__METHOD__.$error_str, LOG_ERR);
             $this->error = $error_str;
             $this->errors[] = $this->error;
             return -2;
@@ -1958,9 +1958,9 @@ 
 
             $this->db->begin();
 
-            $sql = "UPDATE " . MAIN_DB_PREFIX . "propal ";
-            $sql .= " SET fk_input_reason = " . $id;
-            $sql .= " WHERE rowid = " . $this->id;
+            $sql = "UPDATE ".MAIN_DB_PREFIX."propal ";
+            $sql .= " SET fk_input_reason = ".$id;
+            $sql .= " WHERE rowid = ".$this->id;
 
             dol_syslog(__METHOD__, LOG_DEBUG);
             $resql = $this->db->query($sql);
@@ -1990,15 +1990,15 @@ 
                 return 1;
             } else {
                 foreach ($this->errors as $errmsg) {
-                    dol_syslog(__METHOD__ . ' Error: ' . $errmsg, LOG_ERR);
-                    $this->error .= ($this->error ? ', ' . $errmsg : $errmsg);
+                    dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
+                    $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
                 }
                 $this->db->rollback();
                 return -1 * $error;
             }
         } else {
-            $error_str = 'Propal status do not meet requirement ' . $this->statut;
-            dol_syslog(__METHOD__ . $error_str, LOG_ERR);
+            $error_str = 'Propal status do not meet requirement '.$this->statut;
+            dol_syslog(__METHOD__.$error_str, LOG_ERR);
             $this->error = $error_str;
             $this->errors[] = $this->error;
             return -2;
@@ -2022,10 +2022,10 @@ 
 
             $this->db->begin();
 
-            $sql = 'UPDATE ' . MAIN_DB_PREFIX . 'propal SET ref_client = ' . (empty($ref_client) ? 'NULL' : '\'' . $this->db->escape($ref_client) . '\'');
-            $sql .= ' WHERE rowid = ' . $this->id;
+            $sql = 'UPDATE '.MAIN_DB_PREFIX.'propal SET ref_client = '.(empty($ref_client) ? 'NULL' : '\''.$this->db->escape($ref_client).'\'');
+            $sql .= ' WHERE rowid = '.$this->id;
 
-            dol_syslog(__METHOD__ . ' $this->id=' . $this->id . ', ref_client=' . $ref_client, LOG_DEBUG);
+            dol_syslog(__METHOD__.' $this->id='.$this->id.', ref_client='.$ref_client, LOG_DEBUG);
             $resql = $this->db->query($sql);
             if (!$resql) {
                 $this->errors[] = $this->db->error();
@@ -2050,8 +2050,8 @@ 
                 return 1;
             } else {
                 foreach ($this->errors as $errmsg) {
-                    dol_syslog(__METHOD__ . ' Error: ' . $errmsg, LOG_ERR);
-                    $this->error .= ($this->error ? ', ' . $errmsg : $errmsg);
+                    dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
+                    $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
                 }
                 $this->db->rollback();
                 return -1 * $error;
@@ -2082,8 +2082,8 @@ 
 
             $this->db->begin();
 
-            $sql = "UPDATE " . MAIN_DB_PREFIX . "propal SET remise_percent = " . $remise;
-            $sql .= " WHERE rowid = " . $this->id . " AND fk_statut = " . self::STATUS_DRAFT;
+            $sql = "UPDATE ".MAIN_DB_PREFIX."propal SET remise_percent = ".$remise;
+            $sql .= " WHERE rowid = ".$this->id." AND fk_statut = ".self::STATUS_DRAFT;
 
             dol_syslog(__METHOD__, LOG_DEBUG);
             $resql = $this->db->query($sql);
@@ -2111,8 +2111,8 @@ 
                 return 1;
             } else {
                 foreach ($this->errors as $errmsg) {
-                    dol_syslog(__METHOD__ . ' Error: ' . $errmsg, LOG_ERR);
-                    $this->error .= ($this->error ? ', ' . $errmsg : $errmsg);
+                    dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
+                    $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
                 }
                 $this->db->rollback();
                 return -1 * $error;
@@ -2141,9 +2141,9 @@ 
 
             $this->db->begin();
 
-            $sql = "UPDATE " . MAIN_DB_PREFIX . "propal ";
-            $sql .= " SET remise_absolue = " . $remise;
-            $sql .= " WHERE rowid = " . $this->id . " AND fk_statut = " . self::STATUS_DRAFT;
+            $sql = "UPDATE ".MAIN_DB_PREFIX."propal ";
+            $sql .= " SET remise_absolue = ".$remise;
+            $sql .= " WHERE rowid = ".$this->id." AND fk_statut = ".self::STATUS_DRAFT;
 
             dol_syslog(__METHOD__, LOG_DEBUG);
             $resql = $this->db->query($sql);
@@ -2171,8 +2171,8 @@ 
                 return 1;
             } else {
                 foreach ($this->errors as $errmsg) {
-                    dol_syslog(__METHOD__ . ' Error: ' . $errmsg, LOG_ERR);
-                    $this->error .= ($this->error ? ', ' . $errmsg : $errmsg);
+                    dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
+                    $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
                 }
                 $this->db->rollback();
                 return -1 * $error;
@@ -2195,20 +2195,20 @@ 
         $this->statut = $statut;
         $error = 0;
 
-        $sql = "UPDATE " . MAIN_DB_PREFIX . "propal";
-        $sql .= " SET fk_statut = " . $this->statut . ",";
+        $sql = "UPDATE ".MAIN_DB_PREFIX."propal";
+        $sql .= " SET fk_statut = ".$this->statut.",";
         if (!empty($note))
-            $sql .= " note_private = '" . $this->db->escape($note) . "',";
+            $sql .= " note_private = '".$this->db->escape($note)."',";
         $sql .= " date_cloture=NULL, fk_user_cloture=NULL";
-        $sql .= " WHERE rowid = " . $this->id;
+        $sql .= " WHERE rowid = ".$this->id;
 
         $this->db->begin();
 
-        dol_syslog(get_class($this) . "::reopen", LOG_DEBUG);
+        dol_syslog(get_class($this)."::reopen", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if (!$resql) {
             $error++;
-            $this->errors[] = "Error " . $this->db->lasterror();
+            $this->errors[] = "Error ".$this->db->lasterror();
         }
         if (!$error) {
             if (!$notrigger) {
@@ -2225,8 +2225,8 @@ 
         if ($error) {
             if (!empty($this->errors)) {
                 foreach ($this->errors as $errmsg) {
-                    dol_syslog(get_class($this) . "::update " . $errmsg, LOG_ERR);
-                    $this->error .= ($this->error ? ', ' . $errmsg : $errmsg);
+                    dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
+                    $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
                 }
             }
             $this->db->rollback();
@@ -2257,9 +2257,9 @@ 
 
         $newprivatenote = dol_concatdesc($this->note_private, $note);
 
-        $sql = "UPDATE " . MAIN_DB_PREFIX . "propal";
-        $sql .= " SET fk_statut = " . $statut . ", note_private = '" . $this->db->escape($newprivatenote) . "', date_cloture='" . $this->db->idate($now) . "', fk_user_cloture=" . $user->id;
-        $sql .= " WHERE rowid = " . $this->id;
+        $sql = "UPDATE ".MAIN_DB_PREFIX."propal";
+        $sql .= " SET fk_statut = ".$statut.", note_private = '".$this->db->escape($newprivatenote)."', date_cloture='".$this->db->idate($now)."', fk_user_cloture=".$user->id;
+        $sql .= " WHERE rowid = ".$this->id;
 
         $resql = $this->db->query($sql);
         if ($resql) {
@@ -2344,8 +2344,8 @@ 
 
         $this->db->begin();
 
-        $sql = 'UPDATE ' . MAIN_DB_PREFIX . 'propal SET fk_statut = ' . self::STATUS_BILLED;
-        $sql .= ' WHERE rowid = ' . $this->id . ' AND fk_statut > ' . self::STATUS_DRAFT;
+        $sql = 'UPDATE '.MAIN_DB_PREFIX.'propal SET fk_statut = '.self::STATUS_BILLED;
+        $sql .= ' WHERE rowid = '.$this->id.' AND fk_statut > '.self::STATUS_DRAFT;
 
         dol_syslog(__METHOD__, LOG_DEBUG);
         $resql = $this->db->query($sql);
@@ -2372,8 +2372,8 @@ 
             return 1;
         } else {
             foreach ($this->errors as $errmsg) {
-                dol_syslog(__METHOD__ . ' Error: ' . $errmsg, LOG_ERR);
-                $this->error .= ($this->error ? ', ' . $errmsg : $errmsg);
+                dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
+                $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
             }
             $this->db->rollback();
             return -1 * $error;
@@ -2395,8 +2395,8 @@ 
 
         $this->db->begin();
 
-        $sql = "UPDATE " . MAIN_DB_PREFIX . "propal SET fk_statut = " . self::STATUS_DRAFT;
-        $sql .= " WHERE rowid = " . $this->id;
+        $sql = "UPDATE ".MAIN_DB_PREFIX."propal SET fk_statut = ".self::STATUS_DRAFT;
+        $sql .= " WHERE rowid = ".$this->id;
 
         dol_syslog(__METHOD__, LOG_DEBUG);
         $resql = $this->db->query($sql);
@@ -2424,8 +2424,8 @@ 
             return 1;
         } else {
             foreach ($this->errors as $errmsg) {
-                dol_syslog(__METHOD__ . ' Error: ' . $errmsg, LOG_ERR);
-                $this->error .= ($this->error ? ', ' . $errmsg : $errmsg);
+                dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
+                $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
             }
             $this->db->rollback();
             return -1 * $error;
@@ -2458,21 +2458,21 @@ 
         $sql .= " p.datep as dp, p.fin_validite as datelimite";
         if (!$user->rights->societe->client->voir && !$socid)
             $sql .= ", sc.fk_soc, sc.fk_user";
-        $sql .= " FROM " . MAIN_DB_PREFIX . "societe as s, " . MAIN_DB_PREFIX . "propal as p, " . MAIN_DB_PREFIX . "c_propalst as c";
+        $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as p, ".MAIN_DB_PREFIX."c_propalst as c";
         if (!$user->rights->societe->client->voir && !$socid)
-            $sql .= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc";
-        $sql .= " WHERE p.entity IN (" . getEntity('propal') . ")";
+            $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+        $sql .= " WHERE p.entity IN (".getEntity('propal').")";
         $sql .= " AND p.fk_soc = s.rowid";
         $sql .= " AND p.fk_statut = c.id";
         if (!$user->rights->societe->client->voir && !$socid) { //restriction
-            $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " . $user->id;
+            $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
         }
         if ($socid)
-            $sql .= " AND s.rowid = " . $socid;
+            $sql .= " AND s.rowid = ".$socid;
         if ($draft)
-            $sql .= " AND p.fk_statut = " . self::STATUS_DRAFT;
+            $sql .= " AND p.fk_statut = ".self::STATUS_DRAFT;
         if ($notcurrentuser > 0)
-            $sql .= " AND p.fk_user_author <> " . $user->id;
+            $sql .= " AND p.fk_user_author <> ".$user->id;
         $sql .= $this->db->order($sortfield, $sortorder);
         $sql .= $this->db->plimit($limit, $offset);
 
@@ -2487,7 +2487,7 @@ 
                     if ($shortlist == 1) {
                         $ga[$obj->propalid] = $obj->ref;
                     } else if ($shortlist == 2) {
-                        $ga[$obj->propalid] = $obj->ref . ' (' . $obj->name . ')';
+                        $ga[$obj->propalid] = $obj->ref.' ('.$obj->name.')';
                     } else {
                         $ga[$i]['id'] = $obj->propalid;
                         $ga[$i]['ref'] = $obj->ref;
@@ -2552,10 +2552,10 @@ 
 
         if (count($linkedInvoices) > 0) {
             $sql = "SELECT rowid as facid, ref, total, datef as df, fk_user_author, fk_statut, paye";
-            $sql .= " FROM " . MAIN_DB_PREFIX . "facture";
-            $sql .= " WHERE rowid IN (" . implode(',', $linkedInvoices) . ")";
+            $sql .= " FROM ".MAIN_DB_PREFIX."facture";
+            $sql .= " WHERE rowid IN (".implode(',', $linkedInvoices).")";
 
-            dol_syslog(get_class($this) . "::InvoiceArrayList", LOG_DEBUG);
+            dol_syslog(get_class($this)."::InvoiceArrayList", LOG_DEBUG);
             $resql = $this->db->query($sql);
 
             if ($resql) {
@@ -2597,7 +2597,7 @@ 
     function delete($user, $notrigger = 0)
     {
         global $conf;
-        require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
         $error = 0;
 
@@ -2613,9 +2613,9 @@ 
         }
 
         if (!$error) {
-            $sql = "DELETE FROM " . MAIN_DB_PREFIX . "propaldet WHERE fk_propal = " . $this->id;
+            $sql = "DELETE FROM ".MAIN_DB_PREFIX."propaldet WHERE fk_propal = ".$this->id;
             if ($this->db->query($sql)) {
-                $sql = "DELETE FROM " . MAIN_DB_PREFIX . "propal WHERE rowid = " . $this->id;
+                $sql = "DELETE FROM ".MAIN_DB_PREFIX."propal WHERE rowid = ".$this->id;
                 if ($this->db->query($sql)) {
                     // Delete linked object
                     $res = $this->deleteObjectLinked();
@@ -2631,8 +2631,8 @@ 
                         // We remove directory
                         $ref = dol_sanitizeFileName($this->ref);
                         if ($conf->propal->multidir_output[$this->entity] && !empty($this->ref)) {
-                            $dir = $conf->propal->multidir_output[$this->entity] . "/" . $ref;
-                            $file = $dir . "/" . $ref . ".pdf";
+                            $dir = $conf->propal->multidir_output[$this->entity]."/".$ref;
+                            $file = $dir."/".$ref.".pdf";
                             if (file_exists($file)) {
                                 dol_delete_preview($this);
 
@@ -2662,13 +2662,13 @@ 
                             if ($result < 0) {
                                 $error++;
                                 $errorflag = -4;
-                                dol_syslog(get_class($this) . "::delete erreur " . $errorflag . " " . $this->error, LOG_ERR);
+                                dol_syslog(get_class($this)."::delete erreur ".$errorflag." ".$this->error, LOG_ERR);
                             }
                         }
                     }
 
                     if (!$error) {
-                        dol_syslog(get_class($this) . "::delete " . $this->id . " by " . $user->id, LOG_DEBUG);
+                        dol_syslog(get_class($this)."::delete ".$this->id." by ".$user->id, LOG_DEBUG);
                         $this->db->commit();
                         return 1;
                     } else {
@@ -2709,11 +2709,11 @@ 
 
             $this->db->begin();
 
-            $sql = 'UPDATE ' . MAIN_DB_PREFIX . 'propal';
-            $sql .= ' SET fk_availability = ' . $availability_id;
-            $sql .= ' WHERE rowid=' . $this->id;
+            $sql = 'UPDATE '.MAIN_DB_PREFIX.'propal';
+            $sql .= ' SET fk_availability = '.$availability_id;
+            $sql .= ' WHERE rowid='.$this->id;
 
-            dol_syslog(__METHOD__ . ' availability(' . $availability_id . ')', LOG_DEBUG);
+            dol_syslog(__METHOD__.' availability('.$availability_id.')', LOG_DEBUG);
             $resql = $this->db->query($sql);
             if (!$resql) {
                 $this->errors[] = $this->db->error();
@@ -2738,15 +2738,15 @@ 
                 return 1;
             } else {
                 foreach ($this->errors as $errmsg) {
-                    dol_syslog(__METHOD__ . ' Error: ' . $errmsg, LOG_ERR);
-                    $this->error .= ($this->error ? ', ' . $errmsg : $errmsg);
+                    dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
+                    $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
                 }
                 $this->db->rollback();
                 return -1 * $error;
             }
         } else {
-            $error_str = 'Propal status do not meet requirement ' . $this->statut;
-            dol_syslog(__METHOD__ . $error_str, LOG_ERR);
+            $error_str = 'Propal status do not meet requirement '.$this->statut;
+            dol_syslog(__METHOD__.$error_str, LOG_ERR);
             $this->error = $error_str;
             $this->errors[] = $this->error;
             return -2;
@@ -2772,11 +2772,11 @@ 
 
             $this->db->begin();
 
-            $sql = 'UPDATE ' . MAIN_DB_PREFIX . 'propal';
-            $sql .= ' SET fk_input_reason = ' . $demand_reason_id;
-            $sql .= ' WHERE rowid=' . $this->id;
+            $sql = 'UPDATE '.MAIN_DB_PREFIX.'propal';
+            $sql .= ' SET fk_input_reason = '.$demand_reason_id;
+            $sql .= ' WHERE rowid='.$this->id;
 
-            dol_syslog(__METHOD__ . ' demand_reason(' . $demand_reason_id . ')', LOG_DEBUG);
+            dol_syslog(__METHOD__.' demand_reason('.$demand_reason_id.')', LOG_DEBUG);
             $resql = $this->db->query($sql);
             if (!$resql) {
                 $this->errors[] = $this->db->error();
@@ -2801,15 +2801,15 @@ 
                 return 1;
             } else {
                 foreach ($this->errors as $errmsg) {
-                    dol_syslog(__METHOD__ . ' Error: ' . $errmsg, LOG_ERR);
-                    $this->error .= ($this->error ? ', ' . $errmsg : $errmsg);
+                    dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
+                    $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
                 }
                 $this->db->rollback();
                 return -1 * $error;
             }
         } else {
-            $error_str = 'Propal status do not meet requirement ' . $this->statut;
-            dol_syslog(__METHOD__ . $error_str, LOG_ERR);
+            $error_str = 'Propal status do not meet requirement '.$this->statut;
+            dol_syslog(__METHOD__.$error_str, LOG_ERR);
             $this->error = $error_str;
             $this->errors[] = $this->error;
             return -2;
@@ -2827,8 +2827,8 @@ 
         $sql = "SELECT c.rowid, ";
         $sql .= " c.datec, c.date_valid as datev, c.date_cloture as dateo,";
         $sql .= " c.fk_user_author, c.fk_user_valid, c.fk_user_cloture";
-        $sql .= " FROM " . MAIN_DB_PREFIX . "propal as c";
-        $sql .= " WHERE c.rowid = " . $id;
+        $sql .= " FROM ".MAIN_DB_PREFIX."propal as c";
+        $sql .= " WHERE c.rowid = ".$id;
 
         $result = $this->db->query($sql);
 
@@ -2921,15 +2921,15 @@ 
         elseif ($mode == 1)
             return $this->labelstatut_short[$statut];
         elseif ($mode == 2)
-            return img_picto($this->labelstatut_short[$statut], $statuttrans) . ' ' . $this->labelstatut_short[$statut];
+            return img_picto($this->labelstatut_short[$statut], $statuttrans).' '.$this->labelstatut_short[$statut];
         elseif ($mode == 3)
             return img_picto($this->labelstatut[$statut], $statuttrans);
         elseif ($mode == 4)
-            return img_picto($this->labelstatut[$statut], $statuttrans) . ' ' . $this->labelstatut[$statut];
+            return img_picto($this->labelstatut[$statut], $statuttrans).' '.$this->labelstatut[$statut];
         elseif ($mode == 5)
-            return '<span class="hideonsmartphone">' . $this->labelstatut_short[$statut] . ' </span>' . img_picto($this->labelstatut[$statut], $statuttrans);
+            return '<span class="hideonsmartphone">'.$this->labelstatut_short[$statut].' </span>'.img_picto($this->labelstatut[$statut], $statuttrans);
         elseif ($mode == 6)
-            return '<span class="hideonsmartphone">' . $this->labelstatut[$statut] . ' </span>' . img_picto($this->labelstatut[$statut], $statuttrans);
+            return '<span class="hideonsmartphone">'.$this->labelstatut[$statut].' </span>'.img_picto($this->labelstatut[$statut], $statuttrans);
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -2948,19 +2948,19 @@ 
         $clause = " WHERE";
 
         $sql = "SELECT p.rowid, p.ref, p.datec as datec, p.fin_validite as datefin, p.total_ht";
-        $sql .= " FROM " . MAIN_DB_PREFIX . "propal as p";
+        $sql .= " FROM ".MAIN_DB_PREFIX."propal as p";
         if (!$user->rights->societe->client->voir && !$user->societe_id) {
-            $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON p.fk_soc = sc.fk_soc";
-            $sql .= " WHERE sc.fk_user = " . $user->id;
+            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON p.fk_soc = sc.fk_soc";
+            $sql .= " WHERE sc.fk_user = ".$user->id;
             $clause = " AND";
         }
-        $sql .= $clause . " p.entity IN (" . getEntity('propal') . ")";
+        $sql .= $clause." p.entity IN (".getEntity('propal').")";
         if ($mode == 'opened')
-            $sql .= " AND p.fk_statut = " . self::STATUS_VALIDATED;
+            $sql .= " AND p.fk_statut = ".self::STATUS_VALIDATED;
         if ($mode == 'signed')
-            $sql .= " AND p.fk_statut = " . self::STATUS_SIGNED;
+            $sql .= " AND p.fk_statut = ".self::STATUS_SIGNED;
         if ($user->societe_id)
-            $sql .= " AND p.fk_soc = " . $user->societe_id;
+            $sql .= " AND p.fk_soc = ".$user->societe_id;
 
         $resql = $this->db->query($sql);
         if ($resql) {
@@ -2978,14 +2978,14 @@ 
             if ($mode == 'signed') {
                 $delay_warning = $conf->propal->facturation->warning_delay;
                 $statut = self::STATUS_SIGNED;
-                $label = $langs->trans("PropalsToBill");         // We set here bill but may be billed or ordered
+                $label = $langs->trans("PropalsToBill"); // We set here bill but may be billed or ordered
             }
 
             $response = new WorkboardResponse();
             $response->warning_delay = $delay_warning / 60 / 60 / 24;
             $response->label = $label;
-            $response->url = DOL_URL_ROOT . '/comm/propal/list.php?viewstatut=' . $statut . '&mainmenu=commercial&leftmenu=propals';
-            $response->url_late = DOL_URL_ROOT . '/comm/propal/list.php?viewstatut=' . $statut . '&mainmenu=commercial&leftmenu=propals&sortfield=p.datep&sortorder=asc';
+            $response->url = DOL_URL_ROOT.'/comm/propal/list.php?viewstatut='.$statut.'&mainmenu=commercial&leftmenu=propals';
+            $response->url_late = DOL_URL_ROOT.'/comm/propal/list.php?viewstatut='.$statut.'&mainmenu=commercial&leftmenu=propals&sortfield=p.datep&sortorder=asc';
             $response->img = img_object('', "propal");
 
             // This assignment in condition is not a bug. It allows walking the results.
@@ -3025,8 +3025,8 @@ 
         $num_prods = 0;
         $prodids = array();
         $sql = "SELECT rowid";
-        $sql .= " FROM " . MAIN_DB_PREFIX . "product";
-        $sql .= " WHERE entity IN (" . getEntity('product') . ")";
+        $sql .= " FROM ".MAIN_DB_PREFIX."product";
+        $sql .= " WHERE entity IN (".getEntity('product').")";
         $resql = $this->db->query($sql);
         if ($resql) {
             $num_prods = $this->db->num_rows($resql);
@@ -3061,7 +3061,7 @@ 
         $xnbp = 0;
         while ($xnbp < $nbp) {
             $line = new PropaleLigne($this->db);
-            $line->desc = $langs->trans("Description") . " " . $xnbp;
+            $line->desc = $langs->trans("Description")." ".$xnbp;
             $line->qty = 1;
             $line->subprice = 100;
             $line->price = 100;
@@ -3111,14 +3111,14 @@ 
         $clause = "WHERE";
 
         $sql = "SELECT count(p.rowid) as nb";
-        $sql .= " FROM " . MAIN_DB_PREFIX . "propal as p";
-        $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe as s ON p.fk_soc = s.rowid";
+        $sql .= " FROM ".MAIN_DB_PREFIX."propal as p";
+        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON p.fk_soc = s.rowid";
         if (!$user->rights->societe->client->voir && !$user->societe_id) {
-            $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON s.rowid = sc.fk_soc";
-            $sql .= " WHERE sc.fk_user = " . $user->id;
+            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
+            $sql .= " WHERE sc.fk_user = ".$user->id;
             $clause = "AND";
         }
-        $sql .= " " . $clause . " p.entity IN (" . getEntity('propal') . ")";
+        $sql .= " ".$clause." p.entity IN (".getEntity('propal').")";
 
         $resql = $this->db->query($sql);
         if ($resql) {
@@ -3152,20 +3152,20 @@ 
         if (!empty($classname)) {
             $mybool = false;
 
-            $file = $classname . ".php";
+            $file = $classname.".php";
 
             // Include file with class
             $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
             foreach ($dirmodels as $reldir) {
 
-                $dir = dol_buildpath($reldir . "core/modules/propale/");
+                $dir = dol_buildpath($reldir."core/modules/propale/");
 
                 // Load file with numbering class (if found)
-                $mybool |= @include_once $dir . $file;
+                $mybool |= @include_once $dir.$file;
             }
 
             if (!$mybool) {
-                dol_print_error('', "Failed to include file " . $file);
+                dol_print_error('', "Failed to include file ".$file);
                 return '';
             }
 
@@ -3182,7 +3182,7 @@ 
             }
         } else {
             $langs->load("errors");
-            print $langs->trans("Error") . " " . $langs->trans("ErrorModuleSetupNotComplete");
+            print $langs->trans("Error")." ".$langs->trans("ErrorModuleSetupNotComplete");
             return "";
         }
     }
@@ -3202,7 +3202,7 @@ 
         global $langs, $conf, $user;
 
         if (!empty($conf->dol_no_mouse_hover)) {
-            $notooltip = 1;   // Force disable tooltips
+            $notooltip = 1; // Force disable tooltips
         }
 
         $result = '';
@@ -3210,37 +3210,37 @@ 
         $url = '';
 
         if ($user->rights->propal->lire) {
-            $label = '<u>' . $langs->trans("ShowPropal") . '</u>';
+            $label = '<u>'.$langs->trans("ShowPropal").'</u>';
             if (!empty($this->ref)) {
-                $label .= '<br><b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
+                $label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
             }
             if (!empty($this->ref_client)) {
-                $label .= '<br><b>' . $langs->trans('RefCustomer') . ':</b> ' . $this->ref_client;
+                $label .= '<br><b>'.$langs->trans('RefCustomer').':</b> '.$this->ref_client;
             }
             if (!empty($this->total_ht)) {
-                $label .= '<br><b>' . $langs->trans('AmountHT') . ':</b> ' . price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency);
+                $label .= '<br><b>'.$langs->trans('AmountHT').':</b> '.price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency);
             }
             if (!empty($this->total_tva)) {
-                $label .= '<br><b>' . $langs->trans('VAT') . ':</b> ' . price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency);
+                $label .= '<br><b>'.$langs->trans('VAT').':</b> '.price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency);
             }
             if (!empty($this->total_ttc)) {
-                $label .= '<br><b>' . $langs->trans('AmountTTC') . ':</b> ' . price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
+                $label .= '<br><b>'.$langs->trans('AmountTTC').':</b> '.price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
             }
             if ($option == '') {
                 // $url = DOL_URL_ROOT . '/comm/propal/card.php?id=' . $this->id . $get_params;
-                $url = BASE_URI . '?controller=comm/propal&method=card&id=' . $this->id . $get_params;
+                $url = BASE_URI.'?controller=comm/propal&method=card&id='.$this->id.$get_params;
             }
             if ($option == 'compta') {  // deprecated
                 // $url = DOL_URL_ROOT . '/comm/propal/card.php?id=' . $this->id . $get_params;
-                $url = BASE_URI . '?controller=comm/propal&method=card&id=' . $this->id . $get_params;
+                $url = BASE_URI.'?controller=comm/propal&method=card&id='.$this->id.$get_params;
             }
             if ($option == 'expedition') {
                 // $url = DOL_URL_ROOT . '/expedition/propal.php?id=' . $this->id . $get_params;
-                $url = BASE_URI . '?controller=expedition&method=propal&id=' . $this->id . $get_params;
+                $url = BASE_URI.'?controller=expedition&method=propal&id='.$this->id.$get_params;
             }
             if ($option == 'document') {
                 // $url = DOL_URL_ROOT . '/comm/propal/document.php?id=' . $this->id . $get_params;
-                $url = BASE_URI . '?controller=comm/propal&method=document&id=' . $this->id . $get_params;
+                $url = BASE_URI.'?controller=comm/propal&method=document&id='.$this->id.$get_params;
             }
 
             if ($option != 'nolink') {
@@ -3259,19 +3259,19 @@ 
         if (empty($notooltip) && $user->rights->propal->lire) {
             if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
                 $label = $langs->trans("ShowPropal");
-                $linkclose .= ' alt="' . dol_escape_htmltag($label, 1) . '"';
+                $linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
             }
-            $linkclose .= ' title="' . dol_escape_htmltag($label, 1) . '"';
+            $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
             $linkclose .= ' class="classfortooltip"';
         }
 
-        $linkstart = '<a href="' . $url . '"';
-        $linkstart .= $linkclose . '>';
+        $linkstart = '<a href="'.$url.'"';
+        $linkstart .= $linkclose.'>';
         $linkend = '</a>';
 
         $result .= $linkstart;
         if ($withpicto)
-            $result .= img_object(($notooltip ? '' : $label), $this->picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="' . (($withpicto != 2) ? 'paddingright ' : '') . 'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+            $result .= img_object(($notooltip ? '' : $label), $this->picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
         if ($withpicto != 2)
             $result .= $this->ref;
         $result .= $linkend;
@@ -3359,8 +3359,8 @@ 
     // From llx_propaldet
     var $fk_propal;
     var $fk_parent_line;
-    var $desc;           // Description ligne
-    var $fk_product;  // Id produit predefini
+    var $desc; // Description ligne
+    var $fk_product; // Id produit predefini
     /**
      * @deprecated
      * @see product_type
@@ -3390,9 +3390,9 @@ 
     var $info_bits = 0; // Liste d'options cumulables:
     // Bit 0: 	0 si TVA normal - 1 si TVA NPR
     // Bit 1:	0 ligne normale - 1 si ligne de remise fixe
-    var $total_ht;   // Total HT  de la ligne toute quantite et incluant la remise ligne
-    var $total_tva;   // Total TVA  de la ligne toute quantite et incluant la remise ligne
-    var $total_ttc;   // Total TTC de la ligne toute quantite et incluant la remise ligne
+    var $total_ht; // Total HT  de la ligne toute quantite et incluant la remise ligne
+    var $total_tva; // Total TVA  de la ligne toute quantite et incluant la remise ligne
+    var $total_ttc; // Total TTC de la ligne toute quantite et incluant la remise ligne
 
     /**
      * @deprecated
@@ -3435,11 +3435,11 @@ 
      * @var string
      */
     public $product_desc;
-    var $localtax1_tx;  // Local tax 1
-    var $localtax2_tx;  // Local tax 2
+    var $localtax1_tx; // Local tax 1
+    var $localtax2_tx; // Local tax 2
     var $localtax1_type; // Local tax 1 type
     var $localtax2_type; // Local tax 2 type
-    var $total_localtax1;   // Line total local tax 1
+    var $total_localtax1; // Line total local tax 1
     var $total_localtax2; // Line total local tax 2
     var $date_start;
     var $date_end;
@@ -3478,9 +3478,9 @@ 
         $sql .= ' pd.fk_multicurrency, pd.multicurrency_code, pd.multicurrency_subprice, pd.multicurrency_total_ht, pd.multicurrency_total_tva, pd.multicurrency_total_ttc,';
         $sql .= ' p.ref as product_ref, p.label as product_label, p.description as product_desc,';
         $sql .= ' pd.date_start, pd.date_end, pd.product_type';
-        $sql .= ' FROM ' . MAIN_DB_PREFIX . 'propaldet as pd';
-        $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'product as p ON pd.fk_product = p.rowid';
-        $sql .= ' WHERE pd.rowid = ' . $rowid;
+        $sql .= ' FROM '.MAIN_DB_PREFIX.'propaldet as pd';
+        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON pd.fk_product = p.rowid';
+        $sql .= ' WHERE pd.rowid = '.$rowid;
 
         $result = $this->db->query($sql);
         if ($result) {
@@ -3488,17 +3488,17 @@ 
 
             if ($objp) {
                 $this->id = $objp->rowid;
-                $this->rowid = $objp->rowid;     // deprecated
+                $this->rowid = $objp->rowid; // deprecated
                 $this->fk_propal = $objp->fk_propal;
                 $this->fk_parent_line = $objp->fk_parent_line;
                 $this->label = $objp->custom_label;
                 $this->desc = $objp->description;
                 $this->qty = $objp->qty;
-                $this->price = $objp->price;  // deprecated
+                $this->price = $objp->price; // deprecated
                 $this->subprice = $objp->subprice;
                 $this->vat_src_code = $objp->vat_src_code;
                 $this->tva_tx = $objp->tva_tx;
-                $this->remise = $objp->remise;    // deprecated
+                $this->remise = $objp->remise; // deprecated
                 $this->remise_percent = $objp->remise_percent;
                 $this->fk_remise_except = $objp->fk_remise_except;
                 $this->fk_product = $objp->fk_product;
@@ -3519,9 +3519,9 @@ 
                 $this->product_type = $objp->product_type;
                 $this->rang = $objp->rang;
 
-                $this->ref = $objp->product_ref;      // deprecated
+                $this->ref = $objp->product_ref; // deprecated
                 $this->product_ref = $objp->product_ref;
-                $this->libelle = $objp->product_label;  // deprecated
+                $this->libelle = $objp->product_label; // deprecated
                 $this->product_label = $objp->product_label;
                 $this->product_desc = $objp->product_desc;
                 $this->fk_unit = $objp->fk_unit;
@@ -3562,7 +3562,7 @@ 
 
         $error = 0;
 
-        dol_syslog(get_class($this) . "::insert rang=" . $this->rang);
+        dol_syslog(get_class($this)."::insert rang=".$this->rang);
 
         $pa_ht_isemptystring = (empty($this->pa_ht) && $this->pa_ht == ''); // If true, we can use a default value. If this->pa_ht = '0', we must use '0'.
         // Clean parameters
@@ -3623,7 +3623,7 @@ 
         $this->db->begin();
 
         // Insert line into database
-        $sql = 'INSERT INTO ' . MAIN_DB_PREFIX . 'propaldet';
+        $sql = 'INSERT INTO '.MAIN_DB_PREFIX.'propaldet';
         $sql .= ' (fk_propal, fk_parent_line, label, description, fk_product, product_type,';
         $sql .= ' fk_remise_except, qty, vat_src_code, tva_tx, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type,';
         $sql .= ' subprice, remise_percent, ';
@@ -3632,47 +3632,47 @@ 
         $sql .= ' fk_unit,';
         $sql .= ' date_start, date_end';
         $sql .= ', fk_multicurrency, multicurrency_code, multicurrency_subprice, multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc)';
-        $sql .= " VALUES (" . $this->fk_propal . ",";
-        $sql .= " " . ($this->fk_parent_line > 0 ? "'" . $this->db->escape($this->fk_parent_line) . "'" : "null") . ",";
-        $sql .= " " . (!empty($this->label) ? "'" . $this->db->escape($this->label) . "'" : "null") . ",";
-        $sql .= " '" . $this->db->escape($this->desc) . "',";
-        $sql .= " " . ($this->fk_product ? "'" . $this->db->escape($this->fk_product) . "'" : "null") . ",";
-        $sql .= " '" . $this->db->escape($this->product_type) . "',";
-        $sql .= " " . ($this->fk_remise_except ? "'" . $this->db->escape($this->fk_remise_except) . "'" : "null") . ",";
-        $sql .= " " . price2num($this->qty) . ",";
-        $sql .= " " . (empty($this->vat_src_code) ? "''" : "'" . $this->db->escape($this->vat_src_code) . "'") . ",";
-        $sql .= " " . price2num($this->tva_tx) . ",";
-        $sql .= " " . price2num($this->localtax1_tx) . ",";
-        $sql .= " " . price2num($this->localtax2_tx) . ",";
-        $sql .= " '" . $this->db->escape($this->localtax1_type) . "',";
-        $sql .= " '" . $this->db->escape($this->localtax2_type) . "',";
-        $sql .= " " . (price2num($this->subprice) !== '' ? price2num($this->subprice) : "null") . ",";
-        $sql .= " " . price2num($this->remise_percent) . ",";
-        $sql .= " " . (isset($this->info_bits) ? "'" . $this->db->escape($this->info_bits) . "'" : "null") . ",";
-        $sql .= " " . price2num($this->total_ht) . ",";
-        $sql .= " " . price2num($this->total_tva) . ",";
-        $sql .= " " . price2num($this->total_localtax1) . ",";
-        $sql .= " " . price2num($this->total_localtax2) . ",";
-        $sql .= " " . price2num($this->total_ttc) . ",";
-        $sql .= " " . (!empty($this->fk_fournprice) ? "'" . $this->db->escape($this->fk_fournprice) . "'" : "null") . ",";
-        $sql .= " " . (isset($this->pa_ht) ? "'" . price2num($this->pa_ht) . "'" : "null") . ",";
-        $sql .= ' ' . $this->special_code . ',';
-        $sql .= ' ' . $this->rang . ',';
-        $sql .= ' ' . (!$this->fk_unit ? 'NULL' : $this->fk_unit) . ',';
-        $sql .= " " . (!empty($this->date_start) ? "'" . $this->db->idate($this->date_start) . "'" : "null") . ',';
-        $sql .= " " . (!empty($this->date_end) ? "'" . $this->db->idate($this->date_end) . "'" : "null");
-        $sql .= ", " . ($this->fk_multicurrency > 0 ? $this->fk_multicurrency : 'null');
-        $sql .= ", '" . $this->db->escape($this->multicurrency_code) . "'";
-        $sql .= ", " . $this->multicurrency_subprice;
-        $sql .= ", " . $this->multicurrency_total_ht;
-        $sql .= ", " . $this->multicurrency_total_tva;
-        $sql .= ", " . $this->multicurrency_total_ttc;
+        $sql .= " VALUES (".$this->fk_propal.",";
+        $sql .= " ".($this->fk_parent_line > 0 ? "'".$this->db->escape($this->fk_parent_line)."'" : "null").",";
+        $sql .= " ".(!empty($this->label) ? "'".$this->db->escape($this->label)."'" : "null").",";
+        $sql .= " '".$this->db->escape($this->desc)."',";
+        $sql .= " ".($this->fk_product ? "'".$this->db->escape($this->fk_product)."'" : "null").",";
+        $sql .= " '".$this->db->escape($this->product_type)."',";
+        $sql .= " ".($this->fk_remise_except ? "'".$this->db->escape($this->fk_remise_except)."'" : "null").",";
+        $sql .= " ".price2num($this->qty).",";
+        $sql .= " ".(empty($this->vat_src_code) ? "''" : "'".$this->db->escape($this->vat_src_code)."'").",";
+        $sql .= " ".price2num($this->tva_tx).",";
+        $sql .= " ".price2num($this->localtax1_tx).",";
+        $sql .= " ".price2num($this->localtax2_tx).",";
+        $sql .= " '".$this->db->escape($this->localtax1_type)."',";
+        $sql .= " '".$this->db->escape($this->localtax2_type)."',";
+        $sql .= " ".(price2num($this->subprice) !== '' ? price2num($this->subprice) : "null").",";
+        $sql .= " ".price2num($this->remise_percent).",";
+        $sql .= " ".(isset($this->info_bits) ? "'".$this->db->escape($this->info_bits)."'" : "null").",";
+        $sql .= " ".price2num($this->total_ht).",";
+        $sql .= " ".price2num($this->total_tva).",";
+        $sql .= " ".price2num($this->total_localtax1).",";
+        $sql .= " ".price2num($this->total_localtax2).",";
+        $sql .= " ".price2num($this->total_ttc).",";
+        $sql .= " ".(!empty($this->fk_fournprice) ? "'".$this->db->escape($this->fk_fournprice)."'" : "null").",";
+        $sql .= " ".(isset($this->pa_ht) ? "'".price2num($this->pa_ht)."'" : "null").",";
+        $sql .= ' '.$this->special_code.',';
+        $sql .= ' '.$this->rang.',';
+        $sql .= ' '.(!$this->fk_unit ? 'NULL' : $this->fk_unit).',';
+        $sql .= " ".(!empty($this->date_start) ? "'".$this->db->idate($this->date_start)."'" : "null").',';
+        $sql .= " ".(!empty($this->date_end) ? "'".$this->db->idate($this->date_end)."'" : "null");
+        $sql .= ", ".($this->fk_multicurrency > 0 ? $this->fk_multicurrency : 'null');
+        $sql .= ", '".$this->db->escape($this->multicurrency_code)."'";
+        $sql .= ", ".$this->multicurrency_subprice;
+        $sql .= ", ".$this->multicurrency_total_ht;
+        $sql .= ", ".$this->multicurrency_total_tva;
+        $sql .= ", ".$this->multicurrency_total_ttc;
         $sql .= ')';
 
-        dol_syslog(get_class($this) . '::insert', LOG_DEBUG);
+        dol_syslog(get_class($this).'::insert', LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql) {
-            $this->rowid = $this->db->last_insert_id(MAIN_DB_PREFIX . 'propaldet');
+            $this->rowid = $this->db->last_insert_id(MAIN_DB_PREFIX.'propaldet');
 
             if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) { // For avoid conflicts if trigger used
                 $this->id = $this->rowid;
@@ -3695,7 +3695,7 @@ 
             $this->db->commit();
             return 1;
         } else {
-            $this->error = $this->db->error() . " sql=" . $sql;
+            $this->error = $this->db->error()." sql=".$sql;
             $this->db->rollback();
             return -1;
         }
@@ -3715,7 +3715,7 @@ 
         $error = 0;
         $this->db->begin();
 
-        $sql = "DELETE FROM " . MAIN_DB_PREFIX . "propaldet WHERE rowid = " . $this->rowid;
+        $sql = "DELETE FROM ".MAIN_DB_PREFIX."propaldet WHERE rowid = ".$this->rowid;
         dol_syslog("PropaleLigne::delete", LOG_DEBUG);
         if ($this->db->query($sql)) {
 
@@ -3725,7 +3725,7 @@ 
                 $result = $this->deleteExtraFields();
                 if ($result < 0) {
                     $error++;
-                    dol_syslog(get_class($this) . "::delete error -4 " . $this->error, LOG_ERR);
+                    dol_syslog(get_class($this)."::delete error -4 ".$this->error, LOG_ERR);
                 }
             }
 
@@ -3743,7 +3743,7 @@ 
 
             return 1;
         } else {
-            $this->error = $this->db->error() . " sql=" . $sql;
+            $this->error = $this->db->error()." sql=".$sql;
             $this->db->rollback();
             return -1;
         }
@@ -3812,49 +3812,49 @@ 
         $this->db->begin();
 
         // Mise a jour ligne en base
-        $sql = "UPDATE " . MAIN_DB_PREFIX . "propaldet SET";
-        $sql .= " description='" . $this->db->escape($this->desc) . "'";
-        $sql .= ", label=" . (!empty($this->label) ? "'" . $this->db->escape($this->label) . "'" : "null");
-        $sql .= ", product_type=" . $this->product_type;
-        $sql .= ", vat_src_code = '" . (empty($this->vat_src_code) ? '' : $this->vat_src_code) . "'";
-        $sql .= ", tva_tx='" . price2num($this->tva_tx) . "'";
-        $sql .= ", localtax1_tx=" . price2num($this->localtax1_tx);
-        $sql .= ", localtax2_tx=" . price2num($this->localtax2_tx);
-        $sql .= ", localtax1_type='" . $this->db->escape($this->localtax1_type) . "'";
-        $sql .= ", localtax2_type='" . $this->db->escape($this->localtax2_type) . "'";
-        $sql .= ", qty='" . price2num($this->qty) . "'";
-        $sql .= ", subprice=" . price2num($this->subprice) . "";
-        $sql .= ", remise_percent=" . price2num($this->remise_percent) . "";
-        $sql .= ", price=" . price2num($this->price) . "";     // TODO A virer
-        $sql .= ", remise=" . price2num($this->remise) . "";    // TODO A virer
-        $sql .= ", info_bits='" . $this->db->escape($this->info_bits) . "'";
+        $sql = "UPDATE ".MAIN_DB_PREFIX."propaldet SET";
+        $sql .= " description='".$this->db->escape($this->desc)."'";
+        $sql .= ", label=".(!empty($this->label) ? "'".$this->db->escape($this->label)."'" : "null");
+        $sql .= ", product_type=".$this->product_type;
+        $sql .= ", vat_src_code = '".(empty($this->vat_src_code) ? '' : $this->vat_src_code)."'";
+        $sql .= ", tva_tx='".price2num($this->tva_tx)."'";
+        $sql .= ", localtax1_tx=".price2num($this->localtax1_tx);
+        $sql .= ", localtax2_tx=".price2num($this->localtax2_tx);
+        $sql .= ", localtax1_type='".$this->db->escape($this->localtax1_type)."'";
+        $sql .= ", localtax2_type='".$this->db->escape($this->localtax2_type)."'";
+        $sql .= ", qty='".price2num($this->qty)."'";
+        $sql .= ", subprice=".price2num($this->subprice)."";
+        $sql .= ", remise_percent=".price2num($this->remise_percent)."";
+        $sql .= ", price=".price2num($this->price).""; // TODO A virer
+        $sql .= ", remise=".price2num($this->remise).""; // TODO A virer
+        $sql .= ", info_bits='".$this->db->escape($this->info_bits)."'";
         if (empty($this->skip_update_total)) {
-            $sql .= ", total_ht=" . price2num($this->total_ht) . "";
-            $sql .= ", total_tva=" . price2num($this->total_tva) . "";
-            $sql .= ", total_ttc=" . price2num($this->total_ttc) . "";
-            $sql .= ", total_localtax1=" . price2num($this->total_localtax1) . "";
-            $sql .= ", total_localtax2=" . price2num($this->total_localtax2) . "";
-        }
-        $sql .= ", fk_product_fournisseur_price=" . (!empty($this->fk_fournprice) ? "'" . $this->db->escape($this->fk_fournprice) . "'" : "null");
-        $sql .= ", buy_price_ht=" . price2num($this->pa_ht);
+            $sql .= ", total_ht=".price2num($this->total_ht)."";
+            $sql .= ", total_tva=".price2num($this->total_tva)."";
+            $sql .= ", total_ttc=".price2num($this->total_ttc)."";
+            $sql .= ", total_localtax1=".price2num($this->total_localtax1)."";
+            $sql .= ", total_localtax2=".price2num($this->total_localtax2)."";
+        }
+        $sql .= ", fk_product_fournisseur_price=".(!empty($this->fk_fournprice) ? "'".$this->db->escape($this->fk_fournprice)."'" : "null");
+        $sql .= ", buy_price_ht=".price2num($this->pa_ht);
         if (strlen($this->special_code))
-            $sql .= ", special_code=" . $this->special_code;
-        $sql .= ", fk_parent_line=" . ($this->fk_parent_line > 0 ? $this->fk_parent_line : "null");
+            $sql .= ", special_code=".$this->special_code;
+        $sql .= ", fk_parent_line=".($this->fk_parent_line > 0 ? $this->fk_parent_line : "null");
         if (!empty($this->rang))
-            $sql .= ", rang=" . $this->rang;
-        $sql .= ", date_start=" . (!empty($this->date_start) ? "'" . $this->db->idate($this->date_start) . "'" : "null");
-        $sql .= ", date_end=" . (!empty($this->date_end) ? "'" . $this->db->idate($this->date_end) . "'" : "null");
-        $sql .= ", fk_unit=" . (!$this->fk_unit ? 'NULL' : $this->fk_unit);
+            $sql .= ", rang=".$this->rang;
+        $sql .= ", date_start=".(!empty($this->date_start) ? "'".$this->db->idate($this->date_start)."'" : "null");
+        $sql .= ", date_end=".(!empty($this->date_end) ? "'".$this->db->idate($this->date_end)."'" : "null");
+        $sql .= ", fk_unit=".(!$this->fk_unit ? 'NULL' : $this->fk_unit);
 
         // Multicurrency
-        $sql .= ", multicurrency_subprice=" . price2num($this->multicurrency_subprice) . "";
-        $sql .= ", multicurrency_total_ht=" . price2num($this->multicurrency_total_ht) . "";
-        $sql .= ", multicurrency_total_tva=" . price2num($this->multicurrency_total_tva) . "";
-        $sql .= ", multicurrency_total_ttc=" . price2num($this->multicurrency_total_ttc) . "";
+        $sql .= ", multicurrency_subprice=".price2num($this->multicurrency_subprice)."";
+        $sql .= ", multicurrency_total_ht=".price2num($this->multicurrency_total_ht)."";
+        $sql .= ", multicurrency_total_tva=".price2num($this->multicurrency_total_tva)."";
+        $sql .= ", multicurrency_total_ttc=".price2num($this->multicurrency_total_ttc)."";
 
-        $sql .= " WHERE rowid = " . $this->rowid;
+        $sql .= " WHERE rowid = ".$this->rowid;
 
-        dol_syslog(get_class($this) . "::update", LOG_DEBUG);
+        dol_syslog(get_class($this)."::update", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql) {
             if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) { // For avoid conflicts if trigger used
@@ -3897,11 +3897,11 @@ 
         $this->db->begin();
 
         // Mise a jour ligne en base
-        $sql = "UPDATE " . MAIN_DB_PREFIX . "propaldet SET";
-        $sql .= " total_ht=" . price2num($this->total_ht, 'MT') . "";
-        $sql .= ",total_tva=" . price2num($this->total_tva, 'MT') . "";
-        $sql .= ",total_ttc=" . price2num($this->total_ttc, 'MT') . "";
-        $sql .= " WHERE rowid = " . $this->rowid;
+        $sql = "UPDATE ".MAIN_DB_PREFIX."propaldet SET";
+        $sql .= " total_ht=".price2num($this->total_ht, 'MT')."";
+        $sql .= ",total_tva=".price2num($this->total_tva, 'MT')."";
+        $sql .= ",total_ttc=".price2num($this->total_ttc, 'MT')."";
+        $sql .= " WHERE rowid = ".$this->rowid;
 
         dol_syslog("PropaleLigne::update_total", LOG_DEBUG);
 

Braces +349 added lines, -240 removed lines

@@ -269,8 +269,9 @@ 
         // phpcs:enable
         global $conf, $mysoc;
 
-        if (!$qty)
-            $qty = 1;
+        if (!$qty) {
+                    $qty = 1;
+        }
 
         dol_syslog(get_class($this) . "::add_product $idproduct, $qty, $remise_percent");
         if ($idproduct > 0) {
@@ -281,8 +282,9 @@ 
 
             $tva_tx = get_default_tva($mysoc, $this->thirdparty, $prod->id);
             $tva_npr = get_default_npr($mysoc, $this->thirdparty, $prod->id);
-            if (empty($tva_tx))
-                $tva_npr = 0;
+            if (empty($tva_tx)) {
+                            $tva_npr = 0;
+            }
             $vat_src_code = '';     // May be defined into tva_tx
 
             $localtax1_tx = get_localtax($tva_tx, 1, $mysoc, $this->thirdparty, $tva_npr);
@@ -305,8 +307,9 @@ 
             $line->vat_src_code = $vat_src_code;
             $line->tva_tx = $tva_tx;
             $line->fk_unit = $prod->fk_unit;
-            if ($tva_npr)
-                $line->info_bits = 1;
+            if ($tva_npr) {
+                            $line->info_bits = 1;
+            }
 
             $this->lines[] = $line;
         }
@@ -429,16 +432,21 @@ 
             include_once DOL_DOCUMENT_ROOT . '/core/lib/price.lib.php';
 
             // Clean parameters
-            if (empty($remise_percent))
-                $remise_percent = 0;
-            if (empty($qty))
-                $qty = 0;
-            if (empty($info_bits))
-                $info_bits = 0;
-            if (empty($rang))
-                $rang = 0;
-            if (empty($fk_parent_line) || $fk_parent_line < 0)
-                $fk_parent_line = 0;
+            if (empty($remise_percent)) {
+                            $remise_percent = 0;
+            }
+            if (empty($qty)) {
+                            $qty = 0;
+            }
+            if (empty($info_bits)) {
+                            $info_bits = 0;
+            }
+            if (empty($rang)) {
+                            $rang = 0;
+            }
+            if (empty($fk_parent_line) || $fk_parent_line < 0) {
+                            $fk_parent_line = 0;
+            }
 
             $remise_percent = price2num($remise_percent);
             $qty = price2num($qty);
@@ -458,8 +466,9 @@ 
             }
 
             // Check parameters
-            if ($type < 0)
-                return -1;
+            if ($type < 0) {
+                            return -1;
+            }
 
             $this->db->begin();
 
@@ -574,8 +583,9 @@ 
             $this->line->multicurrency_total_ttc = $multicurrency_total_ttc;
 
             // Mise en option de la ligne
-            if (empty($qty) && empty($special_code))
-                $this->line->special_code = 3;
+            if (empty($qty) && empty($special_code)) {
+                            $this->line->special_code = 3;
+            }
 
             // TODO deprecated
             $this->line->price = $price;
@@ -588,8 +598,9 @@ 
             $result = $this->line->insert();
             if ($result > 0) {
                 // Reorder if child line
-                if (!empty($fk_parent_line))
-                    $this->line_order(true, 'DESC');
+                if (!empty($fk_parent_line)) {
+                                    $this->line_order(true, 'DESC');
+                }
 
                 // Mise a jour informations denormalisees au niveau de la propale meme
                 $result = $this->update_price(1, 'auto', 0, $mysoc); // This method is designed to add line from user input so total calculation must be done using 'auto' mode.
@@ -657,12 +668,17 @@ 
         $txlocaltax1 = price2num($txlocaltax1);
         $txlocaltax2 = price2num($txlocaltax2);
         $pa_ht = price2num($pa_ht);
-        if (empty($qty) && empty($special_code))
-            $special_code = 3;    // Set option tag
-        if (!empty($qty) && $special_code == 3)
-            $special_code = 0;    // Remove option tag
-        if (empty($type))
-            $type = 0;
+        if (empty($qty) && empty($special_code)) {
+                    $special_code = 3;
+        }
+        // Set option tag
+        if (!empty($qty) && $special_code == 3) {
+                    $special_code = 0;
+        }
+        // Remove option tag
+        if (empty($type)) {
+                    $type = 0;
+        }
 
         if ($this->statut == self::STATUS_DRAFT) {
             $this->db->begin();
@@ -770,8 +786,9 @@ 
             $result = $this->line->update($notrigger);
             if ($result > 0) {
                 // Reorder if child line
-                if (!empty($fk_parent_line))
-                    $this->line_order(true, 'DESC');
+                if (!empty($fk_parent_line)) {
+                                    $this->line_order(true, 'DESC');
+                }
 
                 $this->update_price(1);
 
@@ -780,8 +797,7 @@ 
 
                 $this->db->commit();
                 return $result;
-            }
-            else {
+            } else {
                 $this->error = $this->line->error;
 
                 $this->db->rollback();
@@ -842,21 +858,26 @@ 
         $now = dol_now();
 
         // Clean parameters
-        if (empty($this->entity))
-            $this->entity = $conf->entity;
-        if (empty($this->date))
-            $this->date = $this->datep;
+        if (empty($this->entity)) {
+                    $this->entity = $conf->entity;
+        }
+        if (empty($this->date)) {
+                    $this->date = $this->datep;
+        }
         $this->fin_validite = $this->date + ($this->duree_validite * 24 * 3600);
-        if (empty($this->availability_id))
-            $this->availability_id = 0;
-        if (empty($this->demand_reason_id))
-            $this->demand_reason_id = 0;
+        if (empty($this->availability_id)) {
+                    $this->availability_id = 0;
+        }
+        if (empty($this->demand_reason_id)) {
+                    $this->demand_reason_id = 0;
+        }
 
         // Multicurrency (test on $this->multicurrency_tx because we should take the default rate only if not using origin rate)
-        if (!empty($this->multicurrency_code) && empty($this->multicurrency_tx))
-            list($this->fk_multicurrency, $this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code, $this->date);
-        else
-            $this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
+        if (!empty($this->multicurrency_code) && empty($this->multicurrency_tx)) {
+                    list($this->fk_multicurrency, $this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code, $this->date);
+        } else {
+                    $this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
+        }
         if (empty($this->fk_multicurrency)) {
             $this->multicurrency_code = $conf->currency;
             $this->fk_multicurrency = 0;
@@ -970,8 +991,9 @@ 
 
                 dol_syslog(get_class($this) . "::create", LOG_DEBUG);
                 $resql = $this->db->query($sql);
-                if (!$resql)
-                    $error++;
+                if (!$resql) {
+                                    $error++;
+                }
 
                 if (!empty($this->linkedObjectsIds) && empty($this->linked_objects)) { // To use new linkedObjectsIds instead of old linked_objects
                     $this->linked_objects = $this->linkedObjectsIds; // TODO Replace linked_objects with linkedObjectsIds
@@ -1003,8 +1025,9 @@ 
                 if (!$error && $this->origin && $this->origin_id) {
                     dol_syslog('Deprecated use of linked object, use ->linkedObjectsIds instead', LOG_WARNING);
                     $ret = $this->add_object_linked();
-                    if (!$ret)
-                        dol_print_error($this->db);
+                    if (!$ret) {
+                                            dol_print_error($this->db);
+                    }
                 }
 
                 /*
@@ -1027,8 +1050,9 @@ 
                         }
                         // Complete vat rate with code
                         $vatrate = $line->tva_tx;
-                        if ($line->vat_src_code && !preg_match('/\(.*\)/', $vatrate))
-                            $vatrate .= ' (' . $line->vat_src_code . ')';
+                        if ($line->vat_src_code && !preg_match('/\(.*\)/', $vatrate)) {
+                                                    $vatrate .= ' (' . $line->vat_src_code . ')';
+                        }
 
                         $result = $this->addline(
                             $line->desc, $line->subprice, $line->qty, $vatrate, $line->localtax1_tx, $line->localtax2_tx, $line->fk_product, $line->remise_percent, 'HT', 0, $line->info_bits, $line->product_type, $line->rang, $line->special_code, $fk_parent_line, $line->fk_fournprice, $line->pa_ht, $line->label, $line->date_start, $line->date_end, $line->array_options, $line->fk_unit, $this->element, $line->id
@@ -1143,8 +1167,9 @@ 
         $this->db->begin();
 
         // get extrafields so they will be clone
-        foreach ($this->lines as $line)
-            $line->fetch_optionals();
+        foreach ($this->lines as $line) {
+                    $line->fetch_optionals();
+        }
 
         // Load dest object
         $clonedObj = clone $this;
@@ -1190,22 +1215,25 @@ 
         $clonedObj->date = $now;
         $clonedObj->datep = $now;    // deprecated
         $clonedObj->fin_validite = $clonedObj->date + ($clonedObj->duree_validite * 24 * 3600);
-        if (empty($conf->global->MAIN_KEEP_REF_CUSTOMER_ON_CLONING))
-            $clonedObj->ref_client = '';
+        if (empty($conf->global->MAIN_KEEP_REF_CUSTOMER_ON_CLONING)) {
+                    $clonedObj->ref_client = '';
+        }
 
         // Create clone
         $result = $clonedObj->create($user);
-        if ($result < 0)
-            $error++;
-        else {
+        if ($result < 0) {
+                    $error++;
+        } else {
             // copy internal contacts
-            if ($clonedObj->copy_linked_contact($this, 'internal') < 0)
-                $error++;
+            if ($clonedObj->copy_linked_contact($this, 'internal') < 0) {
+                            $error++;
+            }
 
             // copy external contacts if same company
             elseif ($this->socid == $clonedObj->socid) {
-                if ($clonedObj->copy_linked_contact($this, 'external') < 0)
-                    $error++;
+                if ($clonedObj->copy_linked_contact($this, 'external') < 0) {
+                                    $error++;
+                }
             }
         }
 
@@ -1215,8 +1243,9 @@ 
                 $parameters = array('objFrom' => $this, 'clonedObj' => $clonedObj);
                 $action = '';
                 $reshook = $hookmanager->executeHooks('createFrom', $parameters, $clonedObj, $action);    // Note that $action and $object may have been modified by some hooks
-                if ($reshook < 0)
-                    $error++;
+                if ($reshook < 0) {
+                                    $error++;
+                }
             }
         }
 
@@ -1280,8 +1309,9 @@ 
         if ($ref) {
             $sql .= " WHERE p.entity IN (" . getEntity('propal') . ")"; // Dont't use entity if you use rowid
             $sql .= " AND p.ref='" . $this->db->escape($ref) . "'";
-        } else
-            $sql .= " WHERE p.rowid=" . $rowid;
+        } else {
+                    $sql .= " WHERE p.rowid=" . $rowid;
+        }
 
         dol_syslog(get_class($this) . "::fetch", LOG_DEBUG);
         $resql = $this->db->query($sql);
@@ -1404,18 +1434,24 @@ 
         $error = 0;
 
         // Clean parameters
-        if (isset($this->ref))
-            $this->ref = trim($this->ref);
-        if (isset($this->ref_client))
-            $this->ref_client = trim($this->ref_client);
-        if (isset($this->note) || isset($this->note_private))
-            $this->note_private = (isset($this->note_private) ? trim($this->note_private) : trim($this->note));
-        if (isset($this->note_public))
-            $this->note_public = trim($this->note_public);
-        if (isset($this->modelpdf))
-            $this->modelpdf = trim($this->modelpdf);
-        if (isset($this->import_key))
-            $this->import_key = trim($this->import_key);
+        if (isset($this->ref)) {
+                    $this->ref = trim($this->ref);
+        }
+        if (isset($this->ref_client)) {
+                    $this->ref_client = trim($this->ref_client);
+        }
+        if (isset($this->note) || isset($this->note_private)) {
+                    $this->note_private = (isset($this->note_private) ? trim($this->note_private) : trim($this->note));
+        }
+        if (isset($this->note_public)) {
+                    $this->note_public = trim($this->note_public);
+        }
+        if (isset($this->modelpdf)) {
+                    $this->modelpdf = trim($this->modelpdf);
+        }
+        if (isset($this->import_key)) {
+                    $this->import_key = trim($this->import_key);
+        }
 
         // Check parameters
         // Put here code to add control on parameters values
@@ -1465,8 +1501,9 @@ 
         if (!$error && !$notrigger) {
             // Call trigger
             $result = $this->call_trigger('PROPAL_MODIFY', $user);
-            if ($result < 0)
-                $error++;
+            if ($result < 0) {
+                            $error++;
+            }
             // End call triggers
         }
 
@@ -1506,8 +1543,9 @@ 
         $sql .= ' FROM ' . MAIN_DB_PREFIX . 'propaldet as d';
         $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'product as p ON (d.fk_product = p.rowid)';
         $sql .= ' WHERE d.fk_propal = ' . $this->id;
-        if ($only_product)
-            $sql .= ' AND p.fk_product_type = 0';
+        if ($only_product) {
+                    $sql .= ' AND p.fk_product_type = 0';
+        }
         $sql .= ' ORDER by d.rang';
 
         dol_syslog(get_class($this) . "::fetch_lines", LOG_DEBUG);
@@ -1750,8 +1788,9 @@ 
             if (!$notrigger && empty($error)) {
                 // Call trigger
                 $result = $this->call_trigger('PROPAL_MODIFY', $user);
-                if ($result < 0)
-                    $error++;
+                if ($result < 0) {
+                                    $error++;
+                }
                 // End call triggers
             }
 
@@ -1805,8 +1844,9 @@ 
             if (!$notrigger && empty($error)) {
                 // Call trigger
                 $result = $this->call_trigger('PROPAL_MODIFY', $user);
-                if ($result < 0)
-                    $error++;
+                if ($result < 0) {
+                                    $error++;
+                }
                 // End call triggers
             }
 
@@ -1860,8 +1900,9 @@ 
             if (!$notrigger && empty($error)) {
                 // Call trigger
                 $result = $this->call_trigger('PROPAL_MODIFY', $user);
-                if ($result < 0)
-                    $error++;
+                if ($result < 0) {
+                                    $error++;
+                }
                 // End call triggers
             }
 
@@ -1916,8 +1957,9 @@ 
             if (!$notrigger && empty($error)) {
                 // Call trigger
                 $result = $this->call_trigger('PROPAL_MODIFY', $user);
-                if ($result < 0)
-                    $error++;
+                if ($result < 0) {
+                                    $error++;
+                }
                 // End call triggers
             }
 
@@ -1980,8 +2022,9 @@ 
             if (!$notrigger && empty($error)) {
                 // Call trigger
                 $result = $this->call_trigger('PROPAL_MODIFY', $user);
-                if ($result < 0)
-                    $error++;
+                if ($result < 0) {
+                                    $error++;
+                }
                 // End call triggers
             }
 
@@ -2040,8 +2083,9 @@ 
             if (!$notrigger && empty($error)) {
                 // Call trigger
                 $result = $this->call_trigger('PROPAL_MODIFY', $user);
-                if ($result < 0)
-                    $error++;
+                if ($result < 0) {
+                                    $error++;
+                }
                 // End call triggers
             }
 
@@ -2101,8 +2145,9 @@ 
             if (!$notrigger && empty($error)) {
                 // Call trigger
                 $result = $this->call_trigger('PROPAL_MODIFY', $user);
-                if ($result < 0)
-                    $error++;
+                if ($result < 0) {
+                                    $error++;
+                }
                 // End call triggers
             }
 
@@ -2161,8 +2206,9 @@ 
             if (!$notrigger && empty($error)) {
                 // Call trigger
                 $result = $this->call_trigger('PROPAL_MODIFY', $user);
-                if ($result < 0)
-                    $error++;
+                if ($result < 0) {
+                                    $error++;
+                }
                 // End call triggers
             }
 
@@ -2197,8 +2243,9 @@ 
 
         $sql = "UPDATE " . MAIN_DB_PREFIX . "propal";
         $sql .= " SET fk_statut = " . $this->statut . ",";
-        if (!empty($note))
-            $sql .= " note_private = '" . $this->db->escape($note) . "',";
+        if (!empty($note)) {
+                    $sql .= " note_private = '" . $this->db->escape($note) . "',";
+        }
         $sql .= " date_cloture=NULL, fk_user_cloture=NULL";
         $sql .= " WHERE rowid = " . $this->id;
 
@@ -2362,8 +2409,9 @@ 
         if (!$notrigger && empty($error)) {
             // Call trigger
             $result = $this->call_trigger('PROPAL_MODIFY', $user);
-            if ($result < 0)
-                $error++;
+            if ($result < 0) {
+                            $error++;
+            }
             // End call triggers
         }
 
@@ -2414,8 +2462,9 @@ 
         if (!$notrigger && empty($error)) {
             // Call trigger
             $result = $this->call_trigger('PROPAL_MODIFY', $user);
-            if ($result < 0)
-                $error++;
+            if ($result < 0) {
+                            $error++;
+            }
             // End call triggers
         }
 
@@ -2456,23 +2505,28 @@ 
         $sql = "SELECT s.rowid, s.nom as name, s.client,";
         $sql .= " p.rowid as propalid, p.fk_statut, p.total_ht, p.ref, p.remise, ";
         $sql .= " p.datep as dp, p.fin_validite as datelimite";
-        if (!$user->rights->societe->client->voir && !$socid)
-            $sql .= ", sc.fk_soc, sc.fk_user";
+        if (!$user->rights->societe->client->voir && !$socid) {
+                    $sql .= ", sc.fk_soc, sc.fk_user";
+        }
         $sql .= " FROM " . MAIN_DB_PREFIX . "societe as s, " . MAIN_DB_PREFIX . "propal as p, " . MAIN_DB_PREFIX . "c_propalst as c";
-        if (!$user->rights->societe->client->voir && !$socid)
-            $sql .= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc";
+        if (!$user->rights->societe->client->voir && !$socid) {
+                    $sql .= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc";
+        }
         $sql .= " WHERE p.entity IN (" . getEntity('propal') . ")";
         $sql .= " AND p.fk_soc = s.rowid";
         $sql .= " AND p.fk_statut = c.id";
         if (!$user->rights->societe->client->voir && !$socid) { //restriction
             $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " . $user->id;
         }
-        if ($socid)
-            $sql .= " AND s.rowid = " . $socid;
-        if ($draft)
-            $sql .= " AND p.fk_statut = " . self::STATUS_DRAFT;
-        if ($notcurrentuser > 0)
-            $sql .= " AND p.fk_user_author <> " . $user->id;
+        if ($socid) {
+                    $sql .= " AND s.rowid = " . $socid;
+        }
+        if ($draft) {
+                    $sql .= " AND p.fk_statut = " . self::STATUS_DRAFT;
+        }
+        if ($notcurrentuser > 0) {
+                    $sql .= " AND p.fk_user_author <> " . $user->id;
+        }
         $sql .= $this->db->order($sortfield, $sortorder);
         $sql .= $this->db->plimit($limit, $offset);
 
@@ -2583,8 +2637,9 @@ 
             } else {
                 return -1;
             }
-        } else
-            return $ga;
+        } else {
+                    return $ga;
+        }
     }
 
     /**
@@ -2619,13 +2674,15 @@ 
                 if ($this->db->query($sql)) {
                     // Delete linked object
                     $res = $this->deleteObjectLinked();
-                    if ($res < 0)
-                        $error++;
+                    if ($res < 0) {
+                                            $error++;
+                    }
 
                     // Delete linked contacts
                     $res = $this->delete_linked_contact();
-                    if ($res < 0)
-                        $error++;
+                    if ($res < 0) {
+                                            $error++;
+                    }
 
                     if (!$error) {
                         // We remove directory
@@ -2728,8 +2785,9 @@ 
             if (!$notrigger && empty($error)) {
                 // Call trigger
                 $result = $this->call_trigger('PROPAL_MODIFY', $user);
-                if ($result < 0)
-                    $error++;
+                if ($result < 0) {
+                                    $error++;
+                }
                 // End call triggers
             }
 
@@ -2791,8 +2849,9 @@ 
             if (!$notrigger && empty($error)) {
                 // Call trigger
                 $result = $this->call_trigger('PROPAL_MODIFY', $user);
-                if ($result < 0)
-                    $error++;
+                if ($result < 0) {
+                                    $error++;
+                }
                 // End call triggers
             }
 
@@ -2905,31 +2964,33 @@ 
         }
 
         $statuttrans = '';
-        if ($statut == self::STATUS_DRAFT)
-            $statuttrans = 'statut0';
-        elseif ($statut == self::STATUS_VALIDATED)
-            $statuttrans = 'statut1';
-        elseif ($statut == self::STATUS_SIGNED)
-            $statuttrans = 'statut3';
-        elseif ($statut == self::STATUS_NOTSIGNED)
-            $statuttrans = 'statut5';
-        elseif ($statut == self::STATUS_BILLED)
-            $statuttrans = 'statut6';
-
-        if ($mode == 0)
-            return $this->labelstatut[$statut];
-        elseif ($mode == 1)
-            return $this->labelstatut_short[$statut];
-        elseif ($mode == 2)
-            return img_picto($this->labelstatut_short[$statut], $statuttrans) . ' ' . $this->labelstatut_short[$statut];
-        elseif ($mode == 3)
-            return img_picto($this->labelstatut[$statut], $statuttrans);
-        elseif ($mode == 4)
-            return img_picto($this->labelstatut[$statut], $statuttrans) . ' ' . $this->labelstatut[$statut];
-        elseif ($mode == 5)
-            return '<span class="hideonsmartphone">' . $this->labelstatut_short[$statut] . ' </span>' . img_picto($this->labelstatut[$statut], $statuttrans);
-        elseif ($mode == 6)
-            return '<span class="hideonsmartphone">' . $this->labelstatut[$statut] . ' </span>' . img_picto($this->labelstatut[$statut], $statuttrans);
+        if ($statut == self::STATUS_DRAFT) {
+                    $statuttrans = 'statut0';
+        } elseif ($statut == self::STATUS_VALIDATED) {
+                    $statuttrans = 'statut1';
+        } elseif ($statut == self::STATUS_SIGNED) {
+                    $statuttrans = 'statut3';
+        } elseif ($statut == self::STATUS_NOTSIGNED) {
+                    $statuttrans = 'statut5';
+        } elseif ($statut == self::STATUS_BILLED) {
+                    $statuttrans = 'statut6';
+        }
+
+        if ($mode == 0) {
+                    return $this->labelstatut[$statut];
+        } elseif ($mode == 1) {
+                    return $this->labelstatut_short[$statut];
+        } elseif ($mode == 2) {
+                    return img_picto($this->labelstatut_short[$statut], $statuttrans) . ' ' . $this->labelstatut_short[$statut];
+        } elseif ($mode == 3) {
+                    return img_picto($this->labelstatut[$statut], $statuttrans);
+        } elseif ($mode == 4) {
+                    return img_picto($this->labelstatut[$statut], $statuttrans) . ' ' . $this->labelstatut[$statut];
+        } elseif ($mode == 5) {
+                    return '<span class="hideonsmartphone">' . $this->labelstatut_short[$statut] . ' </span>' . img_picto($this->labelstatut[$statut], $statuttrans);
+        } elseif ($mode == 6) {
+                    return '<span class="hideonsmartphone">' . $this->labelstatut[$statut] . ' </span>' . img_picto($this->labelstatut[$statut], $statuttrans);
+        }
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -2955,12 +3016,15 @@ 
             $clause = " AND";
         }
         $sql .= $clause . " p.entity IN (" . getEntity('propal') . ")";
-        if ($mode == 'opened')
-            $sql .= " AND p.fk_statut = " . self::STATUS_VALIDATED;
-        if ($mode == 'signed')
-            $sql .= " AND p.fk_statut = " . self::STATUS_SIGNED;
-        if ($user->societe_id)
-            $sql .= " AND p.fk_soc = " . $user->societe_id;
+        if ($mode == 'opened') {
+                    $sql .= " AND p.fk_statut = " . self::STATUS_VALIDATED;
+        }
+        if ($mode == 'signed') {
+                    $sql .= " AND p.fk_statut = " . self::STATUS_SIGNED;
+        }
+        if ($user->societe_id) {
+                    $sql .= " AND p.fk_soc = " . $user->societe_id;
+        }
 
         $resql = $this->db->query($sql);
         if ($resql) {
@@ -3270,10 +3334,12 @@ 
         $linkend = '</a>';
 
         $result .= $linkstart;
-        if ($withpicto)
-            $result .= img_object(($notooltip ? '' : $label), $this->picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="' . (($withpicto != 2) ? 'paddingright ' : '') . 'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-        if ($withpicto != 2)
-            $result .= $this->ref;
+        if ($withpicto) {
+                    $result .= img_object(($notooltip ? '' : $label), $this->picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="' . (($withpicto != 2) ? 'paddingright ' : '') . 'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+        }
+        if ($withpicto != 2) {
+                    $result .= $this->ref;
+        }
         $result .= $linkend;
 
         return $result;
@@ -3566,46 +3632,66 @@ 
 
         $pa_ht_isemptystring = (empty($this->pa_ht) && $this->pa_ht == ''); // If true, we can use a default value. If this->pa_ht = '0', we must use '0'.
         // Clean parameters
-        if (empty($this->tva_tx))
-            $this->tva_tx = 0;
-        if (empty($this->localtax1_tx))
-            $this->localtax1_tx = 0;
-        if (empty($this->localtax2_tx))
-            $this->localtax2_tx = 0;
-        if (empty($this->localtax1_type))
-            $this->localtax1_type = 0;
-        if (empty($this->localtax2_type))
-            $this->localtax2_type = 0;
-        if (empty($this->total_localtax1))
-            $this->total_localtax1 = 0;
-        if (empty($this->total_localtax2))
-            $this->total_localtax2 = 0;
-        if (empty($this->rang))
-            $this->rang = 0;
-        if (empty($this->remise))
-            $this->remise = 0;
-        if (empty($this->remise_percent) || !is_numeric($this->remise_percent))
-            $this->remise_percent = 0;
-        if (empty($this->info_bits))
-            $this->info_bits = 0;
-        if (empty($this->special_code))
-            $this->special_code = 0;
-        if (empty($this->fk_parent_line))
-            $this->fk_parent_line = 0;
-        if (empty($this->fk_fournprice))
-            $this->fk_fournprice = 0;
-        if (!is_numeric($this->qty))
-            $this->qty = 0;
-        if (empty($this->pa_ht))
-            $this->pa_ht = 0;
-        if (empty($this->multicurrency_subprice))
-            $this->multicurrency_subprice = 0;
-        if (empty($this->multicurrency_total_ht))
-            $this->multicurrency_total_ht = 0;
-        if (empty($this->multicurrency_total_tva))
-            $this->multicurrency_total_tva = 0;
-        if (empty($this->multicurrency_total_ttc))
-            $this->multicurrency_total_ttc = 0;
+        if (empty($this->tva_tx)) {
+                    $this->tva_tx = 0;
+        }
+        if (empty($this->localtax1_tx)) {
+                    $this->localtax1_tx = 0;
+        }
+        if (empty($this->localtax2_tx)) {
+                    $this->localtax2_tx = 0;
+        }
+        if (empty($this->localtax1_type)) {
+                    $this->localtax1_type = 0;
+        }
+        if (empty($this->localtax2_type)) {
+                    $this->localtax2_type = 0;
+        }
+        if (empty($this->total_localtax1)) {
+                    $this->total_localtax1 = 0;
+        }
+        if (empty($this->total_localtax2)) {
+                    $this->total_localtax2 = 0;
+        }
+        if (empty($this->rang)) {
+                    $this->rang = 0;
+        }
+        if (empty($this->remise)) {
+                    $this->remise = 0;
+        }
+        if (empty($this->remise_percent) || !is_numeric($this->remise_percent)) {
+                    $this->remise_percent = 0;
+        }
+        if (empty($this->info_bits)) {
+                    $this->info_bits = 0;
+        }
+        if (empty($this->special_code)) {
+                    $this->special_code = 0;
+        }
+        if (empty($this->fk_parent_line)) {
+                    $this->fk_parent_line = 0;
+        }
+        if (empty($this->fk_fournprice)) {
+                    $this->fk_fournprice = 0;
+        }
+        if (!is_numeric($this->qty)) {
+                    $this->qty = 0;
+        }
+        if (empty($this->pa_ht)) {
+                    $this->pa_ht = 0;
+        }
+        if (empty($this->multicurrency_subprice)) {
+                    $this->multicurrency_subprice = 0;
+        }
+        if (empty($this->multicurrency_total_ht)) {
+                    $this->multicurrency_total_ht = 0;
+        }
+        if (empty($this->multicurrency_total_tva)) {
+                    $this->multicurrency_total_tva = 0;
+        }
+        if (empty($this->multicurrency_total_ttc)) {
+                    $this->multicurrency_total_ttc = 0;
+        }
 
         // if buy price not defined, define buyprice as configured in margin admin
         if ($this->pa_ht == 0 && $pa_ht_isemptystring) {
@@ -3617,8 +3703,9 @@ 
         }
 
         // Check parameters
-        if ($this->product_type < 0)
-            return -1;
+        if ($this->product_type < 0) {
+                    return -1;
+        }
 
         $this->db->begin();
 
@@ -3763,42 +3850,62 @@ 
 
         $pa_ht_isemptystring = (empty($this->pa_ht) && $this->pa_ht == ''); // If true, we can use a default value. If this->pa_ht = '0', we must use '0'.
         // Clean parameters
-        if (empty($this->tva_tx))
-            $this->tva_tx = 0;
-        if (empty($this->localtax1_tx))
-            $this->localtax1_tx = 0;
-        if (empty($this->localtax2_tx))
-            $this->localtax2_tx = 0;
-        if (empty($this->total_localtax1))
-            $this->total_localtax1 = 0;
-        if (empty($this->total_localtax2))
-            $this->total_localtax2 = 0;
-        if (empty($this->localtax1_type))
-            $this->localtax1_type = 0;
-        if (empty($this->localtax2_type))
-            $this->localtax2_type = 0;
-        if (empty($this->marque_tx))
-            $this->marque_tx = 0;
-        if (empty($this->marge_tx))
-            $this->marge_tx = 0;
-        if (empty($this->price))
-            $this->price = 0; // TODO A virer
-        if (empty($this->remise))
-            $this->remise = 0; // TODO A virer
-        if (empty($this->remise_percent))
-            $this->remise_percent = 0;
-        if (empty($this->info_bits))
-            $this->info_bits = 0;
-        if (empty($this->special_code))
-            $this->special_code = 0;
-        if (empty($this->fk_parent_line))
-            $this->fk_parent_line = 0;
-        if (empty($this->fk_fournprice))
-            $this->fk_fournprice = 0;
-        if (empty($this->subprice))
-            $this->subprice = 0;
-        if (empty($this->pa_ht))
-            $this->pa_ht = 0;
+        if (empty($this->tva_tx)) {
+                    $this->tva_tx = 0;
+        }
+        if (empty($this->localtax1_tx)) {
+                    $this->localtax1_tx = 0;
+        }
+        if (empty($this->localtax2_tx)) {
+                    $this->localtax2_tx = 0;
+        }
+        if (empty($this->total_localtax1)) {
+                    $this->total_localtax1 = 0;
+        }
+        if (empty($this->total_localtax2)) {
+                    $this->total_localtax2 = 0;
+        }
+        if (empty($this->localtax1_type)) {
+                    $this->localtax1_type = 0;
+        }
+        if (empty($this->localtax2_type)) {
+                    $this->localtax2_type = 0;
+        }
+        if (empty($this->marque_tx)) {
+                    $this->marque_tx = 0;
+        }
+        if (empty($this->marge_tx)) {
+                    $this->marge_tx = 0;
+        }
+        if (empty($this->price)) {
+                    $this->price = 0;
+        }
+        // TODO A virer
+        if (empty($this->remise)) {
+                    $this->remise = 0;
+        }
+        // TODO A virer
+        if (empty($this->remise_percent)) {
+                    $this->remise_percent = 0;
+        }
+        if (empty($this->info_bits)) {
+                    $this->info_bits = 0;
+        }
+        if (empty($this->special_code)) {
+                    $this->special_code = 0;
+        }
+        if (empty($this->fk_parent_line)) {
+                    $this->fk_parent_line = 0;
+        }
+        if (empty($this->fk_fournprice)) {
+                    $this->fk_fournprice = 0;
+        }
+        if (empty($this->subprice)) {
+                    $this->subprice = 0;
+        }
+        if (empty($this->pa_ht)) {
+                    $this->pa_ht = 0;
+        }
 
         // if buy price not defined, define buyprice as configured in margin admin
         if ($this->pa_ht == 0 && $pa_ht_isemptystring) {
@@ -3837,11 +3944,13 @@ 
         }
         $sql .= ", fk_product_fournisseur_price=" . (!empty($this->fk_fournprice) ? "'" . $this->db->escape($this->fk_fournprice) . "'" : "null");
         $sql .= ", buy_price_ht=" . price2num($this->pa_ht);
-        if (strlen($this->special_code))
-            $sql .= ", special_code=" . $this->special_code;
+        if (strlen($this->special_code)) {
+                    $sql .= ", special_code=" . $this->special_code;
+        }
         $sql .= ", fk_parent_line=" . ($this->fk_parent_line > 0 ? $this->fk_parent_line : "null");
-        if (!empty($this->rang))
-            $sql .= ", rang=" . $this->rang;
+        if (!empty($this->rang)) {
+                    $sql .= ", rang=" . $this->rang;
+        }
         $sql .= ", date_start=" . (!empty($this->date_start) ? "'" . $this->db->idate($this->date_start) . "'" : "null");
         $sql .= ", date_end=" . (!empty($this->date_end) ? "'" . $this->db->idate($this->date_end) . "'" : "null");
         $sql .= ", fk_unit=" . (!$this->fk_unit ? 'NULL' : $this->fk_unit);

dolibarr/htdocs/comm/propal/note.php

Spacing +35 added lines, -35 removed lines

@@ -27,23 +27,23 @@ 
  *	\ingroup    propal
  *	\brief      Fiche d'information sur une proposition commerciale
  */
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 
 require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/propal.lib.php';
-if (! empty($conf->projet->enabled)) {
-	require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
+if (!empty($conf->projet->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
 // Load translation files required by the page
 $langs->loadLangs(array('propal', 'compta', 'bills', 'companies'));
 
-$id = GETPOST('id','int');
-$ref=GETPOST('ref','alpha');
-$action=GETPOST('action','alpha');
+$id = GETPOST('id', 'int');
+$ref = GETPOST('ref', 'alpha');
+$action = GETPOST('action', 'alpha');
 
 // Security check
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->societe_id) $socid = $user->societe_id;
 $result = restrictedArea($user, 'propale', $id, 'propal');
 
 $object = new Propal($db);
@@ -53,9 +53,9 @@ 
  * Actions
  */
 
-$permissionnote=$user->rights->propale->creer;	// Used by the include of actions_setnotes.inc.php
+$permissionnote = $user->rights->propale->creer; // Used by the include of actions_setnotes.inc.php
 
-include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php';	// Must be include, not includ_once
+include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not includ_once
 
 
 
@@ -63,15 +63,15 @@ 
  * View
  */
 
-llxHeader('',$langs->trans('Proposal'),'EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos');
+llxHeader('', $langs->trans('Proposal'), 'EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos');
 
 $form = new Form($db);
 
-if ($id > 0 || ! empty($ref))
+if ($id > 0 || !empty($ref))
 {
 	if ($mesg) print $mesg;
 
-	$now=dol_now();
+	$now = dol_now();
 
 	if ($object->fetch($id, $ref) > 0)
 	{
@@ -80,63 +80,63 @@ 
 		    $head = propal_prepare_head($object);
 			dol_fiche_head($head, 'note', $langs->trans('Proposal'), -1, 'propal');
 
-			$cssclass='titlefield';
+			$cssclass = 'titlefield';
 			//if ($action == 'editnote_public') $cssclass='titlefieldcreate';
 			//if ($action == 'editnote_private') $cssclass='titlefieldcreate';
 
 
 			// Proposal card
 
-			$linkback = '<a href="' . DOL_URL_ROOT . '/comm/propal/list.php?restore_lastsearch_values=1' . (! empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+			$linkback = '<a href="'.DOL_URL_ROOT.'/comm/propal/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
 
-			$morehtmlref='<div class="refidno">';
+			$morehtmlref = '<div class="refidno">';
 			// Ref customer
-			$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
-			$morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
+			$morehtmlref .= $form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
+			$morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
 			// Thirdparty
-			$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
+			$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 			// Project
-			if (! empty($conf->projet->enabled))
+			if (!empty($conf->projet->enabled))
 			{
 			    $langs->load("projects");
-			    $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+			    $morehtmlref .= '<br>'.$langs->trans('Project').' ';
 			    if ($user->rights->propal->creer)
 			    {
 			        if ($action != 'classify')
 			            //$morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a>';
-			            $morehtmlref.=' : ';
+			            $morehtmlref .= ' : ';
 			            if ($action == 'classify') {
 			                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-			                $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-			                $morehtmlref.='<input type="hidden" name="action" value="classin">';
-			                $morehtmlref.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-			                $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-			                $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-			                $morehtmlref.='</form>';
+			                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+			                $morehtmlref .= '<input type="hidden" name="action" value="classin">';
+			                $morehtmlref .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+			                $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+			                $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+			                $morehtmlref .= '</form>';
 			            } else {
-			                $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+			                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
 			            }
 			    } else {
-			        if (! empty($object->fk_project)) {
+			        if (!empty($object->fk_project)) {
 			            $proj = new Project($db);
 			            $proj->fetch($object->fk_project);
-			            $morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
-			            $morehtmlref.=$proj->ref;
-			            $morehtmlref.='</a>';
+			            $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+			            $morehtmlref .= $proj->ref;
+			            $morehtmlref .= '</a>';
 			        } else {
-			            $morehtmlref.='';
+			            $morehtmlref .= '';
 			        }
 			    }
 			}
-			$morehtmlref.='</div>';
+			$morehtmlref .= '</div>';
 
 			dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
 			print '<div class="fichecenter">';
 			print '<div class="underbanner clearboth"></div>';
 
-			$cssclass="titlefield";
+			$cssclass = "titlefield";
 			include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
 
 			print '</div>';

dolibarr/htdocs/comm/propal/list.php

Spacing +155 added lines, -155 removed lines

@@ -35,16 +35,16 @@ 
  * 	\ingroup    	propal
  * 	\brief      	Page of commercial proposals card and list
  */
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formfile.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formpropal.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formcompany.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/comm/propal/class/propal.class.php';
-require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formpropal.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array('companies', 'propal', 'compta', 'bills', 'orders', 'products', 'deliveries', 'categories'));
@@ -129,7 +129,7 @@ 
 }
 $result = restrictedArea($user, $module, $objectid, $dbtable);
 
-$diroutputmassaction = $conf->propal->multidir_output[$conf->entity] . '/temp/massgeneration/' . $user->id;
+$diroutputmassaction = $conf->propal->multidir_output[$conf->entity].'/temp/massgeneration/'.$user->id;
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $object = new Propal($db);
@@ -182,7 +182,7 @@ 
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) {
     foreach ($extrafields->attribute_label as $key => $val) {
         if (!empty($extrafields->attribute_list[$key])) {
-            $arrayfields["ef." . $key] = array('label' => $extrafields->attribute_label[$key], 'checked' => (($extrafields->attribute_list[$key] < 0) ? 0 : 1), 'position' => $extrafields->attribute_pos[$key], 'enabled' => (abs($extrafields->attribute_list[$key]) != 3 && $extrafields->attribute_perms[$key]));
+            $arrayfields["ef.".$key] = array('label' => $extrafields->attribute_label[$key], 'checked' => (($extrafields->attribute_list[$key] < 0) ? 0 : 1), 'position' => $extrafields->attribute_pos[$key], 'enabled' => (abs($extrafields->attribute_list[$key]) != 3 && $extrafields->attribute_perms[$key]));
         }
     }
 }
@@ -200,12 +200,12 @@ 
 }
 
 $parameters = array('socid' => $socid);
-$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
     setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
 
-include DOL_DOCUMENT_ROOT . '/core/actions_changeselectedfields.inc.php';
+include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
 // Do we click on purge search criteria ?
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
@@ -253,7 +253,7 @@ 
     $permtodelete = $user->rights->propal->supprimer;
     $permtoclose = $user->rights->propal->cloturer;
     $uploaddir = $conf->propal->multidir_output[$conf->entity];
-    include DOL_DOCUMENT_ROOT . '/core/actions_massactions.inc.php';
+    include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
 
 
@@ -296,45 +296,45 @@ 
 
 // Add fields from extrafields
 foreach ($extrafields->attribute_label as $key => $val) {
-    $sql .= ($extrafields->attribute_type[$key] != 'separate' ? ",ef." . $key . ' as options_' . $key : '');
+    $sql .= ($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key.' as options_'.$key : '');
 }
 // Add fields from hooks
 $parameters = array();
-$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters);    // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
-$sql .= ' FROM ' . MAIN_DB_PREFIX . 'societe as s';
-$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_country as country on (country.rowid = s.fk_pays)";
-$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_typent as typent on (typent.id = s.fk_typent)";
-$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_departements as state on (state.rowid = s.fk_departement)";
+$sql .= ' FROM '.MAIN_DB_PREFIX.'societe as s';
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as country on (country.rowid = s.fk_pays)";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_typent as typent on (typent.id = s.fk_typent)";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as state on (state.rowid = s.fk_departement)";
 if (!empty($search_categ_cus)) {
-    $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . "categorie_societe as cc ON s.rowid = cc.fk_soc"; // We'll need this table joined to the select in order to filter by categ
+    $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_societe as cc ON s.rowid = cc.fk_soc"; // We'll need this table joined to the select in order to filter by categ
 }
 
-$sql .= ', ' . MAIN_DB_PREFIX . 'propal as p';
+$sql .= ', '.MAIN_DB_PREFIX.'propal as p';
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) {
-    $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "propal_extrafields as ef on (p.rowid = ef.fk_object)";
+    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."propal_extrafields as ef on (p.rowid = ef.fk_object)";
 }
 if ($sall || $search_product_category > 0) {
-    $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'propaldet as pd ON p.rowid=pd.fk_propal';
+    $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'propaldet as pd ON p.rowid=pd.fk_propal';
 }
 if ($search_product_category > 0) {
-    $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'categorie_product as cp ON cp.fk_product=pd.fk_product';
+    $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON cp.fk_product=pd.fk_product';
 }
-$sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'user as u ON p.fk_user_author = u.rowid';
-$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "projet as pr ON pr.rowid = p.fk_projet";
-$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_availability as ava on (ava.rowid = p.fk_availability)";
+$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'user as u ON p.fk_user_author = u.rowid';
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet as pr ON pr.rowid = p.fk_projet";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_availability as ava on (ava.rowid = p.fk_availability)";
 // We'll need this table joined to the select in order to filter by sale
 if ($search_sale > 0 || (!$user->rights->societe->client->voir && !$socid)) {
-    $sql .= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc";
+    $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 }
 if ($search_user > 0) {
-    $sql .= ", " . MAIN_DB_PREFIX . "element_contact as c";
-    $sql .= ", " . MAIN_DB_PREFIX . "c_type_contact as tc";
+    $sql .= ", ".MAIN_DB_PREFIX."element_contact as c";
+    $sql .= ", ".MAIN_DB_PREFIX."c_type_contact as tc";
 }
 $sql .= ' WHERE p.fk_soc = s.rowid';
-$sql .= ' AND p.entity IN (' . getEntity('propal') . ')';
+$sql .= ' AND p.entity IN ('.getEntity('propal').')';
 if (!$user->rights->societe->client->voir && !$socid) { //restriction
-    $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " . $user->id;
+    $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 }
 if ($search_town) {
     $sql .= natural_search('s.town', $search_town);
@@ -346,10 +346,10 @@ 
     $sql .= natural_search("state.nom", $search_state);
 }
 if ($search_country) {
-    $sql .= " AND s.fk_pays IN (" . $db->escape($search_country) . ')';
+    $sql .= " AND s.fk_pays IN (".$db->escape($search_country).')';
 }
 if ($search_type_thirdparty) {
-    $sql .= " AND s.fk_typent IN (" . $db->escape($search_type_thirdparty) . ')';
+    $sql .= " AND s.fk_typent IN (".$db->escape($search_type_thirdparty).')';
 }
 if ($search_ref) {
     $sql .= natural_search('p.ref', $search_ref);
@@ -361,7 +361,7 @@ 
     $sql .= natural_search('pr.ref', $search_refproject);
 }
 if ($search_availability) {
-    $sql .= " AND p.fk_availability IN (" . $db->escape($search_availability) . ')';
+    $sql .= " AND p.fk_availability IN (".$db->escape($search_availability).')';
 }
 
 if ($search_societe) {
@@ -383,36 +383,36 @@ 
     $sql .= natural_search(array_keys($fieldstosearchall), $sall);
 }
 if ($search_categ_cus > 0) {
-    $sql .= " AND cc.fk_categorie = " . $db->escape($search_categ_cus);
+    $sql .= " AND cc.fk_categorie = ".$db->escape($search_categ_cus);
 }
 if ($search_categ_cus == -2) {
     $sql .= " AND cc.fk_categorie IS NULL";
 }
 
 if ($search_product_category > 0) {
-    $sql .= " AND cp.fk_categorie = " . $db->escape($search_product_category);
+    $sql .= " AND cp.fk_categorie = ".$db->escape($search_product_category);
 }
 if ($socid > 0) {
-    $sql .= ' AND s.rowid = ' . $socid;
+    $sql .= ' AND s.rowid = '.$socid;
 }
 if ($viewstatut != '' && $viewstatut != '-1') {
-    $sql .= ' AND p.fk_statut IN (' . $db->escape($viewstatut) . ')';
+    $sql .= ' AND p.fk_statut IN ('.$db->escape($viewstatut).')';
 }
 $sql .= dolSqlDateFilter("p.datep", $search_day, $search_month, $search_year);
 $sql .= dolSqlDateFilter("p.fin_validite", $search_dayfin, $search_month_end, $search_yearfin);
 $sql .= dolSqlDateFilter("p.date_livraison", $search_daydelivery, $search_monthdelivery, $search_yeardelivery);
 if ($search_sale > 0) {
-    $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " . $db->escape($search_sale);
+    $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$db->escape($search_sale);
 }
 if ($search_user > 0) {
-    $sql .= " AND c.fk_c_type_contact = tc.rowid AND tc.element='propal' AND tc.source='internal' AND c.element_id = p.rowid AND c.fk_socpeople = " . $db->escape($search_user);
+    $sql .= " AND c.fk_c_type_contact = tc.rowid AND tc.element='propal' AND tc.source='internal' AND c.element_id = p.rowid AND c.fk_socpeople = ".$db->escape($search_user);
 }
 // Add where from extra fields
-include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_list_search_sql.tpl.php';
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
 
 // Add where from hooks
 $parameters = array();
-$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters);    // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 
 $sql .= $db->order($sortfield, $sortorder);
@@ -441,7 +441,7 @@ 
     if ($socid > 0) {
         $soc = new Societe($db);
         $soc->fetch($socid);
-        $title = $langs->trans('ListOfProposals') . ' - ' . $soc->name;
+        $title = $langs->trans('ListOfProposals').' - '.$soc->name;
         if (empty($search_societe))
             $search_societe = $soc->name;
     }
@@ -458,76 +458,76 @@ 
 
         $id = $obj->rowid;
 
-        header("Location: " . DOL_URL_ROOT . '/comm/propal/card.php?id=' . $id);
+        header("Location: ".DOL_URL_ROOT.'/comm/propal/card.php?id='.$id);
         exit;
     }
 
     llxHeader('', $langs->trans('Proposal'), $help_url);
 
-    $param = '&viewstatut=' . urlencode($viewstatut);
+    $param = '&viewstatut='.urlencode($viewstatut);
     if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
-        $param .= '&contextpage=' . urlencode($contextpage);
+        $param .= '&contextpage='.urlencode($contextpage);
     }
     if ($limit > 0 && $limit != $conf->liste_limit) {
-        $param .= '&limit=' . urlencode($limit);
+        $param .= '&limit='.urlencode($limit);
     }
     if ($sall) {
-        $param .= '&sall=' . urlencode($sall);
+        $param .= '&sall='.urlencode($sall);
     }
     if ($search_day) {
-        $param .= '&search_day=' . urlencode($search_day);
+        $param .= '&search_day='.urlencode($search_day);
     }
     if ($search_month) {
-        $param .= '&search_month=' . urlencode($search_month);
+        $param .= '&search_month='.urlencode($search_month);
     }
     if ($search_year) {
-        $param .= '&search_year=' . urlencode($search_year);
+        $param .= '&search_year='.urlencode($search_year);
     }
     if ($search_ref) {
-        $param .= '&search_ref=' . urlencode($search_ref);
+        $param .= '&search_ref='.urlencode($search_ref);
     }
     if ($search_refcustomer) {
-        $param .= '&search_refcustomer=' . urlencode($search_refcustomer);
+        $param .= '&search_refcustomer='.urlencode($search_refcustomer);
     }
     if ($search_refproject) {
-        $param .= '&search_refproject=' . urlencode($search_refproject);
+        $param .= '&search_refproject='.urlencode($search_refproject);
     }
     if ($search_societe) {
-        $param .= '&search_societe=' . urlencode($search_societe);
+        $param .= '&search_societe='.urlencode($search_societe);
     }
     if ($search_user > 0) {
-        $param .= '&search_user=' . urlencode($search_user);
+        $param .= '&search_user='.urlencode($search_user);
     }
     if ($search_sale > 0) {
-        $param .= '&search_sale=' . urlencode($search_sale);
+        $param .= '&search_sale='.urlencode($search_sale);
     }
     if ($search_montant_ht) {
-        $param .= '&search_montant_ht=' . urlencode($search_montant_ht);
+        $param .= '&search_montant_ht='.urlencode($search_montant_ht);
     }
     if ($search_login) {
-        $param .= '&search_login=' . urlencode($search_login);
+        $param .= '&search_login='.urlencode($search_login);
     }
     if ($search_town) {
-        $param .= '&search_town=' . urlencode($search_town);
+        $param .= '&search_town='.urlencode($search_town);
     }
     if ($search_zip) {
-        $param .= '&search_zip=' . urlencode($search_zip);
+        $param .= '&search_zip='.urlencode($search_zip);
     }
     if ($socid > 0) {
-        $param .= '&socid=' . urlencode($socid);
+        $param .= '&socid='.urlencode($socid);
     }
     if ($optioncss != '') {
-        $param .= '&optioncss=' . urlencode($optioncss);
+        $param .= '&optioncss='.urlencode($optioncss);
     }
     if ($search_categ_cus > 0) {
-        $param .= '&search_categ_cus=' . urlencode($search_categ_cus);
+        $param .= '&search_categ_cus='.urlencode($search_categ_cus);
     }
     if ($search_product_category != '') {
-        $param .= '&search_product_category=' . $search_product_category;
+        $param .= '&search_product_category='.$search_product_category;
     }
 
     // Add $param from extra fields
-    include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_list_search_param.tpl.php';
+    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
     // List of mass actions available
     $arrayofmassactions = array(
@@ -549,38 +549,38 @@ 
     $newcardbutton = '';
     if ($user->rights->propal->creer) {
         // $newcardbutton = '<a class="butActionNew" href="' . DOL_URL_ROOT . '/comm/propal/card.php?action=create"><span class="valignmiddle">' . $langs->trans('NewPropal') . '</span>';
-        $newcardbutton = '<a class="butActionNew" href = "' . BASE_URI . '?controller=comm/propal&method=card&action=create"><span class="valignmiddle">' . $langs->trans('NewPropal') . '</span>';
+        $newcardbutton = '<a class="butActionNew" href = "'.BASE_URI.'?controller=comm/propal&method=card&action=create"><span class="valignmiddle">'.$langs->trans('NewPropal').'</span>';
         $newcardbutton .= '<span class="fa fa-plus-circle valignmiddle"></span>';
         $newcardbutton .= '</a>';
     }
 
     // Lignes des champs de filtre
-    print '<form method="POST" id="searchFormList" action="' . $_SERVER["PHP_SELF"] . '">';
+    print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
     if ($optioncss != '') {
-        print '<input type="hidden" name="optioncss" value="' . $optioncss . '">';
+        print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
     }
-    print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
     print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
     print '<input type="hidden" name="action" value="list">';
-    print '<input type="hidden" name="sortfield" value="' . $sortfield . '">';
-    print '<input type="hidden" name="sortorder" value="' . $sortorder . '">';
-    print '<input type="hidden" name="page" value="' . $page . '">';
-    print '<input type="hidden" name="contextpage" value="' . $contextpage . '">';
+    print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+    print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+    print '<input type="hidden" name="page" value="'.$page.'">';
+    print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
     print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_commercial.png', 0, $newcardbutton, '', $limit);
 
     $topicmail = "SendPropalRef";
     $modelmail = "proposal_send";
     $objecttmp = new Propal($db);
-    $trackid = 'pro' . $object->id;
+    $trackid = 'pro'.$object->id;
 
-    include DOL_DOCUMENT_ROOT . '/core/tpl/massactions_pre.tpl.php';
+    include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
     if ($sall) {
         foreach ($fieldstosearchall as $key => $val) {
             $fieldstosearchall[$key] = $langs->trans($val);
         }
-        print '<div class="divsearchfieldfilter">' . $langs->trans("FilterOnInto", $sall) . join(', ', $fieldstosearchall) . '</div>';
+        print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';
     }
 
     $i = 0;
@@ -591,35 +591,35 @@ 
     if ($user->rights->societe->client->voir || $socid) {
         $langs->load("commercial");
         $moreforfilter .= '<div class="divsearchfield">';
-        $moreforfilter .= $langs->trans('ThirdPartiesOfSaleRepresentative') . ': ';
+        $moreforfilter .= $langs->trans('ThirdPartiesOfSaleRepresentative').': ';
         $moreforfilter .= $formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, 1, 'maxwidth200');
         $moreforfilter .= '</div>';
     }
     // If the user can view prospects other than his'
     if ($user->rights->societe->client->voir || $socid) {
         $moreforfilter .= '<div class="divsearchfield">';
-        $moreforfilter .= $langs->trans('LinkedToSpecificUsers') . ': ';
+        $moreforfilter .= $langs->trans('LinkedToSpecificUsers').': ';
         $moreforfilter .= $form->select_dolusers($search_user, 'search_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth200');
         $moreforfilter .= '</div>';
     }
     // If the user can view products
     if ($conf->categorie->enabled && ($user->rights->produit->lire || $user->rights->service->lire)) {
-        include_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
+        include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
         $moreforfilter .= '<div class="divsearchfield">';
-        $moreforfilter .= $langs->trans('IncludingProductWithTag') . ': ';
+        $moreforfilter .= $langs->trans('IncludingProductWithTag').': ';
         $cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, null, 'parent', null, null, 1);
         $moreforfilter .= $form->selectarray('search_product_category', $cate_arbo, $search_product_category, 1, 0, 0, '', 0, 0, 0, 0, 'maxwidth300', 1);
         $moreforfilter .= '</div>';
     }
     if (!empty($conf->categorie->enabled)) {
-        require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
+        require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
         $moreforfilter .= '<div class="divsearchfield">';
-        $moreforfilter .= $langs->trans('CustomersProspectsCategoriesShort') . ': ';
+        $moreforfilter .= $langs->trans('CustomersProspectsCategoriesShort').': ';
         $moreforfilter .= $formother->select_categories('customer', $search_categ_cus, 'search_categ_cus', 1);
         $moreforfilter .= '</div>';
     }
     $parameters = array();
-    $reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters);    // Note that $action and $object may have been modified by hook
+    $reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
     if (empty($reshook)) {
         $moreforfilter .= $hookmanager->resPrint;
     } else {
@@ -637,37 +637,37 @@ 
     $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
     print '<div class="div-table-responsive">';
-    print '<table class="tagtable liste' . ($moreforfilter ? " listwithfilterbefore" : "") . '">' . "\n";
+    print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
     print '<tr class="liste_titre_filter">';
     if (!empty($arrayfields['p.ref']['checked'])) {
         print '<td class="liste_titre">';
-        print '<input class="flat" size="6" type="text" name="search_ref" value="' . dol_escape_htmltag($search_ref) . '">';
+        print '<input class="flat" size="6" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
         print '</td>';
     }
     if (!empty($arrayfields['p.ref_client']['checked'])) {
         print '<td class="liste_titre">';
-        print '<input class="flat" size="6" type="text" name="search_refcustomer" value="' . dol_escape_htmltag($search_refcustomer) . '">';
+        print '<input class="flat" size="6" type="text" name="search_refcustomer" value="'.dol_escape_htmltag($search_refcustomer).'">';
         print '</td>';
     }
     if (!empty($arrayfields['pr.ref']['checked'])) {
         print '<td class="liste_titre">';
-        print '<input class="flat" size="6" type="text" name="search_refproject" value="' . dol_escape_htmltag($search_refproject) . '">';
+        print '<input class="flat" size="6" type="text" name="search_refproject" value="'.dol_escape_htmltag($search_refproject).'">';
         print '</td>';
     }
     if (!empty($arrayfields['s.nom']['checked'])) {
         print '<td class="liste_titre" align="left">';
-        print '<input class="flat" type="text" size="10" name="search_societe" value="' . dol_escape_htmltag($search_societe) . '">';
+        print '<input class="flat" type="text" size="10" name="search_societe" value="'.dol_escape_htmltag($search_societe).'">';
         print '</td>';
     }
     if (!empty($arrayfields['s.town']['checked']))
-        print '<td class="liste_titre"><input class="flat" type="text" size="6" name="search_town" value="' . $search_town . '"></td>';
+        print '<td class="liste_titre"><input class="flat" type="text" size="6" name="search_town" value="'.$search_town.'"></td>';
     if (!empty($arrayfields['s.zip']['checked']))
-        print '<td class="liste_titre"><input class="flat" type="text" size="4" name="search_zip" value="' . $search_zip . '"></td>';
+        print '<td class="liste_titre"><input class="flat" type="text" size="4" name="search_zip" value="'.$search_zip.'"></td>';
     // State
     if (!empty($arrayfields['state.nom']['checked'])) {
         print '<td class="liste_titre">';
-        print '<input class="flat" size="4" type="text" name="search_state" value="' . dol_escape_htmltag($search_state) . '">';
+        print '<input class="flat" size="4" type="text" name="search_state" value="'.dol_escape_htmltag($search_state).'">';
         print '</td>';
     }
     // Country
@@ -688,8 +688,8 @@ 
         print '<td class="liste_titre nowraponall" align="center">';
         //print $langs->trans('Month').': ';
         if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY))
-            print '<input class="flat width25" type="text" maxlength="2" name="search_day" value="' . dol_escape_htmltag($search_day) . '">';
-        print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="search_month" value="' . dol_escape_htmltag($search_month) . '">';
+            print '<input class="flat width25" type="text" maxlength="2" name="search_day" value="'.dol_escape_htmltag($search_day).'">';
+        print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="search_month" value="'.dol_escape_htmltag($search_month).'">';
         //print '&nbsp;'.$langs->trans('Year').': ';
         $formother->select_year($search_year, 'search_year', 1, 20, 5);
         print '</td>';
@@ -699,8 +699,8 @@ 
         print '<td class="liste_titre nowraponall" align="center">';
         //print $langs->trans('Month').': ';
         if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY))
-            print '<input class="flat width25" type="text" maxlength="2" name="search_dayfin" value="' . dol_escape_htmltag($search_dayfin) . '">';
-        print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="search_month_end" value="' . dol_escape_htmltag($search_month_end) . '">';
+            print '<input class="flat width25" type="text" maxlength="2" name="search_dayfin" value="'.dol_escape_htmltag($search_dayfin).'">';
+        print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="search_month_end" value="'.dol_escape_htmltag($search_month_end).'">';
         //print '&nbsp;'.$langs->trans('Year').': ';
         $formother->select_year($search_yearfin, 'search_yearfin', 1, 20, 5);
         print '</td>';
@@ -710,8 +710,8 @@ 
         print '<td class="liste_titre nowraponall" align="center">';
         //print $langs->trans('Month').': ';
         if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY))
-            print '<input class="flat width25" type="text" size="1" maxlength="2" name="search_daydelivery" value="' . dol_escape_htmltag($search_daydelivery) . '">';
-        print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="search_monthdelivery" value="' . dol_escape_htmltag($search_monthdelivery) . '">';
+            print '<input class="flat width25" type="text" size="1" maxlength="2" name="search_daydelivery" value="'.dol_escape_htmltag($search_daydelivery).'">';
+        print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="search_monthdelivery" value="'.dol_escape_htmltag($search_monthdelivery).'">';
         //print '&nbsp;'.$langs->trans('Year').': ';
         $formother->select_year($search_yeardelivery, 'search_yeardelivery', 1, 20, 5);
         print '</td>';
@@ -726,36 +726,36 @@ 
     if (!empty($arrayfields['p.total_ht']['checked'])) {
         // Amount
         print '<td class="liste_titre" align="right">';
-        print '<input class="flat" type="text" size="5" name="search_montant_ht" value="' . dol_escape_htmltag($search_montant_ht) . '">';
+        print '<input class="flat" type="text" size="5" name="search_montant_ht" value="'.dol_escape_htmltag($search_montant_ht).'">';
         print '</td>';
     }
     if (!empty($arrayfields['p.total_vat']['checked'])) {
         // Amount
         print '<td class="liste_titre" align="right">';
-        print '<input class="flat" type="text" size="5" name="search_montant_vat" value="' . dol_escape_htmltag($search_montant_vat) . '">';
+        print '<input class="flat" type="text" size="5" name="search_montant_vat" value="'.dol_escape_htmltag($search_montant_vat).'">';
         print '</td>';
     }
     if (!empty($arrayfields['p.total_ttc']['checked'])) {
         // Amount
         print '<td class="liste_titre" align="right">';
-        print '<input class="flat" type="text" size="5" name="search_montant_ttc" value="' . dol_escape_htmltag($search_montant_ttc) . '">';
+        print '<input class="flat" type="text" size="5" name="search_montant_ttc" value="'.dol_escape_htmltag($search_montant_ttc).'">';
         print '</td>';
     }
     if (!empty($arrayfields['u.login']['checked'])) {
         // Author
         print '<td class="liste_titre" align="center">';
-        print '<input class="flat" size="4" type="text" name="search_login" value="' . dol_escape_htmltag($search_login) . '">';
+        print '<input class="flat" size="4" type="text" name="search_login" value="'.dol_escape_htmltag($search_login).'">';
         print '</td>';
     }
     if (!empty($arrayfields['sale_representative']['checked'])) {
         print '<td class="liste_titre"></td>';
     }
     // Extra fields
-    include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_list_search_input.tpl.php';
+    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
     // Fields from hook
     $parameters = array('arrayfields' => $arrayfields);
-    $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters);    // Note that $action and $object may have been modified by hook
+    $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
     print $hookmanager->resPrint;
     // Date creation
     if (!empty($arrayfields['p.datec']['checked'])) {
@@ -839,10 +839,10 @@ 
         print_liste_field_titre($arrayfields['sale_representative']['label'], $_SERVER["PHP_SELF"], "", "", "$param", '', $sortfield, $sortorder);
     }
 // Extra fields
-    include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_list_search_title.tpl.php';
+    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
     // Hook fields
     $parameters = array('arrayfields' => $arrayfields, 'param' => $param, 'sortfield' => $sortfield, 'sortorder' => $sortorder);
-    $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters);    // Note that $action and $object may have been modified by hook
+    $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
     print $hookmanager->resPrint;
     if (!empty($arrayfields['p.datec']['checked'])) {
         print_liste_field_titre($arrayfields['p.datec']['label'], $_SERVER["PHP_SELF"], "p.datec", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
@@ -854,7 +854,7 @@ 
         print_liste_field_titre($arrayfields['p.fk_statut']['label'], $_SERVER["PHP_SELF"], "p.fk_statut", "", $param, 'align="right"', $sortfield, $sortorder);
     }
     print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
-    print '</tr>' . "\n";
+    print '</tr>'."\n";
 
     $now = dol_now();
     $i = 0;
@@ -882,7 +882,7 @@ 
             if (!empty($obj->note_private)) {
                 $warnornote .= ($warnornote ? ' ' : '');
                 $warnornote .= '<span class="note">';
-                $warnornote .= '<a href = "' . BASE_URI . '?controller=comm/propal&method=note&id=' . $obj->rowid . '">' . img_picto($langs->trans("ViewPrivateNote"), 'object_generic') . '</a>';
+                $warnornote .= '<a href = "'.BASE_URI.'?controller=comm/propal&method=note&id='.$obj->rowid.'">'.img_picto($langs->trans("ViewPrivateNote"), 'object_generic').'</a>';
                 $warnornote .= '</span>';
             }
             if ($warnornote) {
@@ -893,15 +893,15 @@ 
             // Other picto tool
             print '<td width="16" align="right" class="nobordernopadding">';
             $filename = dol_sanitizeFileName($obj->ref);
-            $filedir = $conf->propal->multidir_output[$obj->entity] . '/' . dol_sanitizeFileName($obj->ref);
+            $filedir = $conf->propal->multidir_output[$obj->entity].'/'.dol_sanitizeFileName($obj->ref);
             // $urlsource = $_SERVER['PHP_SELF'] . '?id=' . $obj->rowid;
-            $urlsource = BASE_URI . '?controller=comm/propal&method=list&id=' . $obj->rowid;
+            $urlsource = BASE_URI.'?controller=comm/propal&method=list&id='.$obj->rowid;
             print $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
             print '</td></tr></table>';
 
             print "</td>\n";
             if (!$i)
-                $totalarray['nbfield'] ++;
+                $totalarray['nbfield']++;
         }
 
         if (!empty($arrayfields['p.ref_client']['checked'])) {
@@ -910,7 +910,7 @@ 
             print $obj->ref_client;
             print '</td>';
             if (!$i) {
-                $totalarray['nbfield'] ++;
+                $totalarray['nbfield']++;
             }
         }
 
@@ -923,7 +923,7 @@ 
             }
             print '</td>';
             if (!$i) {
-                $totalarray['nbfield'] ++;
+                $totalarray['nbfield']++;
             }
         }
 
@@ -939,7 +939,7 @@ 
             print $companystatic->getNomUrl(1, 'customer');
             print '</td>';
             if (!$i) {
-                $totalarray['nbfield'] ++;
+                $totalarray['nbfield']++;
             }
         }
 
@@ -949,7 +949,7 @@ 
             print $obj->town;
             print '</td>';
             if (!$i) {
-                $totalarray['nbfield'] ++;
+                $totalarray['nbfield']++;
             }
         }
         // Zip
@@ -958,14 +958,14 @@ 
             print $obj->zip;
             print '</td>';
             if (!$i) {
-                $totalarray['nbfield'] ++;
+                $totalarray['nbfield']++;
             }
         }
         // State
         if (!empty($arrayfields['state.nom']['checked'])) {
-            print "<td>" . $obj->state_name . "</td>\n";
+            print "<td>".$obj->state_name."</td>\n";
             if (!$i) {
-                $totalarray['nbfield'] ++;
+                $totalarray['nbfield']++;
             }
         }
         // Country
@@ -975,7 +975,7 @@ 
             print $tmparray['label'];
             print '</td>';
             if (!$i) {
-                $totalarray['nbfield'] ++;
+                $totalarray['nbfield']++;
             }
         }
         // Type ent
@@ -987,7 +987,7 @@ 
             print $typenArray[$obj->typent_code];
             print '</td>';
             if (!$i) {
-                $totalarray['nbfield'] ++;
+                $totalarray['nbfield']++;
             }
         }
 
@@ -997,31 +997,31 @@ 
             print dol_print_date($db->jdate($obj->dp), 'day');
             print "</td>\n";
             if (!$i) {
-                $totalarray['nbfield'] ++;
+                $totalarray['nbfield']++;
             }
         }
 
         // Date end validity
         if (!empty($arrayfields['p.fin_validite']['checked'])) {
             if ($obj->dfv) {
-                print '<td align="center">' . dol_print_date($db->jdate($obj->dfv), 'day');
+                print '<td align="center">'.dol_print_date($db->jdate($obj->dfv), 'day');
                 print '</td>';
             } else {
                 print '<td>&nbsp;</td>';
             }
             if (!$i)
-                $totalarray['nbfield'] ++;
+                $totalarray['nbfield']++;
         }
         // Date delivery
         if (!empty($arrayfields['p.date_livraison']['checked'])) {
             if ($obj->ddelivery) {
-                print '<td align="center">' . dol_print_date($db->jdate($obj->ddelivery), 'day');
+                print '<td align="center">'.dol_print_date($db->jdate($obj->ddelivery), 'day');
                 print '</td>';
             } else {
                 print '<td>&nbsp;</td>';
             }
             if (!$i) {
-                $totalarray['nbfield'] ++;
+                $totalarray['nbfield']++;
             }
         }
         // Availability
@@ -1030,15 +1030,15 @@ 
             $form->form_availability('', $obj->availability, 'none', 1);
             print '</td>';
             if (!$i) {
-                $totalarray['nbfield'] ++;
+                $totalarray['nbfield']++;
             }
         }
 
         // Amount HT
         if (!empty($arrayfields['p.total_ht']['checked'])) {
-            print '<td align="right">' . price($obj->total_ht) . "</td>\n";
+            print '<td align="right">'.price($obj->total_ht)."</td>\n";
             if (!$i) {
-                $totalarray['nbfield'] ++;
+                $totalarray['nbfield']++;
             }
             if (!$i) {
                 $totalarray['totalhtfield'] = $totalarray['nbfield'];
@@ -1047,9 +1047,9 @@ 
         }
         // Amount VAT
         if (!empty($arrayfields['p.total_vat']['checked'])) {
-            print '<td align="right">' . price($obj->total_vat) . "</td>\n";
+            print '<td align="right">'.price($obj->total_vat)."</td>\n";
             if (!$i) {
-                $totalarray['nbfield'] ++;
+                $totalarray['nbfield']++;
             }
             if (!$i) {
                 $totalarray['totalvatfield'] = $totalarray['nbfield'];
@@ -1058,9 +1058,9 @@ 
         }
         // Amount TTC
         if (!empty($arrayfields['p.total_ttc']['checked'])) {
-            print '<td align="right">' . price($obj->total_ttc) . "</td>\n";
+            print '<td align="right">'.price($obj->total_ttc)."</td>\n";
             if (!$i) {
-                $totalarray['nbfield'] ++;
+                $totalarray['nbfield']++;
             }
             if (!$i) {
                 $totalarray['totalttcfield'] = $totalarray['nbfield'];
@@ -1081,7 +1081,7 @@ 
             }
             print "</td>\n";
             if (!$i) {
-                $totalarray['nbfield'] ++;
+                $totalarray['nbfield']++;
             }
         }
 
@@ -1096,7 +1096,7 @@ 
                 $nbofsalesrepresentative = count($listsalesrepresentatives);
                 if ($nbofsalesrepresentative > 3) {   // We print only number
                     // print '<a href="' . DOL_URL_ROOT . '/societe/commerciaux.php?socid=' . $companystatic->id . '">';
-                    print '<a href = "' . BASE_URI . '?controller=societe&method=commerciaux&socid=' . $companystatic->id . '">';
+                    print '<a href = "'.BASE_URI.'?controller=societe&method=commerciaux&socid='.$companystatic->id.'">';
                     print $nbofsalesrepresentative;
                     print '</a>';
                 } else if ($nbofsalesrepresentative > 0) {
@@ -1128,10 +1128,10 @@ 
         }
 
         // Extra fields
-        include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_list_print_fields.tpl.php';
+        include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
         // Fields from hook
         $parameters = array('arrayfields' => $arrayfields, 'obj' => $obj);
-        $reshook = $hookmanager->executeHooks('printFieldListValue', $parameters);    // Note that $action and $object may have been modified by hook
+        $reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
         print $hookmanager->resPrint;
         // Date creation
         if (!empty($arrayfields['p.datec']['checked'])) {
@@ -1139,7 +1139,7 @@ 
             print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
             print '</td>';
             if (!$i) {
-                $totalarray['nbfield'] ++;
+                $totalarray['nbfield']++;
             }
         }
         // Date modification
@@ -1148,14 +1148,14 @@ 
             print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
             print '</td>';
             if (!$i) {
-                $totalarray['nbfield'] ++;
+                $totalarray['nbfield']++;
             }
         }
         // Status
         if (!empty($arrayfields['p.fk_statut']['checked'])) {
-            print '<td align="right" class="nowrap">' . $objectstatic->LibStatut($obj->fk_statut, 5) . '</td>';
+            print '<td align="right" class="nowrap">'.$objectstatic->LibStatut($obj->fk_statut, 5).'</td>';
             if (!$i) {
-                $totalarray['nbfield'] ++;
+                $totalarray['nbfield']++;
             }
         }
         // Action column
@@ -1165,11 +1165,11 @@ 
             if (in_array($obj->rowid, $arrayofselected)) {
                 $selected = 1;
             }
-            print '<input id="cb' . $obj->rowid . '" class="flat checkforselect" type="checkbox" name="toselect[]" value="' . $obj->rowid . '"' . ($selected ? ' checked="checked"' : '') . '>';
+            print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
         }
         print '</td>';
         if (!$i) {
-            $totalarray['nbfield'] ++;
+            $totalarray['nbfield']++;
         }
 
         print "</tr>\n";
@@ -1186,21 +1186,21 @@ 
             $i++;
             if ($i == 1) {
                 if ($num < $limit && empty($offset))
-                    print '<td align="left">' . $langs->trans("Total") . '</td>';
+                    print '<td align="left">'.$langs->trans("Total").'</td>';
                 else
-                    print '<td align="left">' . $langs->trans("Totalforthispage") . '</td>';
+                    print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
             }
             elseif ($totalarray['totalhtfield'] == $i)
-                print '<td align="right">' . price($totalarray['totalht']) . '</td>';
+                print '<td align="right">'.price($totalarray['totalht']).'</td>';
             elseif ($totalarray['totalvatfield'] == $i)
-                print '<td align="right">' . price($totalarray['totalvat']) . '</td>';
+                print '<td align="right">'.price($totalarray['totalvat']).'</td>';
             elseif ($totalarray['totalttcfield'] == $i)
-                print '<td align="right">' . price($totalarray['totalttc']) . '</td>';
+                print '<td align="right">'.price($totalarray['totalttc']).'</td>';
             elseif ($totalarray['totalizable']) {
                 $printed = false;
                 foreach ($totalarray['totalizable'] as $totalizable) {
                     if ($totalizable['pos'] == $i && !$printed) {
-                        print '<td align="right">' . price($totalizable['total']) . '</td>';
+                        print '<td align="right">'.price($totalizable['total']).'</td>';
                         $printed = true;
                     }
                 }
@@ -1216,20 +1216,20 @@ 
     $db->free($resql);
 
     $parameters = array('arrayfields' => $arrayfields, 'sql' => $sql);
-    $reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters);    // Note that $action and $object may have been modified by hook
+    $reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters); // Note that $action and $object may have been modified by hook
     print $hookmanager->resPrint;
 
-    print '</table>' . "\n";
-    print '</div>' . "\n";
+    print '</table>'."\n";
+    print '</div>'."\n";
 
-    print '</form>' . "\n";
+    print '</form>'."\n";
 
     $hidegeneratedfilelistifempty = 1;
     if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files)
         $hidegeneratedfilelistifempty = 0;
 
     // Show list of available documents
-    $urlsource = $_SERVER['PHP_SELF'] . '?sortfield=' . $sortfield . '&sortorder=' . $sortorder;
+    $urlsource = $_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
     $urlsource .= str_replace('&amp;', '&', $param);
 
     $filedir = $diroutputmassaction;

Braces +49 added lines, -39 removed lines

@@ -243,8 +243,9 @@ 
     $search_array_options = array();
     $search_categ_cus = 0;
 }
-if ($object_statut != '')
+if ($object_statut != '') {
     $viewstatut = $object_statut;
+}
 
 if (empty($reshook)) {
     $objectclass = 'Propal';
@@ -442,10 +443,10 @@ 
         $soc = new Societe($db);
         $soc->fetch($socid);
         $title = $langs->trans('ListOfProposals') . ' - ' . $soc->name;
-        if (empty($search_societe))
-            $search_societe = $soc->name;
-    }
-    else {
+        if (empty($search_societe)) {
+                    $search_societe = $soc->name;
+        }
+    } else {
         $title = $langs->trans('ListOfProposals');
     }
 
@@ -660,10 +661,12 @@ 
         print '<input class="flat" type="text" size="10" name="search_societe" value="' . dol_escape_htmltag($search_societe) . '">';
         print '</td>';
     }
-    if (!empty($arrayfields['s.town']['checked']))
-        print '<td class="liste_titre"><input class="flat" type="text" size="6" name="search_town" value="' . $search_town . '"></td>';
-    if (!empty($arrayfields['s.zip']['checked']))
-        print '<td class="liste_titre"><input class="flat" type="text" size="4" name="search_zip" value="' . $search_zip . '"></td>';
+    if (!empty($arrayfields['s.town']['checked'])) {
+            print '<td class="liste_titre"><input class="flat" type="text" size="6" name="search_town" value="' . $search_town . '"></td>';
+    }
+    if (!empty($arrayfields['s.zip']['checked'])) {
+            print '<td class="liste_titre"><input class="flat" type="text" size="4" name="search_zip" value="' . $search_zip . '"></td>';
+    }
     // State
     if (!empty($arrayfields['state.nom']['checked'])) {
         print '<td class="liste_titre">';
@@ -687,8 +690,9 @@ 
     if (!empty($arrayfields['p.date']['checked'])) {
         print '<td class="liste_titre nowraponall" align="center">';
         //print $langs->trans('Month').': ';
-        if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY))
-            print '<input class="flat width25" type="text" maxlength="2" name="search_day" value="' . dol_escape_htmltag($search_day) . '">';
+        if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
+                    print '<input class="flat width25" type="text" maxlength="2" name="search_day" value="' . dol_escape_htmltag($search_day) . '">';
+        }
         print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="search_month" value="' . dol_escape_htmltag($search_month) . '">';
         //print '&nbsp;'.$langs->trans('Year').': ';
         $formother->select_year($search_year, 'search_year', 1, 20, 5);
@@ -698,8 +702,9 @@ 
     if (!empty($arrayfields['p.fin_validite']['checked'])) {
         print '<td class="liste_titre nowraponall" align="center">';
         //print $langs->trans('Month').': ';
-        if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY))
-            print '<input class="flat width25" type="text" maxlength="2" name="search_dayfin" value="' . dol_escape_htmltag($search_dayfin) . '">';
+        if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
+                    print '<input class="flat width25" type="text" maxlength="2" name="search_dayfin" value="' . dol_escape_htmltag($search_dayfin) . '">';
+        }
         print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="search_month_end" value="' . dol_escape_htmltag($search_month_end) . '">';
         //print '&nbsp;'.$langs->trans('Year').': ';
         $formother->select_year($search_yearfin, 'search_yearfin', 1, 20, 5);
@@ -709,8 +714,9 @@ 
     if (!empty($arrayfields['p.date_livraison']['checked'])) {
         print '<td class="liste_titre nowraponall" align="center">';
         //print $langs->trans('Month').': ';
-        if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY))
-            print '<input class="flat width25" type="text" size="1" maxlength="2" name="search_daydelivery" value="' . dol_escape_htmltag($search_daydelivery) . '">';
+        if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
+                    print '<input class="flat width25" type="text" size="1" maxlength="2" name="search_daydelivery" value="' . dol_escape_htmltag($search_daydelivery) . '">';
+        }
         print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="search_monthdelivery" value="' . dol_escape_htmltag($search_monthdelivery) . '">';
         //print '&nbsp;'.$langs->trans('Year').': ';
         $formother->select_year($search_yeardelivery, 'search_yeardelivery', 1, 20, 5);
@@ -877,8 +883,9 @@ 
             print '</td>';
             // Warning
             $warnornote = '';
-            if ($obj->fk_statut == 1 && $db->jdate($obj->dfv) < ($now - $conf->propal->cloture->warning_delay))
-                $warnornote .= img_warning($langs->trans("Late"));
+            if ($obj->fk_statut == 1 && $db->jdate($obj->dfv) < ($now - $conf->propal->cloture->warning_delay)) {
+                            $warnornote .= img_warning($langs->trans("Late"));
+            }
             if (!empty($obj->note_private)) {
                 $warnornote .= ($warnornote ? ' ' : '');
                 $warnornote .= '<span class="note">';
@@ -900,8 +907,9 @@ 
             print '</td></tr></table>';
 
             print "</td>\n";
-            if (!$i)
-                $totalarray['nbfield'] ++;
+            if (!$i) {
+                            $totalarray['nbfield'] ++;
+            }
         }
 
         if (!empty($arrayfields['p.ref_client']['checked'])) {
@@ -1009,8 +1017,9 @@ 
             } else {
                 print '<td>&nbsp;</td>';
             }
-            if (!$i)
-                $totalarray['nbfield'] ++;
+            if (!$i) {
+                            $totalarray['nbfield'] ++;
+            }
         }
         // Date delivery
         if (!empty($arrayfields['p.date_livraison']['checked'])) {
@@ -1185,18 +1194,18 @@ 
         while ($i < $totalarray['nbfield']) {
             $i++;
             if ($i == 1) {
-                if ($num < $limit && empty($offset))
-                    print '<td align="left">' . $langs->trans("Total") . '</td>';
-                else
-                    print '<td align="left">' . $langs->trans("Totalforthispage") . '</td>';
-            }
-            elseif ($totalarray['totalhtfield'] == $i)
-                print '<td align="right">' . price($totalarray['totalht']) . '</td>';
-            elseif ($totalarray['totalvatfield'] == $i)
-                print '<td align="right">' . price($totalarray['totalvat']) . '</td>';
-            elseif ($totalarray['totalttcfield'] == $i)
-                print '<td align="right">' . price($totalarray['totalttc']) . '</td>';
-            elseif ($totalarray['totalizable']) {
+                if ($num < $limit && empty($offset)) {
+                                    print '<td align="left">' . $langs->trans("Total") . '</td>';
+                } else {
+                                    print '<td align="left">' . $langs->trans("Totalforthispage") . '</td>';
+                }
+            } elseif ($totalarray['totalhtfield'] == $i) {
+                            print '<td align="right">' . price($totalarray['totalht']) . '</td>';
+            } elseif ($totalarray['totalvatfield'] == $i) {
+                            print '<td align="right">' . price($totalarray['totalvat']) . '</td>';
+            } elseif ($totalarray['totalttcfield'] == $i) {
+                            print '<td align="right">' . price($totalarray['totalttc']) . '</td>';
+            } elseif ($totalarray['totalizable']) {
                 $printed = false;
                 foreach ($totalarray['totalizable'] as $totalizable) {
                     if ($totalizable['pos'] == $i && !$printed) {
@@ -1207,8 +1216,9 @@ 
                 if (!$printed) {
                     print '<td></td>';
                 }
-            } else
-                print '<td></td>';
+            } else {
+                            print '<td></td>';
+            }
         }
         print '</tr>';
     }
@@ -1225,8 +1235,9 @@ 
     print '</form>' . "\n";
 
     $hidegeneratedfilelistifempty = 1;
-    if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files)
-        $hidegeneratedfilelistifempty = 0;
+    if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) {
+            $hidegeneratedfilelistifempty = 0;
+    }
 
     // Show list of available documents
     $urlsource = $_SERVER['PHP_SELF'] . '?sortfield=' . $sortfield . '&sortorder=' . $sortorder;
@@ -1237,8 +1248,7 @@ 
     $delallowed = $user->rights->propal->creer;
 
     print $formfile->showdocuments('massfilesarea_proposals', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
-}
-else {
+} else {
     dol_print_error($db);
 }
 

dolibarr/htdocs/core/lib/propal.lib.php

Spacing +16 added lines, -16 removed lines

@@ -40,7 +40,7 @@ 
     $head = array();
 
     // $head[$h][0] = DOL_URL_ROOT.'/comm/propal/card.php?id='.$object->id;
-    $head[$h][0] = BASE_URI . '?controller=comm/propal&method=card&id=' . $object->id;
+    $head[$h][0] = BASE_URI.'?controller=comm/propal&method=card&id='.$object->id;
     $head[$h][1] = $langs->trans('ProposalCard');
     $head[$h][2] = 'comm';
     $h++;
@@ -49,11 +49,11 @@ 
         $langs->load("sendings");
         $text = '';
         // $head[$h][0] = DOL_URL_ROOT.'/expedition/propal.php?id='.$object->id;
-        $head[$h][0] = BASE_URI . '?controller=expedition&method=propal&id=' . $object->id;
+        $head[$h][0] = BASE_URI.'?controller=expedition&method=propal&id='.$object->id;
         if ($conf->expedition_bon->enabled)
             $text = $langs->trans("Shipment");
         if ($conf->livraison_bon->enabled)
-            $text .= '/' . $langs->trans("Receivings");
+            $text .= '/'.$langs->trans("Receivings");
         $head[$h][1] = $text;
         $head[$h][2] = 'shipping';
         $h++;
@@ -62,10 +62,10 @@ 
     if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) {
         $nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
         // $head[$h][0] = DOL_URL_ROOT.'/comm/propal/contact.php?id='.$object->id;
-        $head[$h][0] = BASE_URI . '?controller=comm/propal&method=contact&id=' . $object->id;
+        $head[$h][0] = BASE_URI.'?controller=comm/propal&method=contact&id='.$object->id;
         $head[$h][1] = $langs->trans('ContactsAddresses');
         if ($nbContact > 0)
-            $head[$h][1] .= ' <span class="badge">' . $nbContact . '</span>';
+            $head[$h][1] .= ' <span class="badge">'.$nbContact.'</span>';
         $head[$h][2] = 'contact';
         $h++;
     }
@@ -83,29 +83,29 @@ 
         if (!empty($object->note_public))
             $nbNote++;
         // $head[$h][0] = DOL_URL_ROOT.'/comm/propal/note.php?id='.$object->id;
-        $head[$h][0] = BASE_URI . '?controller=comm/propal&method=note&id=' . $object->id;
+        $head[$h][0] = BASE_URI.'?controller=comm/propal&method=note&id='.$object->id;
         $head[$h][1] = $langs->trans('Notes');
         if ($nbNote > 0)
-            $head[$h][1] .= ' <span class="badge">' . $nbNote . '</span>';
+            $head[$h][1] .= ' <span class="badge">'.$nbNote.'</span>';
         $head[$h][2] = 'note';
         $h++;
     }
 
-    require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
-    require_once DOL_DOCUMENT_ROOT . '/core/class/link.class.php';
-    $upload_dir = $conf->propal->multidir_output[$object->entity] . "/" . dol_sanitizeFileName($object->ref);
+    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+    $upload_dir = $conf->propal->multidir_output[$object->entity]."/".dol_sanitizeFileName($object->ref);
     $nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
     $nbLinks = Link::count($db, $object->element, $object->id);
     // $head[$h][0] = DOL_URL_ROOT.'/comm/propal/document.php?id='.$object->id;
-    $head[$h][0] = BASE_URI . '?controller=comm/propal&method=document&id=' . $object->id;
+    $head[$h][0] = BASE_URI.'?controller=comm/propal&method=document&id='.$object->id;
     $head[$h][1] = $langs->trans('Documents');
     if (($nbFiles + $nbLinks) > 0)
-        $head[$h][1] .= ' <span class="badge">' . ($nbFiles + $nbLinks) . '</span>';
+        $head[$h][1] .= ' <span class="badge">'.($nbFiles + $nbLinks).'</span>';
     $head[$h][2] = 'document';
     $h++;
 
     // $head[$h][0] = DOL_URL_ROOT.'/comm/propal/info.php?id='.$object->id;
-    $head[$h][0] = BASE_URI . '?controller=comm/propal&method=info&id=' . $object->id;
+    $head[$h][0] = BASE_URI.'?controller=comm/propal&method=info&id='.$object->id;
     $head[$h][1] = $langs->trans('Info');
     $head[$h][2] = 'info';
     $h++;
@@ -128,7 +128,7 @@ 
     $head = array();
 
     // $head[$h][0] = DOL_URL_ROOT . '/admin/propal.php';
-    $head[$h][0] = BASE_URI . '?controller=admin&method=propal';
+    $head[$h][0] = BASE_URI.'?controller=admin&method=propal';
     $head[$h][1] = $langs->trans("Miscellaneous");
     $head[$h][2] = 'general';
     $h++;
@@ -140,13 +140,13 @@ 
     complete_head_from_modules($conf, $langs, null, $head, $h, 'propal_admin');
 
     // $head[$h][0] = DOL_URL_ROOT . '/comm/admin/propal_extrafields.php';
-    $head[$h][0] = BASE_URI . '?controller=comm/admin&method=propal_extrafields';
+    $head[$h][0] = BASE_URI.'?controller=comm/admin&method=propal_extrafields';
     $head[$h][1] = $langs->trans("ExtraFields");
     $head[$h][2] = 'attributes';
     $h++;
 
     // $head[$h][0] = DOL_URL_ROOT . '/comm/admin/propaldet_extrafields.php';
-    $head[$h][0] = BASE_URI . '?controller=comm/admin&method=propaldet_extrafields';
+    $head[$h][0] = BASE_URI.'?controller=comm/admin&method=propaldet_extrafields';
     $head[$h][1] = $langs->trans("ExtraFieldsLines");
     $head[$h][2] = 'attributeslines';
     $h++;

Braces +21 added lines, -14 removed lines

@@ -50,10 +50,12 @@ 
         $text = '';
         // $head[$h][0] = DOL_URL_ROOT.'/expedition/propal.php?id='.$object->id;
         $head[$h][0] = BASE_URI . '?controller=expedition&method=propal&id=' . $object->id;
-        if ($conf->expedition_bon->enabled)
-            $text = $langs->trans("Shipment");
-        if ($conf->livraison_bon->enabled)
-            $text .= '/' . $langs->trans("Receivings");
+        if ($conf->expedition_bon->enabled) {
+                    $text = $langs->trans("Shipment");
+        }
+        if ($conf->livraison_bon->enabled) {
+                    $text .= '/' . $langs->trans("Receivings");
+        }
         $head[$h][1] = $text;
         $head[$h][2] = 'shipping';
         $h++;
@@ -64,8 +66,9 @@ 
         // $head[$h][0] = DOL_URL_ROOT.'/comm/propal/contact.php?id='.$object->id;
         $head[$h][0] = BASE_URI . '?controller=comm/propal&method=contact&id=' . $object->id;
         $head[$h][1] = $langs->trans('ContactsAddresses');
-        if ($nbContact > 0)
-            $head[$h][1] .= ' <span class="badge">' . $nbContact . '</span>';
+        if ($nbContact > 0) {
+                    $head[$h][1] .= ' <span class="badge">' . $nbContact . '</span>';
+        }
         $head[$h][2] = 'contact';
         $h++;
     }
@@ -78,15 +81,18 @@ 
 
     if (empty($conf->global->MAIN_DISABLE_NOTES_TAB)) {
         $nbNote = 0;
-        if (!empty($object->note_private))
-            $nbNote++;
-        if (!empty($object->note_public))
-            $nbNote++;
+        if (!empty($object->note_private)) {
+                    $nbNote++;
+        }
+        if (!empty($object->note_public)) {
+                    $nbNote++;
+        }
         // $head[$h][0] = DOL_URL_ROOT.'/comm/propal/note.php?id='.$object->id;
         $head[$h][0] = BASE_URI . '?controller=comm/propal&method=note&id=' . $object->id;
         $head[$h][1] = $langs->trans('Notes');
-        if ($nbNote > 0)
-            $head[$h][1] .= ' <span class="badge">' . $nbNote . '</span>';
+        if ($nbNote > 0) {
+                    $head[$h][1] .= ' <span class="badge">' . $nbNote . '</span>';
+        }
         $head[$h][2] = 'note';
         $h++;
     }
@@ -99,8 +105,9 @@ 
     // $head[$h][0] = DOL_URL_ROOT.'/comm/propal/document.php?id='.$object->id;
     $head[$h][0] = BASE_URI . '?controller=comm/propal&method=document&id=' . $object->id;
     $head[$h][1] = $langs->trans('Documents');
-    if (($nbFiles + $nbLinks) > 0)
-        $head[$h][1] .= ' <span class="badge">' . ($nbFiles + $nbLinks) . '</span>';
+    if (($nbFiles + $nbLinks) > 0) {
+            $head[$h][1] .= ' <span class="badge">' . ($nbFiles + $nbLinks) . '</span>';
+    }
     $head[$h][2] = 'document';
     $h++;
 

dolibarr/htdocs/core/lib/doleditor.lib.php

Spacing +9 added lines, -9 removed lines

@@ -36,14 +36,14 @@ 
     global $conf, $langs, $db;
     global $bc;
 
-    require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
+    require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 
     $formother = new FormOther($db);
 
     $dirskins = array('/includes/ckeditor/ckeditor/skins');
     if (!empty($conf->modules_parts['theme'])) {  // Using this feature slow down application
         foreach ($conf->modules_parts['theme'] as $reldir) {
-            $dirskins = array_merge($dirskins, (array) ($reldir . 'theme'));
+            $dirskins = array_merge($dirskins, (array) ($reldir.'theme'));
         }
     }
     $dirskins = array_unique($dirskins);
@@ -65,7 +65,7 @@ 
     $var = false;
 
     // Title
-    print '<tr class="liste_titre"><th width="35%">' . $langs->trans("DefaultSkin") . '</th>';
+    print '<tr class="liste_titre"><th width="35%">'.$langs->trans("DefaultSkin").'</th>';
     print '<th align="right">';
     $url = 'http://ckeditor.com/addons/skins/all';
     /* print '<a href="'.$url.'" target="_blank">';
@@ -74,16 +74,16 @@ 
     print '</th></tr>';
 
     print '<tr class="oddeven">';
-    print '<td>' . $langs->trans("ThemeDir") . '</td>';
+    print '<td>'.$langs->trans("ThemeDir").'</td>';
     print '<td>';
     foreach ($dirskins as $dirskin) {
-        echo '"' . $dirskin . '" ';
+        echo '"'.$dirskin.'" ';
     }
     print '</td>';
     print '</tr>';
 
     //
-    print '<tr class="oddeven"><td colspan="' . $colspan . '">';
+    print '<tr class="oddeven"><td colspan="'.$colspan.'">';
 
     print '<table class="nobordernopadding" width="100%"><tr><td><div align="center">';
 
@@ -97,7 +97,7 @@ 
             $handle = opendir($dirskin);
             if (is_resource($handle)) {
                 while (($subdir = readdir($handle)) !== false) {
-                    if (is_dir($dirskin . "/" . $subdir) && substr($subdir, 0, 1) <> '.' && substr($subdir, 0, 3) <> 'CVS' && !preg_match('/common|phones/i', $subdir)) {
+                    if (is_dir($dirskin."/".$subdir) && substr($subdir, 0, 1) <> '.' && substr($subdir, 0, 3) <> 'CVS' && !preg_match('/common|phones/i', $subdir)) {
                         // Disable not stable themes (dir ends with _exp or _dev)
                         if ($conf->global->MAIN_FEATURES_LEVEL < 2 && preg_match('/_dev$/i', $subdir))
                             continue;
@@ -106,9 +106,9 @@ 
 
                         print '<div class="inline-block" style="margin-top: 10px; margin-bottom: 10px; margin-right: 20px; margin-left: 20px;">';
                         if ($subdir == $selected_theme) {
-                            print '<input ' . ($edit ? '' : 'disabled') . ' type="radio" ' . $bc[$var] . ' style="border: 0px;" checked name="fckeditor_skin" value="' . $subdir . '"> <b>' . $subdir . '</b>';
+                            print '<input '.($edit ? '' : 'disabled').' type="radio" '.$bc[$var].' style="border: 0px;" checked name="fckeditor_skin" value="'.$subdir.'"> <b>'.$subdir.'</b>';
                         } else {
-                            print '<input ' . ($edit ? '' : 'disabled') . ' type="radio" ' . $bc[$var] . ' style="border: 0px;" name="fckeditor_skin" value="' . $subdir . '"> ' . $subdir;
+                            print '<input '.($edit ? '' : 'disabled').' type="radio" '.$bc[$var].' style="border: 0px;" name="fckeditor_skin" value="'.$subdir.'"> '.$subdir;
                         }
                         print '</div>';
 

Braces +9 added lines, -6 removed lines

@@ -54,8 +54,9 @@ 
         // $selected_theme = 'moono-lisa';
 
         $selected_theme = CKEDITOR_SKIN;
-    } else
-        $selected_theme = $conf->global->FCKEDITOR_SKIN;
+    } else {
+            $selected_theme = $conf->global->FCKEDITOR_SKIN;
+    }
 
     $colspan = 2;
 
@@ -99,10 +100,12 @@ 
                 while (($subdir = readdir($handle)) !== false) {
                     if (is_dir($dirskin . "/" . $subdir) && substr($subdir, 0, 1) <> '.' && substr($subdir, 0, 3) <> 'CVS' && !preg_match('/common|phones/i', $subdir)) {
                         // Disable not stable themes (dir ends with _exp or _dev)
-                        if ($conf->global->MAIN_FEATURES_LEVEL < 2 && preg_match('/_dev$/i', $subdir))
-                            continue;
-                        if ($conf->global->MAIN_FEATURES_LEVEL < 1 && preg_match('/_exp$/i', $subdir))
-                            continue;
+                        if ($conf->global->MAIN_FEATURES_LEVEL < 2 && preg_match('/_dev$/i', $subdir)) {
+                                                    continue;
+                        }
+                        if ($conf->global->MAIN_FEATURES_LEVEL < 1 && preg_match('/_exp$/i', $subdir)) {
+                                                    continue;
+                        }
 
                         print '<div class="inline-block" style="margin-top: 10px; margin-bottom: 10px; margin-right: 20px; margin-left: 20px;">';
                         if ($subdir == $selected_theme) {