oneCInteraction 1.2.2__tar.gz → 1.2.4__tar.gz

{onecinteraction-1.2.2/src/oneCInteraction.egg-info → onecinteraction-1.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oneCInteraction
-Version: 1.2.2
+Version: 1.2.4
 Summary: A Python library for interacting with 1C:Enterprise databases via COM connection.
 Author: agcl
 Classifier: Programming Language :: Python :: 3
@@ -47,6 +47,7 @@ The library is built on the principle of composition: the main `Connection` clas
 - `Connection.characteristics` (`CharacteristicsManager`) — reads properties of product variants.
 - `Connection.orders` (`OrdersManager`) — handles creation and updates of customer orders.
 - `Connection.customers` (`CustomersManager`) — manages customers/counterparties.
+- `Connection.discounts` (`DiscountsManager`) — manages discount groups and active nomenclature discounts.
 
 ---
 
@@ -67,7 +68,7 @@ def __init__(self, s_oneCDatabasePathIn: str, s_usernameIn: str, s_passwordIn: s
 - `s_warehouse_code` (str): 1C warehouse code for new orders.
 - `s_counteragent_code` (str): 1C counteragent (customer) code for new orders.
 - `s_organisation_code` (str): 1C organization code for new orders.
-- `sl_price_types` (list): List of price type names to cache automatically (defaults to `["Розничная", "Оптовая"]`).
+- `sl_price_types` (list): List of price type names to cache automatically (defaults to `["Розничная", "Оптовая", "Закупочная"]`).
 - `c_v8`: The active 1C COM connection object (equals `None` if not connected).
 
 #### Methods:
@@ -91,6 +92,7 @@ Represents a product.
 - `s_uuid` (str): Unique identifier (UUID) of the product in 1C.
 - `s_code` (str): 1C product code.
 - `l_images` (list): List of image UUIDs associated with the product in 1C.
+- `dt_last_arrival` (datetime): Date of the last physical arrival of the product to the warehouse from 1C.
 
 #### `Price`
 Represents a price with its value, assignment date, and type.
@@ -152,22 +154,34 @@ A buyer's order.
 - `s_status` (str): Status of the order in 1C.
 - `s_date` (str): Order creation date (automatically generated).
 - `n_orderCode` (str / int): Order number in 1C.
+- `s_price_type` (str): Price type name used for the order (e.g. `"Розничная"`, `"Оптовая"`, `"Закупочная"`).
+- `s_comment` (str): Additional comment/notes for the order (often parsed to extract Telegram ID).
 
 Calling `str(order_obj)` returns a nicely formatted HTML string suitable for sending to a Telegram bot.
 
+#### `DiscountGroup`
+Represents a group of nomenclature discounts.
+- `s_name` (str): Discount group name or comment.
+- `s_document_number` (str): Number of the document that set the discount in 1C.
+- `s_discount_type_code` (str): Discount type code (e.g. `"B2B"`).
+- `n_discount_percent` (float): Discount percentage.
+- `l_nomenclatures` (list of dict): List of products in the discount group (each product is a dict with keys `"code"`, `"name"`, `"uuid"`, and `"char_name"`).
+
 ---
 
 ### 3. Nomenclature Manager `NomenclatureManager` (`Connection.nomenclature`)
 Defined in [nomenclature.py](file:///c:/Users/agcl/PycharmProjects/oneCInteractionLib/src/oneCInteraction/nomenclature.py).
 
 - `get(s_articleIn: str = "", s_nameIn: str = "", s_codeIn: str = "") -> Nomenclature | None`
-  Searches for and returns a product by its article, name, or code. Fetches retail/wholesale prices, stock balances by warehouses, and characteristics.
+  Searches for and returns a product by its article, name, or code. Fetches retail, wholesale, and purchase prices, stock balances by warehouses, characteristics, and the parent group's UUID (`s_parent_uuid`).
+- `search(s_queryIn: str, s_searchByIn: str = "all") -> list`
+  Searches for nomenclature items by a query string matching the name, article, code, or all of them. Returns a list of `Nomenclature` objects (without full detailed price/stock breakdown, but containing basic fields).
 - `get_images(c_productObjIn: Nomenclature, s_imageDirIn: str = None) -> list`
   Downloads all attached images for a product from 1C. Saves them in the specified directory `s_imageDirIn` (defaults to `data/images`). Returns a list of the saved filenames (e.g., `["[uuid]_0.jpg"]`).
 - `get_by_group(c_groupRefIn) -> list`
   Batch fetches all products within a specific 1C group. Using optimized COM queries, this method minimizes DB requests and operates significantly faster than calling `get()` sequentially in a loop.
-- `get_by_category(c_categoryIn, s_attributeNameIn: str = "ВидНоменклатуры", s_catalogNameIn: str = "ВидыНоменклатуры") -> list`
-  Batch fetches all products within a specific 1C category (by default using the `ВидНоменклатуры` attribute in the `ВидыНоменклатуры` catalog). `c_categoryIn` can be a COM reference object or a string representing the category name.
+- `get_by_category(c_categoryIn) -> list`
+  Batch fetches all products within a specific 1C category. `c_categoryIn` can be a COM reference object or a string representing the category name (searched within `Справочник.КатегорииОбъектов`).
 
 ---
 
@@ -187,9 +201,9 @@ Defined in [groups.py](file:///c:/Users/agcl/PycharmProjects/oneCInteractionLib/
 Defined in [categories.py](file:///c:/Users/agcl/PycharmProjects/oneCInteractionLib/src/oneCInteraction/categories.py).
 
 - `get(s_codeIn: str = "", s_nameIn: str = "") -> Category | None`
-  Finds a single Category by its code or name in the `ВидыНоменклатуры` catalog.
+  Finds a single Category by its code or name in the `КатегорииОбъектов` (Object Categories) catalog.
 - `create(s_nameIn: str) -> Category | None`
-  Creates a new Category with the specified name in `Справочник.ВидыНоменклатуры` and returns it.
+  Creates a new Category with the specified name in `Справочник.КатегорииОбъектов` and returns it.
 
 ---
 
@@ -211,12 +225,12 @@ Defined in [orders.py](file:///c:/Users/agcl/PycharmProjects/oneCInteractionLib/
 - `push(c_orderObjIn: Order) -> str`
   Creates a new `"Заказ покупателя"` (Buyer's Order) document in 1C.
   - Automatically queries the warehouse, counteragent, and organization based on codes specified in the `Connection` object.
-  - Sets the retail price type, document currency (Hryvnia, code `"980"`), and organization's primary bank account.
-  - Adds products from the order, queries the exact price for the specific characteristic selected, and computes totals.
+  - Sets the price type (defaulting to `"Розничная"` or using `s_price_type` from the order), document currency (Hryvnia, code `"980"`), and organization's primary bank account.
+  - Adds products from the order, queries/compares the exact price for the specific characteristic selected (using `s_price_type` to determine retail, wholesale, or purchase price), and computes totals.
   - Attempts to post the document (`Posting`). If posting fails, it writes the document in draft/save mode (`Write`).
   - Returns the number of the created document in 1C (or an empty string on error).
 - `get(s_codeIn: str) -> Order | None`
-  Retrieves a buyer's order by its 1C document number and parses it into an `Order` object. The comment field is parsed to retrieve the Telegram ID.
+  Retrieves a buyer's order by its 1C document number and parses it into an `Order` object. The comment field is parsed to retrieve the Telegram ID, and the price type is retrieved.
 - `get_today() -> list`
   Returns a list of all today's orders created for the configured bot counteragent (filtered by current date and counteragent code).
 - `update_info(c_orderObjIn: Order) -> bool`
@@ -239,7 +253,18 @@ Defined in [customers.py](file:///c:/Users/agcl/PycharmProjects/oneCInteractionL
 
 ---
 
-### 9. Logging (`log.py`)
+### 9. Discounts Manager `DiscountsManager` (`Connection.discounts`)
+Defined in [discounts.py](file:///c:/Users/agcl/PycharmProjects/oneCInteractionLib/src/oneCInteraction/discounts.py).
+
+- `get_active_groups(s_discount_type_codeIn: str = None) -> list`
+  Retrieves active discount groups and returns them as a list of `DiscountGroup` objects.
+  - If `s_discount_type_codeIn` is specified, only returns groups matching that discount type code.
+  - Queries active discounts from the `СкидкиНаценкиНоменклатуры` information register.
+  - Only retrieves discounts where the percentage is greater than zero and the registrar document's end date (`ДатаОкончания`) is either not set or is greater than or equal to the current date.
+
+---
+
+### 10. Logging (`log.py`)
 Defined in [log.py](file:///c:/Users/agcl/PycharmProjects/oneCInteractionLib/src/oneCInteraction/log.py).
 
 All actions are logged automatically. The library resolves the root directory of the project that imported it and stores log files in the relative path `log/system/[calling_module_name].log`.

{onecinteraction-1.2.2 → onecinteraction-1.2.4}/README.md

@@ -32,6 +32,7 @@ The library is built on the principle of composition: the main `Connection` clas
 - `Connection.characteristics` (`CharacteristicsManager`) — reads properties of product variants.
 - `Connection.orders` (`OrdersManager`) — handles creation and updates of customer orders.
 - `Connection.customers` (`CustomersManager`) — manages customers/counterparties.
+- `Connection.discounts` (`DiscountsManager`) — manages discount groups and active nomenclature discounts.
 
 ---
 
@@ -52,7 +53,7 @@ def __init__(self, s_oneCDatabasePathIn: str, s_usernameIn: str, s_passwordIn: s
 - `s_warehouse_code` (str): 1C warehouse code for new orders.
 - `s_counteragent_code` (str): 1C counteragent (customer) code for new orders.
 - `s_organisation_code` (str): 1C organization code for new orders.
-- `sl_price_types` (list): List of price type names to cache automatically (defaults to `["Розничная", "Оптовая"]`).
+- `sl_price_types` (list): List of price type names to cache automatically (defaults to `["Розничная", "Оптовая", "Закупочная"]`).
 - `c_v8`: The active 1C COM connection object (equals `None` if not connected).
 
 #### Methods:
@@ -76,6 +77,7 @@ Represents a product.
 - `s_uuid` (str): Unique identifier (UUID) of the product in 1C.
 - `s_code` (str): 1C product code.
 - `l_images` (list): List of image UUIDs associated with the product in 1C.
+- `dt_last_arrival` (datetime): Date of the last physical arrival of the product to the warehouse from 1C.
 
 #### `Price`
 Represents a price with its value, assignment date, and type.
@@ -137,22 +139,34 @@ A buyer's order.
 - `s_status` (str): Status of the order in 1C.
 - `s_date` (str): Order creation date (automatically generated).
 - `n_orderCode` (str / int): Order number in 1C.
+- `s_price_type` (str): Price type name used for the order (e.g. `"Розничная"`, `"Оптовая"`, `"Закупочная"`).
+- `s_comment` (str): Additional comment/notes for the order (often parsed to extract Telegram ID).
 
 Calling `str(order_obj)` returns a nicely formatted HTML string suitable for sending to a Telegram bot.
 
+#### `DiscountGroup`
+Represents a group of nomenclature discounts.
+- `s_name` (str): Discount group name or comment.
+- `s_document_number` (str): Number of the document that set the discount in 1C.
+- `s_discount_type_code` (str): Discount type code (e.g. `"B2B"`).
+- `n_discount_percent` (float): Discount percentage.
+- `l_nomenclatures` (list of dict): List of products in the discount group (each product is a dict with keys `"code"`, `"name"`, `"uuid"`, and `"char_name"`).
+
 ---
 
 ### 3. Nomenclature Manager `NomenclatureManager` (`Connection.nomenclature`)
 Defined in [nomenclature.py](file:///c:/Users/agcl/PycharmProjects/oneCInteractionLib/src/oneCInteraction/nomenclature.py).
 
 - `get(s_articleIn: str = "", s_nameIn: str = "", s_codeIn: str = "") -> Nomenclature | None`
-  Searches for and returns a product by its article, name, or code. Fetches retail/wholesale prices, stock balances by warehouses, and characteristics.
+  Searches for and returns a product by its article, name, or code. Fetches retail, wholesale, and purchase prices, stock balances by warehouses, characteristics, and the parent group's UUID (`s_parent_uuid`).
+- `search(s_queryIn: str, s_searchByIn: str = "all") -> list`
+  Searches for nomenclature items by a query string matching the name, article, code, or all of them. Returns a list of `Nomenclature` objects (without full detailed price/stock breakdown, but containing basic fields).
 - `get_images(c_productObjIn: Nomenclature, s_imageDirIn: str = None) -> list`
   Downloads all attached images for a product from 1C. Saves them in the specified directory `s_imageDirIn` (defaults to `data/images`). Returns a list of the saved filenames (e.g., `["[uuid]_0.jpg"]`).
 - `get_by_group(c_groupRefIn) -> list`
   Batch fetches all products within a specific 1C group. Using optimized COM queries, this method minimizes DB requests and operates significantly faster than calling `get()` sequentially in a loop.
-- `get_by_category(c_categoryIn, s_attributeNameIn: str = "ВидНоменклатуры", s_catalogNameIn: str = "ВидыНоменклатуры") -> list`
-  Batch fetches all products within a specific 1C category (by default using the `ВидНоменклатуры` attribute in the `ВидыНоменклатуры` catalog). `c_categoryIn` can be a COM reference object or a string representing the category name.
+- `get_by_category(c_categoryIn) -> list`
+  Batch fetches all products within a specific 1C category. `c_categoryIn` can be a COM reference object or a string representing the category name (searched within `Справочник.КатегорииОбъектов`).
 
 ---
 
@@ -172,9 +186,9 @@ Defined in [groups.py](file:///c:/Users/agcl/PycharmProjects/oneCInteractionLib/
 Defined in [categories.py](file:///c:/Users/agcl/PycharmProjects/oneCInteractionLib/src/oneCInteraction/categories.py).
 
 - `get(s_codeIn: str = "", s_nameIn: str = "") -> Category | None`
-  Finds a single Category by its code or name in the `ВидыНоменклатуры` catalog.
+  Finds a single Category by its code or name in the `КатегорииОбъектов` (Object Categories) catalog.
 - `create(s_nameIn: str) -> Category | None`
-  Creates a new Category with the specified name in `Справочник.ВидыНоменклатуры` and returns it.
+  Creates a new Category with the specified name in `Справочник.КатегорииОбъектов` and returns it.
 
 ---
 
@@ -196,12 +210,12 @@ Defined in [orders.py](file:///c:/Users/agcl/PycharmProjects/oneCInteractionLib/
 - `push(c_orderObjIn: Order) -> str`
   Creates a new `"Заказ покупателя"` (Buyer's Order) document in 1C.
   - Automatically queries the warehouse, counteragent, and organization based on codes specified in the `Connection` object.
-  - Sets the retail price type, document currency (Hryvnia, code `"980"`), and organization's primary bank account.
-  - Adds products from the order, queries the exact price for the specific characteristic selected, and computes totals.
+  - Sets the price type (defaulting to `"Розничная"` or using `s_price_type` from the order), document currency (Hryvnia, code `"980"`), and organization's primary bank account.
+  - Adds products from the order, queries/compares the exact price for the specific characteristic selected (using `s_price_type` to determine retail, wholesale, or purchase price), and computes totals.
   - Attempts to post the document (`Posting`). If posting fails, it writes the document in draft/save mode (`Write`).
   - Returns the number of the created document in 1C (or an empty string on error).
 - `get(s_codeIn: str) -> Order | None`
-  Retrieves a buyer's order by its 1C document number and parses it into an `Order` object. The comment field is parsed to retrieve the Telegram ID.
+  Retrieves a buyer's order by its 1C document number and parses it into an `Order` object. The comment field is parsed to retrieve the Telegram ID, and the price type is retrieved.
 - `get_today() -> list`
   Returns a list of all today's orders created for the configured bot counteragent (filtered by current date and counteragent code).
 - `update_info(c_orderObjIn: Order) -> bool`
@@ -224,7 +238,18 @@ Defined in [customers.py](file:///c:/Users/agcl/PycharmProjects/oneCInteractionL
 
 ---
 
-### 9. Logging (`log.py`)
+### 9. Discounts Manager `DiscountsManager` (`Connection.discounts`)
+Defined in [discounts.py](file:///c:/Users/agcl/PycharmProjects/oneCInteractionLib/src/oneCInteraction/discounts.py).
+
+- `get_active_groups(s_discount_type_codeIn: str = None) -> list`
+  Retrieves active discount groups and returns them as a list of `DiscountGroup` objects.
+  - If `s_discount_type_codeIn` is specified, only returns groups matching that discount type code.
+  - Queries active discounts from the `СкидкиНаценкиНоменклатуры` information register.
+  - Only retrieves discounts where the percentage is greater than zero and the registrar document's end date (`ДатаОкончания`) is either not set or is greater than or equal to the current date.
+
+---
+
+### 10. Logging (`log.py`)
 Defined in [log.py](file:///c:/Users/agcl/PycharmProjects/oneCInteractionLib/src/oneCInteraction/log.py).
 
 All actions are logged automatically. The library resolves the root directory of the project that imported it and stores log files in the relative path `log/system/[calling_module_name].log`.

{onecinteraction-1.2.2 → onecinteraction-1.2.4}/src/oneCInteraction/discounts.py

@@ -40,6 +40,7 @@ class DiscountsManager:
                     РегистрСведений.СкидкиНаценкиНоменклатуры.СрезПоследних(&CurrentDate, ) КАК Скидки
                 WHERE
                     Скидки.ПроцентСкидкиНаценки > 0
+                    AND (Скидки.Регистратор.ДатаОкончания = DATETIME(1, 1, 1) OR Скидки.Регистратор.ДатаОкончания >= &CurrentDate)
             """
             
             if s_discount_type_codeIn is not None:

{onecinteraction-1.2.2 → onecinteraction-1.2.4}/src/oneCInteraction/nomenclature.py

@@ -54,7 +54,8 @@ class NomenclatureManager:
                     Артикул AS Article, 
                     ISNULL(ДополнительноеОписаниеНоменклатуры, "") AS FullDescription,
                     ISNULL(НаименованиеПолное, "") AS FullName,
-                    ISNULL(ЕдиницаХраненияОстатков.Наименование, "шт.") AS Unit
+                    ISNULL(ЕдиницаХраненияОстатков.Наименование, "шт.") AS Unit,
+                    Родитель.Ссылка AS ParentRef
                 FROM Справочник.Номенклатура
                 WHERE ({" OR ".join(where_clauses)}) AND ЭтоГруппа = ЛОЖЬ AND ПометкаУдаления = ЛОЖЬ
             """
@@ -71,6 +72,8 @@ class NomenclatureManager:
             if not s_description:
                 s_description = self.c_v8.String(c_selection.FullName)
 
+            s_parent_uuid = self.c_v8.String(c_selection.ParentRef.UUID()) if not c_selection.ParentRef.IsEmpty() else ""
+
             log_sys(f"Nomenclature found: Name='{c_selection.Name}', Article='{c_selection.Article}'")
             return self._fetch_details(
                 c_selection.Ref, 
@@ -78,8 +81,9 @@ class NomenclatureManager:
                 c_selection.Article, 
                 s_description,
                 getattr(c_selection, "Unit", "шт."),
-                self.c_v8.String(c_selection.Ref.UUID()),
-                self.c_v8.String(c_selection.Code)
+                self.c_v8.String(c_selection.Ref.UUID()), 
+                self.c_v8.String(c_selection.Code),
+                s_parent_uuidIn=s_parent_uuid
             )
         except Exception as e:
             log_sys(f"Error in NomenclatureManager.get: {e}", 1)
@@ -162,6 +166,7 @@ class NomenclatureManager:
                 return []
 
             d_batchDetails = self._fetch_batch_details(l_productRefs)
+            d_batchArrivals = self._fetch_batch_last_arrivals(l_productRefs)
             
             l_allCharRefs = []
             for s_productUuid in d_batchDetails:
@@ -216,7 +221,8 @@ class NomenclatureManager:
                         s_unitIn=d_item["unit"],
                         s_uuidIn=s_productUuid,
                         s_codeIn=self.c_v8.String(d_item["code"]),
-                        l_imagesIn=d_batchImages.get(s_productUuid, [])
+                        l_imagesIn=d_batchImages.get(s_productUuid, []),
+                        dt_last_arrivalIn=d_batchArrivals.get(s_productUuid)
                     ))
 
             log_sys(f"Successfully processed {len(l_nomenclatures)} items in search mode.")
@@ -347,6 +353,47 @@ class NomenclatureManager:
 
         return d_batchData
 
+    def _fetch_batch_last_arrivals(self, l_productRefsIn: list) -> dict:
+        """Batch fetches the last physical arrival date for a list of product references."""
+        if not self.c_v8 or not l_productRefsIn:
+            return {}
+
+        log_sys(f"Batch fetching last arrival dates for {len(l_productRefsIn)} items...")
+        
+        c_productRefsV8 = self.c_v8.NewObject("ValueList")
+        for c_ref in l_productRefsIn:
+            c_productRefsV8.Add(c_ref)
+
+        c_query = self.c_v8.NewObject("Query")
+        c_query.Text = """
+            SELECT
+                ТоварыНаСкладах.Номенклатура AS ProductRef,
+                MAX(ТоварыНаСкладах.Период) AS LastArrivalDate
+            FROM
+                РегистрНакопления.ТоварыНаСкладах AS ТоварыНаСкладах
+            WHERE
+                ТоварыНаСкладах.Номенклатура В (&ProductRefs)
+                AND ТоварыНаСкладах.ВидДвижения = ЗНАЧЕНИЕ(ВидДвиженияНакопления.Приход)
+            GROUP BY
+                ТоварыНаСкладах.Номенклатура
+        """
+        c_query.SetParameter("ProductRefs", c_productRefsV8)
+
+        d_arrivals = {}
+        try:
+            c_result = c_query.Execute()
+            if c_result is not None and not c_result.IsEmpty():
+                c_sel = c_result.Select()
+                while c_sel.Next():
+                    s_productUuid = self.c_v8.String(c_sel.ProductRef.UUID())
+                    dt_last_arrival = _parse_1c_date(c_sel.LastArrivalDate)
+                    if dt_last_arrival:
+                        d_arrivals[s_productUuid] = dt_last_arrival
+        except Exception as e:
+            log_sys(f"Error in batch last arrivals query execution: {e}", 1)
+
+        return d_arrivals
+
     def _fetch_batch_image_metadata(self, l_productRefsIn: list) -> dict:
         """Batch fetches image references (UUIDs) for a list of product references."""
         if not self.c_v8 or not l_productRefsIn:
@@ -389,7 +436,8 @@ class NomenclatureManager:
         s_descriptionIn: str,
         s_unitIn: str = "шт.",
         s_uuidIn: str = "",
-        s_codeIn: str = ""
+        s_codeIn: str = "",
+        s_parent_uuidIn: str = ""
     ):
         """Fetches details (prices, stock, characteristics) for a single Nomenclature."""
         c_retailPtRef = self.c_connection.get_price_type_ref("Розничная")
@@ -527,6 +575,28 @@ class NomenclatureManager:
                 )
             ))
 
+        # Fetch last arrival date
+        dt_last_arrival = None
+        try:
+            c_arrivalQuery = self.c_v8.NewObject("Query")
+            c_arrivalQuery.Text = """
+                SELECT
+                    MAX(ТоварыНаСкладах.Период) AS LastArrivalDate
+                FROM
+                    РегистрНакопления.ТоварыНаСкладах AS ТоварыНаСкладах
+                WHERE
+                    ТоварыНаСкладах.Номенклатура = &ProductRef
+                    AND ТоварыНаСкладах.ВидДвижения = ЗНАЧЕНИЕ(ВидДвиженияНакопления.Приход)
+            """
+            c_arrivalQuery.SetParameter("ProductRef", c_productRefIn)
+            c_arrivalResult = c_arrivalQuery.Execute()
+            if c_arrivalResult is not None and not c_arrivalResult.IsEmpty():
+                c_arrivalSel = c_arrivalResult.Select()
+                if c_arrivalSel.Next():
+                    dt_last_arrival = _parse_1c_date(c_arrivalSel.LastArrivalDate)
+        except Exception as e:
+            log_sys(f"Error fetching last arrival date for {s_articleIn}: {e}", 1)
+
         return structures.Nomenclature(
             s_nameIn=s_nameIn,
             s_articleIn=s_articleIn,
@@ -534,7 +604,9 @@ class NomenclatureManager:
             s_descriptionIn=s_descriptionIn,
             s_unitIn=s_unitIn,
             s_uuidIn=s_uuidIn,
-            s_codeIn=s_codeIn
+            s_codeIn=s_codeIn,
+            s_parent_uuidIn=s_parent_uuidIn,
+            dt_last_arrivalIn=dt_last_arrival
         )
 
     def get_images(self, c_productObjIn, s_imageDirIn: str = None) -> list:
@@ -665,6 +737,7 @@ class NomenclatureManager:
 
 
             d_batchDetails = self._fetch_batch_details(l_productRefs)
+            d_batchArrivals = self._fetch_batch_last_arrivals(l_productRefs)
             
 
             l_allCharRefs = []
@@ -721,8 +794,10 @@ class NomenclatureManager:
                         l_varietyIn=l_varieties,
                         s_descriptionIn=d_item["description"],
                         s_unitIn=d_item["unit"],
+                        s_uuidIn=s_productUuid,
                         s_codeIn=self.c_v8.String(d_item["code"]),
-                        l_imagesIn=d_batchImages.get(s_productUuid, [])
+                        l_imagesIn=d_batchImages.get(s_productUuid, []),
+                        dt_last_arrivalIn=d_batchArrivals.get(s_productUuid)
                     ))
 
             log_sys(f"Successfully processed {len(l_nomenclatures)} items in batch mode.")
@@ -818,6 +893,7 @@ class NomenclatureManager:
 
 
             d_batchDetails = self._fetch_batch_details(l_productRefs)
+            d_batchArrivals = self._fetch_batch_last_arrivals(l_productRefs)
             
 
             l_allCharRefs = []
@@ -874,8 +950,10 @@ class NomenclatureManager:
                         l_varietyIn=l_varieties,
                         s_descriptionIn=d_item["description"],
                         s_unitIn=d_item["unit"],
+                        s_uuidIn=s_productUuid,
                         s_codeIn=self.c_v8.String(d_item["code"]),
-                        l_imagesIn=d_batchImages.get(s_productUuid, [])
+                        l_imagesIn=d_batchImages.get(s_productUuid, []),
+                        dt_last_arrivalIn=d_batchArrivals.get(s_productUuid)
                     ))
 
             log_sys(f"Successfully processed {len(l_nomenclatures)} items in batch mode.")

{onecinteraction-1.2.2 → onecinteraction-1.2.4}/src/oneCInteraction/structures.py

@@ -11,7 +11,8 @@ class Nomenclature:
         s_parent_uuidIn: str = "",
         s_uuidIn: str = "",
         s_codeIn: str = "",
-        l_imagesIn: list = None
+        l_imagesIn: list = None,
+        dt_last_arrivalIn: datetime = None
     ):
         self.s_name = s_nameIn
         self.s_article = s_articleIn
@@ -22,6 +23,7 @@ class Nomenclature:
         self.s_uuid = s_uuidIn
         self.s_code = s_codeIn
         self.l_images = l_imagesIn if l_imagesIn is not None else []
+        self.dt_last_arrival = dt_last_arrivalIn
 
 class Price:
     def __init__(self, n_value: float, dt_assigned: datetime = None, s_type: str = ""):

{onecinteraction-1.2.2 → onecinteraction-1.2.4/src/oneCInteraction.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oneCInteraction
-Version: 1.2.2
+Version: 1.2.4
 Summary: A Python library for interacting with 1C:Enterprise databases via COM connection.
 Author: agcl
 Classifier: Programming Language :: Python :: 3
@@ -47,6 +47,7 @@ The library is built on the principle of composition: the main `Connection` clas
 - `Connection.characteristics` (`CharacteristicsManager`) — reads properties of product variants.
 - `Connection.orders` (`OrdersManager`) — handles creation and updates of customer orders.
 - `Connection.customers` (`CustomersManager`) — manages customers/counterparties.
+- `Connection.discounts` (`DiscountsManager`) — manages discount groups and active nomenclature discounts.
 
 ---
 
@@ -67,7 +68,7 @@ def __init__(self, s_oneCDatabasePathIn: str, s_usernameIn: str, s_passwordIn: s
 - `s_warehouse_code` (str): 1C warehouse code for new orders.
 - `s_counteragent_code` (str): 1C counteragent (customer) code for new orders.
 - `s_organisation_code` (str): 1C organization code for new orders.
-- `sl_price_types` (list): List of price type names to cache automatically (defaults to `["Розничная", "Оптовая"]`).
+- `sl_price_types` (list): List of price type names to cache automatically (defaults to `["Розничная", "Оптовая", "Закупочная"]`).
 - `c_v8`: The active 1C COM connection object (equals `None` if not connected).
 
 #### Methods:
@@ -91,6 +92,7 @@ Represents a product.
 - `s_uuid` (str): Unique identifier (UUID) of the product in 1C.
 - `s_code` (str): 1C product code.
 - `l_images` (list): List of image UUIDs associated with the product in 1C.
+- `dt_last_arrival` (datetime): Date of the last physical arrival of the product to the warehouse from 1C.
 
 #### `Price`
 Represents a price with its value, assignment date, and type.
@@ -152,22 +154,34 @@ A buyer's order.
 - `s_status` (str): Status of the order in 1C.
 - `s_date` (str): Order creation date (automatically generated).
 - `n_orderCode` (str / int): Order number in 1C.
+- `s_price_type` (str): Price type name used for the order (e.g. `"Розничная"`, `"Оптовая"`, `"Закупочная"`).
+- `s_comment` (str): Additional comment/notes for the order (often parsed to extract Telegram ID).
 
 Calling `str(order_obj)` returns a nicely formatted HTML string suitable for sending to a Telegram bot.
 
+#### `DiscountGroup`
+Represents a group of nomenclature discounts.
+- `s_name` (str): Discount group name or comment.
+- `s_document_number` (str): Number of the document that set the discount in 1C.
+- `s_discount_type_code` (str): Discount type code (e.g. `"B2B"`).
+- `n_discount_percent` (float): Discount percentage.
+- `l_nomenclatures` (list of dict): List of products in the discount group (each product is a dict with keys `"code"`, `"name"`, `"uuid"`, and `"char_name"`).
+
 ---
 
 ### 3. Nomenclature Manager `NomenclatureManager` (`Connection.nomenclature`)
 Defined in [nomenclature.py](file:///c:/Users/agcl/PycharmProjects/oneCInteractionLib/src/oneCInteraction/nomenclature.py).
 
 - `get(s_articleIn: str = "", s_nameIn: str = "", s_codeIn: str = "") -> Nomenclature | None`
-  Searches for and returns a product by its article, name, or code. Fetches retail/wholesale prices, stock balances by warehouses, and characteristics.
+  Searches for and returns a product by its article, name, or code. Fetches retail, wholesale, and purchase prices, stock balances by warehouses, characteristics, and the parent group's UUID (`s_parent_uuid`).
+- `search(s_queryIn: str, s_searchByIn: str = "all") -> list`
+  Searches for nomenclature items by a query string matching the name, article, code, or all of them. Returns a list of `Nomenclature` objects (without full detailed price/stock breakdown, but containing basic fields).
 - `get_images(c_productObjIn: Nomenclature, s_imageDirIn: str = None) -> list`
   Downloads all attached images for a product from 1C. Saves them in the specified directory `s_imageDirIn` (defaults to `data/images`). Returns a list of the saved filenames (e.g., `["[uuid]_0.jpg"]`).
 - `get_by_group(c_groupRefIn) -> list`
   Batch fetches all products within a specific 1C group. Using optimized COM queries, this method minimizes DB requests and operates significantly faster than calling `get()` sequentially in a loop.
-- `get_by_category(c_categoryIn, s_attributeNameIn: str = "ВидНоменклатуры", s_catalogNameIn: str = "ВидыНоменклатуры") -> list`
-  Batch fetches all products within a specific 1C category (by default using the `ВидНоменклатуры` attribute in the `ВидыНоменклатуры` catalog). `c_categoryIn` can be a COM reference object or a string representing the category name.
+- `get_by_category(c_categoryIn) -> list`
+  Batch fetches all products within a specific 1C category. `c_categoryIn` can be a COM reference object or a string representing the category name (searched within `Справочник.КатегорииОбъектов`).
 
 ---
 
@@ -187,9 +201,9 @@ Defined in [groups.py](file:///c:/Users/agcl/PycharmProjects/oneCInteractionLib/
 Defined in [categories.py](file:///c:/Users/agcl/PycharmProjects/oneCInteractionLib/src/oneCInteraction/categories.py).
 
 - `get(s_codeIn: str = "", s_nameIn: str = "") -> Category | None`
-  Finds a single Category by its code or name in the `ВидыНоменклатуры` catalog.
+  Finds a single Category by its code or name in the `КатегорииОбъектов` (Object Categories) catalog.
 - `create(s_nameIn: str) -> Category | None`
-  Creates a new Category with the specified name in `Справочник.ВидыНоменклатуры` and returns it.
+  Creates a new Category with the specified name in `Справочник.КатегорииОбъектов` and returns it.
 
 ---
 
@@ -211,12 +225,12 @@ Defined in [orders.py](file:///c:/Users/agcl/PycharmProjects/oneCInteractionLib/
 - `push(c_orderObjIn: Order) -> str`
   Creates a new `"Заказ покупателя"` (Buyer's Order) document in 1C.
   - Automatically queries the warehouse, counteragent, and organization based on codes specified in the `Connection` object.
-  - Sets the retail price type, document currency (Hryvnia, code `"980"`), and organization's primary bank account.
-  - Adds products from the order, queries the exact price for the specific characteristic selected, and computes totals.
+  - Sets the price type (defaulting to `"Розничная"` or using `s_price_type` from the order), document currency (Hryvnia, code `"980"`), and organization's primary bank account.
+  - Adds products from the order, queries/compares the exact price for the specific characteristic selected (using `s_price_type` to determine retail, wholesale, or purchase price), and computes totals.
   - Attempts to post the document (`Posting`). If posting fails, it writes the document in draft/save mode (`Write`).
   - Returns the number of the created document in 1C (or an empty string on error).
 - `get(s_codeIn: str) -> Order | None`
-  Retrieves a buyer's order by its 1C document number and parses it into an `Order` object. The comment field is parsed to retrieve the Telegram ID.
+  Retrieves a buyer's order by its 1C document number and parses it into an `Order` object. The comment field is parsed to retrieve the Telegram ID, and the price type is retrieved.
 - `get_today() -> list`
   Returns a list of all today's orders created for the configured bot counteragent (filtered by current date and counteragent code).
 - `update_info(c_orderObjIn: Order) -> bool`
@@ -239,7 +253,18 @@ Defined in [customers.py](file:///c:/Users/agcl/PycharmProjects/oneCInteractionL
 
 ---
 
-### 9. Logging (`log.py`)
+### 9. Discounts Manager `DiscountsManager` (`Connection.discounts`)
+Defined in [discounts.py](file:///c:/Users/agcl/PycharmProjects/oneCInteractionLib/src/oneCInteraction/discounts.py).
+
+- `get_active_groups(s_discount_type_codeIn: str = None) -> list`
+  Retrieves active discount groups and returns them as a list of `DiscountGroup` objects.
+  - If `s_discount_type_codeIn` is specified, only returns groups matching that discount type code.
+  - Queries active discounts from the `СкидкиНаценкиНоменклатуры` information register.
+  - Only retrieves discounts where the percentage is greater than zero and the registrar document's end date (`ДатаОкончания`) is either not set or is greater than or equal to the current date.
+
+---
+
+### 10. Logging (`log.py`)
 Defined in [log.py](file:///c:/Users/agcl/PycharmProjects/oneCInteractionLib/src/oneCInteraction/log.py).
 
 All actions are logged automatically. The library resolves the root directory of the project that imported it and stores log files in the relative path `log/system/[calling_module_name].log`.

{onecinteraction-1.2.2 → onecinteraction-1.2.4}/src/oneCInteraction.egg-info/scm_version.json

@@ -1,7 +1,7 @@
 {
-  "tag": "1.2.2",
+  "tag": "1.2.4",
   "distance": 0,
-  "node": "g20b3b63d3a854a5d08a4e7d8ff79d678622966c4",
+  "node": "g5ad73510167072830cfef203bb46a98009fc3c21",
   "dirty": false,
   "branch": "HEAD",
   "node_date": "2026-07-13"

{onecinteraction-1.2.2 → onecinteraction-1.2.4}/tests/test_lib.py

@@ -81,7 +81,17 @@ try:
     c_var = c_var_no_char
     
     c_nom = Nomenclature(s_nameIn="Product 1", s_articleIn="ART001", l_varietyIn=[c_var])
-    print("Success: Nomenclature instantiated.")
+    assert c_nom.dt_last_arrival is None
+    
+    dt_now = datetime.now()
+    c_nom_with_arrival = Nomenclature(
+        s_nameIn="Product 2",
+        s_articleIn="ART002",
+        l_varietyIn=[c_var],
+        dt_last_arrivalIn=dt_now
+    )
+    assert c_nom_with_arrival.dt_last_arrival == dt_now
+    print("Success: Nomenclature instantiated and verified with dt_last_arrival.")
     
     c_cat = Category(s_categoryNameIn="Shoes", l_nomenclaturesIn=[c_nom])
     print("Success: Category instantiated.")