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

refactor: checkbox to toggle always standalone credit note

Browse Source 
(cherry picked from commit 2cefe2a20e)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.json
This commit is contained in:
ruthra kumar
2024-03-11 14:02:05 +05:30
committed by Mergify
parent a5e6763be5
commit f83098e493
2 changed files with 29 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
erpnext/accounts/doctype/sales_invoice/sales_invoice.json
View File

@@ -25,6 +25,7 @@
"is_consolidated", "is_consolidated",
"is_return", "is_return",
"return_against", "return_against",
"update_outstanding_for_self",
"update_billed_amount_in_sales_order", "update_billed_amount_in_sales_order",
"update_billed_amount_in_delivery_note", "update_billed_amount_in_delivery_note",
"is_debit_note", "is_debit_note",
@@ -2162,6 +2163,25 @@
"fieldname": "update_billed_amount_in_delivery_note", "fieldname": "update_billed_amount_in_delivery_note",
"fieldtype": "Check", "fieldtype": "Check",
"label": "Update Billed Amount in Delivery Note" "label": "Update Billed Amount in Delivery Note"
<<<<<<< HEAD
=======
},
{
"default": "0",
"depends_on": "loyalty_program",
"fieldname": "dont_create_loyalty_points",
"fieldtype": "Check",
"label": "Don't Create Loyalty Points",
"no_copy": 1
},
{
"default": "1",
"depends_on": "eval: doc.is_return && doc.return_against",
"description": "Credit Note will update it's own outstanding amount, even if \"Return Against\" is specified.",
"fieldname": "update_outstanding_for_self",
"fieldtype": "Check",
"label": "Update Outstanding for Self"
>>>>>>> 2cefe2a20e (refactor: checkbox to toggle always standalone credit note)
} }
], ],
"icon": "fa fa-file-text", "icon": "fa fa-file-text",
@@ -2174,7 +2194,11 @@
"link_fieldname": "consolidated_invoice" "link_fieldname": "consolidated_invoice"
} }
], ],
<<<<<<< HEAD
"modified": "2023-11-23 16:56:29.679499", "modified": "2023-11-23 16:56:29.679499",
=======
"modified": "2024-03-11 14:20:34.874192",
>>>>>>> 2cefe2a20e (refactor: checkbox to toggle always standalone credit note)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Sales Invoice", "name": "Sales Invoice",

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

@@ -220,6 +220,7 @@ class SalesInvoice(SellingController):
unrealized_profit_loss_account: DF.Link | None unrealized_profit_loss_account: DF.Link | None
update_billed_amount_in_delivery_note: DF.Check update_billed_amount_in_delivery_note: DF.Check
update_billed_amount_in_sales_order: DF.Check update_billed_amount_in_sales_order: DF.Check
update_outstanding_for_self: DF.Check
update_stock: DF.Check update_stock: DF.Check
use_company_roundoff_cost_center: DF.Check use_company_roundoff_cost_center: DF.Check
write_off_account: DF.Link | None write_off_account: DF.Link | None
@@ -1241,7 +1242,9 @@ class SalesInvoice(SellingController):
"debit_in_account_currency": base_grand_total "debit_in_account_currency": base_grand_total
if self.party_account_currency == self.company_currency if self.party_account_currency == self.company_currency
else grand_total, else grand_total,
"against_voucher": self.name, "against_voucher": self.name
if self.is_return and self.return_against and self.update_outstanding_for_self
else self.return_against,
"against_voucher_type": self.doctype, "against_voucher_type": self.doctype,
"cost_center": self.cost_center, "cost_center": self.cost_center,
"project": self.project, "project": self.project,