schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: use Text Editor for rendering tax breakup table

Browse Source 
(cherry picked from commit 1c63983873)

# Conflicts:
#	erpnext/accounts/doctype/pos_invoice/pos_invoice.py
#	erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.py
#	erpnext/buying/doctype/purchase_order/purchase_order.json
#	erpnext/buying/doctype/purchase_order/purchase_order.py
#	erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
#	erpnext/buying/doctype/supplier_quotation/supplier_quotation.py
#	erpnext/selling/doctype/quotation/quotation.json
#	erpnext/selling/doctype/quotation/quotation.py
#	erpnext/selling/doctype/sales_order/sales_order.py
#	erpnext/stock/doctype/delivery_note/delivery_note.json
#	erpnext/stock/doctype/delivery_note/delivery_note.py
#	erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
This commit is contained in:
Gursheen Anand
2024-03-20 16:09:14 +05:30
committed by Mergify
parent b6575176f7
commit 7df09d18e1
18 changed files with 1271 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/doctype/pos_invoice/pos_invoice.json
View File

@@ -774,7 +774,7 @@
},
{
"fieldname": "other_charges_calculation",
"fieldtype": "Long Text",
"fieldtype": "Text Editor",
"label": "Taxes and Charges Calculation",
"no_copy": 1,
"oldfieldtype": "HTML",
@@ -1562,7 +1562,7 @@
"icon": "fa fa-file-text",
"is_submittable": 1,
"links": [],
"modified": "2023-11-20 12:27:12.848149",
"modified": "2024-03-20 16:00:34.268756",
"modified_by": "Administrator",
"module": "Accounts",
"name": "POS Invoice",

166
erpnext/accounts/doctype/pos_invoice/pos_invoice.py
View File

@@ -26,6 +26,172 @@ from erpnext.stock.doctype.serial_no.serial_no import (
class POSInvoice(SalesInvoice):
<<<<<<< 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.pos_invoice_item.pos_invoice_item import POSInvoiceItem
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_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_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.Data | 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
consolidated_invoice: DF.Link | None
contact_display: DF.SmallText | None
contact_email: DF.Data | None
contact_mobile: DF.Data | None
contact_person: DF.Link | None
conversion_rate: DF.Float
cost_center: DF.Link | None
coupon_code: DF.Link | None
currency: DF.Link
customer: DF.Link | None
customer_address: DF.Link | None
customer_group: DF.Link | None
customer_name: DF.Data | None
debit_to: DF.Link
discount_amount: DF.Currency
due_date: DF.Date | None
from_date: DF.Date | None
grand_total: DF.Currency
group_same_items: DF.Check
ignore_pricing_rule: DF.Check
in_words: DF.Data | None
inter_company_invoice_reference: DF.Link | None
is_discounted: DF.Check
is_opening: DF.Literal["No", "Yes"]
is_pos: DF.Check
is_return: DF.Check
items: DF.Table[POSInvoiceItem]
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
naming_series: DF.Literal["ACC-PSINV-.YYYY.-"]
net_total: DF.Currency
other_charges_calculation: DF.TextEditor | 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
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_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",
"Consolidated",
"Submitted",
"Paid",
"Unpaid",
"Unpaid and Discounted",
"Overdue and Discounted",
"Overdue",
"Cancelled",
]
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_commission: DF.Currency
total_net_weight: DF.Float
total_qty: DF.Float
total_taxes_and_charges: DF.Currency
update_billed_amount_in_delivery_note: DF.Check
update_billed_amount_in_sales_order: DF.Check
update_stock: 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
>>>>>>> 1c63983873 (fix: use Text Editor for rendering tax breakup table)
def __init__(self, *args, **kwargs):
super(POSInvoice, self).__init__(*args, **kwargs)

4
erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
View File

@@ -756,7 +756,7 @@
},
{
"fieldname": "other_charges_calculation",
"fieldtype": "Long Text",
"fieldtype": "Text Editor",
"label": "Taxes and Charges Calculation",
"no_copy": 1,
"oldfieldtype": "HTML",
@@ -1619,7 +1619,7 @@
"idx": 204,
"is_submittable": 1,
"links": [],
"modified": "2024-03-11 14:46:30.298184",
"modified": "2024-03-20 15:57:00.736868",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Purchase Invoice",

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

@@ -54,6 +54,181 @@ form_grid_templates = {"items": "templates/form_grid/item_grid.html"}
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.TextEditor | 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
>>>>>>> 1c63983873 (fix: use Text Editor for rendering tax breakup table)
def __init__(self, *args, **kwargs):
super(PurchaseInvoice, self).__init__(*args, **kwargs)
self.status_updater = [

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

@@ -943,7 +943,7 @@
},
{
"fieldname": "other_charges_calculation",
"fieldtype": "Long Text",
"fieldtype": "Text Editor",
"hide_days": 1,
"hide_seconds": 1,
"label": "Taxes and Charges Calculation",
@@ -2183,7 +2183,7 @@
"link_fieldname": "consolidated_invoice"
}
],
"modified": "2024-03-15 16:44:17.778370",
"modified": "2024-03-20 16:02:52.237732",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Sales Invoice",
@@ -2238,4 +2238,4 @@
"title_field": "title",
"track_changes": 1,
"track_seen": 1
}
}

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

@@ -49,6 +49,194 @@ form_grid_templates = {"items": "templates/form_grid/item_grid.html"}
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.TextEditor | 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
>>>>>>> 1c63983873 (fix: use Text Editor for rendering tax breakup table)
def __init__(self, *args, **kwargs):
super(SalesInvoice, self).__init__(*args, **kwargs)
self.status_updater = [

6
erpnext/buying/doctype/purchase_order/purchase_order.json
View File

@@ -639,7 +639,7 @@
},
{
"fieldname": "other_charges_calculation",
"fieldtype": "Long Text",
"fieldtype": "Text Editor",
"label": "Taxes and Charges Calculation",
"no_copy": 1,
"oldfieldtype": "HTML",
@@ -1273,7 +1273,11 @@
"idx": 105,
"is_submittable": 1,
"links": [],
<<<<<<< HEAD
"modified": "2023-10-01 20:58:07.851037",
=======
"modified": "2024-03-20 16:03:31.611808",
>>>>>>> 1c63983873 (fix: use Text Editor for rendering tax breakup table)
"modified_by": "Administrator",
"module": "Buying",
"name": "Purchase Order",

135
erpnext/buying/doctype/purchase_order/purchase_order.py
View File

@@ -33,6 +33,141 @@ form_grid_templates = {"items": "templates/form_grid/item_grid.html"}
class PurchaseOrder(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.payment_schedule.payment_schedule import PaymentSchedule
from erpnext.accounts.doctype.pricing_rule_detail.pricing_rule_detail import PricingRuleDetail
from erpnext.accounts.doctype.purchase_taxes_and_charges.purchase_taxes_and_charges import (
PurchaseTaxesandCharges,
)
from erpnext.buying.doctype.purchase_order_item.purchase_order_item import PurchaseOrderItem
from erpnext.buying.doctype.purchase_order_item_supplied.purchase_order_item_supplied import (
PurchaseOrderItemSupplied,
)
additional_discount_percentage: DF.Float
address_display: DF.SmallText | None
advance_paid: DF.Currency
advance_payment_status: DF.Literal["Not Initiated", "Initiated", "Partially Paid", "Fully Paid"]
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_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
billing_address: DF.Link | None
billing_address_display: DF.SmallText | None
buying_price_list: DF.Link | None
company: DF.Link
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
currency: DF.Link
customer: DF.Link | None
customer_contact_display: DF.SmallText | None
customer_contact_email: DF.Code | None
customer_contact_mobile: DF.SmallText | None
customer_contact_person: DF.Link | None
customer_name: DF.Data | None
disable_rounded_total: DF.Check
discount_amount: DF.Currency
from_date: DF.Date | None
grand_total: DF.Currency
group_same_items: DF.Check
ignore_pricing_rule: DF.Check
in_words: DF.Data | None
incoterm: DF.Link | None
inter_company_order_reference: DF.Link | None
is_internal_supplier: DF.Check
is_old_subcontracting_flow: DF.Check
is_subcontracted: DF.Check
items: DF.Table[PurchaseOrderItem]
language: DF.Data | None
letter_head: DF.Link | None
named_place: DF.Data | None
naming_series: DF.Literal["PUR-ORD-.YYYY.-"]
net_total: DF.Currency
order_confirmation_date: DF.Date | None
order_confirmation_no: DF.Data | None
other_charges_calculation: DF.TextEditor | None
party_account_currency: DF.Link | None
payment_schedule: DF.Table[PaymentSchedule]
payment_terms_template: DF.Link | None
per_billed: DF.Percent
per_received: DF.Percent
plc_conversion_rate: DF.Float
price_list_currency: DF.Link | None
pricing_rules: DF.Table[PricingRuleDetail]
project: DF.Link | None
ref_sq: DF.Link | None
represents_company: DF.Link | None
rounded_total: DF.Currency
rounding_adjustment: DF.Currency
scan_barcode: DF.Data | None
schedule_date: DF.Date | None
select_print_heading: DF.Link | None
set_from_warehouse: DF.Link | None
set_reserve_warehouse: DF.Link | None
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",
"On Hold",
"To Receive and Bill",
"To Bill",
"To Receive",
"Completed",
"Cancelled",
"Closed",
"Delivered",
]
supplied_items: DF.Table[PurchaseOrderItemSupplied]
supplier: DF.Link
supplier_address: DF.Link | None
supplier_name: DF.Data | None
supplier_warehouse: DF.Link | None
tax_category: DF.Link | None
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
to_date: DF.Date | None
total: DF.Currency
total_net_weight: DF.Float
total_qty: DF.Float
total_taxes_and_charges: DF.Currency
transaction_date: DF.Date
# end: auto-generated types
>>>>>>> 1c63983873 (fix: use Text Editor for rendering tax breakup table)
def __init__(self, *args, **kwargs):
super(PurchaseOrder, self).__init__(*args, **kwargs)
self.status_updater = [

6
erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
View File

@@ -461,7 +461,7 @@
},
{
"fieldname": "other_charges_calculation",
"fieldtype": "Long Text",
"fieldtype": "Markdown Editor",
"label": "Taxes and Charges Calculation",
"no_copy": 1,
"oldfieldtype": "HTML",
@@ -927,7 +927,11 @@
"index_web_pages_for_search": 1,
"is_submittable": 1,
"links": [],
<<<<<<< HEAD
"modified": "2023-11-20 11:15:30.083077",
=======
"modified": "2024-03-20 16:03:59.069145",
>>>>>>> 1c63983873 (fix: use Text Editor for rendering tax breakup table)
"modified_by": "Administrator",
"module": "Buying",
"name": "Supplier Quotation",

92
erpnext/buying/doctype/supplier_quotation/supplier_quotation.py
View File

@@ -14,6 +14,98 @@ form_grid_templates = {"items": "templates/form_grid/item_grid.html"}
class SupplierQuotation(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.pricing_rule_detail.pricing_rule_detail import PricingRuleDetail
from erpnext.accounts.doctype.purchase_taxes_and_charges.purchase_taxes_and_charges import (
PurchaseTaxesandCharges,
)
from erpnext.buying.doctype.supplier_quotation_item.supplier_quotation_item import (
SupplierQuotationItem,
)
additional_discount_percentage: DF.Float
address_display: DF.SmallText | None
amended_from: DF.Link | None
apply_discount_on: DF.Literal["", "Grand Total", "Net Total"]
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_rounded_total: DF.Currency
base_rounding_adjustment: 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
billing_address: DF.Link | None
billing_address_display: DF.SmallText | None
buying_price_list: DF.Link | None
company: DF.Link
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
disable_rounded_total: DF.Check
discount_amount: DF.Currency
grand_total: DF.Currency
group_same_items: DF.Check
ignore_pricing_rule: DF.Check
in_words: DF.Data | None
incoterm: DF.Link | None
is_subcontracted: DF.Check
items: DF.Table[SupplierQuotationItem]
language: DF.Data | None
letter_head: DF.Link | None
named_place: DF.Data | None
naming_series: DF.Literal["PUR-SQTN-.YYYY.-"]
net_total: DF.Currency
opportunity: DF.Link | None
other_charges_calculation: DF.MarkdownEditor | None
plc_conversion_rate: DF.Float
price_list_currency: DF.Link | None
pricing_rules: DF.Table[PricingRuleDetail]
project: DF.Link | None
quotation_number: DF.Data | None
rounded_total: DF.Currency
rounding_adjustment: DF.Currency
select_print_heading: DF.Link | None
shipping_address: DF.Link | None
shipping_address_display: DF.SmallText | None
shipping_rule: DF.Link | None
status: DF.Literal["", "Draft", "Submitted", "Stopped", "Cancelled", "Expired"]
supplier: DF.Link
supplier_address: DF.Link | None
supplier_name: DF.Data | None
tax_category: DF.Link | None
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
total: DF.Currency
total_net_weight: DF.Float
total_qty: DF.Float
total_taxes_and_charges: DF.Currency
transaction_date: DF.Date
valid_till: DF.Date | None
# end: auto-generated types
>>>>>>> 1c63983873 (fix: use Text Editor for rendering tax breakup table)
def validate(self):
super(SupplierQuotation, self).validate()

6
erpnext/selling/doctype/quotation/quotation.json
View File

@@ -556,7 +556,7 @@
},
{
"fieldname": "other_charges_calculation",
"fieldtype": "Long Text",
"fieldtype": "Text Editor",
"label": "Taxes and Charges Calculation",
"no_copy": 1,
"oldfieldtype": "HTML",
@@ -1072,7 +1072,11 @@
"idx": 82,
"is_submittable": 1,
"links": [],
<<<<<<< HEAD
"modified": "2023-04-14 16:50:44.550098",
=======
"modified": "2024-03-20 16:04:21.567847",
>>>>>>> 1c63983873 (fix: use Text Editor for rendering tax breakup table)
"modified_by": "Administrator",
"module": "Selling",
"name": "Quotation",

106
erpnext/selling/doctype/quotation/quotation.py
View File

@@ -13,6 +13,112 @@ form_grid_templates = {"items": "templates/form_grid/item_grid.html"}
class Quotation(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_taxes_and_charges.sales_taxes_and_charges import (
SalesTaxesandCharges,
)
from erpnext.crm.doctype.competitor_detail.competitor_detail import CompetitorDetail
from erpnext.selling.doctype.quotation_item.quotation_item import QuotationItem
from erpnext.setup.doctype.quotation_lost_reason_detail.quotation_lost_reason_detail import (
QuotationLostReasonDetail,
)
from erpnext.stock.doctype.packed_item.packed_item import PackedItem
additional_discount_percentage: DF.Float
address_display: DF.SmallText | None
amended_from: DF.Link | None
apply_discount_on: DF.Literal["", "Grand Total", "Net Total"]
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_rounded_total: DF.Currency
base_rounding_adjustment: DF.Currency
base_total: DF.Currency
base_total_taxes_and_charges: DF.Currency
campaign: DF.Link | None
company: DF.Link
company_address: DF.Link | None
company_address_display: DF.SmallText | None
competitors: DF.TableMultiSelect[CompetitorDetail]
contact_display: DF.SmallText | None
contact_email: DF.Data | None
contact_mobile: DF.SmallText | None
contact_person: DF.Link | None
conversion_rate: DF.Float
coupon_code: DF.Link | None
currency: DF.Link
customer_address: DF.Link | None
customer_group: DF.Link | None
customer_name: DF.Data | None
discount_amount: DF.Currency
enq_det: DF.Text | None
grand_total: DF.Currency
group_same_items: DF.Check
ignore_pricing_rule: DF.Check
in_words: DF.Data | None
incoterm: DF.Link | None
items: DF.Table[QuotationItem]
language: DF.Data | None
letter_head: DF.Link | None
lost_reasons: DF.TableMultiSelect[QuotationLostReasonDetail]
named_place: DF.Data | None
naming_series: DF.Literal["SAL-QTN-.YYYY.-"]
net_total: DF.Currency
opportunity: DF.Link | None
order_lost_reason: DF.SmallText | None
order_type: DF.Literal["", "Sales", "Maintenance", "Shopping Cart"]
other_charges_calculation: DF.TextEditor | None
packed_items: DF.Table[PackedItem]
party_name: DF.DynamicLink | None
payment_schedule: DF.Table[PaymentSchedule]
payment_terms_template: DF.Link | None
plc_conversion_rate: DF.Float
price_list_currency: DF.Link
pricing_rules: DF.Table[PricingRuleDetail]
quotation_to: DF.Link
referral_sales_partner: DF.Link | None
rounded_total: DF.Currency
rounding_adjustment: DF.Currency
scan_barcode: DF.Data | None
select_print_heading: DF.Link | None
selling_price_list: DF.Link
shipping_address: DF.SmallText | None
shipping_address_name: DF.Link | None
shipping_rule: DF.Link | None
source: DF.Link | None
status: DF.Literal[
"Draft", "Open", "Replied", "Partially Ordered", "Ordered", "Lost", "Cancelled", "Expired"
]
supplier_quotation: DF.Link | None
tax_category: DF.Link | None
taxes: DF.Table[SalesTaxesandCharges]
taxes_and_charges: DF.Link | None
tc_name: DF.Link | None
terms: DF.TextEditor | None
territory: DF.Link | None
title: DF.Data | None
total: DF.Currency
total_net_weight: DF.Float
total_qty: DF.Float
total_taxes_and_charges: DF.Currency
transaction_date: DF.Date
valid_till: DF.Date | None
# end: auto-generated types
>>>>>>> 1c63983873 (fix: use Text Editor for rendering tax breakup table)
def set_indicator(self):
if self.docstatus == 1:
self.indicator_color = "blue"

4
erpnext/selling/doctype/sales_order/sales_order.json
View File

@@ -774,7 +774,7 @@
},
{
"fieldname": "other_charges_calculation",
"fieldtype": "Long Text",
"fieldtype": "Text Editor",
"hide_days": 1,
"hide_seconds": 1,
"label": "Taxes and Charges Calculation",
@@ -1631,7 +1631,7 @@
"idx": 105,
"is_submittable": 1,
"links": [],
"modified": "2023-10-18 12:41:54.813462",
"modified": "2024-03-20 16:04:43.627183",
"modified_by": "Administrator",
"module": "Selling",
"name": "Sales Order",

138
erpnext/selling/doctype/sales_order/sales_order.py
View File

@@ -41,6 +41,144 @@ class WarehouseRequired(frappe.ValidationError):
class SalesOrder(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_taxes_and_charges.sales_taxes_and_charges import (
SalesTaxesandCharges,
)
from erpnext.selling.doctype.sales_order_item.sales_order_item import SalesOrderItem
from erpnext.selling.doctype.sales_team.sales_team import SalesTeam
from erpnext.stock.doctype.packed_item.packed_item import PackedItem
additional_discount_percentage: DF.Float
address_display: DF.SmallText | None
advance_paid: DF.Currency
advance_payment_status: DF.Literal["Not Requested", "Requested", "Partially Paid", "Fully Paid"]
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_discount_amount: DF.Currency
base_grand_total: DF.Currency
base_in_words: DF.Data | None
base_net_total: DF.Currency
base_rounded_total: DF.Currency
base_rounding_adjustment: DF.Currency
base_total: DF.Currency
base_total_taxes_and_charges: DF.Currency
billing_status: DF.Literal["Not Billed", "Fully Billed", "Partly Billed", "Closed"]
campaign: DF.Link | None
commission_rate: DF.Float
company: DF.Link
company_address: DF.Link | None
company_address_display: DF.SmallText | None
contact_display: DF.SmallText | None
contact_email: DF.Data | None
contact_mobile: DF.SmallText | None
contact_person: DF.Link | None
contact_phone: DF.Data | None
conversion_rate: DF.Float
cost_center: DF.Link | None
coupon_code: DF.Link | None
currency: DF.Link
customer: DF.Link
customer_address: DF.Link | None
customer_group: DF.Link | None
customer_name: DF.Data | None
delivery_date: DF.Date | None
delivery_status: DF.Literal[
"Not Delivered", "Fully Delivered", "Partly Delivered", "Closed", "Not Applicable"
]
disable_rounded_total: DF.Check
discount_amount: DF.Currency
dispatch_address: DF.SmallText | None
dispatch_address_name: DF.Link | None
from_date: DF.Date | None
grand_total: DF.Currency
group_same_items: DF.Check
ignore_pricing_rule: DF.Check
in_words: DF.Data | None
incoterm: DF.Link | None
inter_company_order_reference: DF.Link | None
is_internal_customer: DF.Check
items: DF.Table[SalesOrderItem]
language: DF.Data | None
letter_head: DF.Link | None
loyalty_amount: DF.Currency
loyalty_points: DF.Int
named_place: DF.Data | None
naming_series: DF.Literal["SAL-ORD-.YYYY.-"]
net_total: DF.Currency
order_type: DF.Literal["", "Sales", "Maintenance", "Shopping Cart"]
other_charges_calculation: DF.TextEditor | None
packed_items: DF.Table[PackedItem]
party_account_currency: DF.Link | None
payment_schedule: DF.Table[PaymentSchedule]
payment_terms_template: DF.Link | None
per_billed: DF.Percent
per_delivered: DF.Percent
per_picked: DF.Percent
plc_conversion_rate: DF.Float
po_date: DF.Date | None
po_no: DF.Data | None
price_list_currency: DF.Link
pricing_rules: DF.Table[PricingRuleDetail]
project: DF.Link | None
represents_company: DF.Link | None
reserve_stock: DF.Check
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_warehouse: DF.Link | None
shipping_address: DF.SmallText | None
shipping_address_name: DF.Link | None
shipping_rule: DF.Link | None
skip_delivery_note: DF.Check
source: DF.Link | None
status: DF.Literal[
"",
"Draft",
"On Hold",
"To Pay",
"To Deliver and Bill",
"To Bill",
"To Deliver",
"Completed",
"Cancelled",
"Closed",
]
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
title: DF.Data | None
to_date: DF.Date | None
total: DF.Currency
total_commission: DF.Currency
total_net_weight: DF.Float
total_qty: DF.Float
total_taxes_and_charges: DF.Currency
transaction_date: DF.Date
# end: auto-generated types
>>>>>>> 1c63983873 (fix: use Text Editor for rendering tax breakup table)
def __init__(self, *args, **kwargs):
super(SalesOrder, self).__init__(*args, **kwargs)

6
erpnext/stock/doctype/delivery_note/delivery_note.json
View File

@@ -680,7 +680,7 @@
},
{
"fieldname": "other_charges_calculation",
"fieldtype": "Long Text",
"fieldtype": "Text Editor",
"label": "Taxes and Charges Calculation",
"no_copy": 1,
"oldfieldtype": "HTML",
@@ -1401,7 +1401,11 @@
"idx": 146,
"is_submittable": 1,
"links": [],
<<<<<<< HEAD
"modified": "2023-12-18 17:19:39.368239",
=======
"modified": "2024-03-20 16:05:02.854990",
>>>>>>> 1c63983873 (fix: use Text Editor for rendering tax breakup table)
"modified_by": "Administrator",
"module": "Stock",
"name": "Delivery Note",

125
erpnext/stock/doctype/delivery_note/delivery_note.py
View File

@@ -19,6 +19,131 @@ form_grid_templates = {"items": "templates/form_grid/item_grid.html"}
class DeliveryNote(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.pricing_rule_detail.pricing_rule_detail import PricingRuleDetail
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.delivery_note_item.delivery_note_item import DeliveryNoteItem
from erpnext.stock.doctype.packed_item.packed_item import PackedItem
additional_discount_percentage: DF.Float
address_display: DF.SmallText | None
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_discount_amount: DF.Currency
base_grand_total: DF.Currency
base_in_words: DF.Data | None
base_net_total: DF.Currency
base_rounded_total: DF.Currency
base_rounding_adjustment: DF.Currency
base_total: DF.Currency
base_total_taxes_and_charges: DF.Currency
campaign: DF.Link | None
commission_rate: DF.Float
company: DF.Link
company_address: DF.Link | None
company_address_display: DF.SmallText | 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
customer_address: DF.Link | None
customer_group: DF.Link | None
customer_name: DF.Data | None
disable_rounded_total: DF.Check
discount_amount: DF.Currency
dispatch_address: DF.SmallText | None
dispatch_address_name: DF.Link | None
driver: DF.Link | None
driver_name: DF.Data | None
excise_page: DF.Data | None
grand_total: DF.Currency
group_same_items: DF.Check
ignore_pricing_rule: DF.Check
in_words: DF.Data | None
incoterm: DF.Link | None
installation_status: DF.Literal[None]
instructions: DF.Text | None
inter_company_reference: DF.Link | None
is_internal_customer: DF.Check
is_return: DF.Check
issue_credit_note: DF.Check
items: DF.Table[DeliveryNoteItem]
language: DF.Data | None
letter_head: DF.Link | None
lr_date: DF.Date | None
lr_no: DF.Data | None
named_place: DF.Data | None
naming_series: DF.Literal["MAT-DN-.YYYY.-", "MAT-DN-RET-.YYYY.-"]
net_total: DF.Currency
other_charges_calculation: DF.TextEditor | None
packed_items: DF.Table[PackedItem]
per_billed: DF.Percent
per_installed: DF.Percent
per_returned: DF.Percent
pick_list: DF.Link | None
plc_conversion_rate: DF.Float
po_date: DF.Date | None
po_no: DF.SmallText | None
posting_date: DF.Date
posting_time: DF.Time
price_list_currency: DF.Link
pricing_rules: DF.Table[PricingRuleDetail]
print_without_amount: DF.Check
project: DF.Link | None
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", "To Bill", "Completed", "Return Issued", "Cancelled", "Closed"]
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
title: DF.Data | None
total: DF.Currency
total_commission: DF.Currency
total_net_weight: DF.Float
total_qty: DF.Float
total_taxes_and_charges: DF.Currency
transporter: DF.Link | None
transporter_name: DF.Data | None
vehicle_no: DF.Data | None
# end: auto-generated types
>>>>>>> 1c63983873 (fix: use Text Editor for rendering tax breakup table)
def __init__(self, *args, **kwargs):
super(DeliveryNote, self).__init__(*args, **kwargs)
self.status_updater = [

4
erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
View File

@@ -649,7 +649,7 @@
},
{
"fieldname": "other_charges_calculation",
"fieldtype": "Long Text",
"fieldtype": "Text Editor",
"label": "Taxes and Charges Calculation",
"no_copy": 1,
"oldfieldtype": "HTML",
@@ -1242,7 +1242,7 @@
"idx": 261,
"is_submittable": 1,
"links": [],
"modified": "2023-12-18 17:26:41.279663",
"modified": "2024-03-20 16:05:31.713453",
"modified_by": "Administrator",
"module": "Stock",
"name": "Purchase Receipt",

115
erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
View File

@@ -21,6 +21,121 @@ form_grid_templates = {"items": "templates/form_grid/item_grid.html"}
class PurchaseReceipt(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.pricing_rule_detail.pricing_rule_detail import PricingRuleDetail
from erpnext.accounts.doctype.purchase_taxes_and_charges.purchase_taxes_and_charges import (
PurchaseTaxesandCharges,
)
from erpnext.buying.doctype.purchase_receipt_item_supplied.purchase_receipt_item_supplied import (
PurchaseReceiptItemSupplied,
)
from erpnext.stock.doctype.purchase_receipt_item.purchase_receipt_item import PurchaseReceiptItem
additional_discount_percentage: DF.Float
address_display: DF.SmallText | None
amended_from: DF.Link | None
apply_discount_on: DF.Literal["", "Grand Total", "Net Total"]
apply_putaway_rule: 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_rounded_total: DF.Currency
base_rounding_adjustment: 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
billing_address: DF.Link | None
billing_address_display: DF.SmallText | None
buying_price_list: DF.Link | None
company: DF.Link
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
currency: DF.Link
disable_rounded_total: DF.Check
discount_amount: DF.Currency
grand_total: DF.Currency
group_same_items: DF.Check
ignore_pricing_rule: DF.Check
in_words: DF.Data | None
incoterm: DF.Link | None
instructions: DF.SmallText | None
inter_company_reference: DF.Link | None
is_internal_supplier: DF.Check
is_old_subcontracting_flow: DF.Check
is_return: DF.Check
is_subcontracted: DF.Check
items: DF.Table[PurchaseReceiptItem]
language: DF.Data | None
letter_head: DF.Link | None
lr_date: DF.Date | None
lr_no: DF.Data | None
named_place: DF.Data | None
naming_series: DF.Literal["MAT-PRE-.YYYY.-", "MAT-PR-RET-.YYYY.-"]
net_total: DF.Currency
other_charges_calculation: DF.TextEditor | None
per_billed: DF.Percent
per_returned: DF.Percent
plc_conversion_rate: DF.Float
posting_date: DF.Date
posting_time: DF.Time
price_list_currency: DF.Link | None
pricing_rules: DF.Table[PricingRuleDetail]
project: DF.Link | None
range: DF.Data | None
rejected_warehouse: DF.Link | None
remarks: DF.SmallText | None
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", "To Bill", "Completed", "Return Issued", "Cancelled", "Closed"]
subcontracting_receipt: DF.Link | None
supplied_items: DF.Table[PurchaseReceiptItemSupplied]
supplier: DF.Link
supplier_address: DF.Link | None
supplier_delivery_note: DF.Data | None
supplier_name: DF.Data | None
supplier_warehouse: DF.Link | None
tax_category: DF.Link | None
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
total: DF.Currency
total_net_weight: DF.Float
total_qty: DF.Float
total_taxes_and_charges: DF.Currency
transporter_name: DF.Data | None
# end: auto-generated types
>>>>>>> 1c63983873 (fix: use Text Editor for rendering tax breakup table)
def __init__(self, *args, **kwargs):
super(PurchaseReceipt, self).__init__(*args, **kwargs)
self.status_updater = [