ashishkamat/TallyDataTool
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Release 2.1.0.8

Browse Source 
Fix - Purchase Parts
Purchase vehicle
This commit is contained in:
ashkat
2023-05-18 18:01:24 +05:30
parent 4b247631f0
commit bc712b2789
14 changed files with 31 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.vs/TallyDataTool/v15/.suo
BIN
View File
Binary file not shown.
.vs/TallyDataTool/v15/Server/sqlite3/storage.ide
BIN
View File
Binary file not shown.
.vs/TallyDataTool/v15/Server/sqlite3/storage.ide-shm
BIN
View File
Binary file not shown.
.vs/TallyDataTool/v15/Server/sqlite3/storage.ide-wal
BIN
View File
Binary file not shown.
TallyDataTool/FrmMain.cs
+26 -16
View File
@@ -323,6 +323,8 @@ namespace TallyDataTool
oPurchase.TransactionNumber = dtExcelSource.Rows[i]["DocNo"].ToString(); oPurchase.TransactionNumber = dtExcelSource.Rows[i]["DocNo"].ToString();
oPurchase.TransactionDate = dtExcelSource.Rows[i]["DocDate"].ToString(); oPurchase.TransactionDate = dtExcelSource.Rows[i]["DocDate"].ToString();
oPurchase.PartyName = dtExcelSource.Rows[i]["SupplierName"].ToString(); oPurchase.PartyName = dtExcelSource.Rows[i]["SupplierName"].ToString();
oPurchase.SupplierInvoiceNo = dtExcelSource.Rows[i]["DocNo"].ToString();
oPurchase.SupplierInvoiceDate = dtExcelSource.Rows[i]["SupplierInvDate"].ToString();
oPurchase.Narration = ""; oPurchase.Narration = "";
oPurchase.VoucherMode = "Invoice"; oPurchase.VoucherMode = "Invoice";
List<TransactionLedgerDetailsModel> oLedgerDetails = new List<TransactionLedgerDetailsModel>(); List<TransactionLedgerDetailsModel> oLedgerDetails = new List<TransactionLedgerDetailsModel>();
@@ -351,7 +353,7 @@ namespace TallyDataTool
oLedgerDetails.Add(new TransactionLedgerDetailsModel oLedgerDetails.Add(new TransactionLedgerDetailsModel
{ {
LedgerName = "Discount", LedgerName = "Discount",
IsDeemedPositive = "YES", IsDeemedPositive = "NO",
IsPartyLedger = "NO", IsPartyLedger = "NO",
LedgerAmount = double.Parse(dtExcelSource.Rows[i]["Discount"].ToString()).ToString() LedgerAmount = double.Parse(dtExcelSource.Rows[i]["Discount"].ToString()).ToString()
@@ -377,7 +379,7 @@ namespace TallyDataTool
oLedgerDetails.Add(new TransactionLedgerDetailsModel oLedgerDetails.Add(new TransactionLedgerDetailsModel
{ {
LedgerName = "FAME Subsidy", LedgerName = "FAME Subsidy",
IsDeemedPositive = "YES", IsDeemedPositive = "NO",
IsPartyLedger = "NO", IsPartyLedger = "NO",
LedgerAmount = double.Parse(dtExcelSource.Rows[i]["FAMEAmount"].ToString()).ToString() LedgerAmount = double.Parse(dtExcelSource.Rows[i]["FAMEAmount"].ToString()).ToString()
@@ -541,6 +543,8 @@ namespace TallyDataTool
oPurchase.TransactionNumber = dtExcelSource.Rows[i]["DocNo"].ToString(); oPurchase.TransactionNumber = dtExcelSource.Rows[i]["DocNo"].ToString();
oPurchase.TransactionDate = dtExcelSource.Rows[i]["DocDate"].ToString(); oPurchase.TransactionDate = dtExcelSource.Rows[i]["DocDate"].ToString();
oPurchase.PartyName = dtExcelSource.Rows[i]["SupplierName"].ToString(); oPurchase.PartyName = dtExcelSource.Rows[i]["SupplierName"].ToString();
oPurchase.SupplierInvoiceNo = dtExcelSource.Rows[i]["DocNo"].ToString();
oPurchase.SupplierInvoiceDate = dtExcelSource.Rows[i]["SupplierInvDate"].ToString();
oPurchase.Narration = ""; oPurchase.Narration = "";
oPurchase.VoucherMode = "Voucher"; oPurchase.VoucherMode = "Voucher";
//Party Ledger //Party Ledger
@@ -721,6 +725,7 @@ namespace TallyDataTool
string pStrInvNo = "", string pStrInvNo = "",
pStrInvDate = "", pStrInvDate = "",
pStrDocdate = "",
pStrCustomerName = ""; pStrCustomerName = "";
decimal pDecTotalAmount = 0, decimal pDecTotalAmount = 0,
@@ -734,7 +739,7 @@ namespace TallyDataTool
// 1 2 3 4 5 6 7 8 9 10 11 12 13 // 1 2 3 4 5 6 7 8 9 10 11 12 13
string pStrDataCols = "DocNo;DocDate;SupplierName;Discount;FreightAmount;FAMEAmount;IGST;Cess;InvoiceAmount"; string pStrDataCols = "DocNo;DocDate;SupplierName;Discount;FreightAmount;FAMEAmount;IGST;Cess;InvoiceAmount;SupplierInvDate";
dtExcelSource = oLibDbCommon.CreateTable(pStrDataCols); dtExcelSource = oLibDbCommon.CreateTable(pStrDataCols);
pStrDataCols = "DocNo;ProductCode;Qty;Rate;Amount"; pStrDataCols = "DocNo;ProductCode;Qty;Rate;Amount";
@@ -747,9 +752,9 @@ namespace TallyDataTool
if (dtExcelData.Rows[i][0] == null || dtExcelData.Rows[i][0].ToString() == "") if (dtExcelData.Rows[i][0] == null || dtExcelData.Rows[i][0].ToString() == "")
{ {
pDecTotalAmount = pDecTotalAmount + pDecTotalIGST18 + pDecTotalIGST28 + pDecTotalDbMargin + pDecTotalFAMEAmt - (pDecTotalInBillDisc); pDecTotalAmount = pDecTotalAmount + pDecTotalIGST18 + pDecTotalIGST28 + pDecTotalDbMargin - (pDecTotalFAMEAmt +pDecTotalInBillDisc);
pStrData = pStrInvNo; pStrData = pStrInvNo;
pStrData = pStrData + "|" + pStrInvDate; pStrData = pStrData + "|" + pStrDocdate;
pStrData = pStrData + "|" + pStrCustomerName; pStrData = pStrData + "|" + pStrCustomerName;
pStrData = pStrData + "|" + pDecTotalInBillDisc.ToString(); pStrData = pStrData + "|" + pDecTotalInBillDisc.ToString();
pStrData = pStrData + "|" + pDecTotalDbMargin; pStrData = pStrData + "|" + pDecTotalDbMargin;
@@ -757,7 +762,7 @@ namespace TallyDataTool
pStrData = pStrData + "|" + pDecTotalIGST28.ToString(); pStrData = pStrData + "|" + pDecTotalIGST28.ToString();
pStrData = pStrData + "|" + pDecTotalIGST18.ToString(); pStrData = pStrData + "|" + pDecTotalIGST18.ToString();
pStrData = pStrData + "|" + Math.Round(pDecTotalAmount, 0); pStrData = pStrData + "|" + Math.Round(pDecTotalAmount, 0);
pStrData = pStrData + "|" + pStrInvDate;
oLibDbCommon.AddRowToDataTable(dtExcelSource, pStrData); oLibDbCommon.AddRowToDataTable(dtExcelSource, pStrData);
@@ -766,9 +771,9 @@ namespace TallyDataTool
if (pStrInvNo != "" && pStrInvNo != dtExcelData.Rows[i]["Supplier Invoice No"].ToString()) if (pStrInvNo != "" && pStrInvNo != dtExcelData.Rows[i]["Supplier Invoice No"].ToString())
{ {
pDecTotalAmount = pDecTotalAmount + pDecTotalIGST18 + pDecTotalIGST28 + pDecTotalDbMargin + pDecTotalFAMEAmt - (pDecTotalInBillDisc); pDecTotalAmount = pDecTotalAmount + pDecTotalIGST18 + pDecTotalIGST28 + pDecTotalDbMargin - (pDecTotalFAMEAmt + pDecTotalInBillDisc);
pStrData = pStrInvNo; pStrData = pStrInvNo;
pStrData = pStrData + "|" + pStrInvDate; pStrData = pStrData + "|" + pStrDocdate;
pStrData = pStrData + "|" + pStrCustomerName; pStrData = pStrData + "|" + pStrCustomerName;
pStrData = pStrData + "|" + pDecTotalInBillDisc.ToString(); pStrData = pStrData + "|" + pDecTotalInBillDisc.ToString();
pStrData = pStrData + "|" + pDecTotalDbMargin; pStrData = pStrData + "|" + pDecTotalDbMargin;
@@ -776,6 +781,7 @@ namespace TallyDataTool
pStrData = pStrData + "|" + pDecTotalIGST28.ToString(); pStrData = pStrData + "|" + pDecTotalIGST28.ToString();
pStrData = pStrData + "|" + pDecTotalIGST18.ToString(); pStrData = pStrData + "|" + pDecTotalIGST18.ToString();
pStrData = pStrData + "|" + Math.Round(pDecTotalAmount, 0); pStrData = pStrData + "|" + Math.Round(pDecTotalAmount, 0);
pStrData = pStrData + "|" + pStrInvDate;
oLibDbCommon.AddRowToDataTable(dtExcelSource, pStrData); oLibDbCommon.AddRowToDataTable(dtExcelSource, pStrData);
pDecTotalAmount = 0; pDecTotalAmount = 0;
@@ -790,7 +796,7 @@ namespace TallyDataTool
pStrInvNo = dtExcelData.Rows[i]["Supplier Invoice No"].ToString(); pStrInvNo = dtExcelData.Rows[i]["Supplier Invoice No"].ToString();
pStrInvDate = dtExcelData.Rows[i]["Supplier Invoice Date"].ToString().Substring(0, 10); pStrInvDate = dtExcelData.Rows[i]["Supplier Invoice Date"].ToString().Substring(0, 10);
pStrDocdate = dtExcelData.Rows[i]["Document Date"].ToString().Substring(0, 10);
pStrCustomerName = dtExcelData.Rows[i]["Supplier"].ToString(); pStrCustomerName = dtExcelData.Rows[i]["Supplier"].ToString();
@@ -799,11 +805,11 @@ namespace TallyDataTool
pStrData = pStrInvNo; pStrData = pStrInvNo;
if (dtExcelData.Columns.Contains("Vehicle Code")) if (dtExcelData.Columns.Contains("Vehicle Code"))
{ {
pStrData = pStrData + "|" + dtExcelData.Rows[i]["Vehicle Code"].ToString(); pStrData = pStrData + "|" + dtExcelData.Rows[i]["Vehicle Code"].ToString() + dtExcelData.Rows[i]["Color"].ToString();
} }
else else
{ {
pStrData = pStrData + "|" + dtExcelData.Rows[i]["Model"].ToString(); pStrData = pStrData + "|" + dtExcelData.Rows[i]["Model"].ToString() +dtExcelData.Rows[i]["Color"].ToString();
} }
pStrData = pStrData + "|" + "1"; pStrData = pStrData + "|" + "1";
@@ -1536,6 +1542,7 @@ namespace TallyDataTool
string pStrInvNo = "", string pStrInvNo = "",
pStrInvDate = "", pStrInvDate = "",
pStrDocDate = "",
pStrCustomerName = ""; pStrCustomerName = "";
decimal pDecTotalAmount = 0, decimal pDecTotalAmount = 0,
@@ -1553,7 +1560,7 @@ namespace TallyDataTool
// 1 2 3 4 5 6 7 8 9 10 11 12 13 // 1 2 3 4 5 6 7 8 9 10 11 12 13
string pStrDataCols = "DocNo;DocDate;SupplierName;Discount;FreightAmount;Purchase18;Purchase28;Purchase5;IGST18;IGST28;IGST5;InvoiceAmount"; string pStrDataCols = "DocNo;DocDate;SupplierName;Discount;FreightAmount;Purchase18;Purchase28;Purchase5;IGST18;IGST28;IGST5;InvoiceAmount;SupplierInvDate";
dtExcelSource = oLibDbCommon.CreateTable(pStrDataCols); dtExcelSource = oLibDbCommon.CreateTable(pStrDataCols);
@@ -1568,7 +1575,7 @@ namespace TallyDataTool
{ {
pDecTotalAmount = pDecTotalAmount + pDecTotalPurchase18 + pDecTotalPurchase28 + pDecTotalPurchase5 + pDecTotalIGST18 + pDecTotalIGST28 + pDecTotalIGST5 + pDecTotalDbMargin + pDecTotalFAMEAmt - (pDecTotalInBillDisc); pDecTotalAmount = pDecTotalAmount + pDecTotalPurchase18 + pDecTotalPurchase28 + pDecTotalPurchase5 + pDecTotalIGST18 + pDecTotalIGST28 + pDecTotalIGST5 + pDecTotalDbMargin + pDecTotalFAMEAmt - (pDecTotalInBillDisc);
pStrData = pStrInvNo; pStrData = pStrInvNo;
pStrData = pStrData + "|" + pStrInvDate; pStrData = pStrData + "|" + pStrDocDate;
pStrData = pStrData + "|" + pStrCustomerName; pStrData = pStrData + "|" + pStrCustomerName;
pStrData = pStrData + "|" + pDecTotalInBillDisc.ToString(); pStrData = pStrData + "|" + pDecTotalInBillDisc.ToString();
pStrData = pStrData + "|" + pDecTotalDbMargin; pStrData = pStrData + "|" + pDecTotalDbMargin;
@@ -1579,6 +1586,7 @@ namespace TallyDataTool
pStrData = pStrData + "|" + pDecTotalIGST28.ToString(); pStrData = pStrData + "|" + pDecTotalIGST28.ToString();
pStrData = pStrData + "|" + pDecTotalIGST5.ToString(); pStrData = pStrData + "|" + pDecTotalIGST5.ToString();
pStrData = pStrData + "|" + Math.Round(pDecTotalAmount, 0); pStrData = pStrData + "|" + Math.Round(pDecTotalAmount, 0);
pStrData = pStrData + "|" + pStrInvDate;
oLibDbCommon.AddRowToDataTable(dtExcelSource, pStrData); oLibDbCommon.AddRowToDataTable(dtExcelSource, pStrData);
@@ -1593,7 +1601,7 @@ namespace TallyDataTool
{ {
pDecTotalAmount = pDecTotalAmount + pDecTotalPurchase18 + pDecTotalPurchase28 + pDecTotalPurchase5 + pDecTotalIGST18 + pDecTotalIGST28 + pDecTotalIGST5 + pDecTotalDbMargin + pDecTotalFAMEAmt - (pDecTotalInBillDisc); pDecTotalAmount = pDecTotalAmount + pDecTotalPurchase18 + pDecTotalPurchase28 + pDecTotalPurchase5 + pDecTotalIGST18 + pDecTotalIGST28 + pDecTotalIGST5 + pDecTotalDbMargin + pDecTotalFAMEAmt - (pDecTotalInBillDisc);
pStrData = pStrInvNo; pStrData = pStrInvNo;
pStrData = pStrData + "|" + pStrInvDate; pStrData = pStrData + "|" + pStrDocDate;
pStrData = pStrData + "|" + pStrCustomerName; pStrData = pStrData + "|" + pStrCustomerName;
pStrData = pStrData + "|" + pDecTotalInBillDisc.ToString(); pStrData = pStrData + "|" + pDecTotalInBillDisc.ToString();
pStrData = pStrData + "|" + pDecTotalDbMargin; pStrData = pStrData + "|" + pDecTotalDbMargin;
@@ -1604,6 +1612,8 @@ namespace TallyDataTool
pStrData = pStrData + "|" + pDecTotalIGST28.ToString(); pStrData = pStrData + "|" + pDecTotalIGST28.ToString();
pStrData = pStrData + "|" + pDecTotalIGST5.ToString(); pStrData = pStrData + "|" + pDecTotalIGST5.ToString();
pStrData = pStrData + "|" + Math.Round(pDecTotalAmount, 0); pStrData = pStrData + "|" + Math.Round(pDecTotalAmount, 0);
pStrData = pStrData + "|" + pStrInvDate;
oLibDbCommon.AddRowToDataTable(dtExcelSource, pStrData); oLibDbCommon.AddRowToDataTable(dtExcelSource, pStrData);
@@ -1625,7 +1635,7 @@ namespace TallyDataTool
pStrInvNo = dtExcelData.Rows[i]["Supplier Invoice No"].ToString(); pStrInvNo = dtExcelData.Rows[i]["Supplier Invoice No"].ToString();
pStrInvDate = dtExcelData.Rows[i]["Supplier Invoice Date"].ToString().Substring(0, 10); pStrInvDate = dtExcelData.Rows[i]["Supplier Invoice Date"].ToString().Substring(0, 10);
pStrDocDate = dtExcelData.Rows[i]["Document Date"].ToString().Substring(0, 10);
pStrCustomerName = dtExcelData.Rows[i]["Supplier"].ToString(); pStrCustomerName = dtExcelData.Rows[i]["Supplier"].ToString();
@@ -1750,7 +1760,7 @@ namespace TallyDataTool
pStrData = dtExcelData.Rows[i]["Document Name"].ToString(); pStrData = dtExcelData.Rows[i]["Document Name"].ToString();
if (dtExcelData.Columns.Contains("Model") == true) if (dtExcelData.Columns.Contains("Model") == true)
{ {
pStrData = pStrData + "|" + dtExcelData.Rows[i]["Model"].ToString(); pStrData = pStrData + "|" + dtExcelData.Rows[i]["Model"].ToString() + dtExcelData.Rows[i]["Color"].ToString();
} }
else else
{ {
TallyDataTool/Models/VoucherModel.cs
+2
View File
@@ -11,6 +11,8 @@ namespace TallyDataTool.Models
public string TransactionTypeName { get; set; } public string TransactionTypeName { get; set; }
public string TransactionNumber { get; set; } public string TransactionNumber { get; set; }
public string TransactionDate { get; set; } public string TransactionDate { get; set; }
public string SupplierInvoiceNo { get; set; }
public string SupplierInvoiceDate { get; set; }
public string PartyName { get; set; } public string PartyName { get; set; }
public string Narration { get; set; } public string Narration { get; set; }
public string VoucherMode { get; set; } public string VoucherMode { get; set; }
TallyDataTool/Properties/AssemblyInfo.cs
+3 -3
View File
@@ -8,7 +8,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyTitle("TallyDataTool")] [assembly: AssemblyTitle("TallyDataTool")]
[assembly: AssemblyDescription("")] [assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Beta Release -R2023-05-15")] [assembly: AssemblyCompany("Beta Release -R2023-05-18")]
[assembly: AssemblyProduct("TallyDataTool")] [assembly: AssemblyProduct("TallyDataTool")]
[assembly: AssemblyCopyright("Copyright © 2023")] [assembly: AssemblyCopyright("Copyright © 2023")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.1.0.5")] [assembly: AssemblyVersion("2.1.0.8")]
[assembly: AssemblyFileVersion("2.1.0.5")] [assembly: AssemblyFileVersion("2.1.0.8")]
TallyDataTool/bin/Debug/LibTallySync.dll
BIN
View File
Binary file not shown.
TallyDataTool/bin/Debug/LibTallySync.pdb
BIN
View File
Binary file not shown.
TallyDataTool/bin/Debug/TallyDataTool.exe
BIN
View File
Binary file not shown.
TallyDataTool/bin/Debug/TallyDataTool.pdb
BIN
View File
Binary file not shown.
TallyDataTool/obj/Debug/TallyDataTool.csprojAssemblyReference.cache
BIN
View File
Binary file not shown.
TallyDataTool/obj/Debug/TallyDataTool.exe
BIN
View File
Binary file not shown.
TallyDataTool/obj/Debug/TallyDataTool.pdb
BIN
View File
Binary file not shown.