Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into

develop

Conflicts:
	htdocs/comm/propal.php

Change-Id: I5639c70165c8e1149f3934248737817a02efff0c

COPYRIGHT

@@ -25,19 +25,21 @@ TCPDF             5.9.180	LGPL-3+						Yes				PDF generation
 JS libraries:
 jQuery                1.8.2		MIT Licence					Yes				JS library
 jQuery UI             1.9.1		GPL and MIT Licence			Yes				JS library plugin UI
-jQuery Timepicker 1.1.0		GPL and MIT Licence			Yes				JS library Timepicker addon for Datepicker
+jQuery blockUI        2.43      GPL and MIT Licence         Yes             JS library plugin blockUI (to use ajax popups)
 jQuery Colorpicker    1.1	    MIT Licence					Yes				JS library for color picker for a defined list of colors
 jQuery DataTables     1.9.4     BSD							Yes				JS library for tables output
-jQuery Flot       0.7		MIT Licence					Yes				JS library to build graph
 jQuery FileUpload     5.0.3		GPL and MIT Licence			Yes				JS library to upload files
+jQuery Flot           0.7		MIT Licence					Yes				JS library to build graph
 jQuery JCrop          0.9.8		GPL and MIT Licence			Yes				JS library plugin Crop (to crop images)
 jQuery jeditable      1.7.1		GPL and MIT Licence			Yes				JS library plugin jeditable (to edit in place)
 jQuery jNotify	      1.1.00	Apache Software License 2.0	Yes				JS library plugin jNotify (to use ajax popups)
-jQuery blockUI    2.43      GPL and MIT Licence         Yes             JS library plugin blockUI (to use ajax popups)
 jQuery jPicker	      1.1.00	GPL and MIT	Licence			Yes				JS library for color picker with not defined list of colors
+jQuery jqueryFileTree 1.0.1	    GPL and MIT	Licence			Yes				JS library for color picker with not defined list of colors
+jQuery jquerytreeview 1.4.1	    MIT	Licence			 		Yes				JS library for color picker with not defined list of colors
 jQuery Layout         1.3.0		GPL and MIT Licence			Yes				JS library plugin Layout (RC-29.15)
-jQuery TableDnD   0.5		GPL and MIT Licence			Yes				JS library plugin TableDnD (to reorder table rows)
 jQuery Mobile	      1.3		GPL and MIT Licence			Yes				JS library for smartphone (not used)
+jQuery TableDnD       0.5		GPL and MIT Licence			Yes				JS library plugin TableDnD (to reorder table rows)
+jQuery Timepicker     1.1.0		GPL and MIT Licence			Yes				JS library Timepicker addon for Datepicker
 jQuery Tiptip         1.3		GPL and MIT Licence			Yes				JS library for tooltips
 JSGantt               1.2		BSD Licence					Yes				JS library (to build Gantt reports)
 

ChangeLog

@@ -83,6 +83,8 @@ WARNING: If you used external modules, some of them may need to be upgraded due
 - Fix: [ bug #816 ] Sales journal does not reflect localtaxes
 - Fix: [ bug #806 ] Margins module with orders2invoice does not respect cost price
 - 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
 
 
 

htdocs/cashdesk/class/Facturation.class.php

@@ -118,7 +118,7 @@ class Facturation
         }
 
         // Define part of HT, VAT, TTC
-        $resultarray=calcul_price_total($this->qte,$this->prix(),$this->remisePercent(),$vat_rate,0,0,0,'HT',$product->type,0);
+        $resultarray=calcul_price_total($this->qte,$this->prix(),$this->remisePercent(),$vat_rate,0,0,0,'HT',0,$product->type,0);
 
         // Calcul du total ht sans remise
         $total_ht = $resultarray[0];

htdocs/comm/propal.php

@@ -2129,13 +2129,14 @@ else
 		}
 
 		print '</div>';
-		print "<br>\n";
 	}
+	print "<br>\n";
 
 	if ($action != 'presend')
 	{
-		print '<table width="100%"><tr><td width="50%" valign="top">';
+		print '<div class="fichecenter"><div class="fichehalfleft">';
-		print '<a name="builddoc"></a>'; // ancre
+		//print '<table width="100%"><tr><td width="50%" valign="top">';
+		//print '<a name="builddoc"></a>'; // ancre
 
 
 		/*
@@ -2157,14 +2158,20 @@ else
 		*/
 		$somethingshown=$object->showLinkedObjectBlock();
 
-		print '</td><td valign="top" width="50%">';
+
+
+		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+		//print '</td><td valign="top" width="50%">';
+
 
 		// List of actions on element
 		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
 		$formactions=new FormActions($db);
 		$somethingshown=$formactions->showactions($object,'propal',$socid);
 
-		print '</td></tr></table>';
+
+		//print '</td></tr></table>';
+		print '</div></div></div>';
 	}
 
 

htdocs/comm/remx.php

@@ -269,7 +269,8 @@ if ($socid > 0)
 	print_fiche_titre($langs->trans("NewGlobalDiscount"),'','');
 	print '<table class="border" width="100%">';
 	print '<tr><td width="38%">'.$langs->trans("AmountHT").'</td>';
-	print '<td><input type="text" size="5" name="amount_ht" value="'.$_POST["amount_ht"].'">&nbsp;'.$langs->trans("Currency".$conf->currency).'</td></tr>';
+	print '<td><input type="text" size="5" name="amount_ht" value="'.$_POST["amount_ht"].'">';
+	print '<span class="hideonsmartphone">&nbsp;'.$langs->trans("Currency".$conf->currency).'</span></td></tr>';
 	print '<tr><td width="38%">'.$langs->trans("VAT").'</td>';
 	print '<td>';
 	print $form->load_tva('tva_tx',GETPOST('tva_tx'),$mysoc,$objsoc);

htdocs/commande/fiche.php

@@ -2435,18 +2435,18 @@ else
 
 				print '</div>';
 			}
-			print '<br>';
 		}
+		print '<br>';
 
 
 		if ($action != 'presend')
 		{
-			print '<table width="100%"><tr><td width="50%" valign="top">';
+			print '<div class="fichecenter"><div class="fichehalfleft">';
-			print '<a name="builddoc"></a>'; // ancre
+			//print '<table width="100%"><tr><td width="50%" valign="top">';
+			//print '<a name="builddoc"></a>'; // ancre
 
 			/*
 			 * Documents generes
-			*
 			 */
 			$comref = dol_sanitizeFileName($object->ref);
 			$file = $conf->commande->dir_output . '/' . $comref . '/' . $comref . '.pdf';
@@ -2464,14 +2464,16 @@ else
 			 */
 			$somethingshown=$object->showLinkedObjectBlock();
 
-			print '</td><td valign="top" width="50%">';
+			print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+			//print '</td><td valign="top" width="50%">';
 
 			// List of actions on element
 			include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
 			$formactions=new FormActions($db);
 			$somethingshown=$formactions->showactions($object,'order',$socid);
 
-			print '</td></tr></table>';
+			//print '</td></tr></table>';
+            print '</div></div></div>';
 		}
 
 

htdocs/compta/bank/account.php

@@ -27,7 +27,7 @@
  *		\brief      List of details of bank transactions for an account
  */
 
-require 'pre.inc.php';	// We use pre.inc.php to have a dynamic menu
+require('../../main.inc.php');
 require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
@@ -35,7 +35,10 @@ require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php'
 require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
+$langs->load("banks");
+$langs->load("categories");
 $langs->load("bills");
 
 $id = (GETPOST('id','int') ? GETPOST('id','int') : GETPOST('account','int'));

htdocs/compta/bank/annuel.php

@@ -23,10 +23,13 @@
  *		\brief       Page reporting mensuel Entrees/Sorties d'un compte bancaire
  */
 
-require 'pre.inc.php';
+require('../../main.inc.php');
 require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
+$langs->load("banks");
+$langs->load("categories");
+
 $id=GETPOST('account');
 $ref=GETPOST('ref');
 

htdocs/compta/bank/bankid_fr.php

@@ -24,11 +24,13 @@
  *  \brief      Fiche creation compte bancaire
  */
 
-require 'pre.inc.php';
+require('../../main.inc.php');
 require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
 $langs->load("banks");
+$langs->load("categories");
 $langs->load("bills");
 
 $action=GETPOST('action');

htdocs/compta/bank/bilan.php

@@ -22,7 +22,11 @@
  *		\brief      Page de bilan
  */
 
-require 'pre.inc.php';
+require('../../main.inc.php');
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+$langs->load("banks");
+$langs->load("categories");
 
 if (!$user->rights->banque->lire)
   accessforbidden();

htdocs/compta/bank/budget.php

@@ -23,8 +23,10 @@
  *		\brief      Page de budget
  */
 
-require 'pre.inc.php';
+require('../../main.inc.php');
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
+$langs->load("banks");
 $langs->load("categories");
 
 // Security check

htdocs/compta/bank/categ.php

@@ -23,7 +23,11 @@
  *      \brief      Page ajout de categories bancaires
  */
 
-require 'pre.inc.php';
+require('../../main.inc.php');
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+$langs->load("banks");
+$langs->load("categories");
 
 if (!$user->rights->banque->configurer)
   accessforbidden();

htdocs/compta/bank/fiche.php

@@ -24,13 +24,15 @@
  *		\brief      Page to create/view a bank account
  */
 
-require 'pre.inc.php';
+require('../../main.inc.php');
 require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formbank.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
 $langs->load("banks");
+$langs->load("categories");
 $langs->load("companies");
 
 $action=GETPOST("action");

htdocs/compta/bank/graph.php

@@ -23,12 +23,13 @@
  *	\brief      Page graph des transactions bancaires
  */
 
-require 'pre.inc.php';
+require('../../main.inc.php');
 require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
 
 $langs->load("banks");
+$langs->load("categories");
 
 $WIDTH=DolGraph::getDefaultGraphSizeForStats('width',768);
 $HEIGHT=DolGraph::getDefaultGraphSizeForStats('height',200);

htdocs/compta/bank/index.php

@@ -23,10 +23,11 @@
  *       \brief      Home page of bank module
  */
 
-require 'pre.inc.php';
+require('../../main.inc.php');
 require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
 $langs->load("banks");
 $langs->load("categories");
@@ -232,20 +233,20 @@ if (! $found) print '<tr '.$bc[$var].'><td colspan="6">'.$langs->trans("None").'
 // Total
 print '<tr class="liste_total"><td colspan="5" class="liste_total">'.$langs->trans("Total").'</td><td align="right" class="liste_total">'.price($total).'</td></tr>';
 
-
-
 print "</table>";
+print "<br>";
 
 
 /*
  * Boutons d'actions
  */
-print "<br><div class=\"tabsAction\">\n";
+
-if ($user->rights->banque->configurer) {
+print '<div class="tabsAction">'."\n";
+if ($user->rights->banque->configurer) 
+{
 	print '<a class="butAction" href="fiche.php?action=create">'.$langs->trans("NewFinancialAccount").'</a>';
-	print '<a class="butAction" href="categ.php">'.$langs->trans("Rubriques").'</a>';
 }
-print "</div>";
+print '</div>';
 
 
 llxFooter();

htdocs/compta/bank/info.php

@@ -21,11 +21,13 @@
  *     \brief      Onglet info d'une ecriture bancaire
  */
 
-require 'pre.inc.php';
+require('../../main.inc.php');
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
 $langs->load("banks");
+$langs->load("categories");
 $langs->load("companies");
 
 

htdocs/compta/bank/ligne.php

@@ -25,13 +25,13 @@
  *	\brief      Page to edit a bank transaction record
  */
 
-require 'pre.inc.php';
+require('../../main.inc.php');
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
 $langs->load("banks");
+$langs->load("categories");
 $langs->load("compta");
 $langs->load("bills");
-$langs->load("categories");
 if (! empty($conf->adherent->enabled)) $langs->load("members");
 
 

htdocs/compta/bank/pre.inc.php

@@ -1,92 +0,0 @@
-<?php
-/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2003      Jean-Louis Bergamo   <jlb@j1b.org>
- * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copytight (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
- *
- * 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/compta/bank/pre.inc.php
- *		\ingroup    compta
- *		\brief  	Fichier gestionnaire du menu compta banque
- */
-
-require_once realpath(dirname(__FILE__)) . '/../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-
-$langs->load("banks");
-$langs->load("categories");
-
-
-/**
- * Replace the default llxHeader function
- *
- * @param 	string 	$head		Optionnal head lines
- * @param 	string 	$title		HTML title
- * @param 	string 	$help_url	Link to online url help to show on left menu
- * @param 	string 	$target		Force target on menu links
- * @param 	int    	$disablejs	More content into html header
- * @param 	int    	$disablehead	More content into html header
- * @param 	array  	$arrayofjs	Array of complementary js files
- * @param 	array  	$arrayofcss	Array of complementary css files
- * @return	none
- */
-function llxHeader($head = '', $title='', $help_url='', $target='', $disablejs=0, $disablehead=0, $arrayofjs='', $arrayofcss='')
-{
-	global $db, $user, $conf, $langs;
-
-	top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);	// Show html headers
-	top_menu($head, $title, $target, $disablejs, $disablehead, $arrayofjs, $arrayofcss);	// Show html headers
-
-	require_once DOL_DOCUMENT_ROOT.'/core/class/menu.class.php';
-	$menu = new Menu();
-
-	// Entry for each bank account
-	if ($user->rights->banque->lire)
-	{
-		$sql = "SELECT rowid, label, courant, rappro, courant";
-		$sql.= " FROM ".MAIN_DB_PREFIX."bank_account";
-		$sql.= " WHERE entity = ".$conf->entity;
-		$sql.= " AND clos = 0";
-        $sql.= " ORDER BY label";
-
-		$resql = $db->query($sql);
-		if ($resql)
-		{
-			$numr = $db->num_rows($resql);
-			$i = 0;
-
-			if ($numr > 0) 	$menu->add('/compta/bank/index.php',$langs->trans("BankAccounts"),0,$user->rights->banque->lire);
-
-			while ($i < $numr)
-			{
-				$objp = $db->fetch_object($resql);
-				$menu->add('/compta/bank/fiche.php?id='.$objp->rowid,$objp->label,1,$user->rights->banque->lire);
-                if ($objp->rappro && $objp->courant != 2 && empty($objp->clos))  // If not cash account and not closed and can be reconciliate
-                {
-				    $menu->add('/compta/bank/rappro.php?account='.$objp->rowid,$langs->trans("Conciliate"),2,$user->rights->banque->consolidate);
-                }
-				$i++;
-			}
-		}
-		else dol_print_error($db);
-		$db->free($resql);
-	}
-
-	left_menu('', $help_url, '', $menu->liste, 1);
-    main_area();
-}
-?>

htdocs/compta/bank/rappro.php

@@ -23,7 +23,7 @@
  *       \brief      Page to reconciliate bank transactions
  */
 
-require 'pre.inc.php';
+require('../../main.inc.php');
 require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
@@ -31,8 +31,10 @@ require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php'
 require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
 $langs->load("banks");
+$langs->load("categories");
 $langs->load("bills");
 
 if (! $user->rights->banque->consolidate) accessforbidden();

htdocs/compta/bank/releve.php

@@ -23,15 +23,16 @@
  *		\brief      Page d'affichage d'un releve
  */
 
-require 'pre.inc.php';
+require('../../main.inc.php');
 require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
-$action=GETPOST('action', 'alpha');
-
-$langs->load("companies");
 $langs->load("banks");
+$langs->load("categories");
+$langs->load("companies");
 $langs->load("bills");
 
+$action=GETPOST('action', 'alpha');
 $id=GETPOST('account');
 $ref=GETPOST('ref');
 $dvid=GETPOST('dvid');

htdocs/compta/bank/search.php

@@ -24,12 +24,15 @@
  *	\brief      List of bank transactions
  */
 
-require 'pre.inc.php';
+require('../../main.inc.php');
 require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/bankcateg.class.php';
 
+$langs->load("banks");
+$langs->load("categories");
+
 // Security check
 if ($user->societe_id) $socid=$user->societe_id;
 $result=restrictedArea($user,'banque');
@@ -134,9 +137,9 @@ if ($resql)
 
 	// Title
 	$bankcateg=new BankCateg($db);
-	if (! empty($_REQUEST["bid"]))
+	if (GETPOST("bid"))
 	{
-		$result=$bankcateg->fetch($_REQUEST["bid"]);
+		$result=$bankcateg->fetch(GETPOST("bid"));
 		print_barre_liste($langs->trans("BankTransactionForCategory",$bankcateg->label).' '.($socid?' '.$soc->nom:''), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num);
 	}
 	else

htdocs/compta/bank/treso.php

@@ -23,14 +23,16 @@
  *	\brief      Page de detail du budget de tresorerie
  */
 
-require 'pre.inc.php';
+require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
 $langs->load("banks");
+$langs->load("categories");
 $langs->load("bills");
 
 // Security check

htdocs/compta/bank/virement.php

@@ -24,10 +24,12 @@
  *		\brief      Page de saisie d'un virement
  */
 
-require 'pre.inc.php';
+require('../../main.inc.php');
 require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
 $langs->load("banks");
+$langs->load("categories");
 
 if (! $user->rights->banque->transfer)
   accessforbidden();
@@ -36,8 +38,9 @@ $action = GETPOST('action','alpha');
 
 
 /*
- * Action ajout d'un virement
+ * Actions
  */
+
 if ($action == 'add')
 {
 	$langs->load("errors");

htdocs/compta/facture.php

@@ -3440,12 +3440,13 @@ else if ($id > 0 || ! empty($ref))
                 print '</div>';
             }
         }
-
+        print '<br>';
 
         if ($action != 'prerelance' && $action != 'presend')
         {
-            print '<table width="100%"><tr><td width="50%" valign="top">';
+			print '<div class="fichecenter"><div class="fichehalfleft">';
-            print '<a name="builddoc"></a>'; // ancre
+        	//print '<table width="100%"><tr><td width="50%" valign="top">';
+            //print '<a name="builddoc"></a>'; // ancre
 
             /*
              * Documents generes
@@ -3456,7 +3457,6 @@ else if ($id > 0 || ! empty($ref))
             $genallowed=$user->rights->facture->creer;
             $delallowed=$user->rights->facture->supprimer;
 
-            print '<br>';
             print $formfile->showdocuments('facture',$filename,$filedir,$urlsource,$genallowed,$delallowed,$object->modelpdf,1,0,0,28,0,'','','',$soc->default_lang);
             $somethingshown=$formfile->numoffiles;
 
@@ -3472,16 +3472,16 @@ else if ($id > 0 || ! empty($ref))
                 print showPaypalPaymentUrl('invoice',$object->ref);
             }
 
-            print '</td><td valign="top" width="50%">';
+			print '</div><div class="fichehalfright"><div class="ficheaddleft">';
-
+            //print '</td><td valign="top" width="50%">';
-            print '<br>';
 
             // List of actions on element
             include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
             $formactions=new FormActions($db);
             $somethingshown=$formactions->showactions($object,'invoice',$socid);
 
-            print '</td></tr></table>';
+            //print '</td></tr></table>';
+            print '</div></div></div>';
         }
         else
         {

htdocs/compta/paiement/cheque/fiche.php

@@ -24,14 +24,15 @@
  *	\brief      Page for cheque deposits
  */
 
-require 'pre.inc.php';	// We use pre.inc.php to have a dynamic menu
+require('../../../main.inc.php');
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/class/remisecheque.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
+$langs->load("banks");
+$langs->load("categories");
 $langs->load('bills');
-$langs->load('banks');
 $langs->load('companies');
 $langs->load('compta');
 

htdocs/compta/paiement/cheque/index.php

@@ -23,11 +23,12 @@
  *		\brief      Home page for cheque receipts
  */
 
-require 'pre.inc.php';
+require('../../../main.inc.php');
 require_once DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/class/remisecheque.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
 $langs->load("banks");
+$langs->load("categories");
 
 // Security check
 if ($user->societe_id) $socid=$user->societe_id;

htdocs/compta/paiement/cheque/liste.php

@@ -23,10 +23,12 @@
  *   \brief      Page liste des bordereau de remise de cheque
  */
 
-require 'pre.inc.php';
+require('../../../main.inc.php');
 require_once DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/class/remisecheque.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
+$langs->load("banks");
+$langs->load("categories");
 $langs->load("bills");
 
 // Security check

htdocs/compta/paiement/cheque/pre.inc.php

@@ -1,92 +0,0 @@
-<?php
-/* Copyright (C) 2006      Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copytight (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
- *
- * 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/compta/paiement/cheque/pre.inc.php
- *		\ingroup    compta
- *		\brief  	Fichier gestionnaire du menu cheques
- */
-
-require_once realpath(dirname(__FILE__)) . '/../../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-
-$langs->load("banks");
-$langs->load("categories");
-
-
-/**
- * Replace the default llxHeader function
- *
- * @param 	string 	$head		Optionnal head lines
- * @param 	string 	$title		HTML title
- * @param 	string 	$help_url	Link to online url help to show on left menu
- * @param 	string 	$target		Force target on menu links
- * @param 	int    	$disablejs	More content into html header
- * @param 	int    	$disablehead	More content into html header
- * @param 	array  	$arrayofjs	Array of complementary js files
- * @param 	array  	$arrayofcss	Array of complementary css files
- * @return	none
- */
-function llxHeader($head = '', $title='', $help_url='', $target='', $disablejs=0, $disablehead=0, $arrayofjs='', $arrayofcss='')
-{
-	global $db, $user, $conf, $langs;
-
-	top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);	// Show html headers
-	top_menu($head, $title, $target, $disablejs, $disablehead, $arrayofjs, $arrayofcss);	// Show html headers
-
-	require_once DOL_DOCUMENT_ROOT.'/core/class/menu.class.php';
-	$menu = new Menu();
-
-	// Entry for each bank account
-	if ($user->rights->banque->lire)
-	{
-		$sql = "SELECT rowid, label, courant, rappro, courant";
-		$sql.= " FROM ".MAIN_DB_PREFIX."bank_account";
-		$sql.= " WHERE entity = ".$conf->entity;
-		$sql.= " AND clos = 0";
-        $sql.= " ORDER BY label";
-
-		$resql = $db->query($sql);
-		if ($resql)
-		{
-			$numr = $db->num_rows($resql);
-			$i = 0;
-
-			if ($numr > 0) 	$menu->add('/compta/bank/index.php',$langs->trans("BankAccounts"),0,$user->rights->banque->lire);
-
-			while ($i < $numr)
-			{
-				$objp = $db->fetch_object($resql);
-				$menu->add('/compta/bank/fiche.php?id='.$objp->rowid,$objp->label,1,$user->rights->banque->lire);
-                if ($objp->rappro && $objp->courant != 2)  // If not cash account and can be reconciliate
-                {
-				    $menu->add('/compta/bank/rappro.php?account='.$objp->rowid,$langs->trans("Conciliate"),2,$user->rights->banque->consolidate);
-                }
-				$i++;
-			}
-		}
-		else dol_print_error($db);
-		$db->free($resql);
-	}
-
-	left_menu('', $help_url, '', $menu->liste, 1);
-    main_area();
-}
-
-?>

htdocs/compta/prelevement/bon.php

@@ -23,11 +23,14 @@
  *      \brief      Fiche apercu du bon de prelevement
  */
 
-require '../bank/pre.inc.php';
+require('../../main.inc.php');
 require_once DOL_DOCUMENT_ROOT.'/core/lib/prelevement.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
+$langs->load("banks");
+$langs->load("categories");
 $langs->load("bills");
 $langs->load("categories");
 

htdocs/compta/prelevement/bons.php

@@ -24,11 +24,13 @@
  * 	\brief      Page liste des bons de prelevements
  */
 
-require '../bank/pre.inc.php';
+require('../../../main.inc.php');
 require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
-$langs->load("widthdrawals");
+$langs->load("banks");
 $langs->load("categories");
+$langs->load("widthdrawals");
 
 // Security check
 $socid = GETPOST('socid','int');

htdocs/compta/prelevement/create.php

@@ -24,16 +24,18 @@
  *	\brief      Prelevement creation page
  */
 
-require '../bank/pre.inc.php';
+require('../../../main.inc.php');
 require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/prelevement.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
+$langs->load("banks");
+$langs->load("categories");
 $langs->load("widthdrawals");
 $langs->load("companies");
-$langs->load("banks");
 $langs->load("bills");
 
 // Security check

htdocs/compta/prelevement/demandes.php

@@ -24,14 +24,16 @@
  *  \brief      Page to list withdraw requests
  */
 
-require '../bank/pre.inc.php';
+require('../../../main.inc.php');
 require_once DOL_DOCUMENT_ROOT.'/core/modules/modPrelevement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
+$langs->load("banks");
+$langs->load("categories");
 $langs->load("widthdrawals");
 $langs->load("companies");
-$langs->load("categories");
 
 // Security check
 $socid = GETPOST('socid','int');

htdocs/compta/prelevement/factures.php

@@ -24,14 +24,16 @@
  *     \brief      Page liste des factures prelevees
  */
 
-require '../bank/pre.inc.php';
+require('../../../main.inc.php');
 require_once DOL_DOCUMENT_ROOT.'/core/lib/prelevement.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/rejetprelevement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
-$langs->load("companies");
+$langs->load("banks");
 $langs->load("categories");
+$langs->load("companies");
 $langs->load('withdrawals');
 
 // Securite acces client

htdocs/compta/prelevement/fiche-rejet.php

@@ -24,12 +24,14 @@
  *		\brief      Withdraw reject
  */
 
-require '../bank/pre.inc.php';
+require('../../../main.inc.php');
 require_once DOL_DOCUMENT_ROOT.'/core/lib/prelevement.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/rejetprelevement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
+$langs->load("banks");
 $langs->load("categories");
 $langs->load('withdrawals');
 

htdocs/compta/prelevement/fiche-stat.php

@@ -23,17 +23,19 @@
  *	\brief      Prelevement statistics
  */
 
-require '../bank/pre.inc.php';
+require('../../../main.inc.php');
 require_once DOL_DOCUMENT_ROOT.'/core/lib/prelevement.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/ligneprelevement.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+$langs->load("banks");
+$langs->load("categories");
+$langs->load("withdrawals");
 
 // Security check
 if ($user->societe_id > 0) accessforbidden();
 
-$langs->load("withdrawals");
-$langs->load("categories");
-
 // Get supervariables
 $prev_id = GETPOST('id','int');
 $page = GETPOST('page','int');

htdocs/compta/prelevement/fiche.php

@@ -23,16 +23,19 @@
  *	\brief      Fiche prelevement
  */
 
-require '../bank/pre.inc.php';
+require('../../../main.inc.php');
 require_once DOL_DOCUMENT_ROOT.'/core/lib/prelevement.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+$langs->load("banks");
+$langs->load("categories");
 
 if (!$user->rights->prelevement->bons->lire)
 accessforbidden();
 
 $langs->load("bills");
 $langs->load("withdrawals");
-$langs->load("categories");
 
 
 // Security check

htdocs/compta/prelevement/index.php

@@ -24,14 +24,16 @@
  *	\brief      Prelevement index page
  */
 
-require '../bank/pre.inc.php';
+require('../../../main.inc.php');
 require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/prelevement.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
-$langs->load("withdrawals");
+$langs->load("banks");
 $langs->load("categories");
+$langs->load("withdrawals");
 
 // Security check
 $socid = GETPOST('socid','int');

htdocs/compta/prelevement/ligne.php

@@ -24,18 +24,21 @@
  *	\brief      card of withdraw line
  */
 
-require '../bank/pre.inc.php';
+require('../../../main.inc.php');
 require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/ligneprelevement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/rejetprelevement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+$langs->load("banks");
+$langs->load("categories");
 
 // Security check
 if ($user->societe_id > 0) accessforbidden();
 
 $langs->load("bills");
 $langs->load("withdrawals");
-$langs->load("categories");
 
 // Get supervariables
 $action = GETPOST('action','alpha');

htdocs/compta/prelevement/lignes.php

@@ -24,17 +24,20 @@
  *	\brief      Prelevement lines
  */
 
-require '../bank/pre.inc.php';
+require('../../../main.inc.php');
 require_once DOL_DOCUMENT_ROOT.'/core/lib/prelevement.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/ligneprelevement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/rejetprelevement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+$langs->load("banks");
+$langs->load("categories");
 
 // Security check
 if ($user->societe_id > 0) accessforbidden();
 
-$langs->load("categories");
 $langs->load('withdrawals');
 
 // Get supervariables

htdocs/compta/prelevement/liste.php

@@ -23,10 +23,12 @@
  *      \ingroup    prelevement
  *      \brief      Page liste des prelevements
  */
-require '../bank/pre.inc.php';
+require('../../../main.inc.php');
 require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/ligneprelevement.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
+$langs->load("banks");
 $langs->load("withdrawals");
 $langs->load("companies");
 $langs->load("categories");

htdocs/compta/prelevement/rejets.php

@@ -24,13 +24,15 @@
  *      \brief      Reject page
  */
 
-require '../bank/pre.inc.php';
+require('../../../main.inc.php');
 require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/rejetprelevement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
+$langs->load("banks");
+$langs->load("categories");
 $langs->load("withdrawals");
 $langs->load("companies");
-$langs->load("categories");
 
 // Security check
 $socid = GETPOST('socid','int');

htdocs/compta/prelevement/stats.php

@@ -24,12 +24,14 @@
  *      \brief      Page de stats des prelevements
  */
 
-require '../bank/pre.inc.php';
+require('../../../main.inc.php');
 require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/ligneprelevement.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
+$langs->load("banks");
+$langs->load("categories");
 $langs->load("withdrawals");
 $langs->load("companies");
-$langs->load("categories");
 
 // Security check
 $socid = GETPOST('socid','int');

htdocs/compta/sociales/charges.php

@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2005-2013 Regis Houssin        <regis.houssin@capnetworks.com>
  *
  * 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

htdocs/compta/sociales/class/chargesociales.class.php

@@ -115,6 +115,8 @@ class ChargeSociales extends CommonObject
      */
     function create($user)
     {
+    	global $conf;
+
         // Nettoyage parametres
         $newamount=price2num($this->amount,'MT');
 
@@ -127,10 +129,11 @@ class ChargeSociales extends CommonObject
 
         $this->db->begin();
 
-        $sql = "INSERT INTO ".MAIN_DB_PREFIX."chargesociales (fk_type, libelle, date_ech, periode, amount)";
+        $sql = "INSERT INTO ".MAIN_DB_PREFIX."chargesociales (fk_type, libelle, date_ech, periode, amount, entity)";
         $sql.= " VALUES (".$this->type.",'".$this->db->escape($this->lib)."',";
         $sql.= " '".$this->db->idate($this->date_ech)."','".$this->db->idate($this->periode)."',";
-        $sql.= " ".price2num($newamount);
+        $sql.= " '".price2num($newamount)."',";
+        $sql.= " ".$conf->entity;
         $sql.= ")";
 
         dol_syslog(get_class($this)."::create sql=".$sql);

htdocs/compta/tva/class/tva.class.php

@@ -500,13 +500,13 @@ class Tva extends CommonObject
         $sql = "INSERT INTO ".MAIN_DB_PREFIX."tva (datep, datev, amount";
         if ($this->note)  $sql.=", note";
         if ($this->label) $sql.=", label";
-        $sql.= ", fk_user_creat, fk_bank";
+        $sql.= ", fk_user_creat, fk_bank, entity";
 		$sql.= ") ";
         $sql.= " VALUES ('".$this->db->idate($this->datep)."',";
         $sql.= "'".$this->db->idate($this->datev)."'," . $this->amount;
         if ($this->note)  $sql.=", '".$this->db->escape($this->note)."'";
         if ($this->label) $sql.=", '".$this->db->escape($this->label)."'";
-        $sql.=", '".$user->id."', NULL";
+        $sql.=", '".$user->id."', NULL, ".$conf->entity;
         $sql.= ")";
 
 		dol_syslog("Tva::addPayment sql=".$sql);

htdocs/compta/tva/fiche.php

@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2005-2013 Regis Houssin        <regis.houssin@capnetworks.com>
  *
  * 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

htdocs/core/class/commonobject.class.php

@@ -2702,31 +2702,47 @@ abstract class CommonObject
 		global $conf,$langs,$hookmanager;
 
 		print '<tr class="liste_titre nodrag nodrop">';
-		if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER))
+
-		{
+		if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) print '<td align="center" width="5">&nbsp;</td>';
-			print '<td align="center" width="5">&nbsp;</td>';
+
-		}
+		// Description
 		print '<td>'.$langs->trans('Description').'</td>';
+
+		// VAT
 		print '<td align="right" width="50">'.$langs->trans('VAT').'</td>';
+
+		// Price HT
 		print '<td align="right" width="80">'.$langs->trans('PriceUHT').'</td>';
-		if ($conf->global->MAIN_FEATURES_LEVEL > 1)
+
-			print '<td align="right" width="80">&nbsp;</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>';
+
+		// Reduction short
 		print '<td align="right" width="50">'.$langs->trans('ReductionShort').'</td>';
+
 		if (! empty($conf->margin->enabled)) {
 			if ($conf->global->MARGIN_TYPE == "1")
 				print '<td align="right" width="80">'.$langs->trans('BuyingPrice').'</td>';
 			else
 				print '<td align="right" width="80">'.$langs->trans('CostPrice').'</td>';
+
 			if (! empty($conf->global->DISPLAY_MARGIN_RATES))
 				print '<td align="right" width="50">'.$langs->trans('MarginRate').'</td>';
 			if (! empty($conf->global->DISPLAY_MARK_RATES))
 				print '<td align="right" width="50">'.$langs->trans('MarkRate').'</td>';
 		}
+
+		// Total HT
 		print '<td align="right" width="50">'.$langs->trans('TotalHTShort').'</td>';
-		print '<td width="10">&nbsp;</td>';
+
-		print '<td width="10">&nbsp;</td>';
+		print '<td width="10"></td>';
-		print '<td nowrap="nowrap">&nbsp;</td>'; // No width to allow autodim
+
+		print '<td width="10"></td>';
+
+		print '<td nowrap="nowrap"></td>'; // No width to allow autodim
+
 		print "</tr>\n";
 
 		$num = count($this->lines);

htdocs/core/class/extrafields.class.php

@@ -627,6 +627,10 @@ class ExtraFields
         	$formstat = new Form($db);
         	
         	$showtime = in_array($type,array('datetime')) ? 1 : 0;
+        	// Do not show current date when field not required (see select_date() method)
+        	if(!$required && $value == '')
+        		$value = '-1';
+        	
         	$out = $formstat->select_date($value, 'options_'.$key, $showtime, $showtime, $required, '', 1, 1, 1, 0, 1);
         	//$out='<input type="text" name="options_'.$key.'" size="'.$showsize.'" maxlength="'.$newsize.'" value="'.$value.'"'.($moreparam?$moreparam:'').'>';
         }

htdocs/core/lib/functions.lib.php

@@ -1188,6 +1188,9 @@ function dol_print_phone($phone,$country='',$cid=0,$socid=0,$addlink='',$separ="
 	if (empty($phone)) { return ''; }
 	if (empty($country)) $country=$mysoc->country_code;
 
+	// Short format for small screens
+	if ($conf->dol_optimize_smallscreen) $separ='';
+
 	$newphone=$phone;
 	if (strtoupper($country) == "FR")
 	{
@@ -1213,9 +1216,14 @@ function dol_print_phone($phone,$country='',$cid=0,$socid=0,$addlink='',$separ="
 		}
 	}
 
-	if (! empty($addlink))
+	if (! empty($addlink))	// Link on phone number + link to add action (if conf->global->AGENDA_ADDACTIONFORPHONE set)
 	{
-		if (! empty($conf->clicktodial->enabled) && $addlink == 'AC_TEL')
+		if (! empty($conf->browser))	// If phone, we use link of phone
+		{
+			$newphone ='<a href="tel:'.$phone.'"';
+			$newphone.='>'.$phone.'</a>';
+		}
+		else if (! empty($conf->clicktodial->enabled) && $addlink == 'AC_TEL')		// If click to dial, we use click to dial url
 		{
 			if (empty($user->clicktodial_loaded)) $user->fetch_clicktodial();
 

htdocs/core/lib/project.lib.php

@@ -438,7 +438,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 				// Tick to drag and drop
 				if ($addordertick)
 				{
-					print '<td align="center" class="tdlineupdown">&nbsp;</td>';
+					print '<td align="center" class="tdlineupdown hideonsmartphone">&nbsp;</td>';
 				}
 
 				print "</tr>\n";
@@ -459,13 +459,16 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 
 	if ($total>0)
 	{
-		print '<tr class="liste_total"><td class="liste_total">'.$langs->trans("Total").'</td>';
+		print '<tr class="liste_total">';
+		print '<td class="liste_total">'.$langs->trans("Total").'</td>';
 		if ($showproject) print '<td></td>';
 		print '<td></td>';
 		print '<td></td>';
 		print '<td></td>';
 		print '<td></td>';
-		print '<td align="right" nowrap="nowrap" class="liste_total">'.convertSecondToTime($total).'</td></tr>';
+		if ($addordertick) print '<td class="hideonsmartphone"></td>';
+		print '<td align="right" nowrap="nowrap" class="liste_total">'.convertSecondToTime($total).'</td>';
+		print '</tr>';
 	}
 
 	return $inc;

htdocs/core/menus/standard/auguria.lib.php

@@ -234,13 +234,62 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabM
 		}
 	}
 
-	/**
+	// We update newmenu with entries found into database
-	 * We update newmenu with entries found into database
-	 * --------------------------------------------------
-	 */
 	$menuArbo = new Menubase($db,'auguria');
 	$newmenu = $menuArbo->menuLeftCharger($newmenu,$mainmenu,$leftmenu,($user->societe_id?1:0),'auguria',$tabMenu);
 
+	// We update newmenu for special dynamic menus
+	if ($conf->banque->enabled && $user->rights->banque->lire && $mainmenu == 'bank')	// Entry for each bank account
+	{
+		$sql = "SELECT rowid, label, courant, rappro, courant";
+		$sql.= " FROM ".MAIN_DB_PREFIX."bank_account";
+		$sql.= " WHERE entity = ".$conf->entity;
+		$sql.= " AND clos = 0";
+		$sql.= " ORDER BY label";
+	
+		$resql = $db->query($sql);
+		if ($resql)
+		{
+			$numr = $db->num_rows($resql);
+			$i = 0;
+	
+			if ($numr > 0) 	$newmenu->add('/compta/bank/index.php',$langs->trans("BankAccounts"),0,$user->rights->banque->lire);
+	
+			while ($i < $numr)
+			{
+				$objp = $db->fetch_object($resql);
+				$newmenu->add('/compta/bank/fiche.php?id='.$objp->rowid,$objp->label,1,$user->rights->banque->lire);
+				if ($objp->rappro && $objp->courant != 2 && empty($objp->clos))  // If not cash account and not closed and can be reconciliate
+				{
+					$newmenu->add('/compta/bank/rappro.php?account='.$objp->rowid,$langs->trans("Conciliate"),2,$user->rights->banque->consolidate);
+				}
+				$i++;
+			}
+		}
+		else dol_print_error($db);
+		$db->free($resql);
+	}
+
+	if ($conf->ftp->enabled && $mainmenu == 'ftp')	// Entry for FTP
+	{
+		$MAXFTP=20;
+		$i=1;
+		while ($i <= $MAXFTP)
+		{
+			$paramkey='FTP_NAME_'.$i;
+			//print $paramkey;
+			if (! empty($conf->global->$paramkey))
+			{
+				$link="/ftp/index.php?idmenu=".$_SESSION["idmenu"]."&numero_ftp=".$i;
+		
+				$newmenu->add($link, dol_trunc($conf->global->$paramkey,24));
+			}
+			$i++;
+		}
+	}	
+
+	
+	// Build final $menu_array = $menu_array_before +$newmenu->liste + $menu_array_after
 	//var_dump($menu_array_before);exit;
 	//var_dump($menu_array_after);exit;
 	$menu_array=$newmenu->liste;

htdocs/core/menus/standard/auguria_menu.php

@@ -205,12 +205,12 @@ class MenuManager
         			$canonnexturl=preg_replace('/\?.*$/','',$nexturl);
         			//var_dump($canonrelurl);
         			//var_dump($canonnexturl);
-        			print '<ul>';
+        			print '<ul>'."\n";
         		    if ($canonrelurl != $canonnexturl && ! in_array($val['mainmenu'],array('home','tools'))
         				|| strpos($canonrelurl,'/product/index.php') || strpos($canonrelurl,'/compta/bank/index.php'))
 					{
         				// We add sub entry
-        				print '<li data-role="list-divider"><a href="'.$relurl.'">'.$langs->trans(ucfirst($val['mainmenu'])."Dashboard").'</a></li>'."\n";
+        				print str_pad('',1).'<li data-role="list-divider" class="lilevel1"><a href="'.$relurl.'">'.$langs->trans(ucfirst($val['mainmenu'])."Dashboard").'</a></li>'."\n";
         			}
         			foreach($submenu->liste as $key2 => $val2)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
         			{
@@ -220,8 +220,9 @@ class MenuManager
         				$canonurl2=preg_replace('/\?.*$/','',$val2['url']);
         				//var_dump($val2['url'].' - '.$canonurl2.' - '.$val2['level']);
         				if (in_array($canonurl2,array('/admin/index.php','/admin/tools/index.php','/core/tools.php'))) $relurl2='';
-        				print '<li'.($val2['level']==0?' data-role="list-divider"':'').'>';
+        				print str_pad('',$val2['level']+1).'<li'.($val2['level']==0?' data-role="list-divider"':'').' class="lilevel'.($val2['level']+1).'">';
         				if ($relurl2) print '<a href="'.$relurl2.'">';
+        				print str_pad('',($val2['level']+1)*12,'&nbsp;');
         				print $val2['titre'];
         				if ($relurl2) print '</a>';
         				print '</li>'."\n";

htdocs/core/menus/standard/eldy.lib.php

@@ -1161,9 +1161,60 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 		// Add personalized menus and modules menus
 		$menuArbo = new Menubase($db,'eldy');
 		$newmenu = $menuArbo->menuLeftCharger($newmenu,$mainmenu,$leftmenu,(empty($user->societe_id)?0:1),'eldy',$tabMenu);
+
+		// We update newmenu for special dynamic menus
+		if ($user->rights->banque->lire && $mainmenu == 'bank')	// Entry for each bank account
+		{
+			$sql = "SELECT rowid, label, courant, rappro, courant";
+			$sql.= " FROM ".MAIN_DB_PREFIX."bank_account";
+			$sql.= " WHERE entity = ".$conf->entity;
+			$sql.= " AND clos = 0";
+			$sql.= " ORDER BY label";
+		
+			$resql = $db->query($sql);
+			if ($resql)
+			{
+				$numr = $db->num_rows($resql);
+				$i = 0;
+		
+				if ($numr > 0) 	$newmenu->add('/compta/bank/index.php',$langs->trans("BankAccounts"),0,$user->rights->banque->lire);
+		
+				while ($i < $numr)
+				{
+					$objp = $db->fetch_object($resql);
+					$newmenu->add('/compta/bank/fiche.php?id='.$objp->rowid,$objp->label,1,$user->rights->banque->lire);
+					if ($objp->rappro && $objp->courant != 2 && empty($objp->clos))  // If not cash account and not closed and can be reconciliate
+					{
+						$newmenu->add('/compta/bank/rappro.php?account='.$objp->rowid,$langs->trans("Conciliate"),2,$user->rights->banque->consolidate);
+					}
+					$i++;
+				}
+			}
+			else dol_print_error($db);
+			$db->free($resql);
+		}
+		if ($conf->ftp->enabled && $mainmenu == 'ftp')	// Entry for FTP
+		{
+			$MAXFTP=20;
+			$i=1;
+			while ($i <= $MAXFTP)
+			{
+				$paramkey='FTP_NAME_'.$i;
+				//print $paramkey;
+				if (! empty($conf->global->$paramkey))
+				{
+					$link="/ftp/index.php?idmenu=".$_SESSION["idmenu"]."&numero_ftp=".$i;
+		
+					$newmenu->add($link, dol_trunc($conf->global->$paramkey,24));
+				}
+				$i++;
+			}
+		}		
+	
 	}
 	
 	
+	// Build final $menu_array = $menu_array_before +$newmenu->liste + $menu_array_after
 	//var_dump($menu_array_before);exit;
 	//var_dump($menu_array_after);exit;
 	$menu_array=$newmenu->liste;

htdocs/core/menus/standard/eldy_menu.php

@@ -159,12 +159,12 @@ class MenuManager
         			$canonnexturl=preg_replace('/\?.*$/','',$nexturl);
         			//var_dump($canonrelurl);
         			//var_dump($canonnexturl);
-        			print '<ul>';
+        			print '<ul>'."\n";
         			if ($canonrelurl != $canonnexturl && ! in_array($val['mainmenu'],array('home','tools'))
         				|| strpos($canonrelurl,'/product/index.php') || strpos($canonrelurl,'/compta/bank/index.php'))
 					{
         				// We add sub entry
-        				print '<li data-role="list-divider"><a href="'.$relurl.'">'.$langs->trans(ucfirst($val['mainmenu'])."Dashboard").'</a></li>'."\n";
+        				print str_pad('',1).'<li data-role="list-divider" class="lilevel1"><a href="'.$relurl.'">'.$langs->trans(ucfirst($val['mainmenu'])."Dashboard").'</a></li>'."\n";
         			}
        				foreach($submenu->liste as $key2 => $val2)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
        				{
@@ -174,8 +174,9 @@ class MenuManager
         				$canonurl2=preg_replace('/\?.*$/','',$val2['url']);
         				//var_dump($val2['url'].' - '.$canonurl2.' - '.$val2['level']);
         				if (in_array($canonurl2,array('/admin/index.php','/admin/tools/index.php','/core/tools.php'))) $relurl2='';
-        				print '<li'.($val2['level']==0?' data-role="list-divider"':'').'>';
+        				print str_pad('',$val2['level']+1).'<li'.($val2['level']==0?' data-role="list-divider"':'').' class="lilevel'.($val2['level']+1).'">';
         				if ($relurl2) print '<a href="'.$relurl2.'">';
+        				print str_pad('',($val2['level']+1)*12,'&nbsp;');
         				print $val2['titre'];
         				if ($relurl2) print '</a>';
         				print '</li>'."\n";

htdocs/core/modules/modMargin.class.php

@@ -102,7 +102,7 @@ class modMargin extends DolibarrModules
     			'type'=>'left',			// This is a Top menu entry
     			'titre'=>'Margins',
     			'mainmenu'=>'accountancy',
-    			'leftmenu'=>'margins',		// Use 1 if you also want to add left menu entries using this descriptor. Use 0 if left menu entries are defined in a file pre.inc.php (old school).
+    			'leftmenu'=>'margins',
     			'url'=>'/margin/index.php',
     			'langs'=>'margins',	// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
     			'position'=>100,

htdocs/core/tpl/objectline_view.tpl.php

@@ -152,7 +152,7 @@
 		</a>
 	</td>
 
-	<?php if ($num > 1) { ?>
+	<?php if ($num > 1 && empty($conf->browser->phone)) { ?>
 	<td align="center" class="tdlineupdown">
 		<?php if ($i > 0) { ?>
 		<a class="lineupdown" href="<?php echo $_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=up&amp;rowid='.$line->id; ?>">
@@ -166,10 +166,10 @@
 		<?php } ?>
 	</td>
     <?php } else { ?>
-    <td align="center" class="tdlineupdown">&nbsp;</td>
+    <td align="center"<?php echo (empty($conf->browser->phone)?' class="tdlineupdown"':''); ?>></td>
 	<?php } ?>
 <?php } else { ?>
-	<td colspan="3">&nbsp;</td>
+	<td colspan="3"></td>
 <?php } ?>
 
 </tr>

htdocs/document.php

@@ -40,11 +40,17 @@ if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML','1');
 if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
 
 /**
- * Wrapper, donc header vierge
+ * Header empty
  *
- * @return  null
+ * @return	void
  */
 function llxHeader() { }
+/**
+ * Footer empty
+ *
+ * @return	void
+ */
+function llxFooter() { }
 
 require 'main.inc.php';	// Load $user and permissions
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';

htdocs/fichinter/fiche.php

@@ -1442,7 +1442,9 @@ else if ($id > 0 || ! empty($ref))
 
     if ($action != 'presend')
     {
-        print '<table width="100%"><tr><td width="50%" valign="top">';
+		print '<div class="fichecenter"><div class="fichehalfleft">';
+    	//print '<table width="100%"><tr><td width="50%" valign="top">';
+
         /*
          * Built documents
          */
@@ -1464,14 +1466,16 @@ else if ($id > 0 || ! empty($ref))
     	 */
     	$somethingshown=$object->showLinkedObjectBlock();
 
-    	print '</td><td valign="top" width="50%">';
+    	//print '</td><td valign="top" width="50%">';
+    	print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+
     	// List of actions on element
     	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
     	$formactions=new FormActions($db);
     	$somethingshown=$formactions->showactions($object,'fichinter',$socid);
-        print "</td><td>";
+
-        print "&nbsp;</td>";
+        print '</div></div></div>';
-        print "</tr></table>\n";
+    	//print "</td></tr></table>\n";
     }
 
 

htdocs/fourn/commande/fiche.php

@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2004-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005      Eric	Seigne          <eric.seigne@ryxeo.com>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2010-2013 Juanjo Menent        <jmenent@2byte.es>
@@ -1762,9 +1762,12 @@ elseif (! empty($object->id))
 
 			print "</div>";
 		}
+		print "<br>";
 
-		print '<table width="100%"><tr><td width="50%" valign="top">';
+
-		print '<a name="builddoc"></a>'; // ancre
+		print '<div class="fichecenter"><div class="fichehalfleft">';
+		//print '<table width="100%"><tr><td width="50%" valign="top">';
+		//print '<a name="builddoc"></a>'; // ancre
 
 		/*
 		 * Documents generes
@@ -1785,7 +1788,8 @@ elseif (! empty($object->id))
 		 */
 		$somethingshown=$object->showLinkedObjectBlock();
 
-		print '</td><td valign="top" width="50%">';
+		//print '</td><td valign="top" width="50%">';
+		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 
 		if ($user->rights->fournisseur->commande->commander && $object->statut == 2)
 		{
@@ -1853,7 +1857,8 @@ elseif (! empty($object->id))
 		$somethingshown=$formactions->showactions($object,'order_supplier',$socid);
 		*/
 
-		print '</td></tr></table>';
+		print '</div></div></div>';
+		//print '</td></tr></table>';
 	}
 
 	/*

htdocs/fourn/facture/fiche.php

@@ -2054,11 +2054,13 @@ else
                 print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a>';
             }
             print '</div>';
+            print '<br>';
 
             if ($action != 'edit')
             {
-                print '<table width="100%"><tr><td width="50%" valign="top">';
+				print '<div class="fichecenter"><div class="fichehalfleft">';
-                print '<a name="builddoc"></a>'; // ancre
+            	//print '<table width="100%"><tr><td width="50%" valign="top">';
+                //print '<a name="builddoc"></a>'; // ancre
 
                 /*
                  * Documents generes
@@ -2072,7 +2074,6 @@ else
                 $delallowed=$user->rights->fournisseur->facture->supprimer;
                 $modelpdf=(! empty($object->modelpdf)?$object->modelpdf:(empty($conf->global->INVOICE_SUPPLIER_ADDON_PDF)?'':$conf->global->INVOICE_SUPPLIER_ADDON_PDF));
 
-                print '<br>';
                 print $formfile->showdocuments('facture_fournisseur',$subdir,$filedir,$urlsource,$genallowed,$delallowed,$modelpdf,1,0,0,0,0,'','','',$societe->default_lang);
                 $somethingshown=$formfile->numoffiles;
 
@@ -2081,15 +2082,17 @@ else
                 */
                 $somethingshown=$object->showLinkedObjectBlock();
 
-                print '</td><td valign="top" width="50%">';
+				print '</div><div class="fichehalfright"><div class="ficheaddleft">';
-                print '<br>';
+                //print '</td><td valign="top" width="50%">';
+                //print '<br>';
 
                 // List of actions on element
                 include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
                 $formactions=new FormActions($db);
                 $somethingshown=$formactions->showactions($object,'invoice_supplier',$socid);
 
-                print '</td></tr></table>';
+				print '</div></div></div>';
+                //print '</td></tr></table>';
             }
         }
         /*

htdocs/ftp/index.php

@@ -23,7 +23,7 @@
  *	\author		Laurent Destailleur
  */
 
-require 'pre.inc.php';	// We use pre.inc.php to have a dynamic menu
+require('../main.inc.php');
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/treeview.lib.php';

htdocs/ftp/pre.inc.php

@@ -1,72 +0,0 @@
-<?php
-/* Copyright (C) 2008-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
- *
- * 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/ftp/pre.inc.php
- *		\ingroup    ftp
- *		\brief      File to manage left menu for FTP module
- */
-
-require (realpath(dirname(__FILE__)) . "/../main.inc.php");
-
-$user->getrights('ecm');
-
-/**
- * Replace the default llxHeader function
- *
- * @param 	string	$head			Optionnal head lines
- * @param 	string	$title			HTML title
- * @param 	string	$help_url		Link to online url help
- * @param 	string	$morehtml		More content into html header
- * @param 	string 	$target			Force target on menu links
- * @param 	int    	$disablejs		More content into html header
- * @param 	int    	$disablehead	More content into html header
- * @param 	array  	$arrayofjs		Array of complementary js files
- * @param 	array  	$arrayofcss		Array of complementary css files
- * @return	none
- */
-function llxHeader($head = '', $title='', $help_url='', $morehtml='', $target='', $disablejs=0, $disablehead=0, $arrayofjs='', $arrayofcss='')
-{
-	global $conf,$langs,$user;
-	$langs->load("ftp");
-
-	top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);	// Show html headers
-	top_menu($head, $title, $target, $disablejs, $disablehead, $arrayofjs, $arrayofcss);	// Show html headers
-
-	require_once DOL_DOCUMENT_ROOT.'/core/class/menu.class.php';
-	$menu = new Menu();
-
-	$MAXFTP=20;
-	$i=1;
-	while ($i <= $MAXFTP)
-	{
-		$paramkey='FTP_NAME_'.$i;
-		//print $paramkey;
-		if (! empty($conf->global->$paramkey))
-		{
-			$link="/ftp/index.php?idmenu=".$_SESSION["idmenu"]."&numero_ftp=".$i;
-
-			$menu->add($link, dol_trunc($conf->global->$paramkey,24));
-		}
-		$i++;
-	}
-
-
-	left_menu($menu->liste, $help_url, $morehtml, '', 1);
-	main_area();
-}
-?>

htdocs/holiday/index.php

@@ -278,19 +278,20 @@ if($user->rights->holiday->lire_tous) {
 }
 
 // VALIDEUR
-if($user->rights->holiday->lire_tous){
+if($user->rights->holiday->lire_tous)
+{
     print '<td class="liste_titre" align="left">';
 
-    // Liste des utiliseurs du groupes Comptabilité
+    $validator = new UserGroup($db);
-
+    $excludefilter=$user->admin?'':'u.rowid <> '.$user->id;
-    $idGroupValid = $holiday->getConfCP('userGroup');
+    $valideurobjects = $validator->listUsersForGroup($excludefilter);
-
+    $valideurarray = array();
-    $validator = new UserGroup($db,$idGroupValid);
+    foreach($valideurobjects as $val) $valideurarray[$val->id]=$val->id;
-    $valideur = $validator->listUsersForGroup();
+    $form->select_users($search_valideur,"search_valideur",1,"",0,$valideurarray,'');
-
-    $form->select_users($search_valideur,"search_valideur",1,"",0,$valideur,'');
     print '</td>';
-} else {
+}
+else 
+{
     print '<td class="liste_titre">&nbsp;</td>';
 }
 

htdocs/includes/jquery/plugins/template/README.md

@@ -1,346 +0,0 @@
-# JavaScript Templates
-
-## Demo
-[JavaScript Templates Demo](http://blueimp.github.com/JavaScript-Templates/)
-
-## Usage
-
-### Client-side
-Include the (minified) JavaScript Templates script in your HTML markup:
-
-```html
-<script src="tmpl.min.js"></script>
-```
-
-Add a script section with type **"text/x-tmpl"**, a unique **id** property and your template definition as content:
-
-```html
-<script type="text/x-tmpl" id="tmpl-demo">
-<h3>{%=o.title%}</h3>
-<p>Released under the
-<a href="{%=o.license.url%}">{%=o.license.name%}</a>.</p>
-<h4>Features</h4>
-<ul>
-{% for (var i=0; i<o.features.length; i++) { %}
-    <li>{%=o.features[i]%}</li>
-{% } %}
-</ul>
-</script>
-```
-
-**"o"** (the lowercase letter) is a reference to the data parameter of the template function (see the API section on how to modify this identifier).
-
-In your application code, create a JavaScript object to use as data for the template:
-
-```js
-var data = {
-    "title": "JavaScript Templates",
-    "license": {
-        "name": "MIT license",
-        "url": "http://www.opensource.org/licenses/MIT"
-    },
-    "features": [
-        "lightweight & fast",
-        "powerful",
-        "zero dependencies"
-    ]
-};
-```
-
-In a real application, this data could be the result of retrieving a [JSON](http://json.org/) resource.
-
-Render the result by calling the **tmpl()** method with the id of the template and the data object as arguments:
-
-```js
-document.getElementById("result").innerHTML = tmpl("tmpl-demo", data);
-```
-
-### Server-side
-
-The following is an example how to use the JavaScript Templates engine on the server-side with [node.js](http://nodejs.org/).
-
-Create a new directory and add the **tmpl.js** file. Or alternatively, install the **blueimp-tmpl** package with [npm](http://npmjs.org/):
-
-```sh
-npm install blueimp-tmpl
-```
-
-Add a file **template.html** with the following content:
-
-```html
-<!DOCTYPE HTML>
-<title>{%=o.title%}</title>
-<h3><a href="{%=o.url%}">{%=o.title%}</a></h3>
-<h4>Features</h4>
-<ul>
-{% for (var i=0; i<o.features.length; i++) { %}
-    <li>{%=o.features[i]%}</li>
-{% } %}
-</ul>
-```
-
-Add a file **server.js** with the following content:
-
-```js
-require("http").createServer(function (req, res) {
-    var fs = require("fs"),
-        // The tmpl module exports the tmpl() function:
-        tmpl = require("./tmpl").tmpl,
-        // Use the following version if you installed the package with npm:
-        // tmpl = require("blueimp-tmpl").tmpl,
-        // Sample data:
-        data = {
-            "title": "JavaScript Templates",
-            "url": "https://github.com/blueimp/JavaScript-Templates",
-            "features": [
-                "lightweight & fast",
-                "powerful",
-                "zero dependencies"
-            ]
-        };
-    // Override the template loading method:
-    tmpl.load = function (id) {
-        var filename = id + ".html";
-        console.log("Loading " + filename);
-        return fs.readFileSync(filename, "utf8");
-    };
-    res.writeHead(200, {"Content-Type": "text/x-tmpl"});
-    // Render the content:
-    res.end(tmpl("template", data));
-}).listen(8080, "localhost");
-console.log("Server running at http://localhost:8080/");
-```
-
-Run the application with the following command:
-
-```sh
-node server.js
-```
-
-## Requirements
-The JavaScript Templates script has zero dependencies.
-
-## API
-
-### tmpl() function
-The **tmpl()** function is added to the global **window** object and can be called as global function:
-
-```js
-var result = tmpl("tmpl-demo", data);
-```
-
-The **tmpl()** function can be called with the id of a template, or with a template string:
-
-```js
-var result = tmpl("<h3>{%=o.title%}</h3>", data);
-```
-
-If called without second argument, **tmpl()** returns a reusable template function:
-
-```js
-var func = tmpl("<h3>{%=o.title%}</h3>");
-document.getElementById("result").innerHTML = func(data);
-```
-
-### Templates cache
-Templates loaded by id are cached in the map **tmpl.cache**:
-
-```js
-var func = tmpl("tmpl-demo"), // Loads and parses the template
-    cached = typeof tmpl.cache["tmpl-demo"] === "function", // true
-    result = tmpl("tmpl-demo", data); // Uses cached template function
-
-tmpl.cache["tmpl-demo"] = null;
-result = tmpl("tmpl-demo", data); // Loads and parses the template again
-```
-
-### Output encoding
-The method **tmpl.encode** is used to escape HTML special characters in the template output:
-
-```js
-var output = tmpl.encode("<>&\"'\x00"); // Renders "&lt;&gt;&amp;&quot;&#39;"
-```
-
-**tmpl.encode** makes use of the regular expression **tmpl.encReg** and the encoding map **tmpl.encMap** to match and replace special characters, which can be modified to change the behavior of the output encoding.  
-Strings matched by the regular expression, but not found in the encoding map are removed from the output. This allows for example to automatically trim input values (removing whitespace from the start and end of the string):
-
-```js
-tmpl.encReg = /(^\s+)|(\s+$)|[<>&"'\x00]/g;
-var output = tmpl.encode("    Banana!    "); // Renders "Banana" (without whitespace)
-```
-
-### Local helper variables
-The local variables available inside the templates are the following:
-
-* **o**: The data object given as parameter to the template function (see the next section on how to modify the parameter name).
-* **tmpl**: A reference to the **tmpl** function object.
-* **_s**: The string for the rendered result content.
-* **_e**: A reference to the **tmpl.encode** method.
-* **print**: Helper function to add content to the rendered result string.
-* **include**: Helper function to include the return value of a different template in the result.
-
-To introduce additional local helper variables, the string **tmpl.helper** can be extended. The following adds a convenience function for *console.log* and a streaming function, that streams the template rendering result back to the callback argument (note the comma at the beginning of each variable declaration):
-
-```js
-tmpl.helper += ",log=function(){console.log.apply(console, arguments)}" +
-    ",st='',stream=function(cb){var l=st.length;st=_s;cb( _s.slice(l));}";
-```
-
-Those new helper functions could be used to stream the template contents to the console output:
-
-```html
-<script type="text/x-tmpl" id="tmpl-demo">
-<h3>{%=o.title%}</h3>
-{% stream(log); %}
-<p>Released under the
-<a href="{%=o.license.url%}">{%=o.license.name%}</a>.</p>
-{% stream(log); %}
-<h4>Features</h4>
-<ul>
-{% stream(log); %}
-{% for (var i=0; i<o.features.length; i++) { %}
-    <li>{%=o.features[i]%}</li>
-    {% stream(log); %}
-{% } %}
-</ul>
-{% stream(log); %}
-</script>
-```
-
-### Template function argument
-The generated template functions accept one argument, which is the data object given to the **tmpl(id, data)** function. This argument is available inside the template definitions as parameter **o** (the lowercase letter).
-
-The argument name can be modified by overriding **tmpl.arg**:
-
-```js
-tmpl.arg = "p";
-
-// Renders "<h3>JavaScript Templates</h3>":
-var result = tmpl("<h3>{%=p.title%}</h3>", {title: "JavaScript Templates"});
-```
-
-### Template parsing
-The template contents are matched and replaced using the regular expression **tmpl.regexp** and the replacement function **tmpl.func**. The replacement function operates based on the [parenthesized submatch strings](https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/String/replace#Specifying_a_function_as_a_parameter).
-
-To use different tags for the template syntax, override **tmpl.regexp** with a modified regular expression, by exchanging all occurrences of "**\\{%**" and "**%\\}**", e.g. with "**\\[%**" and "**%\\]**":
-
-```js
-tmpl.regexp = /([\s'\\])(?![^%]*%\])|(?:\[%(=|#)([\s\S]+?)%\])|(\[%)|(%\])/g;
-```
-
-By default, the plugin preserves whitespace (newlines, carriage returns, tabs and spaces). To strip unnecessary whitespace, you can override the **tmpl.func** function, e.g. with the following code:
-
-```js
-var originalFunc = tmpl.func;
-tmpl.func = function (s, p1, p2, p3, p4, p5, offset, str) {
-    if (p1 && /\s/.test(p1)) {
-        if (!offset || /\s/.test(str.charAt(offset - 1)) ||
-                /^\s+$/g.test(str.slice(offset))) {
-            return '';
-        }
-        return ' ';
-    }
-    return originalFunc.apply(tmpl, arguments);
-};
-```
-
-## Templates syntax
-
-### Interpolation
-Print variable with HTML special characters escaped:
-
-```html
-<h3>{%=o.title%}</h3>
-```
-
-Print variable without escaping:
-
-```html
-<h3>{%#o.user_id%}</h3>
-```
-
-Print output of function calls:
-
-```html
-<a href="{%=encodeURI(o.url)%}">Website</a>
-```
-
-Use dot notation to print nested properties:
-
-```html
-<strong>{%=o.author.name%}</strong>
-```
-
-Note that the JavaScript Templates engine prints **falsy** values as empty strings.  
-That is, **undefined**, **null**, **false**, **0** and **NaN** will all be converted to **''**.  
-To be able to print e.g. the number 0, convert it to a String before using it as an output variable:
-
-```html
-<h3>{%=0+''%}</h3>
-```
-
-### Evaluation
-Use **print(str)** to add escaped content to the output:
-
-```html
-<span>Year: {% var d=new Date(); print(d.getFullYear()); %}</span>
-```
-
-Use **print(str, true)** to add unescaped content to the output:
-
-```html
-<span>{% print("Fast &amp; powerful", true); %}</span>
-```
-
-Use **include(str, obj)** to include content from a different template:
-
-```html
-<div>
-{% include('tmpl-link', {name: "Website", url: "http://example.org"}); %}
-</div>
-```
-
-If else condition:
-
-```html
-{% if (o.author.url) { %}
-    <a href="{%=encodeURI(o.author.url)%}">{%=o.author.name%}</a>
-{% } else { %}
-    <em>No author url.</em>
-{% } %}
-```
-
-For loop:
-
-```html
-<ul>
-{% for (var i=0; i<o.features.length; i++) { %}
-    <li>{%=o.features[i]%}</li>
-{% } %}
-</ul>
-```
-
-## Compiled templates
-The JavaScript Templates project comes with a compilation script, that allows you to compile your templates into JavaScript code and combine them with a minimal Templates runtime into one minified JavaScript file.
-
-The compilation script is built for [node.js](http://nodejs.org/) and also requires [UglifyJS](https://github.com/mishoo/UglifyJS).  
-To use it, first install both the JavaScript Templates project and UglifyJS via [npm](http://npmjs.org/):
-
-```sh
-npm install uglify-js
-npm install blueimp-tmpl
-```
-
-This will put the executables **uglifyjs** and **tmpl.js** into the folder **node_modules/.bin**. It will also make them available on your PATH if you install the packages globally (by adding the **-g** flag to the install command).
-
-The **tmpl.js** executable accepts the paths to one or multiple template files as command line arguments and prints the generated JavaScript code to the console output. The following command line shows you how to store the generated code in a new JavaScript file that can be included in your project:
-
-```sh
-tmpl.js templates/upload.html templates/download.html > tmpl.min.js
-```
-
-The files given as command line arguments to **tmpl.js** can either be pure template files or HTML documents with embedded template script sections. For the pure template files, the file names (without extension) serve as template ids.  
-The generated file can be included in your project as a replacement for the original **tmpl.js** runtime. It provides you with the same API and provides a **tmpl(id, data)** function that accepts the id of one of your templates as first and a data object as optional second parameter.
-
-## License
-The JavaScript Templates script is released under the [MIT license](http://www.opensource.org/licenses/MIT).

htdocs/includes/jquery/plugins/template/compile.js

@@ -1,82 +0,0 @@
-#!/usr/bin/env node
-/*
- * JavaScript Templates Compiler 2.1.0
- * https://github.com/blueimp/JavaScript-Templates
- *
- * Copyright 2011, Sebastian Tschan
- * https://blueimp.net
- *
- * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
- */
-
-/*jslint nomen: true */
-/*global require, __dirname, process, console */
-
-(function () {
-    "use strict";
-    var tmpl = require("./tmpl.js").tmpl,
-        fs = require("fs"),
-        path = require("path"),
-        jsp = require("uglify-js").parser,
-        pro = require("uglify-js").uglify,
-        // Retrieve the content of the minimal runtime:
-        runtime = fs.readFileSync(__dirname + "/runtime.js", "utf8"),
-        // A regular expression to parse templates from script tags in a HTML page:
-        regexp = /<script( id="([\w\-]+)")? type="text\/x-tmpl"( id="([\w\-]+)")?>([\s\S]+?)<\/script>/gi,
-        // A regular expression to match the helper function names:
-        helperRegexp = new RegExp(
-            tmpl.helper.match(/\w+(?=\s*=\s*function\s*\()/g).join("\\s*\\(|") + "\\s*\\("
-        ),
-        // A list to store the function bodies:
-        list = [],
-        code,
-        ast;
-    // Extend the Templating engine with a print method for the generated functions:
-    tmpl.print = function (str) {
-        // Only add helper functions if they are used inside of the template:
-        var helper = helperRegexp.test(str) ? tmpl.helper : "",
-            body = str.replace(tmpl.regexp, tmpl.func);
-        if (helper || (/_e\s*\(/.test(body))) {
-            helper = "_e=tmpl.encode" + helper + ",";
-        }
-        return "function(" + tmpl.arg + ",tmpl){" +
-            ("var " + helper + "_s='" + body + "';return _s;")
-            .split("_s+='';").join("") + "}";
-    };
-    // Loop through the command line arguments:
-    process.argv.forEach(function (file, index) {
-        var listLength = list.length,
-            content,
-            result,
-            id;
-        // Skipt the first two arguments, which are "node" and the script:
-        if (index > 1) {
-            content = fs.readFileSync(file, "utf8");
-            while (true) {
-                // Find templates in script tags:
-                result = regexp.exec(content);
-                if (!result) {
-                    break;
-                }
-                id = result[2] || result[4];
-                list.push("'" + id + "':" + tmpl.print(result[5]));
-            }
-            if (listLength === list.length) {
-                // No template script tags found, use the complete content:
-                id = path.basename(file, path.extname(file));
-                list.push("'" + id + "':" + tmpl.print(content));
-            }
-        }
-    });
-    // Combine the generated functions as cache of the minimal runtime:
-    code = runtime.replace("{}", "{" + list.join(",") + "}");
-    // Parse the code and get the initial AST (Abstract Syntac Tree):
-    ast = jsp.parse(code);
-    // Get a new AST with mangled names:
-    ast = pro.ast_mangle(ast);
-    // Get an AST with compression optimizations:
-    ast = pro.ast_squeeze(ast);
-    // Generate the code and print it to the console output:
-    console.log(pro.gen_code(ast));
-}());

htdocs/includes/jquery/plugins/template/runtime.js

@@ -1,46 +0,0 @@
-/*
- * JavaScript Templates Runtime 2.1.0
- * https://github.com/blueimp/JavaScript-Templates
- *
- * Copyright 2011, Sebastian Tschan
- * https://blueimp.net
- *
- * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
- */
-
-/*jslint sloppy: true */
-/*global define */
-
-(function ($) {
-    var tmpl = function (id, data) {
-        var f = tmpl.cache[id];
-        return data ? f(data, tmpl) : function (data) {
-            return f(data, tmpl);
-        };
-    };
-    tmpl.cache = {};
-    tmpl.encReg = /[<>&"'\x00]/g;
-    tmpl.encMap = {
-        "<"   : "&lt;",
-        ">"   : "&gt;",
-        "&"   : "&amp;",
-        "\""  : "&quot;",
-        "'"   : "&#39;"
-    };
-    tmpl.encode = function (s) {
-        return String(s || "").replace(
-            tmpl.encReg,
-            function (c) {
-                return tmpl.encMap[c] || "";
-            }
-        );
-    };
-    if (typeof define === "function" && define.amd) {
-        define(function () {
-            return tmpl;
-        });
-    } else {
-        $.tmpl = tmpl;
-    }
-}(this));

htdocs/includes/jquery/plugins/template/tmpl.js

@@ -1,86 +0,0 @@
-/*
- * JavaScript Templates 2.1.0
- * https://github.com/blueimp/JavaScript-Templates
- *
- * Copyright 2011, Sebastian Tschan
- * https://blueimp.net
- *
- * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
- *
- * Inspired by John Resig's JavaScript Micro-Templating:
- * http://ejohn.org/blog/javascript-micro-templating/
- */
-
-/*jslint evil: true, regexp: true */
-/*global document, define */
-
-(function ($) {
-    "use strict";
-    var tmpl = function (str, data) {
-        var f = !/[^\w\-\.:]/.test(str) ? tmpl.cache[str] = tmpl.cache[str] ||
-                tmpl(tmpl.load(str)) :
-                    new Function(
-                        tmpl.arg + ',tmpl',
-                        "var _e=tmpl.encode" + tmpl.helper + ",_s='" +
-                            str.replace(tmpl.regexp, tmpl.func) +
-                            "';return _s;"
-                    );
-        return data ? f(data, tmpl) : function (data) {
-            return f(data, tmpl);
-        };
-    };
-    tmpl.cache = {};
-    tmpl.load = function (id) {
-        return document.getElementById(id).innerHTML;
-    };
-    tmpl.regexp = /([\s'\\])(?![^%]*%\})|(?:\{%(=|#)([\s\S]+?)%\})|(\{%)|(%\})/g;
-    tmpl.func = function (s, p1, p2, p3, p4, p5) {
-        if (p1) { // whitespace, quote and backspace in interpolation context
-            return {
-                "\n": "\\n",
-                "\r": "\\r",
-                "\t": "\\t",
-                " " : " "
-            }[s] || "\\" + s;
-        }
-        if (p2) { // interpolation: {%=prop%}, or unescaped: {%#prop%}
-            if (p2 === "=") {
-                return "'+_e(" + p3 + ")+'";
-            }
-            return "'+(" + p3 + "||'')+'";
-        }
-        if (p4) { // evaluation start tag: {%
-            return "';";
-        }
-        if (p5) { // evaluation end tag: %}
-            return "_s+='";
-        }
-    };
-    tmpl.encReg = /[<>&"'\x00]/g;
-    tmpl.encMap = {
-        "<"   : "&lt;",
-        ">"   : "&gt;",
-        "&"   : "&amp;",
-        "\""  : "&quot;",
-        "'"   : "&#39;"
-    };
-    tmpl.encode = function (s) {
-        return String(s || "").replace(
-            tmpl.encReg,
-            function (c) {
-                return tmpl.encMap[c] || "";
-            }
-        );
-    };
-    tmpl.arg = "o";
-    tmpl.helper = ",print=function(s,e){_s+=e&&(s||'')||_e(s);}" +
-        ",include=function(s,d){_s+=tmpl(s,d);}";
-    if (typeof define === "function" && define.amd) {
-        define(function () {
-            return tmpl;
-        });
-    } else {
-        $.tmpl = tmpl;
-    }
-}(this));

htdocs/includes/jquery/plugins/template/tmpl.min.js

@@ -1 +0,0 @@
-(function(a){"use strict";var b=function(a,c){var d=/[^\w\-\.:]/.test(a)?new Function(b.arg+",tmpl","var _e=tmpl.encode"+b.helper+",_s='"+a.replace(b.regexp,b.func)+"';return _s;"):b.cache[a]=b.cache[a]||b(b.load(a));return c?d(c,b):function(a){return d(a,b)}};b.cache={},b.load=function(a){return document.getElementById(a).innerHTML},b.regexp=/([\s'\\])(?![^%]*%\})|(?:\{%(=|#)([\s\S]+?)%\})|(\{%)|(%\})/g,b.func=function(a,b,c,d,e,f){if(b)return{"\n":"\\n","\r":"\\r","\t":"\\t"," ":" "}[a]||"\\"+a;if(c)return c==="="?"'+_e("+d+")+'":"'+("+d+"||'')+'";if(e)return"';";if(f)return"_s+='"},b.encReg=/[<>&"'\x00]/g,b.encMap={"<":"&lt;",">":"&gt;","&":"&amp;",'"':"&quot;","'":"&#39;"},b.encode=function(a){return String(a||"").replace(b.encReg,function(a){return b.encMap[a]||""})},b.arg="o",b.helper=",print=function(s,e){_s+=e&&(s||'')||_e(s);},include=function(s,d){_s+=tmpl(s,d);}",typeof define=="function"&&define.amd?define(function(){return b}):a.tmpl=b})(this);

htdocs/index.php

@@ -188,7 +188,7 @@ if ($user->societe_id == 0)
     DOL_URL_ROOT.'/compta/facture/list.php?mainmenu=accountancy',
     DOL_URL_ROOT.'/contrat/liste.php');
     // Translation lang files
-    $langfile=array("bills",
+    $langfile=array("companies",
                     "prospects",
                     "suppliers",
                     "members",

htdocs/opensurvey/fonctions.php

@@ -136,23 +136,6 @@ function is_error($cerr)
 }
 
 
-
-/**
- * Vérifie une adresse e-mail selon les normes RFC
- *
- * @param  	string  $email  l'adresse e-mail a vérifier
- * @return  bool    vrai si l'adresse est correcte, faux sinon
- * @see 	http://fightingforalostcause.net/misc/2006/compare-email-regex.php
- * @see 	http://svn.php.net/viewvc/php/php-src/trunk/ext/filter/logical_filters.c?view=markup
- */
-function validateEmail($email)
-{
-	$pattern = '/^(?!(?:(?:\\x22?\\x5C[\\x00-\\x7E]\\x22?)|(?:\\x22?[^\\x5C\\x22]\\x22?)){255,})(?!(?:(?:\\x22?\\x5C[\\x00-\\x7E]\\x22?)|(?:\\x22?[^\\x5C\\x22]\\x22?)){65,}@)(?:(?:[\\x21\\x23-\\x27\\x2A\\x2B\\x2D\\x2F-\\x39\\x3D\\x3F\\x5E-\\x7E]+)|(?:\\x22(?:[\\x01-\\x08\\x0B\\x0C\\x0E-\\x1F\\x21\\x23-\\x5B\\x5D-\\x7F]|(?:\\x5C[\\x00-\\x7F]))*\\x22))(?:\\.(?:(?:[\\x21\\x23-\\x27\\x2A\\x2B\\x2D\\x2F-\\x39\\x3D\\x3F\\x5E-\\x7E]+)|(?:\\x22(?:[\\x01-\\x08\\x0B\\x0C\\x0E-\\x1F\\x21\\x23-\\x5B\\x5D-\\x7F]|(?:\\x5C[\\x00-\\x7F]))*\\x22)))*@(?:(?:(?!.*[^.]{64,})(?:(?:(?:xn--)?[a-z0-9]+(?:-[a-z0-9]+)*\\.){1,126}){1,}(?:(?:[a-z][a-z0-9]*)|(?:(?:xn--)[a-z0-9]+))(?:-[a-z0-9]+)*)|(?:\\[(?:(?:IPv6:(?:(?:[a-f0-9]{1,4}(?::[a-f0-9]{1,4}){7})|(?:(?!(?:.*[a-f0-9][:\\]]){7,})(?:[a-f0-9]{1,4}(?::[a-f0-9]{1,4}){0,5})?::(?:[a-f0-9]{1,4}(?::[a-f0-9]{1,4}){0,5})?)))|(?:(?:IPv6:(?:(?:[a-f0-9]{1,4}(?::[a-f0-9]{1,4}){5}:)|(?:(?!(?:.*[a-f0-9]:){5,})(?:[a-f0-9]{1,4}(?::[a-f0-9]{1,4}){0,3})?::(?:[a-f0-9]{1,4}(?::[a-f0-9]{1,4}){0,3}:)?)))?(?:(?:25[0-5])|(?:2[0-4][0-9])|(?:1[0-9]{2})|(?:[1-9]?[0-9]))(?:\\.(?:(?:25[0-5])|(?:2[0-4][0-9])|(?:1[0-9]{2})|(?:[1-9]?[0-9]))){3}))\\]))$/iD';
-
-	return (bool) preg_match($pattern, $email);
-}
-
-
 /**
  * Fonction vérifiant l'existance et la valeur non vide d'une clé d'un tableau
  *

htdocs/opensurvey/public/create_survey.php

@@ -74,9 +74,7 @@ if (GETPOST("creation_sondage_date") || GETPOST("creation_sondage_autre") || GET
 		$_SESSION["mailsonde"] = false;
 	}
 
-	if(validateEmail($adresse) === false) {
+	if (! isValidEmail($adresse)) $erreur_adresse = true;
-		$erreur_adresse = true;
-	}
 
 	//var_dump($titre.' - '.$nom.' - '.$adresse.' - '.!$erreur_adresse.' - '.! $erreur_injection_titre.' - '.! $erreur_injection_commentaires.' - '.! $erreur_injection_nom.' - '.$creation_sondage_date.' - '.$creation_sondage_autre); exit;
 

htdocs/public/emailing/mailing-read.php

@@ -31,6 +31,20 @@ if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');		// Do not check ant
 if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');	// Do not check anti POST attack test
 if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');	// If there is no need to load and show top and left menu
 
+/**
+ * Header empty
+ *
+ * @return	void
+ */
+function llxHeader() { }
+/**
+ * Footer empty
+ *
+ * @return	void
+ */
+function llxFooter() { }
+
+
 require '../../main.inc.php';
 
 $tag=GETPOST('tag');

htdocs/public/emailing/mailing-unsubscribe.php

@@ -29,6 +29,20 @@ if (! defined('NOLOGIN'))        define("NOLOGIN",1);			// This means this outpu
 if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');		// Do not check anti CSRF attack test
 if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');	// If there is no need to load and show top and left menu
 
+/**
+ * Header empty
+ *
+ * @return	void
+ */
+function llxHeader() { }
+/**
+ * Footer empty
+ *
+ * @return	void
+ */
+function llxFooter() { }
+
+
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 

htdocs/theme/amarok/style.css.php

@@ -336,11 +336,20 @@ table.login_table .vmenu {
 /* ! Message d'erreur lors du login : */
 center .error { padding:8px !important; padding-left:26px !important; padding-right:20px; width:inherit; max-width:450px;color:#552323 !important; font-size:14px; border-radius:8px; text-align: left;}
 
-/* For hide object and add pointer cursor */
+
+
+/* ============================================================================== */
+/* Styles to hide objects                                                         */
+/* ============================================================================== */
 
 .hideobject { display:none; }
+<?php if (! empty($dol_optimize_smallscreen)) { ?>
+.hideonsmartphone { display: none; }
+.noenlargeonsmartphone { width : 50px !important; display: inline !important; }
+<?php } ?>
 .linkobject { cursor:pointer; }
 
+
 /* For dragging lines */
 
 .dragClass {color:#333333;}

htdocs/theme/auguria/style.css.php

@@ -62,7 +62,13 @@ if (! empty($conf->global->MAIN_OVERWRITE_THEME_RES)) { $path='/'.$conf->global-
 
 // Define image path files
 $fontlist='arial,tahoma,verdana,helvetica';    //$fontlist='Verdana,Helvetica,Arial,sans-serif';
-//'/theme/auguria/img/menus/trtitle.png';
+
+$dol_hide_topmenu=$conf->dol_hide_topmenu;
+$dol_hide_leftmenu=$conf->dol_hide_leftmenu;
+$dol_optimize_smallscreen=$conf->dol_optimize_smallscreen;
+$dol_no_mouse_hover=$conf->dol_no_mouse_hover;
+$dol_use_jmobile=$conf->dol_use_jmobile;
+
 $img_liste_titre=dol_buildpath($path.'/theme/'.$theme.'/img/menus/trtitle.png',1);
 $img_head=dol_buildpath($path.'/theme/'.$theme.'/img/headbg2.jpg',1);
 $img_button=dol_buildpath($path.'/theme/'.$theme.'/img/button_bg.png',1);
@@ -196,8 +202,9 @@ div.inline-block
 /* ============================================================================== */
 
 .hideobject { display: none; }
-<?php if (! empty($conf->dol_optimize_smallscreen)) { ?>
+<?php if (! empty($dol_optimize_smallscreen)) { ?>
 .hideonsmartphone { display: none; }
+.noenlargeonsmartphone { width : 50px !important; display: inline !important; }
 <?php } ?>
 .linkobject { cursor: pointer; }
 

htdocs/theme/bureau2crea/style.css.php

@@ -60,6 +60,12 @@ $fontsizesmaller=empty($conf->dol_optimize_smallscreen)?'11':'11';
 $fontlist='arial,tahoma,verdana,helvetica';
 //$fontlist='Verdana,Helvetica,Arial,sans-serif';
 
+$dol_hide_topmenu=$conf->dol_hide_topmenu;
+$dol_hide_leftmenu=$conf->dol_hide_leftmenu;
+$dol_optimize_smallscreen=$conf->dol_optimize_smallscreen;
+$dol_no_mouse_hover=$conf->dol_no_mouse_hover;
+$dol_use_jmobile=$conf->dol_use_jmobile;
+
 $path='';    			// This value may be used in future for external module to overwrite theme
 $theme='bureau2crea';	// Value of theme
 if (! empty($conf->global->MAIN_OVERWRITE_THEME_RES)) { $path='/'.$conf->global->MAIN_OVERWRITE_THEME_RES; $theme=$conf->global->MAIN_OVERWRITE_THEME_RES; }
@@ -225,8 +231,9 @@ div.inline-block
 /* ============================================================================== */
 
 .hideobject { display: none; }
-<?php if (! empty($conf->dol_optimize_smallscreen)) { ?>
+<?php if (! empty($dol_optimize_smallscreen)) { ?>
 .hideonsmartphone { display: none; }
+.noenlargeonsmartphone { width : 50px !important; display: inline !important; }
 <?php } ?>
 .linkobject { cursor: pointer; }
 

htdocs/theme/cameleo/style.css.php

@@ -60,6 +60,12 @@ $fontsizesmaller=empty($conf->dol_optimize_smallscreen)?'11':'11';
 $fontlist='arial,tahoma,verdana,helvetica';
 //$fontlist='Verdana,Helvetica,Arial,sans-serif';
 
+$dol_hide_topmenu=$conf->dol_hide_topmenu;
+$dol_hide_leftmenu=$conf->dol_hide_leftmenu;
+$dol_optimize_smallscreen=$conf->dol_optimize_smallscreen;
+$dol_no_mouse_hover=$conf->dol_no_mouse_hover;
+$dol_use_jmobile=$conf->dol_use_jmobile;
+
 $path='';    		// This value may be used in future for external module to overwrite theme
 $theme='cameleo';	// Value of theme
 if (! empty($conf->global->MAIN_OVERWRITE_THEME_RES)) { $path='/'.$conf->global->MAIN_OVERWRITE_THEME_RES; $theme=$conf->global->MAIN_OVERWRITE_THEME_RES; }
@@ -201,8 +207,9 @@ div.inline-block
 /* ============================================================================== */
 
 .hideobject { display: none; }
-<?php if (! empty($conf->dol_optimize_smallscreen)) { ?>
+<?php if (! empty($dol_optimize_smallscreen)) { ?>
 .hideonsmartphone { display: none; }
+.noenlargeonsmartphone { width : 50px !important; display: inline !important; }
 <?php } ?>
 .linkobject { cursor: pointer; }
 

htdocs/theme/eldy/style.css.php

@@ -352,8 +352,9 @@ th .button {
 /* ============================================================================== */
 
 .hideobject { display: none; }
-<?php if (! empty($conf->dol_optimize_smallscreen)) { ?>
+<?php if (! empty($dol_optimize_smallscreen)) { ?>
 .hideonsmartphone { display: none; }
+.noenlargeonsmartphone { width : 50px !important; display: inline !important; }
 <?php } ?>
 .linkobject { cursor: pointer; }
 

htdocs/viewimage.php

@@ -36,13 +36,18 @@ if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
 // Pour autre que companylogo, on charge environnement + info issus de logon comme le user
 if ((isset($_GET["modulepart"]) && $_GET["modulepart"] == 'companylogo') && ! defined("NOLOGIN")) define("NOLOGIN",'1');
 
-
 /**
- * Wrapper, donc header vierge
+ * Header empty
  *
- * @return  null
+ * @return	void
  */
 function llxHeader() { }
+/**
+ * Footer empty
+ *
+ * @return	void
+ */
+function llxFooter() { }
 
 require 'main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';

test/phpunit/phpunittest.xml

@@ -47,10 +47,6 @@
 	    <directory suffix=".php">../../htdocs/societe/canvas/</directory>
 	    <directory suffix=".php">../../htdocs/includes/</directory>
 	    <file>../../htdocs/boutique/osc_master.inc.php</file>
-	    <file>../../htdocs/compta/bank/pre.inc.php</file>
-	    <file>../../htdocs/compta/paiement/cheque/pre.inc.php</file>
-	    <file>../../htdocs/holiday/common.inc.php</file>
-	    <file>../../htdocs/ftp/pre.inc.php</file>
 	    </exclude>
 	  </whitelist>
 	</filter>