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

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

Browse Source
This commit is contained in:
Laurent Destailleur 2020-05-28 21:36:08 +02:00
commit 3b22b6192d
4 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/modules/modExpenseReport.class.php
View File

@ -34,7 +34,7 @@ class modExpenseReport extends DolibarrModules
/**
* Constructor. Define names, constants, directories, boxes, permissions
*
* @param Database $db Database handler
* @param DoliDb $db Database handler
*/
public function __construct($db)
{

7
htdocs/multicurrency/class/multicurrency.class.php
View File

@ -553,8 +553,6 @@ class MultiCurrency extends CommonObject
*/
public static function getAmountConversionFromInvoiceRate($fk_facture, $amount, $way = 'dolibarr', $table = 'facture')
{
global $db;
$multicurrency_tx = self::getInvoiceRate($fk_facture, $table);
if ($multicurrency_tx)
@ -588,10 +586,11 @@ class MultiCurrency extends CommonObject
}
/**
* With free account we can't set source then recalcul all rates to force another source
* With free account we can't set source then recalcul all rates to force another source.
* This modify the array &$TRate.
*
* @param stdClass $TRate Object containing all currencies rates
* @return -1 if KO, 0 if nothing, 1 if OK
* @return int -1 if KO, 0 if nothing, 1 if OK
*/
public static function recalculRates(&$TRate)
{

12
htdocs/variants/class/ProductCombination.class.php
View File

@ -542,18 +542,10 @@ WHERE c.fk_product_parent = ".(int) $productid." AND p.tosell = 1";
}
//Final weight impact
$weight_impact = $forced_weightvar;
if ($forced_weightvar === false) {
$weight_impact = 0;
}
$weight_impact = (float) $forced_weightvar; // If false, return 0
//Final price impact
$price_impact = $forced_pricevar;
if ($forced_pricevar === false) {
$price_impact = 0;
}
$price_impact = (float) $forced_pricevar; // If false, return 0
$newcomb = new ProductCombination($db);
$existingCombination = $newcomb->fetchByProductCombination2ValuePairs($product->id, $combinations);

2
htdocs/webservices/server_productorservice.php
View File

@ -1003,7 +1003,7 @@ function getListOfProductsOrServices($authentication, $filterproduct)
*
* @param array $authentication Array of authentication information
* @param array $id Category id
* @param $lang $lang Force lang
* @param Translate $lang Force lang
* @return array Array result
*/
function getProductsForCategory($authentication, $id, $lang = '')