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

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

Browse Source 
Conflicts:
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
This commit is contained in:
Laurent Destailleur
2018-08-08 17:31:23 +02:00
parent 63898b205e de1386c83c
commit 8d54df4263
11 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/core/class/extrafields.class.php
View File

@@ -744,6 +744,7 @@ class ExtraFields
if ($elementtype == 'thirdparty') $elementtype='societe';
if ($elementtype == 'contact') $elementtype='socpeople';
if ($elementtype == 'order_supplier') $elementtype='commande_fournisseur';
$array_name_label=array();