Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-08 09:01:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/website/index.php
This commit is contained in:
Laurent Destailleur
2020-06-03 01:06:27 +02:00
parent 2965dda815 a37a4031e9
commit f92426034f
9 changed files with 51 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/barcode/codeinit.php
View File

@@ -202,7 +202,7 @@ if ($conf->societe->enabled)
{
$nbno = $nbtotal = 0;
print load_fiche_titre($langs->trans("BarcodeInitForThirdparties"), '', 'title_companies');
print load_fiche_titre($langs->trans("BarcodeInitForThirdparties"), '', 'company');
print '<br>'."\n";
$sql = "SELECT count(rowid) as nb FROM ".MAIN_DB_PREFIX."societe where barcode IS NULL or barcode = ''";