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

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

Browse Source 
Conflicts:
	htdocs/variants/combinations.php
This commit is contained in:
Laurent Destailleur 2019-02-27 01:25:25 +01:00
commit 6f0d5fcf3f
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/fourn/facture/list.php
View File

@ -391,7 +391,7 @@ if (! $search_all)
$sql.= " typent.code,"; $sql.= " typent.code,";
$sql.= " state.code_departement, state.nom,"; $sql.= " state.code_departement, state.nom,";
$sql.= ' country.code,'; $sql.= ' country.code,';
$sql.= " p.rowid, p.ref"; $sql.= " p.rowid, p.ref, p.title";
foreach ($extrafields->attribute_label as $key => $val) //prevent error with sql_mode=only_full_group_by foreach ($extrafields->attribute_label as $key => $val) //prevent error with sql_mode=only_full_group_by
{ {

12
htdocs/variants/combinations.php
View File

@ -1,7 +1,7 @@
<?php <?php
/* Copyright (C) 2016 Marcos García <marcosgdf@gmail.com> /* Copyright (C) 2016 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2017 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2017 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2018 Frédéric France <frederic.france@netlogic.fr> * Copyright (C) 2018-2019 Frédéric France <frederic.france@netlogic.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -29,9 +29,9 @@ $langs->loadLangs(array("products", "other"));
$id = GETPOST('id', 'int'); $id = GETPOST('id', 'int');
$valueid = GETPOST('valueid', 'int'); $valueid = GETPOST('valueid', 'int');
$ref = GETPOST('ref'); $ref = GETPOST('ref', 'alpha');
$weight_impact = (float) GETPOST('weight_impact'); $weight_impact = GETPOST('weight_impact', 'alpha');
$price_impact = (float) GETPOST('price_impact'); $price_impact = GETPOST('price_impact', 'alpha');
$price_impact_percent = (bool) GETPOST('price_impact_percent'); $price_impact_percent = (bool) GETPOST('price_impact_percent');
$form = new Form($db); $form = new Form($db);