Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "refactor: use both fields to store against values"

Browse Source 
This reverts commit 09439334cae6a7306dad8e54a9f81f9ffa483f8b.
This commit is contained in:
Deepesh Garg 2024-01-14 11:22:50 +05:30
parent 4dad4b50fb
commit 1a67d7d95f
12 changed files with 0 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/deferred_revenue.py
View File

@ -516,7 +516,6 @@ def make_gl_entries(
{
"account": credit_account,
"against": against,
"against_link": against,
"credit": base_amount,
"credit_in_account_currency": amount,
"cost_center": cost_center,
@ -536,7 +535,6 @@ def make_gl_entries(
{
"account": debit_account,
"against": against,
"against_link": against,
"debit": base_amount,
"debit_in_account_currency": amount,
"cost_center": cost_center,

2
erpnext/accounts/doctype/invoice_discounting/invoice_discounting.py
View File

@ -154,7 +154,6 @@ class InvoiceDiscounting(AccountsController):
"party_type": "Customer",
"party": d.customer,
"against": self.accounts_receivable_credit,
"against_link": self.accounts_receivable_credit,
"credit": outstanding_in_company_currency,
"credit_in_account_currency": outstanding_in_company_currency
if inv.party_account_currency == company_currency
@ -175,7 +174,6 @@ class InvoiceDiscounting(AccountsController):
"party_type": "Customer",
"party": d.customer,
"against": inv.debit_to,
"against_link": inv.debit_to,
"debit": outstanding_in_company_currency,
"debit_in_account_currency": outstanding_in_company_currency
if ar_credit_account_currency == company_currency

6
erpnext/accounts/doctype/payment_entry/payment_entry.py
View File

@ -1145,7 +1145,6 @@ class PaymentEntry(AccountsController):
"party_type": self.party_type,
"party": self.party,
"against": against_account,
"against_link": against_account,
"account_currency": self.party_account_currency,
"cost_center": self.cost_center,
},
@ -1311,7 +1310,6 @@ class PaymentEntry(AccountsController):
"account": self.paid_from,
"account_currency": self.paid_from_account_currency,
"against": self.party if self.payment_type == "Pay" else self.paid_to,
"against_link": self.party if self.payment_type == "Pay" else self.paid_to,
"credit_in_account_currency": self.paid_amount,
"credit": self.base_paid_amount,
"cost_center": self.cost_center,
@ -1327,7 +1325,6 @@ class PaymentEntry(AccountsController):
"account": self.paid_to,
"account_currency": self.paid_to_account_currency,
"against": self.party if self.payment_type == "Receive" else self.paid_from,
"against_link": self.party if self.payment_type == "Receive" else self.paid_from,
"debit_in_account_currency": self.received_amount,
"debit": self.base_received_amount,
"cost_center": self.cost_center,
@ -1360,7 +1357,6 @@ class PaymentEntry(AccountsController):
{
"account": d.account_head,
"against": against,
"against_link": against,
dr_or_cr: tax_amount,
dr_or_cr + "_in_account_currency": base_tax_amount
if account_currency == self.company_currency
@ -1386,7 +1382,6 @@ class PaymentEntry(AccountsController):
{
"account": payment_account,
"against": against,
"against_link": against,
rev_dr_or_cr: tax_amount,
rev_dr_or_cr + "_in_account_currency": base_tax_amount
if account_currency == self.company_currency
@ -1412,7 +1407,6 @@ class PaymentEntry(AccountsController):
"account": d.account,
"account_currency": account_currency,
"against": self.party or self.paid_from,
"against_link": self.party or self.paid_from,
"debit_in_account_currency": d.amount,
"debit": d.amount,
"cost_center": d.cost_center,

21
erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
View File

@ -828,7 +828,6 @@ class PurchaseInvoice(BuyingController):
"party": self.supplier,
"due_date": self.due_date,
"against": self.against_expense_account,
"against_link": self.against_expense_account,
"credit": base_grand_total,
"credit_in_account_currency": base_grand_total
if self.party_account_currency == self.company_currency
@ -902,7 +901,6 @@ class PurchaseInvoice(BuyingController):
{
"account": warehouse_account[item.warehouse]["account"],
"against": warehouse_account[item.from_warehouse]["account"],
"against_link": warehouse_account[item.from_warehouse]["account"],
"cost_center": item.cost_center,
"project": item.project or self.project,
"remarks": self.get("remarks") or _("Accounting Entry for Stock"),
@ -923,7 +921,6 @@ class PurchaseInvoice(BuyingController):
{
"account": warehouse_account[item.from_warehouse]["account"],
"against": warehouse_account[item.warehouse]["account"],
"against_link": warehouse_account[item.warehouse]["account"],
"cost_center": item.cost_center,
"project": item.project or self.project,
"remarks": self.get("remarks") or _("Accounting Entry for Stock"),
@ -941,7 +938,6 @@ class PurchaseInvoice(BuyingController):
{
"account": item.expense_account,
"against": self.supplier,
"against_link": self.supplier,
"debit": flt(item.base_net_amount, item.precision("base_net_amount")),
"remarks": self.get("remarks") or _("Accounting Entry for Stock"),
"cost_center": item.cost_center,
@ -959,7 +955,6 @@ class PurchaseInvoice(BuyingController):
{
"account": item.expense_account,
"against": self.supplier,
"against_link": self.supplier,
"debit": warehouse_debit_amount,
"remarks": self.get("remarks") or _("Accounting Entry for Stock"),
"cost_center": item.cost_center,
@ -979,7 +974,6 @@ class PurchaseInvoice(BuyingController):
{
"account": account,
"against": item.expense_account,
"against_link": item.expense_account,
"cost_center": item.cost_center,
"remarks": self.get("remarks") or _("Accounting Entry for Stock"),
"credit": flt(amount["base_amount"]),
@ -1000,7 +994,6 @@ class PurchaseInvoice(BuyingController):
{
"account": supplier_warehouse_account,
"against": item.expense_account,
"against_link": item.expense_account,
"cost_center": item.cost_center,
"project": item.project or self.project,
"remarks": self.get("remarks") or _("Accounting Entry for Stock"),
@ -1056,7 +1049,6 @@ class PurchaseInvoice(BuyingController):
{
"account": expense_account,
"against": self.supplier,
"against_link": self.supplier,
"debit": amount,
"cost_center": item.cost_center,
"project": item.project or self.project,
@ -1083,7 +1075,6 @@ class PurchaseInvoice(BuyingController):
{
"account": expense_account,
"against": self.supplier,
"against_link": self.supplier,
"debit": discrepancy_caused_by_exchange_rate_difference,
"cost_center": item.cost_center,
"project": item.project or self.project,
@ -1097,7 +1088,6 @@ class PurchaseInvoice(BuyingController):
{
"account": self.get_company_default("exchange_gain_loss_account"),
"against": self.supplier,
"against_link": self.supplier,
"credit": discrepancy_caused_by_exchange_rate_difference,
"cost_center": item.cost_center,
"project": item.project or self.project,
@ -1132,7 +1122,6 @@ class PurchaseInvoice(BuyingController):
{
"account": self.stock_received_but_not_billed,
"against": self.supplier,
"against_link": self.supplier,
"debit": flt(item.item_tax_amount, item.precision("item_tax_amount")),
"remarks": self.remarks or _("Accounting Entry for Stock"),
"cost_center": self.cost_center,
@ -1194,7 +1183,6 @@ class PurchaseInvoice(BuyingController):
{
"account": cost_of_goods_sold_account,
"against": item.expense_account,
"against_link": item.expense_account,
"debit": stock_adjustment_amt,
"remarks": self.get("remarks") or _("Stock Adjustment"),
"cost_center": item.cost_center,
@ -1225,7 +1213,6 @@ class PurchaseInvoice(BuyingController):
{
"account": tax.account_head,
"against": self.supplier,
"against_link": self.supplier,
dr_or_cr: base_amount,
dr_or_cr + "_in_account_currency": base_amount
if account_currency == self.company_currency
@ -1275,7 +1262,6 @@ class PurchaseInvoice(BuyingController):
"account": tax.account_head,
"cost_center": tax.cost_center,
"against": self.supplier,
"against_link": self.supplier,
"credit": applicable_amount,
"remarks": self.remarks or _("Accounting Entry for Stock"),
},
@ -1294,7 +1280,6 @@ class PurchaseInvoice(BuyingController):
"account": tax.account_head,
"cost_center": tax.cost_center,
"against": self.supplier,
"against_link": self.supplier,
"credit": valuation_tax[tax.name],
"remarks": self.remarks or _("Accounting Entry for Stock"),
},
@ -1310,7 +1295,6 @@ class PurchaseInvoice(BuyingController):
{
"account": self.unrealized_profit_loss_account,
"against": self.supplier,
"against_link": self.supplier,
"credit": flt(self.total_taxes_and_charges),
"credit_in_account_currency": flt(self.base_total_taxes_and_charges),
"cost_center": self.cost_center,
@ -1332,7 +1316,6 @@ class PurchaseInvoice(BuyingController):
"party_type": "Supplier",
"party": self.supplier,
"against": self.cash_bank_account,
"against_link": self.cash_bank_account,
"debit": self.base_paid_amount,
"debit_in_account_currency": self.base_paid_amount
if self.party_account_currency == self.company_currency
@ -1354,7 +1337,6 @@ class PurchaseInvoice(BuyingController):
{
"account": self.cash_bank_account,
"against": self.supplier,
"against_link": self.supplier,
"credit": self.base_paid_amount,
"credit_in_account_currency": self.base_paid_amount
if bank_account_currency == self.company_currency
@ -1379,7 +1361,6 @@ class PurchaseInvoice(BuyingController):
"party_type": "Supplier",
"party": self.supplier,
"against": self.write_off_account,
"against_link": self.write_off_account,
"debit": self.base_write_off_amount,
"debit_in_account_currency": self.base_write_off_amount
if self.party_account_currency == self.company_currency
@ -1400,7 +1381,6 @@ class PurchaseInvoice(BuyingController):
{
"account": self.write_off_account,
"against": self.supplier,
"against_link": self.supplier,
"credit": flt(self.base_write_off_amount),
"credit_in_account_currency": self.base_write_off_amount
if write_off_account_currency == self.company_currency
@ -1428,7 +1408,6 @@ class PurchaseInvoice(BuyingController):
{
"account": round_off_account,
"against": self.supplier,
"against_link": self.supplier,
"debit_in_account_currency": self.rounding_adjustment,
"debit": self.base_rounding_adjustment,
"cost_center": round_off_cost_center

13
erpnext/accounts/doctype/sales_invoice/sales_invoice.py
View File

@ -1234,7 +1234,6 @@ class SalesInvoice(SellingController):
"party": self.customer,
"due_date": self.due_date,
"against": self.against_income_account,
"against_link": self.against_income_account,
"debit": base_grand_total,
"debit_in_account_currency": base_grand_total
if self.party_account_currency == self.company_currency
@ -1264,7 +1263,6 @@ class SalesInvoice(SellingController):
{
"account": tax.account_head,
"against": self.customer,
"against_link": self.customer,
"credit": flt(base_amount, tax.precision("tax_amount_after_discount_amount")),
"credit_in_account_currency": (
flt(base_amount, tax.precision("base_tax_amount_after_discount_amount"))
@ -1286,7 +1284,6 @@ class SalesInvoice(SellingController):
{
"account": self.unrealized_profit_loss_account,
"against": self.customer,
"against_link": self.customer,
"debit": flt(self.total_taxes_and_charges),
"debit_in_account_currency": flt(self.base_total_taxes_and_charges),
"cost_center": self.cost_center,
@ -1355,7 +1352,6 @@ class SalesInvoice(SellingController):
for gle in fixed_asset_gl_entries:
gle["against"] = self.customer
gle["against_link"] = self.customer
gl_entries.append(self.get_gl_dict(gle, item=item))
self.set_asset_status(asset)
@ -1377,7 +1373,6 @@ class SalesInvoice(SellingController):
{
"account": income_account,
"against": self.customer,
"against_link": self.customer,
"credit": flt(base_amount, item.precision("base_net_amount")),
"credit_in_account_currency": (
flt(base_amount, item.precision("base_net_amount"))
@ -1448,7 +1443,6 @@ class SalesInvoice(SellingController):
"account": self.loyalty_redemption_account,
"cost_center": self.cost_center or self.loyalty_redemption_cost_center,
"against": self.customer,
"against_link": self.customer,
"debit": self.loyalty_amount,
"remark": "Loyalty Points redeemed by the customer",
},
@ -1476,7 +1470,6 @@ class SalesInvoice(SellingController):
"party_type": "Customer",
"party": self.customer,
"against": payment_mode.account,
"against_link": payment_mode.account,
"credit": payment_mode.base_amount,
"credit_in_account_currency": payment_mode.base_amount
if self.party_account_currency == self.company_currency
@ -1498,7 +1491,6 @@ class SalesInvoice(SellingController):
{
"account": payment_mode.account,
"against": self.customer,
"against_link": self.customer,
"debit": payment_mode.base_amount,
"debit_in_account_currency": payment_mode.base_amount
if payment_mode_account_currency == self.company_currency
@ -1523,7 +1515,6 @@ class SalesInvoice(SellingController):
"party_type": "Customer",
"party": self.customer,
"against": self.account_for_change_amount,
"against_link": self.account_for_change_amount,
"debit": flt(self.base_change_amount),
"debit_in_account_currency": flt(self.base_change_amount)
if self.party_account_currency == self.company_currency
@ -1545,7 +1536,6 @@ class SalesInvoice(SellingController):
{
"account": self.account_for_change_amount,
"against": self.customer,
"against_link": self.customer,
"credit": self.base_change_amount,
"cost_center": self.cost_center,
},
@ -1572,7 +1562,6 @@ class SalesInvoice(SellingController):
"party_type": "Customer",
"party": self.customer,
"against": self.write_off_account,
"against_link": self.write_off_account,
"credit": flt(self.base_write_off_amount, self.precision("base_write_off_amount")),
"credit_in_account_currency": (
flt(self.base_write_off_amount, self.precision("base_write_off_amount"))
@ -1593,7 +1582,6 @@ class SalesInvoice(SellingController):
{
"account": self.write_off_account,
"against": self.customer,
"against_link": self.customer,
"debit": flt(self.base_write_off_amount, self.precision("base_write_off_amount")),
"debit_in_account_currency": (
flt(self.base_write_off_amount, self.precision("base_write_off_amount"))
@ -1622,7 +1610,6 @@ class SalesInvoice(SellingController):
{
"account": round_off_account,
"against": self.customer,
"against_link": self.customer,
"credit_in_account_currency": flt(
self.rounding_adjustment, self.precision("rounding_adjustment")
),

2
erpnext/assets/doctype/asset/asset.py
View File

@ -698,7 +698,6 @@ class Asset(AccountsController):
{
"account": cwip_account,
"against": fixed_asset_account,
"against_link": fixed_asset_account,
"remarks": self.get("remarks") or _("Accounting Entry for Asset"),
"posting_date": self.available_for_use_date,
"credit": self.purchase_receipt_amount,
@ -714,7 +713,6 @@ class Asset(AccountsController):
{
"account": fixed_asset_account,
"against": cwip_account,
"against_link": cwip_account,
"remarks": self.get("remarks") or _("Accounting Entry for Asset"),
"posting_date": self.available_for_use_date,
"debit": self.purchase_receipt_amount,

3
erpnext/assets/doctype/asset_capitalization/asset_capitalization.py
View File

@ -486,7 +486,6 @@ class AssetCapitalization(StockController):
{
"account": account,
"against": target_account,
"against_link": target_account,
"cost_center": item_row.cost_center,
"project": item_row.get("project") or self.get("project"),
"remarks": self.get("remarks") or "Accounting Entry for Stock",
@ -528,7 +527,6 @@ class AssetCapitalization(StockController):
for gle in fixed_asset_gl_entries:
gle["against"] = target_account
gle["against_link"] = target_account
gl_entries.append(self.get_gl_dict(gle, item=item))
target_against.add(gle["account"])
@ -545,7 +543,6 @@ class AssetCapitalization(StockController):
{
"account": item_row.expense_account,
"against": target_account,
"against_link": target_account,
"cost_center": item_row.cost_center,
"project": item_row.get("project") or self.get("project"),
"remarks": self.get("remarks") or "Accounting Entry for Stock",

4
erpnext/assets/doctype/asset_repair/asset_repair.py
View File

@ -286,7 +286,6 @@ class AssetRepair(AccountsController):
"debit": self.repair_cost,
"debit_in_account_currency": self.repair_cost,
"against": pi_expense_account,
"against_link": pi_expense_account,
"voucher_type": self.doctype,
"voucher_no": self.name,
"cost_center": self.cost_center,
@ -306,7 +305,6 @@ class AssetRepair(AccountsController):
"credit": self.repair_cost,
"credit_in_account_currency": self.repair_cost,
"against": fixed_asset_account,
"against_link": fixed_asset_account,
"voucher_type": self.doctype,
"voucher_no": self.name,
"cost_center": self.cost_center,
@ -341,7 +339,6 @@ class AssetRepair(AccountsController):
"credit": item.amount,
"credit_in_account_currency": item.amount,
"against": fixed_asset_account,
"against_link": fixed_asset_account,
"voucher_type": self.doctype,
"voucher_no": self.name,
"cost_center": self.cost_center,
@ -359,7 +356,6 @@ class AssetRepair(AccountsController):
"debit": item.amount,
"debit_in_account_currency": item.amount,
"against": item.expense_account or default_expense_account,
"against_link": item.expense_account or default_expense_account,
"voucher_type": self.doctype,
"voucher_no": self.name,
"cost_center": self.cost_center,

4
erpnext/controllers/accounts_controller.py
View File

@ -1169,7 +1169,6 @@ class AccountsController(TransactionBase):
{
"account": round_off_account,
"against": against,
"against_link": against,
credit_or_debit: precision_loss,
"cost_center": round_off_cost_center
if self.use_company_roundoff_cost_center
@ -1553,7 +1552,6 @@ class AccountsController(TransactionBase):
{
"account": item.discount_account,
"against": supplier_or_customer,
"against_link": supplier_or_customer,
dr_or_cr: flt(
discount_amount * self.get("conversion_rate"), item.precision("discount_amount")
),
@ -1572,7 +1570,6 @@ class AccountsController(TransactionBase):
{
"account": income_or_expense_account,
"against": supplier_or_customer,
"against_link": supplier_or_customer,
rev_dr_cr: flt(
discount_amount * self.get("conversion_rate"), item.precision("discount_amount")
),
@ -1596,7 +1593,6 @@ class AccountsController(TransactionBase):
{
"account": self.additional_discount_account,
"against": supplier_or_customer,
"against_link": supplier_or_customer,
dr_or_cr: self.base_discount_amount,
"cost_center": self.cost_center or erpnext.get_default_cost_center(self.company),
},

5
erpnext/controllers/stock_controller.py
View File

@ -163,7 +163,6 @@ class StockController(AccountsController):
{
"account": warehouse_account[sle.warehouse]["account"],
"against": expense_account,
"against_link": expense_account,
"cost_center": item_row.cost_center,
"project": item_row.project or self.get("project"),
"remarks": self.get("remarks") or _("Accounting Entry for Stock"),
@ -180,7 +179,6 @@ class StockController(AccountsController):
{
"account": expense_account,
"against": warehouse_account[sle.warehouse]["account"],
"against_link": warehouse_account[sle.warehouse]["account"],
"cost_center": item_row.cost_center,
"remarks": self.get("remarks") or _("Accounting Entry for Stock"),
"debit": -1 * flt(sle.stock_value_difference, precision),
@ -213,7 +211,6 @@ class StockController(AccountsController):
{
"account": expense_account,
"against": warehouse_asset_account,
"against_link": warehouse_asset_account,
"cost_center": item_row.cost_center,
"project": item_row.project or self.get("project"),
"remarks": _("Rounding gain/loss Entry for Stock Transfer"),
@ -230,7 +227,6 @@ class StockController(AccountsController):
{
"account": warehouse_asset_account,
"against": expense_account,
"against_link": expense_account,
"cost_center": item_row.cost_center,
"remarks": _("Rounding gain/loss Entry for Stock Transfer"),
"credit": sle_rounding_diff,
@ -847,7 +843,6 @@ class StockController(AccountsController):
"debit": debit,
"credit": credit,
"against": against_account,
"against_link": against_account,
"remarks": remarks,
}

1
erpnext/regional/united_arab_emirates/utils.py
View File

@ -154,7 +154,6 @@ def make_gl_entry(tax, gl_entries, doc, tax_accounts):
"cost_center": tax.cost_center,
"posting_date": doc.posting_date,
"against": doc.supplier,
"against_link": doc.supplier,
dr_or_cr: tax.base_tax_amount_after_discount_amount,
dr_or_cr + "_in_account_currency": tax.base_tax_amount_after_discount_amount
if account_currency == doc.company_currency

2
erpnext/stock/doctype/stock_entry/stock_entry.py
View File

@ -1460,7 +1460,6 @@ class StockEntry(StockController):
{
"account": account,
"against": d.expense_account,
"against_link": d.expense_account,
"cost_center": d.cost_center,
"remarks": self.get("remarks") or _("Accounting Entry for Stock"),
"credit_in_account_currency": flt(amount["amount"]),
@ -1475,7 +1474,6 @@ class StockEntry(StockController):
{
"account": d.expense_account,
"against": account,
"against_link": account,
"cost_center": d.cost_center,
"remarks": self.get("remarks") or _("Accounting Entry for Stock"),
"credit": -1