Skip to content

STDEV-13280#576

Open
ragnvold wants to merge 91 commits intodevelopfrom
STDEV-13280
Open

STDEV-13280#576
ragnvold wants to merge 91 commits intodevelopfrom
STDEV-13280

Conversation

@ragnvold
Copy link
Contributor

@ragnvold ragnvold commented May 22, 2025

Добавление поддержки ОСУ от последнего релиза (0.6.26)

Nikita Parmenov and others added 9 commits May 22, 2025 14:26
Добавление новой ТГ PET_FOOD_MARKED и VEGETABLE_OIL_MARKED
Добавление новой ТГ PET_FOOD_MARKED и VEGETABLE_OIL_MARKED
Base automatically changed from rc_0.6.26 to develop June 18, 2025 09:09
Ilya Fomenko and others added 30 commits October 23, 2025 17:48
# Conflicts:
#	build.gradle
#	src/main/java/ru/evotor/framework/receipt/position/LocalModuleInfo.kt
# Conflicts:
#	src/main/java/ru/evotor/framework/core/action/event/receipt/payment/combined/result/PaymentDelegatorEventResult.kt
# Conflicts:
#	src/main/java/ru/evotor/framework/BundleExt.kt
#	src/main/java/ru/evotor/framework/core/action/command/print_receipt_command/PrintBuyReceiptCommand.kt
#	src/main/java/ru/evotor/framework/core/action/command/print_receipt_command/PrintBuybackReceiptCommand.kt
#	src/main/java/ru/evotor/framework/core/action/command/print_receipt_command/PrintPaybackReceiptCommand.kt
#	src/main/java/ru/evotor/framework/core/action/command/print_receipt_command/PrintReceiptCommand.kt
#	src/main/java/ru/evotor/framework/core/action/command/print_receipt_command/PrintSellReceiptCommand.kt
#	src/main/java/ru/evotor/framework/receipt/Receipt.kt
#	src/main/java/ru/evotor/framework/receipt/ReceiptApi.kt
# Conflicts:
#	src/main/java/ru/evotor/framework/core/action/datamapper/ReceiptHeaderMapper.java
#	src/main/java/ru/evotor/framework/receipt/Receipt.kt
#	src/main/java/ru/evotor/framework/receipt/ReceiptApi.kt
#	src/main/java/ru/evotor/framework/receipt/ReceiptHeaderTable.kt
# Conflicts:
#	build.gradle
#	src/main/java/ru/evotor/framework/core/action/datamapper/PositionMapper.java
#	src/main/java/ru/evotor/framework/receipt/Position.java
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants