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

Merge remote-tracking branch 'upstream/develop' into 14a39

Browse Source
This commit is contained in:
Alexandre SPANGARO
2021-04-26 13:53:16 +02:00
parent d27030df3f 87393cee98
commit d95be3e08b
205 changed files with 9058 additions and 20864 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/modules/DolibarrModules.class.php
View File

@@ -2310,9 +2310,9 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
}
/**
* check for module update
* Check for module update
* TODO : store results for $this->url_last_version and $this->needUpdate
* Add a cron task to monitor for updates
* Add a cron task to monitor for updates
*
* @return int <0 if Error, 0 == no update needed, >0 if need update
*/

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

@@ -60,7 +60,7 @@ class modAccounting extends DolibarrModules
$this->dirs = array('/accounting/temp');
// Config pages
$this->config_page_url = array();
$this->config_page_url = array('accounting.php');
// Dependencies
$this->depends = array("modFacture", "modBanque", "modTax"); // List of modules id that must be enabled if this module is enabled

2
htdocs/core/modules/movement/doc/pdf_standard.modules.php
View File

@@ -295,7 +295,7 @@ class pdf_stdandard extends ModelePDFMovement
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_lot as pl ON m.batch = pl.batch AND m.fk_product = pl.fk_product";
$sql .= " WHERE m.fk_product = p.rowid";
if ($msid > 0) {
$sql .= " AND m.rowid = ".$msid;
$sql .= " AND m.rowid = ".((int) $msid);
}
$sql .= " AND m.fk_entrepot = e.rowid";
$sql .= " AND e.entity IN (".getEntity('stock').")";