lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2015-11-05 13:43:33 +01:00
commit 1927f47eaa
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/langs/en_US/admin.lang
View File

@ -1424,6 +1424,7 @@ SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties
UseUnits=Define a unit of measure for Quantity during order, proposal or invoice lines edition
ProductCodeChecker= Module for product code generation and checking (product or service)
ProductOtherConf= Product / Service configuration
IsNotADir=is not a directory!
##### Syslog #####
SyslogSetup=Logs module setup
SyslogOutput=Logs outputs

3
htdocs/product/admin/product.php
View File

@ -518,8 +518,7 @@ if (! empty($conf->global->PRODUCT_CANVAS_ABILITY))
}
else
{
//TODO: Translate
print "<tr><td><b>ERROR</b>: $dir is not a directory !</td></tr>\n";
setEventMessages($dir.' '.$langs->trans("IsNotADir"), null, 'errors');
}
}