nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-22 14:39:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 09439334ca.
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
Download Patch File Download Diff File Expand all files Collapse all files

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,
}