| '.$langs->trans("MessageLogin").' | ';
- // Editeur wysiwyg
- require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php");
- $doleditor=new DolEditor('main_home',(isset($conf->global->MAIN_HOME)?$conf->global->MAIN_HOME:''),'',142,'dolibarr_notes','In',false,true,true,ROWS_4,90);
+
+ $doleditor = new DolEditor('main_home', (isset($conf->global->MAIN_HOME)?$conf->global->MAIN_HOME:''), '', 142, 'dolibarr_notes', 'In', false, true, true, ROWS_4, 90);
$doleditor->Create();
+
print ' |
'."\n";
// Message of the day on home page
$var=!$var;
print '| '.$langs->trans("MessageOfDay").' | ';
- require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php");
- $doleditor=new DolEditor('main_motd',(isset($conf->global->MAIN_MOTD)?$conf->global->MAIN_MOTD:''),'',142,'dolibarr_notes','In',false,true,true,ROWS_4,90);
+
+ $doleditor = new DolEditor('main_motd', (isset($conf->global->MAIN_MOTD)?$conf->global->MAIN_MOTD:''), '', 142, 'dolibarr_notes', 'In', false, true, true, ROWS_4, 90);
$doleditor->Create();
+
print ' |
'."\n";
/*
diff --git a/htdocs/comm/propal/document.php b/htdocs/comm/propal/document.php
index 884d000adad..98e636d4c81 100644
--- a/htdocs/comm/propal/document.php
+++ b/htdocs/comm/propal/document.php
@@ -159,7 +159,7 @@ if ($object->id > 0)
print '';
- $linkback=''.$langs->trans("BackToList").'';
+ $linkback=''.$langs->trans("BackToList").'';
// Ref
print '| '.$langs->trans('Ref').' | ';
diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php
index ecbe46ab761..fcf6b5efee3 100644
--- a/htdocs/commande/fiche.php
+++ b/htdocs/commande/fiche.php
@@ -1464,6 +1464,9 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G
}
}
+ //WYSIWYG Editor
+ include_once(DOL_DOCUMENT_ROOT.'/core/modules/commande/modules_commande.php');
+
// Template to use by default
print ' |
| '.$langs->trans('Model').' | ';
print '';
@@ -1477,8 +1480,8 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G
print ' |
';
print '| '.$langs->trans('NotePublic').' | ';
print '';
- require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php");
- $doleditor=new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70);
+
+ $doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70);
print $doleditor->Create(1);
//print '';
print ' |
';
@@ -1489,7 +1492,7 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G
print '';
print '| '.$langs->trans('NotePrivate').' | ';
print '';
- require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php");
+
$doleditor=new DolEditor('note', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70);
print $doleditor->Create(1);
//print '';
diff --git a/htdocs/compta/deplacement/fiche.php b/htdocs/compta/deplacement/fiche.php
index 9e97c88ae1e..02cf7dcb4ef 100644
--- a/htdocs/compta/deplacement/fiche.php
+++ b/htdocs/compta/deplacement/fiche.php
@@ -255,6 +255,9 @@ $form = new Form($db);
*/
if ($action == 'create')
{
+ //WYSIWYG Editor
+ require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php");
+
print_fiche_titre($langs->trans("NewTrip"));
dol_htmloutput_errors($mesg);
@@ -295,9 +298,10 @@ if ($action == 'create')
print ' |
';
print '| '.$langs->trans('NotePublic').' | ';
print '';
- require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php");
- $doleditor=new DolEditor('note_public',GETPOST('note_public','alpha'),600,200,'dolibarr_notes','In',false,true,true,ROWS_8,100);
+
+ $doleditor = new DolEditor('note_public', GETPOST('note_public', 'alpha'), 600, 200, 'dolibarr_notes', 'In', false, true, true, ROWS_8, 100);
print $doleditor->Create(1);
+
print ' |
';
// Private note
@@ -306,9 +310,10 @@ if ($action == 'create')
print '';
print '| '.$langs->trans('NotePrivate').' | ';
print '';
- require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php");
- $doleditor=new DolEditor('note_private',GETPOST('note_private','alpha'),600,200,'dolibarr_notes','In',false,true,true,ROWS_8,100);
+
+ $doleditor = new DolEditor('note_private', GETPOST('note_private', 'alpha'), 600, 200, 'dolibarr_notes', 'In', false, true, true, ROWS_8, 100);
print $doleditor->Create(1);
+
print ' |
';
}
@@ -332,6 +337,9 @@ else if ($id)
if ($action == 'edit' && $user->rights->deplacement->creer)
{
+ //WYSIWYG Editor
+ require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php");
+
$soc = new Societe($db);
if ($object->socid)
{
@@ -382,9 +390,10 @@ else if ($id)
// Public note
print '| '.$langs->trans("NotePublic").' | ';
print '';
- require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php");
- $doleditor=new DolEditor('note_public',$object->note_public,600,200,'dolibarr_notes','In',false,true,true,ROWS_8,'100');
+
+ $doleditor = new DolEditor('note_public', $object->note_public, 600, 200, 'dolibarr_notes', 'In', false, true, true, ROWS_8, '100');
print $doleditor->Create(1);
+
print " |
";
// Private note
@@ -392,9 +401,10 @@ else if ($id)
{
print '| '.$langs->trans("NotePrivate").' | ';
print '';
- require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php");
- $doleditor=new DolEditor('note_private',$object->note_private,600,200,'dolibarr_notes','In',false,true,true,ROWS_8,'100');
+
+ $doleditor = new DolEditor('note_private', $object->note_private, 600, 200, 'dolibarr_notes', 'In', false, true, true, ROWS_8, '100');
print $doleditor->Create(1);
+
print " |
";
}
diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php
index ef5d48c7d34..f1f17b5a5d3 100644
--- a/htdocs/fourn/commande/fiche.php
+++ b/htdocs/fourn/commande/fiche.php
@@ -1408,6 +1408,9 @@ if ($id > 0 || ! empty($ref))
*/
if ($object->statut == 0 && $user->rights->fournisseur->commande->creer && $action <> 'editline')
{
+ //WYSIWYG Editor
+ require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php");
+
print '';
print '';
print ''; // ancre
@@ -1434,11 +1437,9 @@ if ($id > 0 || ! empty($ref))
if ($forceall || ($conf->product->enabled && $conf->service->enabled)
|| (empty($conf->product->enabled) && empty($conf->service->enabled))) print '
';
- // Editor wysiwyg
- require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php");
$nbrows=ROWS_2;
if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT;
- $doleditor=new DolEditor('dp_desc',GETPOST('dp_desc'),'',100,'dolibarr_details','',false,true,$conf->global->FCKEDITOR_ENABLE_DETAILS,$nbrows,70);
+ $doleditor = new DolEditor('dp_desc', GETPOST('dp_desc'), '', 100, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_DETAILS, $nbrows, 70);
$doleditor->Create();
print ' | ';
@@ -1492,11 +1493,9 @@ if ($id > 0 || ! empty($ref))
echo $hookmanager->executeHooks('formCreateProductSupplierOptions',$parameters,$object,$action);
}
- // Editor wysiwyg
- require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php");
$nbrows=ROWS_2;
if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT;
- $doleditor=new DolEditor('np_desc',GETPOST('np_desc'),'',100,'dolibarr_details','',false,true,$conf->global->FCKEDITOR_ENABLE_DETAILS,$nbrows,70);
+ $doleditor = new DolEditor('np_desc', GETPOST('np_desc'), '', 100, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_DETAILS, $nbrows, 70);
$doleditor->Create();
print '';
diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang
index 550796cc2bd..f1df9df59f2 100644
--- a/htdocs/langs/es_ES/admin.lang
+++ b/htdocs/langs/es_ES/admin.lang
@@ -61,7 +61,9 @@ PreviewNotAvailable=Vista previa no disponible
ThemeCurrentlyActive=Tema actualmente activo
CurrentTimeZone=Zona horaria PHP (Servidor)
Space=Área
+Table=Tabla
Fields=Campos
+Index=Índice
Mask=Máscara
NextValue=Próximo valor
NextValueForInvoices=Próximo valor (facturas)
@@ -156,6 +158,7 @@ ImportPostgreSqlDesc=Para importar una copia de seguridad, debe usar el comando
ImportMySqlCommand=%s %s < miarchivobackup.sql
ImportPostgreSqlCommand=%s %s miarchivobackup.sql
FileNameToGenerate=Nombre del archivo a generar
+Compression=Compresión
CommandsToDisableForeignKeysForImport=Comando para desactivar las claves excluyentes a la importación
ExportCompatibility=Compatibilidad del archivo de exportación generado
MySqlExportParameters=Parámetros de la exportación MySql
@@ -169,7 +172,7 @@ AddDropTable=Añadir órdenes DROP TABLE
Datas=Datos
NameColumn=Nombre las columnas
ExtendedInsert=Instrucciones INSERT extendidas
-NoLockBeforeInsert=Sin intrucción LOCK antes del INSERT
+NoLockBeforeInsert=Sin instrucción LOCK antes del INSERT
DelayedInsert=Inserciones con retraso
EncodeBinariesInHexa=Codificar los campos binarios en hexadecimal
IgnoreDuplicateRecords=Ignorar los errores de duplicación (INSERT IGNORE)
diff --git a/htdocs/langs/es_ES/main.lang b/htdocs/langs/es_ES/main.lang
index d42c71bc808..9d38e7b485a 100644
--- a/htdocs/langs/es_ES/main.lang
+++ b/htdocs/langs/es_ES/main.lang
@@ -504,7 +504,7 @@ ShowCustomerPreview=Ver historial cliente
ShowSupplierPreview=Ver historial proveedor
ShowProspectPreview=Ver historial cliente potencial
ShowAccountancyPreview=Ver historial contable
-RefCustomer=Ref. client
+RefCustomer=Ref. cliente
Currency=Divisa
InfoAdmin=Información para los administradores
Undo=Anular
diff --git a/htdocs/langs/es_ES/orders.lang b/htdocs/langs/es_ES/orders.lang
index 52c24e74b8a..8000334fb5d 100644
--- a/htdocs/langs/es_ES/orders.lang
+++ b/htdocs/langs/es_ES/orders.lang
@@ -65,7 +65,7 @@ UnvalidateOrder=Desvalidar el pedido
DeleteOrder=Eliminar el pedido
CancelOrder=Anular el pedido
AddOrder=Crear pedido
-AddToMyOrders=añadir a mis pedidos
+AddToMyOrders=Añadir a mis pedidos
AddToOtherOrders=Añadir a otros pedidos
ShowOrder=Mostrar pedido
NoOpenedOrders=Níngun pedido borrador
diff --git a/htdocs/langs/es_ES/products.lang b/htdocs/langs/es_ES/products.lang
index 1f4e5d16ad2..299fd575738 100644
--- a/htdocs/langs/es_ES/products.lang
+++ b/htdocs/langs/es_ES/products.lang
@@ -156,7 +156,7 @@ ServiceNb=Servicio no %s
ListProductServiceByPopularity=Listado de productos/servicios por popularidad
ListProductByPopularity=Listado de productos/servicios por popularidad
ListServiceByPopularity=Listado de servicios por popularidad
-Finished=Producto manofacturado
+Finished=Producto manufacturado
RowMaterial=Materia prima
CloneProduct=Clonar producto/servicio
ConfirmCloneProduct=¿Está seguro de querer clonar el producto o servicio %s?
diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php
index b7694adb377..aac1d444a9f 100644
--- a/htdocs/product/fiche.php
+++ b/htdocs/product/fiche.php
@@ -665,7 +665,10 @@ $helpurl='';
if (GETPOST("type") == '0') $helpurl='EN:Module_Products|FR:Module_Produits|ES:Módulo_Productos';
if (GETPOST("type") == '1') $helpurl='EN:Module_Services_En|FR:Module_Services|ES:Módulo_Servicios';
-llxHeader('',$langs->trans("CardProduct".GETPOST("type")),$helpurl);
+if (isset($_GET['type'])) $title = $langs->trans('CardProduct'.GETPOST('type'));
+else $title = $langs->trans('ProductServiceCard');
+
+llxHeader('', $title, $helpurl);
$form = new Form($db);
$formproduct = new FormProduct($db);
@@ -691,6 +694,9 @@ else
// -----------------------------------------
if ($action == 'create' && ($user->rights->produit->creer || $user->rights->service->creer))
{
+ //WYSIWYG Editor
+ require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php");
+
print '
';
diff --git a/htdocs/product/index.php b/htdocs/product/index.php
index 8703283e460..e1adb65923e 100644
--- a/htdocs/product/index.php
+++ b/htdocs/product/index.php
@@ -48,7 +48,7 @@ $transAreaType = $langs->trans("ProductsAndServicesArea");
$helpurl='';
if (! isset($_GET["type"]))
{
- $transAreaType = $langs->trans("ProductsArea");
+ $transAreaType = $langs->trans("ProductsAndServicesArea");
$helpurl='EN:Module_Products|FR:Module_Produits|ES:Módulo_Productos';
}
if ((isset($_GET["type"]) && $_GET["type"] == 0) || empty($conf->service->enabled))
diff --git a/htdocs/product/traduction.php b/htdocs/product/traduction.php
index eea25aceee9..20b154517c1 100644
--- a/htdocs/product/traduction.php
+++ b/htdocs/product/traduction.php
@@ -160,6 +160,9 @@ print '