Conflict solved

2026-01-06 00:53:00 +01:00 · 2014-07-12 09:20:00 +02:00
parent 2d8fee8adb a209c0ba5b
commit b6edde320b
25 changed files with 708 additions and 107 deletions
--- a/13
+++ b/13
@@ -8,15 +8,19 @@ For users:
 - New: [ task #867 ] Remove ESAEB external module code from core.
 - New: Can create proposal from an intervention.
 - New: Can filter events on a group of users.
- New: Add thirdparty to filter on events. 
+- New: Can filter events of a thirdparty.
+- New: Split Agenda view (month, week, day) into different tabs.
 - New: Form to add a photo is immediatly available on photo page if
       permissions are ok (save one click per photo to add).
 - New: Add option PRODUCT_MAX_VISIBLE_PHOTO to limit number of photos
       shown on main product card.
 - New: Add event FICHINTER_CLASSIFY_BILLED into list of possible events to
       create an automatic event into agenda.
- New: Add new type of event (when type of events are used, not by
-       default)
+- New: Add new type of event (when type of events are used, not by default)
+- New: Add country into table of thirdparties type. This will allow to provide
+       a list of thirdparty types specific to a country (like argentina that
+       need type A or B).
+- New: Can force a specific bank account onto an invoice/order...      
 - Fix: [ bug #1487 ] PAYMENT_DELETE trigger does not intercept trigger action
 - Fix: [ bug #1470, #1472, #1473] User trigger problem
 - Fix: [ bug #1489, #1491 ] Intervention trigger problem
@@ -44,6 +48,8 @@ For developers:
 - New: Add country iso code on 3 chars into table of countries.
 - Qual: Removed hard coded rowid into data init of table llx_c_action_trigger.
 - LINEBILL_DELETE, LINK_DELETE, ORDER_SUPPLIER_DELETE, RESOURCE_DELETE trigger called before SQL delete
+- New: [ Task #1481 ] Add trigger BILL_SUPPLIER_UPDATE.
+- New: [ Task #1495 ] Add trigger LINECONTRACT_CREATE.

 WARNING: Following change may create regression for some external modules, but was necessary to make
 Dolibarr better:
@@ -159,6 +165,7 @@ removed. You must now use the 6 parameters way. See file modMyModule.class.php f
  So check that return value is 0 to keep default standard behaviour after hook, or 1 to disable
  default standard behaviour.
 - Properties "civilite_id" were renamed into "civility_id".
+- Remove add_photo_web() that is ot used anymore by core code.



--- a/htdocs/adherents/index.php
+++ b/htdocs/adherents/index.php
@@ -137,15 +137,15 @@ print "</tr>\n";
 $var=false;
 print "<tr ".$bc[$var].">";
 print '<td>';
-print $langs->trans("Ref").':</td><td><input type="text" name="search_ref" class="flat" size="16">';
+print '<label for="search_ref">'.$langs->trans("Ref").'</label>:</td><td><input type="text" name="search_ref" id="search_ref" class="flat" size="16">';
 print '</td><td rowspan="3"><input class="button" type="submit" value="'.$langs->trans("Search").'"></td></tr>';
 print "<tr ".$bc[$var].">";
 print '<td>';
-print $langs->trans("Name").':</td><td><input type="text" name="search_lastname" class="flat" size="16">';
+print '<label for="search_lastname">'.$langs->trans("Name").'</label>:</td><td><input type="text" name="search_lastname" id="search_lastname" class="flat" size="16">';
 print '</td></tr>';
 print "<tr ".$bc[$var].">";
 print '<td>';
-print $langs->trans("Other").':</td><td><input type="text" name="sall" class="flat" size="16">';
+print '<label for="sall">'.$langs->trans("Other").'</label>:</td><td><input type="text" name="sall" id="sall" class="flat" size="16">';
 print '</td></tr>';
 print "</table></form>";

--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -130,16 +130,16 @@ $tablib[24]= "DictionaryAccountancysystem";
 $tablib[25]= "DictionaryRevenueStamp";
 $tablib[26]= "DictionaryResourceType";

-// Requete pour extraction des donnees des dictionnaires
+// Requests to extract data
 $tabsql=array();
 $tabsql[1] = "SELECT f.rowid as rowid, f.code, f.libelle, p.code as country_code, p.libelle as country, f.active FROM ".MAIN_DB_PREFIX."c_forme_juridique as f, ".MAIN_DB_PREFIX."c_pays as p WHERE f.fk_pays=p.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, p.code as country_code, p.libelle as country, d.active FROM ".MAIN_DB_PREFIX."c_departements as d, ".MAIN_DB_PREFIX."c_regions as r, ".MAIN_DB_PREFIX."c_pays as p WHERE d.fk_region=r.code_region and r.fk_pays=p.rowid and r.active=1 and p.active=1";
-$tabsql[3] = "SELECT r.rowid as rowid, code_region as code, nom as libelle, r.fk_pays as country_id, p.code as country_code, p.libelle as country, r.active FROM ".MAIN_DB_PREFIX."c_regions as r, ".MAIN_DB_PREFIX."c_pays as p WHERE r.fk_pays=p.rowid and p.active=1";
+$tabsql[3] = "SELECT r.rowid as rowid, r.code_region as code, r.nom as libelle, r.fk_pays as country_id, p.code as country_code, p.libelle as country, r.active FROM ".MAIN_DB_PREFIX."c_regions as r, ".MAIN_DB_PREFIX."c_pays as p WHERE r.fk_pays=p.rowid and p.active=1";
 $tabsql[4] = "SELECT rowid   as rowid, code, libelle, active FROM ".MAIN_DB_PREFIX."c_pays";
 $tabsql[5] = "SELECT c.rowid as rowid, c.code as code, c.civilite AS libelle, c.active FROM ".MAIN_DB_PREFIX."c_civilite AS c";
 $tabsql[6] = "SELECT a.id    as rowid, a.code as code, a.libelle AS libelle, a.type, a.active, a.module, 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, 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[8] = "SELECT t.id    as rowid, t.code as code, t.libelle, t.fk_country as country_id, p.code as country_code, p.libelle as country, t.active FROM ".MAIN_DB_PREFIX."c_typent as t LEFT JOIN ".MAIN_DB_PREFIX."c_pays as p ON t.fk_country=p.rowid";
 $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, ".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";
@@ -159,7 +159,7 @@ $tabsql[24]= "SELECT s.rowid as rowid, pcg_version, s.fk_pays as country_id, p.c
 $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";
 $tabsql[26]= "SELECT rowid   as rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_type_resource";

-// Critere de tri du dictionnaire
+// Criteria to sort dictionaries
 $tabsqlsort=array();
 $tabsqlsort[1] ="country ASC, code ASC";
 $tabsqlsort[2] ="country ASC, code ASC";
@@ -168,7 +168,7 @@ $tabsqlsort[4] ="code ASC";
 $tabsqlsort[5] ="libelle 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] ="libelle ASC";
+$tabsqlsort[8] ="country DESC, libelle ASC";
 $tabsqlsort[9] ="label ASC";
 $tabsqlsort[10]="country ASC, taux ASC, recuperableonly ASC, localtax1 ASC, localtax2 ASC";
 $tabsqlsort[11]="element ASC, source ASC, code ASC";
@@ -197,7 +197,7 @@ $tabfield[4] = "code,libelle";
 $tabfield[5] = "code,libelle";
 $tabfield[6] = "code,libelle,type,position";
 $tabfield[7] = "code,libelle,country_id,country,accountancy_code,deductible";
-$tabfield[8] = "code,libelle";
+$tabfield[8] = "code,libelle,country_id,country";
 $tabfield[9] = "code,label,unicode";
 $tabfield[10]= "country_id,country,taux,recuperableonly,localtax1_type,localtax1,localtax2_type,localtax2,accountancy_code_sell,accountancy_code_buy,note";
 $tabfield[11]= "element,source,code,libelle";
@@ -226,7 +226,7 @@ $tabfieldvalue[4] = "code,libelle";
 $tabfieldvalue[5] = "code,libelle";
 $tabfieldvalue[6] = "code,libelle,type,position";
 $tabfieldvalue[7] = "code,libelle,country,accountancy_code,deductible";
-$tabfieldvalue[8] = "code,libelle";
+$tabfieldvalue[8] = "code,libelle,country";
 $tabfieldvalue[9] = "code,label,unicode";
 $tabfieldvalue[10]= "country,taux,recuperableonly,localtax1_type,localtax1,localtax2_type,localtax2,accountancy_code_sell,accountancy_code_buy,note";
 $tabfieldvalue[11]= "element,source,code,libelle";
@@ -255,7 +255,7 @@ $tabfieldinsert[4] = "code,libelle";
 $tabfieldinsert[5] = "code,civilite";
 $tabfieldinsert[6] = "code,libelle,type,position";
 $tabfieldinsert[7] = "code,libelle,fk_pays,accountancy_code,deductible";
-$tabfieldinsert[8] = "code,libelle";
+$tabfieldinsert[8] = "code,libelle,fk_country";
 $tabfieldinsert[9] = "code_iso,label,unicode";
 $tabfieldinsert[10]= "fk_pays,taux,recuperableonly,localtax1_type,localtax1,localtax2_type,localtax2,accountancy_code_sell,accountancy_code_buy,note";
 $tabfieldinsert[11]= "element,source,code,libelle";
@@ -428,7 +428,8 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
    $ok=1;
    foreach ($listfield as $f => $value)
    {
-        if ($value == 'country' && in_array('region_id',$listfield)) continue;		// For region page, we do not require the country input
+        if ($value == 'country' && in_array($tablib[$id],array('DictionaryRegion','DictionaryCompanyType'))) continue;		// For some pages, country is not mandatory
+        if ($value == 'country_id' && in_array($tablib[$id],array('DictionaryRegion','DictionaryCompanyType'))) 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 ((! isset($_POST[$value]) || $_POST[$value]=='')
@@ -473,9 +474,17 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
 	    	$msg .= $langs->transnoentities('ErrorFieldFormat', $langs->transnoentities('Code')).'<br />';
 	    }*/
    }
-    if (isset($_POST["country"]) && $_POST["country"]=='0') {
-        $ok=0;
-        setEventMessage($langs->transnoentities("ErrorFieldRequired",$langs->transnoentities("Country")),'errors');
+    if (isset($_POST["country"]) && $_POST["country"]=='0')
+    {
+    	if (in_array($tablib[$id],array('DictionaryCompanyType')))
+    	{
+    		$_POST["country"]='';
+    	}
+    	else
+    	{
+        	$ok=0;
+        	setEventMessage($langs->transnoentities("ErrorFieldRequired",$langs->transnoentities("Country")),'errors');
+    	}
    }

 	// Clean some parameters
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -1023,8 +1023,6 @@ else    // View by day
 }


-$db->close();
-
 /* TODO Export
 print '
 <a href="" id="actionagenda_ical_link"><img src="'.DOL_URL_ROOT.'/theme/common/ical.gif" border="0"/></a>
@@ -1041,6 +1039,8 @@ $("#actionagenda_vcal_link").attr("href","/public/agenda/agendaexport.php?format

 llxFooter();

+$db->close();
+

 /**
 * Show event of a particular day
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -0,0 +1,480 @@
+<?php
+/* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2003      Eric Seigne          <erics@rycks.com>
+ * Copyright (C) 2004-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2011      Juanjo Menent        <jmenent@2byte.es>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+
+/**
+ *  \file       htdocs/comm/action/peruser.php
+ *  \ingroup    agenda
+ *  \brief      Tab of calendar events per user
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php';
+if (! empty($conf->projet->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+}
+
+if (! isset($conf->global->AGENDA_MAX_EVENTS_DAY_VIEW)) $conf->global->AGENDA_MAX_EVENTS_DAY_VIEW=3;
+
+$filter=GETPOST("filter",'',3);
+$filtera = GETPOST("userasked","int",3)?GETPOST("userasked","int",3):GETPOST("filtera","int",3);
+$filtert = GETPOST("usertodo","int",3)?GETPOST("usertodo","int",3):GETPOST("filtert","int",3);
+$filterd = GETPOST("userdone","int",3)?GETPOST("userdone","int",3):GETPOST("filterd","int",3);
+$usergroup = GETPOST("usergroup","int",3);
+$showbirthday = empty($conf->use_javascript_ajax)?GETPOST("showbirthday","int"):1;
+
+
+$sortfield = GETPOST("sortfield",'alpha');
+$sortorder = GETPOST("sortorder",'alpha');
+$page = GETPOST("page","int");
+if ($page == -1) { $page = 0; }
+$limit = $conf->liste_limit;
+$offset = $limit * $page;
+if (! $sortorder) $sortorder="ASC";
+if (! $sortfield) $sortfield="a.datec";
+
+// Security check
+$socid = GETPOST("socid","int");
+if ($user->societe_id) $socid=$user->societe_id;
+$result = restrictedArea($user, 'agenda', 0, '', 'myactions');
+if ($socid < 0) $socid='';
+
+$canedit=1;
+if (! $user->rights->agenda->myactions->read) accessforbidden();
+if (! $user->rights->agenda->allactions->read) $canedit=0;
+if (! $user->rights->agenda->allactions->read || $filter =='mine')  // If no permission to see all, we show only affected to me
+{
+    $filtera=$user->id;
+    $filtert=$user->id;
+    $filterd=$user->id;
+}
+
+$action=GETPOST('action','alpha');
+//$year=GETPOST("year");
+$year=GETPOST("year","int")?GETPOST("year","int"):date("Y");
+$month=GETPOST("month","int")?GETPOST("month","int"):date("m");
+$week=GETPOST("week","int")?GETPOST("week","int"):date("W");
+$day=GETPOST("day","int")?GETPOST("day","int"):0;
+$pid=GETPOST("projectid","int",3);
+$status=GETPOST("status");
+$type=GETPOST("type");
+$maxprint=(isset($_GET["maxprint"])?GETPOST("maxprint"):$conf->global->AGENDA_MAX_EVENTS_DAY_VIEW);
+$actioncode=GETPOST("actioncode","alpha",3)?GETPOST("actioncode","alpha",3):(GETPOST("actioncode")=='0'?'0':'');
+
+if ($actioncode == '') $actioncode=(empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE)?'':$conf->global->AGENDA_DEFAULT_FILTER_TYPE);
+if ($status == '')     $status=(empty($conf->global->AGENDA_DEFAULT_FILTER_STATUS)?'':$conf->global->AGENDA_DEFAULT_FILTER_STATUS);
+if (empty($action))   $action=(empty($conf->global->AGENDA_DEFAULT_VIEW)?'show_month':$conf->global->AGENDA_DEFAULT_VIEW);
+
+if (GETPOST('viewcal') && $action != 'show_day' && $action != 'show_week')  {
+    $action='show_month'; $day='';
+}                                                   // View by month
+if (GETPOST('viewweek') || $action == 'show_week') {
+    $action='show_week'; $week=($week?$week:date("W")); $day=($day?$day:date("d"));
+}  // View by week
+if (GETPOST('viewday') || $action == 'show_day')  {
+    $action='show_day'; $day=($day?$day:date("d"));
+}                                  // View by day
+
+
+$langs->load("agenda");
+$langs->load("other");
+$langs->load("commercial");
+
+// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+$hookmanager->initHooks(array('agenda'));
+
+
+/*
+ * Actions
+ */
+
+// None
+
+
+/*
+ * View
+ */
+
+$help_url='EN:Module_Agenda_En|FR:Module_Agenda|ES:M&oacute;dulo_Agenda';
+llxHeader('',$langs->trans("Agenda"),$help_url);
+
+$form=new Form($db);
+$companystatic=new Societe($db);
+$contactstatic=new Contact($db);
+
+$now=dol_now();
+$nowarray=dol_getdate($now);
+$nowyear=$nowarray['year'];
+$nowmonth=$nowarray['mon'];
+$nowday=$nowarray['mday'];
+
+// Define list of all external calendars
+$listofextcals=array();
+if (empty($conf->global->AGENDA_DISABLE_EXT) && $conf->global->AGENDA_EXT_NB > 0)
+{
+    $i=0;
+    while($i < $conf->global->AGENDA_EXT_NB)
+    {
+        $i++;
+        $source='AGENDA_EXT_SRC'.$i;
+        $name='AGENDA_EXT_NAME'.$i;
+        $color='AGENDA_EXT_COLOR'.$i;
+        $buggedfile='AGENDA_EXT_BUGGEDFILE'.$i;
+        if (! empty($conf->global->$source) && ! empty($conf->global->$name))
+        {
+        	// Note: $conf->global->buggedfile can be empty or 'uselocalandtznodaylight' or 'uselocalandtzdaylight'
+        	$listofextcals[]=array('src'=>$conf->global->$source,'name'=>$conf->global->$name,'color'=>$conf->global->$color,'buggedfile'=>(isset($conf->global->buggedfile)?$conf->global->buggedfile:0));
+        }
+    }
+}
+
+
+if (empty($action) || $action=='show_month')
+{
+    $prev = dol_get_prev_month($month, $year);
+    $prev_year  = $prev['year'];
+    $prev_month = $prev['month'];
+    $next = dol_get_next_month($month, $year);
+    $next_year  = $next['year'];
+    $next_month = $next['month'];
+
+    $max_day_in_prev_month = date("t",dol_mktime(0,0,0,$prev_month,1,$prev_year));  // Nb of days in previous month
+    $max_day_in_month = date("t",dol_mktime(0,0,0,$month,1,$year));                 // Nb of days in next month
+    // tmpday is a negative or null cursor to know how many days before the 1 to show on month view (if tmpday=0 we start on monday)
+    $tmpday = -date("w",dol_mktime(0,0,0,$month,1,$year))+2;
+    $tmpday+=((isset($conf->global->MAIN_START_WEEK)?$conf->global->MAIN_START_WEEK:1)-1);
+    if ($tmpday >= 1) $tmpday -= 7;
+    // Define firstdaytoshow and lastdaytoshow
+    $firstdaytoshow=dol_mktime(0,0,0,$prev_month,$max_day_in_prev_month+$tmpday,$prev_year);
+    $next_day=7-($max_day_in_month+1-$tmpday)%7;
+    if ($next_day < 6) $next_day+=7;
+    $lastdaytoshow=dol_mktime(0,0,0,$next_month,$next_day,$next_year);
+}
+if ($action=='show_week')
+{
+    $prev = dol_get_first_day_week($day, $month, $year);
+    $prev_year  = $prev['prev_year'];
+    $prev_month = $prev['prev_month'];
+    $prev_day   = $prev['prev_day'];
+    $first_day  = $prev['first_day'];
+
+    $week = $prev['week'];
+
+    $day = (int) $day;
+    $next = dol_get_next_week($day, $week, $month, $year);
+    $next_year  = $next['year'];
+    $next_month = $next['month'];
+    $next_day   = $next['day'];
+
+    // Define firstdaytoshow and lastdaytoshow
+    $firstdaytoshow=dol_mktime(0,0,0,$prev_month,$first_day,$prev_year);
+    $lastdaytoshow=dol_mktime(0,0,0,$next_month,$next_day,$next_year);
+
+    $max_day_in_month = date("t",dol_mktime(0,0,0,$month,1,$year));
+
+    $tmpday = $first_day;
+}
+if ($action == 'show_day')
+{
+    $prev = dol_get_prev_day($day, $month, $year);
+    $prev_year  = $prev['year'];
+    $prev_month = $prev['month'];
+    $prev_day   = $prev['day'];
+    $next = dol_get_next_day($day, $month, $year);
+    $next_year  = $next['year'];
+    $next_month = $next['month'];
+    $next_day   = $next['day'];
+
+    // Define firstdaytoshow and lastdaytoshow
+    $firstdaytoshow=dol_mktime(0,0,0,$prev_month,$prev_day,$prev_year);
+    $lastdaytoshow=dol_mktime(0,0,0,$next_month,$next_day,$next_year);
+}
+//print 'xx'.$prev_year.'-'.$prev_month.'-'.$prev_day;
+//print 'xx'.$next_year.'-'.$next_month.'-'.$next_day;
+//print dol_print_date($firstdaytoshow,'day');
+//print dol_print_date($lastdaytoshow,'day');
+
+$title=$langs->trans("DoneAndToDoActions");
+if ($status == 'done') $title=$langs->trans("DoneActions");
+if ($status == 'todo') $title=$langs->trans("ToDoActions");
+
+$param='';
+if ($status)  $param="&status=".$status;
+if ($filter)  $param.="&filter=".$filter;
+if ($filtera) $param.="&filtera=".$filtera;
+if ($filtert) $param.="&filtert=".$filtert;
+if ($filterd) $param.="&filterd=".$filterd;
+if ($socid)   $param.="&socid=".$socid;
+if ($showbirthday) $param.="&showbirthday=1";
+if ($pid)     $param.="&projectid=".$pid;
+if ($actioncode != '') $param.="&actioncode=".$actioncode;
+if ($type)   $param.="&type=".$type;
+if ($action == 'show_day' || $action == 'show_week') $param.='&action='.$action;
+$param.="&maxprint=".$maxprint;
+
+// Show navigation bar
+if (empty($action) || $action=='show_month')
+{
+    $nav ="<a href=\"?year=".$prev_year."&amp;month=".$prev_month.$param."\">".img_previous($langs->trans("Previous"))."</a>\n";
+    $nav.=" <span id=\"month_name\">".dol_print_date(dol_mktime(0,0,0,$month,1,$year),"%b %Y");
+    $nav.=" </span>\n";
+    $nav.="<a href=\"?year=".$next_year."&amp;month=".$next_month.$param."\">".img_next($langs->trans("Next"))."</a>\n";
+    $nav.=" &nbsp; (<a href=\"?year=".$nowyear."&amp;month=".$nowmonth.$param."\">".$langs->trans("Today")."</a>)";
+    $picto='calendar';
+}
+if ($action=='show_week')
+{
+    $nav ="<a href=\"?year=".$prev_year."&amp;month=".$prev_month."&amp;day=".$prev_day.$param."\">".img_previous($langs->trans("Previous"))."</a>\n";
+    $nav.=" <span id=\"month_name\">".dol_print_date(dol_mktime(0,0,0,$month,1,$year),"%Y").", ".$langs->trans("Week")." ".$week;
+    $nav.=" </span>\n";
+    $nav.="<a href=\"?year=".$next_year."&amp;month=".$next_month."&amp;day=".$next_day.$param."\">".img_next($langs->trans("Next"))."</a>\n";
+    $nav.=" &nbsp; (<a href=\"?year=".$nowyear."&amp;month=".$nowmonth."&amp;day=".$nowday.$param."\">".$langs->trans("Today")."</a>)";
+    $picto='calendarweek';
+}
+if ($action=='show_day')
+{
+    $nav ="<a href=\"?year=".$prev_year."&amp;month=".$prev_month."&amp;day=".$prev_day.$param."\">".img_previous($langs->trans("Previous"))."</a>\n";
+    $nav.=" <span id=\"month_name\">".dol_print_date(dol_mktime(0,0,0,$month,$day,$year),"daytextshort");
+    $nav.=" </span>\n";
+    $nav.="<a href=\"?year=".$next_year."&amp;month=".$next_month."&amp;day=".$next_day.$param."\">".img_next($langs->trans("Next"))."</a>\n";
+    $nav.=" &nbsp; (<a href=\"?year=".$nowyear."&amp;month=".$nowmonth."&amp;day=".$nowday.$param."\">".$langs->trans("Today")."</a>)";
+    $picto='calendarday';
+}
+
+// Must be after the nav definition
+$param.='&year='.$year.'&month='.$month.($day?'&day='.$day:'');
+//print 'x'.$param;
+
+
+
+
+$tabactive='cardperuser';
+
+$paramnoaction=preg_replace('/action=[a-z_]+/','',$param);
+
+$head = calendars_prepare_head($paramnoaction);
+
+dol_fiche_head($head, $tabactive, $langs->trans('Agenda'), 0, 'action');
+print_actions_filter($form,$canedit,$status,$year,$month,$day,$showbirthday,$filtera,$filtert,$filterd,$pid,$socid,$listofextcals,$actioncode,$usergroup);
+dol_fiche_end();
+
+print_fiche_titre($s,$link.' &nbsp; &nbsp; '.$nav, '');
+
+
+// Get event in an array
+$eventarray=array();
+
+$sql = 'SELECT a.id,a.label,';
+$sql.= ' a.datep,';
+$sql.= ' a.datep2,';
+$sql.= ' a.datea,';
+$sql.= ' a.datea2,';
+$sql.= ' a.percent,';
+$sql.= ' a.fk_user_author,a.fk_user_action,a.fk_user_done,';
+$sql.= ' a.transparency, a.priority, a.fulldayevent, a.location,';
+$sql.= ' a.fk_soc, a.fk_contact,';
+$sql.= ' ca.code';
+$sql.= ' FROM '.MAIN_DB_PREFIX.'c_actioncomm as ca, '.MAIN_DB_PREFIX."actioncomm as a";
+if (! $user->rights->societe->client->voir && ! $socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";
+if ($usergroup > 0) $sql.= ", ".MAIN_DB_PREFIX."usergroup_user as ugu";
+$sql.= ' WHERE a.fk_action = ca.id';
+$sql.= ' AND a.entity IN ('.getEntity('agenda', 1).')';
+if ($actioncode) $sql.=" AND ca.code='".$db->escape($actioncode)."'";
+if ($pid) $sql.=" AND a.fk_project=".$db->escape($pid);
+if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND (a.fk_soc IS NULL OR sc.fk_user = " .$user->id . ")";
+if ($socid > 0) $sql.= ' AND a.fk_soc = '.$socid;
+if ($usergroup > 0) $sql.= " AND ugu.fk_user = a.fk_user_action";
+if ($action == 'show_day')
+{
+    $sql.= " AND (";
+    $sql.= " (a.datep BETWEEN '".$db->idate(dol_mktime(0,0,0,$month,$day,$year))."'";
+    $sql.= " AND '".$db->idate(dol_mktime(23,59,59,$month,$day,$year))."')";
+    $sql.= " OR ";
+    $sql.= " (a.datep2 BETWEEN '".$db->idate(dol_mktime(0,0,0,$month,$day,$year))."'";
+    $sql.= " AND '".$db->idate(dol_mktime(23,59,59,$month,$day,$year))."')";
+    $sql.= " OR ";
+    $sql.= " (a.datep < '".$db->idate(dol_mktime(0,0,0,$month,$day,$year))."'";
+    $sql.= " AND a.datep2 > '".$db->idate(dol_mktime(23,59,59,$month,$day,$year))."')";
+    $sql.= ')';
+}
+else
+{
+    // To limit array
+    $sql.= " AND (";
+    $sql.= " (a.datep BETWEEN '".$db->idate(dol_mktime(0,0,0,$month,1,$year)-(60*60*24*7))."'";   // Start 7 days before
+    $sql.= " AND '".$db->idate(dol_mktime(23,59,59,$month,28,$year)+(60*60*24*10))."')";            // End 7 days after + 3 to go from 28 to 31
+    $sql.= " OR ";
+    $sql.= " (a.datep2 BETWEEN '".$db->idate(dol_mktime(0,0,0,$month,1,$year)-(60*60*24*7))."'";
+    $sql.= " AND '".$db->idate(dol_mktime(23,59,59,$month,28,$year)+(60*60*24*10))."')";
+    $sql.= " OR ";
+    $sql.= " (a.datep < '".$db->idate(dol_mktime(0,0,0,$month,1,$year)-(60*60*24*7))."'";
+    $sql.= " AND a.datep2 > '".$db->idate(dol_mktime(23,59,59,$month,28,$year)+(60*60*24*10))."')";
+    $sql.= ')';
+}
+if ($type) $sql.= " AND ca.id = ".$type;
+if ($status == '0') { $sql.= " AND a.percent = 0"; }
+if ($status == '-1') { $sql.= " AND a.percent = -1"; }	// Not applicable
+if ($status == '50') { $sql.= " AND (a.percent >= 0 AND a.percent < 100)"; }	// Running
+if ($status == 'done' || $status == '100') { $sql.= " AND (a.percent = 100 OR (a.percent = -1 AND a.datep2 <= '".$db->idate($now)."'))"; }
+if ($status == 'todo') { $sql.= " AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep2 > '".$db->idate($now)."'))"; }
+if ($filtera > 0 || $filtert > 0 || $filterd > 0 || $usergroup > 0)
+{
+    $sql.= " AND (";
+    if ($filtera > 0) $sql.= " a.fk_user_author = ".$filtera;
+    if ($filtert > 0) $sql.= ($filtera>0?" OR ":"")." a.fk_user_action = ".$filtert;
+    if ($filterd > 0) $sql.= ($filtera>0||$filtert>0?" OR ":"")." a.fk_user_done = ".$filterd;
+	if ($usergroup > 0) $sql.= ($filtera>0||$filtert>0||$filterd>0?" OR ":"")." ugu.fk_usergroup = ".$usergroup;
+    $sql.= ")";
+}
+// Sort on date
+$sql.= ' ORDER BY datep';
+//print $sql;
+
+dol_syslog("comm/action/index.php", LOG_DEBUG);
+$resql=$db->query($sql);
+if ($resql)
+{
+    $num = $db->num_rows($resql);
+    $i=0;
+    while ($i < $num)
+    {
+        $obj = $db->fetch_object($resql);
+
+        // Create a new object action
+        $event=new ActionComm($db);
+        $event->id=$obj->id;
+        $event->datep=$db->jdate($obj->datep);      // datep and datef are GMT date
+        $event->datef=$db->jdate($obj->datep2);
+        $event->type_code=$obj->code;
+        $event->libelle=$obj->label;
+        $event->percentage=$obj->percent;
+        $event->author->id=$obj->fk_user_author;	// user id of creator
+        $event->usertodo->id=$obj->fk_user_action;	// user id of owner
+        $event->userdone->id=$obj->fk_user_done;	// deprecated
+		// $event->userstodo=... with s after user, in future version, will be an array with all id of user assigned to event
+        $event->priority=$obj->priority;
+        $event->fulldayevent=$obj->fulldayevent;
+        $event->location=$obj->location;
+        $event->transparency=$obj->transparency;
+
+        $event->societe->id=$obj->fk_soc;
+        $event->contact->id=$obj->fk_contact;
+
+        // Defined date_start_in_calendar and date_end_in_calendar property
+        // They are date start and end of action but modified to not be outside calendar view.
+        if ($event->percentage <= 0)
+        {
+            $event->date_start_in_calendar=$event->datep;
+            if ($event->datef != '' && $event->datef >= $event->datep) $event->date_end_in_calendar=$event->datef;
+            else $event->date_end_in_calendar=$event->datep;
+        }
+        else
+        {
+            $event->date_start_in_calendar=$event->datep;
+            if ($event->datef != '' && $event->datef >= $event->datep) $event->date_end_in_calendar=$event->datef;
+            else $event->date_end_in_calendar=$event->datep;
+        }
+        // Define ponctual property
+        if ($event->date_start_in_calendar == $event->date_end_in_calendar)
+        {
+            $event->ponctuel=1;
+        }
+
+        // Check values
+        if ($event->date_end_in_calendar < $firstdaytoshow ||
+        $event->date_start_in_calendar > $lastdaytoshow)
+        {
+            // This record is out of visible range
+        }
+        else
+        {
+            if ($event->date_start_in_calendar < $firstdaytoshow) $event->date_start_in_calendar=$firstdaytoshow;
+            if ($event->date_end_in_calendar > $lastdaytoshow) $event->date_end_in_calendar=$lastdaytoshow;
+
+            // Add an entry in actionarray for each day
+            $daycursor=$event->date_start_in_calendar;
+            $annee = date('Y',$daycursor);
+            $mois = date('m',$daycursor);
+            $jour = date('d',$daycursor);
+
+            // Loop on each day covered by action to prepare an index to show on calendar
+            $loop=true; $j=0;
+            $daykey=dol_mktime(0,0,0,$mois,$jour,$annee);
+            do
+            {
+                //if ($event->id==408) print 'daykey='.$daykey.' '.$event->datep.' '.$event->datef.'<br>';
+
+                $eventarray[$daykey][]=$event;
+                $j++;
+
+                $daykey+=60*60*24;
+                if ($daykey > $event->date_end_in_calendar) $loop=false;
+            }
+            while ($loop);
+
+            //print 'Event '.$i.' id='.$event->id.' (start='.dol_print_date($event->datep).'-end='.dol_print_date($event->datef);
+            //print ' startincalendar='.dol_print_date($event->date_start_in_calendar).'-endincalendar='.dol_print_date($event->date_end_in_calendar).') was added in '.$j.' different index key of array<br>';
+        }
+        $i++;
+
+    }
+}
+else
+{
+    dol_print_error($db);
+}
+
+$maxnbofchar=18;
+$cachethirdparties=array();
+$cachecontacts=array();
+
+// Define theme_datacolor array
+$color_file = DOL_DOCUMENT_ROOT."/theme/".$conf->theme."/graph-color.php";
+if (is_readable($color_file))
+{
+    include_once $color_file;
+}
+if (! is_array($theme_datacolor)) $theme_datacolor=array(array(120,130,150), array(200,160,180), array(190,190,220));
+
+
+
+
+/* TODO Export
+ print '
+<a href="" id="actionagenda_ical_link"><img src="'.DOL_URL_ROOT.'/theme/common/ical.gif" border="0"/></a>
+<a href="" id="actionagenda_vcal_link"><img src="'.DOL_URL_ROOT.'/theme/common/vcal.gif" border="0"/></a>
+<a href="" id="actionagenda_rss_link"><img src="'.DOL_URL_ROOT.'/theme/common/rss.gif"  border="0"/></a>
+
+<script>
+$("#actionagenda_rss_link").attr("href","/public/agenda/agendaexport.php?format=rss&type=ActionAgenda&exportkey=dolibarr&token="+getToken()+"&status="+getStatus()+"&userasked="+getUserasked()+"&usertodo="+getUsertodo()+"&userdone="+getUserdone()+"&year="+getYear()+"&month="+getMonth()+"&day="+getDay()+"&showbirthday="+getShowbirthday()+"&action="+getAction()+"&projectid="+getProjectid()+"");
+$("#actionagenda_ical_link").attr("href","/public/agenda/agendaexport.php?format=ical&type=ActionAgenda&exportkey=dolibarr&token="+getToken()+"&status="+getStatus()+"&userasked="+getUserasked()+"&usertodo="+getUsertodo()+"&userdone="+getUserdone()+"&year="+getYear()+"&month="+getMonth()+"&day="+getDay()+"&showbirthday="+getShowbirthday()+"&action="+getAction()+"&projectid="+getProjectid()+"");
+$("#actionagenda_vcal_link").attr("href","/public/agenda/agendaexport.php?format=vcal&type=ActionAgenda&exportkey=dolibarr&token="+getToken()+"&status="+getStatus()+"&userasked="+getUserasked()+"&usertodo="+getUsertodo()+"&userdone="+getUserdone()+"&year="+getYear()+"&month="+getMonth()+"&day="+getDay()+"&showbirthday="+getShowbirthday()+"&action="+getAction()+"&projectid="+getProjectid()+"");
+</script>
+';
+*/
+
+llxFooter();
+
+$db->close();
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -78,9 +78,9 @@ if (! empty($conf->propal->enabled) && $user->rights->propal->lire)
 	print '<table class="noborder nohover" width="100%">';
 	print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("SearchAProposal").'</td></tr>';
 	print '<tr '.$bc[$var].'>';
-	print '<td class="nowrap">'.$langs->trans("Ref").':</td><td><input type="text" class="flat" name="sf_ref" size="18"></td>';
+	print '<td class="nowrap"><label for="sf_ref">'.$langs->trans("Ref").'</label>:</td><td><input type="text" class="flat" name="sf_ref" id="sf_ref" size="18"></td>';
 	print '<td rowspan="2"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
-	print '<tr '.$bc[$var].'><td class="nowrap">'.$langs->trans("Other").':</td><td><input type="text" class="flat" name="sall" size="18"></td>';
+	print '<tr '.$bc[$var].'><td class="nowrap"><label for="sall">'.$langs->trans("Other").'</label>:</td><td><input type="text" class="flat" name="sall" id="sall" size="18"></td>';
 	print '</tr>';
 	print "</table></form>\n";
 	print "<br>\n";
@@ -95,8 +95,8 @@ if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("SearchACustomerOrder").'</td></tr>';
 	print '<tr '.$bc[$var].'><td>';
-	print $langs->trans("Ref").':</td><td><input type="text" class="flat" name="sref" size=18></td><td rowspan="2"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
-	print '<tr '.$bc[$var].'><td class="nowrap">'.$langs->trans("Other").':</td><td><input type="text" class="flat" name="sall" size="18"></td>';
+	print '<label for="sref">'.$langs->trans("Ref").'</label>:</td><td><input type="text" class="flat" name="sref" id="sref" size=18></td><td rowspan="2"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
+	print '<tr '.$bc[$var].'><td class="nowrap"><label for="sall">'.$langs->trans("Other").'</label>:</td><td><input type="text" class="flat" name="sall" id="sall" size="18"></td>';
 	print '</tr>';
 	print "</form></table><br>\n";
 }
@@ -110,9 +110,9 @@ if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire)
 	print '<table class="noborder nohover" width="100%">';
 	print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("SearchAContract").'</td></tr>';
 	print '<tr '.$bc[$var].'>';
-	print '<td class="nowrap">'.$langs->trans("Ref").':</td><td><input type="text" class="flat" name="search_contract" size="18"></td>';
+	print '<td class="nowrap"><label for="search_contract">'.$langs->trans("Ref").'</label>:</td><td><input type="text" class="flat" name="search_contract" id="search_contract" size="18"></td>';
 	print '<td rowspan="2"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
-	print '<tr '.$bc[$var].'><td class="nowrap">'.$langs->trans("Other").':</td><td><input type="text" class="flat" name="sall" size="18"></td>';
+	print '<tr '.$bc[$var].'><td class="nowrap"><label for="sall">'.$langs->trans("Other").'</label>:</td><td><input type="text" class="flat" name="sall" id="sall" size="18"></td>';
 	print '</tr>';
 	print "</table></form>\n";
 	print "<br>";
--- a/htdocs/compta/hrm.php
+++ b/htdocs/compta/hrm.php
@@ -96,9 +96,9 @@ if (! empty($conf->deplacement->enabled) && $user->rights->deplacement->lire)
    print '<table class="noborder nohover" width="100%">';
    print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("SearchATripAndExpense").'</td></tr>';
    print "<tr ".$bc[0].">";
-    print "<td>".$langs->trans("Ref").':</td><td><input type="text" name="search_ref" class="flat" size="18"></td>';
+    print "<td><label for=\"search_ref\">".$langs->trans("Ref").'</label>:</td><td><input type="text" name="search_ref" id="search_ref" class="flat" size="18"></td>';
    print '<td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
-    //print "<tr ".$bc[0]."><td>".$langs->trans("Other").':</td><td><input type="text" name="sall" class="flat" size="18"></td>';
+    //print "<tr ".$bc[0]."><td><label for=\"sall\">".$langs->trans("Other").'</label>:</td><td><input type="text" name="sall" id="sall" class="flat" size="18"></td>';
    print '</tr>';
    print "</table></form><br>";
 }
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -97,9 +97,9 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
 	print '<table class="noborder nohover" width="100%">';
 	print "<tr class=\"liste_titre\">";
 	print '<td colspan="3">'.$langs->trans("SearchACustomerInvoice").'</td></tr>';
-	print "<tr ".$bc[0]."><td>".$langs->trans("Ref").':</td><td><input type="text" name="sf_ref" class="flat" size="18"></td>';
+	print "<tr ".$bc[0]."><td><label for=\"sf_ref\">".$langs->trans("Ref").'</label>:</td><td><input type="text" name="sf_ref" id="sf_ref" class="flat" size="18"></td>';
 	print '<td rowspan="2"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
-	print "<tr ".$bc[0]."><td>".$langs->trans("Other").':</td><td><input type="text" name="sall" class="flat" size="18"></td>';
+	print "<tr ".$bc[0]."><td><label for=\"sall\">".$langs->trans("Other").'</label>:</td><td><input type="text" name="sall" id="sall" class="flat" size="18"></td>';
 	print '</tr>';
 	print "</table></form><br>";
 }
@@ -114,9 +114,9 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->lire)
 	print '<table class="noborder nohover" width="100%">';
 	print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("SearchASupplierInvoice").'</td></tr>';
 	print "<tr ".$bc[0].">";
-	print "<td>".$langs->trans("Ref").':</td><td><input type="text" name="search_ref" class="flat" size="18"></td>';
+	print "<td><label for=\"search_ref\">".$langs->trans("Ref").'</label>:</td><td><input type="text" name="search_ref" id="search_ref" class="flat" size="18"></td>';
 	print '<td rowspan="2"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
-	print "<tr ".$bc[0]."><td>".$langs->trans("RefSupplier").':</td><td><input type="text" name="search_ref_supplier" class="flat" size="18"></td>';
+	print "<tr ".$bc[0]."><td><label for=\"search_ref_supplier\">".$langs->trans("RefSupplier").'</label>:</td><td><input type="text" name="search_ref_supplier" id="search_ref_supplier" class="flat" size="18"></td>';
 	print '</tr>';
 	print "</table></form><br>";
 }
@@ -132,9 +132,9 @@ if (! empty($conf->don->enabled) && $user->rights->don->lire)
    print '<table class="noborder nohover" width="100%">';
    print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("SearchADonation").'</td></tr>';
    print "<tr ".$bc[0].">";
-    print "<td>".$langs->trans("Ref").':</td><td><input type="text" name="search_ref" class="flat" size="18"></td>';
+    print "<td><label for=\"search_ref\">".$langs->trans("Ref").'</label>:</td><td><input type="text" name="search_ref" id="search_ref" class="flat" size="18"></td>';
    print '<td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
-    //print "<tr ".$bc[0]."><td>".$langs->trans("Other").':</td><td><input type="text" name="sall" class="flat" size="18"></td>';
+    //print "<tr ".$bc[0]."><td><label for=\"sall\"".$langs->trans("Other").'</label>:</td><td><input type="text" name="sall" id="sall" class="flat" size="18"></td>';
    print '</tr>';
    print "</table></form><br>";
 }
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -824,6 +824,11 @@ class Contrat extends CommonObject
 		$error=0;

 		$this->db->begin();
+		
+	    // Call trigger
+	    $result=$this->call_trigger('CONTRACT_DELETE',$user);
+	    if ($result < 0) { $error++; }
+	    // End call triggers

 		if (! $error)
 		{
@@ -909,14 +914,6 @@ class Contrat extends CommonObject
 			}
 		}

-		if (! $error)
-		{
-            // Call trigger
-            $result=$this->call_trigger('CONTRACT_DELETE',$user);
-            if ($result < 0) { $error++; }
-            // End call triggers
-		}
-
 		if (! $error)
 		{
 			// We remove directory
@@ -1078,6 +1075,15 @@ class Contrat extends CommonObject
 				$result=$this->update_statut($user);
 				if ($result > 0)
 				{
+				    // Call trigger
+				    $result=$this->call_trigger('LINECONTRACT_CREATE',$user);
+				    if ($result < 0)
+				    { 
+				        $this->db->rollback();
+				        return -1;
+				    }
+				    // End call triggers
+				    
 					$this->db->commit();
 					return 1;
 				}
@@ -1222,6 +1228,15 @@ class Contrat extends CommonObject
 			$result=$this->update_statut($user);
 			if ($result >= 0)
 			{
+		        // Call trigger
+		        $result=$this->call_trigger('LINECONTRACT_UPDATE',$user);
+		        if ($result < 0) 
+		        { 
+		            $this->db->rollback(); 
+		            return -3; 
+		        }
+		        // End call triggers
+	     			    
 				$this->db->commit();
 				return 1;
 			}
@@ -1257,6 +1272,11 @@ class Contrat extends CommonObject
 		if ($this->statut >= 0)
 		{

+		    // Call trigger
+		    $result=$this->call_trigger('LINECONTRACT_DELETE',$user);
+		    if ($result < 0) return -1;
+		    // End call triggers
+		    
 		    $this->db->begin();

 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."contratdet";
@@ -1271,11 +1291,6 @@ class Contrat extends CommonObject
 				return -1;
 			}

-            // Call trigger
-            $result=$this->call_trigger('LINECONTRACT_DELETE',$user);
-            if ($result < 0) { $error++; $this->db->rollback(); return -1; }
-            // End call triggers
-
            $this->db->commit();
 			return 1;
 		}
@@ -1734,13 +1749,8 @@ class Contrat extends CommonObject
 /**
 *	Classe permettant la gestion des lignes de contrats
 */
-class ContratLigne
+class ContratLigne extends CommonObject
 {
-	var $db;							//!< To store db handler
-	var $error;							//!< To return error code (or message)
-	var $errors=array();				//!< To return several error codes (or messages)
-	//var $element='contratdet';			//!< Id that identify managed objects
-	//var $table_element='contratdet';	//!< Name of table without prefix where object is stored

 	var $id;
 	var $ref;
--- a/htdocs/core/boxes/box_actions.php
+++ b/htdocs/core/boxes/box_actions.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2003-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
 * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
 * Copyright (C) 2005-2011 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2014 	   Charles-Fr BENKE        <charles.fr@benke.fr>
 *
 * 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
@@ -151,7 +152,70 @@ class box_actions extends ModeleBoxes
 	 */
 	function showBox($head = null, $contents = null)
 	{
+		global $langs, $conf;
 		parent::showBox($this->info_box_head, $this->info_box_contents);
+				if ($conf->global->SHOW_DIALOG_HOMEPAGE)
+		{		
+			$actioncejour=false;
+			$contents=$this->info_box_contents;
+			$nblines=count($contents);
+			$bcx[0] = 'class="box_pair"';
+			$bcx[1] = 'class="box_impair"';
+			if ($contents[0][0]['text'] != $langs->trans("NoActionsToDo"))
+			{
+				print '<div id="dialog" title="'.$nblines." ".$langs->trans("ActionsToDo").'">';
+				print '<table width=100%>';
+				for ($i=0, $n=$nblines; $i < $n; $i++)
+				{
+					if (isset($contents[$i]))
+					{
+						// on affiche que les évènement du jours ou passé
+						// qui ne sont pas à 100% 
+						$actioncejour=true;
+						$var=!$var;
+						// TR
+						$logo=$contents[$i][0]['logo'];
+						$label=$contents[$i][1]['text'];
+						$urlevent=$contents[$i][1]['url'];
+						$logosoc=$contents[$i][2]['logo'];
+						$nomsoc=$contents[$i][3]['text'];
+						$urlsoc=$contents[$i][3]['url'];
+						$dateligne=$contents[$i][4]['text'];
+						$percentage=$contents[$i][5]['text'];
+						print '<tr '.$bcx[$var].'>';
+						print '<td align=center>';
+						print img_object("",$logo);
+						print '</td>';
+						print '<td align=center><a href="'.$urlevent.'">'.$label.'</a></td>';
+						print '<td align=center><a href="'.$urlsoc.'">'.img_object("",$logosoc)." ".$nomsoc.'</a></td>';
+						print '<td align=center>'.$dateligne.'</td>';
+						print '<td align=center>'.$percentage.'</td>';
+						print '</tr>';
+					}
+				}
+				print '</table>'; 
+	
+			}
+			print '</div>';
+			if ($actioncejour)
+			{
+				print '<script>';
+				print '$( "#dialog" ).dialog({ autoOpen: true });';
+				if ($conf->global->SHOW_DIALOG_HOMEPAGE > 1)
+				{
+					print 'setTimeout(function(){';
+					print '$("#dialog").dialog("close");';
+					print '}, '.($conf->global->SHOW_DIALOG_HOMEPAGE*1000).');';
+				}
+				print '</script>';
+			}
+			else
+			{
+				print '<script>';
+				print '$( "#dialog" ).dialog({ autoOpen: false });';
+				print '</script>';
+			}
+		}
 	}

 }
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -2744,21 +2744,21 @@ abstract class CommonObject
 		if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) print '<td align="center" width="5">&nbsp;</td>';

 		// Description
-		print '<td>'.$langs->trans('Description').'</td>';
+		print '<td><label for="">'.$langs->trans('Description').'</label></td>';

 		// VAT
-		print '<td align="right" width="50">'.$langs->trans('VAT').'</td>';
+		print '<td align="right" width="50"><label for="tva_tx">'.$langs->trans('VAT').'</label></td>';

 		// Price HT
-		print '<td align="right" width="80">'.$langs->trans('PriceUHT').'</td>';
+		print '<td align="right" width="80"><label for="price_ht">'.$langs->trans('PriceUHT').'</label></td>';

 		if ($conf->global->MAIN_FEATURES_LEVEL > 1) print '<td align="right" width="80">&nbsp;</td>';

 		// Qty
-		print '<td align="right" width="50">'.$langs->trans('Qty').'</td>';
+		print '<td align="right" width="50"><label for="qty">'.$langs->trans('Qty').'</label></td>';

 		// Reduction short
-		print '<td align="right" width="50">'.$langs->trans('ReductionShort').'</td>';
+		print '<td align="right" width="50"><label for="remise_percent">'.$langs->trans('ReductionShort').'</label></td>';

 		if (! empty($conf->margin->enabled) && empty($user->societe_id))
 		{
--- a/htdocs/core/class/ctypent.class.php
+++ b/htdocs/core/class/ctypent.class.php
@@ -156,7 +156,8 @@ class Ctypent // extends CommonObject
        $sql = "SELECT";
 		$sql.= " t.id,";
 		$sql.= " t.code,";
-		$sql.= " t.libelle,";
+		$sql.= " t.libelle as label,";
+		$sql.= " t.fk_country as country_id,";
 		$sql.= " t.active,";
 		$sql.= " t.module";
        $sql.= " FROM ".MAIN_DB_PREFIX."c_typent as t";
@@ -173,7 +174,8 @@ class Ctypent // extends CommonObject

                $this->id    = $obj->id;
 				$this->code = $obj->code;
-				$this->libelle = $obj->libelle;
+				$this->libelle = $obj->label;
+				$this->country_id = $obj->country_id;
 				$this->active = $obj->active;
 				$this->module = $obj->module;
            }
--- a/htdocs/core/class/html.formcompany.class.php
+++ b/htdocs/core/class/html.formcompany.class.php
@@ -57,13 +57,13 @@ class FormCompany
 	 */
 	function typent_array($mode=0, $filter='')
 	{
-		global $langs;
+		global $langs,$mysoc;

 		$effs = array();

 		$sql = "SELECT id, code, libelle";
 		$sql.= " FROM ".MAIN_DB_PREFIX."c_typent";
-		$sql.= " WHERE active = 1";
+		$sql.= " WHERE active = 1 AND (fk_country IS NULL OR fk_country = ".(empty($mysoc->country_id)?'0':$mysoc->country_id).")";
 		if ($filter) $sql.=" ".$filter;
 		$sql.= " ORDER by id";
 		dol_syslog(get_class($this).'::typent_array', LOG_DEBUG);
--- a/htdocs/core/tpl/login.tpl.php
+++ b/htdocs/core/tpl/login.tpl.php
@@ -77,7 +77,7 @@ $(document).ready(function () {
 <tr>
 <td valign="middle" class="loginfield"><strong><label for="username"><?php echo $langs->trans('Login'); ?></label></strong></td>
 <td valign="middle" class="nowrap">
-<input type="text" id="username" name="username" class="flat" size="15" maxlength="40" value="<?php echo dol_escape_htmltag($login); ?>" tabindex="1" />
+<input type="text" id="username" name="username" class="flat" size="15" maxlength="40" value="<?php echo dol_escape_htmltag($login); ?>" tabindex="1" autofocus="autofocus" />
 </td>
 </tr>
 <!-- Password -->
@@ -96,9 +96,12 @@ if (! empty($hookmanager->resArray['options'])) {
 	}
 }
 ?>
-<?php if ($captcha) { ?>
+<?php
+	if ($captcha) {
+		// TODO: provide accessible captha variants
+?>
 	<!-- Captcha -->
-	<tr><td valign="middle" class="loginfield nowrap"><b><?php echo $langs->trans('SecurityCode'); ?></b></td>
+	<tr><td valign="middle" class="loginfield nowrap"><label for="securitycode"><b><?php echo $langs->trans('SecurityCode'); ?></b></label></td>
 	<td valign="top" class="nowrap none" align="left">

 	<table class="login_table_securitycode" style="width: 100px;"><tr>
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -50,23 +50,25 @@ if (in_array($object->element,array('propal','facture','invoice','commande','ord
 	<td<?php echo (! empty($conf->global->MAIN_VIEW_LINE_NUMBER) ? ' colspan="2"' : ''); ?>>
 	<div id="add"></div><span class="hideonsmartphone"><?php echo $langs->trans('AddNewLine'); ?></span><?php // echo $langs->trans("FreeZone"); ?>
 	</td>
-	<td align="right"><span id="title_vat"><?php echo $langs->trans('VAT'); ?></span></td>
-	<td align="right"><span id="title_up_ht"><?php echo $langs->trans('PriceUHT'); ?></span></td>
+	<td align="right"><span id="title_vat"><label for="tva_tx"><?php echo $langs->trans('VAT'); ?></label></span></td>
+	<td align="right"><span id="title_up_ht"><label for="price_ht"><?php echo $langs->trans('PriceUHT'); ?></label></span></td>
 	<?php if (! empty($inputalsopricewithtax)) { ?>
-	<td align="right"><span id="title_up_ttc"><?php echo $langs->trans('PriceUTTC'); ?></span></td>
+	<td align="right"><span id="title_up_ttc"><label for="price_ttc"><?php echo $langs->trans('PriceUTTC'); ?></label></span></td>
 	<?php } ?>
-	<td align="right"><?php echo $langs->trans('Qty'); ?></td>
-	<td align="right"><?php echo $langs->trans('ReductionShort'); ?></td>
+	<td align="right"><label for="qty"><?php echo $langs->trans('Qty'); ?></label></td>
+	<td align="right"><label for="remise_percent"><?php echo $langs->trans('ReductionShort'); ?></label></td>
 	<?php
 	if (! empty($usemargins))
 	{
 		?>
 		<td align="right">
 		<?php
+		echo '<label for="buying_price">';
 		if ($conf->global->MARGIN_TYPE == "1")
 			echo $langs->trans('BuyingPrice');
 		else
 			echo $langs->trans('CostPrice');
+		echo '</label>';
 		?>
 		</td>
 		<?php
@@ -107,7 +109,9 @@ else {
 		print '<input type="hidden" name="type" value="'.((! empty($object->element) && $object->element == 'contrat')?'1':'0').'">';
 	}
 	else {*/
+		echo '<label for="select_type">';
 		echo $langs->trans("FreeLineOfType");
+		echo '</label>';
 		/*
 		if (empty($conf->product->enabled) && empty($conf->service->enabled)) echo $langs->trans("Type");
 		else if (! empty($forceall) || (! empty($conf->product->enabled) && ! empty($conf->service->enabled))) echo $langs->trans("FreeLineOfType");
@@ -124,6 +128,7 @@ else {
 		echo '<br><span>';
 		echo '<input type="radio" name="prod_entry_mode" id="prod_entry_mode_predef" value="predef"'.(GETPOST('prod_entry_mode')=='predef'?' checked="true"':'').'> ';

+		echo '<label for="prod_entry_mode_predef">';
 		if (empty($senderissupplier))
 		{
 			if (! empty($conf->product->enabled) && empty($conf->service->enabled)) echo $langs->trans('PredefinedProductsToSell');
@@ -136,6 +141,7 @@ else {
 			else if (empty($conf->product->enabled) && ! empty($conf->service->enabled)) echo $langs->trans('PredefinedServicesToPurchase');
 			else echo $langs->trans('PredefinedProductsAndServicesToPurchase');
 		}
+		echo '</label>';
 		echo ' ';

 		$filtertype='';
@@ -184,7 +190,7 @@ else {
 	<td align="right"><?php
 	if (GETPOST('prod_entry_mode') != 'predef')
 	{
-		if ($seller->tva_assuj == "0") echo '<input type="hidden" name="tva_tx" value="0">0';
+		if ($seller->tva_assuj == "0") echo '<input type="hidden" name="tva_tx" id="tva_tx" value="0">0';
 		else echo $form->load_tva('tva_tx', (isset($_POST["tva_tx"])?$_POST["tva_tx"]:-1), $seller, $buyer);
 	}
 	?>
@@ -201,9 +207,9 @@ else {
 	<?php } ?>
 	</td>
 	<?php } ?>
-	<td align="right"><input type="text" size="2" name="qty" class="flat" value="<?php echo (isset($_POST["qty"])?$_POST["qty"]:1); ?>">
+	<td align="right"><input type="text" size="2" name="qty" id="qty" class="flat" value="<?php echo (isset($_POST["qty"])?$_POST["qty"]:1); ?>">
 	</td>
-	<td align="right" class="nowrap"><input type="text" size="1" class="flat" value="<?php echo (isset($_POST["remise_percent"])?$_POST["remise_percent"]:$buyer->remise_client); ?>" name="remise_percent"><span class="hideonsmartphone">%</span></td>
+	<td align="right" class="nowrap"><input type="text" size="1" name="remise_percent" id="remise_percent" class="flat" value="<?php echo (isset($_POST["remise_percent"])?$_POST["remise_percent"]:$buyer->remise_client); ?>"><span class="hideonsmartphone">%</span></td>

 	<?php
 	if (! empty($usemargins))
--- a/htdocs/core/tpl/objectline_edit.tpl.php
+++ b/htdocs/core/tpl/objectline_edit.tpl.php
@@ -107,7 +107,7 @@ $coldisplay=-1; // We remove first td
 		// must also not be output for most entities (proposal, intervention, ...)
 		//if($line->qty > $line->stock) print img_picto($langs->trans("StockTooLow"),"warning", 'style="vertical-align: bottom;"')." ";
 	?>
-		<input size="3" type="text" class="flat" name="qty" value="<?php echo $line->qty; ?>">
+		<input size="3" type="text" class="flat" name="qty" id="qty" value="<?php echo $line->qty; ?>">
 	<?php } else { ?>
 		&nbsp;
 	<?php } ?>
@@ -115,7 +115,7 @@ $coldisplay=-1; // We remove first td

 	<td align="right" nowrap><?php $coldisplay++; ?>
 	<?php if (($line->info_bits & 2) != 2) { ?>
-		<input size="1" type="text" class="flat" name="remise_percent" value="<?php echo $line->remise_percent; ?>">%
+		<input size="1" type="text" class="flat" name="remise_percent" id="remise_percent" value="<?php echo $line->remise_percent; ?>">%
 	<?php } else { ?>
 		&nbsp;
 	<?php } ?>
--- a/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
+++ b/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
@@ -417,6 +417,10 @@ class InterfaceDemo
        {
            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
        }
+        elseif ($action == 'LINECONTRACT_CREATE')
+        {
+            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+        }
        elseif ($action == 'LINECONTRACT_UPDATE')
        {
            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
@@ -484,6 +488,10 @@ class InterfaceDemo
 		elseif ($action == 'BILL_SUPPLIER_CREATE')
        {
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+        }
+		elseif ($action == 'BILL_SUPPLIER_UPDATE')
+        {
+             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
        }
 		elseif ($action == 'BILL_SUPPLIER_DELETE')
        {
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -600,8 +600,8 @@ class FactureFournisseur extends CommonInvoice
            if (! $notrigger)
            {
                // Call trigger
-                //$result=$this->call_trigger('BILL_SUPPLIER_MODIFY',$user);
-                //if ($result < 0) $error++;            
+                $result=$this->call_trigger('BILL_SUPPLIER_UPDATE',$user);
+                if ($result < 0) $error++;            
                // End call triggers
            }
        }
--- a/htdocs/install/mysql/data/llx_c_typent.sql
+++ b/htdocs/install/mysql/data/llx_c_typent.sql
@@ -27,17 +27,20 @@
 --

 --
-- Types entreprises
+-- Types of thirdparties
 --

 delete from llx_c_typent;
-insert into llx_c_typent (id,code,libelle,active) values (  0, 'TE_UNKNOWN', '-',             1);
-insert into llx_c_typent (id,code,libelle,active) values (  1, 'TE_STARTUP', 'Start-up',      0);
-insert into llx_c_typent (id,code,libelle,active) values (  2, 'TE_GROUP',   'Grand groupe',  1);
-insert into llx_c_typent (id,code,libelle,active) values (  3, 'TE_MEDIUM',  'PME/PMI',       1);
-insert into llx_c_typent (id,code,libelle,active) values (  4, 'TE_SMALL',   'TPE',           1);
-insert into llx_c_typent (id,code,libelle,active) values (  5, 'TE_ADMIN',   'Administration',1);
-insert into llx_c_typent (id,code,libelle,active) values (  6, 'TE_WHOLE',   'Grossiste',     0);
-insert into llx_c_typent (id,code,libelle,active) values (  7, 'TE_RETAIL',  'Revendeur',     0);
-insert into llx_c_typent (id,code,libelle,active) values (  8, 'TE_PRIVATE', 'Particulier',   1);
-insert into llx_c_typent (id,code,libelle,active) values (100, 'TE_OTHER',   'Autres',        1);
+insert into llx_c_typent (id,code,libelle,fk_country,active) values (  0, 'TE_UNKNOWN', '-',             NULL, 1);
+insert into llx_c_typent (id,code,libelle,fk_country,active) values (  1, 'TE_STARTUP', 'Start-up',      NULL, 0);
+insert into llx_c_typent (id,code,libelle,fk_country,active) values (  2, 'TE_GROUP',   'Grand groupe',  NULL, 1);
+insert into llx_c_typent (id,code,libelle,fk_country,active) values (  3, 'TE_MEDIUM',  'PME/PMI',       NULL, 1);
+insert into llx_c_typent (id,code,libelle,fk_country,active) values (  4, 'TE_SMALL',   'TPE',           NULL, 1);
+insert into llx_c_typent (id,code,libelle,fk_country,active) values (  5, 'TE_ADMIN',   'Administration',NULL, 1);
+insert into llx_c_typent (id,code,libelle,fk_country,active) values (  6, 'TE_WHOLE',   'Grossiste',     NULL, 0);
+insert into llx_c_typent (id,code,libelle,fk_country,active) values (  7, 'TE_RETAIL',  'Revendeur',     NULL, 0);
+insert into llx_c_typent (id,code,libelle,fk_country,active) values (  8, 'TE_PRIVATE', 'Particulier',   NULL, 1);
+insert into llx_c_typent (id,code,libelle,fk_country,active) values (100, 'TE_OTHER',   'Autres',        NULL, 1);
+insert into llx_c_typent (id,code,libelle,fk_country,active) values (231, 'TE_A_RI',    'Responsable Inscripto',    23, 0);
+insert into llx_c_typent (id,code,libelle,fk_country,active) values (232, 'TE_B_RNI',   'Responsable No Inscripto', 23, 0);
+insert into llx_c_typent (id,code,libelle,fk_country,active) values (233, 'TE_C_FE',    'Consumidor Final/Exento',  23, 0);
--- a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql
+++ b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql
@@ -21,10 +21,15 @@

 ALTER TABLE llx_c_paiement ADD COLUMN accountancy_code varchar(32) DEFAULT NULL AFTER active;

-insert into llx_c_action_trigger (rowid,code,label,description,elementtype,rang) values (29,'FICHINTER_CLASSIFY_BILLED','Classify intervention as billed','Executed when a intervention is classified as billed (when option FICHINTER_DISABLE_DETAILS is set)','ficheinter',19);
+-- Defined only to have specific list for countries that can't use generic list (like argentina that need type A or B)
+ALTER TABLE llx_c_typent ADD COLUMN fk_country integer NULL AFTER libelle;
+  
+INSERT INTO llx_c_action_trigger (rowid,code,label,description,elementtype,rang) values (29,'FICHINTER_CLASSIFY_BILLED','Classify intervention as billed','Executed when a intervention is classified as billed (when option FICHINTER_DISABLE_DETAILS is set)','ficheinter',19);

-insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values (11,'AC_INT','system','Intervention on site',NULL, 1, 4);
+INSERT INTO llx_c_actioncomm (id, code, type, libelle, module, active, position) values (11,'AC_INT','system','Intervention on site',NULL, 1, 4);

+
+  
 ALTER TABLE llx_accountingaccount add column entity integer DEFAULT 1 NOT NULL AFTER rowid;
 ALTER TABLE llx_accountingaccount add column datec datetime NOT NULL AFTER entity;
 ALTER TABLE llx_accountingaccount add column tms timestamp AFTER datec;
--- a/htdocs/install/mysql/tables/llx_c_typent.sql
+++ b/htdocs/install/mysql/tables/llx_c_typent.sql
@@ -19,9 +19,10 @@

 create table llx_c_typent
 (
-  id        integer      PRIMARY KEY,
-  code      varchar(12)  NOT NULL,
-  libelle   varchar(30),
-  active    tinyint DEFAULT 1   NOT NULL,
-  module    varchar(32) NULL
+  id         integer      PRIMARY KEY,
+  code       varchar(12)  NOT NULL,
+  libelle    varchar(30),
+  fk_country integer NULL,		-- Defined only to have specific list for countries that can't use generic list (like argentina that need type A or B)
+  active     tinyint DEFAULT 1   NOT NULL,
+  module     varchar(32) NULL
 )ENGINE=innodb;
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -296,7 +296,7 @@ CurrentVersion=Dolibarr current version
 CallUpdatePage=Go to the page that updates the database structure and datas: %s.
 LastStableVersion=Last stable version
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of company type on n characters (see dictionary-company types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of thirdparty type on n characters (see dictionary-thirdparty types).<br>
 GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
 GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany done 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1800,18 +1800,21 @@ function printSearchForm($urlaction,$urlobject,$title,$htmlmodesearch,$htmlinput
    global $conf,$langs;

    $ret='';
-    $ret.='<div class="menu_titre">';
-    $ret.='<a class="vsmenu" href="'.$urlobject.'">';
-    $ret.=$title.'</a><br>';
-    $ret.='</div>';
    $ret.='<form action="'.$urlaction.'" method="post">';
+	$ret.='<label for="'.$htmlinputname.'">';
+	$ret.='<div class="menu_titre">';
+	$ret.='<a class="vsmenu" href="'.$urlobject.'">';
+	$ret.=$title;
+	$ret.='</a><br>';
+	$ret.='</div>';
+	$ret.='</label>';
    $ret.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
    $ret.='<input type="hidden" name="mode" value="search">';
    $ret.='<input type="hidden" name="mode_search" value="'.$htmlmodesearch.'">';
    $ret.='<input type="text" class="flat" ';
    if (! empty($conf->global->MAIN_HTML5_PLACEHOLDER)) $ret.=' placeholder="'.$langs->trans("SearchOf").''.strip_tags($title).'"';
    else $ret.=' title="'.$langs->trans("SearchOf").''.strip_tags($title).'"';
-    $ret.=' name="'.$htmlinputname.'" size="10" />';
+    $ret.=' name="'.$htmlinputname.'" id="'.$htmlinputname.'" size="10" />';
    $ret.='<input type="submit" class="button" value="'.$langs->trans("Go").'">';
    $ret.="</form>\n";
    return $ret;
--- a/htdocs/product/index.php
+++ b/htdocs/product/index.php
@@ -83,17 +83,17 @@ print '<table class="noborder nohover" width="100%">';
 print "<tr class=\"liste_titre\">";
 print '<td colspan="3">'.$langs->trans("Search").'</td></tr>';
 print "<tr ".$bc[false]."><td>";
-print $langs->trans("Ref").':</td><td><input class="flat" type="text" size="14" name="sref"></td>';
+print '<label for="sref">'.$langs->trans("Ref").'</label>:</td><td><input class="flat" type="text" size="14" name="sref" id="sref"></td>';
 print '<td rowspan="'.$rowspan.'"><input type="submit" class="button" value="'.$langs->trans("Search").'"></td></tr>';
 if (! empty($conf->barcode->enabled))
 {
 	print "<tr ".$bc[false]."><td>";
-	print $langs->trans("BarCode").':</td><td><input class="flat" type="text" size="14" name="sbarcode"></td>';
+	print '<label for="barcode">'.$langs->trans("BarCode").'</label>:</td><td><input class="flat" type="text" size="14" name="sbarcode" id="barcode"></td>';
 	//print '<td><input type="submit" class="button" value="'.$langs->trans("Search").'"></td>';
 	print '</tr>';
 }
 print "<tr ".$bc[false]."><td>";
-print $langs->trans("Other").':</td><td><input class="flat" type="text" size="14" name="sall"></td>';
+print '<label for="sall">'.$langs->trans("Other").'</label>:</td><td><input class="flat" type="text" size="14" name="sall" id="sall"></td>';
 //print '<td><input type="submit" class="button" value="'.$langs->trans("Search").'"></td>';
 print '</tr>';
 print "</table></form><br>";
--- a/htdocs/societe/index.php
+++ b/htdocs/societe/index.php
@@ -66,17 +66,17 @@ print '<table class="noborder nohover" width="100%">';
 print '<tr class="liste_titre">';
 print '<td colspan="3">'.$langs->trans("Search").'</td></tr>';
 print "<tr ".$bc[false]."><td>";
-print $langs->trans("Name").':</td><td><input class="flat" type="text" size="14" name="search_nom_only"></td>';
+print '<label for="search_nom_only">'.$langs->trans("Name").'</label>:</td><td><input class="flat" type="text" size="14" name="search_nom_only" id="search_nom_only"></td>';
 print '<td rowspan="'.$rowspan.'"><input type="submit" class="button" value="'.$langs->trans("Search").'"></td></tr>';
 if (! empty($conf->barcode->enabled))
 {
 	print "<tr ".$bc[false]."><td>";
-	print $langs->trans("BarCode").':</td><td><input class="flat" type="text" size="14" name="sbarcode"></td>';
+	print '<label for="sbarcode">'.$langs->trans("BarCode").'</label>:</td><td><input class="flat" type="text" size="14" name="sbarcode" id="sbarcode"></td>';
 	//print '<td><input type="submit" class="button" value="'.$langs->trans("Search").'"></td>';
 	print '</tr>';
 }
 print "<tr ".$bc[false]."><td>";
-print $langs->trans("Other").':</td><td><input class="flat" type="text" size="14" name="search_all"></td>';
+print '<label for="search_all">'.$langs->trans("Other").'</label>:</td><td><input class="flat" type="text" size="14" name="search_all" id="search_all"></td>';
 //print '<td><input type="submit" class="button" value="'.$langs->trans("Search").'"></td>';
 print '</tr>';