Commit 192da922 authored by kravtsov's avatar kravtsov

[-] Изменено значение по умолчанию для типа маркировки

    Теперь по умолчанию тип маркировки 5, табачные изделия
parent 082ce681
......@@ -4,6 +4,14 @@
Company : SHTRIH-M, Russia, Moscow, Masterkova 4
(495) 787-60-90, www.shtrih-m.ru
*******************************************************************
OposShtrih_1.13_481.exe
16 марта 2018 15:15
[-] Изменено значение по умолчанию для типа маркировки
Теперь по умолчанию тип маркировки 5, табачные изделия
*******************************************************************
OposShtrih_1.13_480.exe
......
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,13,0,480
PRODUCTVERSION 1,13,0,480
FILEVERSION 1,13,0,481
PRODUCTVERSION 1,13,0,481
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.480\0"
VALUE "FileVersion", "1.13.0.481\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\Test\SmFiscalPrinterTest\Units\duGS1Barcode.pas',0,1,1,18,1,0,0
File_1=SourceModule,'C:\projects\OPOSShtrih\Source\SmFptrSrv\Units\oleMain.pas',0,1,1,1,1,0,0
File_2=SourceModule,'C:\projects\OPOSShtrih\Source\Shared\DriverError.pas',0,1,19,19,37,0,0
File_3=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\GS1Barcode.pas',0,1,28,25,44,0,0
File_4=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\FiscalPrinterDevice.pas',0,1,8656,27,8671,0,0
File_5=SourceModule,'C:\projects\OPOSShtrih\Test\SmFiscalPrinterTest\Units\duBitUtils.pas',0,1,1,1,1,0,0
File_6=SourceModule,'C:\projects\OPOSShtrih\Test\SmFiscalPrinterTest\Units\duStringUtils.pas',0,1,1,18,2,0,0
File_7=SourceModule,'C:\projects\OPOSShtrih\Source\Shared\StringUtils.pas',0,1,19,1,33,0,0
File_8=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\FSSalesReceipt.pas',0,1,179,46,175,0,0
File_9=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\Retalix.pas',0,1,205,54,217,0,0
File_0=SourceModule,'C:\projects\OPOSShtrih\Source\Shared\DriverError.pas',0,1,19,1,34,0,0
File_1=SourceModule,'C:\projects\OPOSShtrih\Source\OposTest\Units\DriverTest.pas',0,1,145,19,152,0,0
File_2=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\PrinterProtocol1.pas',0,1,228,22,234,0,0
File_3=SourceModule,'C:\projects\OPOSShtrih\Source\Shared\SerialPort.pas',0,1,382,114,412,0,0
File_4=SourceModule,'C:\projects\OPOSShtrih\Source\OposTest\Units\PrinterTest.pas',0,1,4501,19,4506,0,0
File_5=SourceModule,'C:\projects\OPOSShtrih\Source\Shared\DIOHandlers.pas',0,1,502,38,510,0,0
File_6=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\PrinterParameters.pas',0,1,681,33,695,0,0
File_7=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\DirectIOAPI.pas',0,1,304,25,315,0,0
File_8=SourceModule,'C:\projects\OPOSShtrih\Test\SmFiscalPrinterTest\Units\duGS1Barcode.pas',0,1,16,32,33,0,0
[Modules]
Count=0
EditWindowCount=0
Module0=C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\FiscalPrinterDevice.pas
Count=1
EditWindowCount=1
TypeLibWindowCount=3
[C:\projects\OPOSShtrih\Test\SmScaleTest\SmScaleTestLib.dpr]
[C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\FiscalPrinterDevice.pas]
ModuleType=SourceModule
FormState=0
FormOnTop=0
......@@ -91,6 +92,44 @@ FormOnTop=0
FormState=0
FormOnTop=0
[C:\projects\OPOSShtrih\Test\SmScaleTest\SmScaleTestLib.dpr]
FormState=0
FormOnTop=0
[EditWindow0]
ViewCount=1
CurrentView=0
View0=0
CodeExplorer=CodeExplorer@EditWindow0
MessageView=MessageView@EditWindow0
Create=1
Visible=1
State=2
Left=309
Top=138
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=0
BottomPanelClients=MessageView@EditWindow0
BottomPanelData=00000400010000000B0000004D657373616765566965770000000000000000000000000000000000FFFFFFFF
[View0]
Module=C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\FiscalPrinterDevice.pas
CursorX=146
CursorY=8707
TopLine=8685
LeftCol=1
[TypeLibEditWindow0]
Create=1
Visible=0
......@@ -187,12 +226,12 @@ Visible=1
State=0
Left=8
Top=124
Width=581
Height=558
Width=554
Height=589
MaxLeft=-1
MaxTop=-1
ClientWidth=565
ClientHeight=524
ClientWidth=538
ClientHeight=555
TBDockHeight=681
LRDockWidth=445
Dockable=0
......@@ -201,13 +240,13 @@ Dockable=0
Create=1
Visible=0
State=0
Left=651
Top=219
Width=629
Left=219
Top=192
Width=965
Height=723
MaxLeft=-1
MaxTop=-1
ClientWidth=613
ClientWidth=949
ClientHeight=685
DumpPane=348
DisassemblyPane=309
......@@ -229,38 +268,38 @@ ClientHeight=60
[PropertyInspector]
Create=1
Visible=0
Visible=1
State=0
Left=3
Top=118
Width=310
Height=871
Left=-1
Top=110
Width=300
Height=831
MaxLeft=-1
MaxTop=-1
ClientWidth=294
ClientHeight=837
ClientWidth=284
ClientHeight=797
TBDockHeight=681
LRDockWidth=291
Dockable=1
SplitPos=122
SplitPos=143
ArrangeBy=Name
SelectedItem=
ExpandedItems=Anchors,Attributes,BorderIcons,Font,Font.Style,Greeting,Options,PngOptions,ProviderFlags,TestModeInfo,Title,Title.Font,VisibleButtons
ExpandedItems=Anchors,Attributes,BorderIcons,Constraints,Font,Font.Style,Greeting,Options,ProviderFlags,TestModeInfo,Title,Title.Font,VisibleButtons
HiddenCategories=
[BreakpointWindow]
Create=1
Visible=0
State=0
Left=0
Top=933
Width=667
Height=327
Left=980
Top=180
Width=835
Height=613
MaxLeft=-1
MaxTop=-1
ClientWidth=651
ClientHeight=293
TBDockHeight=177
ClientWidth=819
ClientHeight=579
TBDockHeight=197
LRDockWidth=737
Dockable=1
Column0Width=149
......@@ -272,17 +311,17 @@ Column5Width=75
[CallStackWindow]
Create=1
Visible=0
Visible=1
State=0
Left=0
Top=933
Width=648
Height=452
Top=12
Width=991
Height=454
MaxLeft=-1
MaxTop=-1
ClientWidth=632
ClientHeight=418
TBDockHeight=117
ClientWidth=991
ClientHeight=454
TBDockHeight=454
LRDockWidth=320
Dockable=1
......@@ -414,9 +453,60 @@ Column2Width=545
EntryPointPane=225
CompUnitPane=104
[CodeExplorer@EditWindow0]
Create=1
Visible=0
State=0
Left=-113
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=0
State=0
Left=-119
Top=-705
Width=443
Height=85
MaxLeft=-1
MaxTop=-1
ClientWidth=443
ClientHeight=85
TBDockHeight=85
LRDockWidth=443
Dockable=1
[DockHosts]
DockHostCount=0
DockHostCount=1
[DockSite0]
DockSiteType=0
Create=1
Visible=0
State=0
Left=202
Top=592
Width=1007
Height=500
MaxLeft=-1
MaxTop=-1
ClientWidth=991
ClientHeight=466
TBDockHeight=690
LRDockWidth=328
Dockable=1
DockClients=CallStackWindow
DockSiteData=0000040000000000D20100000000000001DF03000000000000010000000087000000000000000100000002D2010000000000000200000000DF0300000F00000043616C6C537461636B57696E646F770200000000F7010000000000000100000000080100000000000001000000008C010000000000000100000000100200000000000001000000009802000000000000FFFFFFFF
[ActiveProject]
ActiveProject=2
ActiveProject=3
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,13,0,480
PRODUCTVERSION 1,13,0,480
FILEVERSION 1,13,0,481
PRODUCTVERSION 1,13,0,481
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.480\0"
VALUE "FileVersion", "1.13.0.481\0"
VALUE "InternalName", "OPOS test\0"
VALUE "LegalCopyright", "SHTRIH-M \251 2013 \0"
VALUE "OriginalFilename", "OposTest.exe\0"
......
......@@ -4518,9 +4518,11 @@ begin
FiscalPrinter.FiscalReceiptType := FPTR_RT_SALES;
Check(FiscalPrinter.BeginFiscalReceipt(True));
(*
pString := '3';
pData := DriverParameterMarkType;
Check(FiscalPrinter.DirectIO(DIO_SET_DRIVER_PARAMETER, pData, pString));
*)
pData := DriverParameterBarcode;
pString :=
......
......@@ -7,7 +7,7 @@ uses
DeviceService;
const
GenericServiceVersion = deviceVersion113 + 480;
GenericServiceVersion = deviceVersion113 + 481;
implementation
......
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,13,0,480
PRODUCTVERSION 1,13,0,480
FILEVERSION 1,13,0,481
PRODUCTVERSION 1,13,0,481
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.480\0"
VALUE "FileVersion", "1.13.0.481\0"
VALUE "InternalName", "Fiscal printer driver\0"
VALUE "LegalCopyright", "SHTRIH-M \251 2013 \0"
VALUE "OriginalFilename", "SmFiscalPrinter.dll\0"
......
......@@ -8727,7 +8727,7 @@ begin
Data := TTLVTag.Int2ValueTLV(1162, 2) + TTLVTag.Int2ValueTLV(Length(Data), 2) + Data;
end;
else
raise Exception.Create('Invalid MarType value');
raise Exception.Create('Invalid MarkType value');
end;
Result := FSSendTLVOperation(Data);
end;
......
......@@ -696,6 +696,7 @@ begin
FPayTypes := TPayTypes.Create;
FVatCodes := TVatCodes.Create;
DefTableFilePath := GetModulePath + 'Tables';
MarkType := 5;
SetDefaults;
end;
......
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,13,0,480
PRODUCTVERSION 1,13,0,480
FILEVERSION 1,13,0,481
PRODUCTVERSION 1,13,0,481
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.480\0"
VALUE "FileVersion", "1.13.0.481\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,480
PRODUCTVERSION 1,13,0,480
FILEVERSION 1,13,0,481
PRODUCTVERSION 1,13,0,481
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.480\0"
VALUE "FileVersion", "1.13.0.481\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.480
current=1.13.0.481
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