diff --git a/ns_app/print_formats/sales_invoice_ns/sales_invoice_ns.html b/ns_app/print_formats/sales_invoice_ns/sales_invoice_ns.html index 5f9c14c..80fbb99 100644 --- a/ns_app/print_formats/sales_invoice_ns/sales_invoice_ns.html +++ b/ns_app/print_formats/sales_invoice_ns/sales_invoice_ns.html @@ -1,5 +1,5 @@ + +
+ + {% set company_doc = frappe.get_doc("Company", company) %} + + + + + + + +
+

{{ company_doc.company_name }}

+

+ 1063 Chestnut Level Road, Quarryville PA 17566
+ {% if company_doc.address %}{{ company_doc.address }}
{% endif %} + {% if company_doc.phone_no %}Phone: {{ company_doc.phone_no }}{% endif %} + {% if company_doc.email %} | Email: {{ company_doc.email }}{% endif %} +

+ 		+ Sales Order
+ {{ doc.name }}
+ Date: {{ frappe.utils.formatdate(doc.transaction_date, "MM-dd-yyyy") }} +
+ + + + + + + +
+ {% if doc.delivery_date %} + Delivery Date: + {{ frappe.utils.formatdate(doc.delivery_date, "MM-dd-yyyy") }}
+ {% endif %} + Terms: {{ doc.payment_terms_template or "Net 30" }} +
+ + +
+ {{ doc.customer_name }}
+ {{ doc.address_display or doc.customer_address }} +
+ +
+ + {% if doc.custom_subscription_data or doc.custom_invoice_notes %} + + + + +
+ {% if doc.custom_subscription_data %} +
+ {{ doc.custom_subscription_data }} +
+ {% endif %} + {% if doc.custom_invoice_notes %} +
+ {{ doc.custom_invoice_notes }} +
+ {% endif %} +
+ {% endif %} + + + + + + + + + + + + + + {% for row in doc.items %} + + + + + + + + {% endfor %} + +
ItemDescriptionQtyRateAmount
+ {{ row.item_code }} + + {{ row.item_name }} + + {{ row.qty }} + + {{ row.rate }} + + {{ row.amount }} +
+ + + + + + + + + + + {% for tax in doc.taxes %} + + + + + {% endfor %} + + + + + + + +
+ Subtotal + + {{ doc.total }} +
+ {{ tax.account_head }} ({{ tax.rate }}%) + + {{ tax.tax_amount }} +
+ Total + + {{ doc.grand_total }} +
+ + +
+ + +
+

+This Sales Order is not an invoice. +Pricing and availability subject to confirmation. + +Thank you for your business. +

+
+ +
diff --git a/ns_app/print_formats/sales_invoice_ns/sales_order_ns.json b/ns_app/print_formats/sales_invoice_ns/sales_order_ns.json new file mode 100644 index 0000000..26319b4 --- /dev/null +++ b/ns_app/print_formats/sales_invoice_ns/sales_order_ns.json @@ -0,0 +1,8 @@ +{ + "doctype": "Print Format", + "name": "NS Sales Order", + "doc_type": "Sales Order", + "print_format_type": "Jinja", + "standard": "Yes", + "disabled": 0 +} diff --git a/ns_app/public/js/custom.js b/ns_app/public/js/custom.js index b1a99bc..4d174f4 100644 --- a/ns_app/public/js/custom.js +++ b/ns_app/public/js/custom.js @@ -40,7 +40,7 @@ frappe.ui.form.on("Customer", { // Defaults frm.set_value("territory", "United States"); - // Add Owner fields to Quick Entry + // Add Company fields to Quick Entry frm.add_custom_field({ fieldname: "company_name", label: "Company Name", @@ -50,7 +50,7 @@ frappe.ui.form.on("Customer", { }); }, - // ZIP auto-fill (kept from previous step) + // ZIP auto-fill pincode(frm) { if (!frm.is_quick_entry) return;