nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 16:34:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
ruthra kumar
2024-03-13 12:16:44 +05:30
parent d87b98d945
commit 1093e0d46f
3 changed files with 0 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2163,16 +2163,6 @@
"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", "default": "1",
@@ -2181,7 +2171,6 @@
"fieldname": "update_outstanding_for_self", "fieldname": "update_outstanding_for_self",
"fieldtype": "Check", "fieldtype": "Check",
"label": "Update Outstanding for Self" "label": "Update Outstanding for Self"
>>>>>>> 2cefe2a20e (refactor: checkbox to toggle always standalone credit note)
} }
], ],
"icon": "fa fa-file-text", "icon": "fa fa-file-text",
@@ -2194,11 +2183,7 @@
"link_fieldname": "consolidated_invoice" "link_fieldname": "consolidated_invoice"
} }
], ],
<<<<<<< HEAD
"modified": "2023-11-23 16:56:29.679499",
=======
"modified": "2024-03-11 14:20:34.874192", "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",

16
erpnext/controllers/accounts_controller.py
View File

@@ -218,21 +218,6 @@ class AccountsController(TransactionBase):
) )
if self.get("is_return") and self.get("return_against") and not self.get("is_pos"): if self.get("is_return") and self.get("return_against") and not self.get("is_pos"):
<<<<<<< HEAD
document_type = "Credit Note" if self.doctype == "Sales Invoice" else "Debit Note"
frappe.msgprint(
_(
"{0} will be treated as a standalone {0}. If you want {1}'s outstanding to be updated, uncheck {2} checkbox. <br><br> Or you can use {3} tool to reconcile against {1} later."
).format(
document_type,
<<<<<<< HEAD
get_link_to_form("Payment Reconciliation", "Payment Reconciliation"),
=======
>>>>>>> adf13a19c4 (chore: update popup message)
get_link_to_form(self.doctype, self.get("return_against")),
frappe.bold("Update Outstanding for Self"),
get_link_to_form("Payment Reconciliation"),
=======
if self.get("update_outstanding_for_self"): if self.get("update_outstanding_for_self"):
document_type = "Credit Note" if self.doctype == "Sales Invoice" else "Debit Note" document_type = "Credit Note" if self.doctype == "Sales Invoice" else "Debit Note"
frappe.msgprint( frappe.msgprint(
@@ -244,7 +229,6 @@ class AccountsController(TransactionBase):
frappe.bold("Update Outstanding for Self"), frappe.bold("Update Outstanding for Self"),
get_link_to_form("Payment Reconciliation"), get_link_to_form("Payment Reconciliation"),
) )
>>>>>>> 445d2acf50 (chore: better popup message)
) )
pos_check_field = "is_pos" if self.doctype == "Sales Invoice" else "is_paid" pos_check_field = "is_pos" if self.doctype == "Sales Invoice" else "is_paid"

3
erpnext/patches.txt
View File

@@ -353,11 +353,8 @@ erpnext.patches.v14_0.update_zero_asset_quantity_field
execute:frappe.db.set_single_value("Buying Settings", "project_update_frequency", "Each Transaction") execute:frappe.db.set_single_value("Buying Settings", "project_update_frequency", "Each Transaction")
erpnext.patches.v14_0.update_total_asset_cost_field erpnext.patches.v14_0.update_total_asset_cost_field
erpnext.patches.v14_0.create_accounting_dimensions_in_reconciliation_tool erpnext.patches.v14_0.create_accounting_dimensions_in_reconciliation_tool
<<<<<<< HEAD
erpnext.patches.v15_0.allow_on_submit_dimensions_for_repostable_doctypes erpnext.patches.v15_0.allow_on_submit_dimensions_for_repostable_doctypes
=======
erpnext.patches.v14_0.update_flag_for_return_invoices erpnext.patches.v14_0.update_flag_for_return_invoices
>>>>>>> 849f478894 (chore: patch for updating flag in Cr/Dr notes)
# below migration patch should always run last # below migration patch should always run last
erpnext.patches.v14_0.migrate_gl_to_payment_ledger erpnext.patches.v14_0.migrate_gl_to_payment_ledger
erpnext.stock.doctype.delivery_note.patches.drop_unused_return_against_index # 2023-12-20 erpnext.stock.doctype.delivery_note.patches.drop_unused_return_against_index # 2023-12-20