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

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

Browse Source 
Conflicts:
	htdocs/commande/class/api_orders.class.php
	htdocs/compta/facture/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/project.lib.php
	htdocs/fourn/class/api_supplier_orders.class.php
	htdocs/fourn/class/fournisseur.facture-rec.class.php
	htdocs/langs/en_US/stocks.lang
This commit is contained in:
Laurent Destailleur
2023-11-17 18:24:53 +01:00
parent 07432b8def 90556039a1
commit a0bba05b02
35 changed files with 164 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/lib/functions.lib.php
View File

@@ -223,7 +223,9 @@ function isModEnabled($module)
'bank' => 'banque',
'category' => 'categorie',
'contract' => 'contrat',
'project' => 'projet'
'project' => 'projet',
'bank' => 'banque',
'category' => 'categorie'
);
if (empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) {
$arrayconv['supplier_order'] = 'fournisseur';