diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php index bb17d1b039e..9feca68cfae 100644 --- a/htdocs/admin/dict.php +++ b/htdocs/admin/dict.php @@ -446,7 +446,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify')) } // Other checks if ($tabname[$id] == MAIN_DB_PREFIX."c_actioncomm" && isset($_POST["type"]) && in_array($_POST["type"],array('system','systemauto'))) { - $ok=0; + $ok=0; setEventMessage($langs->transnoentities('ErrorReservedTypeSystemSystemAuto'),'errors'); } if (isset($_POST["code"])) @@ -456,8 +456,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify')) $ok=0; setEventMessage($langs->transnoentities('ErrorCodeCantContainZero'),'errors'); } - // FIXME regresion if code with not in numeric base - /*if (!is_numeric($_POST['code'])) + /*if (!is_numeric($_POST['code'])) // disabled, code may not be in numeric base { $ok = 0; $msg .= $langs->transnoentities('ErrorFieldFormat', $langs->transnoentities('Code')).'
'; @@ -1100,7 +1099,7 @@ if ($id) if (($obj->code == '0' || $obj->code == '' || preg_match('/unknown/i',$obj->code))) $iserasable = 0; else if ($obj->code == 'RECEP') $iserasable = 0; else if ($obj->code == 'EF0') $iserasable = 0; - } + } if (isset($obj->type) && in_array($obj->type, array('system', 'systemauto'))) $iserasable=0; diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php index 166847ed0f2..4f455d26dd2 100644 --- a/htdocs/comm/action/fiche.php +++ b/htdocs/comm/action/fiche.php @@ -167,7 +167,7 @@ if ($action == 'add_action') $actioncomm->datep = $datep; $actioncomm->datef = $datef; $actioncomm->percentage = $percentage; - $actioncomm->duree=((float) (GETPOST('dureehour') * 60) + (float) GETPOST('dureemin')) * + $actioncomm->duree=((float) (GETPOST('dureehour') * 60) + (float) GETPOST('dureemin')) * 60; $usertodo=new User($db); @@ -193,7 +193,7 @@ if ($action == 'add_action') } // Special for module webcal and phenix - // FIXME external modules + // TODO external modules if (! empty($conf->webcalendar->enabled) && GETPOST('add_webcal') == 'on') $actioncomm->use_webcal=1; if (! empty($conf->phenix->enabled) && GETPOST('add_phenix') == 'on') $actioncomm->use_phenix=1; @@ -484,7 +484,7 @@ if ($action == 'create') // Full day print ''.$langs->trans("EventOnFullDay").''; - + // Date start $datep=$actioncomm->datep; if (GETPOST('datep','int',1)) $datep=dol_stringtotime(GETPOST('datep','int',1),0); @@ -565,7 +565,7 @@ if ($action == 'create') } else { - + $events=array(); $events[]=array('method' => 'getContacts', 'url' => dol_buildpath('/core/ajax/contacts.php',1), 'htmlname' => 'contactid', 'params' => array('add-customer-contact' => 'disabled')); //For external user force the company to user company @@ -581,7 +581,7 @@ if ($action == 'create') print ''.$langs->trans("ActionOnContact").''; $form->select_contacts(GETPOST('socid','int'),GETPOST('contactid'),'contactid',1); print ''; - + // Project if (! empty($conf->projet->enabled)) @@ -623,7 +623,7 @@ if ($action == 'create') $doleditor=new DolEditor('note',(GETPOST('note')?GETPOST('note'):$actioncomm->note),'',240,'dolibarr_notes','In',true,true,$conf->fckeditor->enabled,ROWS_7,90); $doleditor->Create(); print ''; - + // Other attributes $parameters=array(); diff --git a/htdocs/comm/contact.php b/htdocs/comm/contact.php index 4281eab9cb1..5c85f745def 100644 --- a/htdocs/comm/contact.php +++ b/htdocs/comm/contact.php @@ -42,6 +42,7 @@ $search_lastname=GETPOST('search_nom')?GETPOST('search_nom'):GETPOST('search_las $search_firstname=GETPOST('search_firstname')?GETPOST('search_firstname'):GETPOST('search_firstname'); // For backward compatibility $search_company=GETPOST('search_societe')?GETPOST('search_societe'):GETPOST('search_company'); // For backward compatibility $contactname=GETPOST('contactname'); +$begin=GETPOST('begin','alpha'); // Security check $socid = GETPOST('socid','int'); @@ -87,13 +88,7 @@ if ($socid) $sql.= " AND s.rowid = ".$socid; if (dol_strlen($stcomm)) { - $sql.= " AND s.fk_stcomm=$stcomm"; -} - -// FIXME $begin not exist -if (dol_strlen($begin)) // filtre sur la premiere lettre du nom -{ - $sql.= " AND upper(p.name) LIKE '".$begin."%'"; + $sql.= " AND s.fk_stcomm=".$db->escape($stcomm); } if (! empty($search_lastname)) @@ -113,7 +108,7 @@ if (! empty($search_company)) if (! empty($contactname)) // acces a partir du module de recherche { - $sql.= " AND (p.name LIKE '%".$db->escape(strtolower($contactname))."%' OR lower(p.firstname) LIKE '%".$db->escape(strtolower($contactname))."%') "; + $sql.= " AND (p.name LIKE '%".$db->escape($contactname)."%' OR lower(p.firstname) LIKE '%".$db->escape($contactname)."%') "; $sortfield = "p.name"; $sortorder = "ASC"; } @@ -124,55 +119,57 @@ $sql.= $db->plimit($limit+1, $offset); $resql = $db->query($sql); if ($resql) { - $num = $db->num_rows($resql); + $num = $db->num_rows($resql); - $title = (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("ListOfContacts") : $langs->trans("ListOfContactsAddresses")); - print_barre_liste($title.($label?" (".$label.")":""),$page, $_SERVER["PHP_SELF"], "&type=$type",$sortfield,$sortorder,"",$num); + $param="&type=".$type; - print ''; - print ''; - print_liste_field_titre($langs->trans("Lastname"),$_SERVER["PHP_SELF"],"p.name", $begin,"&type=$type","",$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Firstname"),$_SERVER["PHP_SELF"],"p.firstname", $begin,"&type=$type","",$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom", $begin,"&type=$type","",$sortfield,$sortorder); - print ''; - print ''; - print "\n"; + $title = (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("ListOfContacts") : $langs->trans("ListOfContactsAddresses")); + print_barre_liste($title.($label?" (".$label.")":""),$page, $_SERVER["PHP_SELF"], $param,$sortfield,$sortorder,"",$num); - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print "\n"; - print ''; + print '
'.$langs->trans("Email").''.$langs->trans("Phone").'
 
'; + print ''; + print_liste_field_titre($langs->trans("Lastname"),$_SERVER["PHP_SELF"],"p.name", $begin, $param,"",$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Firstname"),$_SERVER["PHP_SELF"],"p.firstname", $begin, $param,"",$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom", $begin, $param,"",$sortfield,$sortorder); + print ''; + print ''; + print "\n"; - $var=True; - $i = 0; - while ($i < min($num,$limit)) - { - $obj = $db->fetch_object($resql); + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print "\n"; + print ''; - $var=!$var; + $var=True; + $i = 0; + while ($i < min($num,$limit)) + { + $obj = $db->fetch_object($resql); - print ""; - print ''; - print ""; + $var=!$var; - print '\n"; + print ""; + print ''; + print ""; - print ''; + print '\n"; - print ''; + print ''; - print "\n"; - $i++; - } - print "
'.$langs->trans("Email").''.$langs->trans("Phone").'
 
'.img_object($langs->trans("ShowContact"),"contact"); - print ' '.$obj->name.'$obj->firstname'.img_object($langs->trans("ShowCompany"),"company").' '; - print "rowid."\">$obj->nom
'.img_object($langs->trans("ShowContact"),"contact"); + print ' '.$obj->name.'$obj->firstname'.dol_print_phone($obj->email,$obj->cidp,$obj->rowid,'AC_EMAIL').''.img_object($langs->trans("ShowCompany"),"company").' '; + print "rowid."\">$obj->nom'.dol_print_phone($obj->phone,$obj->country_code,$obj->cidp,$obj->rowid,'AC_TEL').' '.dol_print_phone($obj->email,$obj->cidp,$obj->rowid,'AC_EMAIL').'

"; - $db->free($resql); + print ''.dol_print_phone($obj->phone,$obj->country_code,$obj->cidp,$obj->rowid,'AC_TEL').' '; + + print "\n"; + $i++; + } + print "

"; + $db->free($resql); } else { @@ -182,5 +179,4 @@ else llxFooter(); $db->close(); - -?> +?> \ No newline at end of file diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index d9103180a62..2341f5e4ff7 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -3085,6 +3085,7 @@ class OrderLine extends CommonOrderLine $this->fk_product = $objp->fk_product; $this->product_type = $objp->product_type; $this->info_bits = $objp->info_bits; + $this->special_code = $objp->special_code; $this->total_ht = $objp->total_ht; $this->total_tva = $objp->total_tva; $this->total_localtax1 = $objp->total_localtax1; diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index 2ad24721e46..521a8f63e80 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -3396,7 +3396,7 @@ class FactureLigne extends CommonInvoiceLine $sql = 'SELECT fd.rowid, fd.fk_facture, fd.fk_parent_line, fd.fk_product, fd.product_type, fd.label as custom_label, fd.description, fd.price, fd.qty, fd.tva_tx,'; $sql.= ' fd.localtax1_tx, fd. localtax2_tx, fd.remise, fd.remise_percent, fd.fk_remise_except, fd.subprice,'; $sql.= ' fd.date_start as date_start, fd.date_end as date_end, fd.fk_product_fournisseur_price as fk_fournprice, fd.buy_price_ht as pa_ht,'; - $sql.= ' fd.info_bits, fd.total_ht, fd.total_tva, fd.total_ttc, fd.total_localtax1, fd.total_localtax2, fd.rang,'; + $sql.= ' fd.info_bits, fd.special_code, fd.total_ht, fd.total_tva, fd.total_ttc, fd.total_localtax1, fd.total_localtax2, fd.rang,'; $sql.= ' fd.fk_code_ventilation,'; $sql.= ' p.ref as product_ref, p.label as product_libelle, p.description as product_desc'; $sql.= ' FROM '.MAIN_DB_PREFIX.'facturedet as fd'; @@ -3425,6 +3425,7 @@ class FactureLigne extends CommonInvoiceLine $this->date_start = $this->db->jdate($objp->date_start); $this->date_end = $this->db->jdate($objp->date_end); $this->info_bits = $objp->info_bits; + $this->special_code = $objp->special_code; $this->total_ht = $objp->total_ht; $this->total_tva = $objp->total_tva; $this->total_localtax1 = $objp->total_localtax1; diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php index f86c0603cd6..48b08946469 100644 --- a/htdocs/compta/facture/prelevement.php +++ b/htdocs/compta/facture/prelevement.php @@ -211,7 +211,6 @@ if ($object->id > 0) } print ')'; } - // FIXME $facidnext not defined /* if ($facidnext > 0) { diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php index 65d485d129c..f045fb30cc3 100644 --- a/htdocs/contrat/fiche.php +++ b/htdocs/contrat/fiche.php @@ -1088,7 +1088,6 @@ else } - $servicepos=(GETPOST('servicepos')?GETPOST('servicepos'):1); // FIXME : not used ? $colorb='666666'; $arrayothercontracts=$object->getListOfContracts('others'); diff --git a/htdocs/core/boxes/box_activity.php b/htdocs/core/boxes/box_activity.php index 8f191415deb..bddeb4b957e 100644 --- a/htdocs/core/boxes/box_activity.php +++ b/htdocs/core/boxes/box_activity.php @@ -56,7 +56,7 @@ class box_activity extends ModeleBoxes // FIXME: Use a cache to save data because this slow down too much main home page. This box slow down too seriously software. // FIXME: Removed number_format (not compatible with all languages) // FIXME: Pb into some status - $this->enabled=$conf->global->MAIN_FEATURES_LEVEL; // Not enabled by default due to bugs (see previous FIXME) + $this->enabled=$conf->global->MAIN_FEATURES_LEVEL; // Not enabled by default due to bugs (see previous comments) } /** diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 59a258289f4..8c1c4ac7987 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -138,7 +138,7 @@ class Form if (empty($typeofdata)) return 'ErrorBadParameter'; // When option to edit inline is activated - if (! empty($conf->global->MAIN_USE_JQUERY_JEDITABLE) && ! preg_match('/^select;|datehourpicker/',$typeofdata)) // FIXME add jquery timepicker + if (! empty($conf->global->MAIN_USE_JQUERY_JEDITABLE) && ! preg_match('/^select;|datehourpicker/',$typeofdata)) // TODO add jquery timepicker { $ret.=$this->editInPlace($object, $value, $htmlname, $perm, $typeofdata, $editvalue, $extObject, $success); } diff --git a/htdocs/core/db/pgsql.class.php b/htdocs/core/db/pgsql.class.php index 7c0366fb4a0..cb63f012114 100644 --- a/htdocs/core/db/pgsql.class.php +++ b/htdocs/core/db/pgsql.class.php @@ -61,7 +61,7 @@ class DoliDBPgsql extends DoliDB var $lastqueryerror; var $lasterror; var $lasterrno; - + var $unescapeslashquot=0; // By default we do not force the unescape of \'. This is used only to process sql with mysql escaped data. var $standard_conforming_strings=1; // Database has option standard_conforming_strings to on @@ -211,7 +211,7 @@ class DoliDBPgsql extends DoliDB // tinyint type conversion $line=preg_replace('/tinyint\(?[0-9]*\)?/','smallint',$line); $line=preg_replace('/tinyint/i','smallint',$line); - + // nuke unsigned $line=preg_replace('/(int\w+|smallint)\s+unsigned/i','\\1',$line); @@ -234,13 +234,13 @@ class DoliDBPgsql extends DoliDB $line=preg_replace('/^float/i','numeric',$line); $line=preg_replace('/(\s*)float/i','\\1numeric',$line); - //Check tms timestamp field case (in Mysql this field is defautled to now and + //Check tms timestamp field case (in Mysql this field is defautled to now and // on update defaulted by now $line=preg_replace('/(\s*)tms(\s*)timestamp/i','\\1tms timestamp without time zone DEFAULT now() NOT NULL',$line); - + // nuke ON UPDATE CURRENT_TIMESTAMP $line=preg_replace('/(\s*)on(\s*)update(\s*)CURRENT_TIMESTAMP/i','\\1',$line); - + // unique index(field1,field2) if (preg_match('/unique index\s*\((\w+\s*,\s*\w+)\)/i',$line)) { @@ -468,7 +468,7 @@ class DoliDBPgsql extends DoliDB { return ''; } - + /** * Close database connexion * @@ -1254,7 +1254,7 @@ class DoliDBPgsql extends DoliDB $sql.="(".$field_desc['value'].")"; } - // FIXME May not work with pgsql. May need to run a second request. If it works, just remove the FIXME tag + // TODO May not work with pgsql. May need to run a second request. If it works, just remove the comment if ($field_desc['null'] == 'not null' || $field_desc['null'] == 'NOT NULL') $sql.=" NOT NULL"; dol_syslog($sql,LOG_DEBUG); diff --git a/htdocs/core/tpl/admin_extrafields_add.tpl.php b/htdocs/core/tpl/admin_extrafields_add.tpl.php index 3a5b02a9d48..d1f8fc6bb37 100644 --- a/htdocs/core/tpl/admin_extrafields_add.tpl.php +++ b/htdocs/core/tpl/admin_extrafields_add.tpl.php @@ -31,14 +31,14 @@ { print 'jQuery("#value_choice").hide();'; } - + if (GETPOST('type') == "separate") { print "jQuery('#size, #unique, #required, #default_value').val('').attr('disabled','disabled');"; print 'jQuery("#value_choice").hide();'; } ?> - + if (type == 'date') { size.val('').attr('disabled','disabled'); unique.removeAttr('disabled','disabled'); jQuery("#value_choice").hide(); } else if (type == 'datetime') { size.val('').attr('disabled','disabled'); unique.removeAttr('disabled','disabled'); jQuery("#value_choice").hide(); } else if (type == 'double') { size.val('24,8').removeAttr('disabled'); unique.removeAttr('disabled','disabled'); jQuery("#value_choice").hide(); } @@ -67,17 +67,19 @@ - - - - - + + + + + + + - - diff --git a/htdocs/core/tpl/admin_extrafields_edit.tpl.php b/htdocs/core/tpl/admin_extrafields_edit.tpl.php index 3d1bdc4a9be..e24a3e86948 100644 --- a/htdocs/core/tpl/admin_extrafields_edit.tpl.php +++ b/htdocs/core/tpl/admin_extrafields_edit.tpl.php @@ -73,8 +73,6 @@ elseif ($type== 'sellist') $param_chain = $paramlist[0]; } ?> - - @@ -84,6 +82,10 @@ elseif ($type== 'sellist') + + + + - - diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php index 8afc2d4fe28..ee961f5ad70 100644 --- a/htdocs/core/tpl/objectline_edit.tpl.php +++ b/htdocs/core/tpl/objectline_edit.tpl.php @@ -43,6 +43,7 @@ if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) { + global->MAIN_FEATURES_LEVEL > 1) diff --git a/htdocs/exports/class/export.class.php b/htdocs/exports/class/export.class.php index dbb3a215d5d..39225d26d6e 100644 --- a/htdocs/exports/class/export.class.php +++ b/htdocs/exports/class/export.class.php @@ -220,7 +220,7 @@ class Export if ($i > 0) $sql.=', '; else $i++; - + if (strpos($key, ' as ')===false) { $newfield=$key.' as '.str_replace(array('.', '-'),'_',$key); } else { @@ -327,7 +327,7 @@ class Export */ function conditionDate($Field, $Value, $Sens) { - // FIXME date_format is forbidden, not performant and no portable. Use instead BETWEEN + // TODO date_format is forbidden, not performant and not portable. Use instead BETWEEN if (strlen($Value)==4) $Condition=" date_format(".$Field.",'%Y') ".$Sens." ".$Value; elseif (strlen($Value)==6) $Condition=" date_format(".$Field.",'%Y%m') ".$Sens." '".$Value."'"; else $Condition=" date_format(".$Field.",'%Y%m%d') ".$Sens." ".$Value; diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php index f170b29330a..1cd4d982466 100644 --- a/htdocs/fourn/facture/document.php +++ b/htdocs/fourn/facture/document.php @@ -102,7 +102,7 @@ if ($object->id > 0) if ($action == 'delete') { print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&urlfile='.urlencode($_GET["urlfile"]), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', 0, 1); - + } print '
trans("Type"); ?> -selectarray('type',$type2label,GETPOST('type')); ?> -
trans("Position"); ?>
trans("Label"); ?>
trans("AttributeCode"); ?> (trans("AlphaNumOnlyCharsAndNoSpace"); ?>)
trans("Type"); ?> +selectarray('type',$type2label,GETPOST('type')); ?> +
trans("Size"); ?>
trans("Position"); ?>
@@ -95,8 +97,6 @@
trans("DefaultValue"); ?>">
trans("Size"); ?>
trans("Unique"); ?>>
trans("Position"); ?>
trans("Label"); ?>
trans("Size"); ?>
trans("Position"); ?>
trans("Size"); ?>
trans("Unique"); ?>>
'; @@ -153,7 +153,6 @@ if ($object->id > 0) } print ')'; } - // FIXME $facidnext is not defined /* if ($facidnext > 0) { diff --git a/htdocs/product/photos.php b/htdocs/product/photos.php index c3353866b29..864b36c3149 100644 --- a/htdocs/product/photos.php +++ b/htdocs/product/photos.php @@ -97,7 +97,7 @@ if ($object->id) if ($action == 'delete') { print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&file='.$_GET["file"], $langs->trans('DeletePicture'), $langs->trans('ConfirmDeletePicture'), 'confirm_delete', '', 0, 1); - + } print($mesg); @@ -162,7 +162,7 @@ if ($object->id) { // Affiche formulaire upload $formfile=new FormFile($db); - $formfile->form_attach_new_file($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans("AddPhoto"), 1, 0, 1, 50, $object, '', false); // FIXME Regis: disabled for the moment + $formfile->form_attach_new_file($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans("AddPhoto"), 1, 0, 1, 50, $object, '', false); // ajax=false for the moment. true may not work. } // Affiche photos diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php index 0c2b17dcb1a..4b05818a567 100644 --- a/htdocs/user/perms.php +++ b/htdocs/user/perms.php @@ -76,7 +76,7 @@ if ($action == 'addrights' && $caneditperms) { $edituser = new User($db); $edituser->fetch($id); - //$edituser->addrights($rights, $module, '', $entity); // FIXME unused for the moment + //$edituser->addrights($rights, $module, '', $entity); // TODO unused for the moment $edituser->addrights($rights, $module); // Si on a touche a ses propres droits, on recharge @@ -92,7 +92,7 @@ if ($action == 'delrights' && $caneditperms) { $edituser = new User($db); $edituser->fetch($id); - //$edituser->delrights($rights, $module, '', $entity); // FIXME unused for the moment + //$edituser->delrights($rights, $module, '', $entity); // TODO unused for the moment $edituser->delrights($rights, $module); // Si on a touche a ses propres droits, on recharge @@ -177,13 +177,16 @@ $sql = "SELECT r.id, r.libelle, r.module"; $sql.= " FROM ".MAIN_DB_PREFIX."rights_def as r,"; $sql.= " ".MAIN_DB_PREFIX."user_rights as ur"; $sql.= " WHERE ur.fk_id = r.id"; -if (! empty($conf->multicompany->enabled)) { +if (! empty($conf->multicompany->enabled)) +{ if (1==2 && ! empty($conf->multicompany->transverse_mode)) { - $sql.= " AND r.entity = ".(GETPOST('entity','int')?GETPOST('entity','int'):$conf->entity); // FIXME unused for the moment + $sql.= " AND r.entity = ".(GETPOST('entity','int')?GETPOST('entity','int'):$conf->entity); // TODO unused for the moment } else { $sql.= " AND r.entity = ".(! empty($fuser->entity) ? $fuser->entity : $conf->entity); } -} else { +} +else +{ $sql.= " AND r.entity = ".$conf->entity; } $sql.= " AND ur.fk_user = ".$fuser->id;