Commit 515d0076 authored by kravtsov's avatar kravtsov

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

parent e9876017
......@@ -6,8 +6,8 @@
*******************************************************************
OposShtrih_1.13_473.exe
13 февраля 2018 12:40
OposShtrih_1.13_474.exe
13 февраля 2018 14:05
[-] Исправлена ошибка печати строк
......
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,13,0,473
PRODUCTVERSION 1,13,0,473
FILEVERSION 1,13,0,475
PRODUCTVERSION 1,13,0,475
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.473\0"
VALUE "FileVersion", "1.13.0.475\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,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
File_0=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\SalesReceipt.pas',0,1,1,1,1,0,0
File_1=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\CustomReceipt.pas',0,1,430,2,432,0,0
File_2=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\SharedPrinter.pas',0,1,1,1,1,0,0
File_3=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\FiscalPrinterDevice.pas',0,1,1,1,1,0,0
File_4=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\ReceiptPrinter.pas',0,1,1,47,3,0,0
File_5=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\FiscalReceiptPrinter.pas',0,1,1,40,15,0,0
File_6=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\FiscalPrinterImpl.pas',0,1,1,1,1,0,0
File_7=SourceModule,'C:\projects\OPOSShtrih\Source\OposTest\Units\PrinterTest.pas',0,1,4437,105,4468,0,0
File_8=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\FSSalesReceipt.pas',0,1,963,37,969,0,0
File_9=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\PrinterParameters.pas',0,1,1,1,1,0,0
[Modules]
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
Count=0
EditWindowCount=0
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
[C:\projects\OPOSShtrih\Source\OposShtrih.bpg]
FormState=0
FormOnTop=0
......@@ -106,55 +87,9 @@ 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
[C:\projects\OPOSShtrih\Test\SmScaleTest\SmScaleTestLib.dpr]
FormState=0
FormOnTop=0
[TypeLibEditWindow0]
Create=1
......@@ -250,8 +185,8 @@ ClientHeight=84
Create=1
Visible=1
State=0
Left=-2
Top=116
Left=8
Top=124
Width=650
Height=514
MaxLeft=-1
......@@ -479,38 +414,6 @@ 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
......
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,13,0,473
PRODUCTVERSION 1,13,0,473
FILEVERSION 1,13,0,475
PRODUCTVERSION 1,13,0,475
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.473\0"
VALUE "FileVersion", "1.13.0.475\0"
VALUE "InternalName", "OPOS test\0"
VALUE "LegalCopyright", "SHTRIH-M \251 2013 \0"
VALUE "OriginalFilename", "OposTest.exe\0"
......
......@@ -4459,6 +4459,8 @@ begin
Check(FiscalPrinter.ResetPrinter());
FiscalPrinter.FiscalReceiptType := FPTR_RT_SALES;
Check(FiscalPrinter.BeginFiscalReceipt(True));
FiscalPrinter.PreLine := 'PreLIne 1';
FiscalPrinter.PostLine := 'PostLIne 1';
Check(FiscalPrinter.PrintRecItem(Text, 101, 3088, 4, 32.7, ''));
Check(FiscalPrinter.PrintRecTotal(101, 101, '2'));
Check(FiscalPrinter.PrintRecMessage('.: 41895 '));
......
......@@ -7,7 +7,7 @@ uses
DeviceService;
const
GenericServiceVersion = deviceVersion113 + 473;
GenericServiceVersion = deviceVersion113 + 475;
implementation
......
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,13,0,473
PRODUCTVERSION 1,13,0,473
FILEVERSION 1,13,0,475
PRODUCTVERSION 1,13,0,475
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.473\0"
VALUE "FileVersion", "1.13.0.475\0"
VALUE "InternalName", "Fiscal printer driver\0"
VALUE "LegalCopyright", "SHTRIH-M \251 2013 \0"
VALUE "OriginalFilename", "SmFiscalPrinter.dll\0"
......
......@@ -192,6 +192,9 @@ begin
CheckPrice(Price);
CheckQuantity(Quantity);
CheckPrice(UnitPrice);
OpenReceipt(RecTypeSale);
PrintPreLine;
if UnitPrice = 0 then
begin
......@@ -219,6 +222,7 @@ begin
end;
FItems.Add(Operation);
FLastItemSumm := Round2(Operation.Price*Operation.Quantity/1000);
PrintPostLine;
end;
procedure TSalesReceipt.PrintRecItemAdjustment(
......@@ -231,6 +235,7 @@ var
begin
CheckDescription(Description);
CheckAdjAmount(AdjustmentType, Amount);
PrintPreLine;
case AdjustmentType of
FPTR_AT_AMOUNT_DISCOUNT:
......@@ -282,6 +287,7 @@ begin
else
InvalidParameterValue('AdjustmentType', IntToStr(AdjustmentType));
end;
PrintPostLine;
end;
procedure TSalesReceipt.PrintRecPackageAdjustment(
......@@ -290,6 +296,7 @@ procedure TSalesReceipt.PrintRecPackageAdjustment(
begin
CheckDescription(Description);
PrintPreLine;
case AdjustmentType of
FPTR_AT_AMOUNT_DISCOUNT,
FPTR_AT_AMOUNT_SURCHARGE:
......@@ -299,11 +306,13 @@ begin
else
RaiseOposException(OPOS_E_ILLEGAL);
end;
PrintPostLine;
end;
procedure TSalesReceipt.PrintRecPackageAdjustVoid(AdjustmentType: Integer;
const VatAdjustment: string);
begin
PrintPreLine;
CheckDescription(VatAdjustment);
case AdjustmentType of
FPTR_AT_AMOUNT_DISCOUNT,
......@@ -314,6 +323,7 @@ begin
else
RaiseOposException(OPOS_E_ILLEGAL);
end;
PrintPostLine;
end;
procedure TSalesReceipt.PrintRecRefund(const Description: string;
......@@ -322,6 +332,8 @@ var
Operation: TPriceReg;
begin
CheckAmount(Amount);
OpenReceipt(RecTypeRetSale);
PrintPreLine;
Operation.Quantity := 1000;
Operation.Price := Printer.CurrencyToInt(Amount);
......@@ -333,6 +345,7 @@ begin
Operation.Department := Parameters.Department;
Printer.RetSale(Operation);
FItems.Add(Operation);
PrintPostLine;
end;
procedure TSalesReceipt.PrintRecRefundVoid(
......@@ -343,6 +356,7 @@ var
begin
CheckDescription(Description);
CheckAmount(Amount);
PrintPreLine;
Operation.Quantity := 1000;
Operation.Price := Printer.CurrencyToInt(Amount);
......@@ -353,6 +367,7 @@ begin
Operation.Text := Description;
Operation.Department := Parameters.Department;
Printer.Storno(Operation);
PrintPostLine;
end;
procedure TSalesReceipt.PrintRecSubtotal(Amount: Currency);
......@@ -369,7 +384,9 @@ procedure TSalesReceipt.PrintRecSubtotalAdjustment(AdjustmentType: Integer;
begin
CheckDescription(Description);
CheckAdjAmount(AdjustmentType, Amount);
PrintPreLine;
RecSubtotalAdjustment(AdjustmentType, Amount);
PrintPostLine;
end;
// Discount void consider to taxes turnover
......@@ -463,7 +480,9 @@ procedure TSalesReceipt.PrintRecSubtotalAdjustVoid(
AdjustmentType: Integer; Amount: Currency);
begin
CheckAdjAmount(AdjustmentType, Amount);
PrintPreLine;
RecSubtotalAdjustment(AdjustmentType, Amount);
PrintPostLine;
end;
procedure TSalesReceipt.PrintRecTotal(Total: Currency; Payment: Currency;
......@@ -478,6 +497,7 @@ begin
CheckAmount(Total);
CheckAmount(Payment);
CheckTotal(Total);
PrintPreLine;
// Check payment code
PayCode := Printer.GetPayCode(Description);
......@@ -501,7 +521,7 @@ begin
begin
State.SetState(FPTR_PS_FISCAL_RECEIPT_TOTAL);
end;
Printer.PrintPostLine;
PrintPostLine;
end;
procedure TSalesReceipt.CheckRececiptState;
......@@ -594,6 +614,7 @@ begin
CheckAmount(Amount);
CheckQuantity(Quantity);
CheckDescription(Description);
PrintPreLine;
Operation.Quantity := Quantity;
Operation.Price := Printer.CurrencyToInt(Amount);
......@@ -605,6 +626,7 @@ begin
Operation.Text := Description;
Operation.Department := Parameters.Department;
Printer.Storno(Operation);
PrintPostLine;
end;
procedure TSalesReceipt.PrintRecItemVoid(const Description: string;
......@@ -616,7 +638,7 @@ begin
CheckPrice(Price);
CheckQuantity(Quantity);
CheckPrice(UnitPrice);
PrintPreLine;
if UnitPrice = 0 then
begin
// If no price - use single quantity cost
......@@ -637,6 +659,7 @@ begin
Operation.Department := Parameters.Department;
Printer.Storno(Operation);
FLastItemSumm := -Round2(Operation.Price*Operation.Quantity/1000);
PrintPostLine;
end;
procedure TSalesReceipt.PrintRecItemRefund(const ADescription: string;
......@@ -648,7 +671,9 @@ begin
CheckAmount(Amount);
CheckAmount(UnitAmount);
CheckQuantity(Quantity);
OpenReceipt(RecTypeRetSale);
PrintPreLine;
if (UnitAmount = 0)or(Quantity = 0) then
begin
// If no price - use single quantity cost
......@@ -669,6 +694,7 @@ begin
Operation.Department := Parameters.Department;
Printer.RetSale(Operation);
FItems.Add(Operation);
PrintPostLine;
end;
procedure TSalesReceipt.PrintRecItemRefundVoid(const ADescription: string;
......
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,13,0,473
PRODUCTVERSION 1,13,0,473
FILEVERSION 1,13,0,475
PRODUCTVERSION 1,13,0,475
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.473\0"
VALUE "FileVersion", "1.13.0.475\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,473
PRODUCTVERSION 1,13,0,473
FILEVERSION 1,13,0,475
PRODUCTVERSION 1,13,0,475
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.473\0"
VALUE "FileVersion", "1.13.0.475\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.473
current=1.13.0.475
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