Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
### Fixed

- Fix `Validation` tab from `Order`
- Fix invalid relations declared


## [2.12.4] - 2025-12-02

Expand Down
2 changes: 1 addition & 1 deletion ajax/massreception.php
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
]);
echo "</td><td>";
echo __s("Delivery status", "order") . "&nbsp;";
PluginOrderDeliveryState::Dropdown(['name' => "plugin_order_deliverystates_id"]);
PluginOrderDeliverystate::Dropdown(['name' => "plugin_order_deliverystates_id"]);
echo "</td></tr>";

echo "<tr class='tab_bg_2'>";
Expand Down
2 changes: 1 addition & 1 deletion front/ordertype.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@

Session::checkLoginUser();

$dropdown = new PluginOrderOrderType();
$dropdown = new PluginOrderOrdertype();

include(GLPI_ROOT . "/front/dropdown.common.php");
2 changes: 1 addition & 1 deletion front/othertype.form.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@

Session::checkLoginUser();

$dropdown = new PluginOrderOtherType();
$dropdown = new PluginOrderOthertype();

include(GLPI_ROOT . "/front/dropdown.common.form.php");
24 changes: 12 additions & 12 deletions hook.php
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,14 @@ function plugin_order_install()
$migration = new Migration(PLUGIN_ORDER_VERSION);
$classes = ['PluginOrderConfig', 'PluginOrderBillState', 'PluginOrderBillType',
'PluginOrderOrderState', 'PluginOrderOrder','PluginOrderOrder_Item',
'PluginOrderReference', 'PluginOrderDeliveryState',
'PluginOrderReference', 'PluginOrderDeliverystate',
'PluginOrderNotificationTargetOrder',
'PluginOrderOrder_Supplier', 'PluginOrderBill', 'PluginOrderOrderPayment',
'PluginOrderOrderType', 'PluginOrderOther', 'PluginOrderOtherType',
'PluginOrderOrdertype', 'PluginOrderOther', 'PluginOrderOthertype',
'PluginOrderPreference', 'PluginOrderProfile', 'PluginOrderReference_Supplier',
'PluginOrderSurveySupplier', 'PluginOrderOrderTax', 'PluginOrderDocumentCategory',
'PluginOrderReferenceFree', 'PluginOrderAccountSection',
'PluginOrderAnalyticNature',
'PluginOrderReferenceFree', 'PluginOrderAccountsection',
'PluginOrderAnalyticnature',
];
foreach ($classes as $class) {
if ($plug = isPluginItemType($class)) {
Expand Down Expand Up @@ -122,13 +122,13 @@ function plugin_order_uninstall()

$classes = ['PluginOrderConfig', 'PluginOrderBill', 'PluginOrderBillState',
'PluginOrderBillType', 'PluginOrderOrderState', 'PluginOrderOrder',
'PluginOrderOrder_Item', 'PluginOrderReference', 'PluginOrderDeliveryState',
'PluginOrderOrder_Item', 'PluginOrderReference', 'PluginOrderDeliverystate',
'PluginOrderNotificationTargetOrder',
'PluginOrderOrder_Supplier', 'PluginOrderOrderPayment','PluginOrderOrderTax',
'PluginOrderOrderType', 'PluginOrderOther', 'PluginOrderOtherType',
'PluginOrderOrdertype', 'PluginOrderOther', 'PluginOrderOthertype',
'PluginOrderPreference', 'PluginOrderProfile', 'PluginOrderReference_Supplier',
'PluginOrderSurveySupplier', 'PluginOrderDocumentCategory',
'PluginOrderAccountSection', 'PluginOrderAnalyticNature',
'PluginOrderAccountsection', 'PluginOrderAnalyticnature',
];
foreach ($classes as $class) {
call_user_func([$class, 'uninstall']);
Expand All @@ -146,14 +146,14 @@ function plugin_order_getDropdown()
if ($plugin->isActivated("order")) {
return ['PluginOrderOrderTax' => __s("VAT", "order"),
'PluginOrderOrderPayment' => __s("Payment conditions", "order"),
'PluginOrderOrderType' => __s("Type"),
'PluginOrderOrdertype' => __s("Type"),
'PluginOrderOrderState' => __s("Order status", "order"),
'PluginOrderOtherType' => __s("Other type of item", "order"),
'PluginOrderDeliveryState' => __s("Delivery status", "order"),
'PluginOrderOthertype' => __s("Other type of item", "order"),
'PluginOrderDeliverystate' => __s("Delivery status", "order"),
'PluginOrderBillState' => __s("Bill status", "order"),
'PluginOrderBillType' => __s("Bill type", "order"),
'PluginOrderAnalyticNature' => __s("Analytic nature", "order"),
'PluginOrderAccountSection' => __s("Account section", "order"),
'PluginOrderAnalyticnature' => __s("Analytic nature", "order"),
'PluginOrderAccountsection' => __s("Account section", "order"),
'PluginOrderDocumentCategory' => __s("Orders", "order"),
];
} else {
Expand Down
2 changes: 1 addition & 1 deletion inc/accountsection.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@



class PluginOrderAccountSection extends CommonDropdown
class PluginOrderAccountsection extends CommonDropdown
{
public static $rightname = 'plugin_order_order';

Expand Down
2 changes: 1 addition & 1 deletion inc/analyticnature.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@



class PluginOrderAnalyticNature extends CommonDropdown
class PluginOrderAnalyticnature extends CommonDropdown
{
public static $rightname = 'plugin_order_order';

Expand Down
2 changes: 1 addition & 1 deletion inc/deliverystate.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@



class PluginOrderDeliveryState extends CommonDropdown
class PluginOrderDeliverystate extends CommonDropdown
{
public static function getTypeName($nb = 0)
{
Expand Down
4 changes: 2 additions & 2 deletions inc/order.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -979,7 +979,7 @@ public function showForm($ID, $options = [])
/* type order */
echo "<td>" . __s("Type") . ": </td><td>";
if ($canedit) {
PluginOrderOrderType::Dropdown([
PluginOrderOrdertype::Dropdown([
'name' => "plugin_order_ordertypes_id",
'value' => $this->fields["plugin_order_ordertypes_id"],
]);
Expand Down Expand Up @@ -1293,7 +1293,7 @@ public function showForm($ID, $options = [])
}

if ($canedit) {
PluginOrderAccountSection::Dropdown([
PluginOrderAccountsection::Dropdown([
'name' => "plugin_order_accountsections_id",
'value' => $this->fields["plugin_order_accountsections_id"],
]);
Expand Down
6 changes: 3 additions & 3 deletions inc/order_item.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -509,7 +509,7 @@ public function showAddForm($plugin_order_orders_id)
echo "</span></td>";

echo "<td " . ($config->isAnalyticNatureDisplayed() ? '' : 'style="display:none;"') . ">";
PluginOrderAnalyticNature::Dropdown(['name' => "plugin_order_analyticnatures_id"]);
PluginOrderAnalyticnature::Dropdown(['name' => "plugin_order_analyticnatures_id"]);

if ($config->isAnalyticNatureMandatory()) {
echo " <span class='red'>*</span>";
Expand Down Expand Up @@ -589,7 +589,7 @@ public function showAddForm($plugin_order_orders_id)
echo "</td>";

echo "<td " . ($config->isAnalyticNatureDisplayed() ? '' : 'style="display:none;"') . ">";
PluginOrderAnalyticNature::Dropdown(['name' => "plugin_order_analyticnatures_id"]);
PluginOrderAnalyticnature::Dropdown(['name' => "plugin_order_analyticnatures_id"]);

if ($config->isAnalyticNatureMandatory()) {
echo " <span class='red'>*</span>";
Expand Down Expand Up @@ -662,7 +662,7 @@ public function showAddForm($plugin_order_orders_id)

$core_typefilename = GLPI_ROOT . "/src/" . $file . "Type.php";
$plugin_typefilename = PLUGIN_ORDER_DIR . "/inc/" . strtolower($file) . "type.class.php";
$itemtypeclass = "PluginOrderOtherType";
$itemtypeclass = "PluginOrderOthertype";

if (
file_exists($core_typefilename)
Expand Down
2 changes: 1 addition & 1 deletion inc/ordertype.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@


// Class for a Dropdown
class PluginOrderOrderType extends CommonDropdown
class PluginOrderOrdertype extends CommonDropdown
{
public static $rightname = 'plugin_order_order';

Expand Down
2 changes: 1 addition & 1 deletion inc/othertype.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@



class PluginOrderOtherType extends CommonDropdown
class PluginOrderOthertype extends CommonDropdown
{
public static $rightname = 'plugin_order_order';

Expand Down
4 changes: 2 additions & 2 deletions inc/reception.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ public function showForm($ID, $options = [])
echo "<td>" . __s("Delivery status", "order") . ": </td>";
echo "<td>";
if ($canedit) {
PluginOrderDeliveryState::Dropdown([
PluginOrderDeliverystate::Dropdown([
'name' => "plugin_order_deliverystates_id",
'value' => $this->fields["plugin_order_deliverystates_id"],
]);
Expand Down Expand Up @@ -817,7 +817,7 @@ public function showReceptionForm($params = [])
echo "<input type='text' name='delivery_number' size='20'>";

echo "<label class='order_ma'>" . __s("Delivery status", "order") . "</label>";
PluginOrderDeliveryState::Dropdown(['name' => "plugin_order_deliverystates_id"]);
PluginOrderDeliverystate::Dropdown(['name' => "plugin_order_deliverystates_id"]);

$config = PluginOrderConfig::getConfig();
if ($config->canGenerateAsset() == PluginOrderConfig::CONFIG_ASK) {
Expand Down