Skip to content

Commit

Permalink
Merge tag 'v2.013' into v3.005-dev-new
Browse files Browse the repository at this point in the history 
* tag 'v2.013': (85 commits)
  Order: Improves retcode on invalid request
  Order: Adds case when market is closed (GH-700)
  Order: Adds argument for order close action
  EA/Order: Adds debug prints
  Order: Refresh order after modification
  Order: Fixes the current volume value when data in orequest is missing
  Order: Fixes issues with symbol being NULL after orders were loaded from the existing pool
  Order: Ignores processing condition on forcible order refresh to avoid stack overflow
  Order: Improves code syntax and better error message on order close error
  Order: Minor improvements
  Indi_ADXW: Fixes logic for SetCustomIndicatorName()
  ADXW: Renames variables to avoid global conflicts
  Order: OrderClose: Adds magic just in case
  Terminal: Fixes typo
  EA: Improves logic for strategy filter
  TSM: Increases signal cache limit to 1000
  EA: Improves open strategy signal filtering
  Sets magic on order modify in case it is lost
  Fixes "tree optimization error" under MT4.
  Improves orders and magic number logic
  ...
  • Loading branch information
@kenorb
kenorb committed Apr 27, 2024
2 parents de3b8ac + b43f990 commit 4214899
Show file tree
Hide file tree
Showing 588 changed files with 2,187 additions and 1,382 deletions.
2 changes: 1 addition & 1 deletion 3D/Chart3D.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//+------------------------------------------------------------------+
//| EA31337 framework |
//| Copyright 2016-2021, 31337 Investments Ltd |
//| Copyright 2016-2023, EA31337 Ltd |
//| https://github.com/EA31337 |
//+------------------------------------------------------------------+

Expand Down
2 changes: 1 addition & 1 deletion 3D/Chart3DCandles.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//+------------------------------------------------------------------+
//| EA31337 framework |
//| Copyright 2016-2021, 31337 Investments Ltd |
//| Copyright 2016-2023, EA31337 Ltd |
//| https://github.com/EA31337 |
//+------------------------------------------------------------------+

Expand Down
2 changes: 1 addition & 1 deletion 3D/Chart3DType.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//+------------------------------------------------------------------+
//| EA31337 framework |
//| Copyright 2016-2021, 31337 Investments Ltd |
//| Copyright 2016-2023, EA31337 Ltd |
//| https://github.com/EA31337 |
//+------------------------------------------------------------------+

Expand Down
2 changes: 1 addition & 1 deletion 3D/Cube.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//+------------------------------------------------------------------+
//| EA31337 framework |
//| Copyright 2016-2021, 31337 Investments Ltd |
//| Copyright 2016-2023, EA31337 Ltd |
//| https://github.com/EA31337 |
//+------------------------------------------------------------------+

Expand Down
2 changes: 1 addition & 1 deletion 3D/Device.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//+------------------------------------------------------------------+
//| EA31337 framework |
//| Copyright 2016-2021, 31337 Investments Ltd |
//| Copyright 2016-2023, EA31337 Ltd |
//| https://github.com/EA31337 |
//+------------------------------------------------------------------+

Expand Down
2 changes: 1 addition & 1 deletion 3D/Devices/MTDX/MTDXDevice.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//+------------------------------------------------------------------+
//| EA31337 framework |
//| Copyright 2016-2021, 31337 Investments Ltd |
//| Copyright 2016-2023, EA31337 Ltd |
//| https://github.com/EA31337 |
//+------------------------------------------------------------------+

Expand Down
2 changes: 1 addition & 1 deletion 3D/Devices/MTDX/MTDXIndexBuffer.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//+------------------------------------------------------------------+
//| EA31337 framework |
//| Copyright 2016-2021, 31337 Investments Ltd |
//| Copyright 2016-2023, EA31337 Ltd |
//| https://github.com/EA31337 |
//+------------------------------------------------------------------+

Expand Down
2 changes: 1 addition & 1 deletion 3D/Devices/MTDX/MTDXShader.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//+------------------------------------------------------------------+
//| EA31337 framework |
//| Copyright 2016-2021, 31337 Investments Ltd |
//| Copyright 2016-2023, EA31337 Ltd |
//| https://github.com/EA31337 |
//+------------------------------------------------------------------+

Expand Down
2 changes: 1 addition & 1 deletion 3D/Devices/MTDX/MTDXVertexBuffer.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//+------------------------------------------------------------------+
//| EA31337 framework |
//| Copyright 2016-2021, 31337 Investments Ltd |
//| Copyright 2016-2023, EA31337 Ltd |
//| https://github.com/EA31337 |
//+------------------------------------------------------------------+

Expand Down
2 changes: 1 addition & 1 deletion 3D/Face.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//+------------------------------------------------------------------+
//| EA31337 framework |
//| Copyright 2016-2021, 31337 Investments Ltd |
//| Copyright 2016-2023, EA31337 Ltd |
//| https://github.com/EA31337 |
//+------------------------------------------------------------------+

Expand Down
2 changes: 1 addition & 1 deletion 3D/Frontend.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//+------------------------------------------------------------------+
//| EA31337 framework |
//| Copyright 2016-2021, 31337 Investments Ltd |
//| Copyright 2016-2023, EA31337 Ltd |
//| https://github.com/EA31337 |
//+------------------------------------------------------------------+

Expand Down
2 changes: 1 addition & 1 deletion 3D/Frontends/MT5Frontend.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//+------------------------------------------------------------------+
//| EA31337 framework |
//| Copyright 2016-2021, 31337 Investments Ltd |
//| Copyright 2016-2023, EA31337 Ltd |
//| https://github.com/EA31337 |
//+------------------------------------------------------------------+

Expand Down
2 changes: 1 addition & 1 deletion 3D/IndexBuffer.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//+------------------------------------------------------------------+
//| EA31337 framework |
//| Copyright 2016-2021, 31337 Investments Ltd |
//| Copyright 2016-2023, EA31337 Ltd |
//| https://github.com/EA31337 |
//+------------------------------------------------------------------+

Expand Down
2 changes: 1 addition & 1 deletion 3D/Interface.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//+------------------------------------------------------------------+
//| EA31337 framework |
//| Copyright 2016-2021, 31337 Investments Ltd |
//| Copyright 2016-2023, EA31337 Ltd |
//| https://github.com/EA31337 |
//+------------------------------------------------------------------+

Expand Down
2 changes: 1 addition & 1 deletion 3D/Mesh.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//+------------------------------------------------------------------+
//| EA31337 framework |
//| Copyright 2016-2021, 31337 Investments Ltd |
//| Copyright 2016-2023, EA31337 Ltd |
//| https://github.com/EA31337 |
//+------------------------------------------------------------------+

Expand Down
2 changes: 1 addition & 1 deletion 3D/Shader.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//+------------------------------------------------------------------+
//| EA31337 framework |
//| Copyright 2016-2021, 31337 Investments Ltd |
//| Copyright 2016-2023, EA31337 Ltd |
//| https://github.com/EA31337 |
//+------------------------------------------------------------------+

Expand Down
2 changes: 1 addition & 1 deletion 3D/TSR.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//+------------------------------------------------------------------+
//| EA31337 framework |
//| Copyright 2016-2021, 31337 Investments Ltd |
//| Copyright 2016-2023, EA31337 Ltd |
//| https://github.com/EA31337 |
//+------------------------------------------------------------------+

Expand Down
2 changes: 1 addition & 1 deletion 3D/VertexBuffer.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//+------------------------------------------------------------------+
//| EA31337 framework |
//| Copyright 2016-2021, 31337 Investments Ltd |
//| Copyright 2016-2023, EA31337 Ltd |
//| https://github.com/EA31337 |
//+------------------------------------------------------------------+

Expand Down
2 changes: 1 addition & 1 deletion Account/Account.define.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//+------------------------------------------------------------------+
//| EA31337 framework |
//| Copyright 2016-2021, EA31337 Ltd |
//| Copyright 2016-2023, EA31337 Ltd |
//| https://github.com/EA31337 |
//+------------------------------------------------------------------+

Expand Down
38 changes: 19 additions & 19 deletions Account/Account.enum.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//+------------------------------------------------------------------+
//| EA31337 framework |
//| Copyright 2016-2021, EA31337 Ltd |
//| Copyright 2016-2023, EA31337 Ltd |
//| https://github.com/EA31337 |
//+------------------------------------------------------------------+

Expand Down Expand Up @@ -60,20 +60,20 @@ enum ENUM_ACC_STAT_INDEX { ACC_VALUE_CURR = 0, ACC_VALUE_PREV = 1, FINAL_ENUM_AC
* https://www.mql5.com/en/docs/constants/environment_state/accountinformation
*/
enum ENUM_ACCOUNT_INFO_DOUBLE {
ACCOUNT_ASSETS, // The current assets of an account (double).
ACCOUNT_BALANCE, // Account balance in the deposit currency (double).
ACCOUNT_COMMISSION_BLOCKED, // The current blocked commission amount on an account (double).
ACCOUNT_CREDIT, // Account credit in the deposit currency (double).
ACCOUNT_PROFIT, // Current profit of an account in the deposit currency (double).
ACCOUNT_EQUITY, // Account equity in the deposit currency (double).
ACCOUNT_LIABILITIES, // The current liabilities on an account (double).
ACCOUNT_MARGIN, // Account margin used in the deposit currency (double).
ACCOUNT_MARGIN_FREE, // Free margin of an account in the deposit currency (double).
ACCOUNT_MARGIN_INITIAL, // Initial margin reserved on an account to cover all pending orders (double).
ACCOUNT_MARGIN_LEVEL, // Account margin level in percents (double).
ACCOUNT_MARGIN_SO_CALL, // Margin call level (double).
ACCOUNT_MARGIN_SO_SO, // Margin stop out level (double).
ACCOUNT_MARGIN_INITIAL, // Initial margin (double).
ACCOUNT_MARGIN_MAINTENANCE, // Maintenance margin (double).
ACCOUNT_ASSETS, // The current assets of an account (double).
ACCOUNT_LIABILITIES, // The current liabilities on an account (double).
ACCOUNT_COMMISSION_BLOCKED, // The current blocked commission amount on an account (double).
ACCOUNT_MARGIN_MAINTENANCE, // Maintenance margin reserved to cover minimum amount of open positions (double).
ACCOUNT_MARGIN_SO_CALL, // Margin call level (double). Depends on ACCOUNT_MARGIN_SO_MODE.
ACCOUNT_MARGIN_SO_SO, // Margin stop out level (double). Depends on ACCOUNT_MARGIN_SO_MODE.
ACCOUNT_PROFIT, // Current profit of an account in the deposit currency (double).
};

/**
Expand All @@ -85,16 +85,16 @@ enum ENUM_ACCOUNT_INFO_DOUBLE {
* https://www.mql5.com/en/docs/constants/environment_state/accountinformation
*/
enum ENUM_ACCOUNT_INFO_INTEGER {
ACCOUNT_LOGIN, // Account number (long).
ACCOUNT_TRADE_MODE, // Account trade mode (ENUM_ACCOUNT_TRADE_MODE).
ACCOUNT_CURRENCY_DIGITS, // The number of decimal places in the account currency (int).
ACCOUNT_FIFO_CLOSE, // Whether positions can only be closed by FIFO rule (bool).
ACCOUNT_LEVERAGE, // Account leverage (long).
ACCOUNT_LIMIT_ORDERS, // Maximum allowed number of active pending orders (int).
ACCOUNT_LOGIN, // Account number (long).
ACCOUNT_MARGIN_MODE, // Margin calculation mode (ENUM_ACCOUNT_MARGIN_MODE).
ACCOUNT_MARGIN_SO_MODE, // Mode for setting the minimal allowed margin (ENUM_ACCOUNT_STOPOUT_MODE).
ACCOUNT_TRADE_ALLOWED, // Allowed trade for the current account (bool).
ACCOUNT_TRADE_EXPERT, // Allowed trade for an Expert Advisor (bool).
ACCOUNT_MARGIN_MODE, // Margin calculation mode (ENUM_ACCOUNT_MARGIN_MODE).
ACCOUNT_CURRENCY_DIGITS, // The number of decimal places in the account currency (int).
ACCOUNT_FIFO_CLOSE, // An indication showing that positions can only be closed by FIFO rule (bool).
ACCOUNT_TRADE_MODE, // Account trade mode (ENUM_ACCOUNT_TRADE_MODE).
};

/**
Expand All @@ -106,10 +106,10 @@ enum ENUM_ACCOUNT_INFO_INTEGER {
* https://www.mql5.com/en/docs/constants/environment_state/accountinformation
*/
enum ENUM_ACCOUNT_INFO_STRING {
ACCOUNT_NAME, // Client name (string).
ACCOUNT_SERVER, // Trade server name (string).
ACCOUNT_CURRENCY, // Account currency (string).
ACCOUNT_COMPANY, // Name of a company that serves the account (string).
ACCOUNT_CURRENCY, // Account currency (string).
ACCOUNT_NAME, // Client name (string).
ACCOUNT_SERVER // Trade server name (string).
};

/**
Expand All @@ -119,9 +119,9 @@ enum ENUM_ACCOUNT_INFO_STRING {
* https://www.mql5.com/en/docs/constants/environment_state/accountinformation
*/
enum ENUM_ACCOUNT_MARGIN_MODE {
ACCOUNT_MARGIN_MODE_RETAIL_NETTING, // Used for the OTC markets to interpret positions in the "netting" mode.
ACCOUNT_MARGIN_MODE_EXCHANGE, // Used for the exchange markets.
ACCOUNT_MARGIN_MODE_EXCHANGE, // Margin is calculated based on the discounts.
ACCOUNT_MARGIN_MODE_RETAIL_HEDGING, // Used for the exchange markets where individual positions are possible.
ACCOUNT_MARGIN_MODE_RETAIL_NETTING, // Used for the OTC markets to interpret positions in the "netting" mode.
};

/**
Expand Down
2 changes: 1 addition & 1 deletion Account/Account.extern.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//+------------------------------------------------------------------+
//| EA31337 framework |
//| Copyright 2016-2022, EA31337 Ltd |
//| Copyright 2016-2023, EA31337 Ltd |
//| https://github.com/EA31337 |
//+------------------------------------------------------------------+

Expand Down
2 changes: 1 addition & 1 deletion Account/Account.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//+------------------------------------------------------------------+
//| EA31337 framework |
//| Copyright 2016-2021, EA31337 Ltd |
//| Copyright 2016-2023, EA31337 Ltd |
//| https://github.com/EA31337 |
//+------------------------------------------------------------------+

Expand Down
2 changes: 1 addition & 1 deletion Account/Account.struct.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//+------------------------------------------------------------------+
//| EA31337 framework |
//| Copyright 2016-2021, EA31337 Ltd |
//| Copyright 2016-2023, EA31337 Ltd |
//| https://github.com/EA31337 |
//+------------------------------------------------------------------+

Expand Down
2 changes: 1 addition & 1 deletion Account/AccountBase.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//+------------------------------------------------------------------+
//| EA31337 framework |
//| Copyright 2016-2021, EA31337 Ltd |
//| Copyright 2016-2023, EA31337 Ltd |
//| https://github.com/EA31337 |
//+------------------------------------------------------------------+

Expand Down
2 changes: 1 addition & 1 deletion Account/AccountBase.struct.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//+------------------------------------------------------------------+
//| EA31337 framework |
//| Copyright 2016-2021, EA31337 Ltd |
//| Copyright 2016-2023, EA31337 Ltd |
//| https://github.com/EA31337 |
//+------------------------------------------------------------------+

Expand Down
2 changes: 1 addition & 1 deletion Account/AccountForex.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//+------------------------------------------------------------------+
//| EA31337 framework |
//| Copyright 2016-2021, EA31337 Ltd |
//| Copyright 2016-2023, EA31337 Ltd |
//| https://github.com/EA31337 |
//+------------------------------------------------------------------+

Expand Down
2 changes: 1 addition & 1 deletion Account/AccountForex.struct.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//+------------------------------------------------------------------+
//| EA31337 framework |
//| Copyright 2016-2021, EA31337 Ltd |
//| Copyright 2016-2023, EA31337 Ltd |
//| https://github.com/EA31337 |
//+------------------------------------------------------------------+

Expand Down
2 changes: 1 addition & 1 deletion Account/AccountMt.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//+------------------------------------------------------------------+
//| EA31337 framework |
//| Copyright 2016-2022, EA31337 Ltd |
//| Copyright 2016-2023, EA31337 Ltd |
//| https://github.com/EA31337 |
//+------------------------------------------------------------------+

Expand Down
2 changes: 1 addition & 1 deletion Account/tests/Account.test.mq4
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//+------------------------------------------------------------------+
//| EA31337 framework |
//| Copyright 2016-2021, EA31337 Ltd |
//| Copyright 2016-2023, EA31337 Ltd |
//| https://github.com/EA31337 |
//+------------------------------------------------------------------+

Expand Down
2 changes: 1 addition & 1 deletion Account/tests/Account.test.mq5
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//+------------------------------------------------------------------+
//| EA31337 framework |
//| Copyright 2016-2021, EA31337 Ltd |
//| Copyright 2016-2023, EA31337 Ltd |
//| https://github.com/EA31337 |
//+------------------------------------------------------------------+

Expand Down
2 changes: 1 addition & 1 deletion Account/tests/AccountForex.test.mq4
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//+------------------------------------------------------------------+
//| EA31337 framework |
//| Copyright 2016-2021, EA31337 Ltd |
//| Copyright 2016-2023, EA31337 Ltd |
//| https://github.com/EA31337 |
//+------------------------------------------------------------------+

Expand Down
2 changes: 1 addition & 1 deletion Account/tests/AccountForex.test.mq5
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//+------------------------------------------------------------------+
//| EA31337 framework |
//| Copyright 2016-2021, EA31337 Ltd |
//| Copyright 2016-2023, EA31337 Ltd |
//| https://github.com/EA31337 |
//+------------------------------------------------------------------+

Expand Down
2 changes: 1 addition & 1 deletion Account/tests/AccountMt.test.mq4
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//+------------------------------------------------------------------+
//| EA31337 framework |
//| Copyright 2016-2022, EA31337 Ltd |
//| Copyright 2016-2023, EA31337 Ltd |
//| https://github.com/EA31337 |
//+------------------------------------------------------------------+

Expand Down
2 changes: 1 addition & 1 deletion Account/tests/AccountMt.test.mq5
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//+------------------------------------------------------------------+
//| EA31337 framework |
//| Copyright 2016-2022, EA31337 Ltd |
//| Copyright 2016-2023, EA31337 Ltd |
//| https://github.com/EA31337 |
//+------------------------------------------------------------------+

Expand Down
Loading

0 comments on commit 4214899

Please sign in to comment.