diff --git a/htdocs/admin/system/modules.php b/htdocs/admin/system/modules.php index a4cc4fefc11..3486bcde498 100644 --- a/htdocs/admin/system/modules.php +++ b/htdocs/admin/system/modules.php @@ -106,8 +106,8 @@ print ''; print ''; print ''; print ''; -print ''; -print ''; +print ''; +print ''; print ''; $var=false; $sortorder=$modules_names; diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php index 4c04655ae65..d5168ec65c9 100644 --- a/htdocs/compta/bank/releve.php +++ b/htdocs/compta/bank/releve.php @@ -310,7 +310,12 @@ else print "\n"; // Type and num - print ''; + if ($objp->fk_type == 'SOLD') { + $type_label=' '; + } else { + $type_label=($langs->trans("PaymentTypeShort".$objp->fk_type)!="PaymentTypeShort".$objp->fk_type)?$langs->trans("PaymentTypeShort".$objp->fk_type):$objp->fk_type; + } + print ''; // Description print ''; -print ''; +print ''; if (empty($conf->use_javascript_ajax)) { print ''."\n"; // Utilisation formulaire Ajax sur choix societe $var=!$var; print ""; -print ''; +print ''; if (! $conf->use_javascript_ajax) { print ''; $var=!$var; print ""; -print ''; +print ''; if (! $conf->use_javascript_ajax) { print '
'.$langs->trans("Modules").''.$langs->trans("Version").''.$langs->trans("Id Module").''.$langs->trans("Id Permissions").''.$langs->trans("IdModule").''.$langs->trans("IdPermissions").'
'.$objp->fk_type.' '.($objp->num_chq?$objp->num_chq:'').''.$type_label.' '.($objp->num_chq?$objp->num_chq:'').''; diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 4ee0ecd8dc9..9bffc29f5bf 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -49,9 +49,11 @@ ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is re ErrorCodeCantContainZero=Code can't contain value 0 DisableJavascript=Disable JavaScript and Ajax functions ConfirmAjax=Use Ajax confirmation popups -UseSearchToSelectCompany=Use autocompletion fields to choose third parties (instead of using a list box).

Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. +UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. +UseSearchToSelectCompany=Use autocompletion fields to choose third parties instead of using a list box. ActivityStateToSelectCompany= Add a filter option to show/hide thirdparties which are currently in activity or has ceased it -UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box).

Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. +UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. +UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box). SearchFilter=Search filters options NumberOfKeyToSearch=Nbr of characters to trigger search: %s ViewFullDateActions=Show full dates events in the third sheet @@ -100,6 +102,9 @@ OtherOptions=Other options OtherSetup=Other setup CurrentValueSeparatorDecimal=Decimal separator CurrentValueSeparatorThousand=Thousand separator +Destination=Destination +IdModule=Module ID +IdPermissions=Permissions ID Modules=Modules ModulesCommon=Main modules ModulesOther=Other modules @@ -1304,7 +1309,8 @@ ConfirmDeleteProductLineAbility=Confirmation when removing product lines in form ModifyProductDescAbility=Personalization of product descriptions in forms ViewProductDescInFormAbility=Visualization of product descriptions in the forms (otherwise as popup tooltip) ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the thirdparty language -UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list).
Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. +UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. +UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list). UseEcoTaxeAbility=Support Eco-Taxe (WEEE) SetDefaultBarcodeTypeProducts=Default barcode type to use for products SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties @@ -1491,3 +1497,6 @@ TaskModelModule=Tasks reports document model ##### ECM (GED) ##### ECMSetup = GED Setup ECMAutoTree = Automatic tree folder and document + + +Format=Format \ No newline at end of file diff --git a/htdocs/langs/en_US/banks.lang b/htdocs/langs/en_US/banks.lang index 88ac8d90d5e..05156a723ad 100644 --- a/htdocs/langs/en_US/banks.lang +++ b/htdocs/langs/en_US/banks.lang @@ -133,6 +133,7 @@ CashBudget=Cash budget PlannedTransactions=Planned transactions Graph=Graphics ExportDataset_banque_1=Bank transactions and account statement +ExportDataset_banque_2=Deposit slip TransactionOnTheOtherAccount=Transaction on the other account TransactionWithOtherAccount=Account transfer PaymentNumberUpdateSucceeded=Payment number updated succesfully diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang index 1e8c9bcfe8b..6a8fdd730c9 100644 --- a/htdocs/langs/en_US/other.lang +++ b/htdocs/langs/en_US/other.lang @@ -45,6 +45,9 @@ Notify_MEMBER_SUBSCRIPTION=Member subscribed Notify_MEMBER_RESILIATE=Member resiliated Notify_MEMBER_DELETE=Member deleted Notify_PROJECT_CREATE=Project creation +Notify_TASK_CREATE=Task created +Notify_TASK_MODIFY=Task modified +Notify_TASK_DELETE=Task deleted NbOfAttachedFiles=Number of attached files/documents TotalSizeOfAttachedFiles=Total size of attached files/documents MaxSize=Maximum size diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php index 5aa65d69b5a..c040488b3c6 100644 --- a/htdocs/product/admin/product.php +++ b/htdocs/product/admin/product.php @@ -372,7 +372,7 @@ print '
'; print ''; print ''; print '
'.$langs->trans("UseSearchToSelectProduct").''.$form->textwithpicto($langs->trans("UseSearchToSelectProduct"),$langs->trans('UseSearchToSelectProductTooltip'),1).''; diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php index 9834959273c..b37197c007a 100644 --- a/htdocs/societe/admin/societe.php +++ b/htdocs/societe/admin/societe.php @@ -715,7 +715,7 @@ print ' 
'.$langs->trans("UseSearchToSelectCompany").''.$form->textwithpicto($langs->trans("UseSearchToSelectCompany"),$langs->trans('UseSearchToSelectCompanyTooltip'),1).' '; @@ -739,7 +739,7 @@ print '
'.$langs->trans("UseSearchToSelectContact").''.$form->textwithpicto($langs->trans("UseSearchToSelectContact"),$langs->trans('UseSearchToSelectContactTooltip'),1).'';