Merge remote-tracking branch 'upstream/develop' into develop

update from upstream

dev/translation/sanity_check_en_langfiles.php

@@ -96,10 +96,11 @@ if ($web) print "<br>";
 
 
 // directory containing the php and lang files
-$htdocs 	= $path."/../../htdocs/";
+$htdocs = $path."../../htdocs/";
+$scripts = $path."../../scripts/";
 
 // directory containing the english lang files
-$workdir 	= $htdocs."langs/en_US/";
+$workdir = $htdocs."langs/en_US/";
 
 
 $files = scandir($workdir);
@@ -241,17 +242,18 @@ if ($web)
 
 // STEP 2 - Search key not used
 
-
+if ((! empty($_REQUEST['unused']) && $_REQUEST['unused'] == 'true') || (isset($argv[1]) && $argv[1]=='unused=true'))
-if (! empty($_REQUEST['unused']) && $_REQUEST['unused'] == 'true')
 {
 	foreach ($langstrings_dist AS $value)
 	{
-		$search = '\'trans("'.$value.'")\'';
+		//$search = '\'trans("'.$value.'")\'';
-		$string =  'grep -R -m 1 -F --exclude=includes/* --include=*.php '.$search.' '.$htdocs.'*';
+	    $search = '-e "\''.$value.'\'" -e \'"'.$value.'"\'';
+		$string =  'grep -R -m 1 -F --exclude=includes/* --include=*.php '.$search.' '.$htdocs.'* '.$scripts.'*';
+		//print $string."<br>\n";
 		exec($string,$output);
 		if (empty($output)) {
 			$unused[$value] = true;
-			echo $value.'<br>';
+			echo $value."<br>\n";
 		}
 	}
 

htdocs/compta/bank/search.php

@@ -190,7 +190,7 @@ if ($resql)
 	
 	$moreforfilter = '';
 	$moreforfilter.='<div class="divsearchfield">';
-	$moreforfilter .= $langs->trans('Period') . ' ('.$langs->trans('DateOperationShort').') : ' . $langs->trans('StartDate') . ' ';
+	$moreforfilter .= $langs->trans('Period') . ' ('.$langs->trans('DateOperationShort').') : ' . $langs->trans('DateStart') . ' ';
 	$moreforfilter .= $form->select_date($search_dt_start, 'search_start_dt', 0, 0, 1, "search_form", 1, 0, 1);
 	$moreforfilter .= ' - ';
 	$moreforfilter .= $langs->trans('EndDate') . ' ' . $form->select_date($search_dt_end, 'search_end_dt', 0, 0, 1, "search_form", 1, 0, 1);

htdocs/core/class/html.formfile.class.php

@@ -1267,7 +1267,7 @@ class FormFile
                 print '<input type="hidden" name="id" value="' . $object->id . '">';
                 print '<input type="hidden" name="linkid" value="' . $link->id . '">';
                 print '<input type="hidden" name="action" value="confirm_updateline">';
-                print $langs->trans('Link') . ': <input type="text" name="link" size="50" value="' . $link->url . '">';
+                print $langs->trans('Link') . ': <input type="text" name="link" value="' . $link->url . '">';
                 print '</td>';
                 print '<td>';
                 print $langs->trans('Label') . ': <input type="text" name="label" value="' . $link->label . '">';

htdocs/core/lib/functions.lib.php

@@ -4871,6 +4871,7 @@ function get_htmloutput_mesg($mesgstring='',$mesgarray='', $style='ok', $keepemb
 						if (block) {
 							$.dolEventValid("","'.dol_escape_js($out).'");
 						} else {
+							/* jnotify(message, preset of message type, keepmessage) */
 							$.jnotify("'.dol_escape_js($out).'",
 							"'.($style=="ok" ? 3000 : $style).'",
 							'.($style=="ok" ? "false" : "true").',

htdocs/core/lib/pdf.lib.php

@@ -1948,7 +1948,7 @@ function pdf_getLinkedObjects($object,$outputlangs)
 			        $linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefSending");
 			        if (! empty($linkedobjects[$objecttype]['ref_value'])) $linkedobjects[$objecttype]['ref_value'].=' / ';
 			        $linkedobjects[$objecttype]['ref_value'].= $outputlangs->transnoentities($elementobject->ref);
-			        //$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("DateSending");
+			        //$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("DateShipment");
 			        //if (! empty($linkedobjects[$objecttype]['date_value'])) $linkedobjects[$objecttype]['date_value'].=' / '; 
 			        //$linkedobjects[$objecttype]['date_value'].= dol_print_date($elementobject->date_delivery,'day','',$outputlangs);
 			    }
@@ -1957,7 +1957,7 @@ function pdf_getLinkedObjects($object,$outputlangs)
 			        $linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefOrder") . ' / ' . $outputlangs->transnoentities("RefSending");
 			        if (empty($linkedobjects[$objecttype]['ref_value'])) $linkedobjects[$objecttype]['ref_value'] = $outputlangs->convToOutputCharset($order->ref) . ($order->ref_client ? ' ('.$order->ref_client.')' : '');
 			        $linkedobjects[$objecttype]['ref_value'].= ' / ' . $outputlangs->transnoentities($elementobject->ref);
-			        //$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("OrderDate") . ($elementobject->date_delivery ? ' / ' . $outputlangs->transnoentities("DateSending") : '');
+			        //$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("OrderDate") . ($elementobject->date_delivery ? ' / ' . $outputlangs->transnoentities("DateShipment") : '');
 			        //if (empty($linkedobjects[$objecttype]['date_value'])) $linkedobjects[$objecttype]['date_value'] = dol_print_date($order->date,'day','',$outputlangs);
 			        //$linkedobjects[$objecttype]['date_value'].= ($elementobject->date_delivery ? ' / ' . dol_print_date($elementobject->date_delivery,'day','',$outputlangs) : '');
 			    }

htdocs/core/menus/standard/empty.php

@@ -165,14 +165,16 @@ class MenuManager
         				for($j = ($i + 1); $j < $num; $j++)
         				{
         				    if (empty($menu_array[$j]['level'])) $lastopened=false;
-        				}				
+        				}
+        				$alt = 0;   // For menu manager "empty", we force to not have blockvmenufirst defined
+        				$lastopened = 1; // For menu manager "empty", we force to not have blockvmenulast defined
 						if (($alt%2==0))
 						{
-							print '<div class="blockvmenuimpair'.($lastopened?' blockvmenulast':'').($alt == 1 ? ' blockvmenufirst':'').'">'."\n";
+							print '<div class="blockvmenuimpair blockvmenuunique'.($lastopened?' blockvmenulast':'').($alt == 1 ? ' blockvmenufirst':'').'">'."\n";
 						}
 						else
 						{
-							print '<div class="blockvmenupair'.($lastopened?' blockvmenulast':'').($alt == 1 ? ' blockvmenufirst':'').'">'."\n";
+							print '<div class="blockvmenupair blockvmenuunique'.($lastopened?' blockvmenulast':'').($alt == 1 ? ' blockvmenufirst':'').'">'."\n";
 						}
 					}
 

htdocs/core/modules/mailings/thirdparties_services_expired.modules.php

@@ -128,8 +128,8 @@ class mailing_thirdparties_services_expired extends MailingTargets
 					'lastname' => $obj->name,	// For thirdparties, lastname must be name
                     'firstname' => '',			// For thirdparties, firstname is ''
 					'other' =>
-                    ('StartDate='.dol_print_date($this->db->jdate($obj->date_ouverture),'day')).';'.
+                    ('DateStart='.dol_print_date($this->db->jdate($obj->date_ouverture),'day')).';'.
-                    ('EndDate='.dol_print_date($this->db->jdate($obj->date_fin_validite),'day')).';'.
+                    ('DateEnd='.dol_print_date($this->db->jdate($obj->date_fin_validite),'day')).';'.
                     ('Contract='.$obj->fk_contrat).';'.
                     ('ContactLine='.$obj->cdid),
 					'source_url' => $this->url($obj->id),

htdocs/core/modules/modExpedition.class.php

@@ -236,7 +236,7 @@ class modExpedition extends DolibarrModules
 		$this->export_code[$r]=$this->rights_class.'_'.$r;
 		$this->export_label[$r]='Shipments';	// Translation key (used only if key ExportDataset_xxx_z not found)
 		$this->export_permission[$r]=array(array("expedition","shipment","export"));
-		$this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'ThirdParty','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','d.nom'=>'State','co.label'=>'Country','co.code'=>'CountryCode','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.idprof5'=>'ProfId5','s.idprof6'=>'ProfId6','c.rowid'=>"Id",'c.ref'=>"Ref",'c.ref_customer'=>"RefCustomer",'c.fk_soc'=>"IdCompany",'c.date_creation'=>"DateCreation",'c.date_delivery'=>"DateSending",'c.tracking_number'=>"TrackingNumber",'c.height'=>"Height",'c.width'=>"Width",'c.size'=>"Depth",'c.size_units'=>'SizeUnits','c.weight'=>"Weight",'c.weight_units'=>"WeightUnits",'c.fk_statut'=>'Status','c.note_public'=>"NotePublic",'ed.rowid'=>'LineId','cd.description'=>'Description','ed.qty'=>"Qty",'p.rowid'=>'ProductId','p.ref'=>'ProductRef','p.label'=>'ProductLabel','p.weight'=>'ProductWeight','p.weight_units'=>'WeightUnits','p.volume'=>'ProductVolume','p.volume_units'=>'VolumeUnits');
+		$this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'ThirdParty','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','d.nom'=>'State','co.label'=>'Country','co.code'=>'CountryCode','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.idprof5'=>'ProfId5','s.idprof6'=>'ProfId6','c.rowid'=>"Id",'c.ref'=>"Ref",'c.ref_customer'=>"RefCustomer",'c.fk_soc'=>"IdCompany",'c.date_creation'=>"DateCreation",'c.date_delivery'=>"DateDeliveryPlanned",'c.tracking_number'=>"TrackingNumber",'c.height'=>"Height",'c.width'=>"Width",'c.size'=>"Depth",'c.size_units'=>'SizeUnits','c.weight'=>"Weight",'c.weight_units'=>"WeightUnits",'c.fk_statut'=>'Status','c.note_public'=>"NotePublic",'ed.rowid'=>'LineId','cd.description'=>'Description','ed.qty'=>"Qty",'p.rowid'=>'ProductId','p.ref'=>'ProductRef','p.label'=>'ProductLabel','p.weight'=>'ProductWeight','p.weight_units'=>'WeightUnits','p.volume'=>'ProductVolume','p.volume_units'=>'VolumeUnits');
 		if ($idcontacts && ! empty($conf->global->SHIPMENT_ADD_CONTACTS_IN_EXPORT)) $this->export_fields_array[$r]+=array('sp.rowid'=>'IdContact','sp.lastname'=>'Lastname','sp.firstname'=>'Firstname','sp.note_public'=>'NotePublic');
 		//$this->export_TypeFields_array[$r]=array('s.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.label'=>'List:c_country:label:label','co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_client'=>"Text",'c.date_creation'=>"Date",'c.date_commande'=>"Date",'c.amount_ht'=>"Numeric",'c.remise_percent'=>"Numeric",'c.total_ht'=>"Numeric",'c.total_ttc'=>"Numeric",'c.facture'=>"Boolean",'c.fk_statut'=>'Status','c.note_public'=>"Text",'c.date_livraison'=>'Date','ed.qty'=>"Text");
 		$this->export_TypeFields_array[$r]=array('s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.label'=>'List:c_country:label:label','co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_customer'=>"Text",'c.date_creation'=>"Date",'c.date_delivery'=>"Date",'c.tracking_number'=>"Numeric",'c.height'=>"Numeric",'c.width'=>"Numeric",'c.weight'=>"Numeric",'c.fk_statut'=>'Status','c.note_public'=>"Text",'ed.qty'=>"Numeric",'d.nom'=>'Text');

htdocs/core/tpl/document_actions_post_headers.tpl.php

@@ -65,7 +65,7 @@ $formfile->form_attach_new_file(
     0,
     0,
     $permission,
-    50,
+    $conf->browser->layout == 'phone' ? 40 : 60,
     $object,
 	'',
 	1,

htdocs/ecm/index.php

@@ -371,7 +371,7 @@ $moreheadjs=empty($conf->use_javascript_ajax)?"":"
         ,   north__paneSelector:    \"#ecm-layout-north\"
         ,   west__paneSelector:     \"#ecm-layout-west\"
         ,   resizable: true
-        ,   north__size:        32
+        ,   north__size:        36
         ,   north__resizable:   false
         ,   north__closable:    false
         ,   west__size:         340

htdocs/ecm/index_auto.php

@@ -373,7 +373,7 @@ $moreheadjs=empty($conf->use_javascript_ajax)?"":"
         ,   north__paneSelector:    \"#ecm-layout-north\"
         ,   west__paneSelector:     \"#ecm-layout-west\"
         ,   resizable: true
-        ,   north__size:        32
+        ,   north__size:        36
         ,   north__resizable:   false
         ,   north__closable:    false
         ,   west__size:         340

htdocs/langs/en_US/accountancy.lang

@@ -148,7 +148,6 @@ MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %
 FicheVentilation=Breakdown card
 GeneralLedgerIsWritten=Operations are written in the general ledger
 
-MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
 ## Admin
 ApplyMassCategories=Apply mass categories
 
@@ -177,7 +176,6 @@ OptionModeProductBuyDesc=Show all products with no accounting account defined fo
 
 ## Dictionary
 Range=Range of accounting account
-Sens=Sens
 Calculated=Calculated
 Formula=Formula
 

htdocs/langs/en_US/banks.lang

@@ -163,8 +163,6 @@ LabelRIB=BAN Label
 NoBANRecord=No BAN record
 DeleteARib=Delete BAN record
 ConfirmDeleteRib=Are you sure you want to delete this BAN record ?
-StartDate=Start date
-EndDate=End date
 RejectCheck=Check returned
 ConfirmRejectCheck=Are you sure you want to mark this check as rejected ?
 RejectCheckDate=Date the check was returned

htdocs/langs/en_US/bills.lang

@@ -435,7 +435,7 @@ RevenueStamp=Revenue stamp
 YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of thirdparty
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (recommended Template)
-PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for invoice situation
+PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
 TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
 MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for deposit invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
 TerreNumRefModelError=A bill starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module.
@@ -456,7 +456,6 @@ InvoiceSituationAsk=Invoice following the situation
 InvoiceSituationDesc=Create a new situation following an already existing one
 SituationAmount=Situation invoice amount(net)
 SituationDeduction=Situation subtraction
-Progress=Progress
 ModifyAllLines=Modify all lines
 CreateNextSituationInvoice=Create next situation
 NotLastInCycle=This invoice is not the latest in cycle and must not be modified.
@@ -468,7 +467,6 @@ InvoiceSituationLast=Final and general invoice
 PDFCrevetteSituationNumber=Situation N°%s
 PDFCrevetteSituationInvoiceLineDecompte=Situation invoice - COUNT
 PDFCrevetteSituationInvoiceTitle=Situation invoice
-PDFCrevetteDescription=Invoice PDF template Crevette. A invoice template if you use situation invoice
 PDFCrevetteSituationInvoiceLine=Situation N°%s : Inv. N°%s on %s
 TotalSituationInvoice=Total situation
 invoiceLineProgressError=Invoice line progress can't be greater than or equal to the next invoice line

htdocs/langs/en_US/categories.lang

@@ -55,7 +55,6 @@ SupplierHasNoCategory=This supplier is not in any tags/categories
 CompanyHasNoCategory=This thirdparty is not in any tags/categories
 MemberHasNoCategory=This member is not in any tags/categories
 ContactHasNoCategory=This contact is not in any tags/categories
-ContactHasNoCategory=This contact is not in any tags/categories
 AccountHasNoCategory=This account is not in any tags/categories
 ClassifyInCategory=Add to tag/category
 NoneCategory=None
@@ -106,8 +105,6 @@ CatCusLinks=Links between customers/prospects and tags/categories
 CatProdLinks=Links between products/services and tags/categories
 CatMemberLinks=Links between members and tags/categories
 DeleteFromCat=Remove from tags/category
-DeletePicture=Picture delete
-ConfirmDeletePicture=Confirm picture deletion?
 ExtraFieldsCategories=Complementary attributes
 CategoriesSetup=Tags/categories setup
 CategorieRecursiv=Link with parent tag/category automatically

htdocs/langs/en_US/companies.lang

@@ -380,8 +380,6 @@ ChangeContactInProcess=Change status to 'Contact in process'
 ChangeContactDone=Change status to 'Contact done'
 ProspectsByStatus=Prospects by status
 BillingContact=Billing contact
-NbOfAttachedFiles=Number of attached files
-AttachANewFile=Attach a new file
 NoRIB=No BAN defined
 NoParentCompany=None
 ExportImport=Import-Export

htdocs/langs/en_US/errors.lang

@@ -175,6 +175,7 @@ ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
 ErrorFileMustHaveFormat=File must have format %s
+ErrorSupplierCountryIsNotDefined=Country for this supplier is not defined. Correct this first.
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.  

htdocs/langs/en_US/exports.lang

@@ -120,10 +120,6 @@ CsvOptions=Csv Options
 Separator=Separator
 Enclosure=Enclosure
 SuppliersProducts=Suppliers Products
-BankCode=Bank code
-DeskCode=Desk code
-BankAccountNumber=Account number
-BankAccountNumberKey=Key
 SpecialCode=Special code
 ExportStringFilter=%% allows replacing one or more characters in the text
 ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days

htdocs/langs/en_US/help.lang

@@ -4,7 +4,6 @@ EMailSupport=Emails support
 RemoteControlSupport=Online real time / remote support
 OtherSupport=Other support
 ToSeeListOfAvailableRessources=To contact/see available resources:
-ClickHere=Click here
 HelpCenter=Help center
 DolibarrHelpCenter=Dolibarr help and support center
 ToGoBackToDolibarr=Otherwise, click <a href="%s">here to use Dolibarr</a>

htdocs/langs/en_US/loan.lang

@@ -5,7 +5,7 @@ NewLoan=New Loan
 ShowLoan=Show Loan
 PaymentLoan=Loan payment
 ShowLoanPayment=Show Loan Payment
-Capital=Capital
+LoanCapital=Capital
 Insurance=Insurance
 Interest=Interest
 Nbterms=Number of terms

htdocs/langs/en_US/main.lang

@@ -236,8 +236,8 @@ Date=Date
 DateAndHour=Date and hour
 DateToday=Today's date
 DateReference=Reference date
-DateStart=Date start
+DateStart=Start date
-DateEnd=Date end
+DateEnd=End date
 DateCreation=Creation date
 DateCreationShort=Creat. date
 DateModification=Modification date
@@ -471,6 +471,8 @@ LateDesc=Delay to define if a record is late or not depends on your setup. Ask y
 Photo=Picture
 Photos=Pictures
 AddPhoto=Add picture
+DeletePicture=Picture delete
+ConfirmDeletePicture=Confirm picture deletion?
 Login=Login
 CurrentLogin=Current login
 January=January
@@ -751,6 +753,9 @@ MassFilesArea=Area for files built by mass actions
 HideTempMassFilesArea=Hide area of files built by mass actions
 ShowTempMassFilesArea=Show area of files built by mass actions
 RelatedObjects=Related Objects
+ClassifyBilled=Classify billed
+Progress=Progress
+ClickHere=Click here
 # Week day
 Monday=Monday
 Tuesday=Tuesday

htdocs/langs/en_US/margins.lang

@@ -20,8 +20,6 @@ UserMargins=User margins
 ProductService=Product or Service
 AllProducts=All products and services
 ChooseProduct/Service=Choose product or service
-StartDate=Start date
-EndDate=End date
 Launch=Start
 ForceBuyingPriceIfNull=Force buying/cost price to selling price if not defined
 ForceBuyingPriceIfNullDetails=If buying/cost price not defined, and this option "ON", margin will be zero on line (buying/cost price = selling price), otherwise ("OFF"), marge will be equal to suggested default.

htdocs/langs/en_US/multicurrency.lang

@@ -1,6 +1,4 @@
 # ADMIN
-RecordSaved=Currency rate added
-RecordDeleted=Currency rate deleted
 ErrorAddRateFail=Error in added rate
 ErrorAddCurrencyFail=Error in added currency
 ErrorDeleteCurrencyFail=Error delete fail
@@ -13,5 +11,4 @@ multicurrency_appCurrencySource=Currency source
 multicurrency_alternateCurrencySource= Alternate currency souce
 CurrenciesUsed=Currencies used
 CurrenciesUsed_help_to_add=Add the differents currencies and rates you need to use on you <b>proposals</b>, <b>orders</b>, etc.
-Rate=Rate
 rate=rate

htdocs/langs/en_US/orders.lang

@@ -109,7 +109,6 @@ ConfirmCancelOrder=Are you sure you want to cancel this order ?
 ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</b> ?
 GenerateBill=Generate invoice
 ClassifyShipped=Classify delivered
-ClassifyBilled=Classify billed
 ComptaCard=Accountancy card
 DraftOrders=Draft orders
 DraftSuppliersOrders=Draft suppliers orders

htdocs/langs/en_US/other.lang

@@ -191,7 +191,6 @@ ImageEditor=Image editor
 YouReceiveMailBecauseOfNotification=You receive this message because your email has been added to list of targets to be informed of particular events into %s software of %s.
 YouReceiveMailBecauseOfNotification2=This event is the following:
 ThisIsListOfModules=This is a list of modules preselected by this demo profile (only most common modules are visible in this demo). Edit this to have a more personalized demo and click on "Start".
-ClickHere=Click here
 UseAdvancedPerms=Use the advanced permissions of some modules
 FileFormat=File format
 SelectAColor=Choose a color

htdocs/langs/en_US/products.lang

@@ -107,7 +107,6 @@ BuyingPrice=Buying price
 PriceForEachProduct=Products with specific prices
 NoPriceSpecificToCustomer=This customer has no specific prices. All standard prices for products/services will be used.
 SupplierCard=Supplier card
-CommercialCard=Commercial card
 AllWays=Path to find your product in stock
 NoCat=Your product is not in any category
 PrimaryWay=Primary path
@@ -142,8 +141,6 @@ ErrorAssociationIsFatherOfThis=One of selected product is parent with current pr
 DeleteProduct=Delete a product/service
 ConfirmDeleteProduct=Are you sure you want to delete this product/service?
 ProductDeleted=Product/Service "%s" deleted from database.
-DeletePicture=Delete a picture
-ConfirmDeletePicture=Are you sure you want to delete this picture ?
 ExportDataset_produit_1=Products
 ExportDataset_service_1=Services
 ImportDataset_produit_1=Products

htdocs/langs/en_US/projects.lang

@@ -20,7 +20,6 @@ TasksPublicDesc=This view presents all projects and tasks you are allowed to rea
 TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
 OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
-ProjectsArea=Projects area
 NewProject=New project
 AddProject=Create project
 DeleteAProject=Delete a project
@@ -70,7 +69,6 @@ MyActivities=My tasks/activities
 MyProjects=My projects
 MyProjectsArea=My projects Area
 DurationEffective=Effective duration
-Progress=Progress
 ProgressDeclared=Declared progress
 ProgressCalculated=Calculated progress
 Time=Time

htdocs/langs/en_US/propal.lang

@@ -65,7 +65,6 @@ DateEndPropalShort=Date end
 ValidityDuration=Validity duration
 CloseAs=Set status to
 SetAcceptedRefused=Set accepted/refused
-ClassifyBilled=Classify billed
 BuildBill=Build invoice
 ErrorPropalNotFound=Propal %s not found
 Estimate=Estimate :

htdocs/langs/en_US/sendings.lang

@@ -20,14 +20,11 @@ SendingCard=Shipment card
 NewSending=New shipment
 CreateASending=Create a shipment
 CreateSending=Create shipment
-QtyOrdered=Qty ordered
 QtyShipped=Qty shipped
 QtyToShip=Qty to ship
 QtyReceived=Qty received
 KeepToShip=Remain to ship
 OtherSendingsForSameOrder=Other shipments for this order
-DateSending=Shipping date
-DateSendingShort=Shipping date
 SendingsForSameOrder=Shipments for this order
 SendingsAndReceivingForSameOrder=Shipments and receivings for this order
 SendingsToValidate=Shipments to validate

htdocs/langs/en_US/sms.lang

@@ -39,9 +39,6 @@ SmsSuccessfulySent=Sms correctly sent (from %s to %s)
 ErrorSmsRecipientIsEmpty=Number of target is empty
 WarningNoSmsAdded=No new phone number to add to target list
 ConfirmValidSms=Do you confirm validation of this campain ?
-ConfirmResetMailing=Warning, if you make a reinit of Sms campain <b>%s</b>, you will allow to make a mass sending of it a second time. Is it really what you wan to do ?
-ConfirmDeleteMailing=Do you confirm removing of campain ?
-NbOfRecipients=Number of targets
 NbOfUniqueSms=Nb dof unique phone numbers
 NbOfSms=Nbre of phon numbers
 ThisIsATestMessage=This is a test message

htdocs/langs/en_US/suppliers.lang

@@ -9,7 +9,6 @@ History=History
 ListOfSuppliers=List of suppliers
 ShowSupplier=Show supplier
 OrderDate=Order date
-BuyingPrice=Buying price
 BuyingPriceMin=Minimum purchase price
 BuyingPriceMinShort=Min purchase price
 SellingPriceMinShort=Min sell price
@@ -19,8 +18,6 @@ TotalSellingPriceMinShort=Total of subproducts sell prices
 SomeSubProductHaveNoPrices=Some sub-products have no price defined
 AddSupplierPrice=Add supplier price
 ChangeSupplierPrice=Change supplier price
-ErrorQtyTooLowForThisSupplier=Quantity too low for this supplier or no price defined on this product for this supplier
-ErrorSupplierCountryIsNotDefined=Country for this supplier is not defined. Correct this first.
 ProductHasAlreadyReferenceInThisSupplier=This product has already a reference in this supplier
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s
 NoRecordedSuppliers=No suppliers recorded

htdocs/langs/en_US/website.lang

@@ -14,7 +14,6 @@ EditPageMeta=Edit Meta
 EditPageContent=Edit Content
 Website=Web site
 AddPage=Add page
-Page=Page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first add a page.
 RequestedPageHasNoContentYet=Requested page with id %s has not content yet or cache file .tpl.php was removed. Edit content of page to solve this.
 PageDeleted=Page '%s' of website %s deleted

htdocs/langs/fr_FR/website.lang

@@ -0,0 +1,25 @@
+# Dolibarr language file - Source file is en_US - website
+Shortname=Code
+WebsiteSetupDesc=Créer ici autant d'entrée que de nombre différents de sites web que nécessaire.\nEnsuite, aller dans le menu Sites Web pour les éditer.
+DeleteWebsite=Effacer site web
+ConfirmDeleteWebsite=Êtes-vous sûr de vouloir supprimer ce site web. Toutes les pages et le contenu seront également supprimés.
+WEBSITE_PAGENAME=Nom/alias de la page
+WEBSITE_URL=URL du site web
+WEBSITE_CSS_URL=URL du fichier de la feuille de style (CSS) externe
+WEBSITE_CSS_INLINE=Contenu de la feuille de style (CSS)
+MediaFiles=Répertoire de médias
+EditCss=Modifier la feuille de style (CSS)
+EditMenu=Modifier le menu
+EditPageMeta=Modifier les métadonnées
+EditPageContent=Modifier le contenu
+Website=Site web
+AddPage=Ajouter une page
+Page=Page
+PreviewOfSiteNotYetAvailable=La prévisualisation de votre site web n'est pas disponible actuellement. Vous devez créer la première page.
+RequestedPageHasNoContentYet=La page demandée : %s est vide ou le fichier .tpm.PHP a été supprimé. Modifiez le contenu de la page pour résoudre ce problème.
+PageDeleted=Page%s du site web effacée %s
+PageAdded=Page %s du site web ajouté %s
+ViewSiteInNewTab=Pré-visualiser le site dans un nouvel onglet
+ViewPageInNewTab=Pré-visualiser la page dans un nouvel onglet
+SetAsHomePage=Définir comme page d'accueil
+RealURL=URL réelle

htdocs/loan/calc.php

@@ -327,7 +327,7 @@ if ($form_complete && $show_progress) {
 	$legend = '<tr class="liste_titre">';
 	$legend.= '<td class="liste_titre" align="center">' . $langs->trans("Month") . '</td>';
 	$legend.= '<td class="liste_titre" align="center">' . $langs->trans("Interest") . '</td>';
-	$legend.= '<td class="liste_titre" align="center">' . $langs->trans("Capital") . '</td>';
+	$legend.= '<td class="liste_titre" align="center">' . $langs->trans("LoanCapital") . '</td>';
 	$legend.= '<td class="liste_titre" align="center">' . $langs->trans("Position") . '</td>';
 	$legend.= '</tr>';
 

htdocs/loan/card.php

@@ -101,7 +101,7 @@ if ($action == 'add' && $user->rights->loan->write)
 		}
 		elseif (! $_POST["capital"])
 		{
-			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Capital")), null, 'errors');
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("LoanCapital")), null, 'errors');
 			$action = 'create';
 		}
 		else
@@ -220,7 +220,7 @@ if ($action == 'create')
 	}
 
     // Capital
-    print '<tr><td class="fieldrequired">'.$langs->trans("Capital").'</td><td><input name="capital" size="10" value="' . GETPOST("capital") . '"></td></tr>';
+    print '<tr><td class="fieldrequired">'.$langs->trans("LoanCapital").'</td><td><input name="capital" size="10" value="' . GETPOST("capital") . '"></td></tr>';
 
 	// Date Start
 	print "<tr>";
@@ -365,7 +365,7 @@ if ($id > 0)
 		}
 
 		// Capital
-		print '<tr><td>'.$langs->trans("Capital").'</td><td>'.price($object->capital,0,$outputlangs,1,-1,-1,$conf->currency).'</td></tr>';
+		print '<tr><td>'.$langs->trans("LoanCapital").'</td><td>'.price($object->capital,0,$outputlangs,1,-1,-1,$conf->currency).'</td></tr>';
 
     	// Date start
 		print "<tr><td>".$langs->trans("DateStart")."</td>";
@@ -490,7 +490,7 @@ if ($id > 0)
 			print '<td>'.$langs->trans("Type").'</td>';
 			print '<td align="center">'.$langs->trans("Insurance").'</td>';
 			print '<td align="center">'.$langs->trans("Interest").'</td>';
-      		print '<td align="center">'.$langs->trans("Capital").'</td>';
+      		print '<td align="center">'.$langs->trans("LoanCapital").'</td>';
       		print '<td>&nbsp;</td>';
       		print '</tr>';
 

htdocs/loan/document.php

@@ -116,7 +116,7 @@ if ($object->id)
     }
 
     // Amount
-    print '<tr><td>'.$langs->trans("Capital").'</td><td>'.price($object->capital,0,$outputlangs,1,-1,-1,$conf->currency).'</td></tr>';
+    print '<tr><td>'.$langs->trans("LoanCapital").'</td><td>'.price($object->capital,0,$outputlangs,1,-1,-1,$conf->currency).'</td></tr>';
 
 	// Date start
     print "<tr><td>".$langs->trans("DateStart")."</td>";

htdocs/loan/index.php

@@ -125,7 +125,7 @@ if ($resql)
 	print '<tr class="liste_titre">';
 	print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"l.rowid","",$param,"",$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"],"l.label","",$param,'align="left"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Capital"),$_SERVER["PHP_SELF"],"l.capital","",$param,'align="right"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("LoanCapital"),$_SERVER["PHP_SELF"],"l.capital","",$param,'align="right"',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("DateStart"),$_SERVER["PHP_SELF"],"l.datestart","",$param,'align="center"',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"l.paid","",$param,'align="right"',$sortfield,$sortorder);
 	print_liste_field_titre('');

htdocs/loan/payment/card.php

@@ -163,7 +163,7 @@ print '<tr><td valign="top">'.$langs->trans('Mode').'</td><td colspan="3">'.$lan
 print '<tr><td valign="top">'.$langs->trans('Number').'</td><td colspan="3">'.$payment->num_payment.'</td></tr>';
 
 // Amount
-print '<tr><td valign="top">'.$langs->trans('Capital').'</td><td colspan="3">'.price($payment->amount_capital, 0, $outputlangs, 1, -1, -1, $conf->currency).'</td></tr>';
+print '<tr><td valign="top">'.$langs->trans('LoanCapital').'</td><td colspan="3">'.price($payment->amount_capital, 0, $outputlangs, 1, -1, -1, $conf->currency).'</td></tr>';
 print '<tr><td valign="top">'.$langs->trans('Insurance').'</td><td colspan="3">'.price($payment->amount_insurance, 0, $outputlangs, 1, -1, -1, $conf->currency).'</td></tr>';
 print '<tr><td valign="top">'.$langs->trans('Interest').'</td><td colspan="3">'.price($payment->amount_interest, 0, $outputlangs, 1, -1, -1, $conf->currency).'</td></tr>';
 

htdocs/loan/payment/payment.php

@@ -239,7 +239,7 @@ if ($action == 'create')
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre">';
 	print '<td align="left">'.$langs->trans("DateDue").'</td>';
-	print '<td align="right">'.$langs->trans("Capital").'</td>';
+	print '<td align="right">'.$langs->trans("LoanCapital").'</td>';
 	print '<td align="right">'.$langs->trans("AlreadyPaid").'</td>';
 	print '<td align="right">'.$langs->trans("RemainderToPay").'</td>';
 	print '<td align="right">'.$langs->trans("Amount").'</td>';
@@ -268,7 +268,7 @@ if ($action == 'create')
 	print '<td align="right">';
 	if ($sumpaid < $loan->capital)
 	{
-		print $langs->trans("Capital") .': <input type="text" size="8" name="amount_capital">';
+		print $langs->trans("LoanCapital") .': <input type="text" size="8" name="amount_capital">';
 	}
 	else
 	{

htdocs/main.inc.php

@@ -207,7 +207,7 @@ if (ini_get('register_globals'))    // To solve bug in using $_SESSION
 }
 
 // Init the 5 global objects
-// This include will set: $conf, $db, $langs, $user, $mysoc objects
+// This include will make the new and set properties for: $conf, $db, $langs, $user, $mysoc objects
 require_once 'master.inc.php';
 
 // Activate end of page function
@@ -221,11 +221,12 @@ if (isset($_SERVER["HTTP_USER_AGENT"]))
     $conf->browser->os=$tmp['browseros'];
     $conf->browser->version=$tmp['browserversion'];
     $conf->browser->layout=$tmp['layout'];     // 'classic', 'phone', 'tablet'
-    $conf->browser->phone=$tmp['phone'];	   // deprecated, use layout
+    $conf->browser->phone=$tmp['phone'];	   // TODO deprecated, use ->layout
-    $conf->browser->tablet=$tmp['tablet'];	   // deprecated, use layout
+    $conf->browser->tablet=$tmp['tablet'];	   // TODO deprecated, use ->layout
     //var_dump($conf->browser);
-}
 
+    if ($conf->browser->layout == 'phone') $conf->global->MAIN_TESTMENUHIDER=1;
+}
 
 // Force HTTPS if required ($conf->file->main_force_https is 0/1 or https dolibarr root url)
 // $_SERVER["HTTPS"] is 'on' when link is https, otherwise $_SERVER["HTTPS"] is empty or 'off'

htdocs/margin/agentMargins.php

@@ -99,11 +99,11 @@ if ($user->rights->margins->read->all) {
 }
 
 // Start date
-print '<td>'.$langs->trans('StartDate').' ('.$langs->trans("DateValidation").')</td>';
+print '<td>'.$langs->trans('DateStart').' ('.$langs->trans("DateValidation").')</td>';
 print '<td width="20%">';
 $form->select_date($startdate,'startdate','','',1,"sel",1,1);
 print '</td>';
-print '<td width="20%">'.$langs->trans('EndDate').' ('.$langs->trans("DateValidation").')</td>';
+print '<td width="20%">'.$langs->trans('DateEnd').' ('.$langs->trans("DateValidation").')</td>';
 print '<td width="20%">';
 $form->select_date($enddate,'enddate','','',1,"sel",1,1);
 print '</td>';

htdocs/margin/checkMargins.php

@@ -124,11 +124,11 @@ print '<form method="post" name="sel" action="' . $_SERVER['PHP_SELF'] . '">';
 print '<table class="border" width="100%">';
 
 // Start date
-print '<td>' . $langs->trans('StartDate') . ' (' . $langs->trans("DateValidation") . ')</td>';
+print '<td>' . $langs->trans('DateStrt') . ' (' . $langs->trans("DateValidation") . ')</td>';
 print '<td width="20%">';
 $form->select_date($startdate, 'startdate', '', '', 1, "sel", 1, 1);
 print '</td>';
-print '<td width="20%">' . $langs->trans('EndDate') . ' (' . $langs->trans("DateValidation") . ')</td>';
+print '<td width="20%">' . $langs->trans('DateEnd') . ' (' . $langs->trans("DateValidation") . ')</td>';
 print '<td width="20%">';
 $form->select_date($enddate, 'enddate', '', '', 1, "sel", 1, 1);
 print '</td>';

htdocs/margin/customerMargins.php

@@ -120,11 +120,11 @@ if (! $sortfield)
 }
 
 // Start date
-print '<td>'.$langs->trans('StartDate').' ('.$langs->trans("DateValidation").')</td>';
+print '<td>'.$langs->trans('DateStart').' ('.$langs->trans("DateValidation").')</td>';
 print '<td width="20%">';
 $form->select_date($startdate,'startdate','','',1,"sel",1,1);
 print '</td>';
-print '<td width="20%">'.$langs->trans('EndDate').' ('.$langs->trans("DateValidation").')</td>';
+print '<td width="20%">'.$langs->trans('DateEnd').' ('.$langs->trans("DateValidation").')</td>';
 print '<td width="20%">';
 $form->select_date($enddate,'enddate','','',1,"sel",1,1);
 print '</td>';

htdocs/margin/productMargins.php

@@ -122,11 +122,11 @@ else {
 }
 
 // Start date
-print '<td>'.$langs->trans('StartDate').' ('.$langs->trans("DateValidation").')</td>';
+print '<td>'.$langs->trans('DateStart').' ('.$langs->trans("DateValidation").')</td>';
 print '<td width="20%">';
 $form->select_date($startdate,'startdate','','',1,"sel",1,1);
 print '</td>';
-print '<td width="20%">'.$langs->trans('EndDate').' ('.$langs->trans("DateValidation").')</td>';
+print '<td width="20%">'.$langs->trans('DateEnd').' ('.$langs->trans("DateValidation").')</td>';
 print '<td width="20%">';
 $form->select_date($enddate,'enddate','','',1,"sel",1,1);
 print '</td>';

htdocs/theme/eldy/style.css.php

@@ -667,13 +667,37 @@ td.showDragHandle {
 	height: calc(100% - 50px);*/
 }
 
+.side-nav {
+	display: table-cell;
+	border-right: 1px solid #d0d0d0;
+}
+div.blockvmenulogo
+{
+	border-bottom: 0 !important;
+}
+div.blockvmenupair, div.blockvmenuimpair, div.blockvmenubookmarks {
+	border-top: none !important;
+	border-left: none !important;
+	border-right: none !important;
+	border-bottom: 1px solid #e0e0e0;
+	padding-left: 0 !important;
+}
+div.blockvmenuend {
+	border: none !important;
+	padding-left: 0 !important;
+}
+div.vmenu, td.vmenu {
+	padding-right: 6px !important;
+}
+
+
+
 /* For desktop */
 <?php if ((GETPOST('testmenuhider') || ! empty($conf->global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) { ?>
 #id-container {
 	width: 100%;
 }
 .side-nav {
-	border-right: 1px solid #BBB;
 	border-bottom: 1px solid #BBB;
 	background: #FFF;
 }
@@ -687,7 +711,8 @@ div.blockvmenulogo
 	border-bottom: 0 !important;
 }
 div.blockvmenusearch {
-	padding-bottom: 10px !important;
+	padding-bottom: 12px !important;
+	border-bottom: 1px solid #e0e0e0;
 }
 div.blockvmenupair, div.blockvmenuimpair, div.blockvmenubookmarks, div.blockvmenuend {
 	border-top: none !important;
@@ -699,9 +724,6 @@ div.blockvmenupair, div.blockvmenuimpair, div.blockvmenubookmarks, div.blockvmen
 div.vmenu, td.vmenu {
 	padding-right: 6px !important;
 }
-div.blockvmenulast {
-	border-bottom: 0;
-}
 div.fiche {
 	margin-<?php print $left; ?>: 6px !important;
 	margin-<?php print $right; ?>: 6px !important;
@@ -936,7 +958,6 @@ a.tmenu:link, a.tmenu:visited, a.tmenu:hover, a.tmenu:active {
     font-weight: normal;
 	padding: 0px 5px 0px 3px;
 	white-space: nowrap;
-	/*	text-shadow: 1px 1px 1px #000000; */
 	color: #<?php echo $colortextbackhmenu; ?>;
     text-decoration: none;
 }
@@ -980,13 +1001,16 @@ li.tmenu, li.tmenusel {
 	margin: 0 0 0 0;
 	font-weight: normal;
 }
+li.menuhider:hover {
+	background-image: none !important;
+}
 li.tmenusel, li.tmenu:hover {
-    background-image: -o-linear-gradient(bottom, rgba(250,250,250,0.3) 0%, rgba(0,0,0,0.5) 100%) !important;
+    background-image: -o-linear-gradient(bottom, rgba(250,250,250,0.3) 0%, rgba(0,0,0,0.5) 100%);
-    background-image: -moz-linear-gradient(bottom, rgba(0,0,0,0.5) 0%, rgba(250,250,250,0) 100%) !important;
+    background-image: -moz-linear-gradient(bottom, rgba(0,0,0,0.5) 0%, rgba(250,250,250,0) 100%);
-    background-image: -webkit-linear-gradient(bottom, rgba(0,0,0,0.5) 0%, rgba(250,250,250,0) 100%) !important;
+    background-image: -webkit-linear-gradient(bottom, rgba(0,0,0,0.5) 0%, rgba(250,250,250,0) 100%);
-    background-image: -ms-linear-gradient(bottom, rgba(250,250,250,0.3) 0%, rgba(0,0,0,0.5) 100%) !important;
+    background-image: -ms-linear-gradient(bottom, rgba(250,250,250,0.3) 0%, rgba(0,0,0,0.5) 100%);
-    background-image: linear-gradient(bottom, rgba(250,250,250,0.3) 0%, rgba(0,0,0,0.5) 100%) !important;
+    background-image: linear-gradient(bottom, rgba(250,250,250,0.3) 0%, rgba(0,0,0,0.5) 100%);
-	background: rgb(<?php echo $colorbackhmenu1 ?>);
+	/* background: rgb(<?php echo $colorbackhmenu1 ?>); */
 }
 .tmenuend .tmenuleft { width: 0px; }
 .tmenuend { display: none; }
@@ -1016,9 +1040,21 @@ div.tmenucenter
     height: <?php print $heightmenu; ?>px;
 	<?php } ?>
     width: 100%;
+	/*
+    max-width: <?php echo round($fontsize * 8); ?>px;
+   	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	color: #<?php echo $colortextbackhmenu; ?>;
+	*/
+}
+#menu_titre_logo {
+	padding-top: 0;
+	padding-bottom: 0;
 }
 div.menu_titre {
-	padding-top: 5px;
+	padding-top: 4px;
+	padding-bottom: 4px;
 }
 .mainmenuaspan
 {
@@ -1373,12 +1409,12 @@ div.vmenu, td.vmenu {
 }
 
 .menu_contenu {
-	padding-top: 5px;
+	padding-top: 3px;
-	padding-bottom: 2px;
+	padding-bottom: 3px;
 	overflow: hidden;
     text-overflow: ellipsis;
 }
-#menu_contenu_logo { padding-right: 4px; }
+#menu_contenu_logo { padding-top: 0; }
 .companylogo { }
 .searchform { padding-top: 4px; }
 
@@ -1402,15 +1438,20 @@ a.vsmenu.addbookmarkpicto {
 }
 .vmenu div.blockvmenubookmarks, .vmenu div.blockvmenuend, .vmenu div.blockvmenulogo, .vmenu div.blockvmenusearchphone
 {
-	border-bottom: 1px solid #BBB;
+/*	border-bottom: 1px solid #BBB; */
+}
+div.blockvmenusearchphone 
+{
+	border-bottom: none !important;
 }
 .vmenu div.blockvmenuend, .vmenu div.blockvmenulogo
 {
 	margin: 0 0 8px 2px;
 }
-.vmenu  div.blockvmenusearch
+.vmenu div.blockvmenusearch
 {
-	padding-bottom: 5px;
+	padding-bottom: 14px;
+	border-bottom: 1px solid #e0e0e0;
 }
 .vmenu div.blockvmenuend
 {
@@ -1419,6 +1460,7 @@ a.vsmenu.addbookmarkpicto {
 .vmenu div.blockvmenulogo
 {
 	padding-bottom: 10px;
+	padding-top: 0;
 }
 div.blockvmenubookmarks
 {
@@ -1434,21 +1476,12 @@ div.blockvmenupair, div.blockvmenuimpair, div.blockvmenubookmarks, div.blockvmen
     padding-right: 1px;
     padding-top: 3px;
     padding-bottom: 3px;
-    /* margin: 1px 0 8px 2px; */
     margin: 0 0 0 2px;
 
 	background: rgb(<?php echo $colorbackvmenu1; ?>);
 
     border-left: 1px solid #AAA;
     border-right: 1px solid #BBB;
-/*    border-bottom: 1px solid #BBB;
-    border-top: 1px solid #BBB;
-    border-radius: 4px;
-	-moz-border-radius: 4px;
-    -moz-box-shadow: 3px 3px 4px #DDD;
-    -webkit-box-shadow: 3px 3px 4px #DDD;
-    box-shadow: 3px 3px 4px #DDD;
-  */
 }
 
 div.blockvmenusearch
@@ -1457,26 +1490,11 @@ div.blockvmenusearch
 	color: #000000;
 	text-align: <?php print $left; ?>;
 	text-decoration: none;
-    /*padding-left: 5px;
+    margin: 1px 0px 0px 2px;
-    padding-right: 1px;
-    padding-top: 3px;
-    padding-bottom: 3px; */
-    margin: 1px 0px 4px 2px;
 	background: rgb(<?php echo $colorbackvmenu1; ?>);
-
-    /*border-left: 1px solid #AAA;
-    border-right: 1px solid #BBB;
-    border-bottom: 1px solid #BBB;
-    border-top: 1px solid #BBB;*/
-    /*border-radius: 4px;
-	-moz-border-radius: 4px;
-    -moz-box-shadow: 3px 3px 4px #DDD;
-    -webkit-box-shadow: 3px 3px 4px #DDD;
-    box-shadow: 3px 3px 4px #DDD;*/
 }
 
 div.blockvmenusearch > form > div {
-/* min-height: 40px; */
 	padding-top: 3px;
 }
 div.blockvmenusearch > form > div > label {
@@ -4301,7 +4319,7 @@ img.demothumb {
 
 /* nboftopmenuentries = <?php echo $nbtopmenuentries ?>, fontsize=<?php echo $fontsize ?> */
 /* rule to reduce top menu - 1st reduction */
-@media only screen and (max-width: <?php echo round($nbtopmenuentries * $fontsize * 6.7, 0) + 8; ?>px)
+@media only screen and (max-width: <?php echo round($nbtopmenuentries * $fontsize * 7, 0) + 20; ?>px)
 {
 	div.tmenucenter {
 	    max-width: <?php echo round($fontsize * 4); ?>px;	/* size of viewport */
@@ -4320,7 +4338,7 @@ img.demothumb {
 	}
 
     li.tmenu, li.tmenusel {
-    	min-width: 32px;
+    	min-width: 36px;
     }
     div.mainmenu {
     	min-width: auto;
@@ -4330,7 +4348,7 @@ img.demothumb {
 	}
 }
 /* rule to reduce top menu - 2nd reduction */
-@media only screen and (max-width: <?php echo round($nbtopmenuentries * $fontsize * 4.7, 0) + 8; ?>px)
+@media only screen and (max-width: <?php echo round($nbtopmenuentries * $fontsize * 4.5, 0) + 8; ?>px)
 {
 	div.mainmenu {
 		height: 23px;
@@ -4349,7 +4367,7 @@ img.demothumb {
 	}
 }
 /* rule to reduce top menu - 3rd reduction */
-@media only screen and (max-width: 605px)
+@media only screen and (max-width: 660px)
 {
 	/* Reduce login top right info */
 	.usertextatoplogin {
@@ -4376,7 +4394,7 @@ img.demothumb {
 		<?php } ?>
 	}
     li.tmenu, li.tmenusel {
-        min-width: 30px;
+        min-width: 32px;
     }
 	div.mainmenu {
 		height: 23px;