diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php index b96fbd5a3e0..ba3952fc2c2 100644 --- 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 '
'; + print ''; print ''; print ""; print ''; @@ -133,7 +133,7 @@ if (! $_GET["action"] || $_GET["action"] == 'delete_section') //print_fiche_titre($langs->trans("ECMAutoOrg")); - print ''; + print ''; print '
'.$langs->trans("ECMSearchByKeywords").'
'; print ""; print ''; diff --git a/htdocs/ecm/search.php b/htdocs/ecm/search.php new file mode 100644 index 00000000000..f86170ec85b --- /dev/null +++ b/htdocs/ecm/search.php @@ -0,0 +1,78 @@ + + */ + +/** + \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."
"; } + + +print $langs->trans("FeatureNotYetAvailable"); + +// End of page +$db->close(); + +llxFooter('$Date$ - $Revision$'); +?> diff --git a/htdocs/langs/en_US/ecm.lang b/htdocs/langs/en_US/ecm.lang index 203f8858cb7..7f2045ec57a 100644 --- 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 \ No newline at end of file +# 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.
* Manual directories can be used to save documents not linked to a particular element. +ECMSectionWasRemoved=Directory %s 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 %s ? diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang index 99024adfffb..1a2bc795fcf 100644 --- 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 diff --git a/htdocs/langs/es_ES/ecm.lang b/htdocs/langs/es_ES/ecm.lang index 3117e2a5ef5..8a97b63876e 100644 --- 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
Las rúbricas automáticas son alimentadas automáticamente en la adición de un documento en una ficha objeto. -ECMSectionWasRemoved=La rúbrica %s 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 %s? +# 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
Las rúbricas automáticas son alimentadas automáticamente en la adición de un documento en una ficha objeto. +ECMSectionWasRemoved=La rúbrica %s 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 %s? diff --git a/htdocs/langs/fr_FR/ecm.lang b/htdocs/langs/fr_FR/ecm.lang index 7c5ce9cc266..fdd1361cbe2 100644 --- 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 diff --git a/htdocs/langs/fr_FR/stocks.lang b/htdocs/langs/fr_FR/stocks.lang index a6e0bc5c553..8204a3483d9 100644 --- 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 diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php index f5dbd04f4fd..ad821a37675 100644 --- a/htdocs/product/fiche.php +++ b/htdocs/product/fiche.php @@ -854,27 +854,12 @@ if ($_GET["id"] || $_GET["ref"]) // TVA print ''; - // Stock - if ($product->isproduct() && $conf->stock->enabled) - { - print ''; - if ($product->stock_reel < $product->seuil_stock_alerte) - { - print ''; - } - else - { - print "'; - } - print ''; - } - // Description print ''; - // Durée if ($product->isservice()) { + // Duration print ''; print ''; } diff --git a/htdocs/product/stats/fiche.php b/htdocs/product/stats/fiche.php index c52ba319c82..875da6b1927 100644 --- 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 ''; - // Stock - if ($product->isproduct() && $conf->stock->enabled) - { - print ''; - if ($product->no_stock) - { - print "'; - } - //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"; diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php index 31ee2b2d26d..34258bbc426 100644 --- a/htdocs/product/stock/product.php +++ b/htdocs/product/stock/product.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2006 Laurent Destailleur + * Copyright (C) 2004-2008 Laurent Destailleur * Copyright (C) 2004 Eric Seigne * Copyright (C) 2005 Simon TOSSER * Copyright (C) 2005-2007 Regis Houssin @@ -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 ''; // Stock - print ''; + print ''; + print ''; + print ''; + + // Stock + print ''; if ($product->stock_reel < $product->seuil_stock_alerte) { - print ''; + print ''; } else { @@ -153,7 +159,11 @@ if ($_GET["id"] || $_GET["ref"]) } print ''; - + // Stock + print ''; + print "'; + print ''; + // Nbre de commande clients en cours if ($conf->commande->enabled) {
'.$langs->trans("ECMSearchByEntity").'
'.$langs->trans("VATRate").''.price2num($product->tva_tx,'MU').'%
'.$langs->trans("Stock").''.$product->stock_reel.' '.img_warning().' ('.$langs->trans("StockLimitShort").': '.$product->seuil_stock_alerte.')".$product->stock_reel.'
'.$langs->trans("Description").''.nl2br($product->description).'
'.$langs->trans("Duration").''.$product->duration_value.' '; if ($product->duration_value > 1) { @@ -890,6 +875,7 @@ if ($_GET["id"] || $_GET["ref"]) } else { + // Weight / Volume print '
'.$langs->trans("Weight").''; if ($product->weight != '') { @@ -995,6 +981,7 @@ if ($_GET["id"] || $_GET["ref"]) if ($product->isservice()) { + // Duration print '
'.$langs->trans("Duration").''; print '  '; print '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 '
'.$langs->trans("Weight").''; - print ''; + print ' '; print $html->select_measuring_units("weight_units", "weight", $product->weight_units); print '
'.$langs->trans("Volume").''; - print ''; + print ' '; print $html->select_measuring_units("volume_units", "volume", $product->volume_units); print '
'.$langs->trans("Stock").'".$langs->trans("NoStockForThisProduct"); - } - else - { - if ($product->stock_reel <= $product->seuil_stock_alerte) - { - print ''.img_warning().' '.$product->stock_reel.' Seuil : '.$product->seuil_stock_alerte; - } - else - { - print "".$product->stock_reel; - } - } - print '
'.$langs->trans("TotalStock").'
'.$langs->trans("StockLimit").''.$product->seuil_stock_alerte.'
'.$langs->trans("PhysicalStock").''.$product->stock_reel.' '.img_warning().' (Seuil: '.$product->seuil_stock_alerte.')'.$product->stock_reel.' '.img_warning().'
'.$langs->trans("VirtualStock").'".$langs->trans("FeatureNotYetAvailable").'