Trad: Translaction for module ECM

2008-04-28 22:27:49 +00:00 · 2008-04-28 22:27:49 +00:00 · a48743a243
commit a48743a243
parent 3062b49bbe
10 changed files with 189 additions and 103 deletions
--- a/htdocs/ecm/index.php
+++ b/htdocs/ecm/index.php
@ -118,7 +118,7 @@ if (! $_GET["action"] || $_GET["action"] == 'delete_section')

 	//print_fiche_titre($langs->trans("ECMManualOrg"));

-	print '<form method="post" action="'.DOL_URL_ROOT.'/ecm/todo.php">';
+	print '<form method="post" action="'.DOL_URL_ROOT.'/ecm/search.php">';
 	print '<table class="noborder" width="100%">';
 	print "<tr class=\"liste_titre\">";
 	print '<td colspan="3">'.$langs->trans("ECMSearchByKeywords").'</td></tr>';
@ -133,7 +133,7 @@ if (! $_GET["action"] || $_GET["action"] == 'delete_section')

 	//print_fiche_titre($langs->trans("ECMAutoOrg"));

-	print '<form method="post" action="'.DOL_URL_ROOT.'/ecm/todo.php">';
+	print '<form method="post" action="'.DOL_URL_ROOT.'/ecm/search.php">';
 	print '<table class="noborder" width="100%">';
 	print "<tr class=\"liste_titre\">";
 	print '<td colspan="3">'.$langs->trans("ECMSearchByEntity").'</td></tr>';
--- a/htdocs/ecm/search.php
+++ b/htdocs/ecm/search.php
@ -0,0 +1,78 @@
+<?php
+/* Copyright (C) 2008 Laurent Destailleur  <eldy@users.sourceforge.net>
+ */
+
+/**
+    	\file       htdoc/ecm/earch.php
+		\ingroup    ecm
+		\brief      Page for search results
+		\version    $Id$
+		\author		Laurent Destailleur
+*/
+
+require("./pre.inc.php");
+require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php");
+
+// Load traductions files
+$langs->load("ecm");
+$langs->load("companies");
+$langs->load("other");
+
+// Load permissions
+$user->getrights('ecm');
+
+// Get parameters
+$socid = isset($_GET["socid"])?$_GET["socid"]:'';
+
+// Permissions
+if ($user->societe_id > 0)
+{
+    $action = '';
+    $socid = $user->societe_id;
+}
+
+$section=$_GET["section"];
+if (! $section) $section='misc';
+$upload_dir = $conf->ecm->dir_output.'/'.$section;
+
+
+
+/*******************************************************************
+* ACTIONS
+*
+* Put here all code to do according to value of "action" parameter
+********************************************************************/
+
+
+
+
+
+/*******************************************************************
+* PAGE
+*
+* Put here all code to do according to value of "action" parameter
+********************************************************************/
+
+llxHeader();
+
+$form=new Form($db);
+
+print_fiche_titre($langs->trans("Search"));
+
+//$head = societe_prepare_head($societe);
+
+
+//dolibarr_fiche_head($head, 'document', $societe->nom);
+
+
+
+if ($mesg) { print $mesg."<br>"; }
+
+
+print $langs->trans("FeatureNotYetAvailable");
+
+// End of page
+$db->close();
+
+llxFooter('$Date$ - $Revision$');
+?>
--- a/htdocs/langs/en_US/ecm.lang
+++ b/htdocs/langs/en_US/ecm.lang
@ -1,7 +1,43 @@
-# Dolibarr language file - en_US - ecm
-MenuECM=Documents
-DocsMine=My documents
-DocsThirdParties=Documents third parties
-DocsInvoices=Documents invoices
-DocsProposals=Documents proposals
-ECMArea=Electronic Content Management area
+# Dolibarr language file - en_US - ecm
+MenuECM=Documents
+DocsMine=My documents
+DocsGenerated=Generated documents
+DocsElements=Elements documents
+DocsThirdParties=Documents third parties
+DocsContracts=Documents contracts
+DocsProposals=Documents proposals
+DocsOrders=Documents orders
+DocsInvoices=Documents invoices
+ECMNbOfDocs=Nb doc
+ECMSection=Directory
+ECMSectionManual=Manual directory
+ECMSectionAuto=Automatic directory
+ECMSections=Directories
+ECMRoot=Root
+ECMNewSection=New directory
+ECMAddSection=Add a manual directory
+ECMNewSection=New manual directory
+ECMNewDocument=New document
+ECMCreationDate=Creation date
+ECMCreationUser=Creator
+ECMArea=Electronic Content Management area
+ECMAreaDesc=The Electronic Content Management area allows you to save, share and search quickly documents in Dolibarr.
+ECMAreaDesc2=* Automatic directories are filled automatically when adding documents from card of an element.<br>* Manual directories can be used to save documents not linked to a particular element.
+ECMSectionWasRemoved=Directory <b>%s</b> has been deleted.
+ECMDocumentsSection=Document of directory
+ECMSearchByKeywords=Search by keywords
+ECMSearchByEntity=Search by object
+ECMSectionOfDocuments=Directories of documents
+ECMTypeManual=Manual
+ECMTypeAuto=Automatic
+ECMDocsByThirdParties=Documents linked to third parties
+ECMDocsByProposals=Documents linked to proposals
+ECMDocsByOrders=Documents linked to customers orders
+ECMDocsByContracts=Documents linked to contracts
+ECMDocsByInvoices=Documents linked to customers invoices
+ECMManualOrg=Manual directory
+ECMAutoOrg=Automatic directory
+ECMNoDirecotyYet=No directory created
+ShowECMSection=Show directory
+DeleteSection=Remove directory
+ConfirmDeleteSection=Can you confirm you want to delete the directory <b>%s</b> ?
--- a/htdocs/langs/en_US/stocks.lang
+++ b/htdocs/langs/en_US/stocks.lang
@ -42,10 +42,11 @@ DeStockReStockOnBill=Decrease/increase stocks on invoices/credit notes
 DeStockReStockOnValidateOrder=Decrease/increase stocks on orders notes
 DeStockReStockOnShipment=Decrease/increase stocks on shipment
 StockLimitShort=Limit
-StockLimit=Stock limit
+StockLimit=Stock limit for alerts
 PhysicalStock=Physical stock
 RealStock=Real Stock
-TheoreticalStock=Stock théorique
+TheoreticalStock=Therocial stock
+VirtualStock=Virtual stock
 MininumStock=Minimum stock
 StockUp=Stock up
 MininumStockShort=Stock min
--- a/htdocs/langs/es_ES/ecm.lang
+++ b/htdocs/langs/es_ES/ecm.lang
@ -1,42 +1,40 @@
-# Dolibarr language file - es_ES - ecm
-MenuECM=Documentos
-DocsMine=Mis documentos
-DocsGlobal=Documentos globales
-DocsExternal=Documentos externos
-DocsGenerated=Documentos generados
-DocsElements=Doocumentos elementos
-DocsThirdParties=Documentos terceros
-DocsContracts=Documentos contratos
-DocsProposals=Documentos presupuestos
-DocsOrders=Documentos pedidos
-DocsInvoices=Documentos facturas
-ECMNbOfDocs=Nº de documentos
-ECMSection=Rúbrica
-ECMSections=Rúbricas
-ECMRoot=Raíz
-ECMNewSection=Nueva rúbrica
-ECMAddSection=Añadir rúbrica manual
-ECMNewSection=Nueva rúbrica manual
-ECMNewDocument=Nuevo documento
-ECMCreationDate=Fecha creación
-ECMCreationUser=Creador
-ECMArea=Area gestión de documentos
-ECMAreaDesc=El área de gestión de documentos le permite controlar rápidamente los documentos en Dolibarr.
-ECMAreaDesc2=Puede crear las rúbricas manuales y adjuntar los documentos<br>Las rúbricas automáticas son alimentadas automáticamente en la adición de un documento en una ficha objeto.
-ECMSectionWasRemoved=La rúbrica <b>%s</b> ha sido eliminada
-ECMDocumentsSection=Documento de la sección
-ECMSearchByKeywords=Buscar por palabras clave
-ECMSearchByEntity=Buscar por objeto
-ECMSectionOfDocuments=Rúbricas de documetos
-ECMTypeManual=Manual
-ECMTypeAuto=Automático
-ECMDocsByThirdParties=Documentos asociados a terceros
-ECMDocsByProposals=Documentos asoicados a presupuestos
-ECMDocsByOrders=Documentos asociados a pedidos
-ECMDocsByContracts=Documentos asociados a contratos
-ECMDocsByInvoices=Documentos asociados a facturas
-ECMManualOrg=Rúbrica manual
-ECMAutoOrg=Rúbrica automática
-ShowECMSection=Mostrar rúbrica
-DeleteSection=Eleminación rúbrica
-ConfirmDeleteSection=¿Confirma la eliminación de la rúbrica <b>%s</b>?
+# Dolibarr language file - es_ES - ecm
+MenuECM=Documentos
+DocsMine=Mis documentos
+DocsGenerated=Documentos generados
+DocsElements=Doocumentos elementos
+DocsThirdParties=Documentos terceros
+DocsContracts=Documentos contratos
+DocsProposals=Documentos presupuestos
+DocsOrders=Documentos pedidos
+DocsInvoices=Documentos facturas
+ECMNbOfDocs=Nº de documentos
+ECMSection=Rúbrica
+ECMSections=Rúbricas
+ECMRoot=Raíz
+ECMNewSection=Nueva rúbrica
+ECMAddSection=Añadir rúbrica manual
+ECMNewSection=Nueva rúbrica manual
+ECMNewDocument=Nuevo documento
+ECMCreationDate=Fecha creación
+ECMCreationUser=Creador
+ECMArea=Area gestión de documentos
+ECMAreaDesc=El área de gestión de documentos le permite controlar rápidamente los documentos en Dolibarr.
+ECMAreaDesc2=Puede crear las rúbricas manuales y adjuntar los documentos<br>Las rúbricas automáticas son alimentadas automáticamente en la adición de un documento en una ficha objeto.
+ECMSectionWasRemoved=La rúbrica <b>%s</b> ha sido eliminada
+ECMDocumentsSection=Documento de la sección
+ECMSearchByKeywords=Buscar por palabras clave
+ECMSearchByEntity=Buscar por objeto
+ECMSectionOfDocuments=Rúbricas de documetos
+ECMTypeManual=Manual
+ECMTypeAuto=Automático
+ECMDocsByThirdParties=Documentos asociados a terceros
+ECMDocsByProposals=Documentos asoicados a presupuestos
+ECMDocsByOrders=Documentos asociados a pedidos
+ECMDocsByContracts=Documentos asociados a contratos
+ECMDocsByInvoices=Documentos asociados a facturas
+ECMManualOrg=Rúbrica manual
+ECMAutoOrg=Rúbrica automática
+ShowECMSection=Mostrar rúbrica
+DeleteSection=Eleminación rúbrica
+ConfirmDeleteSection=¿Confirma la eliminación de la rúbrica <b>%s</b>?
--- a/htdocs/langs/fr_FR/ecm.lang
+++ b/htdocs/langs/fr_FR/ecm.lang
@ -1,8 +1,6 @@
 # Dolibarr language file - fr_FR - ecm
 MenuECM=Documents
 DocsMine=Mes documents
-DocsGlobal=Documents globaux
-DocsExternal=Documents externes
 DocsGenerated=Documents générés
 DocsElements=Documents élements
 DocsThirdParties=Documents tiers
--- a/htdocs/langs/fr_FR/stocks.lang
+++ b/htdocs/langs/fr_FR/stocks.lang
@ -42,10 +42,11 @@ DeStockReStockOnBill=D
 DeStockReStockOnValidateOrder=Décrémente/Incrémente les stocks sur les commandes
 DeStockReStockOnShipment=Décrémente/Incrémente les stocks sur les expéditions
 StockLimitShort=Seuil
-StockLimit=Seuil stock
+StockLimit=Seuil alerte stock
 PhysicalStock=Stock physique
 RealStock=Stock réel
 TheoreticalStock=Stock théorique
+VirtualStock=Stock théorique
 MininumStock=Stock minimum
 StockUp=Stock maximum
 MininumStockShort=Stock min
--- a/htdocs/product/fiche.php
+++ b/htdocs/product/fiche.php
@ -854,27 +854,12 @@ if ($_GET["id"] || $_GET["ref"])
 			// TVA
 			print '<tr><td>'.$langs->trans("VATRate").'</td><td>'.price2num($product->tva_tx,'MU').'%</td></tr>';
 			
-			// Stock
-			if ($product->isproduct() && $conf->stock->enabled)
-			{
-				print '<tr><td>'.$langs->trans("Stock").'</td>';
-				if ($product->stock_reel < $product->seuil_stock_alerte)
-				{
-					print '<td>'.$product->stock_reel.' '.img_warning().' ('.$langs->trans("StockLimitShort").': '.$product->seuil_stock_alerte.')</td>';
-				}
-				else
-				{
-					print "<td>".$product->stock_reel.'</td>';
-				}
-				print '</tr>';
-			}
-			
 			// Description
 			print '<tr><td valign="top">'.$langs->trans("Description").'</td><td>'.nl2br($product->description).'</td></tr>';
 			
-			// Durée
 			if ($product->isservice())
 			{
+				// Duration
 				print '<tr><td>'.$langs->trans("Duration").'</td><td>'.$product->duration_value.'&nbsp;';
 				if ($product->duration_value > 1)
 				{
@ -890,6 +875,7 @@ if ($_GET["id"] || $_GET["ref"])
 			}
 			else
 			{
+				// Weight / Volume
 				print '<tr><td>'.$langs->trans("Weight").'</td><td>';
 				if ($product->weight != '')
 				{
@ -995,6 +981,7 @@ if ($_GET["id"] || $_GET["ref"])

 	  if ($product->isservice())
 	    {
+	    	// Duration
 	      print '<tr><td>'.$langs->trans("Duration").'</td><td colspan="2"><input name="duration_value" size="3" maxlength="5" value="'.$product->duration_value.'">';
 	      print '&nbsp; ';
 	      print '<input name="duration_unit" type="radio" value="h"'.($product->duration_unit=='h'?' checked':'').'>'.$langs->trans("Hour");
@ -1011,13 +998,13 @@ if ($_GET["id"] || $_GET["ref"])
 	    }
 	  else
 	    {
-	      // Le poids et le volume ne concerne que les produits et pas les services
+	      // Weight / Volume
 	      print '<tr><td>'.$langs->trans("Weight").'</td><td>';
-	      print '<input name="weight" size="5" value="'.$product->weight.'">';
+	      print '<input name="weight" size="5" value="'.$product->weight.'"> ';
 	      print $html->select_measuring_units("weight_units", "weight", $product->weight_units);
 	      print '</td></tr>';
 	      print '<tr><td>'.$langs->trans("Volume").'</td><td>';
-	      print '<input name="volume" size="5" value="'.$product->volume.'">';
+	      print '<input name="volume" size="5" value="'.$product->volume.'"> ';
 	      print $html->select_measuring_units("volume_units", "volume", $product->volume_units);
 	      print '</td></tr>';
 	    }
--- a/htdocs/product/stats/fiche.php
+++ b/htdocs/product/stats/fiche.php
@ -103,29 +103,6 @@ if ($_GET["id"] || $_GET["ref"])
 		print $product->getLibStatut(2);
 		print '</td></tr>';

-		// Stock
-		if ($product->isproduct() && $conf->stock->enabled)
-		{
-			print '<tr><td>'.$langs->trans("Stock").'</td>';
-			if ($product->no_stock)
-			{
-				print "<td>".$langs->trans("NoStockForThisProduct");
-			}
-			else
-			{
-				if ($product->stock_reel <= $product->seuil_stock_alerte)
-				{
-					print '<td>'.img_warning().' '.$product->stock_reel.' Seuil : '.$product->seuil_stock_alerte;
-				}
-				else
-				{
-					print "<td>".$product->stock_reel;
-				}
-			}
-			print '</td></tr>';
-		}	
-		//show_stats_for_company($product,$socid);
-
 		// Graphs additionels generes pas les cron
 		$year = strftime('%Y',time());
 		$file = get_exdir($product->id, 3) . "ventes-".$year."-".$product->id.".png";	
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2001-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2006 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
 * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
 * Copyright (C) 2005      Simon TOSSER         <simon@kornog-computing.com>
 * Copyright (C) 2005-2007 Regis Houssin        <regis@dolibarr.fr>
@ -42,7 +42,8 @@ if (! $user->rights->produit->lire || ! $product->type == 0 || ! $conf->stock->e
 	accessforbidden();
 }

-/**
+
+/*
 *	Actions
 */

@ -142,10 +143,15 @@ if ($_GET["id"] || $_GET["ref"])
        print '</td></tr>';

        // Stock
-        print '<tr><td>'.$langs->trans("TotalStock").'</td>';
+        print '<tr><td>'.$langs->trans("StockLimit").'</td>';
+		print '<td>'.$product->seuil_stock_alerte.'</td>';
+        print '</tr>';
+        
+        // Stock
+        print '<tr><td>'.$langs->trans("PhysicalStock").'</td>';
 		if ($product->stock_reel < $product->seuil_stock_alerte)
 		{
-			print '<td>'.$product->stock_reel.' '.img_warning().' (Seuil: '.$product->seuil_stock_alerte.')</td>';
+			print '<td>'.$product->stock_reel.' '.img_warning().'</td>';
 		}
 		else
 		{
@ -153,7 +159,11 @@ if ($_GET["id"] || $_GET["ref"])
 		}
        print '</tr>';
        
-
+        // Stock
+        print '<tr><td>'.$langs->trans("VirtualStock").'</td>';
+		print "<td>".$langs->trans("FeatureNotYetAvailable").'</td>';
+        print '</tr>';
+        
        // Nbre de commande clients en cours
 	if ($conf->commande->enabled)
 	  {