diff --git a/ChangeLog b/ChangeLog index 2ef52f1354a..c0eb78120b0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -36,7 +36,20 @@ For users: - New: Add module Opensurvey. - New: Default aprrover for holidays i sby default hierchical parent. - First change to prepare feature "click to print" (IPP) for PDF. - +- New: [ task #350 ] Merge tab customer and prospect +- New: [ task #710 ] Add substitution into mailing send (and HTML is now valid) +- New: [ task #711 ] Add combobox for contact as done for product/thirdparty +- New: [ task #714 ] In Emailing module admin autogenerate security key of READRECIEPT +- New: [ task #743 ] GED : Add aministration option to disabled autotree to display +- New: [ task #767 ] Customer Address fallback when a contact doesn't have an address +- New: [ task #768 ] WYSIWYG for all mail +- New: [ task #773 ] Add Project document in GED(ECM) modules +- New: [ task #783 ] Add checkbox and radio into extrafield feature +- New: [ task #798 ] Add range limit date on product/services as it is done on order and invoice +- New: [ task #814 ] Add extrafield feature into Project/project tasks module +- New: [ task #770 ] Add ODT document generation for Projects module +- New: [ task #741 ] Add intervention box + For translators: - Update language files. @@ -59,6 +72,8 @@ For developers: - New: when adding an action, we can define a free code to tag it for a specific need. - New: Enhance Dolibarr migration process to include migration script of external modules. +- New: [ task #811 ] Uniformanize note field. + WARNING: If you used external modules, some of them may need to be upgraded due to: - Fields of classes were renamed to be normalized (nom, prenom, cp, ville, adresse, tel @@ -85,7 +100,10 @@ WARNING: If you used external modules, some of them may need to be upgraded due - Fix: Orderstoinvoice didn't act as expected when no order was checked - Fix: Bad link to all proposals into Third party card if customer is prospect - Fix: [ bug #789 ] VAT not being calculated in POS - +- Fix: [ bug #794 ] Lost filter on zipcode in prospect list +- Fix: [ bug #774 ] Bug on creating event with box "all day" crossed +- Fix: [ bug #810 ] Cannot update ODT template path +- Fix: [ bug #824 ] MAIN_DB_PREFIX not use into dictionnary ***** ChangeLog for 3.3.1 compared to 3.3 ***** @@ -95,6 +113,7 @@ WARNING: If you used external modules, some of them may need to be upgraded due - Fix: [ bug #736 ] Missing column in llx_c_chargesociales - Fix: Localtax2 for Spain must be based into buyer - Fix: [ bug #762 ] Bad profit calculation in Reporting +- Fix: bug dictionnary with wrong prefix table diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php index 4df22736021..cf93f472019 100644 --- a/htdocs/admin/dict.php +++ b/htdocs/admin/dict.php @@ -139,7 +139,7 @@ $tabsql[6] = "SELECT a.id as rowid, a.code as code, a.libelle AS libelle, a.t $tabsql[7] = "SELECT a.id as rowid, a.code as code, a.libelle AS libelle, a.accountancy_code as accountancy_code, a.deductible, p.code as country_code, p.libelle as country, a.fk_pays as country_id, a.active FROM ".MAIN_DB_PREFIX."c_chargesociales AS a, ".MAIN_DB_PREFIX."c_pays as p WHERE a.fk_pays=p.rowid and p.active=1"; $tabsql[8] = "SELECT id as rowid, code, libelle, active FROM ".MAIN_DB_PREFIX."c_typent"; $tabsql[9] = "SELECT code_iso as code, label, unicode, active FROM ".MAIN_DB_PREFIX."c_currencies"; -$tabsql[10]= "SELECT t.rowid, t.taux, t.localtax1_type, t.localtax1, t.localtax2_type, t.localtax2, p.libelle as country, p.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, llx_c_pays as p WHERE t.fk_pays=p.rowid"; +$tabsql[10]= "SELECT t.rowid, t.taux, t.localtax1_type, t.localtax1, t.localtax2_type, t.localtax2, p.libelle as country, p.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_pays as p WHERE t.fk_pays=p.rowid"; $tabsql[11]= "SELECT t.rowid as rowid, element, source, code, libelle, active FROM ".MAIN_DB_PREFIX."c_type_contact AS t"; $tabsql[12]= "SELECT c.rowid as rowid, code, sortorder, c.libelle, c.libelle_facture, nbjour, fdm, decalage, active FROM ".MAIN_DB_PREFIX.'c_payment_term AS c'; $tabsql[13]= "SELECT id as rowid, code, c.libelle, type, active FROM ".MAIN_DB_PREFIX."c_paiement AS c"; @@ -154,7 +154,7 @@ $tabsql[21]= "SELECT c.rowid as rowid, code, label, active FROM ".MAIN_DB_PREFIX $tabsql[22]= "SELECT rowid as rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_input_reason"; $tabsql[23]= "SELECT rowid as rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number as accountancy_code, account_parent, label, active FROM ".MAIN_DB_PREFIX."accountingaccount"; $tabsql[24]= "SELECT s.rowid as rowid, pcg_version, s.fk_pays as country_id, p.code as country_code, p.libelle as pays, s.label, s.active FROM ".MAIN_DB_PREFIX."accounting_system as s, ".MAIN_DB_PREFIX."c_pays as p WHERE s.fk_pays=p.rowid and p.active=1"; -$tabsql[25]= "SELECT t.rowid, t.taux, p.libelle as country, p.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, llx_c_pays as p WHERE t.fk_pays=p.rowid"; +$tabsql[25]= "SELECT t.rowid, t.taux, p.libelle as country, p.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_pays as p WHERE t.fk_pays=p.rowid"; // Critere de tri du dictionnaire $tabsqlsort=array(); diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php index b603792b957..9e7a7a959bb 100644 --- a/htdocs/comm/action/listactions.php +++ b/htdocs/comm/action/listactions.php @@ -238,7 +238,7 @@ if ($resql) $i = 0; print ''; print ''; - print_liste_field_titre($langs->trans("Action"),$_SERVER["PHP_SELF"],"acode",$param,"","",$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Action"),$_SERVER["PHP_SELF"],"a.label",$param,"","",$sortfield,$sortorder); //print_liste_field_titre($langs->trans("Title"),$_SERVER["PHP_SELF"],"a.label",$param,"","",$sortfield,$sortorder); print_liste_field_titre($langs->trans("DateStart"),$_SERVER["PHP_SELF"],"a.datep",$param,'','align="center"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("DateEnd"),$_SERVER["PHP_SELF"],"a.datep2",$param,'','align="center"',$sortfield,$sortorder); diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php index adbed8ea740..044b4b70ebc 100644 --- a/htdocs/compta/bank/releve.php +++ b/htdocs/compta/bank/releve.php @@ -1,7 +1,7 @@ * Copyright (C) 2004-2009 Laurent Destailleur - * Copyright (C) 2005-2012 Regis Houssin + * Copyright (C) 2005-2013 Regis Houssin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -85,7 +85,7 @@ if ($id > 0 || ! empty($ref)) $acct->fetch($id, $ref); } -if (! isset($num)) +if (empty($num)) { /* * Vue liste tous releves confondus diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php index 4a8f93a52f6..232126d68e2 100644 --- a/htdocs/compta/paiement.php +++ b/htdocs/compta/paiement.php @@ -286,7 +286,8 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie $(\'.fieldrequireddyn\').addClass(\'fieldrequired\'); if ($(\'#fieldchqemetteur\').val() == \'\') { - $(\'#fieldchqemetteur\').val(jQuery(\'#thirdpartylabel\').val()); + var emetteur = ('.$facture->type.' == 2) ? \''.dol_escape_htmltag(MAIN_INFO_SOCIETE_NOM).'\' : jQuery(\'#thirdpartylabel\').val(); + $(\'#fieldchqemetteur\').val(emetteur); } } else diff --git a/htdocs/core/boxes/box_ficheinter.php b/htdocs/core/boxes/box_ficheinter.php new file mode 100644 index 00000000000..78a81139654 --- /dev/null +++ b/htdocs/core/boxes/box_ficheinter.php @@ -0,0 +1,153 @@ + + * +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 3 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see . +*/ + +/** + * \file htdocs/core/boxes/box_intervention.php + * \ingroup ficheinter + * \brief Module de generation de l'affichage de la box ficheinter + */ + +include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php'; + + +/** + * Class to manage the box to show last contracts + */ +class box_ficheinter extends ModeleBoxes +{ + var $boxcode="ficheinter"; + var $boximg="object_intervention"; + var $boxlabel="BoxFicheInter"; + var $depends = array("ficheinter"); // conf->contrat->enabled + + var $db; + var $param; + + var $info_box_head = array(); + var $info_box_contents = array(); + + + /** + * Load data for box to show them later + * + * @param int $max Maximum number of records to load + * @return void + */ + function loadBox($max=10) + { + global $user, $langs, $db, $conf; + + $this->max=$max; + + include_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php'; + $ficheinterstatic=new Fichinter($db); + + $this->info_box_head = array('text' => $langs->trans("BoxTitleLastFicheInter",$max)); + + if ($user->rights->ficheinter->lire) + { + $sql = "SELECT f.rowid, f.ref, f.fk_soc, f.fk_statut,"; + $sql.= " f.datec,"; + $sql.= " f.date_valid as datev,"; + $sql.= " f.tms as datem,"; + $sql.= " s.nom, s.rowid as socid, s.client"; + $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; + if (! $user->rights->societe->client->voir) + $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; + $sql.= ", ".MAIN_DB_PREFIX."fichinter as f"; + $sql.= " WHERE f.fk_soc = s.rowid "; + $sql.= " AND f.entity = ".$conf->entity; + if (! $user->rights->societe->client->voir) + $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id; + $sql.= " ORDER BY f.tms DESC"; + $sql.= $db->plimit($max, 0); + + dol_syslog(get_class($this).'::loadBox sql='.$sql,LOG_DEBUG); + $resql = $db->query($sql); + if ($resql) + { + $num = $db->num_rows($resql); + $now=dol_now(); + + $i = 0; + + while ($i < $num) + { + $objp = $db->fetch_object($resql); + $datec=$db->jdate($objp->datec); + + $ficheinterstatic->statut=$objp->fk_statut; + $ficheinterstatic->id=$objp->rowid; + + $this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"', + 'logo' => $this->boximg, + 'url' => DOL_URL_ROOT."/ficheinter/fiche.php?id=".$objp->rowid); + + $this->info_box_contents[$i][1] = array('td' => 'align="left"', + 'text' => ($objp->ref?$objp->ref:$objp->rowid), // Some contracts have no ref + 'url' => DOL_URL_ROOT."/contrat/fiche.php?id=".$objp->rowid); + + $this->info_box_contents[$i][2] = array('td' => 'align="left" width="16"', + 'logo' => 'company', + 'url' => DOL_URL_ROOT."/comm/fiche.php?socid=".$objp->socid); + + $this->info_box_contents[$i][3] = array('td' => 'align="left"', + 'text' => dol_trunc($objp->nom,40), + 'url' => DOL_URL_ROOT."/comm/fiche.php?socid=".$objp->socid); + + $this->info_box_contents[$i][4] = array('td' => 'align="right"', + 'text' => dol_print_date($datec,'day')); + + $this->info_box_contents[$i][5] = array('td' => 'align="right" nowrap="nowrap"', + 'text' => $ficheinterstatic->getLibStatut(6), + 'asis'=>1 + ); + + $i++; + } + + if ($num==0) $this->info_box_contents[$i][0] = array('td' => 'align="center"','text'=>$langs->trans("NoRecordedContracts")); + } + else + { + $this->info_box_contents[0][0] = array( 'td' => 'align="left"', + 'maxlength'=>500, + 'text' => ($db->error().' sql='.$sql)); + } + } + else + { + $this->info_box_contents[0][0] = array('td' => 'align="left"', + 'text' => $langs->trans("ReadPermissionNotAllowed")); + } + } + + /** + * Method to show box + * + * @param array $head Array with properties of box title + * @param array $contents Array with properties of box lines + * @return void + */ + function showBox($head = null, $contents = null) + { + parent::showBox($this->info_box_head, $this->info_box_contents); + } + +} + +?> diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index ae60706f523..944f364ee4b 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -3333,7 +3333,7 @@ class Form if (strval($set_time) != '' && $set_time != -1) { //$formated_date=dol_print_date($set_time,$conf->format_date_short); - $formated_date=dol_print_date($set_time,$langs->trans("FormatDateShort")); // FormatDateShort for dol_print_date/FormatDateShortJava that is same for javascript + $formated_date=dol_print_date($set_time,$langs->trans("FormatDateShortInput")); // FormatDateShortInput for dol_print_date / FormatDateShortJavaInput that is same for javascript } // Calendrier popup version eldy @@ -3342,7 +3342,7 @@ class Form // Zone de saisie manuelle de la date $retstring.='trans("FormatDateShortJava").'\'); "'; // FormatDateShort for dol_print_date/FormatDateShortJava that is same for javascript + $retstring.=' onChange="dpChangeDay(\''.$prefix.'\',\''.$langs->trans("FormatDateShortJavaInput").'\'); "'; // FormatDateShortInput for dol_print_date / FormatDateShortJavaInput that is same for javascript $retstring.='>'; // Icone calendrier @@ -3350,7 +3350,7 @@ class Form { $retstring.=''; + $retstring.=' onClick="showDP(\''.$base.'\',\''.$prefix.'\',\''.$langs->trans("FormatDateShortJavaInput").'\',\''.$langs->defaultlang.'\');">'.img_object($langs->trans("SelectDate"),'calendarday','class="datecallink"').''; } else $retstring.=''; @@ -3359,7 +3359,7 @@ class Form $retstring.=''."\n"; } else - { + { print "Bad value of MAIN_POPUP_CALENDAR"; } } @@ -3453,7 +3453,7 @@ class Form if ($usecalendar == "eldy") { $base=DOL_URL_ROOT.'/core/'; - $reset_scripts .= 'resetDP(\''.$base.'\',\''.$prefix.'\',\''.$langs->trans("FormatDateShortJava").'\',\''.$langs->defaultlang.'\');'; + $reset_scripts .= 'resetDP(\''.$base.'\',\''.$prefix.'\',\''.$langs->trans("FormatDateShortJavaInput").'\',\''.$langs->defaultlang.'\');'; } else { diff --git a/htdocs/core/datepicker.php b/htdocs/core/datepicker.php index 76b8dbb4b79..a976eb83f01 100644 --- a/htdocs/core/datepicker.php +++ b/htdocs/core/datepicker.php @@ -224,16 +224,16 @@ function displayBox($selectedDate,$month,$year) if($thedate==$selDate) $dayclass="dpSelected"; elseif($thedate==$today) $dayclass="dpToday"; - if ($langs->trans("FormatDateShortJava")=="FormatDateShortJava") + if ($langs->trans("FormatDateShortJavaInput")=="FormatDateShortJavaInput") { - print "ERROR FormatDateShortJava not defined for language ".$langs->defaultlang; + print "ERROR FormatDateShortJavaInput not defined for language ".$langs->defaultlang; exit; } // Sur click dans calendrier, appelle fonction dpClickDay echo ""; $cols++; diff --git a/htdocs/core/get_menudiv.php b/htdocs/core/get_menudiv.php index 0d9e3c0a54b..51bda89ffd0 100644 --- a/htdocs/core/get_menudiv.php +++ b/htdocs/core/get_menudiv.php @@ -40,11 +40,6 @@ $langs->load("main"); $right=($langs->trans("DIRECTION")=='rtl'?'left':'right'); $left=($langs->trans("DIRECTION")=='rtl'?'right':'left'); -//var_dump($langs->defaultlang); -//var_dump($conf->format_date_short_java); -//var_dump($langs->trans("FormatDateShortJava")); - - /* * View diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 7ea8087613e..46f65283a3e 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -3105,12 +3105,16 @@ function get_default_npr($thirdparty_seller, $thirdparty_buyer, $idprod=0, $idpr if ($idprodfournprice > 0) { + if (! class_exists('ProductFournisseur')) + require DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.product.class.php'; $prodprice = new ProductFournisseur($db); $prodprice->fetch_product_fournisseur_price($idprodfournprice); return $prodprice->fourn_tva_npr; } elseif ($idprod > 0) { + if (! class_exists('Product')) + require DOL_DOCUMENT_ROOT . '/product/class/product.class.php'; $prod = new Product($db); $prod->fetch($idprod); return $prod->tva_npr; diff --git a/htdocs/core/modules/modCron.class.php b/htdocs/core/modules/modCron.class.php index 7f17b07503e..2080767e00c 100644 --- a/htdocs/core/modules/modCron.class.php +++ b/htdocs/core/modules/modCron.class.php @@ -25,6 +25,7 @@ */ include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php'; + /** * Class to describe a Cron module */ @@ -122,8 +123,8 @@ class modCron extends DolibarrModules $r=0; $this->menu[$r]=array( 'fk_menu'=>'fk_mainmenu=home,fk_leftmenu=modulesadmintools', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode 'type'=>'left', // This is a Left menu entry - 'titre'=>'CronListActive', - 'url'=>'/cron/list.php?status=1', + 'titre'=>'CronList', + 'url'=>'/cron/list.php?status=-1', 'langs'=>'cron', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory. 'position'=>200, 'enabled'=>'$leftmenu==\'modulesadmintools\'', // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected. @@ -131,18 +132,6 @@ class modCron extends DolibarrModules 'target'=>'', 'user'=>2); // 0=Menu for internal users, 1=external users, 2=both $r++; - - $this->menu[$r]=array( 'fk_menu'=>'fk_mainmenu=home,fk_leftmenu=modulesadmintools', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode - 'type'=>'left', // This is a Left menu entry - 'titre'=>'CronListInactive', - 'url'=>'/cron/list.php?status=0', - 'langs'=>'cron', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory. - 'position'=>201, - 'enabled'=>'$leftmenu==\'modulesadmintools\'', // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected. - 'perms'=>'$user->rights->cron->read', // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules - 'target'=>'', - 'user'=>2); // 0=Menu for internal users, 1=external users, 2=both - $r++; } diff --git a/htdocs/core/modules/modFicheinter.class.php b/htdocs/core/modules/modFicheinter.class.php index 96c0b6b012a..52a90179b95 100644 --- a/htdocs/core/modules/modFicheinter.class.php +++ b/htdocs/core/modules/modFicheinter.class.php @@ -89,6 +89,7 @@ class modFicheinter extends DolibarrModules // Boites $this->boxes = array(); + $this->boxes[0][1] = "box_ficheinter.php"; // Permissions $this->rights = array(); diff --git a/htdocs/core/search_page.php b/htdocs/core/search_page.php index 3cab48155ae..fe21a82c56f 100644 --- a/htdocs/core/search_page.php +++ b/htdocs/core/search_page.php @@ -40,11 +40,6 @@ $langs->load("main"); $right=($langs->trans("DIRECTION")=='rtl'?'left':'right'); $left=($langs->trans("DIRECTION")=='rtl'?'right':'left'); -//var_dump($langs->defaultlang); -//var_dump($conf->format_date_short_java); -//var_dump($langs->trans("FormatDateShortJava")); - - /* * View diff --git a/htdocs/cron/class/cronjob.class.php b/htdocs/cron/class/cronjob.class.php index 60514e73942..454eb457517 100644 --- a/htdocs/cron/class/cronjob.class.php +++ b/htdocs/cron/class/cronjob.class.php @@ -393,10 +393,9 @@ class Cronjob extends CommonObject $sql.= " t.note,"; $sql.= " t.nbrun"; - $sql.= " FROM ".MAIN_DB_PREFIX."cronjob as t"; - $status = (empty($status))?'0':'1'; - $sql.= " WHERE t.status=".$status; + $sql.= " WHERE 1 = 1"; + if ($status >= 0) $sql.= " AND t.status = ".(empty($status)?'0':'1'); //Manage filter if (is_array($filter) && count($filter)>0) { foreach($filter as $key => $value) { @@ -404,7 +403,6 @@ class Cronjob extends CommonObject } } - $sql.= " ORDER BY $sortfield $sortorder "; if (!empty($limit) && !empty($offset)) { $sql.= $this->db->plimit($limit + 1,$offset); @@ -836,7 +834,7 @@ class Cronjob extends CommonObject $error=0; $now=dol_now(); - + $langs->load('cron'); if (empty($userlogin)) { diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php index a78b037d68b..42b41d0ed4f 100644 --- a/htdocs/cron/list.php +++ b/htdocs/cron/list.php @@ -108,8 +108,9 @@ if ($action == 'confirm_execute' && $confirm == "yes" && $user->rights->cron->ex $form = new Form($db); -if (!empty($status)) $pagetitle=$langs->trans("CronListActive"); -else $pagetitle=$langs->trans("CronListInactive"); +//if (! empty($status)) $pagetitle=$langs->trans("CronListActive"); +//else $pagetitle=$langs->trans("CronListInactive"); +$pagetitle=$langs->trans("CronList"); llxHeader('',$pagetitle); @@ -155,8 +156,8 @@ if (count($object->lines)>0) { print_liste_field_titre($langs->trans("CronNbRun"),$_SERVEUR['PHP_SELF'],"t.nbrun","",$arg_url,'',$sortfield,$sortorder); print_liste_field_titre($langs->trans("CronLastResult"),$_SERVEUR['PHP_SELF'],"t.lastresult","",$arg_url,'',$sortfield,$sortorder); print_liste_field_titre($langs->trans("CronLastOutput"),$_SERVEUR['PHP_SELF'],"t.lastoutput","",$arg_url,'',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Active"),$_SERVEUR['PHP_SELF'],"t.status","",$arg_url,'align="center"',$sortfield,$sortorder); print ''; - print ''; print ''."\n"; @@ -177,7 +178,11 @@ if (count($object->lines)>0) { print ''; print ''; print ''; - print ''; @@ -189,7 +194,8 @@ if (count($object->lines)>0) { // Boucler sur chaque job $style='impair'; - foreach($object->lines as $line){ + foreach($object->lines as $line) + { // title profil if ($style=='pair') {$style='impair';} else {$style='pair';} @@ -259,6 +265,10 @@ if (count($object->lines)>0) { print ''; print ''; + + print ''; - // Status + // Status print '
trans("FormatDateShortJava")."')\""; + echo " onClick=\"dpClickDay(".$mydate["year"].",parseInt('".dol_print_date($thedate,"%m")."',10),".$mydate["mday"].",'".$langs->trans("FormatDateShortJavaInput")."')\""; echo ">".sprintf("%02s",$mydate["mday"])."
   '; + print ''; + print $form->selectarray('status', array('0'=>$langs->trans("No"),'1'=>$langs->trans("Yes")), GETPOST('status'), 1); + print ''; + print ' '; + print ''; print '  '; print ''; print ''; + print yn($line->status); + print ''; if ($user->rights->cron->delete) { print "id."&status=".$status."&action=delete\" title=\"".$langs->trans('CronDelete')."\">".img_delete()."  "; } else { diff --git a/htdocs/install/mysql/migration/3.3.0-3.4.0.sql b/htdocs/install/mysql/migration/3.3.0-3.4.0.sql index e8c1da2aa4f..b8542349f5f 100755 --- a/htdocs/install/mysql/migration/3.3.0-3.4.0.sql +++ b/htdocs/install/mysql/migration/3.3.0-3.4.0.sql @@ -180,6 +180,7 @@ UPDATE llx_c_tva set localtax1=0, localtax1_type='0' where localtax1_type = '7'; UPDATE llx_c_tva set localtax2=0, localtax2_type='0' where localtax2_type = '7'; ALTER TABLE llx_facture_fourn_det ADD COLUMN info_bits integer NOT NULL DEFAULT 0 after date_end; +ALTER TABLE llx_product_fournisseur_price ADD COLUMN info_bits integer NOT NULL DEFAULT 0 after tva_tx; ALTER TABLE llx_actioncomm ADD COLUMN code varchar(32) NULL after fk_action; @@ -266,7 +267,6 @@ ALTER TABLE llx_commande_extrafields ADD INDEX idx_commande_extrafields (fk_obje ALTER TABLE llx_socpeople ADD COLUMN note_public text after note; ALTER TABLE llx_societe ADD COLUMN note_public text after note; -ALTER TABLE llx_facture_fourn_det ADD COLUMN info_bits integer NOT NULL DEFAULT 0 after date_end; ALTER TABLE llx_actioncomm ADD COLUMN transparency integer after fk_user_action; INSERT INTO llx_c_action_trigger (rowid,code,label,description,elementtype,rang) VALUES (29,'FICHINTER_SENTBYMAIL','Intervention sent by mail','Executed when a intervention is sent by mail','ficheinter',29); diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql index 2a26034c130..e48c3ce6f82 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql @@ -1,7 +1,7 @@ -- ============================================================================ -- Copyright (C) 2003 Rodolphe Quiedeville -- Copyright (C) 2009-2011 Laurent Destailleur --- Copyright (C) 2009-2012 Regis Houssin +-- Copyright (C) 2009-2013 Regis Houssin -- Copyright (C) 2012 Juanjo Menent -- -- This program is free software; you can redistribute it and/or modify @@ -21,23 +21,23 @@ create table llx_product_fournisseur_price ( - rowid integer AUTO_INCREMENT PRIMARY KEY, - entity integer DEFAULT 1 NOT NULL, -- multi company id - datec datetime, - tms timestamp, + rowid integer AUTO_INCREMENT PRIMARY KEY, + entity integer DEFAULT 1 NOT NULL, -- multi company id + datec datetime, + tms timestamp, fk_product integer, - fk_soc integer, + fk_soc integer, ref_fourn varchar(30), - fk_availability integer, - price double(24,8) DEFAULT 0, + fk_availability integer, + price double(24,8) DEFAULT 0, quantity double, - remise_percent double NOT NULL DEFAULT 0, + remise_percent double NOT NULL DEFAULT 0, remise double NOT NULL DEFAULT 0, unitprice double(24,8) DEFAULT 0, - charges double(24,8) DEFAULT 0, + charges double(24,8) DEFAULT 0, unitcharges double(24,8) DEFAULT 0, - tva_tx double(6,3) NOT NULL, + tva_tx double(6,3) NOT NULL, info_bits integer NOT NULL DEFAULT 0, - fk_user integer, - import_key varchar(14) -- Import key + fk_user integer, + import_key varchar(14) -- Import key )ENGINE=innodb; diff --git a/htdocs/langs/ar_SA/main.lang b/htdocs/langs/ar_SA/main.lang index f273f913d04..93e44d0cf43 100644 --- a/htdocs/langs/ar_SA/main.lang +++ b/htdocs/langs/ar_SA/main.lang @@ -15,7 +15,11 @@ FONTSIZEFORPDF=9 SeparatorDecimal=. SeparatorThousand=None FormatDateShort=%d/%m/%Y +FormatDateShortInpu=%d/%m/%Y FormatDateShortJava=dd/MM/yyyy +FormatDateShortJavaInput=dd/MM/yyyy +FormatDateShortJQuery=dd/mm/yy +FormatDateShortJQueryInput=dd/mm/yy FormatHourShort=%H:%M FormatDateTextShort=%d %b %Y FormatDateText=%d %B %Y @@ -600,7 +604,6 @@ Prefix=بادئة // START - Lines generated via autotranslator.php tool (2012-02-29 15:55:27). // Reference language: en_US -> ar_SA -FormatDateShortJQuery=dd/mm/yy AddLink=إضافة وصلة Of=من SearchOf=البحث diff --git a/htdocs/langs/bg_BG/main.lang b/htdocs/langs/bg_BG/main.lang index 51df97caecb..9356eeac9a0 100644 --- a/htdocs/langs/bg_BG/main.lang +++ b/htdocs/langs/bg_BG/main.lang @@ -10,8 +10,11 @@ FONTSIZEFORPDF=9 SeparatorDecimal=. SeparatorThousand=, FormatDateShort=%d.%m.%Y +FormatDateShortInput=%d.%m.%Y FormatDateShortJava=dd.MM.yyyy +FormatDateShortJavaInput=dd.MM.yyyy FormatDateShortJQuery=dd.mm.yy +FormatDateShortJQueryInput=dd.mm.yy FormatHourShort=%H:%M FormatHourShortDuration=%H:%M FormatDateTextShort=%d %b %Y diff --git a/htdocs/langs/ca_ES/boxes.lang b/htdocs/langs/ca_ES/boxes.lang index c9630609526..029fcb2a189 100644 --- a/htdocs/langs/ca_ES/boxes.lang +++ b/htdocs/langs/ca_ES/boxes.lang @@ -18,6 +18,7 @@ BoxLastActions=Últims esdeveniments BoxLastContracts=Últims contractes BoxLastContacts=Últims contactes/adreçes BoxLastMembers=Últims membres modificats +BoxFicheInter=Últimes intervencions modificades BoxCurrentAccounts=Saldos comptes corrents BoxSalesTurnover=Volum de vendes BoxTotalUnpaidCustomerBills=Total factures a clients pendents de cobrament @@ -47,6 +48,7 @@ BoxTitleTotalUnpaidCustomerBills=Pendent de clients BoxTitleTotalUnpaidSuppliersBills=Pendent a proveïdors BoxTitleLastModifiedContacts=Els últims %s contactes/adreçes modificades BoxTitleLastModifiedMembers=Els %s últims membres modificats +BoxTitleLastFicheInter=Les %s últimes intervencions modificades BoxMyLastBookmarks=Els meus %s darrers marcadors BoxOldestExpiredServices=Serveis antics expirats BoxLastExpiredServices=Els %s contractes més antics amb serveis actius expirats diff --git a/htdocs/langs/ca_ES/main.lang b/htdocs/langs/ca_ES/main.lang index 35b4d437e4e..b4689f1537d 100644 --- a/htdocs/langs/ca_ES/main.lang +++ b/htdocs/langs/ca_ES/main.lang @@ -4,8 +4,11 @@ DIRECTION=ltr SeparatorDecimal=, SeparatorThousand= FormatDateShort=%d/%m/%Y +FormatDateShortInput=%d/%m/%Y FormatDateShortJava=dd/MM/yyyy +FormatDateShortJavaInput=dd/MM/yyyy FormatDateShortJQuery=dd/mm/yy +FormatDateShortJQueryInput=dd/mm/yy FormatHourShort=%H:%M FormatHourShortDuration=%H:%M FormatDateTextShort=%d %b %Y diff --git a/htdocs/langs/da_DK/main.lang b/htdocs/langs/da_DK/main.lang index 7dd615bfa86..128bf629fc7 100644 --- a/htdocs/langs/da_DK/main.lang +++ b/htdocs/langs/da_DK/main.lang @@ -14,7 +14,11 @@ CHARSET=UTF-8 SeparatorDecimal=. SeparatorThousand=, FormatDateShort=%d/%m/%Y +FormatDateShortInput=%d/%m/%Y FormatDateShortJava=dd/MM/yyyy +FormatDateShortJavaInput=dd/MM/yyyy +FormatDateShortJQuery=dd/mm/yy +FormatDateShortJQueryInput=dd/mm/yy FormatHourShort=%H:%M FormatDateTextShort=%d %b %Y FormatDateText=%d %B %Y @@ -624,7 +628,6 @@ Prefix=Præfiks // START - Lines generated via autotranslator.php tool (2012-02-29 15:59:19). // Reference language: en_US -> da_DK -FormatDateShortJQuery=dd/mm/yy AddLink=Tilføj link Of=af SearchOf=Søg diff --git a/htdocs/langs/de_AT/main.lang b/htdocs/langs/de_AT/main.lang index ed9d7b27ec2..6a44f3dbfee 100644 --- a/htdocs/langs/de_AT/main.lang +++ b/htdocs/langs/de_AT/main.lang @@ -10,7 +10,11 @@ DIRECTION=ltr SeparatorDecimal=, SeparatorThousand=. FormatDateShort=%d/%m/%Y +FormatDateShortInput=%d/%m/%Y FormatDateShortJava=dd/MM/yyyy +FormatDateShortJavaInput=dd/MM/yyyy +FormatDateShortJQuery=dd/MM/yy +FormatDateShortJQueryInput=dd/MM/yy FormatHourShort=%H:%M FormatDateTextShort=%d %b %Y FormatDateText=%d %B %Y diff --git a/htdocs/langs/de_DE/main.lang b/htdocs/langs/de_DE/main.lang index bac265965cc..88e22f914d8 100644 --- a/htdocs/langs/de_DE/main.lang +++ b/htdocs/langs/de_DE/main.lang @@ -11,8 +11,11 @@ DIRECTION=ltr SeparatorDecimal=, SeparatorThousand=. FormatDateShort=%d/%m/%Y +FormatDateShortInput=%d/%m/%Y FormatDateShortJava=dd/MM/yyyy +FormatDateShortJavaInput=dd/MM/yyyy FormatDateShortJQuery=dd/MM/yy +FormatDateShortJQueryInput=dd/MM/yy FormatHourShort=%I:%M %p FormatHourShortDuration=%H:%M FormatDateTextShort=%d %b %Y diff --git a/htdocs/langs/el_GR/main.lang b/htdocs/langs/el_GR/main.lang index d37b716a9ba..b38a1417ea8 100644 --- a/htdocs/langs/el_GR/main.lang +++ b/htdocs/langs/el_GR/main.lang @@ -7,7 +7,11 @@ FONTSIZEFORPDF=9 SeparatorDecimal=. SeparatorThousand=, FormatDateShort=%d/%m/%Y +FormatDateShortInput=%d/%m/%Y FormatDateShortJava=dd/MM/yyyy +FormatDateShortJavaInput=dd/MM/yyyy +FormatDateShortJQuery=dd/mm/yy +FormatDateShortJQueryInput=dd/mm/yy FormatHourShort=%I:%M %p FormatHourShortDuration=%H:%M FormatDateTextShort=%b %d, %Y @@ -592,7 +596,6 @@ ShortSunday=Κ // START - Lines generated via autotranslator.php tool (2011-06-26 15:35:22). // Reference language: en_US -> el_GR -FormatDateShortJQuery=dd/mm/yy AddLink=Προσθήκη συνδέσμου Of=του AmountByMonth=Ποσό ανά μήνα diff --git a/htdocs/langs/en_AU/main.lang b/htdocs/langs/en_AU/main.lang index 02b689c7c47..e1c3f95b5ea 100644 --- a/htdocs/langs/en_AU/main.lang +++ b/htdocs/langs/en_AU/main.lang @@ -4,7 +4,11 @@ CHARSET=UTF-8 SeparatorDecimal=. SeparatorThousand=, FormatDateShort=%d/%m/%Y +FormatDateShortInput=%d/%m/%Y FormatDateShortJava=dd/MM/yyyy +FormatDateShortJavaInput=dd/MM/yyyy +FormatDateShortJQuery=dd/mm/yy +FormatDateShortJQueryInput=dd/mm/yy FormatHourShort=%H:%M FormatDateTextShort=%d %b %Y FormatDateText=%d %B %Y diff --git a/htdocs/langs/en_GB/main.lang b/htdocs/langs/en_GB/main.lang index 8bd3243e226..6ec5c920232 100644 --- a/htdocs/langs/en_GB/main.lang +++ b/htdocs/langs/en_GB/main.lang @@ -3,7 +3,11 @@ CHARSET=UTF-8 SeparatorDecimal=. SeparatorThousand=, FormatDateShort=%d/%m/%Y +FormatDateShortInput=%d/%m/%Y FormatDateShortJava=dd/MM/yyyy +FormatDateShortJavaInput=dd/MM/yyyy +FormatDateShortJQuery=dd/mm/yy +FormatDateShortJQueryInput=dd/mm/yy FormatHourShort=%H:%M FormatDateTextShort=%d %b %Y FormatDateText=%d %B %Y diff --git a/htdocs/langs/en_IN/main.lang b/htdocs/langs/en_IN/main.lang index 795d89bce4e..8bf5df955b5 100644 --- a/htdocs/langs/en_IN/main.lang +++ b/htdocs/langs/en_IN/main.lang @@ -4,7 +4,11 @@ DIRECTION=ltr SeparatorDecimal=. SeparatorThousand=, FormatDateShort=%d/%m/%Y +FormatDateShortInput=%d/%m/%Y FormatDateShortJava=dd/MM/yyyy +FormatDateShortJavaInput=dd/MM/yyyy +FormatDateShortJQuery=dd/mm/yy +FormatDateShortJQueryInput=dd/mm/yy FormatHourShort=%I:%M %p FormatDateTextShort=%b %d, %Y FormatDateText=%B %d, %Y diff --git a/htdocs/langs/en_NZ/main.lang b/htdocs/langs/en_NZ/main.lang index 1e6ca9a9ddc..d3f11199968 100644 --- a/htdocs/langs/en_NZ/main.lang +++ b/htdocs/langs/en_NZ/main.lang @@ -4,7 +4,11 @@ CHARSET=UTF-8 SeparatorDecimal=. SeparatorThousand=, FormatDateShort=%d/%m/%Y +FormatDateShortInput=%d/%m/%Y FormatDateShortJava=dd/MM/yyyy +FormatDateShortJavaInput=dd/MM/yyyy +FormatDateShortJQuery=dd/mm/yy +FormatDateShortJQueryInput=dd/mm/yy FormatHourShort=%H:%M FormatDateTextShort=%d %b %Y FormatDateText=%d %B %Y diff --git a/htdocs/langs/en_SA/main.lang b/htdocs/langs/en_SA/main.lang index 146ae3fd85e..cb8e3ba6e6d 100644 --- a/htdocs/langs/en_SA/main.lang +++ b/htdocs/langs/en_SA/main.lang @@ -6,8 +6,11 @@ FONTSIZEFORPDF=9 SeparatorDecimal=. SeparatorThousand=, FormatDateShort=%d/%m/%Y +FormatDateShortInput=%d/%m/%Y FormatDateShortJava=dd/MM/yyyy +FormatDateShortJavaInput=dd/MM/yyyy FormatDateShortJQuery=dd/mm/yy +FormatDateShortJQueryInput=dd/mm/yy FormatHourShort=%I:%M %p FormatHourShortDuration=%H:%M FormatDateTextShort=%d %b %Y diff --git a/htdocs/langs/en_US/boxes.lang b/htdocs/langs/en_US/boxes.lang index e7a56618f88..18c6d541505 100644 --- a/htdocs/langs/en_US/boxes.lang +++ b/htdocs/langs/en_US/boxes.lang @@ -18,6 +18,7 @@ BoxLastActions=Last actions BoxLastContracts=Last contracts BoxLastContacts=Last contacts/addresses BoxLastMembers=Last members +BoxFicheInter=Last interventions BoxCurrentAccounts=Current accounts balance BoxSalesTurnover=Sales turnover BoxTotalUnpaidCustomerBills=Total unpaid customer's invoices @@ -40,6 +41,7 @@ BoxTitleLastProspects=Last %s recorded prospects BoxTitleLastModifiedProspects=Last %s modified prospects BoxTitleLastProductsInContract=Last %s products/services in a contract BoxTitleLastModifiedMembers=Last %s modified members +BoxTitleLastFicheInter=Last %s modified intervention BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer's invoices BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier's invoices BoxTitleCurrentAccounts=Current account's balances diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index e7e8b880297..c0e2f94d7f5 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -4,8 +4,11 @@ DIRECTION=ltr SeparatorDecimal=. SeparatorThousand=, FormatDateShort=%m/%d/%Y +FormatDateShortInput=%m/%d/%Y FormatDateShortJava=MM/dd/yyyy +FormatDateShortJavaInput=MM/dd/yyyy FormatDateShortJQuery=mm/dd/yy +FormatDateShortJQueryInput=mm/dd/yy FormatHourShort=%I:%M %p FormatHourShortDuration=%H:%M FormatDateTextShort=%b %d, %Y diff --git a/htdocs/langs/es_ES/boxes.lang b/htdocs/langs/es_ES/boxes.lang index 72c4363ebe5..728ae189826 100644 --- a/htdocs/langs/es_ES/boxes.lang +++ b/htdocs/langs/es_ES/boxes.lang @@ -18,6 +18,7 @@ BoxLastActions=Últimos eventos BoxLastContracts=Últimos contratos BoxLastContacts=Últimos contactos/direcciones BoxLastMembers=Últimos miembros modificados +BoxFicheInter=Últimas intervenciones modificadas BoxCurrentAccounts=Saldos cuentas corrientes BoxSalesTurnover=Volumen de ventas BoxTotalUnpaidCustomerBills=Total facturas a clientes pendientes de pago @@ -47,6 +48,7 @@ BoxTitleTotalUnpaidCustomerBills=Pendiente de clientes BoxTitleTotalUnpaidSuppliersBills=Pendiente a proveedores BoxTitleLastModifiedContacts=Los %s últimos contactos/direcciones modificadas BoxTitleLastModifiedMembers=Los %s últimos miembros modificados +BoxTitleLastFicheInter=Las %s últimas intervenciones modificadas BoxMyLastBookmarks=Mis %s últimos marcadores BoxOldestExpiredServices=Servicios antiguos expirados BoxLastExpiredServices=Los %s contratos más antiguos con servicios activos expirados diff --git a/htdocs/langs/es_ES/main.lang b/htdocs/langs/es_ES/main.lang index b1c231a4a67..aece1ad9d15 100644 --- a/htdocs/langs/es_ES/main.lang +++ b/htdocs/langs/es_ES/main.lang @@ -4,8 +4,11 @@ DIRECTION=ltr SeparatorDecimal=, SeparatorThousand= FormatDateShort=%d/%m/%Y +FormatDateShortInput=%d/%m/%Y FormatDateShortJava=dd/MM/yyyy +FormatDateShortJavaInput=dd/MM/yyyy FormatDateShortJQuery=dd/mm/yy +FormatDateShortJQueryInput=dd/mm/yy FormatHourShort=%H:%M FormatHourShortDuration=%H:%M FormatDateTextShort=%d %b %Y diff --git a/htdocs/langs/es_HN/main.lang b/htdocs/langs/es_HN/main.lang index 390b2055e2f..421e7598de5 100644 --- a/htdocs/langs/es_HN/main.lang +++ b/htdocs/langs/es_HN/main.lang @@ -3,15 +3,6 @@ CHARSET=UTF-8 DIRECTION=ltr SeparatorDecimal=, SeparatorThousand= -FormatDateShort=%d/%m/%Y -FormatDateShortJava=dd/MM/yyyy -FormatHourShort=%H:%M -FormatHourShortDuration=%H:%M -FormatDateTextShort=%d %b %Y -FormatDateText=%d %B %Y -FormatDateHourShort=%d/%m/%Y %H:%M -FormatDateHourTextShort=%d %b %Y %H:%M -FormatDateHourText=%d %B %Y %H:%M AmountVAT=Importe ISV TotalVAT=Total ISV IncludedVAT=ISV incluido diff --git a/htdocs/langs/es_PR/main.lang b/htdocs/langs/es_PR/main.lang index 401b367ff52..5cb39740ada 100644 --- a/htdocs/langs/es_PR/main.lang +++ b/htdocs/langs/es_PR/main.lang @@ -3,15 +3,6 @@ CHARSET=UTF-8 DIRECTION=ltr SeparatorDecimal=, SeparatorThousand= -FormatDateShort=%d/%m/%Y -FormatDateShortJava=dd/MM/yyyy -FormatHourShort=%H:%M -FormatHourShortDuration=%H:%M -FormatDateTextShort=%d %b %Y -FormatDateText=%d %B %Y -FormatDateHourShort=%d/%m/%Y %H:%M -FormatDateHourTextShort=%d %b %Y %H:%M -FormatDateHourText=%d %B %Y %H:%M AmountVAT=Importe IVU TotalVAT=Total IVU IncludedVAT=IVU incluido diff --git a/htdocs/langs/et_EE/main.lang b/htdocs/langs/et_EE/main.lang index f02122fad5b..086bfe8b5b0 100644 --- a/htdocs/langs/et_EE/main.lang +++ b/htdocs/langs/et_EE/main.lang @@ -12,8 +12,11 @@ DIRECTION=ltr SeparatorDecimal=. SeparatorThousand=, FormatDateShort=%m/%d/%Y +FormatDateShortInput=%m/%d/%Y FormatDateShortJava=MM/dd/yyyy +FormatDateShortJavaInput=MM/dd/yyyy FormatDateShortJQuery=dd/mm/yy +FormatDateShortJQueryInput=dd/mm/yy FormatHourShort=%I:%M %p FormatHourShortDuration=%H:%M FormatDateTextShort=%b %d, %Y diff --git a/htdocs/langs/fa_IR/main.lang b/htdocs/langs/fa_IR/main.lang index 4cb4fc7d9f7..6645152d1d2 100644 --- a/htdocs/langs/fa_IR/main.lang +++ b/htdocs/langs/fa_IR/main.lang @@ -15,7 +15,11 @@ FONTSIZEFORPDF=9 SeparatorDecimal=/ SeparatorThousand=, FormatDateShort=%d/%m/%Y +FormatDateShortInput=%d/%m/%Y FormatDateShortJava=dd/MM/yyyy +FormatDateShortJavaInput=dd/MM/yyyy +FormatDateShortJQuery=dd/mm/yy +FormatDateShortJQueryInput=dd/mm/yy FormatHourShort=%H:%M FormatDateTextShort=%d %b %Y FormatDateText=%d %B %Y diff --git a/htdocs/langs/fi_FI/main.lang b/htdocs/langs/fi_FI/main.lang index 734a3356dd9..b451e91e115 100644 --- a/htdocs/langs/fi_FI/main.lang +++ b/htdocs/langs/fi_FI/main.lang @@ -11,7 +11,11 @@ CHARSET=UTF-8 SeparatorDecimal=, SeparatorThousand= FormatDateShort=%d.%m.%Y +FormatDateShortInput=%d.%m.%Y FormatDateShortJava=dd.MM.yyyy +FormatDateShortJavaInput=dd.MM.yyyy +FormatDateShortJQuery=dd.mm.yy +FormatDateShortJQueryInput=dd.mm.yy FormatHourShort=%H.%M FormatDateTextShort=%d. %b %Y FormatDateText=%d. %B %Y @@ -616,7 +620,6 @@ Prefix=Etuliite // START - Lines generated via autotranslator.php tool (2012-02-29 16:10:23). // Reference language: en_US -> fi_FI -FormatDateShortJQuery=dd/mm/yy AddLink=Lisää linkki Of=ja SearchOf=Etsi diff --git a/htdocs/langs/fr_BE/main.lang b/htdocs/langs/fr_BE/main.lang index 3a222bdd6b9..664e394aeba 100644 --- a/htdocs/langs/fr_BE/main.lang +++ b/htdocs/langs/fr_BE/main.lang @@ -3,7 +3,11 @@ CHARSET=UTF-8 SeparatorDecimal=, SeparatorThousand= FormatDateShort=%d/%m/%Y +FormatDateShortInput=%d/%m/%Y FormatDateShortJava=dd/MM/yyyy +FormatDateShortJavaInput=dd/MM/yyyy +FormatDateShortJQuery=dd/mm/yy +FormatDateShortJQueryInput=dd/mm/yy FormatHourShort=%H:%M FormatDateTextShort=%d %b %Y FormatDateText=%d %B %Y diff --git a/htdocs/langs/fr_CA/main.lang b/htdocs/langs/fr_CA/main.lang index 3cd76162e3d..ca4b13b8480 100644 --- a/htdocs/langs/fr_CA/main.lang +++ b/htdocs/langs/fr_CA/main.lang @@ -3,7 +3,11 @@ CHARSET=UTF-8 SeparatorDecimal=, SeparatorThousand= FormatDateShort=%d.%m.%Y +FormatDateShortInput=%d.%m.%Y FormatDateShortJava=dd.MM.yyyy +FormatDateShortJavaInput=dd.MM.yyyy +FormatDateShortJQuery=dd.mm.yy +FormatDateShortJQueryInput=dd.mm.yy FormatHourShort=%H:%M FormatDateTextShort=%d %b %Y FormatDateText=%d %B %Y diff --git a/htdocs/langs/fr_CH/main.lang b/htdocs/langs/fr_CH/main.lang index dbe4956c684..83cc40057ea 100644 --- a/htdocs/langs/fr_CH/main.lang +++ b/htdocs/langs/fr_CH/main.lang @@ -3,7 +3,11 @@ CHARSET=UTF-8 SeparatorDecimal=, SeparatorThousand= FormatDateShort=%d-%m-%Y +FormatDateShortInput=%d-%m-%Y FormatDateShortJava=dd-MM-yyyy +FormatDateShortJavaInput=dd-MM-yyyy +FormatDateShortJQuery=dd-mm-yy +FormatDateShortJQueryInput=dd-mm-yy FormatHourShort=%H:%M FormatDateTextShort=%d %b %Y FormatDateText=%d %B %Y diff --git a/htdocs/langs/fr_FR/boxes.lang b/htdocs/langs/fr_FR/boxes.lang index 61ef3d2ab52..cd61aa64d93 100644 --- a/htdocs/langs/fr_FR/boxes.lang +++ b/htdocs/langs/fr_FR/boxes.lang @@ -18,6 +18,7 @@ BoxLastActions=Derniers événements BoxLastContracts=Derniers contrats BoxLastContacts=Derniers contacts/adresses BoxLastMembers=Derniers adhérents modifiés +BoxFicheInter=Dernières fiche d'intervention modifiée BoxCurrentAccounts=Soldes Comptes courants BoxSalesTurnover=Chiffre d'affaires BoxTotalUnpaidCustomerBills=Total des factures clients impayées @@ -47,6 +48,7 @@ BoxTitleTotalUnpaidCustomerBills=Impayés clients BoxTitleTotalUnpaidSuppliersBills=Impayés fournisseurs BoxTitleLastModifiedContacts=Les %s derniers contacts/adresses modifiés BoxTitleLastModifiedMembers=Les %s derniers adhérents modifiés +BoxTitleLastFicheInter=Les %s dernières fiche d'intervention modifiée BoxMyLastBookmarks=Mes %s derniers marque-pages BoxOldestExpiredServices=Plus anciens services expirés BoxLastExpiredServices=Les %s plus anciens contrats avec services actifs expirés diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang index 5880a20f284..1173c74e14f 100644 --- a/htdocs/langs/fr_FR/main.lang +++ b/htdocs/langs/fr_FR/main.lang @@ -3,9 +3,12 @@ CHARSET=UTF-8 DIRECTION=ltr SeparatorDecimal=, SeparatorThousand= -FormatDateShort=%d/%m/%Y -FormatDateShortJava=dd/MM/yyyy +FormatDateShort=%d/%m/%y +FormatDateShortInput=%d/%m/%Y +FormatDateShortJava=dd/MM/yy +FormatDateShortJavaInput=dd/MM/yyyy FormatDateShortJQuery=dd/mm/yy +FormatDateShortJQueryInput=dd/mm/yy FormatHourShort=%H:%M FormatHourShortDuration=%H:%M FormatDateTextShort=%d %b %Y diff --git a/htdocs/langs/he_IL/main.lang b/htdocs/langs/he_IL/main.lang index 1561f468861..03c0061acf1 100644 --- a/htdocs/langs/he_IL/main.lang +++ b/htdocs/langs/he_IL/main.lang @@ -15,8 +15,11 @@ FONTSIZEFORPDF=9 SeparatorDecimal=. SeparatorThousand=, FormatDateShort=%m/%d/%Y +FormatDateShortInput=%m/%d/%Y FormatDateShortJava=MM/dd/yyyy -FormatDateShortJQuery=dd/mm/yy +FormatDateShortJavaInput=MM/dd/yyyy +FormatDateShortJQuery=mm/dd/yy +FormatDateShortJQueryInput=mm/dd/yy FormatHourShort=%I:%M %p FormatHourShortDuration=%H:%M FormatDateTextShort=%b %d, %Y diff --git a/htdocs/langs/hu_HU/main.lang b/htdocs/langs/hu_HU/main.lang index 8ee7c826648..9fb2cf4f61d 100644 --- a/htdocs/langs/hu_HU/main.lang +++ b/htdocs/langs/hu_HU/main.lang @@ -5,7 +5,11 @@ FONTFORPDF=dejavusans SeparatorDecimal=. SeparatorThousand=, FormatDateShort=%d/%m/%Y +FormatDateShortInput=%d/%m/%Y FormatDateShortJava=dd/MM/yyyy +FormatDateShortJavaInput=dd/MM/yyyy +FormatDateShortJQuery=dd/mm/yy +FormatDateShortJQueryInput=dd/mm/yy FormatHourShort=%I:%M %p FormatHourShortDuration=%H:%M FormatDateTextShort=%b %d, %Y @@ -587,7 +591,6 @@ ShortSunday=V // START - Lines generated via autotranslator.php tool (2012-02-29 16:13:31). // Reference language: en_US -> hu_HU -FormatDateShortJQuery=dd/mm/yy AddLink=Link hozzáadása Of=A SearchOf=Keresés diff --git a/htdocs/langs/is_IS/main.lang b/htdocs/langs/is_IS/main.lang index 619f60994d9..c89746ed401 100644 --- a/htdocs/langs/is_IS/main.lang +++ b/htdocs/langs/is_IS/main.lang @@ -12,7 +12,11 @@ DIRECTION=ltr SeparatorDecimal=. SeparatorThousand=, FormatDateShort=%d/%m/%Y +FormatDateShortInput=%d/%m/%Y FormatDateShortJava=dd/MM/yyyy +FormatDateShortJavaInput=dd/MM/yyyy +FormatDateShortJQuery=dd/mm/yy +FormatDateShortJQueryInput=dd/mm/yy FormatHourShort=%H:%M FormatDateTextShort=%d %b %Y FormatDateText=%d %B %Y @@ -604,7 +608,6 @@ Reason=Ástæða // START - Lines generated via autotranslator.php tool (2012-02-29 16:26:19). // Reference language: en_US -> is_IS -FormatDateShortJQuery=dd/mm/yy AddLink=Bæta við tengli Of=á SearchOf=Leita diff --git a/htdocs/langs/it_IT/main.lang b/htdocs/langs/it_IT/main.lang index 43e9b108b78..78664cd01f8 100644 --- a/htdocs/langs/it_IT/main.lang +++ b/htdocs/langs/it_IT/main.lang @@ -270,15 +270,18 @@ FollowingConstantsWillBeSubstituted =Le seguenti costanti saranno sostitute ForCustomer =Per i clienti FormatDateHourShort =%d/%m/%Y %H.%M FormatDateHourText =%d %B %Y %H:%M -FormatDateHourTextShort =%d %b %Y %H.%M +FormatDateHourTextShort =%d %b %Y %H.%M FormatDateShort =%d/%m/%Y +FormatDateShortInput =%d/%m/%Y FormatDateShortJava =dd/MM/yyyy -FormatDateShortJQuery =dd/mm/yy +FormatDateShortJavaInput =dd/MM/yyyy +FormatDateShortJQuery =dd/mm/yy +FormatDateShortJQueryInput =dd/mm/yy FormatDateText =%d %B %Y FormatDateTextShort =%d %b %Y -FormatHourShortDuration =%H:%M -FormatHourShort =%H.%M -For =Per +FormatHourShortDuration =%H:%M +FormatHourShort =%H.%M +For =Per FreeZone =Testo libero Frequency =Frequenza FridayMin =Ven diff --git a/htdocs/langs/ja_JP/main.lang b/htdocs/langs/ja_JP/main.lang index 6f6201cb7ec..d4c93c068e5 100644 --- a/htdocs/langs/ja_JP/main.lang +++ b/htdocs/langs/ja_JP/main.lang @@ -9,9 +9,12 @@ FONTSIZEFORPDF=9 // Reference language: en_US -> ja_JP SeparatorDecimal=. SeparatorThousand=、 -FormatDateShort=%m/%d/%Y -FormatDateShortJava=MM/dd/yyyy -FormatDateShortJQuery=dd/mm/yy +FormatDateShort=%m/%d/%Y +FormatDateShortInput=%m/%d/%Y +FormatDateShortJava=MM/dd/yyyy +FormatDateShortJavaInput=MM/dd/yyyy +FormatDateShortJQuery=mm/dd/yy +FormatDateShortJQueryInput=mm/dd/yy FormatHourShort=%I:%M %p FormatHourShortDuration=%H:%M FormatDateTextShort=%b %d, %Y diff --git a/htdocs/langs/nb_NO/main.lang b/htdocs/langs/nb_NO/main.lang index 020639a5d90..123ed5a86ed 100644 --- a/htdocs/langs/nb_NO/main.lang +++ b/htdocs/langs/nb_NO/main.lang @@ -3,7 +3,11 @@ CHARSET=UTF-8 SeparatorDecimal=, SeparatorThousand= FormatDateShort=%d.%m.%Y +FormatDateShortInput=%d.%m.%Y FormatDateShortJava=dd.MM.yyyy +FormatDateShortJavaInput=dd.MM.yyyy +FormatDateShortJQuery=dd.mm.yy +FormatDateShortJQueryInput=dd.mm.yy FormatHourShort=%H.%M FormatDateTextShort=%d. %b %Y FormatDateText=%d. %B %Y @@ -535,8 +539,8 @@ Login=Innlogging Month01=januar Month02=februar Month03=mars -Month04=April -Month05=kan +Month04=april +Month05=mai Month06=juni Month07=juli Month08=August @@ -606,7 +610,6 @@ Day0=Søndag // START - Lines generated via autotranslator.php tool (2012-02-29 17:06:43). // Reference language: en_US -> nb_NO -FormatDateShortJQuery=dd/mm/yy AddLink=Legg til link Of=av SearchOf=Søk diff --git a/htdocs/langs/nl_BE/main.lang b/htdocs/langs/nl_BE/main.lang index 3d16e786aed..d4aff86e9c3 100644 --- a/htdocs/langs/nl_BE/main.lang +++ b/htdocs/langs/nl_BE/main.lang @@ -3,7 +3,11 @@ CHARSET=UTF-8 SeparatorDecimal=, SeparatorThousand= FormatDateShort=%d/%m/%Y +FormatDateShortInput=%d/%m/%Y FormatDateShortJava=dd/MM/yyyy +FormatDateShortJavaInput=dd/MM/yyyy +FormatDateShortJQuery=dd/mm/yy +FormatDateShortJQueryInput=dd/mm/yy FormatHourShort=%H:%M FormatDateTextShort=%d %b %Y FormatDateText=%d %B %Y diff --git a/htdocs/langs/nl_NL/main.lang b/htdocs/langs/nl_NL/main.lang index 40947ca565f..100bd776c3a 100644 --- a/htdocs/langs/nl_NL/main.lang +++ b/htdocs/langs/nl_NL/main.lang @@ -4,7 +4,11 @@ DIRECTION = ltr SeparatorDecimal = , SeparatorThousand = . FormatDateShort = %d-%m-%Y +FormatDateShortInput = %d-%m-%Y FormatDateShortJava = dd-MM-yyyy +FormatDateShortJavaInput = dd-MM-yyyy +FormatDateShortJQuery=dd-mm-yy +FormatDateShortJQueryInput=dd-mm-yy FormatHourShort = %H:%M FormatHourShortDuration = %H:%M FormatDateTextShort = %d %b %Y @@ -590,7 +594,6 @@ ShortSunday = Zo // START - Lines generated via autotranslator.php tool (2011-10-10 01:46:39). // Reference language: en_US -> nl_NL -FormatDateShortJQuery=dd/mm/yy JanuaryMin=Jan FebruaryMin=Februari MarchMin=Mar diff --git a/htdocs/langs/pl_PL/main.lang b/htdocs/langs/pl_PL/main.lang index 5f725587178..41236b3456a 100644 --- a/htdocs/langs/pl_PL/main.lang +++ b/htdocs/langs/pl_PL/main.lang @@ -15,7 +15,11 @@ FONTSIZEFORPDF=8 SeparatorDecimal=, SeparatorThousand= FormatDateShort=%d-%m-%Y +FormatDateShortInput=%d-%m-%Y FormatDateShortJava=dd-MM-yyyy +FormatDateShortJavaInput=dd-MM-yyyy +FormatDateShortJQuery=dd-mm-yy +FormatDateShortJQueryInput=dd-mm-yy FormatHourShort=%H:%M FormatDateTextShort=%d %b %Y FormatDateText=%d %B %Y @@ -620,7 +624,6 @@ Prefix=Przedrostek // START - Lines generated via autotranslator.php tool (2012-02-29 17:18:29). // Reference language: en_US -> pl_PL -FormatDateShortJQuery=dd/mm/yy AddLink=Dodaj link Of=z SearchOf=Szukaj diff --git a/htdocs/langs/pt_PT/main.lang b/htdocs/langs/pt_PT/main.lang index 86d60b9b037..4df4d1ea5ec 100644 --- a/htdocs/langs/pt_PT/main.lang +++ b/htdocs/langs/pt_PT/main.lang @@ -3,7 +3,11 @@ CHARSET=UTF-8 SeparatorDecimal=, SeparatorThousand= FormatDateShort=%d/%m/%Y +FormatDateShortInput=%d/%m/%Y FormatDateShortJava=dd/MM/yyyy +FormatDateShortJavaInput=dd/MM/yyyy +FormatDateShortJQuery=dd/mm/yy +FormatDateShortJQueryInput=dd/mm/yy FormatHourShort=%H:%M FormatDateTextShort=%d %b %Y FormatDateText=%d %B %Y @@ -601,7 +605,6 @@ Prefix=Prefixo // START - Lines generated via autotranslator.php tool (2012-02-29 15:45:52). // Reference language: en_US -> pt_PT -FormatDateShortJQuery=dd/mm/yy AddLink=Adicionar link Of=de SearchOf=Pesquisar diff --git a/htdocs/langs/ro_RO/main.lang b/htdocs/langs/ro_RO/main.lang index df4536746d8..8b7530a1702 100644 --- a/htdocs/langs/ro_RO/main.lang +++ b/htdocs/langs/ro_RO/main.lang @@ -13,7 +13,11 @@ FONTSIZEFORPDF=8 SeparatorDecimal=, SeparatorThousand= FormatDateShort=%d.%m.%Y +FormatDateShortInput=%d.%m.%Y FormatDateShortJava=dd.MM.yyyy +FormatDateShortJavaInput=dd.MM.yyyy +FormatDateShortJQuery=dd.mm.yy +FormatDateShortJQueryInput=dd.mm.yy FormatHourShort=%H:%M FormatDateTextShort=%d %b %Y FormatDateText=%d %B %Y @@ -618,7 +622,6 @@ Prefix=Prefix // START - Lines generated via autotranslator.php tool (2012-02-29 17:23:15). // Reference language: en_US -> ro_RO -FormatDateShortJQuery=dd/mm/yy AddLink=Adauga link-ul Of=de SearchOf=Căutare diff --git a/htdocs/langs/ru_RU/main.lang b/htdocs/langs/ru_RU/main.lang index 1d203fb98f0..30be774c29f 100644 --- a/htdocs/langs/ru_RU/main.lang +++ b/htdocs/langs/ru_RU/main.lang @@ -15,7 +15,11 @@ DIRECTION=ltr SeparatorDecimal=, SeparatorThousand= FormatDateShort=%d.%m.%Y +FormatDateShortInput=%d.%m.%Y FormatDateShortJava=dd.MM.yyyy +FormatDateShortJavaInput=dd.MM.yyyy +FormatDateShortJQuery=dd.mm.yy +FormatDateShortJQueryInput=dd.mm.yy FormatHourShort=%H:%M FormatDateTextShort=%d %b %Y FormatDateText=%d %B %Y @@ -628,7 +632,6 @@ Person=Персона // START - Lines generated via autotranslator.php tool (2011-08-18 23:26:41). // Reference language: en_US -> ru_RU -FormatDateShortJQuery=dd/mm/yy AddLink=Добавить ссылку Of=из AmountByMonth=Сумма за месяц diff --git a/htdocs/langs/ru_UA/main.lang b/htdocs/langs/ru_UA/main.lang index cef3a719ae0..cac36234fbf 100644 --- a/htdocs/langs/ru_UA/main.lang +++ b/htdocs/langs/ru_UA/main.lang @@ -10,7 +10,11 @@ DIRECTION=ltr SeparatorDecimal=, SeparatorThousand= FormatDateShort=%d.%m.%Y +FormatDateShortInput=%d.%m.%Y FormatDateShortJava=dd.MM.yyyy +FormatDateShortJavaInput=dd.MM.yyyy +FormatDateShortJQuery=dd.mm.yy +FormatDateShortJQueryInput=dd.mm.yy FormatHourShort=%H:%M FormatDateTextShort=%d %b %Y FormatDateText=%d %B %Y diff --git a/htdocs/langs/sl_SI/main.lang b/htdocs/langs/sl_SI/main.lang index 793d9498587..c79ca0d5dc5 100644 --- a/htdocs/langs/sl_SI/main.lang +++ b/htdocs/langs/sl_SI/main.lang @@ -6,8 +6,11 @@ FONTSIZEFORPDF=8 SeparatorDecimal = , SeparatorThousand = . FormatDateShort = %d/%m/%Y +FormatDateShortInput = %d/%m/%Y FormatDateShortJava = dd/MM/yyyy +FormatDateShortJavaInput = dd/MM/yyyy FormatDateShortJQuery = dd/mm/yy +FormatDateShortJQueryInput = dd/mm/yy FormatHourShort = %I:%M %p FormatHourShortDuration = %H:%M FormatDateTextShort = %d. %b, %Y diff --git a/htdocs/langs/sv_SE/main.lang b/htdocs/langs/sv_SE/main.lang index 55287b657a0..dde9641a208 100644 --- a/htdocs/langs/sv_SE/main.lang +++ b/htdocs/langs/sv_SE/main.lang @@ -12,7 +12,11 @@ DIRECTION=ltr SeparatorDecimal=, SeparatorThousand= FormatDateShort=%Y-%m-%d +FormatDateShortInput=%Y-%m-%d FormatDateShortJava=yyyy-MM-dd +FormatDateShortJavaInput=yyyy-MM-dd +FormatDateShortJQuery=yy-mm-dd +FormatDateShortJQueryInput=yy-mm-dd FormatHourShort=%H:%M FormatHourShortDuration=%H:%M FormatDateTextShort=%b %d %Y @@ -594,7 +598,6 @@ ShortSunday=S // START - Lines generated via autotranslator.php tool (2012-02-29 17:32:03). // Reference language: en_US -> sv_SE -FormatDateShortJQuery=dd/mm/yy AddLink=Tillsätt länk Of=av SearchOf=Sök diff --git a/htdocs/langs/tr_TR/main.lang b/htdocs/langs/tr_TR/main.lang index 7f372bf7dd5..8862e8b7635 100644 --- a/htdocs/langs/tr_TR/main.lang +++ b/htdocs/langs/tr_TR/main.lang @@ -14,8 +14,11 @@ FONTSIZEFORPDF=8 SeparatorDecimal=. SeparatorThousand=, FormatDateShort=%d/%m/%Y +FormatDateShortInput=%d/%m/%Y FormatDateShortJava=dd/MM/yyyy +FormatDateShortJavaInput=dd/MM/yyyy FormatDateShortJQuery=dd/mm/yy +FormatDateShortJQueryInput=dd/mm/yy FormatHourShort=%H:%M FormatHourShortDuration=%H:%M FormatDateTextShort=%d %b %Y diff --git a/htdocs/langs/zh_CN/main.lang b/htdocs/langs/zh_CN/main.lang index 04235a1bd69..04c6ee545bd 100644 --- a/htdocs/langs/zh_CN/main.lang +++ b/htdocs/langs/zh_CN/main.lang @@ -17,7 +17,11 @@ FONTSIZEFORPDF=9 SeparatorDecimal=. SeparatorThousand=None FormatDateShort=%d/%m/%Y +FormatDateShortInput=%d/%m/%Y FormatDateShortJava=dd/MM/yyyy +FormatDateShortJavaInput=dd/MM/yyyy +FormatDateShortJQuery=dd/mm/yy +FormatDateShortJQueryInput=dd/mm/yy FormatHourShort=%I:%M %p FormatDateTextShort=%b %d, %Y FormatDateText=%B %d, %Y @@ -604,7 +608,6 @@ Prefix=字首 // START - Lines generated via autotranslator.php tool (2012-02-29 17:37:09). // Reference language: en_US -> zh_CN -FormatDateShortJQuery=dd/mm/yy AddLink=添加链接 Of=的 SearchOf=搜索 diff --git a/htdocs/langs/zh_TW/main.lang b/htdocs/langs/zh_TW/main.lang index b853fbb6073..aff84edf1ef 100644 --- a/htdocs/langs/zh_TW/main.lang +++ b/htdocs/langs/zh_TW/main.lang @@ -13,7 +13,11 @@ FONTFORPDF=msungstdlight SeparatorDecimal=. SeparatorThousand=None FormatDateShort=%Y/%m/%d +FormatDateShortInput=%Y/%m/%d FormatDateShortJava=yyyy/MM/dd +FormatDateShortJavaInput=yyyy/MM/dd +FormatDateShortJQuery=yy/mm/dd +FormatDateShortJQueryInput=yy/mm/dd FormatHourShort=%I:%M %p FormatDateTextShort=%Y %b %d FormatDateText=%Y %B %d @@ -600,7 +604,6 @@ Prefix=字首 // START - Lines generated via autotranslator.php tool (2012-02-29 17:37:09). // Reference language: en_US -> zh_CN -FormatDateShortJQuery=dd/mm/yy AddLink=添加鏈接 Of=的 SearchOf=搜尋 diff --git a/htdocs/projet/ganttview.php b/htdocs/projet/ganttview.php index 3a36fd1f591..e19571f9518 100644 --- a/htdocs/projet/ganttview.php +++ b/htdocs/projet/ganttview.php @@ -184,8 +184,8 @@ if (count($tasksarray)>0) // Show Gant diagram from $taskarray using JSGantt - $dateformat=$langs->trans("FormatDateShort"); - $dateformat=strtolower($langs->trans("FormatDateShortJava")); + $dateformat=$langs->trans("FormatDateShort"); // Used by include ganttchart.php later + $dateformat=$langs->trans("FormatDateShortJQuery"); // Used by include ganttchart.php later $array_contacts=array(); $tasks=array(); $project_dependencies=array(); diff --git a/htdocs/societe/societe.php b/htdocs/societe/societe.php index 26583442b2c..93401eaebf0 100644 --- a/htdocs/societe/societe.php +++ b/htdocs/societe/societe.php @@ -122,7 +122,7 @@ if ($mode == 'search') if ($search_type > 0 && in_array($search_type,array('1,3','2,3'))) $sql .= " AND s.client IN (".$db->escape($search_type).")"; if ($search_type > 0 && in_array($search_type,array('4'))) $sql .= " AND s.fournisseur = 1"; if ($search_type == '0') $sql .= " AND s.client = 0 AND s.fournisseur = 0"; - + $result=$db->query($sql); if ($result) { @@ -365,13 +365,13 @@ if ($resql) print ''; print ''; print ''; print '  '; diff --git a/test/phpunit/NumberingModulesTest.php b/test/phpunit/NumberingModulesTest.php index 008ffe6ce94..82bb96dc0be 100644 --- a/test/phpunit/NumberingModulesTest.php +++ b/test/phpunit/NumberingModulesTest.php @@ -443,4 +443,4 @@ class NumberingModulesTest extends PHPUnit_Framework_TestCase } } -?> \ No newline at end of file +?> diff --git a/test/soapui/Dolibarr-soapui-project.xml b/test/soapui/Dolibarr-soapui-project.xml index 12e54e1410c..48349dcf250 100755 --- a/test/soapui/Dolibarr-soapui-project.xml +++ b/test/soapui/Dolibarr-soapui-project.xml @@ -130,7 +130,7 @@ - + @@ -628,7 +628,7 @@ - +