Commit b4f0cabf authored by kravtsov's avatar kravtsov

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

[-] Исправлена ошибка английских сообщений
parent 20949b8a
......@@ -4,6 +4,14 @@
Company : SHTRIH-M, Russia, Moscow, Masterkova 4
(495) 787-60-90, www.shtrih-m.ru
*******************************************************************
OposShtrih_1.13_496.exe
15 июня 2018 14:25
[-] Исправлена ошибка акцизных товаров
[-] Исправлена ошибка английских сообщений
*******************************************************************
OposShtrih_1.13_495.exe
......
This diff is collapsed.
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\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"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: dxgettext 1.2.2\n"
#. Programmer's name for it: dtlServerPage
#: CASHDRAWERLib_TLB.pas:187
#. Programmer's name for it: dtlServerPage
#: NCRCashDrawer_TLB.pas:189
#. Programmer's name for it: dtlServerPage
#: OposCashDrawer_1_13_Lib_TLB.pas:488
#. Programmer's name for it: dtlServerPage
#: OposCashDrawer_CCO_TLB.pas:488
#. Programmer's name for it: dtlServerPage
#: OposFiscalPrinter_1_11_Lib_TLB.pas:2089
#. Programmer's name for it: dtlServerPage
#: OposFiscalPrinter_1_12_Lib_TLB.pas:1129
#. Programmer's name for it: dtlServerPage
#: OposFiscalPrinter_1_13_Lib_TLB.pas:2082
#. Programmer's name for it: dtlServerPage
#: OposFiscalPrinter_CCO_TLB.pas:2081
#. Programmer's name for it: dtlServerPage
#: OposPOSPrinter_CCO_TLB.pas:2311
#. Programmer's name for it: dtlServerPage
#: OposScale_1_13_Lib_TLB.pas:791
msgid "Servers"
msgstr ""
#. Programmer's name for it: dtlOcxPage
#: CASHDRAWERLib_TLB.pas:189
#. Programmer's name for it: dtlOcxPage
#: NCRCashDrawer_TLB.pas:191
#. Programmer's name for it: dtlOcxPage
#: OposCashDrawer_1_13_Lib_TLB.pas:490
#. Programmer's name for it: dtlOcxPage
#: OposCashDrawer_CCO_TLB.pas:490
#. Programmer's name for it: dtlOcxPage
#: OposFiscalPrinter_1_11_Lib_TLB.pas:2091
#. Programmer's name for it: dtlOcxPage
#: OposFiscalPrinter_1_12_Lib_TLB.pas:1131
#. Programmer's name for it: dtlOcxPage
#: OposFiscalPrinter_1_13_Lib_TLB.pas:2084
#. Programmer's name for it: dtlOcxPage
#: OposFiscalPrinter_CCO_TLB.pas:2083
#. Programmer's name for it: dtlOcxPage
#: OposPOSPrinter_CCO_TLB.pas:2313
#. Programmer's name for it: dtlOcxPage
#: OposScale_1_13_Lib_TLB.pas:793
msgid "ActiveX"
msgstr ""
#: OposException.pas:80
msgid "Invalid parameter value"
msgstr ""
#: OposException.pas:86
msgid "Invalid property value"
msgstr ""
#: OposFptrUtils.pas:38
msgid "Receipt station is empty"
msgstr ""
#: OposFptrUtils.pas:43
msgid "Journal station is empty"
msgstr ""
#: OposFptrUtils.pas:48
msgid "Cover is opened"
msgstr ""
#: OposFptrUtils.pas:193
msgid "Invalid day"
msgstr ""
#: OposFptrUtils.pas:196
msgid "Invalid month"
msgstr ""
#: OposFptrUtils.pas:199
msgid "Invalid year"
msgstr ""
#: OposFptrUtils.pas:202
msgid "Invalid hour"
msgstr ""
#: OposFptrUtils.pas:205
msgid "Invalid minutes"
msgstr ""
#: OposServiceDevice19.pas:302
msgid "Device is disabled"
msgstr ""
#: 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 ""
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,13,0,495
PRODUCTVERSION 1,13,0,495
FILEVERSION 1,13,0,496
PRODUCTVERSION 1,13,0,496
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.495\0"
VALUE "FileVersion", "1.13.0.496\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\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
File_0=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\FiscalPrinterDevice.pas',0,1,1,84,17,0,0
File_1=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\FSSalesReceipt.pas',0,1,231,20,258,0,0
File_2=SourceModule,'C:\projects\OPOSShtrih\Source\Shared\DIOHandlers.pas',0,1,1977,24,1989,0,0
File_3=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\DirectIOAPI.pas',0,1,308,50,326,0,0
File_4=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\PrinterParameters.pas',0,1,701,11,716,0,0
File_5=SourceModule,'C:\projects\OPOSShtrih\Source\SmFptrSrv\Units\oleMain.pas',0,1,1,1,1,0,0
File_6=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\FiscalPrinterImpl.pas',0,1,1,26,9,0,0
File_7=SourceModule,'C:\projects\OPOSShtrih\Test\SmFiscalPrinterTest\Units\TextFiscalPrinterDevice.pas',0,1,1765,2,1785,0,0
File_8=SourceModule,'C:\projects\OPOSShtrih\Test\SmFiscalPrinterTest\Units\MockFiscalPrinterDevice.pas',0,1,1,45,12,0,0
File_9=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\FiscalPrinterTypes.pas',0,1,448,1,467,0,0
[Modules]
Module0=C:\projects\OPOSShtrih\Source\SmFiscalPrinter\SmFiscalPrinter.dpr
Module0=C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\PrinterTypes.pas
Count=1
EditWindowCount=1
TypeLibWindowCount=3
[C:\projects\OPOSShtrih\Source\SmFiscalPrinter\SmFiscalPrinter.dpr]
[C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\PrinterTypes.pas]
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
......@@ -33,6 +37,10 @@ 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
......@@ -81,10 +89,6 @@ 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
......@@ -98,29 +102,29 @@ MessageView=MessageView@EditWindow0
Create=1
Visible=1
State=2
Left=412
Left=442
Top=140
Width=868
Height=646
MaxLeft=-8
MaxTop=115
MaxWidth=1292
MaxHeight=835
ClientWidth=1276
ClientHeight=796
MaxTop=107
MaxWidth=1296
MaxHeight=843
ClientWidth=1280
ClientHeight=804
LeftPanelSize=0
LeftPanelClients=CodeExplorer@EditWindow0
LeftPanelData=00000400010000000C000000436F64654578706C6F7265720000000000000000000000000000000000FFFFFFFF
RightPanelSize=0
BottomPanelSize=0
BottomPanelSize=374
BottomPanelClients=MessageView@EditWindow0
BottomPanelData=00000400010000000B0000004D657373616765566965770000000000000000000000000000000000FFFFFFFF
BottomPanelData=000004000000000000000000000000000000000000000000000100000000000000000B0000004D65737361676556696577FFFFFFFF
[View0]
Module=C:\projects\OPOSShtrih\Source\SmFiscalPrinter\SmFiscalPrinter.dpr
CursorX=16
CursorY=15
TopLine=1
Module=C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\PrinterTypes.pas
CursorX=26
CursorY=1731
TopLine=1716
LeftCol=1
[TypeLibEditWindow0]
......@@ -215,23 +219,23 @@ Width=944
Height=123
MaxLeft=-8
MaxTop=-8
MaxWidth=1292
MaxWidth=1296
MaxHeight=123
ClientWidth=1276
ClientWidth=1280
ClientHeight=84
[ProjectManager]
Create=1
Visible=1
State=0
Left=8
Top=124
Width=554
Height=589
Left=0
Top=116
Width=497
Height=418
MaxLeft=-1
MaxTop=-1
ClientWidth=538
ClientHeight=550
ClientWidth=481
ClientHeight=379
TBDockHeight=681
LRDockWidth=445
Dockable=0
......@@ -471,17 +475,17 @@ Dockable=1
[MessageView@EditWindow0]
Create=1
Visible=0
Visible=1
State=0
Left=-252
Top=-671
Width=443
Height=85
Left=12
Top=0
Width=1268
Height=374
MaxLeft=-1
MaxTop=-1
ClientWidth=443
ClientHeight=85
TBDockHeight=85
ClientWidth=1268
ClientHeight=374
TBDockHeight=374
LRDockWidth=443
Dockable=1
......
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,13,0,495
PRODUCTVERSION 1,13,0,495
FILEVERSION 1,13,0,496
PRODUCTVERSION 1,13,0,496
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.495\0"
VALUE "FileVersion", "1.13.0.496\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 + 495;
GenericServiceVersion = deviceVersion113 + 496;
implementation
......
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,13,0,495
PRODUCTVERSION 1,13,0,495
FILEVERSION 1,13,0,496
PRODUCTVERSION 1,13,0,496
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.495\0"
VALUE "FileVersion", "1.13.0.496\0"
VALUE "InternalName", "Fiscal printer driver\0"
VALUE "LegalCopyright", "SHTRIH-M \251 2013 \0"
VALUE "OriginalFilename", "SmFiscalPrinter.dll\0"
......
......@@ -255,7 +255,6 @@ begin
Printer.Printer.PreLine := '';
Printer.Printer.PostLine := '';
Parameters.Barcode := '';
Parameters.MarkType := 0;
FHasReceiptItems := True;
end;
......
......@@ -1321,9 +1321,12 @@ begin
except
on E: Exception do
begin
Logger.Error(E.Message);
SetIsOnline(False);
if not CanRepeatCommand(Command.Code) then Break;
if (i = (Parameters.MaxRetryCount-1)) then raise;
if (i = (Parameters.MaxRetryCount-1)) then
raise ECommunicationError.Create(_(' '));
end;
end;
if Parameters.MaxRetryCount > 0 then
......
......@@ -1722,7 +1722,7 @@ begin
$78: Result := _('Slip configuration');
$79: Result := _('Standard slip configuration');
$7A: Result := _('Fill slip buffer with nonfiscal information');
$7B: Result := _('Clear slip buffer WideString');
$7B: Result := _('Clear slip buffer line');
$7C: Result := _('Clear slip buffer');
$7D: Result := _('Print slip');
$7E: Result := _('Common slip configuration');
......
This diff is collapsed.
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,13,0,495
PRODUCTVERSION 1,13,0,495
FILEVERSION 1,13,0,496
PRODUCTVERSION 1,13,0,496
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.495\0"
VALUE "FileVersion", "1.13.0.496\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,495
PRODUCTVERSION 1,13,0,495
FILEVERSION 1,13,0,496
PRODUCTVERSION 1,13,0,496
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.495\0"
VALUE "FileVersion", "1.13.0.496\0"
VALUE "InternalName", "Scale driver\0"
VALUE "LegalCopyright", "SHTRIH-M \251 2013 \0"
VALUE "OriginalFilename", "SmScale.dll\0"
......
[releases]
current=1.13.0.495
current=1.13.0.496
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