diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php index 758a9ae379f..fb3bbd61b95 100644 --- a/htdocs/core/modules/DolibarrModules.class.php +++ b/htdocs/core/modules/DolibarrModules.class.php @@ -261,6 +261,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it public $export_fields_array; public $export_TypeFields_array; // Array of key=>type where type can be 'Numeric', 'Date', 'Text', 'Boolean', 'Status', 'List:xxx:login:rowid' public $export_entities_array; + public $export_aggregate_array; public $export_examplevalues_array; public $export_help_array; public $export_special_array; // special or computed field @@ -390,6 +391,8 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it */ public $need_dolibarr_version; + public $need_javascript_ajax; + public $enabled_bydefault; /** diff --git a/htdocs/core/modules/modStock.class.php b/htdocs/core/modules/modStock.class.php index e99742a14c4..2d17038f43e 100644 --- a/htdocs/core/modules/modStock.class.php +++ b/htdocs/core/modules/modStock.class.php @@ -210,7 +210,7 @@ class modStock extends DolibarrModules 'e.phone'=>'Text', 'e.fax'=>'Text', 'e.statut'=>'Text', 'pe.rowid'=>'List:entrepot:ref:rowid:stock', 'pe.ref'=>'Text' ); $this->export_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into export_icon - $this->export_aggregate_array[$r] = array(); + $this->export_aggregate_array[$r] = array(); // TODO Not used yet $keyforselect = 'warehouse'; $keyforelement = 'warehouse'; $keyforaliasextra = 'extra'; diff --git a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php index da4ab9660d8..647f7798b3d 100644 --- a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php +++ b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php @@ -148,6 +148,7 @@ class modMyModule extends DolibarrModules // Prerequisites $this->phpmin = array(7, 0); // Minimum version of PHP required by module $this->need_dolibarr_version = array(11, -3); // Minimum version of Dolibarr required by module + $this->need_javascript_ajax = 0; // Messages at activation $this->warnings_activation = array(); // Warning to show when we activate module. array('always'='text') or array('FR'='textfr','MX'='textmx'...) @@ -419,6 +420,7 @@ class modMyModule extends DolibarrModules 't.fk_user_valid' => array('rule' => 'fetchidfromref', 'file' => '/user/class/user.class.php', 'class' => 'User', 'method' => 'fetch', 'element' => 'user'), 't.fk_mode_reglement' => array('rule' => 'fetchidfromcodeorlabel', 'file' => '/compta/paiement/class/cpaiement.class.php', 'class' => 'Cpaiement', 'method' => 'fetch', 'element' => 'cpayment'), ); + $this->import_run_sql_after_array[$r] = array(); $r++; */ /* END MODULEBUILDER IMPORT MYOBJECT */ } diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index 191d84e6983..f405ca283ca 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -7657,6 +7657,14 @@ div.clipboardCPValue.hidewithsize { font-size: 2em; } +/* ============================================================================== */ +/* CSS style used for color jPicker */ +/* ============================================================================== */ + +table.jPicker { + border: 1px solid #bbb !important; +} + /* ============================================================================== */ /* CSS style used for small screen */ /* ============================================================================== */ diff --git a/htdocs/theme/eldy/theme_vars.inc.php b/htdocs/theme/eldy/theme_vars.inc.php index 4476f002ead..a8ea2f65f5c 100644 --- a/htdocs/theme/eldy/theme_vars.inc.php +++ b/htdocs/theme/eldy/theme_vars.inc.php @@ -52,7 +52,7 @@ $theme_bgcoloronglet = array(hexdec('DE'), hexdec('E7'), hexdec('EC')); $colorbackhmenu1 = '38,60,92'; // topmenu $colorbackvmenu1 = '250,250,250'; // vmenu $colortopbordertitle1 = '215,215,215'; // top border of title -$colorbacktitle1 = '233,234,237'; // title of tables,list +$colorbacktitle1 = '243,244,245'; // title of tables,list $colorbacktabcard1 = '255,255,255'; // card $colorbacktabactive = '234,234,234'; $colorbacklineimpair1 = '255,255,255'; // line impair diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 4ce3b9e11a4..16389c8cb6e 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -7591,6 +7591,14 @@ div.clipboardCPValue.hidewithsize { font-size: 2em; } +/* ============================================================================== */ +/* CSS style used for color jPicker */ +/* ============================================================================== */ + +table.jPicker { + border: 1px solid #bbb !important; +} + /* ============================================================================== */ /* CSS style used for small screen */ /* ============================================================================== */