From bb191021de6e8a3401ab29656002a2d13166c5ad Mon Sep 17 00:00:00 2001 From: Alexis Algoud Date: Mon, 2 Dec 2013 16:04:30 +0100 Subject: [PATCH 01/11] Add entitytotest test, because a LDAP user can override the entity restriction without this test --- htdocs/core/login/functions_ldap.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/htdocs/core/login/functions_ldap.php b/htdocs/core/login/functions_ldap.php index b9c5d89a72e4d..ca9fcfd3a020d 100644 --- a/htdocs/core/login/functions_ldap.php +++ b/htdocs/core/login/functions_ldap.php @@ -41,6 +41,7 @@ function check_user_password_ldap($usertotest,$passwordtotest,$entitytotest) global $dolibarr_main_auth_ldap_admin_login,$dolibarr_main_auth_ldap_admin_pass; global $dolibarr_main_auth_ldap_filter; global $dolibarr_main_auth_ldap_debug; + global $mc; if (! function_exists("ldap_connect")) { @@ -168,6 +169,9 @@ function check_user_password_ldap($usertotest,$passwordtotest,$entitytotest) { dol_syslog("functions_ldap::check_user_password_ldap Sync user found id=".$user->id); // On verifie si le login a change et on met a jour les attributs dolibarr + $ret=$mc->checkRight($user->id, $entitytotest); + if ($ret < 0) $login=false; // provoque l'echec de l'identification + if ($user->login != $ldap->login && $ldap->login) { $user->login = $ldap->login; From 895f5452b4080aa2d0e3df037ea685d4415b3344 Mon Sep 17 00:00:00 2001 From: Alexis Algoud Date: Wed, 11 Dec 2013 15:14:29 +0100 Subject: [PATCH 02/11] In some cases of improper use of the delete () function, the complete repertoire of propale objects, invoice or order was deleted. Ex in agefodd module: $obj_link=new Propal($db); $obj_link->id=$agf->propalid; $resultdel=$obj_link->delete($user); To prevent misuse of the function, the reference is not considered given --- htdocs/comm/propal/class/propal.class.php | 2 +- htdocs/commande/class/commande.class.php | 2 +- htdocs/compta/facture/class/facture.class.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index de67b9c78de83..990af29d90f10 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -2056,7 +2056,7 @@ function delete($user, $notrigger=0) { // We remove directory $ref = dol_sanitizeFileName($this->ref); - if ($conf->propal->dir_output) + if ($conf->propal->dir_output && !empty($this->ref)) { $dir = $conf->propal->dir_output . "/" . $ref ; $file = $dir . "/" . $ref . ".pdf"; diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index 275037903757e..a2225b033b811 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -2457,7 +2457,7 @@ function delete($user, $notrigger=0) // On efface le repertoire de pdf provisoire $comref = dol_sanitizeFileName($this->ref); - if ($conf->commande->dir_output) + if ($conf->commande->dir_output && !empty($this->ref)) { $dir = $conf->commande->dir_output . "/" . $comref ; $file = $conf->commande->dir_output . "/" . $comref . "/" . $comref . ".pdf"; diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index 461b3606cd694..8091129052101 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -1323,7 +1323,7 @@ function delete($rowid=0, $notrigger=0, $idwarehouse=-1) { // On efface le repertoire de pdf provisoire $ref = dol_sanitizeFileName($this->ref); - if ($conf->facture->dir_output) + if ($conf->facture->dir_output && !empty($this->ref)) { $dir = $conf->facture->dir_output . "/" . $ref; $file = $conf->facture->dir_output . "/" . $ref . "/" . $ref . ".pdf"; From ba70794c1df50e9a31d836dc77b1c50919316467 Mon Sep 17 00:00:00 2001 From: Alexis Algoud Date: Mon, 16 Dec 2013 09:45:38 +0100 Subject: [PATCH 03/11] Add multicompany->enabled test --- htdocs/core/login/functions_ldap.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/htdocs/core/login/functions_ldap.php b/htdocs/core/login/functions_ldap.php index ca9fcfd3a020d..07c568d41fc64 100644 --- a/htdocs/core/login/functions_ldap.php +++ b/htdocs/core/login/functions_ldap.php @@ -41,7 +41,6 @@ function check_user_password_ldap($usertotest,$passwordtotest,$entitytotest) global $dolibarr_main_auth_ldap_admin_login,$dolibarr_main_auth_ldap_admin_pass; global $dolibarr_main_auth_ldap_filter; global $dolibarr_main_auth_ldap_debug; - global $mc; if (! function_exists("ldap_connect")) { @@ -169,8 +168,14 @@ function check_user_password_ldap($usertotest,$passwordtotest,$entitytotest) { dol_syslog("functions_ldap::check_user_password_ldap Sync user found id=".$user->id); // On verifie si le login a change et on met a jour les attributs dolibarr - $ret=$mc->checkRight($user->id, $entitytotest); - if ($ret < 0) $login=false; // provoque l'echec de l'identification + + if ($conf->multicompany->enabled) { + global $mc; + + $ret=$mc->checkRight($user->id, $entitytotest); + if ($ret < 0) $login=false; // provoque l'echec de l'identification + } + if ($user->login != $ldap->login && $ldap->login) { From dce354adc33960de4d08a0512074c05348b19217 Mon Sep 17 00:00:00 2001 From: Geoffrey Date: Mon, 16 Dec 2013 11:13:39 +0100 Subject: [PATCH 04/11] add extrafields support in supplier orders. managed in configuration but not in view mode --- htdocs/fourn/commande/fiche.php | 117 +++++++++++++++++++++++++++++++- 1 file changed, 114 insertions(+), 3 deletions(-) diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php index 8c87e754bc4ba..cdb8b4f93a6a4 100644 --- a/htdocs/fourn/commande/fiche.php +++ b/htdocs/fourn/commande/fiche.php @@ -75,6 +75,10 @@ $hookmanager->initHooks(array('ordersuppliercard')); $object = new CommandeFournisseur($db); +$extrafields = new ExtraFields($db); + +// fetch optionals attributes and labels +$extralabels=$extrafields->fetch_name_optionals_label($object->table_element); // Load object if ($id > 0 || ! empty($ref)) @@ -692,6 +696,40 @@ else setEventMessage($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), 'errors'); } +elseif ($action == 'update_extras') +{ + // Fill array 'array_options' with data from add form + $extralabels=$extrafields->fetch_name_optionals_label($object->table_element); + $ret = $extrafields->setOptionalsFromPost($extralabels,$object); + if($ret < 0) + $error++; + + if(!$error) { + // Actions on extra fields (by external module or standard code) + // FIXME le hook fait double emploi avec le trigger !! + $hookmanager->initHooks(array('supplierorderdao')); + $parameters=array('id'=>$object->id); + $reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks + if (empty($reshook)) + { + if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used + { + $result=$object->insertExtraFields(); + if ($result < 0) + { + $error++; + } + } + } + else if ($reshook < 0) $error++; + } + else + { + $action = 'edit_extras'; + } + +} + /* * Create an order */ @@ -717,7 +755,10 @@ $object->mode_reglement_id = GETPOST('mode_reglement_id'); $object->note_private = GETPOST('note_private'); $object->note_public = GETPOST('note_public'); - + + // Fill array 'array_options' with data from add form + $ret = $extrafields->setOptionalsFromPost($extralabels,$object); + $id = $object->create($user); if ($id < 0) { @@ -1072,7 +1113,12 @@ // Other options $parameters=array(); $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook - + + if (empty($reshook) && ! empty($extrafields->attribute_label)) + { + print $object->showOptionals($extrafields,'edit'); + } + // Bouton "Create Draft" print "\n"; @@ -1089,7 +1135,9 @@ $title=$langs->trans("SupplierOrder"); dol_fiche_head($head, 'card', $title, 0, 'order'); - + + $res=$object->fetch_optionals($object->id,$extralabels); + /* * Confirmation de la suppression de la commande */ @@ -1354,7 +1402,70 @@ // Other attributes $parameters=array('socid'=>$socid, 'colspan' => ' colspan="3"'); $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook + if (empty($reshook) && ! empty($extrafields->attribute_label)) + { + + if ($action == 'edit_extras') + { + print '
'; + print ''; + print ''; + print ''; + } + foreach($extrafields->attribute_label as $key=>$label) + { + if ($action == 'edit_extras') { + $value=(isset($_POST["options_".$key])?$_POST["options_".$key]:$object->array_options["options_".$key]); + } else { + $value=$object->array_options["options_".$key]; + } + if ($extrafields->attribute_type[$key] == 'separate') + { + print $extrafields->showSeparator($key); + } + else + { + print 'attribute_required[$key])) print ' class="fieldrequired"'; + print '>'.$label.''; + // Convert date into timestamp format + if (in_array($extrafields->attribute_type[$key],array('date','datetime'))) + { + $value = isset($_POST["options_".$key])?dol_mktime($_POST["options_".$key."hour"], $_POST["options_".$key."min"], 0, $_POST["options_".$key."month"], $_POST["options_".$key."day"], $_POST["options_".$key."year"]):$db->jdate($object->array_options['options_'.$key]); + } + + if ($action == 'edit_extras' && $user->rights->fournisseur->commande->creer) + { + print $extrafields->showInputField($key,$value); + } + else + { + print $extrafields->showOutputField($key,$value); + } + print ''."\n"; + } + } + + if(count($extrafields->attribute_label) > 0) { + + if ($action == 'edit_extras' && $user->rights->fournisseur->commande->creer) + { + print ''; + print ''; + print ''; + print ''; + + } + else { + if ($object->statut == 0 && $user->rights->fournisseur->commande->creer) + { + print ''.img_picto('','edit').' '.$langs->trans('Modify').''; + } + } + } + } + // Ligne de 3 colonnes print ''.$langs->trans("AmountHT").''; print ''.price($object->total_ht).''; From 1dca56c21345bb195dc0e87e632fe6056dac4084 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 16 Dec 2013 23:45:12 +0100 Subject: [PATCH 05/11] Fix: Calculation of number of linked files was not working on taxes. --- htdocs/core/lib/tax.lib.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/htdocs/core/lib/tax.lib.php b/htdocs/core/lib/tax.lib.php index a368561d8af2c..de21a157c7449 100644 --- a/htdocs/core/lib/tax.lib.php +++ b/htdocs/core/lib/tax.lib.php @@ -49,8 +49,12 @@ function tax_prepare_head($object) // $this->tabs = array('entity:-tabname); to remove a tab complete_head_from_modules($conf,$langs,$object,$head,$h,'tax'); + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; + $upload_dir = $conf->tax->dir_output . "/" . dol_sanitizeFileName($object->ref); + $nbFiles = count(dol_dir_list($upload_dir,'files')); $head[$h][0] = DOL_URL_ROOT.'/compta/sociales/document.php?id='.$object->id; $head[$h][1] = $langs->trans("Documents"); + if($nbFiles > 0) $head[$h][1].= ' ('.$nbFiles.')'; $head[$h][2] = 'documents'; $h++; From 3b3b66e61278aaef8d2e3f737dec62bce63fa106 Mon Sep 17 00:00:00 2001 From: simnandez Date: Thu, 19 Dec 2013 10:29:34 +0100 Subject: [PATCH 06/11] Trad: Update es_ES translations --- htdocs/langs/es_ES/admin.lang | 5 +++-- htdocs/langs/es_ES/banks.lang | 6 ++++++ htdocs/langs/es_ES/compta.lang | 17 ++++++++++++----- htdocs/langs/es_ES/languages.lang | 4 ++-- htdocs/langs/es_ES/main.lang | 4 +++- htdocs/langs/es_ES/stocks.lang | 3 ++- 6 files changed, 28 insertions(+), 11 deletions(-) diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang index ef4bb836237b6..33ce435cd784d 100644 --- a/htdocs/langs/es_ES/admin.lang +++ b/htdocs/langs/es_ES/admin.lang @@ -299,6 +299,7 @@ ServerNotAvailableOnIPOrPort=Servidor no disponible en la dirección %s e DoTestServerAvailability=Probar conectividad con el servidor DoTestSend=Probar envío DoTestSendHTML=Probar envío HTML +ErrorCantUseRazIfNoYearInMask=Error, no se puede usar la opción @ para reiniciar el contador anualmente si no se encuentra en la máscara la secuencia {yy} o {yyyy} ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, no se puede usar la opción @ si la secuencia {yy}{mm} o {yyyy}{mm} no se encuentra en la máscara. UMask=Parámetro UMask de nuevos archivos en Unix/Linux/BSD. UMaskExplanation=Este parámetro determina los derechos de los archivos creados en el servidor Dolibarr (durante la subida, por ejemplo).
Este debe ser el valor octal (por ejemplo, 0666 significa lectura / escritura para todos).
Este parámetro no tiene ningún efecto sobre un servidor Windows. @@ -380,7 +381,6 @@ KeepEmptyToUseDefault=Deje este campo vacío para usar el valor por defecto DefaultLink=Enlace por defecto ValueOverwrittenByUserSetup=Atención: Este valor puede ser sobreescrito por un valor específico de la configuración del usuario (cada usuario puede tener su propia url clicktodial) ExternalModule=Módulo externo - Instalado en el directorio %s - # Modules Module0Name=Usuarios y grupos Module0Desc=Gestión de usuarios y grupos @@ -1008,6 +1008,8 @@ XDebugInstalled=XDebug está cargado. XCacheInstalled=XCache está cargado AddRefInList=Mostrar el código de cliente/proveedor en los listados (lista desplegable o autoselección) en la mayoría de enlaces FieldEdition=Edición del campo %s +FixTZ=Ajueste TimeZone +FillThisOnlyIfRequired=Ejemplo: +2 (Rellene únicamente si se experimentan problemas de offset de zona horaria) ##### Module password generation PasswordGenerationStandard=Devuelve una contraseña generada por el algoritmo interno Dolibarr: 8 caracteres, números y caracteres en minúsculas mezcladas. PasswordGenerationNone=No ofrece contraseñas. La contraseña se introduce manualmente. @@ -1270,7 +1272,6 @@ FilesOfTypeNotCompressed=Archivos de tipo %s no son comprimidos por el servidor CacheByServer=Caché mediante el servidor CacheByClient=Caché mediante el navegador CompressionOfResources=Compresión de las respuestas HTTP -TestNotPossibleWithCurrentBrowsers=La detección automática no es posible con el navegador actual ##### Products ##### ProductSetup=Configuración del módulo Productos ServiceSetup=Configuración del módulo Servicios diff --git a/htdocs/langs/es_ES/banks.lang b/htdocs/langs/es_ES/banks.lang index bf9908db4c8ea..efbad983ac3f5 100644 --- a/htdocs/langs/es_ES/banks.lang +++ b/htdocs/langs/es_ES/banks.lang @@ -150,3 +150,9 @@ EventualyAddCategory=Eventualmente, indique una categoría en la que clasificar ToConciliate=¿A conciliar? ThenCheckLinesAndConciliate=A continuación, compruebe las líneas presentes en el extracto bancario y haga clic BankDashboard=Resumen cuentas bancarias +DefaultRIB=IBAN por defecto +AllRIB=Todos los IBAN +LabelRIB=Nombre del IBAN +NoBANRecord=Sin IBAN registrados +DeleteARib=Eliminar IBAN registrado +ConfirmDeleteRib=¿Está seguro de querer eliminar este IBAN? diff --git a/htdocs/langs/es_ES/compta.lang b/htdocs/langs/es_ES/compta.lang index b156eeac6989b..3d9936520b33a 100644 --- a/htdocs/langs/es_ES/compta.lang +++ b/htdocs/langs/es_ES/compta.lang @@ -30,6 +30,7 @@ Profit=Beneficio Balance=Saldo Debit=Debe Credit=Haber +Piece=Comprobante Withdrawal=Reintegro Withdrawals=Reintegros AmountHTVATRealReceived=Total repercutido @@ -147,7 +148,7 @@ DescPurchasesJournal=Diario de compras InvoiceRef=Ref. factura CodeNotDef=No definido AddRemind=Desglosar importe disponible -RemainToDivide= Resto a repartir : +RemainToDivide=Resto a repartir : WarningDepositsNotIncluded=Las facturas de anticipo aún no están incluidas en esta versión en el módulo de contabilidad. DatePaymentTermCantBeLowerThanObjectDate=La fecha límite de pago no puede ser inferior a la fecha del objeto Pcg_version=Versión del plan @@ -158,14 +159,20 @@ InvoiceDispatched=Facturas desglosadas AccountancyDashboard=Resumen financiero ByProductsAndServices=Por productos y servicios RefExt=Ref. externa -# ToCreateAPredefinedInvoice=To create a predefined invoice, create a standard invoice then, without validating it, click onto button "Convert to predefined invoice". -# LinkedOrder=linked to command +ToCreateAPredefinedInvoice=Para crear una factura predefinida, cree una factura estandard y, sin validarla, haga clic en el botón "Convertir en recurrente". +LinkedOrder=Enlazar a un pedido ReCalculate=Recalcular Mode1=Método 1 Mode2=Método 2 CalculationRuleDesc=Para calcular el IVA total hay 2 métodos:
El método 1 consiste en redondear el IVA en cada línea y luego sumarlo .
El método 2 consiste en sumar el IVA de cada línea y luego redondear el resultado.
El resultado final puede variar unos céntimos. El modo por defecto es el método %s. -# CalculationRuleDescSupplier=according to supplier, choose appropriate method to apply same calculation rule and get same result expected by your supplier. -# TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). +CalculationRuleDescSupplier=Según el modo usado por el proveedor, escoja el modo adecuado con el fin de aplicar la misma regla y obtener un resultado idéntico al modo aplicado por su proveedor. +TurnoverPerProductInCommitmentAccountingNotRelevant=El volumen de ventas por producto, en una contabilidad en modo contabilidad de caja no es definible. Este informe solo está disponible en modo contabilidad llamada contabilidad de compromiso (ver la configuración del módulo de contabilidad). CalculationMode=Modo de cálculo +COMPTA_PRODUCT_BUY_ACCOUNT=Código contable por defecto para las compras de mercaderías +COMPTA_PRODUCT_SOLD_ACCOUNT=Código contable por defecto para las ventas de mercaderías +COMPTA_SERVICE_BUY_ACCOUNT=Código contable por defecto para las compras de servicios +COMPTA_SERVICE_SOLD_ACCOUNT=Código contable por defecto para las ventas de servicios +COMPTA_VAT_ACCOUNT=Código contable por defecto para el IVA repercutido +COMPTA_VAT_BUY_ACCOUNT=Código contable por defecto para devengado COMPTA_ACCOUNT_CUSTOMER=Cuenta contable por defecto para clientes COMPTA_ACCOUNT_SUPPLIER=Cuenta contable por defecto para proveedores diff --git a/htdocs/langs/es_ES/languages.lang b/htdocs/langs/es_ES/languages.lang index f11e8b2842fa4..26a8f4c9f6243 100644 --- a/htdocs/langs/es_ES/languages.lang +++ b/htdocs/langs/es_ES/languages.lang @@ -1,5 +1,4 @@ # Dolibarr language file - Source file is en_US - languages - Language_ar_AR=Árabe Language_ar_SA=Árabe Language_bg_BG=Búlgaro @@ -16,7 +15,7 @@ Language_en_IN=Inglés (India) Language_en_NZ=Inglés (Nueva Zelanda) Language_en_SA=Inglés (Arabia Saudita) Language_en_US=Inglés (Estados Unidos) -# Language_en_ZA=English (South Africa) +Language_en_ZA=Inglés (África del Sur) Language_es_ES=Español Language_es_AR=Español (Argentina) Language_es_HN=Español (Honduras) @@ -53,6 +52,7 @@ Language_sl_SI=Esloveno Language_sv_SV=Sueco Language_sv_SE=Sueco Language_sk_SK=Eslovaco +Language_uz_UZ=Uzbeco Language_vi_VN=Vietnamita Language_zh_CN=Chino Language_zh_TW=Chino (Tradicional) diff --git a/htdocs/langs/es_ES/main.lang b/htdocs/langs/es_ES/main.lang index 158a4defcfc81..20ff2dc05bde7 100644 --- a/htdocs/langs/es_ES/main.lang +++ b/htdocs/langs/es_ES/main.lang @@ -257,6 +257,8 @@ Seconds=Segundos Today=Hoy Yesterday=Ayer Tomorrow=Mañana +Morning=Mañana +Afternoon=Tarde Quadri=Trimestre MonthOfDay=Mes del día HourShort=H @@ -661,7 +663,7 @@ Access=Acceso HelpCopyToClipboard=Use Ctrl+C para copiar al portapapeles SaveUploadedFileWithMask=Guardar el archivo con el nombre "%s" (sino "%s") OriginFileName=Nombre del archivo origen - +SetDemandReason=Definir el origen # Week day Monday=Lunes Tuesday=Martes diff --git a/htdocs/langs/es_ES/stocks.lang b/htdocs/langs/es_ES/stocks.lang index cf6e59415877c..94e76bb1c8d2b 100644 --- a/htdocs/langs/es_ES/stocks.lang +++ b/htdocs/langs/es_ES/stocks.lang @@ -109,4 +109,5 @@ NbOfProductAfterPeriod=Cantidad del producto %s en stock después del periodo se MassStockMovement=Movimientos de stock en masa SelectProductInAndOutWareHouse=Selecccione un producto, una cantidad, un almacén origen y un almacén destino, seguidamente haga clic "%s". Una vez seleccionados todos los movimientos, haga clic en "%s". RecordMovement=Registrar transferencias -ReceivingForSameOrder=Recepciones de este pedido \ No newline at end of file +ReceivingForSameOrder=Recepciones de este pedido +StockMovementRecorded=Movimientos de stock registrados From 2e840a3d37db8c20212e33ca85304eaf2522c740 Mon Sep 17 00:00:00 2001 From: simnandez Date: Thu, 19 Dec 2013 10:41:44 +0100 Subject: [PATCH 07/11] Trad: Add missing trans --- htdocs/langs/en_US/main.lang | 2 +- htdocs/langs/es_ES/main.lang | 1 + htdocs/langs/fr_FR/main.lang | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index 89b05f25f9a93..5152fd8995ab9 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -664,7 +664,7 @@ HelpCopyToClipboard=Use Ctrl+C to copy to clipboard SaveUploadedFileWithMask=Save file on server with name "%s" (otherwise "%s") OriginFileName=Original filename SetDemandReason=Set source - +ViewPrivateNote=View notes # Week day Monday=Monday Tuesday=Tuesday diff --git a/htdocs/langs/es_ES/main.lang b/htdocs/langs/es_ES/main.lang index 20ff2dc05bde7..16f6e2f102d8b 100644 --- a/htdocs/langs/es_ES/main.lang +++ b/htdocs/langs/es_ES/main.lang @@ -664,6 +664,7 @@ HelpCopyToClipboard=Use Ctrl+C para copiar al portapapeles SaveUploadedFileWithMask=Guardar el archivo con el nombre "%s" (sino "%s") OriginFileName=Nombre del archivo origen SetDemandReason=Definir el origen +ViewPrivateNote=Ver notas # Week day Monday=Lunes Tuesday=Martes diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang index 34b0da196a2fb..dca5103b2365e 100644 --- a/htdocs/langs/fr_FR/main.lang +++ b/htdocs/langs/fr_FR/main.lang @@ -664,6 +664,7 @@ HelpCopyToClipboard=Utilisez Ctrl+C pour copier dans le presse-papier SaveUploadedFileWithMask=Sauver le fichier sur le serveur sous le nom "%s" (sinon "%s") OriginFileName=nom du fichier source SetDemandReason=Définir l'origine +ViewPrivateNote=Voir notes # Week day Monday=Lundi From 8e247e8615bee9f748be7a139e30d66ea94ae5e3 Mon Sep 17 00:00:00 2001 From: simnandez Date: Thu, 19 Dec 2013 12:47:39 +0100 Subject: [PATCH 08/11] Trad: Fix missing translation --- htdocs/comm/propal/list.php | 4 ++-- htdocs/langs/en_US/main.lang | 1 + htdocs/langs/es_ES/main.lang | 1 + htdocs/langs/fr_FR/main.lang | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php index 280da52f6c5d2..262ccbfe91e53 100644 --- a/htdocs/comm/propal/list.php +++ b/htdocs/comm/propal/list.php @@ -422,14 +422,14 @@ { if($num<$limit){ $var=!$var; - print ''.$langs->trans("Total HT").''; + print ''.$langs->trans("TotalHT").''; print ''.price($total).''; print ''; } else { $var=!$var; - print ''.$langs->trans("Total HT for this page").''; + print ''.$langs->trans("TotalHTforthispage").''; print ''.price($total).''; print ''; } diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index 5152fd8995ab9..4465b660cf6ce 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -311,6 +311,7 @@ SubTotal=Subtotal TotalHTShort=Total (net) TotalTTCShort=Total (inc. tax) TotalHT=Total (net of tax) +TotalHTforthispage=Total (net of tax) for this page TotalTTC=Total (inc. tax) TotalTTCToYourCredit=Total (inc. tax) to your credit TotalVAT=Total tax diff --git a/htdocs/langs/es_ES/main.lang b/htdocs/langs/es_ES/main.lang index 16f6e2f102d8b..3b495f6f67c53 100644 --- a/htdocs/langs/es_ES/main.lang +++ b/htdocs/langs/es_ES/main.lang @@ -311,6 +311,7 @@ SubTotal=Subtotal TotalHTShort=Importe TotalTTCShort=Total TotalHT=Base imponible +TotalHTforthispage=Total base imponible para esta página TotalTTC=Total TotalTTCToYourCredit=Total a crédito TotalVAT=Total IVA diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang index dca5103b2365e..dcbdd696002b7 100644 --- a/htdocs/langs/fr_FR/main.lang +++ b/htdocs/langs/fr_FR/main.lang @@ -311,6 +311,7 @@ SubTotal=Sous-total TotalHTShort=Total HT TotalTTCShort=Total TTC TotalHT=Total HT +TotalHTforthispage=Total HT pour cette page TotalTTC=Total TTC TotalTTCToYourCredit=Total TTC à votre crédit TotalVAT=Total TVA From a1e0d84e37e5c5398d7903f1bc5f548e67b2fe38 Mon Sep 17 00:00:00 2001 From: simnandez Date: Thu, 19 Dec 2013 15:43:22 +0100 Subject: [PATCH 09/11] Fix: Lost stats filters into year selection --- ChangeLog | 1 + htdocs/comm/propal/stats/index.php | 4 ++-- htdocs/commande/stats/index.php | 4 ++-- htdocs/compta/facture/stats/index.php | 5 +++-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5dc6b2eab0d61..31c029f2a1c96 100644 --- a/ChangeLog +++ b/ChangeLog @@ -70,6 +70,7 @@ For users: - Fix: [ bug #992 ] Proforma invoices don't have a separated numeric count. - Fix: [ bug #1022 ] correct margin calculation for credit notes. - Fix: Better management of using ajax for upload form (to solve problem when enabling ajax jquery multifile upload in some cases). +- Fix: Lost stats filters into year selection. New experimental module: - New: [ task #157 ] Add a Skype button (adherents / third parties / contacts) diff --git a/htdocs/comm/propal/stats/index.php b/htdocs/comm/propal/stats/index.php index b3b8379afc3a8..e0805d385e69b 100644 --- a/htdocs/comm/propal/stats/index.php +++ b/htdocs/comm/propal/stats/index.php @@ -267,14 +267,14 @@ { // If we have empty year $oldyear--; print ''; - print ''.$oldyear.''; + print '0?'&userid='.$userid:'').'">'.$oldyear.''; print '0'; print '0'; print '0'; print ''; } print ''; - print ''.$year.''; + print '0?'&userid='.$userid:'').'">'.$year.''; print ''.$val['nb'].''; print ''.price(price2num($val['total'],'MT'),1).''; print ''.price(price2num($val['avg'],'MT'),1).''; diff --git a/htdocs/commande/stats/index.php b/htdocs/commande/stats/index.php index 31cb056693457..a7b51fb5fb0a5 100644 --- a/htdocs/commande/stats/index.php +++ b/htdocs/commande/stats/index.php @@ -288,7 +288,7 @@ { // If we have empty year $oldyear--; print ''; - print ''.$oldyear.''; + print '0?'&userid='.$userid:'').'">'.$oldyear.''; print '0'; print '0'; @@ -297,7 +297,7 @@ } print ''; - print ''.$year.''; + print '0?'&userid='.$userid:'').'">'.$year.''; print ''.$val['nb'].''; print ''.price(price2num($val['total'],'MT'),1).''; print ''.price(price2num($val['avg'],'MT'),1).''; diff --git a/htdocs/compta/facture/stats/index.php b/htdocs/compta/facture/stats/index.php index 211bc355cc600..51747fe04d24c 100644 --- a/htdocs/compta/facture/stats/index.php +++ b/htdocs/compta/facture/stats/index.php @@ -2,6 +2,7 @@ /* Copyright (C) 2003-2006 Rodolphe Quiedeville * Copyright (c) 2004-2012 Laurent Destailleur * Copyright (C) 2012 Marcos García + * Copyright (C) 2013 Juanjo Menent * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -266,14 +267,14 @@ { // If we have empty year $oldyear--; print ''; - print ''.$oldyear.''; + print '0?'&userid='.$userid:'').'">'.$oldyear.''; print '0'; print '0'; print '0'; print ''; } print ''; - print ''.$year.''; + print '0?'&userid='.$userid:'').'">'.$year.''; print ''.$val['nb'].''; print ''.price(price2num($val['total'],'MT'),1).''; print ''.price(price2num($val['avg'],'MT'),1).''; From e4da8623f8535e5e07d5229cb485394fe4a0ab6a Mon Sep 17 00:00:00 2001 From: simnandez Date: Thu, 19 Dec 2013 18:18:26 +0100 Subject: [PATCH 10/11] Trad: Add missing es_ES trans --- htdocs/langs/es_ES/companies.lang | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/langs/es_ES/companies.lang b/htdocs/langs/es_ES/companies.lang index 6b7a93c3aee6c..cdc024addca05 100644 --- a/htdocs/langs/es_ES/companies.lang +++ b/htdocs/langs/es_ES/companies.lang @@ -398,6 +398,7 @@ InActivity=Activo ActivityCeased=Cerrado ActivityStateFilter=Estado de actividad ProductsIntoElements=Listado de productos en %s +CurrentOutstandingBill=Importe pendiente OutstandingBill=Importe máximo para facturas pendientes OutstandingBillReached=Importe máximo alcanzado # Monkey From 4d3290e4bf2af7e721c2bcfaff94e862287b96c7 Mon Sep 17 00:00:00 2001 From: simnandez Date: Thu, 19 Dec 2013 18:33:03 +0100 Subject: [PATCH 11/11] Trad: Improve es_ES trans --- htdocs/langs/es_ES/companies.lang | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/langs/es_ES/companies.lang b/htdocs/langs/es_ES/companies.lang index cdc024addca05..9768349fc846c 100644 --- a/htdocs/langs/es_ES/companies.lang +++ b/htdocs/langs/es_ES/companies.lang @@ -398,9 +398,9 @@ InActivity=Activo ActivityCeased=Cerrado ActivityStateFilter=Estado de actividad ProductsIntoElements=Listado de productos en %s -CurrentOutstandingBill=Importe pendiente -OutstandingBill=Importe máximo para facturas pendientes -OutstandingBillReached=Importe máximo alcanzado +CurrentOutstandingBill=Riesgo alcanzado +OutstandingBill=Riesgo máximo +OutstandingBillReached=Riesgo máximo alcanzado # Monkey MonkeyNumRefModelDesc=Devuelve un número bajo el formato %syymm-nnnn para los códigos de clientes y %syymm-nnnn para los códigos de los proveedores, donde yy es el año, mm el mes y nnnn un contador secuencial sin ruptura y sin volver a 0. # Leopard