diff --git a/Interfaces/AAA/Accounting_Defs.hpp b/Interfaces/AAA/Accounting_Defs.hpp index baf35118..d1df330e 100644 --- a/Interfaces/AAA/Accounting_Defs.hpp +++ b/Interfaces/AAA/Accounting_Defs.hpp @@ -1051,7 +1051,9 @@ TAPI_DEFINE_STRUCT(stuVoucherItemPrivate, TAPI_DEFINE_STRUCT(stuAssetItem, SF_Struct (Product, tblAccountProductsBase::DTO, v.prdID), + SF_Struct (Unit, tblAccountUnitsBase::DTO, v.untID), SF_Struct (Saleable, tblAccountSaleablesBase::DTO, v.slbID), + SF_qreal (prdQtyInHand), SF_qreal (slbQtyInHand), @@ -1139,6 +1141,7 @@ TAPI_DEFINE_STRUCT(stuVoucherItem, SF_MD5_t (UUID), SF_QString (Desc), SF_qreal (Qty), + SF_QString (Unit), SF_qreal (UnitPrice), SF_qreal (SubTotal), SF_QMapOfVarStruct (SystemDiscounts, stuSystemDiscount, SystemDiscounts_t), diff --git a/Interfaces/AAA/intfAccountingBasedModule.cpp b/Interfaces/AAA/intfAccountingBasedModule.cpp index 8f9a9c73..29d2466c 100644 --- a/Interfaces/AAA/intfAccountingBasedModule.cpp +++ b/Interfaces/AAA/intfAccountingBasedModule.cpp @@ -506,6 +506,7 @@ Targoman::API::AAA::stuBasketActionResult IMPL_REST_POST(intfAccountingBasedModu AssetItem.fromJson(JsonSaleableInfo, false); AssetItem.Product.fromJson(JsonSaleableInfo); + AssetItem.Unit.fromJson(JsonSaleableInfo); AssetItem.Saleable.fromJson(JsonSaleableInfo); //-- -------------------------------- @@ -547,6 +548,7 @@ Targoman::API::AAA::stuBasketActionResult IMPL_REST_POST(intfAccountingBasedModu PreVoucherItem.UUID = SecurityHelper::UUIDtoMD5(); PreVoucherItem.Desc = AssetItem.Saleable.slbName; PreVoucherItem.Qty = AssetItem.Qty; //_qty; + PreVoucherItem.Unit = AssetItem.Unit.untName; PreVoucherItem.UnitPrice = AssetItem.UnitPrice; PreVoucherItem.SubTotal = AssetItem.SubTotal; @@ -802,6 +804,7 @@ Targoman::API::AAA::stuBasketActionResult intfAccountingBasedModule::internalUpd AccountUserAssetsBaseDTO.fromJson(QJsonObject::fromVariantMap(UserAssetInfo)); stuAssetItem AssetItem; + AssetItem.fromJson(QJsonObject::fromVariantMap(UserAssetInfo)); AssetItem.Product.fromJson(QJsonObject::fromVariantMap(UserAssetInfo)); AssetItem.Saleable.fromJson(QJsonObject::fromVariantMap(UserAssetInfo)); @@ -818,6 +821,7 @@ Targoman::API::AAA::stuBasketActionResult intfAccountingBasedModule::internalUpd // AssetItem.APIToken = _voucherItem.APIToken; AssetItem.Qty = _newQty; + AssetItem.Unit.untName = _voucherItem.Unit; AssetItem.UnitPrice = AssetItem.Saleable.slbBasePrice; AssetItem.Discount = _voucherItem.DisAmount; @@ -873,6 +877,7 @@ Targoman::API::AAA::stuBasketActionResult intfAccountingBasedModule::internalUpd // _voucherItem.UUID = _voucherItem.UUID; _voucherItem.Desc = AssetItem.Saleable.slbName; _voucherItem.Qty = AssetItem.Qty; + _voucherItem.Unit = AssetItem.Unit.untName; _voucherItem.UnitPrice = AssetItem.UnitPrice; _voucherItem.SubTotal = AssetItem.SubTotal;