Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
- Loading branch information
Showing
13 changed files
with
266 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
21 changes: 21 additions & 0 deletions
21
htdocs/install/mysql/tables/llx_inventory_extrafields.key.sql
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| -- =================================================================== | ||
| -- Copyright (C) 2022 Laurent Destailleur <eldy@users.sourceforge.net> | ||
| -- Copyright (C) 2022 ATM Consulting <support@atm-consulting.fr> | ||
| -- | ||
| -- This program is free software; you can redistribute it and/or modify | ||
| -- it under the terms of the GNU General Public License as published by | ||
| -- the Free Software Foundation; either version 3 of the License, or | ||
| -- (at your option) any later version. | ||
| -- | ||
| -- This program is distributed in the hope that it will be useful, | ||
| -- but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| -- GNU General Public License for more details. | ||
| -- | ||
| -- You should have received a copy of the GNU General Public License | ||
| -- along with this program. If not, see <https://www.gnu.org/licenses/>. | ||
| -- | ||
| -- =================================================================== | ||
|
|
||
|
|
||
| ALTER TABLE llx_inventory_extrafields ADD INDEX idx_inventory_extrafields (fk_object); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| -- ======================================================================== | ||
| -- Copyright (C) 2022 Laurent Destailleur <eldy@users.sourceforge.net> | ||
| -- Copyright (C) 2022 ATM Consulting <support@atm-consulting.fr> | ||
|
|
||
| -- This program is free software; you can redistribute it and/or modify | ||
| -- it under the terms of the GNU General Public License as published by | ||
| -- the Free Software Foundation; either version 3 of the License, or | ||
| -- (at your option) any later version. | ||
| -- | ||
| -- This program is distributed in the hope that it will be useful, | ||
| -- but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| -- GNU General Public License for more details. | ||
| -- | ||
| -- You should have received a copy of the GNU General Public License | ||
| -- along with this program. If not, see <https://www.gnu.org/licenses/>. | ||
| -- | ||
| -- ======================================================================== | ||
|
|
||
| create table llx_inventory_extrafields | ||
| ( | ||
| rowid integer AUTO_INCREMENT PRIMARY KEY, | ||
| tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, | ||
| fk_object integer NOT NULL, | ||
| import_key varchar(14) -- import key | ||
| ) ENGINE=innodb; | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,123 @@ | ||
| <?php | ||
| /* Copyright (C) 2001-2002 Rodolphe Quiedeville <rodolphe@quiedeville.org> | ||
| * Copyright (C) 2003 Jean-Louis Bergamo <jlb@j1b.org> | ||
| * Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net> | ||
| * Copyright (C) 2012 Regis Houssin <regis.houssin@inodbox.com> | ||
| * Copyright (C) 2014 Florian Henry <florian.henry@open-concept.pro> | ||
| * Copyright (C) 2015 Jean-François Ferry <jfefe@aternatik.fr> | ||
| * | ||
| * This program is free software; you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation; either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see <https://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| /** | ||
| * \file htdocs/product/admin/inventory_extrafields.php | ||
| * \ingroup stock | ||
| * \brief Page to setup extra fields of inventory | ||
| */ | ||
|
|
||
| // Load Dolibarr environment | ||
| $res = 0; | ||
| // Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined) | ||
| if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) $res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php"; | ||
| // Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME | ||
| $tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1; | ||
| while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) { $i--; $j--; } | ||
| if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) $res = @include substr($tmp, 0, ($i + 1))."/main.inc.php"; | ||
| if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) $res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php"; | ||
| // Try main.inc.php using relative path | ||
| if (!$res && file_exists("../../main.inc.php")) $res = @include "../../main.inc.php"; | ||
| if (!$res && file_exists("../../../main.inc.php")) $res = @include "../../../main.inc.php"; | ||
| if (!$res) die("Include of main fails"); | ||
|
|
||
| require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; | ||
| require_once DOL_DOCUMENT_ROOT.'/core/lib/stock.lib.php'; | ||
|
|
||
| // Load translation files required by the page | ||
| $langs->loadLangs(array('stock@stock', 'admin')); | ||
|
|
||
| $extrafields = new ExtraFields($db); | ||
| $form = new Form($db); | ||
|
|
||
| // List of supported format | ||
| $tmptype2label = ExtraFields::$type2label; | ||
| $type2label = array(''); | ||
| foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val); | ||
|
|
||
| $action = GETPOST('action', 'aZ09'); | ||
| $attrname = GETPOST('attrname', 'alpha'); | ||
| $elementtype = 'inventory'; //Must be the $table_element of the class that manage extrafield | ||
|
|
||
| if (!$user->admin) accessforbidden(); | ||
|
|
||
|
|
||
| /* | ||
| * Actions | ||
| */ | ||
|
|
||
| require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php'; | ||
|
|
||
|
|
||
|
|
||
| /* | ||
| * View | ||
| */ | ||
|
|
||
|
|
||
| llxHeader('', $langs->trans("InventorySetup"), $help_url); | ||
|
|
||
|
|
||
| $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>'; | ||
| print load_fiche_titre($langs->trans("InventorySetup"), $linkback, 'title_setup'); | ||
|
|
||
|
|
||
| $head = stock_admin_prepare_head(); | ||
|
|
||
| print dol_get_fiche_head($head, 'inventoryAttributes', $langs->trans("InventoryExtraFields"), -1, 'account'); | ||
|
|
||
| require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php'; | ||
|
|
||
| print dol_get_fiche_end(); | ||
|
|
||
|
|
||
| // Buttons | ||
| if ($action != 'create' && $action != 'edit') { | ||
| print '<div class="tabsAction">'; | ||
| print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>"; | ||
| print "</div>"; | ||
| } | ||
|
|
||
|
|
||
| /* | ||
| * Creation of an optional field | ||
| */ | ||
| if ($action == 'create') { | ||
| print '<br><div id="newattrib"></div>'; | ||
| print load_fiche_titre($langs->trans('NewAttribute')); | ||
|
|
||
| require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php'; | ||
| } | ||
|
|
||
| /* | ||
| * Edition of an optional field | ||
| */ | ||
| if ($action == 'edit' && !empty($attrname)) { | ||
| print "<br>"; | ||
| print load_fiche_titre($langs->trans("FieldEdition", $attrname)); | ||
|
|
||
| require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php'; | ||
| } | ||
|
|
||
| // End of page | ||
| llxFooter(); | ||
| $db->close(); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters