Commit 20949b8a authored by kravtsov's avatar kravtsov

[-] Исправлена ошибка акцизных товаров

[-] Исправлена ошибка английских сообщений
[-] Исправлена ошибка чтения номера Z отчета
[+] Добавлены параметры для команды DIO_READ_FS_PARAMETER
      DIO_FS_PARAMETER_LAST_DOC_NUM2  = 11; // Чтение номера последнего документа
      DIO_FS_PARAMETER_LAST_DOC_MAC2  = 12; // Чтение фискального признака последнего документа
parent 36541e78
......@@ -4,6 +4,18 @@
Company : SHTRIH-M, Russia, Moscow, Masterkova 4
(495) 787-60-90, www.shtrih-m.ru
*******************************************************************
OposShtrih_1.13_495.exe
14 июня 2018 07:45
[-] Исправлена ошибка акцизных товаров
[-] Исправлена ошибка английских сообщений
[-] Исправлена ошибка чтения номера Z отчета
[+] Добавлены параметры для команды DIO_READ_FS_PARAMETER
DIO_FS_PARAMETER_LAST_DOC_NUM2 = 11; // Чтение номера последнего документа
DIO_FS_PARAMETER_LAST_DOC_MAC2 = 12; // Чтение фискального признака последнего документа
*******************************************************************
OposShtrih_1.13_494.exe
......
......@@ -7,12 +7,12 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"POT-Creation-Date: 2018-05-15 19:59\n"
"PO-Revision-Date: 2018-05-28 13:06+0300\n"
"PO-Revision-Date: 2018-06-13 22:48+0300\n"
"Last-Translator: Vitaly Kravtsov <kravtsov@shtrih-m.ru>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 2.0.6\n"
"X-Generator: Poedit 2.0.8\n"
"Language-Team: \n"
"Language: ru\n"
......@@ -307,6 +307,7 @@ msgid "ФР и ПК"
msgstr "ФР и ПК"
#: Units/CachedSalesReceipt.pas:244 Units/PrinterCommand.pas:178
#: ../Opos/OposException.pas:80
msgid "Invalid parameter value"
msgstr "Неверное значение параметра"
......@@ -317,8 +318,7 @@ msgid "Неверный код типа оплаты"
msgstr "Неверный код типа оплаты"
#: Units/CashDrawerParameters.pas:102 Units/CashDrawerParameters.pas:130
#: Units/PrinterParametersReg.pas:757
#: Units/PrinterParametersRegIBT.pas:774
#: Units/PrinterParametersReg.pas:757 Units/PrinterParametersRegIBT.pas:774
msgid "Registry key open error"
msgstr "Ошибка открытия ключа реестра"
......@@ -349,12 +349,8 @@ msgid "Таблица"
msgstr "Таблица"
#: Units/CsvPrinterTableFormat.pas:200
msgid ""
"Номер таблицы,Ряд,Поле,Размер поля,Тип поля,Мин. значение, Макс."
"значение, Название,Значение"
msgstr ""
"Номер таблицы,Ряд,Поле,Размер поля,Тип поля,Мин. значение, Макс."
"значение, Название,Значение"
msgid "Номер таблицы,Ряд,Поле,Размер поля,Тип поля,Мин. значение, Макс.значение, Название,Значение"
msgstr "Номер таблицы,Ряд,Поле,Размер поля,Тип поля,Мин. значение, Макс.значение, Название,Значение"
#: Units/CustomReceipt.pas:160
msgid "Receipt method is not supported"
......@@ -778,9 +774,7 @@ msgstr "Неверный индекс формата файла"
#: Units/PrinterTypes.pas:1312
msgid "FS: Unknown command or invalid format"
msgstr ""
"ФН: Неизвестная команда, неверный формат посылки или неизвестные "
"параметры"
msgstr "ФН: Неизвестная команда, неверный формат посылки или неизвестные параметры"
#: Units/PrinterTypes.pas:1313
msgid "FS: Incorrect status"
......@@ -859,12 +853,8 @@ msgid "FS: CRC error"
msgstr "ФН: Ошибка CRC"
#: Units/PrinterTypes.pas:1341
msgid ""
"ФН: Неизвестная команда, неверный формат посылки или неизвестные "
"параметры"
msgstr ""
"ФН: Неизвестная команда, неверный формат посылки или неизвестные "
"параметры"
msgid "ФН: Неизвестная команда, неверный формат посылки или неизвестные параметры"
msgstr "ФН: Неизвестная команда, неверный формат посылки или неизвестные параметры"
#: Units/PrinterTypes.pas:1342
msgid "ФН: Неверное состояние ФН"
......@@ -3773,3 +3763,95 @@ msgstr ""
#: SmFiscalPrinter.rc:32
msgid "MAINICON.ico"
msgstr ""
#: ../Opos/OposException.pas:86
msgid "Invalid property value"
msgstr "Неверное значение свойства"
#: ../Opos/OposFptrUtils.pas:38
msgid "Receipt station is empty"
msgstr "Нет чековой ленты"
#: ../Opos/OposFptrUtils.pas:43
msgid "Journal station is empty"
msgstr "Нет контрольной ленты"
#: ../Opos/OposFptrUtils.pas:48
msgid "Cover is opened"
msgstr "Крышка корпуса открыта"
#: ../Opos/OposFptrUtils.pas:193
msgid "Invalid day"
msgstr "Неверное значение дня"
#: ../Opos/OposFptrUtils.pas:196
msgid "Invalid month"
msgstr "Неверное значение месяца"
#: ../Opos/OposFptrUtils.pas:199
msgid "Invalid year"
msgstr "Неверное значение года"
#: ../Opos/OposFptrUtils.pas:202
msgid "Invalid hour"
msgstr "Неверное значение часа"
#: ../Opos/OposFptrUtils.pas:205
msgid "Invalid minutes"
msgstr "Неверное значение минут"
#: ../Opos/OposServiceDevice19.pas:302
msgid "Device is disabled"
msgstr "Устройство отключено"
#: ../Opos/OposServiceDevice19.pas:431
msgid "Invalid BinaryConversion property value"
msgstr "Неверное значение свойства BinaryConversion"
#: ../Opos/OposUtils.pas:166
msgid "Control Object already open"
msgstr "Control Object уже открыт"
#: ../Opos/OposUtils.pas:169
msgid "The registry does not contain a key for the specified device name"
msgstr "В реестре нет ключа для указанного имени устройства"
#: ../Opos/OposUtils.pas:172
msgid "Could not read the device name key's default value, or could not convert this Prog ID to a valid Class ID"
msgstr ""
#: ../Opos/OposUtils.pas:175
msgid "Could not create a service object instance, or could not get its IDispatch interface"
msgstr ""
#: ../Opos/OposUtils.pas:178
msgid "The service object does not support one or more of the method required by its release"
msgstr ""
#: ../Opos/OposUtils.pas:181
msgid "The service object returned a failure status from its open call, but doesn't have a more specific failure code"
msgstr ""
#: ../Opos/OposUtils.pas:184
msgid "The service object major version number is not 1"
msgstr ""
#: ../Opos/OposUtils.pas:187
msgid "Port access required at open, but configured port is invalid or inaccessible"
msgstr ""
#: ../Opos/OposUtils.pas:190
msgid "Service Object does not support the specified device"
msgstr ""
#: ../Opos/OposUtils.pas:193
msgid "Configuration information error"
msgstr ""
#: ../Opos/OposUtils.pas:196
msgid "Errors greater than this value are SO-specific"
msgstr ""
#: ../Opos/OposUtils.pas:198
msgid "Unknown code"
msgstr "Неизвестный код"
......@@ -28,7 +28,8 @@ Name: "source"; Description: "Samples and source code";
; Version history
Source: "History.txt"; DestDir: "{app}"; Flags: ignoreversion; components: main;
; Localization params
Source: "Setup\locales\SmFiscalPrinter.mo"; DestDir: "{app}\locale\en\LC_MESSAGES\"; Flags: 32bit; Components: main
Source: "Setup\locales\SmFiscalPrinter.mo"; DestDir: "{app}\Bin\locale\en\LC_MESSAGES\"; Flags: 32bit; Components: main
Source: "Setup\locales\SmFiscalPrinter.mo"; DestDir: "{app}\Bin\locale\ru\LC_MESSAGES\"; Flags: 32bit; Components: main
Source: "Setup\Locales\ru\locale.ini"; DestDir: "{userappdata}\SHTRIH-M\OposShtrih"; DestName: "locale.ini"; Flags: 32bit; Components: main;
; Logo files
Source: "Setup\Logo\*.*"; DestDir: "{app}\Bin\Logo"; Flags: ignoreversion; components: main;
......
......@@ -7,8 +7,8 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2017-09-04 11:47\n"
"PO-Revision-Date: 2017-09-04 11:47\n"
"POT-Creation-Date: 2018-06-13 22:16\n"
"PO-Revision-Date: 2018-06-13 22:16\n"
"Last-Translator: Somebody <your.email@address.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
......@@ -61,11 +61,6 @@ msgstr ""
msgid "ActiveX"
msgstr ""
#. Programmer's name for it: MsgKeyOpenError
#: OposDevice.pas:75
msgid "Error opening registry key: %s"
msgstr ""
#: OposException.pas:80
msgid "Invalid parameter value"
msgstr ""
......@@ -74,35 +69,35 @@ msgstr ""
msgid "Invalid property value"
msgstr ""
#: OposFptrUtils.pas:37
#: OposFptrUtils.pas:38
msgid "Receipt station is empty"
msgstr ""
#: OposFptrUtils.pas:42
#: OposFptrUtils.pas:43
msgid "Journal station is empty"
msgstr ""
#: OposFptrUtils.pas:47
#: OposFptrUtils.pas:48
msgid "Cover is opened"
msgstr ""
#: OposFptrUtils.pas:192
#: OposFptrUtils.pas:193
msgid "Invalid day"
msgstr ""
#: OposFptrUtils.pas:195
#: OposFptrUtils.pas:196
msgid "Invalid month"
msgstr ""
#: OposFptrUtils.pas:198
#: OposFptrUtils.pas:199
msgid "Invalid year"
msgstr ""
#: OposFptrUtils.pas:201
#: OposFptrUtils.pas:202
msgid "Invalid hour"
msgstr ""
#: OposFptrUtils.pas:204
#: OposFptrUtils.pas:205
msgid "Invalid minutes"
msgstr ""
......@@ -110,7 +105,65 @@ msgstr ""
msgid "Device is disabled"
msgstr ""
#: OposServiceDevice19.pas:432
#: OposServiceDevice19.pas:431
msgid "Invalid BinaryConversion property value"
msgstr ""
#: OposUtils.pas:166
msgid "Control Object already open"
msgstr ""
#: OposUtils.pas:169
msgid "The registry does not contain a key for the specified device "
"name"
msgstr ""
#: OposUtils.pas:172
msgid "Could not read the device name key's default value, or could not "
"convert this Prog ID to a valid Class "
"ID"
msgstr ""
#: OposUtils.pas:175
msgid "Could not create a service object instance, or could not get its "
"IDispatch interface"
msgstr ""
#: OposUtils.pas:178
msgid "The service object does not support one or more of the method "
"required by its release"
msgstr ""
#: OposUtils.pas:181
msgid "The service object returned a failure status from its open call, but "
"doesn't have a more specific failure "
"code"
msgstr ""
#: OposUtils.pas:184
msgid "The service object major version number is not "
"1"
msgstr ""
#: OposUtils.pas:187
msgid "Port access required at open, but configured port is invalid or "
"inaccessible"
msgstr ""
#: OposUtils.pas:190
msgid "Service Object does not support the specified "
"device"
msgstr ""
#: OposUtils.pas:193
msgid "Configuration information error"
msgstr ""
#: OposUtils.pas:196
msgid "Errors greater than this value are SO-specific"
msgstr ""
#: OposUtils.pas:198
msgid "Unknown code"
msgstr ""
......@@ -115,7 +115,7 @@ AutoIncBuild=1
MajorVer=1
MinorVer=13
Release=0
Build=538
Build=542
Debug=0
PreRelease=0
Special=0
......@@ -126,7 +126,7 @@ CodePage=1252
[Version Info Keys]
CompanyName=SHTRIH-M
FileDescription=OPOS setup utility
FileVersion=1.13.0.538
FileVersion=1.13.0.542
InternalName=OPOS setup
LegalCopyright=SHTRIH-M 2013
LegalTrademarks=
......
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,13,0,494
PRODUCTVERSION 1,13,0,494
FILEVERSION 1,13,0,495
PRODUCTVERSION 1,13,0,495
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.494\0"
VALUE "FileVersion", "1.13.0.495\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\SmFiscalPrinter\Units\FiscalPrinterTypes.pas',0,1,353,1,376,0,0
File_1=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\FiscalPrinterDevice.pas',0,1,5076,1,5096,0,0
File_2=SourceModule,'C:\projects\OPOSShtrih\Source\OposTest\Fmu\fmuFptrReceipt.pas',0,1,38,5,43,1,0
File_3=SourceModule,'C:\projects\OPOSShtrih\Source\OposTest\Units\PrinterTest.pas',0,1,1029,47,1039,0,0
File_4=SourceModule,'C:\projects\OPOSShtrih\Source\OposTest\Fmu\fmuFptrAddHeaderTrailer.pas',0,1,37,27,45,0,0
File_5=SourceModule,'C:\projects\OPOSShtrih\Source\OposTest\Units\OPOSDate.pas',0,1,22,45,27,0,0
File_6=SourceModule,'C:\projects\OPOSShtrih\Source\OposTest\Fmu\fmuFptrFiscalReports.pas',0,1,81,103,89,1,1
File_7=SourceModule,'C:\projects\OPOSShtrih\Source\OposTest\Fmu\fmuFptrDirectIO.pas',0,1,1,1,1,1,0
File_8=SourceModule,'C:\projects\OPOSShtrih\Source\SmFptrSrv\Units\oleMain.pas',0,124,1,201,11,0,0
File_0=SourceModule,'C:\projects\OPOSShtrih\Source\Opos\OposFptrUtils.pas',0,1,1,6,1,0,0
File_1=SourceModule,'C:\projects\OPOSShtrih\Source\Shared\DIOHandlers.pas',0,1,1870,58,1885,0,0
File_2=SourceModule,'C:\projects\OPOSShtrih\Source\OposTest\Units\DIODescription.pas',0,1,305,98,309,0,0
File_3=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\DirectIOAPI.pas',0,1,310,24,331,0,0
File_4=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\PrinterTypes.pas',0,1,1570,10,1576,0,0
File_5=SourceModule,'C:\projects\OPOSShtrih\Source\OposTest\Fmu\fmuFptrDirectIO.pas',0,1,1,35,6,1,0
File_6=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\FiscalPrinterImpl.pas',0,1,635,70,646,0,0
File_7=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\TLVTags.pas',0,1,1,16,17,0,0
File_8=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\FiscalPrinterDevice.pas',0,1,7642,29,7648,0,0
File_9=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\TLV.pas',0,1,62,24,83,0,0
[Modules]
Module0=C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\FiscalPrinterImpl.pas
Module0=C:\projects\OPOSShtrih\Source\SmFiscalPrinter\SmFiscalPrinter.dpr
Count=1
EditWindowCount=1
TypeLibWindowCount=3
[C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\FiscalPrinterImpl.pas]
[C:\projects\OPOSShtrih\Source\SmFiscalPrinter\SmFiscalPrinter.dpr]
ModuleType=SourceModule
FormState=0
FormOnTop=0
[C:\projects\OPOSShtrih\Source\SmFptrSrv\SmFptrSrv.dpr]
FormState=0
FormOnTop=0
[C:\projects\OPOSShtrih\Source\OposShtrih.bpg]
FormState=0
FormOnTop=0
......@@ -36,10 +33,6 @@ FormOnTop=0
FormState=0
FormOnTop=0
[C:\projects\OPOSShtrih\Source\SmFiscalPrinter\SmFiscalPrinter.dpr]
FormState=0
FormOnTop=0
[C:\projects\OPOSShtrih\Source\SmFiscalPrinter\SmFiscalPrinter.todo]
FormState=0
FormOnTop=0
......@@ -88,6 +81,10 @@ FormOnTop=0
FormState=0
FormOnTop=0
[C:\projects\OPOSShtrih\Source\SmFptrSrv\SmFptrSrv.dpr]
FormState=0
FormOnTop=0
[C:\projects\OPOSShtrih\Source\SmFptrSrv\SmFptrSrv.tlb]
FormState=0
FormOnTop=0
......@@ -101,16 +98,16 @@ MessageView=MessageView@EditWindow0
Create=1
Visible=1
State=2
Left=324
Top=138
Width=1302
Height=682
Left=412
Top=140
Width=868
Height=646
MaxLeft=-8
MaxTop=106
MaxWidth=1936
MaxHeight=952
ClientWidth=1920
ClientHeight=914
MaxTop=115
MaxWidth=1292
MaxHeight=835
ClientWidth=1276
ClientHeight=796
LeftPanelSize=0
LeftPanelClients=CodeExplorer@EditWindow0
LeftPanelData=00000400010000000C000000436F64654578706C6F7265720000000000000000000000000000000000FFFFFFFF
......@@ -120,10 +117,10 @@ BottomPanelClients=MessageView@EditWindow0
BottomPanelData=00000400010000000B0000004D657373616765566965770000000000000000000000000000000000FFFFFFFF
[View0]
Module=C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\FiscalPrinterImpl.pas
CursorX=86
CursorY=1885
TopLine=1874
Module=C:\projects\OPOSShtrih\Source\SmFiscalPrinter\SmFiscalPrinter.dpr
CursorX=16
CursorY=15
TopLine=1
LeftCol=1
[TypeLibEditWindow0]
......@@ -137,7 +134,7 @@ Height=457
MaxLeft=-1
MaxTop=-1
ClientWidth=631
ClientHeight=419
ClientHeight=418
Module=C:\projects\OPOSShtrih\Source\SmFiscalPrinter\SmFiscalPrinter.tlb
[TypeLibEditWindow1]
......@@ -151,7 +148,7 @@ Height=457
MaxLeft=-1
MaxTop=-1
ClientWidth=631
ClientHeight=419
ClientHeight=418
Module=C:\projects\OPOSShtrih\Source\SmScale\SmScale.tlb
[TypeLibEditWindow2]
......@@ -165,7 +162,7 @@ Height=457
MaxLeft=-1
MaxTop=-1
ClientWidth=631
ClientHeight=419
ClientHeight=418
Module=C:\projects\OPOSShtrih\Source\SmFptrSrv\SmFptrSrv.tlb
[Watches]
......@@ -190,7 +187,7 @@ Height=142
MaxLeft=-1
MaxTop=-1
ClientWidth=476
ClientHeight=108
ClientHeight=103
TBDockHeight=180
LRDockWidth=320
Dockable=1
......@@ -212,29 +209,29 @@ Count=0
Create=1
Visible=1
State=2
Left=92
Top=16
Width=1828
Height=122
MaxLeft=-1
MaxTop=-1
MaxWidth=1936
MaxHeight=122
ClientWidth=1920
Left=336
Top=9
Width=944
Height=123
MaxLeft=-8
MaxTop=-8
MaxWidth=1292
MaxHeight=123
ClientWidth=1276
ClientHeight=84
[ProjectManager]
Create=1
Visible=1
State=0
Left=0
Top=115
Width=528
Height=621
Left=8
Top=124
Width=554
Height=589
MaxLeft=-1
MaxTop=-1
ClientWidth=512
ClientHeight=587
ClientWidth=538
ClientHeight=550
TBDockHeight=681
LRDockWidth=445
Dockable=0
......@@ -250,7 +247,7 @@ Height=723
MaxLeft=-1
MaxTop=-1
ClientWidth=949
ClientHeight=685
ClientHeight=684
DumpPane=348
DisassemblyPane=309
RegisterPane=231
......@@ -263,7 +260,7 @@ State=0
Left=822
Top=767
Width=156
Height=84
Height=89
MaxLeft=-1
MaxTop=-1
ClientWidth=150
......@@ -273,18 +270,18 @@ ClientHeight=60
Create=1
Visible=0
State=0
Left=7
Left=2
Top=110
Width=307
Width=430
Height=831
MaxLeft=-1
MaxTop=-1
ClientWidth=291
ClientHeight=797
ClientWidth=414
ClientHeight=792
TBDockHeight=681
LRDockWidth=291
Dockable=1
SplitPos=149
SplitPos=143
ArrangeBy=Name
SelectedItem=
ExpandedItems=Anchors,Attributes,BorderIcons,Constraints,Font,Font.Style,Greeting,Options,ProviderFlags,TestModeInfo,Title,Title.Font,VisibleButtons
......@@ -301,7 +298,7 @@ Height=613
MaxLeft=-1
MaxTop=-1
ClientWidth=819
ClientHeight=579
ClientHeight=574
TBDockHeight=197
LRDockWidth=737
Dockable=1
......@@ -319,12 +316,12 @@ State=0
Left=0
Top=12
Width=991
Height=454
Height=449
MaxLeft=-1
MaxTop=-1
ClientWidth=991
ClientHeight=454
TBDockHeight=454
ClientHeight=449
TBDockHeight=449
LRDockWidth=320
Dockable=1
......@@ -339,7 +336,7 @@ Height=189
MaxLeft=-1
MaxTop=-1
ClientWidth=544
ClientHeight=155
ClientHeight=150
TBDockHeight=152
LRDockWidth=320
Dockable=1
......@@ -359,7 +356,7 @@ Height=318
MaxLeft=-1
MaxTop=-1
ClientWidth=174
ClientHeight=284
ClientHeight=279
TBDockHeight=318
LRDockWidth=190
Dockable=1
......@@ -368,14 +365,14 @@ Dockable=1
Create=1
Visible=0
State=0
Left=0
Top=110
Left=1031
Top=481
Width=779
Height=814
MaxLeft=-1
MaxTop=-1
ClientWidth=763
ClientHeight=780
ClientHeight=775
TBDockHeight=291