Commit e9876017 authored by kravtsov's avatar kravtsov

[-] Исправлена ошибка печати строк

parent 6e5be87d
......@@ -4,6 +4,13 @@
Company : SHTRIH-M, Russia, Moscow, Masterkova 4
(495) 787-60-90, www.shtrih-m.ru
*******************************************************************
OposShtrih_1.13_473.exe
13 февраля 2018 12:40
[-] Исправлена ошибка печати строк
*******************************************************************
OposShtrih_1.13_472.exe
......
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,13,0,472
PRODUCTVERSION 1,13,0,472
FILEVERSION 1,13,0,473
PRODUCTVERSION 1,13,0,473
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.472\0"
VALUE "FileVersion", "1.13.0.473\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\OposTest\Units\PrinterTest.pas',0,1,4496,18,4497,0,0
File_1=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\DirectIOAPI.pas',0,1,294,25,315,0,0
File_2=SourceModule,'C:\projects\OPOSShtrih\Test\SmFiscalPrinterTest\Units\TextFiscalPrinterDevice.pas',0,1,303,2,303,0,0
File_3=SourceModule,'C:\projects\OPOSShtrih\Test\SmFiscalPrinterTest\Units\MockFiscalPrinterDevice.pas',0,1,1733,122,1741,0,0
File_4=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\FiscalPrinterDevice.pas',0,1,6926,1,6947,0,0
File_5=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\PrinterTypes.pas',0,1,1197,2,1199,0,0
File_6=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\FiscalPrinterTypes.pas',0,1,442,1,465,0,0
File_7=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\FSSalesReceipt.pas',0,1,997,20,1002,0,0
File_8=SourceModule,'C:\projects\OPOSShtrih\Source\Shared\DIOHandlers.pas',0,1,1938,114,1948,0,0
File_9=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\PrinterParameters.pas',0,1,499,2,520,0,0
File_0=SourceModule,'C:\projects\OPOSShtrih\Source\OposTest\Units\PrinterTest.pas',0,1,4491,35,4512,0,0
File_1=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\PrinterParameters.pas',0,1,1,1,1,0,0
File_2=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\DirectIOAPI.pas',0,1,294,52,307,0,0
File_3=SourceModule,'C:\projects\OPOSShtrih\Source\OposTest\Units\DIODescription.pas',0,1,1,1,1,0,0
File_4=SourceModule,'C:\projects\OPOSShtrih\Source\OposConfig\Fmu\fmuFptrReceipt.pas',0,1,49,124,60,1,0
File_5=SourceModule,'C:\projects\OPOSShtrih\Test\SmFiscalPrinterTest\Units\TextFiscalPrinterDevice.pas',0,1,303,2,303,0,0
File_6=SourceModule,'C:\projects\OPOSShtrih\Test\SmFiscalPrinterTest\Units\MockFiscalPrinterDevice.pas',0,1,1733,122,1741,0,0
[Modules]
Count=0
EditWindowCount=0
Module0=C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\FiscalPrinterDevice.pas
Module1=C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\FiscalPrinterImpl.pas
Module2=C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\FSSalesReceipt.pas
Count=3
EditWindowCount=1
TypeLibWindowCount=3
[C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\FiscalPrinterDevice.pas]
ModuleType=SourceModule
FormState=0
FormOnTop=0
[C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\FiscalPrinterImpl.pas]
ModuleType=SourceModule
FormState=0
FormOnTop=0
[C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\FSSalesReceipt.pas]
ModuleType=SourceModule
FormState=0
FormOnTop=0
[C:\projects\OPOSShtrih\Test\SmScaleTest\SmScaleTestLib.dpr]
FormState=0
FormOnTop=0
......@@ -91,6 +106,56 @@ FormOnTop=0
FormState=0
FormOnTop=0
[EditWindow0]
ViewCount=3
CurrentView=0
View0=0
View1=1
View2=2
CodeExplorer=CodeExplorer@EditWindow0
MessageView=MessageView@EditWindow0
Create=1
Visible=1
State=2
Left=490
Top=148
Width=1302
Height=682
MaxLeft=-8
MaxTop=106
MaxWidth=1936
MaxHeight=952
ClientWidth=1920
ClientHeight=914
LeftPanelSize=0
LeftPanelClients=CodeExplorer@EditWindow0
LeftPanelData=00000400010000000C000000436F64654578706C6F7265720000000000000000000000000000000000FFFFFFFF
RightPanelSize=0
BottomPanelSize=85
BottomPanelClients=MessageView@EditWindow0
BottomPanelData=000004000000000000000000000000000000000000000000000100000000000000000B0000004D65737361676556696577FFFFFFFF
[View0]
Module=C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\FiscalPrinterDevice.pas
CursorX=173
CursorY=10
TopLine=1
LeftCol=1
[View1]
Module=C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\FSSalesReceipt.pas
CursorX=1
CursorY=1
TopLine=1
LeftCol=1
[View2]
Module=C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\FiscalPrinterImpl.pas
CursorX=28
CursorY=2255
TopLine=2242
LeftCol=1
[TypeLibEditWindow0]
Create=1
Visible=0
......@@ -174,8 +239,8 @@ Left=336
Top=9
Width=1584
Height=122
MaxLeft=-8
MaxTop=-8
MaxLeft=-1
MaxTop=-1
MaxWidth=1936
MaxHeight=122
ClientWidth=1920
......@@ -414,9 +479,41 @@ Column2Width=545
EntryPointPane=225
CompUnitPane=104
[CodeExplorer@EditWindow0]
Create=1
Visible=0
State=0
Left=-127
Top=-6
Width=140
Height=305
MaxLeft=-1
MaxTop=-1
ClientWidth=140
ClientHeight=305
TBDockHeight=305
LRDockWidth=140
Dockable=1
[MessageView@EditWindow0]
Create=1
Visible=1
State=0
Left=12
Top=0
Width=1908
Height=85
MaxLeft=-1
MaxTop=-1
ClientWidth=1908
ClientHeight=85
TBDockHeight=85
LRDockWidth=443
Dockable=1
[DockHosts]
DockHostCount=0
[ActiveProject]
ActiveProject=2
ActiveProject=3
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,13,0,472
PRODUCTVERSION 1,13,0,472
FILEVERSION 1,13,0,473
PRODUCTVERSION 1,13,0,473
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.472\0"
VALUE "FileVersion", "1.13.0.473\0"
VALUE "InternalName", "OPOS test\0"
VALUE "LegalCopyright", "SHTRIH-M \251 2013 \0"
VALUE "OriginalFilename", "OposTest.exe\0"
......
......@@ -7,7 +7,7 @@ uses
DeviceService;
const
GenericServiceVersion = deviceVersion113 + 472;
GenericServiceVersion = deviceVersion113 + 473;
implementation
......
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,13,0,472
PRODUCTVERSION 1,13,0,472
FILEVERSION 1,13,0,473
PRODUCTVERSION 1,13,0,473
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.472\0"
VALUE "FileVersion", "1.13.0.473\0"
VALUE "InternalName", "Fiscal printer driver\0"
VALUE "LegalCopyright", "SHTRIH-M \251 2013 \0"
VALUE "OriginalFilename", "SmFiscalPrinter.dll\0"
......
......@@ -30,7 +30,6 @@ type
FRecDiscount: TDiscountReceiptItem;
FAdjustmentAmount: Integer;
FTemplate: TReceiptTemplate;
FAdditionalHeader: string;
procedure PrintReceiptItems;
procedure CheckTotal(Total: Currency);
......@@ -1163,7 +1162,6 @@ begin
end else
begin
OpenReceipt(FRecType);
Device.PrintText(PRINTER_STATION_REC, FAdditionalHeader);
CorrectPayments;
PrintRecMessages(0);
......@@ -1636,10 +1634,8 @@ end;
procedure TFSSalesReceipt.PrintAdditionalHeader(
const AdditionalHeader: string);
begin
FAdditionalHeader := AdditionalHeader;
Device.PrintText(PRINTER_STATION_REC, AdditionalHeader);
end;
//OposSalesReceipt -> FiscalReceipt
end.
......@@ -1925,7 +1925,8 @@ begin
Text := TrimText(Text, GetPrintWidth);
Flags := GetPrintFlags(Flags);
Execute(#$17 + IntToBin(GetUsrPassword, 4) + Chr(Flags) + GetLine(Text));
Execute(#$17 + IntToBin(GetUsrPassword, 4) + Chr(Flags) +
GetLine(Text, 40, GetPrintWidth(1)));
end;
(******************************************************************************
......@@ -2667,7 +2668,8 @@ begin
FLogger.Debug(Format('PrintStringFont(%d,%d, ''%s'')',
[Flags, Font, Text]));
Execute(#$2F + IntToBin(GetUsrPassword, 4) + Chr(Flags) + Chr(Font) + Text);
Execute(#$2F + IntToBin(GetUsrPassword, 4) + Chr(Flags) + Chr(Font) +
GetLine(Text, 40, GetPrintWidth(Font)));
end;
(******************************************************************************
......
......@@ -2261,12 +2261,11 @@ begin
FReceipt.Free;
FReceipt := CreateReceipt(FFiscalReceiptType);
Receipt.BeginFiscalReceipt(PrintHeader);
if FAdditionalHeader <> '' then
begin
Receipt.PrintAdditionalHeader(FAdditionalHeader);
end;
Receipt.BeginFiscalReceipt(PrintHeader);
Filters.BeginFiscalReceipt2(FReceipt);
FAfterCloseItems.Clear;
Result := ClearResult;
......
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,13,0,472
PRODUCTVERSION 1,13,0,472
FILEVERSION 1,13,0,473
PRODUCTVERSION 1,13,0,473
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.472\0"
VALUE "FileVersion", "1.13.0.473\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,472
PRODUCTVERSION 1,13,0,472
FILEVERSION 1,13,0,473
PRODUCTVERSION 1,13,0,473
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.472\0"
VALUE "FileVersion", "1.13.0.473\0"
VALUE "InternalName", "Scale driver\0"
VALUE "LegalCopyright", "SHTRIH-M \251 2013 \0"
VALUE "OriginalFilename", "SmScale.dll\0"
......
No preview for this file type
[releases]
current=1.13.0.472
current=1.13.0.473
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