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

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

Browse Source 
Conflicts:
	build/generate_filelist_xml.php
	htdocs/comm/propal/card.php
	htdocs/commande/card.php
	htdocs/compta/facture/card.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/lib/modulebuilder.lib.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/facture/card.php
	htdocs/supplier_proposal/card.php
	htdocs/ticket/list.php
This commit is contained in:
Laurent Destailleur
2021-03-02 15:27:20 +01:00
parent 5af8e49c86 495c61c231
commit 42329b10c9
23 changed files with 103 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,8 +22,6 @@
*/
/**
* Regenerate files .class.php
*
@@ -54,7 +52,7 @@ function rebuildObjectClass($destdir, $module, $objectname, $newmask, $readdir =
}
// Check parameters
if (count($addfieldentry) > 0) {
if (is_array($addfieldentry) && count($addfieldentry) > 0) {
if (empty($addfieldentry['name'])) {
setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("Name")), null, 'errors');
return -2;