Merge pull request #1607 from GPCsolutions/3.6b-review

3.6b review

htdocs/compta/bank/search.php

@@ -167,9 +167,9 @@ if ($resql)
 
 	print '<form method="post" action="search.php" name="search_form">';
 	
-	$moreforfilter .= $langs->trans('Period') . ' ' . $langs->trans('DateOperationShort') . ': ';
+	$moreforfilter .= $langs->trans('Period') . ' ' . $langs->trans('StartDate') . ': ';
 	$moreforfilter .= $form->select_date($search_dt_start, 'search_start_dt', 0, 0, 1, "search_form", 1, 1, 1);
-	$moreforfilter .= $langs->trans('PeriodEndDate') . ':' . $form->select_date($search_dt_end, 'search_end_dt', 0, 0, 1, "search_form", 1, 1, 1);
+	$moreforfilter .= $langs->trans('EndDate') . ':' . $form->select_date($search_dt_end, 'search_end_dt', 0, 0, 1, "search_form", 1, 1, 1);
 	
 	
 	if ($moreforfilter) {

htdocs/compta/prelevement/bons.php

@@ -79,7 +79,7 @@ if ($result)
   print '<table class="liste" width="100%">';
 
   print '<tr class="liste_titre">';
-  print_liste_field_titre($langs->trans("WithdrawalReceipts"),"bons.php","p.ref",'','','class="liste_titre"');
+  print_liste_field_titre($langs->trans("WithdrawalsReceipts"),"bons.php","p.ref",'','','class="liste_titre"');
   print_liste_field_titre($langs->trans("Date"),"bons.php","p.datec","","",'class="liste_titre" align="center"');
   print '<td class="liste_titre" align="right">'.$langs->trans("Amount").'</td>';
   print '</tr>';

htdocs/compta/prelevement/factures.php

@@ -47,7 +47,7 @@ $page = GETPOST('page','int');
 $sortorder = ((GETPOST('sortorder','alpha')=="")) ? "DESC" : GETPOST('sortorder','alpha');
 $sortfield = ((GETPOST('sortfield','alpha')=="")) ? "p.ref" : GETPOST('sortfield','alpha');
 
-llxHeader('',$langs->trans("WithdrawalReceipts"));
+llxHeader('',$langs->trans("WithdrawalsReceipts"));
 
 if ($prev_id)
 {
@@ -56,7 +56,7 @@ if ($prev_id)
   	if ($bon->fetch($prev_id) == 0)
     {
     	$head = prelevement_prepare_head($bon);
-      	dol_fiche_head($head, 'invoices', $langs->trans("WithdrawalReceipts"), '', 'payment');
+		dol_fiche_head($head, 'invoices', $langs->trans("WithdrawalsReceipts"), '', 'payment');
 
       	print '<table class="border" width="100%">';
 

htdocs/compta/prelevement/fiche-rejet.php

@@ -46,7 +46,7 @@ $page = GETPOST('page','int');
 /*
  * View
  */
-llxHeader('',$langs->trans("WithdrawalReceipts"));
+llxHeader('',$langs->trans("WithdrawalsReceipts"));
 
 if ($prev_id)
 {
@@ -55,7 +55,7 @@ if ($prev_id)
   	if ($bon->fetch($prev_id) == 0)
     {
     	$head = prelevement_prepare_head($bon);
-      	dol_fiche_head($head, 'rejects', $langs->trans("WithdrawalReceipts"), '', 'payment');
+		dol_fiche_head($head, 'rejects', $langs->trans("WithdrawalsReceipts"), '', 'payment');
 
       	print '<table class="border" width="100%">';
 

htdocs/compta/prelevement/fiche-stat.php

@@ -44,7 +44,7 @@ $page = GETPOST('page','int');
  * View
  */
 
-llxHeader('',$langs->trans("WithdrawalReceipts"));
+llxHeader('',$langs->trans("WithdrawalsReceipts"));
 
 if ($prev_id)
 {
@@ -53,7 +53,7 @@ if ($prev_id)
 	if ($bon->fetch($prev_id) == 0)
 	{
 		$head = prelevement_prepare_head($bon);
-		dol_fiche_head($head, 'statistics', $langs->trans("WithdrawalReceipts"), '', 'payment');
+		dol_fiche_head($head, 'statistics', $langs->trans("WithdrawalsReceipts"), '', 'payment');
 
 		print '<table class="border" width="100%">';
 

htdocs/compta/prelevement/fiche.php

@@ -133,7 +133,7 @@ if ($action == 'infocredit' && $user->rights->prelevement->bons->credit)
 $bon = new BonPrelevement($db,"");
 $form = new Form($db);
 
-llxHeader('',$langs->trans("WithdrawalReceipts"));
+llxHeader('',$langs->trans("WithdrawalsReceipts"));                                                                     i
 
 
 if ($id > 0)
@@ -141,7 +141,7 @@ if ($id > 0)
 	$bon->fetch($id);
 
 	$head = prelevement_prepare_head($bon);
-	dol_fiche_head($head, 'prelevement', $langs->trans("WithdrawalReceipts"), '', 'payment');
+	dol_fiche_head($head, 'prelevement', $langs->trans("WithdrawalsReceipts"), '', 'payment');
 
 	if (GETPOST('error','alpha')!='')
 	{

htdocs/compta/prelevement/ligne.php

@@ -130,7 +130,7 @@ if ($id)
 
 		print '<table class="border" width="100%">';
 
-		print '<tr><td width="20%">'.$langs->trans("WithdrawalReceipts").'</td><td>';
+		print '<tr><td width="20%">'.$langs->trans("WithdrawalsReceipts").'</td><td>';
 		print '<a href="fiche.php?id='.$lipre->bon_rowid.'">'.$lipre->bon_ref.'</a></td></tr>';
 		print '<tr><td width="20%">'.$langs->trans("Date").'</td><td>'.dol_print_date($bon->datec,'day').'</td></tr>';
 		print '<tr><td width="20%">'.$langs->trans("Amount").'</td><td>'.price($lipre->amount).'</td></tr>';

htdocs/compta/prelevement/lignes.php

@@ -54,7 +54,7 @@ $sortfield = ((GETPOST('sortfield','alpha')=="")) ? "pl.fk_soc" : GETPOST('sortf
  * View
  */
 
-llxHeader('',$langs->trans("WithdrawalReceipts"));
+llxHeader('',$langs->trans("WithdrawalsReceipts"));
 
 if ($prev_id)
 {
@@ -63,7 +63,7 @@ if ($prev_id)
 	if ($bon->fetch($prev_id) == 0)
 	{
 		$head = prelevement_prepare_head($bon);
-		dol_fiche_head($head, 'lines', $langs->trans("WithdrawalReceipts"), '', 'payment');
+		dol_fiche_head($head, 'lines', $langs->trans("WithdrawalsReceipts"), '', 'payment');
 
 		print '<table class="border" width="100%">';
 

htdocs/compta/prelevement/liste.php

@@ -111,7 +111,7 @@ if ($result)
 
     print '<tr class="liste_titre">';
     print '<td class="liste_titre">'.$langs->trans("Line").'</td>';
-    print_liste_field_titre($langs->trans("WithdrawalReceipts"),$_SERVER["PHP_SELF"],"p.ref");
+    print_liste_field_titre($langs->trans("WithdrawalsReceipts"),$_SERVER["PHP_SELF"],"p.ref");
     print_liste_field_titre($langs->trans("Bill"),$_SERVER["PHP_SELF"],"f.facnumber",'',$urladd);
     print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom");
     print_liste_field_titre($langs->trans("CustomerCode"),$_SERVER["PHP_SELF"],"s.code_client",'','','align="center"');

htdocs/core/lib/member.lib.php

@@ -177,7 +177,7 @@ function member_stats_prepare_head($object)
     
     $head[$h][0] = DOL_URL_ROOT.'/adherents/stats/geo.php?mode=memberbyregion';
     $head[$h][1] = $langs->trans("Region");
-    $head[$h][2] = 'statscregion';
+    $head[$h][2] = 'statsregion';
     $h++;
 
     $head[$h][0] = DOL_URL_ROOT.'/adherents/stats/geo.php?mode=memberbystate';

htdocs/core/modules/contract/doc/pdf_strato.modules.php

@@ -24,7 +24,7 @@
 /**
  *	\file       htdocs/core/modules/contract/doc/pdf_strato.modules.php
  *	\ingroup    ficheinter
- *	\brief      Fichier de la classe permettant de generer les fiches d'intervention au modele Strato
+ *	\brief      Strato contracts template class file
  */
 require_once DOL_DOCUMENT_ROOT.'/core/modules/contract/modules_contract.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
@@ -64,7 +64,7 @@ class pdf_strato extends ModelePDFContract
 
 		$this->db = $db;
 		$this->name = 'strato';
-		$this->description = $langs->trans("DocumentModelStandard");
+		$this->description = $langs->trans("StandardContractsTemplate");
 
 		// Dimension page pour format A4
 		$this->type = 'pdf';
@@ -116,7 +116,6 @@ class pdf_strato extends ModelePDFContract
 		$outputlangs->load("dict");
 		$outputlangs->load("companies");
 		$outputlangs->load("contracts");
-		$outputlangs->load("interventions");
 
 		if ($conf->contrat->dir_output)
 		{
@@ -171,10 +170,10 @@ class pdf_strato extends ModelePDFContract
 				$pdf->SetDrawColor(128,128,128);
 
 				$pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
-				$pdf->SetSubject($outputlangs->transnoentities("InterventionCard"));
+				$pdf->SetSubject($outputlangs->transnoentities("ContractCard"));
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
-				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("InterventionCard"));
+				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("ContractCard"));
 				if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
 
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite);   // Left, Top, Right
@@ -408,13 +407,13 @@ class pdf_strato extends ModelePDFContract
 		if (empty($hidebottom))
 		{
 			$pdf->SetXY(20,230);
-			$pdf->MultiCell(66,5, $outputlangs->transnoentities("NameAndSignatureOfInternalContact"),0,'L',0);
+			$pdf->MultiCell(66,5, $outputlangs->transnoentities("ContactNameAndSignature", $this->emetteur->name),0,'L',0);
 
 			$pdf->SetXY(20,235);
 			$pdf->MultiCell(80,25, '', 1);
 
 			$pdf->SetXY(110,230);
-			$pdf->MultiCell(80,5, $outputlangs->transnoentities("NameAndSignatureOfExternalContact"),0,'L',0);
+			$pdf->MultiCell(80,5, $outputlangs->transnoentities("ContactNameAndSignature", $this->recipient->name),0,'L',0);
 
 			$pdf->SetXY(110,235);
 			$pdf->MultiCell(80,25, '', 1);
@@ -565,11 +564,11 @@ class pdf_strato extends ModelePDFContract
 				// On peut utiliser le nom de la societe du contact
 				if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socname = $object->contact->socname;
 				else $socname = $object->client->nom;
-				$carac_client_name=$outputlangs->convToOutputCharset($socname);
+				$this->recipient->name=$outputlangs->convToOutputCharset($socname);
 			}
 			else
 			{
-				$carac_client_name=$outputlangs->convToOutputCharset($object->client->nom);
+				$this->recipient->name=$outputlangs->convToOutputCharset($object->client->nom);
 			}
 
 			$carac_client=pdf_build_address($outputlangs, $this->emetteur, $object->client, (isset($object->contact)?$object->contact:''), $usecontact, 'target');
@@ -591,11 +590,11 @@ class pdf_strato extends ModelePDFContract
 			// Show recipient name
 			$pdf->SetXY($posx+2,$posy+3);
 			$pdf->SetFont('','B', $default_font_size);
-			$pdf->MultiCell($widthrecbox, 4, $carac_client_name, 0, 'L');
+			$pdf->MultiCell($widthrecbox, 4, $this->recipient->name, 0, 'L');
 
 			// Show recipient information
 			$pdf->SetFont('','', $default_font_size - 1);
-			$pdf->SetXY($posx+2,$posy+4+(dol_nboflines_bis($carac_client_name,50)*4));
+			$pdf->SetXY($posx+2,$posy+4+(dol_nboflines_bis($this->recipient->name,50)*4));
 			$pdf->MultiCell($widthrecbox, 4, $carac_client, 0, 'L');
 		}
 	}

htdocs/core/modules/modBarcode.class.php

@@ -95,7 +95,7 @@ class modBarcode extends DolibarrModules
         						'leftmenu'=>'barcodeprint',
         						'type'=>'left',			                // This is a Left menu entry
 						        'titre'=>'BarCodePrintsheet',
-						        'url'=>'/barcode/printsheet.php?mainmenu=home&leftmenu=modulesadmintools',
+						        'url'=>'/barcode/printsheet.php?mainmenu=tools&leftmenu=barcodeprint',
 						        'langs'=>'products',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
 						        'position'=>200,
 						        'enabled'=>'$conf->barcode->enabled',  // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.

htdocs/install/check.php

@@ -155,7 +155,7 @@ if ($memmaxorig != '')
 		if (strtoupper($reg[2]) == 'M') $memmax=$reg[1]*1024*1024;
 		if (strtoupper($reg[2]) == 'K') $memmax=$reg[1]*1024;
 	}
-	if ($memmax >= $memrequired)
+	if ($memmax >= $memrequired || $memmax == -1)
 	{
 		print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("PHPMemoryOK",$memmaxorig,$memrequiredorig)."<br>\n";
 	}
@@ -212,13 +212,13 @@ else
 		else dolibarr_install_syslog("failed to create a new file ".$conffile." into current dir ".getcwd().". Check permission.", LOG_ERR);
 	}
 
-	// First install, on ne peut pas upgrader
+	// First install, we can't upgrade
 	$allowupgrade=0;
 }
 
 
 
-// Si fichier absent et n'a pu etre cree
+// File is missng and can't be created
 if (! file_exists($conffile))
 {
 	print '<img src="../theme/eldy/img/error.png" alt="Error"> '.$langs->trans("ConfFileDoesNotExistsAndCouldNotBeCreated",$conffiletoshow);
@@ -231,7 +231,7 @@ if (! file_exists($conffile))
 }
 else
 {
-	// Si fichier present mais ne peut etre modifie
+	// File exists but can't be modified
 	if (!is_writable($conffile))
 	{
 		if ($confexists)
@@ -248,7 +248,7 @@ else
 
 		$allowinstall=0;
 	}
-	// Si fichier present et peut etre modifie
+	// File exists and can be modified
 	else
 	{
 		if ($confexists)
@@ -267,12 +267,12 @@ else
 	}
 	print "<br>\n";
 
-	// Si prerequis ok, on affiche le bouton pour passer a l'etape suivante
+	// Requirements ok, we display the next step button
 	if ($checksok)
 	{
 		$ok=0;
 
-		// Try to create db connexion
+		// Try to create db connection
 		if (file_exists($conffile))
 		{
 			include_once $conffile;
@@ -523,5 +523,5 @@ $("div#AShowChoices a").click(function() {
 
 </script>';
 
-pFooter(1);	// 1 car ne doit jamais afficher bouton Suivant
+pFooter(true);	// Never display next button
 

htdocs/langs/en_US/contracts.lang

@@ -89,6 +89,8 @@ ListOfServicesToExpireWithDuration=List of Services to expire in %s days
 ListOfServicesToExpireWithDurationNeg=List of Services expired from more than %s days
 ListOfServicesToExpire=List of Services to expire
 NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative.
+StandardContractsTemplate=Standard contracts template
+ContactNameAndSignature=For %s, name and signature:
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Sales representative signing contract

htdocs/langs/en_US/products.lang

@@ -28,8 +28,10 @@ ProductsAndServicesStatistics=Products and Services statistics
 ProductsStatistics=Products statistics
 ProductsOnSell=Available products
 ProductsNotOnSell=Obsolete products
+ProductsOnSellAndOnBuy=Products not for sale nor purchase
 ServicesOnSell=Available services
 ServicesNotOnSell=Obsolete services
+ServicesOnSellAndOnBuy=Services not for sale nor purchase
 InternalRef=Internal reference
 LastRecorded=Last products/services on sell recorded
 LastRecordedProductsAndServices=Last %s recorded products/services

htdocs/main.inc.php

@@ -1621,9 +1621,12 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me
 		//Dolibarr version
 	    $doliurl='http://www.dolibarr.org';
 
-	    //local communities
-	    if (preg_match('/fr/i',$langs->defaultlang)) $doliurl='http://www.dolibarr.fr';
+		//local communities
+		if (preg_match('/fr/i',$langs->defaultlang)) $doliurl='http://www.dolibarr.fr';
 		if (preg_match('/es/i',$langs->defaultlang)) $doliurl='http://www.dolibarr.es';
+		if (preg_match('/de/i',$langs->defaultlang)) $doliurl='http://www.dolibarr.de';
+		if (preg_match('/it/i',$langs->defaultlang)) $doliurl='http://www.dolibarr.it';
+		if (preg_match('/gr/i',$langs->defaultlang)) $doliurl='http://www.dolibarr.gr';
 
 	    $appli='Dolibarr';
 	    if (! empty($conf->global->MAIN_APPLICATION_TITLE))

htdocs/societe/admin/societe.php

@@ -765,18 +765,20 @@ print '</tr>';
 $var=!$var;
 print "<tr ".$bc[$var].">";
 print '<td width="80%">'.$langs->trans("AddRefInList").'</td>';
+print '<td>&nbsp</td>';
+print '<td align="center">';
 if (!empty($conf->global->SOCIETE_ADD_REF_IN_LIST))
 {
-	print '<td align="center" colspan="2"><a href="'.$_SERVER['PHP_SELF'].'?action=setaddrefinlist&value=0">';
+	print '<a href="'.$_SERVER['PHP_SELF'].'?action=setaddrefinlist&value=0">';
 	print img_picto($langs->trans("Activated"),'switch_on');
-	print '</a></td>';
+
 }
 else
 {
-	print '<td align="center" colspan="2"><a href="'.$_SERVER['PHP_SELF'].'?action=setaddrefinlist&value=1">';
+	print '<a href="'.$_SERVER['PHP_SELF'].'?action=setaddrefinlist&value=1">';
 	print img_picto($langs->trans("Disabled"),'switch_off');
-	print '</a></td>';
 }
+print '</a></td>';
 print '</tr>';