Merge branch '23.0' of git@github.com:Dolibarr/dolibarr.git into develop
This commit is contained in:
commit
166cef8bc2
4 changed files with 13 additions and 1 deletions
|
|
@ -662,6 +662,8 @@ if ($nboftargetok) {
|
|||
run("rm -fr $BUILDROOT/$PROJECT/htdocs/install/mssql");
|
||||
run("rm -fr $BUILDROOT/$PROJECT/htdocs/install/sqlite3");
|
||||
|
||||
run("rm -fr $BUILDROOT/$PROJECT/htdocs/install/install.forced.php");
|
||||
|
||||
run("rm -fr $BUILDROOT/$PROJECT/node_modules");
|
||||
|
||||
run("rm -fr $BUILDROOT/$PROJECT/dev/ansible");
|
||||
|
|
|
|||
|
|
@ -722,6 +722,8 @@ if ($nboftargetok) {
|
|||
$ret = `rm -fr $BUILDROOT/$PROJECT/htdocs/install/mssql`;
|
||||
$ret = `rm -fr $BUILDROOT/$PROJECT/htdocs/install/sqlite3`;
|
||||
|
||||
$ret = `rm -fr $BUILDROOT/$PROJECT/htdocs/install/install.forced.php`;
|
||||
|
||||
$ret = `rm -fr $BUILDROOT/$PROJECT/node_modules`;
|
||||
|
||||
$ret = `rm -fr $BUILDROOT/$PROJECT/dev/ansible`;
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@ if (isModEnabled('category')) {
|
|||
}
|
||||
|
||||
// Load translation files required by the page
|
||||
$langs->loadLangs(array('bills', 'companies', 'products', 'categories', 'banks'));
|
||||
$langs->loadLangs(array('banks', 'bills', 'companies', 'products', 'categories', 'cashdesk'));
|
||||
|
||||
$search_all = trim(GETPOST('search_all', 'alphanohtml'));
|
||||
|
||||
|
|
@ -359,6 +359,10 @@ foreach ($object->fields as $key => $val) {
|
|||
}
|
||||
// Extra fields
|
||||
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
|
||||
// Add hook to complete $arrayfield
|
||||
$parameters = array('arrayfields' => &$arrayfields);
|
||||
$reshook = $hookmanager->executeHooks('completeArrayFields', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
|
||||
$sql .= $hookmanager->resPrint;
|
||||
|
||||
// For POS context, we force some fields
|
||||
if ($contextpage == 'poslist') {
|
||||
|
|
|
|||
|
|
@ -195,6 +195,10 @@ foreach ($object->fields as $key => $val) {
|
|||
|
||||
// Extra fields
|
||||
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
|
||||
// Add hook to complete $arrayfield
|
||||
$parameters = array('arrayfields' => &$arrayfields);
|
||||
$reshook = $hookmanager->executeHooks('completeArrayFields', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
|
||||
$sql .= $hookmanager->resPrint;
|
||||
|
||||
// Complete arrayfields with special fields
|
||||
/*$arrayfields = array_merge($arrayfields, array(
|
||||
|
|
|
|||
Loading…
Reference in a new issue