Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Merge branch 'misc' of https://github.com/marcosgdf/dolibarr into

Browse Source 
marcosgdf-misc

Conflicts:
	htdocs/barcode/codeinit.php
This commit is contained in:
Laurent Destailleur
2015-02-18 22:54:02 +01:00
parent cc1d506614 e485dd413d
commit 4963555669
108 changed files with 413 additions and 367 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/barcode/codeinit.php
View File

@@ -211,7 +211,8 @@ if ($conf->societe->enabled)
{
$nbno=$nbtotal=0;
print_fiche_titre($langs->trans("BarcodeInitForThirdparties"),'','').'<br>'."\n";
print_fiche_titre($langs->trans("BarcodeInitForThirdparties"),'','');
print '<br>'."\n";
$sql="SELECT count(rowid) as nb FROM ".MAIN_DB_PREFIX."societe where barcode IS NULL or barcode = ''";
$resql=$db->query($sql);
if ($resql)
@@ -251,7 +252,9 @@ if ($conf->product->enabled || $conf->product->service)
$nbno=$nbtotal=0;
print_fiche_titre($langs->trans("BarcodeInitForProductsOrServices"),'','').'<br>'."\n";
print_fiche_titre($langs->trans("BarcodeInitForProductsOrServices"),'','');
print '<br>'."\n";
$sql ="SELECT count(rowid) as nb, fk_product_type, datec";
$sql.=" FROM ".MAIN_DB_PREFIX."product";
$sql.=" WHERE barcode IS NULL OR barcode = ''";