chore: resolve conflicts
This commit is contained in:
ruthra kumar
@@ -1605,15 +1605,6 @@
|
|||||||
"fieldtype": "Check",
|
"fieldtype": "Check",
|
||||||
"label": "Use Transaction Date Exchange Rate",
|
"label": "Use Transaction Date Exchange Rate",
|
||||||
"read_only": 1
|
"read_only": 1
|
||||||
<<<<<<< HEAD
|
|
||||||
=======
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fetch_from": "supplier.supplier_group",
|
|
||||||
"fieldname": "supplier_group",
|
|
||||||
"fieldtype": "Link",
|
|
||||||
"label": "Supplier Group",
|
|
||||||
"options": "Supplier Group"
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"default": "1",
|
"default": "1",
|
||||||
@@ -1622,7 +1613,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"
|
||||||
>>>>>>> 767f2157e6 (refactor: checkbox in purchase invoice)
|
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"icon": "fa fa-file-text",
|
"icon": "fa fa-file-text",
|
||||||
|
|||||||
@@ -54,181 +54,6 @@ form_grid_templates = {"items": "templates/form_grid/item_grid.html"}
|
|||||||
|
|
||||||
|
|
||||||
class PurchaseInvoice(BuyingController):
|
class PurchaseInvoice(BuyingController):
|
||||||
<<<<<<< HEAD
|
|
||||||
=======
|
|
||||||
# begin: auto-generated types
|
|
||||||
# This code is auto-generated. Do not modify anything in this block.
|
|
||||||
|
|
||||||
from typing import TYPE_CHECKING
|
|
||||||
|
|
||||||
if TYPE_CHECKING:
|
|
||||||
from frappe.types import DF
|
|
||||||
|
|
||||||
from erpnext.accounts.doctype.advance_tax.advance_tax import AdvanceTax
|
|
||||||
from erpnext.accounts.doctype.payment_schedule.payment_schedule import PaymentSchedule
|
|
||||||
from erpnext.accounts.doctype.pricing_rule_detail.pricing_rule_detail import PricingRuleDetail
|
|
||||||
from erpnext.accounts.doctype.purchase_invoice_advance.purchase_invoice_advance import (
|
|
||||||
PurchaseInvoiceAdvance,
|
|
||||||
)
|
|
||||||
from erpnext.accounts.doctype.purchase_invoice_item.purchase_invoice_item import (
|
|
||||||
PurchaseInvoiceItem,
|
|
||||||
)
|
|
||||||
from erpnext.accounts.doctype.purchase_taxes_and_charges.purchase_taxes_and_charges import (
|
|
||||||
PurchaseTaxesandCharges,
|
|
||||||
)
|
|
||||||
from erpnext.accounts.doctype.tax_withheld_vouchers.tax_withheld_vouchers import (
|
|
||||||
TaxWithheldVouchers,
|
|
||||||
)
|
|
||||||
from erpnext.buying.doctype.purchase_receipt_item_supplied.purchase_receipt_item_supplied import (
|
|
||||||
PurchaseReceiptItemSupplied,
|
|
||||||
)
|
|
||||||
|
|
||||||
additional_discount_percentage: DF.Float
|
|
||||||
address_display: DF.SmallText | None
|
|
||||||
advance_tax: DF.Table[AdvanceTax]
|
|
||||||
advances: DF.Table[PurchaseInvoiceAdvance]
|
|
||||||
against_expense_account: DF.SmallText | None
|
|
||||||
allocate_advances_automatically: DF.Check
|
|
||||||
amended_from: DF.Link | None
|
|
||||||
apply_discount_on: DF.Literal["", "Grand Total", "Net Total"]
|
|
||||||
apply_tds: DF.Check
|
|
||||||
auto_repeat: DF.Link | None
|
|
||||||
base_discount_amount: DF.Currency
|
|
||||||
base_grand_total: DF.Currency
|
|
||||||
base_in_words: DF.Data | None
|
|
||||||
base_net_total: DF.Currency
|
|
||||||
base_paid_amount: DF.Currency
|
|
||||||
base_rounded_total: DF.Currency
|
|
||||||
base_rounding_adjustment: DF.Currency
|
|
||||||
base_tax_withholding_net_total: DF.Currency
|
|
||||||
base_taxes_and_charges_added: DF.Currency
|
|
||||||
base_taxes_and_charges_deducted: DF.Currency
|
|
||||||
base_total: DF.Currency
|
|
||||||
base_total_taxes_and_charges: DF.Currency
|
|
||||||
base_write_off_amount: DF.Currency
|
|
||||||
bill_date: DF.Date | None
|
|
||||||
bill_no: DF.Data | None
|
|
||||||
billing_address: DF.Link | None
|
|
||||||
billing_address_display: DF.SmallText | None
|
|
||||||
buying_price_list: DF.Link | None
|
|
||||||
cash_bank_account: DF.Link | None
|
|
||||||
clearance_date: DF.Date | None
|
|
||||||
company: DF.Link | None
|
|
||||||
contact_display: DF.SmallText | None
|
|
||||||
contact_email: DF.SmallText | None
|
|
||||||
contact_mobile: DF.SmallText | None
|
|
||||||
contact_person: DF.Link | None
|
|
||||||
conversion_rate: DF.Float
|
|
||||||
cost_center: DF.Link | None
|
|
||||||
credit_to: DF.Link
|
|
||||||
currency: DF.Link | None
|
|
||||||
disable_rounded_total: DF.Check
|
|
||||||
discount_amount: DF.Currency
|
|
||||||
due_date: DF.Date | None
|
|
||||||
from_date: DF.Date | None
|
|
||||||
grand_total: DF.Currency
|
|
||||||
group_same_items: DF.Check
|
|
||||||
hold_comment: DF.SmallText | None
|
|
||||||
ignore_default_payment_terms_template: DF.Check
|
|
||||||
ignore_pricing_rule: DF.Check
|
|
||||||
in_words: DF.Data | None
|
|
||||||
incoterm: DF.Link | None
|
|
||||||
inter_company_invoice_reference: DF.Link | None
|
|
||||||
is_internal_supplier: DF.Check
|
|
||||||
is_old_subcontracting_flow: DF.Check
|
|
||||||
is_opening: DF.Literal["No", "Yes"]
|
|
||||||
is_paid: DF.Check
|
|
||||||
is_return: DF.Check
|
|
||||||
is_subcontracted: DF.Check
|
|
||||||
items: DF.Table[PurchaseInvoiceItem]
|
|
||||||
language: DF.Data | None
|
|
||||||
letter_head: DF.Link | None
|
|
||||||
mode_of_payment: DF.Link | None
|
|
||||||
named_place: DF.Data | None
|
|
||||||
naming_series: DF.Literal["ACC-PINV-.YYYY.-", "ACC-PINV-RET-.YYYY.-"]
|
|
||||||
net_total: DF.Currency
|
|
||||||
on_hold: DF.Check
|
|
||||||
only_include_allocated_payments: DF.Check
|
|
||||||
other_charges_calculation: DF.LongText | None
|
|
||||||
outstanding_amount: DF.Currency
|
|
||||||
paid_amount: DF.Currency
|
|
||||||
party_account_currency: DF.Link | None
|
|
||||||
payment_schedule: DF.Table[PaymentSchedule]
|
|
||||||
payment_terms_template: DF.Link | None
|
|
||||||
per_received: DF.Percent
|
|
||||||
plc_conversion_rate: DF.Float
|
|
||||||
posting_date: DF.Date
|
|
||||||
posting_time: DF.Time | None
|
|
||||||
price_list_currency: DF.Link | None
|
|
||||||
pricing_rules: DF.Table[PricingRuleDetail]
|
|
||||||
project: DF.Link | None
|
|
||||||
rejected_warehouse: DF.Link | None
|
|
||||||
release_date: DF.Date | None
|
|
||||||
remarks: DF.SmallText | None
|
|
||||||
repost_required: DF.Check
|
|
||||||
represents_company: DF.Link | None
|
|
||||||
return_against: DF.Link | None
|
|
||||||
rounded_total: DF.Currency
|
|
||||||
rounding_adjustment: DF.Currency
|
|
||||||
scan_barcode: DF.Data | None
|
|
||||||
select_print_heading: DF.Link | None
|
|
||||||
set_from_warehouse: DF.Link | None
|
|
||||||
set_posting_time: DF.Check
|
|
||||||
set_warehouse: DF.Link | None
|
|
||||||
shipping_address: DF.Link | None
|
|
||||||
shipping_address_display: DF.SmallText | None
|
|
||||||
shipping_rule: DF.Link | None
|
|
||||||
status: DF.Literal[
|
|
||||||
"",
|
|
||||||
"Draft",
|
|
||||||
"Return",
|
|
||||||
"Debit Note Issued",
|
|
||||||
"Submitted",
|
|
||||||
"Paid",
|
|
||||||
"Partly Paid",
|
|
||||||
"Unpaid",
|
|
||||||
"Overdue",
|
|
||||||
"Cancelled",
|
|
||||||
"Internal Transfer",
|
|
||||||
]
|
|
||||||
subscription: DF.Link | None
|
|
||||||
supplied_items: DF.Table[PurchaseReceiptItemSupplied]
|
|
||||||
supplier: DF.Link
|
|
||||||
supplier_address: DF.Link | None
|
|
||||||
supplier_group: DF.Link | None
|
|
||||||
supplier_name: DF.Data | None
|
|
||||||
supplier_warehouse: DF.Link | None
|
|
||||||
tax_category: DF.Link | None
|
|
||||||
tax_id: DF.ReadOnly | None
|
|
||||||
tax_withheld_vouchers: DF.Table[TaxWithheldVouchers]
|
|
||||||
tax_withholding_category: DF.Link | None
|
|
||||||
tax_withholding_net_total: DF.Currency
|
|
||||||
taxes: DF.Table[PurchaseTaxesandCharges]
|
|
||||||
taxes_and_charges: DF.Link | None
|
|
||||||
taxes_and_charges_added: DF.Currency
|
|
||||||
taxes_and_charges_deducted: DF.Currency
|
|
||||||
tc_name: DF.Link | None
|
|
||||||
terms: DF.TextEditor | None
|
|
||||||
title: DF.Data | None
|
|
||||||
to_date: DF.Date | None
|
|
||||||
total: DF.Currency
|
|
||||||
total_advance: DF.Currency
|
|
||||||
total_net_weight: DF.Float
|
|
||||||
total_qty: DF.Float
|
|
||||||
total_taxes_and_charges: DF.Currency
|
|
||||||
unrealized_profit_loss_account: DF.Link | None
|
|
||||||
update_billed_amount_in_purchase_order: DF.Check
|
|
||||||
update_billed_amount_in_purchase_receipt: DF.Check
|
|
||||||
update_outstanding_for_self: DF.Check
|
|
||||||
update_stock: DF.Check
|
|
||||||
use_company_roundoff_cost_center: DF.Check
|
|
||||||
use_transaction_date_exchange_rate: DF.Check
|
|
||||||
write_off_account: DF.Link | None
|
|
||||||
write_off_amount: DF.Currency
|
|
||||||
write_off_cost_center: DF.Link | None
|
|
||||||
# end: auto-generated types
|
|
||||||
|
|
||||||
>>>>>>> 767f2157e6 (refactor: checkbox in purchase invoice)
|
|
||||||
def __init__(self, *args, **kwargs):
|
def __init__(self, *args, **kwargs):
|
||||||
super(PurchaseInvoice, self).__init__(*args, **kwargs)
|
super(PurchaseInvoice, self).__init__(*args, **kwargs)
|
||||||
self.status_updater = [
|
self.status_updater = [
|
||||||
|
|||||||
@@ -2182,11 +2182,7 @@
|
|||||||
"link_fieldname": "consolidated_invoice"
|
"link_fieldname": "consolidated_invoice"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
<<<<<<< HEAD
|
|
||||||
"modified": "2024-01-02 17:25:46.027523",
|
|
||||||
=======
|
|
||||||
"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",
|
||||||
|
|||||||
@@ -49,194 +49,6 @@ form_grid_templates = {"items": "templates/form_grid/item_grid.html"}
|
|||||||
|
|
||||||
|
|
||||||
class SalesInvoice(SellingController):
|
class SalesInvoice(SellingController):
|
||||||
<<<<<<< HEAD
|
|
||||||
=======
|
|
||||||
# begin: auto-generated types
|
|
||||||
# This code is auto-generated. Do not modify anything in this block.
|
|
||||||
|
|
||||||
from typing import TYPE_CHECKING
|
|
||||||
|
|
||||||
if TYPE_CHECKING:
|
|
||||||
from frappe.types import DF
|
|
||||||
|
|
||||||
from erpnext.accounts.doctype.payment_schedule.payment_schedule import PaymentSchedule
|
|
||||||
from erpnext.accounts.doctype.pricing_rule_detail.pricing_rule_detail import PricingRuleDetail
|
|
||||||
from erpnext.accounts.doctype.sales_invoice_advance.sales_invoice_advance import (
|
|
||||||
SalesInvoiceAdvance,
|
|
||||||
)
|
|
||||||
from erpnext.accounts.doctype.sales_invoice_item.sales_invoice_item import SalesInvoiceItem
|
|
||||||
from erpnext.accounts.doctype.sales_invoice_payment.sales_invoice_payment import (
|
|
||||||
SalesInvoicePayment,
|
|
||||||
)
|
|
||||||
from erpnext.accounts.doctype.sales_invoice_timesheet.sales_invoice_timesheet import (
|
|
||||||
SalesInvoiceTimesheet,
|
|
||||||
)
|
|
||||||
from erpnext.accounts.doctype.sales_taxes_and_charges.sales_taxes_and_charges import (
|
|
||||||
SalesTaxesandCharges,
|
|
||||||
)
|
|
||||||
from erpnext.selling.doctype.sales_team.sales_team import SalesTeam
|
|
||||||
from erpnext.stock.doctype.packed_item.packed_item import PackedItem
|
|
||||||
|
|
||||||
account_for_change_amount: DF.Link | None
|
|
||||||
additional_discount_account: DF.Link | None
|
|
||||||
additional_discount_percentage: DF.Float
|
|
||||||
address_display: DF.SmallText | None
|
|
||||||
advances: DF.Table[SalesInvoiceAdvance]
|
|
||||||
against_income_account: DF.SmallText | None
|
|
||||||
allocate_advances_automatically: DF.Check
|
|
||||||
amended_from: DF.Link | None
|
|
||||||
amount_eligible_for_commission: DF.Currency
|
|
||||||
apply_discount_on: DF.Literal["", "Grand Total", "Net Total"]
|
|
||||||
auto_repeat: DF.Link | None
|
|
||||||
base_change_amount: DF.Currency
|
|
||||||
base_discount_amount: DF.Currency
|
|
||||||
base_grand_total: DF.Currency
|
|
||||||
base_in_words: DF.SmallText | None
|
|
||||||
base_net_total: DF.Currency
|
|
||||||
base_paid_amount: DF.Currency
|
|
||||||
base_rounded_total: DF.Currency
|
|
||||||
base_rounding_adjustment: DF.Currency
|
|
||||||
base_total: DF.Currency
|
|
||||||
base_total_taxes_and_charges: DF.Currency
|
|
||||||
base_write_off_amount: DF.Currency
|
|
||||||
campaign: DF.Link | None
|
|
||||||
cash_bank_account: DF.Link | None
|
|
||||||
change_amount: DF.Currency
|
|
||||||
commission_rate: DF.Float
|
|
||||||
company: DF.Link
|
|
||||||
company_address: DF.Link | None
|
|
||||||
company_address_display: DF.SmallText | None
|
|
||||||
company_tax_id: DF.Data | None
|
|
||||||
contact_display: DF.SmallText | None
|
|
||||||
contact_email: DF.Data | None
|
|
||||||
contact_mobile: DF.SmallText | None
|
|
||||||
contact_person: DF.Link | None
|
|
||||||
conversion_rate: DF.Float
|
|
||||||
cost_center: DF.Link | None
|
|
||||||
currency: DF.Link
|
|
||||||
customer: DF.Link | None
|
|
||||||
customer_address: DF.Link | None
|
|
||||||
customer_group: DF.Link | None
|
|
||||||
customer_name: DF.SmallText | None
|
|
||||||
debit_to: DF.Link
|
|
||||||
disable_rounded_total: DF.Check
|
|
||||||
discount_amount: DF.Currency
|
|
||||||
dispatch_address: DF.SmallText | None
|
|
||||||
dispatch_address_name: DF.Link | None
|
|
||||||
dont_create_loyalty_points: DF.Check
|
|
||||||
due_date: DF.Date | None
|
|
||||||
from_date: DF.Date | None
|
|
||||||
grand_total: DF.Currency
|
|
||||||
group_same_items: DF.Check
|
|
||||||
ignore_default_payment_terms_template: DF.Check
|
|
||||||
ignore_pricing_rule: DF.Check
|
|
||||||
in_words: DF.SmallText | None
|
|
||||||
incoterm: DF.Link | None
|
|
||||||
inter_company_invoice_reference: DF.Link | None
|
|
||||||
is_cash_or_non_trade_discount: DF.Check
|
|
||||||
is_consolidated: DF.Check
|
|
||||||
is_debit_note: DF.Check
|
|
||||||
is_discounted: DF.Check
|
|
||||||
is_internal_customer: DF.Check
|
|
||||||
is_opening: DF.Literal["No", "Yes"]
|
|
||||||
is_pos: DF.Check
|
|
||||||
is_return: DF.Check
|
|
||||||
items: DF.Table[SalesInvoiceItem]
|
|
||||||
language: DF.Data | None
|
|
||||||
letter_head: DF.Link | None
|
|
||||||
loyalty_amount: DF.Currency
|
|
||||||
loyalty_points: DF.Int
|
|
||||||
loyalty_program: DF.Link | None
|
|
||||||
loyalty_redemption_account: DF.Link | None
|
|
||||||
loyalty_redemption_cost_center: DF.Link | None
|
|
||||||
named_place: DF.Data | None
|
|
||||||
naming_series: DF.Literal["ACC-SINV-.YYYY.-", "ACC-SINV-RET-.YYYY.-"]
|
|
||||||
net_total: DF.Currency
|
|
||||||
only_include_allocated_payments: DF.Check
|
|
||||||
other_charges_calculation: DF.LongText | None
|
|
||||||
outstanding_amount: DF.Currency
|
|
||||||
packed_items: DF.Table[PackedItem]
|
|
||||||
paid_amount: DF.Currency
|
|
||||||
party_account_currency: DF.Link | None
|
|
||||||
payment_schedule: DF.Table[PaymentSchedule]
|
|
||||||
payment_terms_template: DF.Link | None
|
|
||||||
payments: DF.Table[SalesInvoicePayment]
|
|
||||||
plc_conversion_rate: DF.Float
|
|
||||||
po_date: DF.Date | None
|
|
||||||
po_no: DF.Data | None
|
|
||||||
pos_profile: DF.Link | None
|
|
||||||
posting_date: DF.Date
|
|
||||||
posting_time: DF.Time | None
|
|
||||||
price_list_currency: DF.Link
|
|
||||||
pricing_rules: DF.Table[PricingRuleDetail]
|
|
||||||
project: DF.Link | None
|
|
||||||
redeem_loyalty_points: DF.Check
|
|
||||||
remarks: DF.SmallText | None
|
|
||||||
repost_required: DF.Check
|
|
||||||
represents_company: DF.Link | None
|
|
||||||
return_against: DF.Link | None
|
|
||||||
rounded_total: DF.Currency
|
|
||||||
rounding_adjustment: DF.Currency
|
|
||||||
sales_partner: DF.Link | None
|
|
||||||
sales_team: DF.Table[SalesTeam]
|
|
||||||
scan_barcode: DF.Data | None
|
|
||||||
select_print_heading: DF.Link | None
|
|
||||||
selling_price_list: DF.Link
|
|
||||||
set_posting_time: DF.Check
|
|
||||||
set_target_warehouse: DF.Link | None
|
|
||||||
set_warehouse: DF.Link | None
|
|
||||||
shipping_address: DF.SmallText | None
|
|
||||||
shipping_address_name: DF.Link | None
|
|
||||||
shipping_rule: DF.Link | None
|
|
||||||
source: DF.Link | None
|
|
||||||
status: DF.Literal[
|
|
||||||
"",
|
|
||||||
"Draft",
|
|
||||||
"Return",
|
|
||||||
"Credit Note Issued",
|
|
||||||
"Submitted",
|
|
||||||
"Paid",
|
|
||||||
"Partly Paid",
|
|
||||||
"Unpaid",
|
|
||||||
"Unpaid and Discounted",
|
|
||||||
"Partly Paid and Discounted",
|
|
||||||
"Overdue and Discounted",
|
|
||||||
"Overdue",
|
|
||||||
"Cancelled",
|
|
||||||
"Internal Transfer",
|
|
||||||
]
|
|
||||||
subscription: DF.Link | None
|
|
||||||
tax_category: DF.Link | None
|
|
||||||
tax_id: DF.Data | None
|
|
||||||
taxes: DF.Table[SalesTaxesandCharges]
|
|
||||||
taxes_and_charges: DF.Link | None
|
|
||||||
tc_name: DF.Link | None
|
|
||||||
terms: DF.TextEditor | None
|
|
||||||
territory: DF.Link | None
|
|
||||||
timesheets: DF.Table[SalesInvoiceTimesheet]
|
|
||||||
title: DF.Data | None
|
|
||||||
to_date: DF.Date | None
|
|
||||||
total: DF.Currency
|
|
||||||
total_advance: DF.Currency
|
|
||||||
total_billing_amount: DF.Currency
|
|
||||||
total_billing_hours: DF.Float
|
|
||||||
total_commission: DF.Currency
|
|
||||||
total_net_weight: DF.Float
|
|
||||||
total_qty: DF.Float
|
|
||||||
total_taxes_and_charges: DF.Currency
|
|
||||||
unrealized_profit_loss_account: DF.Link | None
|
|
||||||
update_billed_amount_in_delivery_note: DF.Check
|
|
||||||
update_billed_amount_in_sales_order: DF.Check
|
|
||||||
update_outstanding_for_self: DF.Check
|
|
||||||
update_stock: DF.Check
|
|
||||||
use_company_roundoff_cost_center: DF.Check
|
|
||||||
write_off_account: DF.Link | None
|
|
||||||
write_off_amount: DF.Currency
|
|
||||||
write_off_cost_center: DF.Link | None
|
|
||||||
write_off_outstanding_amount_automatically: DF.Check
|
|
||||||
# end: auto-generated types
|
|
||||||
|
|
||||||
>>>>>>> 2cefe2a20e (refactor: checkbox to toggle always standalone credit note)
|
|
||||||
def __init__(self, *args, **kwargs):
|
def __init__(self, *args, **kwargs):
|
||||||
super(SalesInvoice, self).__init__(*args, **kwargs)
|
super(SalesInvoice, self).__init__(*args, **kwargs)
|
||||||
self.status_updater = [
|
self.status_updater = [
|
||||||
|
|||||||
@@ -203,21 +203,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(
|
||||||
@@ -229,7 +214,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"
|
||||||
|
|||||||
Reference in New Issue
Block a user