Browse Source

refs #1 Syncronizing with commit: 0b30199a05

qt5
parent
commit
1afdb8b5a2
3 changed files with 4 additions and 6 deletions
  1. +1
    -1
      3.0/src/includes/Hardware/FR/FRStatusCodes.h
  2. +1
    -1
      3.0/src/includes/Hardware/FR/FRStatusesDescriptions.h
  3. +2
    -4
      3.0/src/modules/Hardware/FR/src/Base/FRBase.cpp

+ 1
- 1
3.0/src/includes/Hardware/FR/FRStatusCodes.h View File

@@ -24,6 +24,7 @@ namespace FRStatusCode
const int WrongDealerTaxSystem = 261; /// Неверно настроена СНО (1! СНО в ФР).
const int WrongDealerAgentFlag = 262; /// Неверно настроен признак агента (1! признак агента в ФР).
const int WrongFiscalizationSettings = 263; /// Параметры фискализации некорректны.
const int Taxes = 264; /// Налоговые ставки неверны.
}
/// Ошибки.
@@ -44,7 +45,6 @@ namespace FRStatusCode
const int WrongDealerTaxSystem = 282; /// Неверно настроена СНО.
const int WrongDealerAgentFlag = 283; /// Неверно настроен признак агента.
const int CashierINN = 284; /// Неправильный ИНН кассира.
const int Taxes = 285; /// Налоговые ставки неверны.
}
}


+ 1
- 1
3.0/src/includes/Hardware/FR/FRStatusesDescriptions.h View File

@@ -36,6 +36,7 @@ namespace FRStatusCode
ADD_FR_WARNING(WrongDealerTaxSystem, QCoreApplication::translate("FRStatuses", "#wrong_dealer_tax_system"));
ADD_FR_WARNING(WrongDealerAgentFlag, QCoreApplication::translate("FRStatuses", "#wrong_dealer_agent_flag"));
ADD_FR_WARNING(WrongFiscalizationSettings, QCoreApplication::translate("FRStatuses", "#wrong_fiscalization_settings"));
ADD_FR_WARNING(Taxes, QCoreApplication::translate("FRStatuses", "#taxes"));
/// Ошибки.
ADD_FR_ERROR(FR, QCoreApplication::translate("FRStatuses", "#fiscal_add_on_error"));
@@ -53,7 +54,6 @@ namespace FRStatusCode
ADD_FR_ERROR(WrongDealerTaxSystem, QCoreApplication::translate("FRStatuses", "#wrong_dealer_tax_system"));
ADD_FR_ERROR(WrongDealerAgentFlag, QCoreApplication::translate("FRStatuses", "#wrong_dealer_agent_flag"));
ADD_FR_ERROR(CashierINN, QCoreApplication::translate("FRStatuses", "#cashier_inn"));
ADD_FR_ERROR(Taxes, QCoreApplication::translate("FRStatuses", "#taxes"));
}
TStatusCodes getFiscalStatusCodes()


+ 2
- 4
3.0/src/modules/Hardware/FR/src/Base/FRBase.cpp View File

@@ -59,8 +59,6 @@ FRBase<T>::FRBase(): mFFEngine(mLog)
mCanProcessZBuffer = false;
mFFEngine.setCodec(mCodec);
mRecoverableErrors.insert(FRStatusCode::Error::Taxes);
setConfigParameter(CHardwareSDK::FR::CanWithoutPrinting, false);
setConfigParameter(CHardwareSDK::FR::WithoutPrinting, CHardwareSDK::Values::Auto);
setConfigParameter(CHardware::CanSoftReboot, false);
@@ -535,7 +533,7 @@ bool FRBase<T>::checkTaxes()
{
mTaxError = true;
return !isFiscal();
// return !isFiscal();
}
}
@@ -1199,7 +1197,7 @@ bool FRBase<T>::processStatus(TStatusCodes & aStatusCodes)
if (mNotPrintingError) aStatusCodes.insert(DeviceStatusCode::Error::Initialization);
if (mCashierINNError) aStatusCodes.insert(FRStatusCode::Error::CashierINN);
if (mFSOfflineEnd) aStatusCodes.insert(FRStatusCode::Error::NeedOFDConnection);
if (mTaxError) aStatusCodes.insert(FRStatusCode::Error::Taxes);
if (mTaxError) aStatusCodes.insert(FRStatusCode::Warning::Taxes);
if (mIsOnline)
{


Loading…
Cancel
Save