Commit 15581d87 authored by kravtsov's avatar kravtsov

[-] Поправил чек коррекции

parent a9034233
......@@ -6,8 +6,8 @@
*******************************************************************
OposShtrih_1.13_488.exe
16 мая 2018 22:10
OposShtrih_1.13_489.exe
17 мая 2018 11:20
[+] Добавлены типы чеков коррекции для печати чека коррекции версии 2
FPTR_RT_CORRECTION2_SALE = 104;
......
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,13,0,488
PRODUCTVERSION 1,13,0,488
FILEVERSION 1,13,0,489
PRODUCTVERSION 1,13,0,489
FILEFLAGSMASK 0x3fL
FILEFLAGS 0x0L
FILEOS 0x4L
......@@ -13,7 +13,7 @@ BEGIN
BEGIN
VALUE "CompanyName", "SHTRIH-M\0"
VALUE "FileDescription", "OPOS setup utility\0"
VALUE "FileVersion", "1.13.0.488\0"
VALUE "FileVersion", "1.13.0.489\0"
VALUE "InternalName", "OPOS setup \0"
VALUE "LegalCopyright", "SHTRIH-M \251 2013 \0"
VALUE "OriginalFilename", "OposConfig.exe\0"
......
[Closed Files]
File_0=SourceModule,'C:\projects\OPOSShtrih\Source\SmFptrSrv\Units\oleMain.pas',0,1,1,1,1,0,0
File_1=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\FiscalPrinterImpl.pas',0,1,15,46,26,0,0
File_2=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\CorrectionReceipt.pas',0,1,1,1,1,0,0
File_3=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\DirectIOAPI.pas',0,1,1,1,1,0,0
File_4=SourceModule,'C:\projects\OPOSShtrih\Source\OposTest\Units\PrinterTest.pas',0,1,4663,3,4678,0,0
File_5=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\CorrectionReceipt2.pas',0,1,70,13,119,0,0
File_0=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\CorrectionReceipt.pas',0,1,35,24,55,0,0
File_1=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\CorrectionReceipt2.pas',0,1,26,15,60,0,0
File_2=SourceModule,'C:\projects\OPOSShtrih\Source\OposTest\Units\PrinterTest.pas',0,1,4668,29,4677,0,0
File_3=SourceModule,'C:\projects\OPOSShtrih\Source\SmFptrSrv\Units\oleMain.pas',0,1,1,1,1,0,0
File_4=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\FiscalPrinterImpl.pas',0,1,15,46,26,0,0
File_5=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\DirectIOAPI.pas',0,1,1,1,1,0,0
File_6=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\FiscalPrinterDevice.pas',0,1,4038,1,4044,0,0
File_7=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\EscPrinter.pas',0,1,285,33,298,0,0
File_8=SourceModule,'C:\projects\OPOSShtrih\Source\Shared\DIOHandler.pas',0,1,97,15,108,0,0
......@@ -435,5 +435,5 @@ DockClients=CallStackWindow
DockSiteData=0000040000000000D20100000000000001DF03000000000000010000000087000000000000000100000002D2010000000000000200000000DF0300000F00000043616C6C537461636B57696E646F770200000000F7010000000000000100000000080100000000000001000000008C010000000000000100000000100200000000000001000000009802000000000000FFFFFFFF
[ActiveProject]
ActiveProject=1
ActiveProject=2
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,13,0,488
PRODUCTVERSION 1,13,0,488
FILEVERSION 1,13,0,489
PRODUCTVERSION 1,13,0,489
FILEFLAGSMASK 0x3fL
FILEFLAGS 0x0L
FILEOS 0x4L
......@@ -13,7 +13,7 @@ BEGIN
BEGIN
VALUE "CompanyName", "SHTRIH-M\0"
VALUE "FileDescription", "OPOS test utility\0"
VALUE "FileVersion", "1.13.0.488\0"
VALUE "FileVersion", "1.13.0.489\0"
VALUE "InternalName", "OPOS test\0"
VALUE "LegalCopyright", "SHTRIH-M \251 2013 \0"
VALUE "OriginalFilename", "OposTest.exe\0"
......
......@@ -4680,7 +4680,7 @@ begin
Check(FiscalPrinter.DirectIO2(40, 1177, '77'));
Check(FiscalPrinter.DirectIO2(40, 1178, '11.05.2018'));
Check(FiscalPrinter.DirectIO2(40, 1179, '99'));
Check(FiscalPrinter.PrintRecCash(1));
Check(FiscalPrinter.PrintRecCash(1.23));
Check(FiscalPrinter.SetParameter(DriverParameterCorrectionType, 0));
Check(FiscalPrinter.SetParameter(DriverParameterCalculationSign, 1));
Check(FiscalPrinter.SetParameter(DriverParameterAmount2, 2));
......
......@@ -7,7 +7,7 @@ uses
DeviceService;
const
GenericServiceVersion = deviceVersion113 + 488;
GenericServiceVersion = deviceVersion113 + 489;
implementation
......
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,13,0,488
PRODUCTVERSION 1,13,0,488
FILEVERSION 1,13,0,489
PRODUCTVERSION 1,13,0,489
FILEFLAGSMASK 0x3fL
FILEFLAGS 0x0L
FILEOS 0x4L
......@@ -13,7 +13,7 @@ BEGIN
BEGIN
VALUE "CompanyName", "SHTRIH-M\0"
VALUE "FileDescription", "Fiscal printer service\0"
VALUE "FileVersion", "1.13.0.488\0"
VALUE "FileVersion", "1.13.0.489\0"
VALUE "InternalName", "Fiscal printer driver\0"
VALUE "LegalCopyright", "SHTRIH-M \251 2013 \0"
VALUE "OriginalFilename", "SmFiscalPrinter.dll\0"
......
......@@ -1087,6 +1087,7 @@ var
checksum: Integer;
codeword_pos: Integer;
begin
checksum := 0;
case FBarcodeType of
btCode128A,
btCodeEAN128A:
......
......@@ -47,19 +47,7 @@ end;
function TCorrectionReceipt2.GetTotal: Int64;
begin
Result := FTotal +
Parameters.Amount1 +
Parameters.Amount2 +
Parameters.Amount3 +
Parameters.Amount4 +
Parameters.Amount5 +
Parameters.Amount6 +
Parameters.Amount7 +
Parameters.Amount8 +
Parameters.Amount9 +
Parameters.Amount10 +
Parameters.Amount11 +
Parameters.Amount12;
Result := FTotal;
end;
procedure TCorrectionReceipt2.PrintRecTotal(Total: Currency; Payment: Currency;
......
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,13,0,488
PRODUCTVERSION 1,13,0,488
FILEVERSION 1,13,0,489
PRODUCTVERSION 1,13,0,489
FILEFLAGSMASK 0x3fL
FILEFLAGS 0x0L
FILEOS 0x4L
......@@ -13,7 +13,7 @@ BEGIN
BEGIN
VALUE "CompanyName", "SHTRIH-M\0"
VALUE "FileDescription", "Fiscal printer print server\0"
VALUE "FileVersion", "1.13.0.488\0"
VALUE "FileVersion", "1.13.0.489\0"
VALUE "InternalName", "Fiscal printer driver\0"
VALUE "LegalCopyright", "SHTRIH-M \251 2013 \0"
VALUE "OriginalFilename", "SmFptrSrv.exe\0"
......
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,13,0,488
PRODUCTVERSION 1,13,0,488
FILEVERSION 1,13,0,489
PRODUCTVERSION 1,13,0,489
FILEFLAGSMASK 0x3fL
FILEFLAGS 0x0L
FILEOS 0x4L
......@@ -13,7 +13,7 @@ BEGIN
BEGIN
VALUE "CompanyName", "SHTRIH-M\0"
VALUE "FileDescription", "Scale service\0"
VALUE "FileVersion", "1.13.0.488\0"
VALUE "FileVersion", "1.13.0.489\0"
VALUE "InternalName", "Scale driver\0"
VALUE "LegalCopyright", "SHTRIH-M \251 2013 \0"
VALUE "OriginalFilename", "SmScale.dll\0"
......
[releases]
current=1.13.0.488
current=1.13.0.489
last_date=2010-02-05
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment