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

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2024-03-31 11:41:44 +05:30
committed by GitHub
parent b5629d2d4e
commit 9b8bb4d6a2
1 changed files with 0 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,98 +14,6 @@ form_grid_templates = {"items": "templates/form_grid/item_grid.html"}
class SupplierQuotation(BuyingController): 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.TextEditor | 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.TextEditor | 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.TextEditor | 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.TextEditor | 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
>>>>>>> 9828d34b19 (fix: markdown to text editor set for supplier quotation)
def validate(self): def validate(self):
super(SupplierQuotation, self).validate() super(SupplierQuotation, self).validate()