Another fix for VAT reports
This commit is contained in:
@@ -14,7 +14,7 @@ namespace Swarmops.Database
|
||||
/// </summary>
|
||||
public static int DbVersionExpected
|
||||
{
|
||||
get { return 48; }
|
||||
get { return 49; }
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -239,7 +239,7 @@ namespace Swarmops.Database
|
||||
|
||||
AddParameterWithName(command, "vatReportId", vatReportId);
|
||||
AddParameterWithName(command, "financialTransactionId", financialTransactionId);
|
||||
AddParameterWithName(command, "foreignObjectId", foreignObjectId);
|
||||
AddParameterWithName(command, "foreignId", foreignObjectId);
|
||||
AddParameterWithName(command, "financialDependencyType", financialDependencyType.ToString());
|
||||
AddParameterWithName(command, "turnoverCents", turnoverCents);
|
||||
AddParameterWithName(command, "vatInboundCents", vatInboundCents);
|
||||
|
||||
@@ -46,3 +46,4 @@
|
||||
0046 - VatReports.Turnover=>TurnoverCents [RF]
|
||||
0047 - Fix for null case in SetVatReportReleased [RF]
|
||||
0048 - Fix for CreateVatReportItem, ForeignObjectId=>ForeignId [RF]
|
||||
0049 - Another fix for CreateVatReportItem
|
||||
|
||||
@@ -33,4 +33,8 @@ BEGIN
|
||||
|
||||
INSERT INTO VatReportItems (VatReportId, FinancialTransactionId, ForeignId, FinancialDependencyTypeId, TurnoverCents, VatInboundCents, VatOutboundCents)
|
||||
VALUES (vatReportId, financialTransactionId, foreignId, financialDependencyTypeId, turnoverCents, vatInboundCents, vatOutboundCents);
|
||||
|
||||
|
||||
SELECT LAST_INSERT_ID() AS Identity;
|
||||
|
||||
END
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
DROP PROCEDURE IF EXISTS `CreateVatReportItem`
|
||||
|
||||
#
|
||||
|
||||
CREATE PROCEDURE `CreateVatReportItem`(
|
||||
vatReportId INT,
|
||||
financialTransactionId INT,
|
||||
foreignId INT,
|
||||
financialDependencyType VARCHAR(64),
|
||||
turnoverCents BIGINT,
|
||||
vatInboundCents BIGINT,
|
||||
vatOutboundCents BIGINT
|
||||
)
|
||||
BEGIN
|
||||
|
||||
DECLARE financialDependencyTypeId INTEGER;
|
||||
|
||||
SELECT 0 INTO financialDependencyTypeId;
|
||||
|
||||
IF ((SELECT COUNT(*) FROM FinancialDependencyTypes WHERE FinancialDependencyTypes.Name=financialDependencyType) = 0)
|
||||
THEN
|
||||
INSERT INTO FinancialDependencyTypes (Name)
|
||||
VALUES (financialDependencyType);
|
||||
|
||||
SELECT LAST_INSERT_ID() INTO financialDependencyTypeId;
|
||||
|
||||
ELSE
|
||||
|
||||
SELECT FinancialDependencyTypes.FinancialDependencyTypeId INTO FinancialDependencyTypeId FROM FinancialDependencyTypes
|
||||
WHERE FinancialDependencyTypes.Name=financialDependencyType;
|
||||
|
||||
END IF;
|
||||
|
||||
INSERT INTO VatReportItems (VatReportId, FinancialTransactionId, ForeignId, FinancialDependencyTypeId, TurnoverCents, VatInboundCents, VatOutboundCents)
|
||||
VALUES (vatReportId, financialTransactionId, foreignId, financialDependencyTypeId, turnoverCents, vatInboundCents, vatOutboundCents);
|
||||
|
||||
|
||||
SELECT LAST_INSERT_ID() AS Identity;
|
||||
|
||||
END
|
||||
Reference in New Issue
Block a user