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 2019-08-15 20:42:58 +02:00
commit 3defd346e4
4 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/langs/en_US/products.lang
View File

@ -340,4 +340,4 @@ ErrorCopyProductCombinations=There was an error while copying the product varian
ErrorDestinationProductNotFound=Destination product not found
ErrorProductCombinationNotFound=Product variant not found
ActionAvailableOnVariantProductOnly=Action only available on the variant of product
ProductsPricePerCustomer=Product prices per customers
ProductsPricePerCustomer=Product prices per customers

2
htdocs/langs/fr_FR/products.lang
View File

@ -340,4 +340,4 @@ ErrorCopyProductCombinations=Une erreur s'est produite lors de la copie des vari
ErrorDestinationProductNotFound=Produit destination non trouvé
ErrorProductCombinationNotFound=Variante du produit non trouvé
ActionAvailableOnVariantProductOnly=Action disponible uniquement sur la variante du produit
ProductsPricePerCustomer=Prix produit par clients
ProductsPricePerCustomer=Prix produit par clients

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

@ -146,6 +146,7 @@ if ($action == 'other')
$value = GETPOST('activate_useProdFournDesc', 'alpha');
$res = dolibarr_set_const($db, "PRODUIT_FOURN_TEXTS", $value, 'chaine', 0, '', $conf->entity);
if ($value) {
$sql_test = "SELECT count(desc_fourn) as cpt FROM ".MAIN_DB_PREFIX."product_fournisseur_price WHERE 1";
$resql = $db->query($sql_test);
@ -678,6 +679,7 @@ if (! empty($conf->fournisseur->enabled))
print '</tr>';
}
if (! empty($conf->global->PRODUCT_CANVAS_ABILITY))
{
// Add canvas feature

3
htdocs/product/list.php
View File

@ -136,6 +136,7 @@ $fieldstosearchall = array(
'p.label'=>"ProductLabel",
'p.description'=>"Description",
"p.note"=>"Note",
);
// multilang
if (! empty($conf->global->MAIN_MULTILANGS))
@ -148,6 +149,8 @@ if (! empty($conf->barcode->enabled)) {
$fieldstosearchall['p.barcode']='Gencod';
$fieldstosearchall['pfp.barcode']='GencodBuyPrice';
}
// Personalized search criterias. Example: $conf->global->PRODUCT_QUICKSEARCH_ON_FIELDS = 'p.ref=ProductRef;p.label=ProductLabel'
if (! empty($conf->global->PRODUCT_QUICKSEARCH_ON_FIELDS)) $fieldstosearchall=dolExplodeIntoArray($conf->global->PRODUCT_QUICKSEARCH_ON_FIELDS);
if (empty($conf->global->PRODUIT_MULTIPRICES))
{