Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
diff --git a/accounts/doctype/sales_invoice/sales_invoice.txt b/accounts/doctype/sales_invoice/sales_invoice.txt
index c69cda1..f5eb356 100644
--- a/accounts/doctype/sales_invoice/sales_invoice.txt
+++ b/accounts/doctype/sales_invoice/sales_invoice.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-05-24 19:29:05",
"docstatus": 0,
- "modified": "2013-06-05 14:42:44",
+ "modified": "2013-06-05 18:53:03",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -49,15 +49,6 @@
"read_only": 0
},
{
- "doctype": "DocField",
- "fieldname": "column_break0",
- "fieldtype": "Column Break",
- "oldfieldtype": "Column Break",
- "print_hide": 0,
- "read_only": 0,
- "width": "50%"
- },
- {
"description": "To manage multiple series please go to Setup > Manage Series",
"doctype": "DocField",
"fieldname": "naming_series",
@@ -72,26 +63,6 @@
"reqd": 1
},
{
- "doctype": "DocField",
- "fieldname": "is_pos",
- "fieldtype": "Check",
- "label": "Is POS",
- "oldfieldname": "is_pos",
- "oldfieldtype": "Check",
- "print_hide": 1,
- "read_only": 0
- },
- {
- "doctype": "DocField",
- "fieldname": "update_stock",
- "fieldtype": "Check",
- "label": "Update Stock",
- "oldfieldname": "update_stock",
- "oldfieldtype": "Check",
- "print_hide": 1,
- "read_only": 0
- },
- {
"description": "The account to which you will pay (have paid) the money to.",
"doctype": "DocField",
"fieldname": "debit_to",
@@ -176,6 +147,32 @@
"read_only": 0
},
{
+ "doctype": "DocField",
+ "fieldname": "amended_from",
+ "fieldtype": "Link",
+ "label": "Amended From",
+ "no_copy": 1,
+ "oldfieldname": "amended_from",
+ "oldfieldtype": "Link",
+ "options": "Sales Invoice",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "company",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "label": "Company",
+ "oldfieldname": "company",
+ "oldfieldtype": "Link",
+ "options": "Company",
+ "print_hide": 1,
+ "read_only": 0,
+ "reqd": 1,
+ "search_index": 0
+ },
+ {
"default": "Today",
"description": "The date at which current entry will get or has actually executed.",
"doctype": "DocField",
@@ -211,6 +208,7 @@
"fieldname": "mode_of_payment",
"fieldtype": "Select",
"label": "Mode of Payment",
+ "no_copy": 0,
"oldfieldname": "mode_of_payment",
"oldfieldtype": "Select",
"options": "link:Mode of Payment",
@@ -218,6 +216,99 @@
},
{
"doctype": "DocField",
+ "fieldname": "is_pos",
+ "fieldtype": "Check",
+ "label": "Is POS",
+ "oldfieldname": "is_pos",
+ "oldfieldtype": "Check",
+ "print_hide": 1,
+ "read_only": 0
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "update_stock",
+ "fieldtype": "Check",
+ "label": "Update Stock",
+ "oldfieldname": "update_stock",
+ "oldfieldtype": "Check",
+ "print_hide": 1,
+ "read_only": 0
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "currency_section",
+ "fieldtype": "Section Break",
+ "label": "Price List and Currency",
+ "read_only": 0
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "currency",
+ "fieldtype": "Link",
+ "label": "Currency",
+ "oldfieldname": "currency",
+ "oldfieldtype": "Select",
+ "options": "Currency",
+ "print_hide": 1,
+ "read_only": 0,
+ "reqd": 1
+ },
+ {
+ "default": "1.00",
+ "description": "Rate at which Customer Currency is converted to customer's base currency",
+ "doctype": "DocField",
+ "fieldname": "conversion_rate",
+ "fieldtype": "Float",
+ "label": "Conversion Rate",
+ "oldfieldname": "conversion_rate",
+ "oldfieldtype": "Currency",
+ "print_hide": 1,
+ "read_only": 0,
+ "reqd": 1
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "column_break2",
+ "fieldtype": "Column Break",
+ "read_only": 0,
+ "width": "50%"
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "price_list_name",
+ "fieldtype": "Select",
+ "label": "Price List",
+ "oldfieldname": "price_list_name",
+ "oldfieldtype": "Select",
+ "options": "link:Price List",
+ "print_hide": 1,
+ "read_only": 0,
+ "reqd": 1
+ },
+ {
+ "description": "Select the currency in which price list is maintained",
+ "doctype": "DocField",
+ "fieldname": "price_list_currency",
+ "fieldtype": "Link",
+ "label": "Price List Currency",
+ "options": "Currency",
+ "print_hide": 1,
+ "read_only": 0,
+ "reqd": 1
+ },
+ {
+ "description": "Rate at which Price list currency is converted to customer's base currency",
+ "doctype": "DocField",
+ "fieldname": "plc_conversion_rate",
+ "fieldtype": "Float",
+ "label": "Price List Currency Conversion Rate",
+ "no_copy": 0,
+ "print_hide": 1,
+ "read_only": 0,
+ "reqd": 1
+ },
+ {
+ "doctype": "DocField",
"fieldname": "items",
"fieldtype": "Section Break",
"label": "Items",
@@ -238,6 +329,23 @@
},
{
"doctype": "DocField",
+ "fieldname": "packing_list",
+ "fieldtype": "Section Break",
+ "label": "Packing List",
+ "print_hide": 1,
+ "read_only": 0
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "packing_details",
+ "fieldtype": "Table",
+ "label": "Packing Details",
+ "options": "Delivery Note Packing Item",
+ "print_hide": 1,
+ "read_only": 0
+ },
+ {
+ "doctype": "DocField",
"fieldname": "sales_bom_help",
"fieldtype": "HTML",
"label": "Sales BOM Help",
@@ -252,13 +360,6 @@
"read_only": 0
},
{
- "doctype": "DocField",
- "fieldname": "col_break26",
- "fieldtype": "Column Break",
- "read_only": 0,
- "width": "50%"
- },
- {
"description": "Select Items from Sales Order",
"doctype": "DocField",
"fieldname": "sales_order_main",
@@ -300,12 +401,12 @@
},
{
"doctype": "DocField",
- "fieldname": "recalculate_values",
- "fieldtype": "Button",
- "label": "Re-Calculate Values",
- "oldfieldtype": "Button",
- "print_hide": 1,
- "read_only": 0
+ "fieldname": "net_total_export",
+ "fieldtype": "Currency",
+ "label": "Net Total (Export)",
+ "options": "currency",
+ "print_hide": 0,
+ "read_only": 1
},
{
"doctype": "DocField",
@@ -321,94 +422,15 @@
},
{
"doctype": "DocField",
- "fieldname": "net_total_export",
- "fieldtype": "Currency",
- "label": "Net Total (Export)",
- "options": "currency",
- "print_hide": 0,
- "read_only": 1
- },
- {
- "doctype": "DocField",
- "fieldname": "currency_section",
- "fieldtype": "Section Break",
- "label": "Price List and Currency",
+ "fieldname": "recalculate_values",
+ "fieldtype": "Button",
+ "label": "Re-Calculate Values",
+ "oldfieldtype": "Button",
+ "print_hide": 1,
"read_only": 0
},
{
"doctype": "DocField",
- "fieldname": "col_break27",
- "fieldtype": "Column Break",
- "read_only": 0,
- "width": "50%"
- },
- {
- "doctype": "DocField",
- "fieldname": "price_list_name",
- "fieldtype": "Select",
- "label": "Price List",
- "oldfieldname": "price_list_name",
- "oldfieldtype": "Select",
- "options": "link:Price List",
- "print_hide": 1,
- "read_only": 0,
- "reqd": 1
- },
- {
- "description": "Select the currency in which price list is maintained",
- "doctype": "DocField",
- "fieldname": "price_list_currency",
- "fieldtype": "Link",
- "label": "Price List Currency",
- "options": "Currency",
- "print_hide": 1,
- "read_only": 0,
- "reqd": 1
- },
- {
- "description": "Rate at which Price list currency is converted to customer's base currency",
- "doctype": "DocField",
- "fieldname": "plc_conversion_rate",
- "fieldtype": "Float",
- "label": "Price List Currency Conversion Rate",
- "print_hide": 1,
- "read_only": 0,
- "reqd": 1
- },
- {
- "doctype": "DocField",
- "fieldname": "column_break2",
- "fieldtype": "Column Break",
- "read_only": 0,
- "width": "50%"
- },
- {
- "doctype": "DocField",
- "fieldname": "currency",
- "fieldtype": "Link",
- "label": "Currency",
- "oldfieldname": "currency",
- "oldfieldtype": "Select",
- "options": "Currency",
- "print_hide": 1,
- "read_only": 0,
- "reqd": 1
- },
- {
- "default": "1.00",
- "description": "Rate at which Customer Currency is converted to customer's base currency",
- "doctype": "DocField",
- "fieldname": "conversion_rate",
- "fieldtype": "Float",
- "label": "Conversion Rate",
- "oldfieldname": "conversion_rate",
- "oldfieldtype": "Currency",
- "print_hide": 1,
- "read_only": 0,
- "reqd": 1
- },
- {
- "doctype": "DocField",
"fieldname": "taxes",
"fieldtype": "Section Break",
"label": "Taxes and Charges",
@@ -428,6 +450,11 @@
},
{
"doctype": "DocField",
+ "fieldname": "column_break_38",
+ "fieldtype": "Column Break"
+ },
+ {
+ "doctype": "DocField",
"fieldname": "get_charges",
"fieldtype": "Button",
"label": "Get Taxes and Charges",
@@ -436,6 +463,11 @@
"read_only": 0
},
{
+ "doctype": "DocField",
+ "fieldname": "section_break_40",
+ "fieldtype": "Section Break"
+ },
+ {
"allow_on_submit": 1,
"doctype": "DocField",
"fieldname": "other_charges",
@@ -448,15 +480,29 @@
},
{
"doctype": "DocField",
- "fieldname": "calculate_charges",
- "fieldtype": "Button",
- "label": "Calculate Taxes and Charges",
- "oldfieldtype": "Button",
+ "fieldname": "other_charges_calculation",
+ "fieldtype": "HTML",
+ "label": "Taxes and Charges Calculation",
+ "oldfieldtype": "HTML",
"print_hide": 1,
"read_only": 0
},
{
"doctype": "DocField",
+ "fieldname": "section_break_43",
+ "fieldtype": "Section Break"
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "other_charges_total_export",
+ "fieldtype": "Currency",
+ "label": "Total Taxes and Charges (Export)",
+ "options": "currency",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "doctype": "DocField",
"fieldname": "other_charges_total",
"fieldtype": "Currency",
"label": "Total Taxes and Charges",
@@ -468,19 +514,15 @@
},
{
"doctype": "DocField",
- "fieldname": "other_charges_total_export",
- "fieldtype": "Currency",
- "label": "Total Taxes and Charges (Export)",
- "options": "currency",
- "print_hide": 1,
- "read_only": 1
+ "fieldname": "column_break_45",
+ "fieldtype": "Column Break"
},
{
"doctype": "DocField",
- "fieldname": "other_charges_calculation",
- "fieldtype": "HTML",
- "label": "Taxes and Charges Calculation",
- "oldfieldtype": "HTML",
+ "fieldname": "calculate_charges",
+ "fieldtype": "Button",
+ "label": "Calculate Taxes and Charges",
+ "oldfieldtype": "Button",
"print_hide": 1,
"read_only": 0
},
@@ -495,6 +537,61 @@
},
{
"doctype": "DocField",
+ "fieldname": "grand_total_export",
+ "fieldtype": "Currency",
+ "in_list_view": 1,
+ "label": "Grand Total (Export)",
+ "oldfieldname": "grand_total_export",
+ "oldfieldtype": "Currency",
+ "options": "currency",
+ "print_hide": 0,
+ "read_only": 1,
+ "reqd": 1
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "rounded_total_export",
+ "fieldtype": "Currency",
+ "label": "Rounded Total (Export)",
+ "oldfieldname": "rounded_total_export",
+ "oldfieldtype": "Currency",
+ "options": "currency",
+ "print_hide": 0,
+ "read_only": 1
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "in_words_export",
+ "fieldtype": "Data",
+ "label": "In Words (Export)",
+ "oldfieldname": "in_words_export",
+ "oldfieldtype": "Data",
+ "print_hide": 0,
+ "read_only": 1
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "gross_profit",
+ "fieldtype": "Currency",
+ "label": "Gross Profit",
+ "oldfieldname": "gross_profit",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "gross_profit_percent",
+ "fieldtype": "Float",
+ "label": "Gross Profit (%)",
+ "oldfieldname": "gross_profit_percent",
+ "oldfieldtype": "Currency",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "doctype": "DocField",
"fieldname": "column_break5",
"fieldtype": "Column Break",
"oldfieldtype": "Column Break",
@@ -564,67 +661,33 @@
},
{
"doctype": "DocField",
- "fieldname": "column_break6",
- "fieldtype": "Column Break",
- "oldfieldtype": "Column Break",
+ "fieldname": "advances",
+ "fieldtype": "Section Break",
+ "label": "Advances",
+ "oldfieldtype": "Section Break",
"print_hide": 1,
- "read_only": 0,
- "width": "50%"
+ "read_only": 0
},
{
"doctype": "DocField",
- "fieldname": "grand_total_export",
- "fieldtype": "Currency",
- "in_list_view": 1,
- "label": "Grand Total (Export)",
- "oldfieldname": "grand_total_export",
- "oldfieldtype": "Currency",
- "options": "currency",
- "print_hide": 0,
- "read_only": 1,
- "reqd": 1
- },
- {
- "doctype": "DocField",
- "fieldname": "rounded_total_export",
- "fieldtype": "Currency",
- "label": "Rounded Total (Export)",
- "oldfieldname": "rounded_total_export",
- "oldfieldtype": "Currency",
- "options": "currency",
- "print_hide": 0,
- "read_only": 1
- },
- {
- "doctype": "DocField",
- "fieldname": "in_words_export",
- "fieldtype": "Data",
- "label": "In Words (Export)",
- "oldfieldname": "in_words_export",
- "oldfieldtype": "Data",
- "print_hide": 0,
- "read_only": 1
- },
- {
- "doctype": "DocField",
- "fieldname": "gross_profit",
- "fieldtype": "Currency",
- "label": "Gross Profit",
- "oldfieldname": "gross_profit",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
+ "fieldname": "get_advances_received",
+ "fieldtype": "Button",
+ "label": "Get Advances Received",
+ "oldfieldtype": "Button",
+ "options": "get_advances",
"print_hide": 1,
- "read_only": 1
+ "read_only": 0
},
{
"doctype": "DocField",
- "fieldname": "gross_profit_percent",
- "fieldtype": "Float",
- "label": "Gross Profit (%)",
- "oldfieldname": "gross_profit_percent",
- "oldfieldtype": "Currency",
+ "fieldname": "advance_adjustment_details",
+ "fieldtype": "Table",
+ "label": "Sales Invoice Advance",
+ "oldfieldname": "advance_adjustment_details",
+ "oldfieldtype": "Table",
+ "options": "Sales Invoice Advance",
"print_hide": 1,
- "read_only": 1
+ "read_only": 0
},
{
"doctype": "DocField",
@@ -725,6 +788,11 @@
},
{
"doctype": "DocField",
+ "fieldname": "column_break_71",
+ "fieldtype": "Column Break"
+ },
+ {
+ "doctype": "DocField",
"fieldname": "get_terms",
"fieldtype": "Button",
"label": "Get Terms and Conditions",
@@ -734,6 +802,11 @@
},
{
"doctype": "DocField",
+ "fieldname": "section_break_73",
+ "fieldtype": "Section Break"
+ },
+ {
+ "doctype": "DocField",
"fieldname": "terms",
"fieldtype": "Text Editor",
"label": "Terms and Conditions Details",
@@ -746,11 +819,35 @@
"doctype": "DocField",
"fieldname": "contact_section",
"fieldtype": "Section Break",
+ "hidden": 0,
"label": "Contact Info",
"read_only": 0
},
{
"doctype": "DocField",
+ "fieldname": "territory",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "label": "Territory",
+ "options": "Territory",
+ "print_hide": 1,
+ "read_only": 0,
+ "reqd": 1,
+ "search_index": 0
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "customer_group",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "label": "Customer Group",
+ "options": "Customer Group",
+ "print_hide": 1,
+ "read_only": 0,
+ "search_index": 0
+ },
+ {
+ "doctype": "DocField",
"fieldname": "col_break23",
"fieldtype": "Column Break",
"read_only": 0,
@@ -776,36 +873,6 @@
},
{
"doctype": "DocField",
- "fieldname": "col_break24",
- "fieldtype": "Column Break",
- "read_only": 0,
- "width": "50%"
- },
- {
- "doctype": "DocField",
- "fieldname": "territory",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Territory",
- "options": "Territory",
- "print_hide": 1,
- "read_only": 0,
- "reqd": 1,
- "search_index": 0
- },
- {
- "doctype": "DocField",
- "fieldname": "customer_group",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Customer Group",
- "options": "Customer Group",
- "print_hide": 1,
- "read_only": 0,
- "search_index": 0
- },
- {
- "doctype": "DocField",
"fieldname": "more_info",
"fieldtype": "Section Break",
"label": "More Info",
@@ -814,13 +881,40 @@
"read_only": 0
},
{
+ "description": "Track this Sales Invoice against any Project",
"doctype": "DocField",
- "fieldname": "column_break7",
- "fieldtype": "Column Break",
- "oldfieldtype": "Column Break",
- "print_hide": 1,
+ "fieldname": "project_name",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "label": "Project Name",
+ "oldfieldname": "project_name",
+ "oldfieldtype": "Link",
+ "options": "Project",
"read_only": 0,
- "width": "50%"
+ "search_index": 1
+ },
+ {
+ "depends_on": "eval:doc.source == 'Campaign'",
+ "doctype": "DocField",
+ "fieldname": "campaign",
+ "fieldtype": "Link",
+ "label": "Campaign",
+ "oldfieldname": "campaign",
+ "oldfieldtype": "Link",
+ "options": "Campaign",
+ "print_hide": 1,
+ "read_only": 0
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "source",
+ "fieldtype": "Select",
+ "label": "Source",
+ "oldfieldname": "source",
+ "oldfieldtype": "Select",
+ "options": "\nExisting Customer\nReference\nAdvertisement\nCold Calling\nExhibition\nSupplier Reference\nMass Mailing\nCustomer's Vendor\nCampaign",
+ "print_hide": 1,
+ "read_only": 0
},
{
"default": "No",
@@ -838,40 +932,6 @@
"search_index": 0
},
{
- "description": "Actual Invoice Date",
- "doctype": "DocField",
- "fieldname": "aging_date",
- "fieldtype": "Date",
- "label": "Aging Date",
- "oldfieldname": "aging_date",
- "oldfieldtype": "Date",
- "print_hide": 1,
- "read_only": 0
- },
- {
- "doctype": "DocField",
- "fieldname": "posting_time",
- "fieldtype": "Time",
- "label": "Posting Time",
- "no_copy": 1,
- "oldfieldname": "posting_time",
- "oldfieldtype": "Time",
- "print_hide": 1,
- "read_only": 0
- },
- {
- "allow_on_submit": 1,
- "doctype": "DocField",
- "fieldname": "letter_head",
- "fieldtype": "Select",
- "label": "Letter Head",
- "oldfieldname": "letter_head",
- "oldfieldtype": "Select",
- "options": "link:Letter Head",
- "print_hide": 1,
- "read_only": 0
- },
- {
"doctype": "DocField",
"fieldname": "c_form_applicable",
"fieldtype": "Select",
@@ -893,29 +953,24 @@
"read_only": 1
},
{
- "depends_on": "eval:doc.source == 'Campaign'",
"doctype": "DocField",
- "fieldname": "campaign",
- "fieldtype": "Link",
- "label": "Campaign",
- "oldfieldname": "campaign",
- "oldfieldtype": "Link",
- "options": "Campaign",
+ "fieldname": "column_break8",
+ "fieldtype": "Column Break",
+ "oldfieldtype": "Column Break",
"print_hide": 1,
"read_only": 0
},
{
- "description": "Track this Sales Invoice against any Project",
+ "allow_on_submit": 1,
"doctype": "DocField",
- "fieldname": "project_name",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Project Name",
- "oldfieldname": "project_name",
- "oldfieldtype": "Link",
- "options": "Project",
- "read_only": 0,
- "search_index": 1
+ "fieldname": "letter_head",
+ "fieldtype": "Select",
+ "label": "Letter Head",
+ "oldfieldname": "letter_head",
+ "oldfieldtype": "Select",
+ "options": "link:Letter Head",
+ "print_hide": 1,
+ "read_only": 0
},
{
"allow_on_submit": 1,
@@ -933,39 +988,28 @@
},
{
"doctype": "DocField",
- "fieldname": "column_break8",
- "fieldtype": "Column Break",
- "oldfieldtype": "Column Break",
+ "fieldname": "posting_time",
+ "fieldtype": "Time",
+ "label": "Posting Time",
+ "no_copy": 1,
+ "oldfieldname": "posting_time",
+ "oldfieldtype": "Time",
"print_hide": 1,
"read_only": 0
},
{
+ "description": "Actual Invoice Date",
"doctype": "DocField",
- "fieldname": "source",
- "fieldtype": "Select",
- "label": "Source",
- "oldfieldname": "source",
- "oldfieldtype": "Select",
- "options": "\nExisting Customer\nReference\nAdvertisement\nCold Calling\nExhibition\nSupplier Reference\nMass Mailing\nCustomer's Vendor\nCampaign",
+ "fieldname": "aging_date",
+ "fieldtype": "Date",
+ "label": "Aging Date",
+ "oldfieldname": "aging_date",
+ "oldfieldtype": "Date",
"print_hide": 1,
"read_only": 0
},
{
"doctype": "DocField",
- "fieldname": "company",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Company",
- "oldfieldname": "company",
- "oldfieldtype": "Link",
- "options": "Company",
- "print_hide": 1,
- "read_only": 0,
- "reqd": 1,
- "search_index": 0
- },
- {
- "doctype": "DocField",
"fieldname": "fiscal_year",
"fieldtype": "Select",
"in_filter": 1,
@@ -981,41 +1025,6 @@
},
{
"doctype": "DocField",
- "fieldname": "amended_from",
- "fieldtype": "Link",
- "label": "Amended From",
- "no_copy": 1,
- "oldfieldname": "amended_from",
- "oldfieldtype": "Link",
- "options": "Sales Invoice",
- "print_hide": 1,
- "read_only": 1
- },
- {
- "description": "The date at which current entry is corrected in the system.",
- "doctype": "DocField",
- "fieldname": "amendment_date",
- "fieldtype": "Date",
- "label": "Amendment Date",
- "no_copy": 1,
- "oldfieldname": "amendment_date",
- "oldfieldtype": "Date",
- "print_hide": 1,
- "read_only": 0
- },
- {
- "depends_on": "eval:!doc.__islocal",
- "doctype": "DocField",
- "fieldname": "cancel_reason",
- "fieldtype": "Data",
- "label": "Cancel Reason",
- "oldfieldname": "cancel_reason",
- "oldfieldtype": "Data",
- "print_hide": 1,
- "read_only": 1
- },
- {
- "doctype": "DocField",
"fieldname": "remarks",
"fieldtype": "Small Text",
"label": "Remarks",
@@ -1028,53 +1037,6 @@
},
{
"doctype": "DocField",
- "fieldname": "advances",
- "fieldtype": "Section Break",
- "label": "Advances",
- "oldfieldtype": "Section Break",
- "print_hide": 1,
- "read_only": 0
- },
- {
- "doctype": "DocField",
- "fieldname": "get_advances_received",
- "fieldtype": "Button",
- "label": "Get Advances Received",
- "oldfieldtype": "Button",
- "options": "get_advances",
- "print_hide": 1,
- "read_only": 0
- },
- {
- "doctype": "DocField",
- "fieldname": "advance_adjustment_details",
- "fieldtype": "Table",
- "label": "Sales Invoice Advance",
- "oldfieldname": "advance_adjustment_details",
- "oldfieldtype": "Table",
- "options": "Sales Invoice Advance",
- "print_hide": 1,
- "read_only": 0
- },
- {
- "doctype": "DocField",
- "fieldname": "packing_list",
- "fieldtype": "Section Break",
- "label": "Packing List",
- "print_hide": 1,
- "read_only": 0
- },
- {
- "doctype": "DocField",
- "fieldname": "packing_details",
- "fieldtype": "Table",
- "label": "Packing Details",
- "options": "Delivery Note Packing Item",
- "print_hide": 1,
- "read_only": 0
- },
- {
- "doctype": "DocField",
"fieldname": "sales_team_section_break",
"fieldtype": "Section Break",
"label": "Sales Team",
diff --git a/buying/doctype/purchase_common/purchase_common.js b/buying/doctype/purchase_common/purchase_common.js
index dfcafed..eee7984 100644
--- a/buying/doctype/purchase_common/purchase_common.js
+++ b/buying/doctype/purchase_common/purchase_common.js
@@ -309,6 +309,12 @@
delete item["rate"];
});
}
+
+ if(!wn.meta.get_docfield(item.doctype, "item_tax_amount", item.parent || item.name)) {
+ $.each(this.frm.item_doclist, function(i, item) {
+ delete item["item_tax_amount"];
+ });
+ }
},
calculate_outstanding_amount: function() {
@@ -326,9 +332,10 @@
// stored for valuation
//
// TODO: rename item_tax_amount to valuation_tax_amount
- if(["Valuation", "Valuation and Total"].indexOf(tax.category) != -1) {
- // accumulate only if tax is for Valuation / Valuation and Total
- item.item_tax_amount += flt(current_tax_amount, precision("item_tax_amount", item));
+ if(["Valuation", "Valuation and Total"].indexOf(tax.category) != -1 &&
+ wn.meta.get_docfield(item.doctype, "item_tax_amount", item.parent || item.name)) {
+ // accumulate only if tax is for Valuation / Valuation and Total
+ item.item_tax_amount += flt(current_tax_amount, precision("item_tax_amount", item));
}
},
diff --git a/controllers/buying_controller.py b/controllers/buying_controller.py
index 312fb8e..f1cfc10 100644
--- a/controllers/buying_controller.py
+++ b/controllers/buying_controller.py
@@ -167,7 +167,7 @@
for item in self.item_doclist:
item.purchase_rate = item.rate
del item.fields["rate"]
-
+
if not self.meta.get_field("item_tax_amount", parentfield=self.fname):
for item in self.item_doclist:
del item.fields["item_tax_amount"]
@@ -179,8 +179,9 @@
TODO: rename item_tax_amount to valuation_tax_amount
"""
- if tax.category in ["Valuation", "Valuation and Total"]:
- item.item_tax_amount += flt(current_tax_amount, self.precision("item_tax_amount", item))
+ if tax.category in ["Valuation", "Valuation and Total"] and \
+ self.meta.get_field("item_tax_amount", parentfield=self.fname):
+ item.item_tax_amount += flt(current_tax_amount, self.precision("item_tax_amount", item))
# update valuation rate
def update_valuation_rate(self, parentfield):
diff --git a/public/images/favicon.ico b/public/images/favicon.ico
index c50923e..4fbf3f2 100644
--- a/public/images/favicon.ico
+++ b/public/images/favicon.ico
Binary files differ
diff --git a/public/images/splash.svg b/public/images/splash.svg
index 0a48c17..3f9fa88 100644
--- a/public/images/splash.svg
+++ b/public/images/splash.svg
@@ -12,12 +12,14 @@
id="svg2"
version="1.1"
inkscape:version="0.48.2 r9819"
- sodipodi:docname="erpnext-logo-2013 - flat-ui-colors.svg"
+ sodipodi:docname="splash-mono.svg"
inkscape:export-filename="/Users/anandpdoshi/Dropbox/erpnext/logo 2013/erpnext-logo-2013 other colors 3.png"
inkscape:export-xdpi="167.56363"
inkscape:export-ydpi="167.56363"
viewBox="0 0 680 820"
- preserveAspectRatio="xMidyMid meet">
+ preserveAspectRatio="xMidyMid meet"
+ width="100%"
+ height="100%">
<defs
id="defs4" />
<sodipodi:namedview
@@ -28,10 +30,10 @@
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="0.53740115"
- inkscape:cx="523.82055"
- inkscape:cy="650.03526"
+ inkscape:cx="417.75453"
+ inkscape:cy="501.17067"
inkscape:document-units="px"
- inkscape:current-layer="layer5"
+ inkscape:current-layer="layer4"
showgrid="false"
inkscape:snap-bbox="false"
showguides="true"
@@ -43,7 +45,7 @@
inkscape:snap-grids="true"
inkscape:window-width="721"
inkscape:window-height="690"
- inkscape:window-x="559"
+ inkscape:window-x="293"
inkscape:window-y="0"
inkscape:window-maximized="0">
<inkscape:grid
@@ -68,7 +70,7 @@
id="layer1"
style="display:inline">
<rect
- style="opacity:0.90000000000000002;fill:#f39c12;fill-opacity:1"
+ style="opacity:0.90000000000000002;fill:#bdc3c7;fill-opacity:1"
id="rect3800"
width="150"
height="150"
@@ -84,7 +86,7 @@
inkscape:label="Layer 2">
<path
transform="scale(1,-1)"
- style="display:inline;opacity:0.90000000000000002;fill:#f1c40f;fill-opacity:1"
+ style="display:inline;opacity:0.90000000000000002;fill:#bdc3c7;fill-opacity:1"
d="m 180,-372.36218 110,0 20,0 0,20 0,110 c 0,11.08 -8.92,20 -20,20 l -110,0 c -11.08,0 -20,-8.92 -20,-20 l 0,-110 c 0,-11.08 8.92,-20 20,-20 z"
id="rect3051"
inkscape:connector-curvature="0"
@@ -95,7 +97,7 @@
id="layer3"
inkscape:label="Layer 3">
<rect
- style="display:inline;opacity:0.90000000000000002;fill:#2ecc71;fill-opacity:0.94117647"
+ style="display:inline;opacity:0.90000000000000002;fill:#bdc3c7;fill-opacity:0.94117647"
id="rect3840"
width="150"
height="150"
@@ -114,14 +116,14 @@
inkscape:connector-curvature="0"
id="path3054"
d="m 490,372.36218 -110,0 -20,0 0,-20 0,-110 c 0,-11.08 8.92,-20 20,-20 l 110,0 c 11.08,0 20,8.92 20,20 l 0,110 c 0,11.08 -8.92,20 -20,20 z"
- style="display:inline;opacity:0.90000000000000002;fill:#27ae60;fill-opacity:1" />
+ style="display:inline;opacity:0.90000000000000002;fill:#bdc3c7;fill-opacity:1" />
</g>
<g
inkscape:groupmode="layer"
id="layer5"
inkscape:label="Layer 5">
<rect
- style="display:inline;opacity:0.90000000000000002;fill:#3498db;fill-opacity:0.94117647"
+ style="display:inline;opacity:0.90000000000000002;fill:#bdc3c7;fill-opacity:0.94117647"
id="rect3844"
width="150"
height="150"
@@ -136,7 +138,7 @@
id="layer6"
inkscape:label="Layer 6">
<path
- style="display:inline;opacity:0.90000000000000002;fill:#2980b9;fill-opacity:0.94117647"
+ style="display:inline;opacity:0.90000000000000002;fill:#bdc3c7;fill-opacity:0.94117647"
d="m 490,422.36218 -110,0 -20,0 0,20 0,110 c 0,11.08 8.92,20 20,20 l 110,0 c 11.08,0 20,-8.92 20,-20 l 0,-110 c 0,-11.08 -8.92,-20 -20,-20 z"
id="path3058"
inkscape:connector-curvature="0"
@@ -147,7 +149,7 @@
id="layer7"
inkscape:label="Layer 7">
<rect
- style="display:inline;opacity:0.90000000000000002;fill:#c0392b;fill-opacity:1"
+ style="display:inline;opacity:0.90000000000000002;fill:#bdc3c7;fill-opacity:1"
id="rect3848"
width="150"
height="150"
@@ -166,6 +168,6 @@
inkscape:connector-curvature="0"
id="path3056"
d="m 180,422.36218 110,0 20,0 0,20 0,110 c 0,11.08 -8.92,20 -20,20 l -110,0 c -11.08,0 -20,-8.92 -20,-20 l 0,-110 c 0,-11.08 8.92,-20 20,-20 z"
- style="display:inline;opacity:0.90000000000000002;fill:#e74c3c;fill-opacity:1" />
+ style="display:inline;opacity:0.90000000000000002;fill:#bdc3c7;fill-opacity:1" />
</g>
</svg>
diff --git a/public/js/conf.js b/public/js/conf.js
index 1054bfc..bf9dd00 100644
--- a/public/js/conf.js
+++ b/public/js/conf.js
@@ -15,8 +15,8 @@
// add toolbar icon
$(document).bind('toolbar_setup', function() {
- $('.navbar-brand').html((wn.boot.website_settings.brand_html || 'erpnext') +
- ' <i class="icon-home icon-white navbar-icon-home" ></i>')
+ $('.navbar-brand').html(wn.boot.website_settings.brand_html ||
+ ('<object data="app/images/splash.svg" class="toolbar-splash" type="image/svg+xml"></object>erpnext'))
.css('max-width', '200px').css('overflow', 'hidden')
.hover(function() {
$(this).find('.icon-home').addClass('navbar-icon-home-hover');
diff --git a/public/js/startup.css b/public/js/startup.css
index bfcbe84..1cc808d 100644
--- a/public/js/startup.css
+++ b/public/js/startup.css
@@ -59,4 +59,11 @@
.show-all-reports {
margin-top: 5px;
font-size: 11px;
+}
+
+/* toolbar */
+.toolbar-splash {
+ width: 32px;
+ height: 32px;
+ margin: -11px auto;
}
\ No newline at end of file
diff --git a/selling/doctype/quotation/quotation.txt b/selling/doctype/quotation/quotation.txt
index 885fc82..1017221 100644
--- a/selling/doctype/quotation/quotation.txt
+++ b/selling/doctype/quotation/quotation.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-05-24 19:29:08",
"docstatus": 0,
- "modified": "2013-06-05 14:43:03",
+ "modified": "2013-06-05 19:07:51",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -171,6 +171,34 @@
"width": "50%"
},
{
+ "doctype": "DocField",
+ "fieldname": "amended_from",
+ "fieldtype": "Data",
+ "label": "Amended From",
+ "no_copy": 1,
+ "oldfieldname": "amended_from",
+ "oldfieldtype": "Data",
+ "print_hide": 1,
+ "read_only": 1,
+ "width": "150px"
+ },
+ {
+ "description": "Select the relevant company name if you have multiple companies.",
+ "doctype": "DocField",
+ "fieldname": "company",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "label": "Company",
+ "oldfieldname": "company",
+ "oldfieldtype": "Link",
+ "options": "Company",
+ "print_hide": 1,
+ "read_only": 0,
+ "reqd": 1,
+ "search_index": 0,
+ "width": "150px"
+ },
+ {
"default": "Today",
"description": "The date at which current entry is made in system.",
"doctype": "DocField",
@@ -203,116 +231,49 @@
},
{
"doctype": "DocField",
- "fieldname": "items",
- "fieldtype": "Section Break",
- "label": "Items",
- "oldfieldtype": "Section Break",
- "print_hide": 0,
- "read_only": 0,
- "search_index": 0
- },
- {
- "allow_on_submit": 1,
- "doctype": "DocField",
- "fieldname": "quotation_details",
- "fieldtype": "Table",
- "label": "Quotation Items",
- "oldfieldname": "quotation_details",
- "oldfieldtype": "Table",
- "options": "Quotation Item",
- "read_only": 0,
- "reqd": 1,
- "width": "40px"
- },
- {
- "doctype": "DocField",
- "fieldname": "sec_break23",
- "fieldtype": "Section Break",
- "options": "Simple",
- "read_only": 0
- },
- {
- "doctype": "DocField",
- "fieldname": "col_break34",
- "fieldtype": "Column Break",
- "read_only": 0,
- "width": "50%"
- },
- {
- "doctype": "DocField",
- "fieldname": "net_total",
- "fieldtype": "Currency",
- "label": "Net Total*",
- "no_copy": 0,
- "oldfieldname": "net_total",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "print_hide": 1,
- "read_only": 1,
- "reqd": 0,
- "width": "100px"
- },
- {
- "doctype": "DocField",
- "fieldname": "net_total_export",
- "fieldtype": "Currency",
- "label": "Net Total (Export)",
- "options": "currency",
- "read_only": 1
- },
- {
- "doctype": "DocField",
- "fieldname": "recalculate_values",
- "fieldtype": "Button",
- "label": "Re-Calculate Values",
- "oldfieldtype": "Button",
- "print_hide": 1,
- "read_only": 0
- },
- {
- "doctype": "DocField",
- "fieldname": "col_break35",
- "fieldtype": "Column Break",
- "read_only": 0,
- "width": "50%"
- },
- {
- "description": "To create Quotation against Opportunity, Select Opportunity No. and click on 'Pull Opportunity Details' ",
- "doctype": "DocField",
- "fieldname": "enq_no",
- "fieldtype": "Link",
- "hidden": 0,
- "in_filter": 1,
- "label": "Opportunity No",
- "no_copy": 0,
- "oldfieldname": "enq_no",
- "oldfieldtype": "Link",
- "options": "Opportunity",
- "print_hide": 0,
- "read_only": 0,
- "report_hide": 0,
- "search_index": 0
- },
- {
- "doctype": "DocField",
- "fieldname": "pull_enquiry_detail",
- "fieldtype": "Button",
- "hidden": 0,
- "label": "Pull Opportunity Detail",
- "no_copy": 0,
- "oldfieldtype": "Button",
- "print_hide": 0,
- "read_only": 0,
- "report_hide": 0
- },
- {
- "doctype": "DocField",
"fieldname": "section_break0",
"fieldtype": "Section Break",
"label": "Price List and Currency",
"read_only": 0
},
{
+ "description": "Customer's currency - If you want to select a currency that is not the default currency, then you must also specify the Currency Conversion Rate.",
+ "doctype": "DocField",
+ "fieldname": "currency",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "label": "Currency",
+ "oldfieldname": "currency",
+ "oldfieldtype": "Select",
+ "options": "Currency",
+ "print_hide": 1,
+ "read_only": 0,
+ "reqd": 1,
+ "search_index": 0,
+ "width": "100px"
+ },
+ {
+ "default": "1.00",
+ "description": "Rate at which customer's currency is converted to company's base currency",
+ "doctype": "DocField",
+ "fieldname": "conversion_rate",
+ "fieldtype": "Float",
+ "label": "Conversion Rate",
+ "oldfieldname": "conversion_rate",
+ "oldfieldtype": "Currency",
+ "print_hide": 1,
+ "read_only": 0,
+ "reqd": 1,
+ "width": "100px"
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "column_break2",
+ "fieldtype": "Column Break",
+ "read_only": 0,
+ "width": "50%"
+ },
+ {
"description": "Select the price list as entered in \"Price List\" master. This will pull the reference rates of items against this price list as specified in \"Item\" master.",
"doctype": "DocField",
"fieldname": "price_list_name",
@@ -351,40 +312,100 @@
},
{
"doctype": "DocField",
- "fieldname": "column_break2",
+ "fieldname": "items",
+ "fieldtype": "Section Break",
+ "label": "Items",
+ "oldfieldtype": "Section Break",
+ "print_hide": 0,
+ "read_only": 0,
+ "search_index": 0
+ },
+ {
+ "allow_on_submit": 1,
+ "doctype": "DocField",
+ "fieldname": "quotation_details",
+ "fieldtype": "Table",
+ "label": "Quotation Items",
+ "oldfieldname": "quotation_details",
+ "oldfieldtype": "Table",
+ "options": "Quotation Item",
+ "read_only": 0,
+ "reqd": 1,
+ "width": "40px"
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "sec_break23",
+ "fieldtype": "Section Break",
+ "options": "Simple",
+ "read_only": 0
+ },
+ {
+ "description": "To create Quotation against Opportunity, Select Opportunity No. and click on 'Pull Opportunity Details' ",
+ "doctype": "DocField",
+ "fieldname": "enq_no",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "in_filter": 1,
+ "label": "Opportunity No",
+ "no_copy": 0,
+ "oldfieldname": "enq_no",
+ "oldfieldtype": "Link",
+ "options": "Opportunity",
+ "print_hide": 0,
+ "read_only": 0,
+ "report_hide": 0,
+ "search_index": 0
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "pull_enquiry_detail",
+ "fieldtype": "Button",
+ "hidden": 0,
+ "label": "Pull Opportunity Detail",
+ "no_copy": 0,
+ "oldfieldtype": "Button",
+ "print_hide": 0,
+ "read_only": 0,
+ "report_hide": 0
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "col_break34",
"fieldtype": "Column Break",
"read_only": 0,
"width": "50%"
},
{
- "description": "Customer's currency - If you want to select a currency that is not the default currency, then you must also specify the Currency Conversion Rate.",
"doctype": "DocField",
- "fieldname": "currency",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Currency",
- "oldfieldname": "currency",
- "oldfieldtype": "Select",
- "options": "Currency",
+ "fieldname": "net_total_export",
+ "fieldtype": "Currency",
+ "label": "Net Total (Export)",
+ "options": "currency",
+ "read_only": 1
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "net_total",
+ "fieldtype": "Currency",
+ "label": "Net Total*",
+ "no_copy": 0,
+ "oldfieldname": "net_total",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
"print_hide": 1,
- "read_only": 0,
- "reqd": 1,
- "search_index": 0,
+ "read_only": 1,
+ "reqd": 0,
"width": "100px"
},
{
- "default": "1.00",
- "description": "Rate at which customer's currency is converted to company's base currency",
"doctype": "DocField",
- "fieldname": "conversion_rate",
- "fieldtype": "Float",
- "label": "Conversion Rate",
- "oldfieldname": "conversion_rate",
- "oldfieldtype": "Currency",
+ "fieldname": "recalculate_values",
+ "fieldtype": "Button",
+ "label": "Re-Calculate Values",
+ "oldfieldtype": "Button",
"print_hide": 1,
- "read_only": 0,
- "reqd": 1,
- "width": "100px"
+ "read_only": 0
},
{
"doctype": "DocField",
@@ -408,6 +429,11 @@
},
{
"doctype": "DocField",
+ "fieldname": "column_break_34",
+ "fieldtype": "Column Break"
+ },
+ {
+ "doctype": "DocField",
"fieldname": "get_charges",
"fieldtype": "Button",
"hidden": 0,
@@ -418,6 +444,11 @@
},
{
"doctype": "DocField",
+ "fieldname": "section_break_36",
+ "fieldtype": "Section Break"
+ },
+ {
+ "doctype": "DocField",
"fieldname": "other_charges",
"fieldtype": "Table",
"label": "Sales Taxes and Charges",
@@ -428,15 +459,29 @@
},
{
"doctype": "DocField",
- "fieldname": "calculate_charges",
- "fieldtype": "Button",
- "label": "Calculate Taxes and Charges",
- "oldfieldtype": "Button",
+ "fieldname": "other_charges_calculation",
+ "fieldtype": "HTML",
+ "label": "Taxes and Charges Calculation",
+ "oldfieldtype": "HTML",
"print_hide": 1,
"read_only": 0
},
{
"doctype": "DocField",
+ "fieldname": "section_break_39",
+ "fieldtype": "Section Break"
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "other_charges_total_export",
+ "fieldtype": "Currency",
+ "label": "Taxes and Charges Total (Export)",
+ "options": "currency",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "doctype": "DocField",
"fieldname": "other_charges_total",
"fieldtype": "Currency",
"label": "Taxes and Charges Total",
@@ -448,19 +493,15 @@
},
{
"doctype": "DocField",
- "fieldname": "other_charges_total_export",
- "fieldtype": "Currency",
- "label": "Taxes and Charges Total (Export)",
- "options": "currency",
- "print_hide": 1,
- "read_only": 1
+ "fieldname": "column_break_42",
+ "fieldtype": "Column Break"
},
{
"doctype": "DocField",
- "fieldname": "other_charges_calculation",
- "fieldtype": "HTML",
- "label": "Taxes and Charges Calculation",
- "oldfieldtype": "HTML",
+ "fieldname": "calculate_charges",
+ "fieldtype": "Button",
+ "label": "Calculate Taxes and Charges",
+ "oldfieldtype": "Button",
"print_hide": 1,
"read_only": 0
},
@@ -475,55 +516,6 @@
},
{
"doctype": "DocField",
- "fieldname": "grand_total",
- "fieldtype": "Currency",
- "label": "Grand Total*",
- "no_copy": 0,
- "oldfieldname": "grand_total",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "print_hide": 1,
- "read_only": 1,
- "reqd": 0,
- "width": "200px"
- },
- {
- "doctype": "DocField",
- "fieldname": "rounded_total",
- "fieldtype": "Currency",
- "label": "Rounded Total",
- "no_copy": 0,
- "oldfieldname": "rounded_total",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "print_hide": 1,
- "read_only": 1,
- "width": "200px"
- },
- {
- "description": "In Words will be visible once you save the Quotation.",
- "doctype": "DocField",
- "fieldname": "in_words",
- "fieldtype": "Data",
- "label": "In Words",
- "no_copy": 0,
- "oldfieldname": "in_words",
- "oldfieldtype": "Data",
- "print_hide": 1,
- "read_only": 1,
- "width": "200px"
- },
- {
- "doctype": "DocField",
- "fieldname": "column_break3",
- "fieldtype": "Column Break",
- "oldfieldtype": "Column Break",
- "print_hide": 1,
- "read_only": 0,
- "width": "50%"
- },
- {
- "doctype": "DocField",
"fieldname": "grand_total_export",
"fieldtype": "Currency",
"in_list_view": 1,
@@ -564,6 +556,55 @@
"width": "200px"
},
{
+ "doctype": "DocField",
+ "fieldname": "column_break3",
+ "fieldtype": "Column Break",
+ "oldfieldtype": "Column Break",
+ "print_hide": 1,
+ "read_only": 0,
+ "width": "50%"
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "grand_total",
+ "fieldtype": "Currency",
+ "label": "Grand Total*",
+ "no_copy": 0,
+ "oldfieldname": "grand_total",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "print_hide": 1,
+ "read_only": 1,
+ "reqd": 0,
+ "width": "200px"
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "rounded_total",
+ "fieldtype": "Currency",
+ "label": "Rounded Total",
+ "no_copy": 0,
+ "oldfieldname": "rounded_total",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "print_hide": 1,
+ "read_only": 1,
+ "width": "200px"
+ },
+ {
+ "description": "In Words will be visible once you save the Quotation.",
+ "doctype": "DocField",
+ "fieldname": "in_words",
+ "fieldtype": "Data",
+ "label": "In Words",
+ "no_copy": 0,
+ "oldfieldname": "in_words",
+ "oldfieldtype": "Data",
+ "print_hide": 1,
+ "read_only": 1,
+ "width": "200px"
+ },
+ {
"description": "Add Terms and Conditions for the Quotation like Payment Terms, Validity of Offer etc. You can also prepare a Terms and Conditions Master and use the Template",
"doctype": "DocField",
"fieldname": "terms_section_break",
@@ -587,6 +628,11 @@
},
{
"doctype": "DocField",
+ "fieldname": "column_break_54",
+ "fieldtype": "Column Break"
+ },
+ {
+ "doctype": "DocField",
"fieldname": "get_terms",
"fieldtype": "Button",
"label": "Get Terms and Conditions",
@@ -595,6 +641,11 @@
},
{
"doctype": "DocField",
+ "fieldname": "section_break_56",
+ "fieldtype": "Section Break"
+ },
+ {
+ "doctype": "DocField",
"fieldname": "terms",
"fieldtype": "Text Editor",
"label": "Term Details",
@@ -610,6 +661,35 @@
"read_only": 0
},
{
+ "description": "Will be fetched from Customer",
+ "doctype": "DocField",
+ "fieldname": "territory",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "in_filter": 1,
+ "label": "Territory",
+ "options": "Territory",
+ "print_hide": 1,
+ "read_only": 0,
+ "reqd": 1,
+ "search_index": 0
+ },
+ {
+ "depends_on": "customer",
+ "doctype": "DocField",
+ "fieldname": "customer_group",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "label": "Customer Group",
+ "oldfieldname": "customer_group",
+ "oldfieldtype": "Link",
+ "options": "Customer Group",
+ "print_hide": 1,
+ "read_only": 0,
+ "reqd": 0,
+ "search_index": 0
+ },
+ {
"depends_on": "customer",
"doctype": "DocField",
"fieldname": "col_break98",
@@ -643,42 +723,6 @@
"reqd": 0
},
{
- "doctype": "DocField",
- "fieldname": "col_break99",
- "fieldtype": "Column Break",
- "read_only": 0,
- "width": "50%"
- },
- {
- "description": "Will be fetched from Customer",
- "doctype": "DocField",
- "fieldname": "territory",
- "fieldtype": "Link",
- "hidden": 0,
- "in_filter": 1,
- "label": "Territory",
- "options": "Territory",
- "print_hide": 1,
- "read_only": 0,
- "reqd": 1,
- "search_index": 0
- },
- {
- "depends_on": "customer",
- "doctype": "DocField",
- "fieldname": "customer_group",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Customer Group",
- "oldfieldname": "customer_group",
- "oldfieldtype": "Link",
- "options": "Customer Group",
- "print_hide": 1,
- "read_only": 0,
- "reqd": 0,
- "search_index": 0
- },
- {
"description": "Filling in additional information about the Quotation will help you analyze your data better.",
"doctype": "DocField",
"fieldname": "more_info",
@@ -689,32 +733,18 @@
"read_only": 0
},
{
- "allow_on_submit": 1,
"doctype": "DocField",
- "fieldname": "letter_head",
- "fieldtype": "Select",
- "label": "Letter Head",
- "oldfieldname": "letter_head",
- "oldfieldtype": "Select",
- "options": "link:Letter Head",
- "print_hide": 1,
- "read_only": 0
- },
- {
- "description": "Select the relevant company name if you have multiple companies.",
- "doctype": "DocField",
- "fieldname": "company",
+ "fieldname": "campaign",
"fieldtype": "Link",
- "in_filter": 1,
- "label": "Company",
- "oldfieldname": "company",
+ "hidden": 0,
+ "label": "Campaign",
+ "no_copy": 0,
+ "oldfieldname": "campaign",
"oldfieldtype": "Link",
- "options": "Company",
+ "options": "Campaign",
"print_hide": 1,
"read_only": 0,
- "reqd": 1,
- "search_index": 0,
- "width": "150px"
+ "report_hide": 0
},
{
"doctype": "DocField",
@@ -731,6 +761,70 @@
"report_hide": 0
},
{
+ "allow_on_submit": 0,
+ "default": "Draft",
+ "doctype": "DocField",
+ "fieldname": "status",
+ "fieldtype": "Select",
+ "in_filter": 1,
+ "label": "Status",
+ "no_copy": 1,
+ "oldfieldname": "status",
+ "oldfieldtype": "Select",
+ "options": "\nDraft\nSubmitted\nOrder Confirmed\nOrder Lost\nCancelled",
+ "print_hide": 1,
+ "read_only": 1,
+ "reqd": 1,
+ "search_index": 0
+ },
+ {
+ "allow_on_submit": 1,
+ "doctype": "DocField",
+ "fieldname": "order_lost_reason",
+ "fieldtype": "Small Text",
+ "label": "Quotation Lost Reason",
+ "no_copy": 1,
+ "oldfieldname": "order_lost_reason",
+ "oldfieldtype": "Small Text",
+ "print_hide": 1,
+ "read_only": 0
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "column_break4",
+ "fieldtype": "Column Break",
+ "oldfieldtype": "Column Break",
+ "print_hide": 1,
+ "read_only": 0,
+ "width": "50%"
+ },
+ {
+ "allow_on_submit": 1,
+ "doctype": "DocField",
+ "fieldname": "letter_head",
+ "fieldtype": "Select",
+ "label": "Letter Head",
+ "oldfieldname": "letter_head",
+ "oldfieldtype": "Select",
+ "options": "link:Letter Head",
+ "print_hide": 1,
+ "read_only": 0
+ },
+ {
+ "allow_on_submit": 1,
+ "doctype": "DocField",
+ "fieldname": "select_print_heading",
+ "fieldtype": "Link",
+ "label": "Select Print Heading",
+ "no_copy": 1,
+ "oldfieldname": "select_print_heading",
+ "oldfieldtype": "Link",
+ "options": "Print Heading",
+ "print_hide": 1,
+ "read_only": 0,
+ "report_hide": 1
+ },
+ {
"doctype": "DocField",
"fieldname": "fiscal_year",
"fieldtype": "Select",
@@ -759,84 +853,6 @@
},
{
"doctype": "DocField",
- "fieldname": "column_break4",
- "fieldtype": "Column Break",
- "oldfieldtype": "Column Break",
- "print_hide": 1,
- "read_only": 0,
- "width": "50%"
- },
- {
- "allow_on_submit": 0,
- "default": "Draft",
- "doctype": "DocField",
- "fieldname": "status",
- "fieldtype": "Select",
- "in_filter": 1,
- "label": "Status",
- "no_copy": 1,
- "oldfieldname": "status",
- "oldfieldtype": "Select",
- "options": "\nDraft\nSubmitted\nOrder Confirmed\nOrder Lost\nCancelled",
- "print_hide": 1,
- "read_only": 1,
- "reqd": 1,
- "search_index": 0
- },
- {
- "doctype": "DocField",
- "fieldname": "campaign",
- "fieldtype": "Link",
- "hidden": 0,
- "label": "Campaign",
- "no_copy": 0,
- "oldfieldname": "campaign",
- "oldfieldtype": "Link",
- "options": "Campaign",
- "print_hide": 1,
- "read_only": 0,
- "report_hide": 0
- },
- {
- "allow_on_submit": 1,
- "doctype": "DocField",
- "fieldname": "order_lost_reason",
- "fieldtype": "Small Text",
- "label": "Quotation Lost Reason",
- "no_copy": 1,
- "oldfieldname": "order_lost_reason",
- "oldfieldtype": "Small Text",
- "print_hide": 1,
- "read_only": 0
- },
- {
- "allow_on_submit": 1,
- "doctype": "DocField",
- "fieldname": "select_print_heading",
- "fieldtype": "Link",
- "label": "Select Print Heading",
- "no_copy": 1,
- "oldfieldname": "select_print_heading",
- "oldfieldtype": "Link",
- "options": "Print Heading",
- "print_hide": 1,
- "read_only": 0,
- "report_hide": 1
- },
- {
- "doctype": "DocField",
- "fieldname": "amended_from",
- "fieldtype": "Data",
- "label": "Amended From",
- "no_copy": 1,
- "oldfieldname": "amended_from",
- "oldfieldtype": "Data",
- "print_hide": 1,
- "read_only": 1,
- "width": "150px"
- },
- {
- "doctype": "DocField",
"fieldname": "communication_history",
"fieldtype": "Section Break",
"oldfieldtype": "Section Break",
@@ -857,16 +873,6 @@
"width": "40px"
},
{
- "doctype": "DocField",
- "fieldname": "file_list",
- "fieldtype": "Small Text",
- "hidden": 1,
- "label": "File List",
- "no_copy": 1,
- "print_hide": 1,
- "read_only": 0
- },
- {
"amend": 1,
"cancel": 1,
"create": 1,
diff --git a/selling/doctype/sales_common/sales_common.js b/selling/doctype/sales_common/sales_common.js
index a5086a5..dc3f60d 100644
--- a/selling/doctype/sales_common/sales_common.js
+++ b/selling/doctype/sales_common/sales_common.js
@@ -388,6 +388,7 @@
this.change_form_labels(company_currency);
this.change_grid_labels(company_currency);
+ set_sales_bom_help(this.frm.doc);
},
change_form_labels: function(company_currency) {
diff --git a/selling/doctype/sales_order/sales_order.txt b/selling/doctype/sales_order/sales_order.txt
index 77fcf11..02ffae7 100644
--- a/selling/doctype/sales_order/sales_order.txt
+++ b/selling/doctype/sales_order/sales_order.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-05-24 19:29:08",
"docstatus": 0,
- "modified": "2013-06-05 14:47:04",
+ "modified": "2013-06-05 18:59:41",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -143,6 +143,34 @@
"width": "50%"
},
{
+ "doctype": "DocField",
+ "fieldname": "amended_from",
+ "fieldtype": "Data",
+ "hidden": 1,
+ "label": "Amended From",
+ "no_copy": 1,
+ "oldfieldname": "amended_from",
+ "oldfieldtype": "Data",
+ "print_hide": 1,
+ "read_only": 1,
+ "width": "150px"
+ },
+ {
+ "description": "Select the relevant company name if you have multiple companies.",
+ "doctype": "DocField",
+ "fieldname": "company",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "label": "Company",
+ "oldfieldname": "company",
+ "oldfieldtype": "Link",
+ "options": "Company",
+ "print_hide": 1,
+ "reqd": 1,
+ "search_index": 1,
+ "width": "150px"
+ },
+ {
"default": "Today",
"description": "The date at which current entry is made in system.",
"doctype": "DocField",
@@ -222,6 +250,76 @@
},
{
"doctype": "DocField",
+ "fieldname": "sec_break45",
+ "fieldtype": "Section Break",
+ "label": "Price List and Currency"
+ },
+ {
+ "description": "Customer's currency",
+ "doctype": "DocField",
+ "fieldname": "currency",
+ "fieldtype": "Link",
+ "label": "Currency",
+ "oldfieldname": "currency",
+ "oldfieldtype": "Select",
+ "options": "Currency",
+ "print_hide": 1,
+ "reqd": 1,
+ "width": "100px"
+ },
+ {
+ "default": "1.00",
+ "description": "Rate at which customer's currency is converted to company's base currency",
+ "doctype": "DocField",
+ "fieldname": "conversion_rate",
+ "fieldtype": "Float",
+ "label": "Conversion Rate",
+ "oldfieldname": "conversion_rate",
+ "oldfieldtype": "Currency",
+ "print_hide": 1,
+ "reqd": 1,
+ "width": "100px"
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "column_break2",
+ "fieldtype": "Column Break",
+ "width": "50%"
+ },
+ {
+ "description": "Select the price list as entered in \"Price List\" master. This will pull the reference rates of items against this price list as specified in \"Item\" master.",
+ "doctype": "DocField",
+ "fieldname": "price_list_name",
+ "fieldtype": "Select",
+ "label": "Price List",
+ "oldfieldname": "price_list_name",
+ "oldfieldtype": "Select",
+ "options": "link:Price List",
+ "print_hide": 1,
+ "reqd": 1,
+ "width": "100px"
+ },
+ {
+ "description": "Select the currency in which price list is maintained",
+ "doctype": "DocField",
+ "fieldname": "price_list_currency",
+ "fieldtype": "Link",
+ "label": "Price List Currency",
+ "options": "Currency",
+ "print_hide": 1,
+ "reqd": 1
+ },
+ {
+ "description": "Rate at which Price list currency is converted to company's base currency",
+ "doctype": "DocField",
+ "fieldname": "plc_conversion_rate",
+ "fieldtype": "Float",
+ "label": "Price List Currency Conversion Rate",
+ "print_hide": 1,
+ "reqd": 1
+ },
+ {
+ "doctype": "DocField",
"fieldname": "items",
"fieldtype": "Section Break",
"label": "Items",
@@ -240,51 +338,30 @@
"reqd": 1
},
{
+ "description": "Display all the individual items delivered with the main items",
"doctype": "DocField",
- "fieldname": "section_break0",
- "fieldtype": "Section Break"
+ "fieldname": "packing_list",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "label": "Packing List",
+ "oldfieldtype": "Section Break",
+ "print_hide": 1
},
{
"doctype": "DocField",
- "fieldname": "col_break20",
- "fieldtype": "Column Break",
- "width": "50%"
- },
- {
- "doctype": "DocField",
- "fieldname": "net_total",
- "fieldtype": "Currency",
- "label": "Net Total*",
- "oldfieldname": "net_total",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
+ "fieldname": "packing_details",
+ "fieldtype": "Table",
+ "label": "Packing Details",
+ "oldfieldname": "packing_details",
+ "oldfieldtype": "Table",
+ "options": "Delivery Note Packing Item",
"print_hide": 1,
- "read_only": 1,
- "reqd": 0,
- "width": "150px"
- },
- {
- "doctype": "DocField",
- "fieldname": "net_total_export",
- "fieldtype": "Currency",
- "label": "Net Total (Export)",
- "options": "currency",
"read_only": 1
},
{
"doctype": "DocField",
- "fieldname": "recalculate_values",
- "fieldtype": "Button",
- "label": "Re-Calculate Values",
- "oldfieldtype": "Button",
- "print_hide": 1,
- "search_index": 0
- },
- {
- "doctype": "DocField",
- "fieldname": "col_break_21",
- "fieldtype": "Column Break",
- "width": "50%"
+ "fieldname": "section_break0",
+ "fieldtype": "Section Break"
},
{
"description": "Quotation no against which this Sales Order is made ",
@@ -327,73 +404,39 @@
},
{
"doctype": "DocField",
- "fieldname": "sec_break45",
- "fieldtype": "Section Break",
- "label": "Price List and Currency"
- },
- {
- "description": "Select the price list as entered in \"Price List\" master. This will pull the reference rates of items against this price list as specified in \"Item\" master.",
- "doctype": "DocField",
- "fieldname": "price_list_name",
- "fieldtype": "Select",
- "label": "Price List",
- "oldfieldname": "price_list_name",
- "oldfieldtype": "Select",
- "options": "link:Price List",
- "print_hide": 1,
- "reqd": 1,
- "width": "100px"
- },
- {
- "description": "Select the currency in which price list is maintained",
- "doctype": "DocField",
- "fieldname": "price_list_currency",
- "fieldtype": "Link",
- "label": "Price List Currency",
- "options": "Currency",
- "print_hide": 1,
- "reqd": 1
- },
- {
- "description": "Rate at which Price list currency is converted to company's base currency",
- "doctype": "DocField",
- "fieldname": "plc_conversion_rate",
- "fieldtype": "Float",
- "label": "Price List Currency Conversion Rate",
- "print_hide": 1,
- "reqd": 1
- },
- {
- "doctype": "DocField",
- "fieldname": "column_break2",
+ "fieldname": "col_break20",
"fieldtype": "Column Break",
"width": "50%"
},
{
- "description": "Customer's currency",
"doctype": "DocField",
- "fieldname": "currency",
- "fieldtype": "Link",
- "label": "Currency",
- "oldfieldname": "currency",
- "oldfieldtype": "Select",
- "options": "Currency",
- "print_hide": 1,
- "reqd": 1,
- "width": "100px"
+ "fieldname": "net_total_export",
+ "fieldtype": "Currency",
+ "label": "Net Total (Export)",
+ "options": "currency",
+ "read_only": 1
},
{
- "default": "1.00",
- "description": "Rate at which customer's currency is converted to company's base currency",
"doctype": "DocField",
- "fieldname": "conversion_rate",
- "fieldtype": "Float",
- "label": "Conversion Rate",
- "oldfieldname": "conversion_rate",
+ "fieldname": "net_total",
+ "fieldtype": "Currency",
+ "label": "Net Total*",
+ "oldfieldname": "net_total",
"oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
"print_hide": 1,
- "reqd": 1,
- "width": "100px"
+ "read_only": 1,
+ "reqd": 0,
+ "width": "150px"
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "recalculate_values",
+ "fieldtype": "Button",
+ "label": "Re-Calculate Values",
+ "oldfieldtype": "Button",
+ "print_hide": 1,
+ "search_index": 0
},
{
"doctype": "DocField",
@@ -415,6 +458,11 @@
},
{
"doctype": "DocField",
+ "fieldname": "column_break_38",
+ "fieldtype": "Column Break"
+ },
+ {
+ "doctype": "DocField",
"fieldname": "get_charges",
"fieldtype": "Button",
"label": "Get Taxes and Charges",
@@ -422,6 +470,11 @@
},
{
"doctype": "DocField",
+ "fieldname": "section_break_40",
+ "fieldtype": "Section Break"
+ },
+ {
+ "doctype": "DocField",
"fieldname": "other_charges",
"fieldtype": "Table",
"label": "Sales Taxes and Charges",
@@ -431,14 +484,28 @@
},
{
"doctype": "DocField",
- "fieldname": "calculate_charges",
- "fieldtype": "Button",
- "label": "Calculate Taxes and Charges",
- "oldfieldtype": "Button",
+ "fieldname": "other_charges_calculation",
+ "fieldtype": "HTML",
+ "label": "Taxes and Charges Calculation",
+ "oldfieldtype": "HTML",
"print_hide": 0
},
{
"doctype": "DocField",
+ "fieldname": "section_break_43",
+ "fieldtype": "Section Break"
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "other_charges_total_export",
+ "fieldtype": "Currency",
+ "label": "Taxes and Charges Total (Export)",
+ "options": "currency",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "doctype": "DocField",
"fieldname": "other_charges_total",
"fieldtype": "Currency",
"label": "Taxes and Charges Total",
@@ -451,19 +518,15 @@
},
{
"doctype": "DocField",
- "fieldname": "other_charges_total_export",
- "fieldtype": "Currency",
- "label": "Taxes and Charges Total (Export)",
- "options": "currency",
- "print_hide": 1,
- "read_only": 1
+ "fieldname": "column_break_46",
+ "fieldtype": "Column Break"
},
{
"doctype": "DocField",
- "fieldname": "other_charges_calculation",
- "fieldtype": "HTML",
- "label": "Taxes and Charges Calculation",
- "oldfieldtype": "HTML",
+ "fieldname": "calculate_charges",
+ "fieldtype": "Button",
+ "label": "Calculate Taxes and Charges",
+ "oldfieldtype": "Button",
"print_hide": 0
},
{
@@ -476,6 +539,50 @@
},
{
"doctype": "DocField",
+ "fieldname": "grand_total_export",
+ "fieldtype": "Currency",
+ "label": "Grand Total (Export)",
+ "oldfieldname": "grand_total_export",
+ "oldfieldtype": "Currency",
+ "options": "currency",
+ "print_hide": 0,
+ "read_only": 1,
+ "reqd": 0,
+ "width": "150px"
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "rounded_total_export",
+ "fieldtype": "Currency",
+ "label": "Rounded Total (Export)",
+ "oldfieldname": "rounded_total_export",
+ "oldfieldtype": "Currency",
+ "options": "currency",
+ "print_hide": 0,
+ "read_only": 1,
+ "width": "150px"
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "in_words_export",
+ "fieldtype": "Data",
+ "label": "In Words (Export)",
+ "oldfieldname": "in_words_export",
+ "oldfieldtype": "Data",
+ "print_hide": 0,
+ "read_only": 1,
+ "width": "200px"
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "column_break3",
+ "fieldtype": "Column Break",
+ "oldfieldtype": "Column Break",
+ "print_hide": 1,
+ "width": "50%"
+ },
+ {
+ "doctype": "DocField",
"fieldname": "grand_total",
"fieldtype": "Currency",
"label": "Grand Total*",
@@ -513,50 +620,6 @@
},
{
"doctype": "DocField",
- "fieldname": "column_break3",
- "fieldtype": "Column Break",
- "oldfieldtype": "Column Break",
- "print_hide": 1,
- "width": "50%"
- },
- {
- "doctype": "DocField",
- "fieldname": "grand_total_export",
- "fieldtype": "Currency",
- "label": "Grand Total (Export)",
- "oldfieldname": "grand_total_export",
- "oldfieldtype": "Currency",
- "options": "currency",
- "print_hide": 0,
- "read_only": 1,
- "reqd": 0,
- "width": "150px"
- },
- {
- "doctype": "DocField",
- "fieldname": "rounded_total_export",
- "fieldtype": "Currency",
- "label": "Rounded Total (Export)",
- "oldfieldname": "rounded_total_export",
- "oldfieldtype": "Currency",
- "options": "currency",
- "print_hide": 0,
- "read_only": 1,
- "width": "150px"
- },
- {
- "doctype": "DocField",
- "fieldname": "in_words_export",
- "fieldtype": "Data",
- "label": "In Words (Export)",
- "oldfieldname": "in_words_export",
- "oldfieldtype": "Data",
- "print_hide": 0,
- "read_only": 1,
- "width": "200px"
- },
- {
- "doctype": "DocField",
"fieldname": "terms_section_break",
"fieldtype": "Section Break",
"label": "Terms and Conditions",
@@ -576,6 +639,11 @@
},
{
"doctype": "DocField",
+ "fieldname": "column_break_58",
+ "fieldtype": "Column Break"
+ },
+ {
+ "doctype": "DocField",
"fieldname": "get_terms",
"fieldtype": "Button",
"label": "Get Terms and Conditions",
@@ -584,6 +652,11 @@
},
{
"doctype": "DocField",
+ "fieldname": "section_break_60",
+ "fieldtype": "Section Break"
+ },
+ {
+ "doctype": "DocField",
"fieldname": "terms",
"fieldtype": "Text Editor",
"label": "Terms and Conditions Details",
@@ -606,6 +679,35 @@
},
{
"doctype": "DocField",
+ "fieldname": "territory",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "label": "Territory",
+ "options": "Territory",
+ "print_hide": 1,
+ "reqd": 1,
+ "search_index": 1
+ },
+ {
+ "description": "Category of customer as entered in Customer master",
+ "doctype": "DocField",
+ "fieldname": "customer_group",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "label": "Customer Group",
+ "options": "Customer Group",
+ "print_hide": 1,
+ "reqd": 1,
+ "search_index": 1
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "col_break46",
+ "fieldtype": "Column Break",
+ "width": "50%"
+ },
+ {
+ "doctype": "DocField",
"fieldname": "customer_address",
"fieldtype": "Link",
"hidden": 0,
@@ -624,35 +726,6 @@
"print_hide": 1
},
{
- "doctype": "DocField",
- "fieldname": "territory",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Territory",
- "options": "Territory",
- "print_hide": 1,
- "reqd": 1,
- "search_index": 1
- },
- {
- "doctype": "DocField",
- "fieldname": "col_break46",
- "fieldtype": "Column Break",
- "width": "50%"
- },
- {
- "description": "Category of customer as entered in Customer master",
- "doctype": "DocField",
- "fieldname": "customer_group",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Customer Group",
- "options": "Customer Group",
- "print_hide": 1,
- "reqd": 1,
- "search_index": 1
- },
- {
"description": "Filling in additional information about the Sales Order will help you analyze your data better.",
"doctype": "DocField",
"fieldname": "more_info",
@@ -662,6 +735,39 @@
"print_hide": 1
},
{
+ "description": "Track this Sales Order against any Project",
+ "doctype": "DocField",
+ "fieldname": "project_name",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "label": "Project Name",
+ "oldfieldname": "project_name",
+ "oldfieldtype": "Link",
+ "options": "Project",
+ "search_index": 1
+ },
+ {
+ "depends_on": "eval:doc.source == 'Campaign'",
+ "doctype": "DocField",
+ "fieldname": "campaign",
+ "fieldtype": "Link",
+ "label": "Campaign",
+ "oldfieldname": "campaign",
+ "oldfieldtype": "Link",
+ "options": "Campaign",
+ "print_hide": 1
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "source",
+ "fieldtype": "Select",
+ "label": "Source",
+ "oldfieldname": "source",
+ "oldfieldtype": "Select",
+ "options": "\nExisting Customer\nReference\nAdvertisement\nCold Calling\nExhibition\nSupplier Reference\nMass Mailing\nCustomer's Vendor\nCampaign",
+ "print_hide": 1
+ },
+ {
"doctype": "DocField",
"fieldname": "column_break4",
"fieldtype": "Column Break",
@@ -694,58 +800,6 @@
"report_hide": 1
},
{
- "depends_on": "eval:doc.source == 'Campaign'",
- "doctype": "DocField",
- "fieldname": "campaign",
- "fieldtype": "Link",
- "label": "Campaign",
- "oldfieldname": "campaign",
- "oldfieldtype": "Link",
- "options": "Campaign",
- "print_hide": 1
- },
- {
- "doctype": "DocField",
- "fieldname": "amended_from",
- "fieldtype": "Data",
- "hidden": 1,
- "label": "Amended From",
- "no_copy": 1,
- "oldfieldname": "amended_from",
- "oldfieldtype": "Data",
- "print_hide": 1,
- "read_only": 1,
- "width": "150px"
- },
- {
- "description": "The date at which current entry is corrected in the system.",
- "doctype": "DocField",
- "fieldname": "amendment_date",
- "fieldtype": "Date",
- "hidden": 1,
- "label": "Amendment Date",
- "no_copy": 1,
- "oldfieldname": "amendment_date",
- "oldfieldtype": "Date",
- "print_hide": 1,
- "width": "100px"
- },
- {
- "description": "Select the relevant company name if you have multiple companies.",
- "doctype": "DocField",
- "fieldname": "company",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Company",
- "oldfieldname": "company",
- "oldfieldtype": "Link",
- "options": "Company",
- "print_hide": 1,
- "reqd": 1,
- "search_index": 1,
- "width": "150px"
- },
- {
"doctype": "DocField",
"fieldname": "fiscal_year",
"fieldtype": "Select",
@@ -760,48 +814,14 @@
"width": "150px"
},
{
- "depends_on": "eval:!doc.__islocal",
"doctype": "DocField",
- "fieldname": "cancel_reason",
- "fieldtype": "Data",
- "label": "Cancel Reason",
- "no_copy": 1,
- "oldfieldname": "cancel_reason",
- "oldfieldtype": "Data",
- "print_hide": 1,
- "read_only": 1
- },
- {
- "doctype": "DocField",
- "fieldname": "column_break5",
- "fieldtype": "Column Break",
+ "fieldname": "section_break_78",
+ "fieldtype": "Section Break",
"oldfieldtype": "Column Break",
"print_hide": 1,
"width": "50%"
},
{
- "doctype": "DocField",
- "fieldname": "source",
- "fieldtype": "Select",
- "label": "Source",
- "oldfieldname": "source",
- "oldfieldtype": "Select",
- "options": "\nExisting Customer\nReference\nAdvertisement\nCold Calling\nExhibition\nSupplier Reference\nMass Mailing\nCustomer's Vendor\nCampaign",
- "print_hide": 1
- },
- {
- "description": "Track this Sales Order against any Project",
- "doctype": "DocField",
- "fieldname": "project_name",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Project Name",
- "oldfieldname": "project_name",
- "oldfieldtype": "Link",
- "options": "Project",
- "search_index": 1
- },
- {
"default": "Draft",
"doctype": "DocField",
"fieldname": "status",
@@ -820,6 +840,16 @@
"width": "100px"
},
{
+ "doctype": "DocField",
+ "fieldname": "delivery_status",
+ "fieldtype": "Select",
+ "hidden": 1,
+ "label": "Delivery Status",
+ "no_copy": 1,
+ "options": "Delivered\nNot Delivered\nPartly Delivered\nClosed\nNot Applicable",
+ "print_hide": 1
+ },
+ {
"depends_on": "eval:!doc.__islocal",
"description": "% of materials delivered against this Sales Order",
"doctype": "DocField",
@@ -836,6 +866,11 @@
"width": "100px"
},
{
+ "doctype": "DocField",
+ "fieldname": "column_break_81",
+ "fieldtype": "Column Break"
+ },
+ {
"depends_on": "eval:!doc.__islocal",
"description": "% of materials billed against this Sales Order",
"doctype": "DocField",
@@ -853,16 +888,6 @@
},
{
"doctype": "DocField",
- "fieldname": "delivery_status",
- "fieldtype": "Select",
- "hidden": 1,
- "label": "Delivery Status",
- "no_copy": 1,
- "options": "Delivered\nNot Delivered\nPartly Delivered\nClosed\nNot Applicable",
- "print_hide": 1
- },
- {
- "doctype": "DocField",
"fieldname": "billing_status",
"fieldtype": "Select",
"hidden": 1,
@@ -872,27 +897,6 @@
"print_hide": 1
},
{
- "description": "Display all the individual items delivered with the main items",
- "doctype": "DocField",
- "fieldname": "packing_list",
- "fieldtype": "Section Break",
- "hidden": 0,
- "label": "Packing List",
- "oldfieldtype": "Section Break",
- "print_hide": 1
- },
- {
- "doctype": "DocField",
- "fieldname": "packing_details",
- "fieldtype": "Table",
- "label": "Packing Details",
- "oldfieldname": "packing_details",
- "oldfieldtype": "Table",
- "options": "Delivery Note Packing Item",
- "print_hide": 1,
- "read_only": 1
- },
- {
"doctype": "DocField",
"fieldname": "sales_team_section_break",
"fieldtype": "Section Break",
@@ -901,13 +905,6 @@
"print_hide": 1
},
{
- "doctype": "DocField",
- "fieldname": "column_break6",
- "fieldtype": "Column Break",
- "print_hide": 1,
- "width": "50%"
- },
- {
"description": "Name as entered in Sales Partner master",
"doctype": "DocField",
"fieldname": "sales_partner",
diff --git a/stock/doctype/delivery_note/delivery_note.txt b/stock/doctype/delivery_note/delivery_note.txt
index f0731ce..74a21b3 100644
--- a/stock/doctype/delivery_note/delivery_note.txt
+++ b/stock/doctype/delivery_note/delivery_note.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-05-24 19:29:09",
"docstatus": 0,
- "modified": "2013-06-05 14:47:47",
+ "modified": "2013-06-05 19:22:52",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -144,6 +144,37 @@
"read_only": 0
},
{
+ "allow_on_submit": 0,
+ "doctype": "DocField",
+ "fieldname": "amended_from",
+ "fieldtype": "Data",
+ "label": "Amended From",
+ "no_copy": 1,
+ "oldfieldname": "amended_from",
+ "oldfieldtype": "Data",
+ "print_hide": 1,
+ "print_width": "150px",
+ "read_only": 1,
+ "width": "150px"
+ },
+ {
+ "description": "Select the relevant company name if you have multiple companies",
+ "doctype": "DocField",
+ "fieldname": "company",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "label": "Company",
+ "oldfieldname": "company",
+ "oldfieldtype": "Link",
+ "options": "Company",
+ "print_hide": 1,
+ "print_width": "150px",
+ "read_only": 0,
+ "reqd": 1,
+ "search_index": 1,
+ "width": "150px"
+ },
+ {
"default": "Today",
"description": "The date at which current entry will get or has actually executed.",
"doctype": "DocField",
@@ -214,117 +245,39 @@
},
{
"doctype": "DocField",
- "fieldname": "items",
- "fieldtype": "Section Break",
- "label": "Items",
- "oldfieldtype": "Section Break",
- "read_only": 0
- },
- {
- "allow_on_submit": 1,
- "doctype": "DocField",
- "fieldname": "delivery_note_details",
- "fieldtype": "Table",
- "label": "Delivery Note Items",
- "no_copy": 0,
- "oldfieldname": "delivery_note_details",
- "oldfieldtype": "Table",
- "options": "Delivery Note Item",
- "print_hide": 0,
- "read_only": 0,
- "reqd": 1
- },
- {
- "doctype": "DocField",
- "fieldname": "sales_bom_help",
- "fieldtype": "HTML",
- "label": "Sales BOM Help",
- "print_hide": 1,
- "read_only": 0
- },
- {
- "doctype": "DocField",
- "fieldname": "section_break0",
- "fieldtype": "Section Break",
- "options": "Simple",
- "read_only": 0
- },
- {
- "doctype": "DocField",
- "fieldname": "col_break24",
- "fieldtype": "Column Break",
- "read_only": 0
- },
- {
- "doctype": "DocField",
- "fieldname": "net_total",
- "fieldtype": "Currency",
- "label": "Net Total*",
- "no_copy": 0,
- "oldfieldname": "net_total",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "print_hide": 1,
- "print_width": "150px",
- "read_only": 1,
- "reqd": 0,
- "width": "150px"
- },
- {
- "doctype": "DocField",
- "fieldname": "net_total_export",
- "fieldtype": "Currency",
- "label": "Net Total (Export)",
- "options": "currency",
- "read_only": 1
- },
- {
- "doctype": "DocField",
- "fieldname": "recalculate_values",
- "fieldtype": "Button",
- "label": "Re-Calculate Values",
- "oldfieldtype": "Button",
- "read_only": 0
- },
- {
- "doctype": "DocField",
- "fieldname": "col_break28",
- "fieldtype": "Column Break",
- "read_only": 0
- },
- {
- "description": "You can make a delivery note from multiple sales orders. Select sales orders one by one and click on the button below.",
- "doctype": "DocField",
- "fieldname": "sales_order_no",
- "fieldtype": "Link",
- "in_list_view": 1,
- "label": "Sales Order No",
- "no_copy": 0,
- "oldfieldname": "sales_order_no",
- "oldfieldtype": "Link",
- "options": "Sales Order",
- "print_hide": 0,
- "read_only": 0
- },
- {
- "doctype": "DocField",
- "fieldname": "get_items",
- "fieldtype": "Button",
- "hidden": 0,
- "label": "Get Items",
- "oldfieldtype": "Button",
- "options": "pull_sales_order_details",
- "print_hide": 1,
- "read_only": 0
- },
- {
- "doctype": "DocField",
"fieldname": "sec_break25",
"fieldtype": "Section Break",
"label": "Price List and Currency",
"read_only": 0
},
{
+ "description": "Customer's Currency",
+ "doctype": "DocField",
+ "fieldname": "currency",
+ "fieldtype": "Link",
+ "label": "Currency",
+ "oldfieldname": "currency",
+ "oldfieldtype": "Select",
+ "options": "Currency",
+ "print_hide": 1,
+ "read_only": 0,
+ "reqd": 1
+ },
+ {
+ "default": "1.00",
+ "description": "Rate at which customer's currency is converted to company's base currency",
+ "doctype": "DocField",
+ "fieldname": "conversion_rate",
+ "fieldtype": "Float",
+ "label": "Conversion Rate",
+ "no_copy": 0,
+ "oldfieldname": "conversion_rate",
+ "oldfieldtype": "Currency",
+ "print_hide": 1,
+ "read_only": 0,
+ "reqd": 1
+ },
+ {
"doctype": "DocField",
"fieldname": "col_break23",
"fieldtype": "Column Break",
@@ -366,41 +319,125 @@
},
{
"doctype": "DocField",
- "fieldname": "column_break2",
- "fieldtype": "Column Break",
- "print_width": "50%",
- "read_only": 0,
- "width": "50%"
+ "fieldname": "items",
+ "fieldtype": "Section Break",
+ "label": "Items",
+ "oldfieldtype": "Section Break",
+ "read_only": 0
},
{
- "description": "Customer's Currency",
+ "allow_on_submit": 1,
"doctype": "DocField",
- "fieldname": "currency",
- "fieldtype": "Link",
- "label": "Currency",
- "oldfieldname": "currency",
- "oldfieldtype": "Select",
- "options": "Currency",
- "print_hide": 1,
- "read_only": 0,
- "reqd": 1
- },
- {
- "default": "1.00",
- "description": "Rate at which customer's currency is converted to company's base currency",
- "doctype": "DocField",
- "fieldname": "conversion_rate",
- "fieldtype": "Float",
- "label": "Conversion Rate",
+ "fieldname": "delivery_note_details",
+ "fieldtype": "Table",
+ "label": "Delivery Note Items",
"no_copy": 0,
- "oldfieldname": "conversion_rate",
- "oldfieldtype": "Currency",
- "print_hide": 1,
+ "oldfieldname": "delivery_note_details",
+ "oldfieldtype": "Table",
+ "options": "Delivery Note Item",
+ "print_hide": 0,
"read_only": 0,
"reqd": 1
},
{
"doctype": "DocField",
+ "fieldname": "packing_list",
+ "fieldtype": "Section Break",
+ "label": "Packing List",
+ "oldfieldtype": "Section Break",
+ "print_hide": 1,
+ "read_only": 0
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "packing_details",
+ "fieldtype": "Table",
+ "label": "Packing Details",
+ "oldfieldname": "packing_details",
+ "oldfieldtype": "Table",
+ "options": "Delivery Note Packing Item",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "sales_bom_help",
+ "fieldtype": "HTML",
+ "label": "Sales BOM Help",
+ "print_hide": 1,
+ "read_only": 0
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "section_break0",
+ "fieldtype": "Section Break",
+ "options": "Simple",
+ "read_only": 0
+ },
+ {
+ "description": "You can make a delivery note from multiple sales orders. Select sales orders one by one and click on the button below.",
+ "doctype": "DocField",
+ "fieldname": "sales_order_no",
+ "fieldtype": "Link",
+ "in_list_view": 1,
+ "label": "Sales Order No",
+ "no_copy": 0,
+ "oldfieldname": "sales_order_no",
+ "oldfieldtype": "Link",
+ "options": "Sales Order",
+ "print_hide": 0,
+ "read_only": 0
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "get_items",
+ "fieldtype": "Button",
+ "hidden": 0,
+ "label": "Get Items",
+ "oldfieldtype": "Button",
+ "options": "pull_sales_order_details",
+ "print_hide": 1,
+ "read_only": 0
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "col_break24",
+ "fieldtype": "Column Break",
+ "read_only": 0
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "net_total_export",
+ "fieldtype": "Currency",
+ "label": "Net Total (Export)",
+ "options": "currency",
+ "read_only": 1
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "net_total",
+ "fieldtype": "Currency",
+ "label": "Net Total*",
+ "no_copy": 0,
+ "oldfieldname": "net_total",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "print_hide": 1,
+ "print_width": "150px",
+ "read_only": 1,
+ "reqd": 0,
+ "width": "150px"
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "recalculate_values",
+ "fieldtype": "Button",
+ "label": "Re-Calculate Values",
+ "oldfieldtype": "Button",
+ "read_only": 0
+ },
+ {
+ "doctype": "DocField",
"fieldname": "taxes",
"fieldtype": "Section Break",
"label": "Taxes",
@@ -421,6 +458,11 @@
},
{
"doctype": "DocField",
+ "fieldname": "column_break_39",
+ "fieldtype": "Column Break"
+ },
+ {
+ "doctype": "DocField",
"fieldname": "get_charges",
"fieldtype": "Button",
"label": "Get Taxes and Charges",
@@ -430,6 +472,11 @@
},
{
"doctype": "DocField",
+ "fieldname": "section_break_41",
+ "fieldtype": "Section Break"
+ },
+ {
+ "doctype": "DocField",
"fieldname": "other_charges",
"fieldtype": "Table",
"label": "Sales Taxes and Charges",
@@ -441,6 +488,28 @@
},
{
"doctype": "DocField",
+ "fieldname": "other_charges_calculation",
+ "fieldtype": "HTML",
+ "label": "Taxes and Charges Calculation",
+ "oldfieldtype": "HTML",
+ "read_only": 0
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "section_break_44",
+ "fieldtype": "Section Break"
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "other_charges_total_export",
+ "fieldtype": "Currency",
+ "label": "Taxes and Charges Total (Export)",
+ "options": "company",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "doctype": "DocField",
"fieldname": "other_charges_total",
"fieldtype": "Currency",
"label": "Taxes and Charges Total",
@@ -454,12 +523,8 @@
},
{
"doctype": "DocField",
- "fieldname": "other_charges_total_export",
- "fieldtype": "Currency",
- "label": "Taxes and Charges Total (Export)",
- "options": "company",
- "print_hide": 1,
- "read_only": 1
+ "fieldname": "column_break_47",
+ "fieldtype": "Column Break"
},
{
"doctype": "DocField",
@@ -472,14 +537,6 @@
},
{
"doctype": "DocField",
- "fieldname": "other_charges_calculation",
- "fieldtype": "HTML",
- "label": "Taxes and Charges Calculation",
- "oldfieldtype": "HTML",
- "read_only": 0
- },
- {
- "doctype": "DocField",
"fieldname": "totals",
"fieldtype": "Section Break",
"label": "Totals",
@@ -489,56 +546,6 @@
},
{
"doctype": "DocField",
- "fieldname": "grand_total",
- "fieldtype": "Currency",
- "label": "Grand Total",
- "no_copy": 0,
- "oldfieldname": "grand_total",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "print_hide": 1,
- "print_width": "150px",
- "read_only": 1,
- "reqd": 0,
- "width": "150px"
- },
- {
- "doctype": "DocField",
- "fieldname": "rounded_total",
- "fieldtype": "Currency",
- "label": "Rounded Total",
- "no_copy": 0,
- "oldfieldname": "rounded_total",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "print_hide": 1,
- "print_width": "150px",
- "read_only": 1,
- "width": "150px"
- },
- {
- "description": "In Words will be visible once you save the Delivery Note.",
- "doctype": "DocField",
- "fieldname": "in_words",
- "fieldtype": "Data",
- "label": "In Words",
- "no_copy": 0,
- "oldfieldname": "in_words",
- "oldfieldtype": "Data",
- "print_hide": 1,
- "print_width": "200px",
- "read_only": 1,
- "width": "200px"
- },
- {
- "doctype": "DocField",
- "fieldname": "column_break3",
- "fieldtype": "Column Break",
- "oldfieldtype": "Column Break",
- "read_only": 0
- },
- {
- "doctype": "DocField",
"fieldname": "grand_total_export",
"fieldtype": "Currency",
"label": "Grand Total (Export)",
@@ -582,6 +589,56 @@
},
{
"doctype": "DocField",
+ "fieldname": "column_break3",
+ "fieldtype": "Column Break",
+ "oldfieldtype": "Column Break",
+ "read_only": 0
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "grand_total",
+ "fieldtype": "Currency",
+ "label": "Grand Total",
+ "no_copy": 0,
+ "oldfieldname": "grand_total",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "print_hide": 1,
+ "print_width": "150px",
+ "read_only": 1,
+ "reqd": 0,
+ "width": "150px"
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "rounded_total",
+ "fieldtype": "Currency",
+ "label": "Rounded Total",
+ "no_copy": 0,
+ "oldfieldname": "rounded_total",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "print_hide": 1,
+ "print_width": "150px",
+ "read_only": 1,
+ "width": "150px"
+ },
+ {
+ "description": "In Words will be visible once you save the Delivery Note.",
+ "doctype": "DocField",
+ "fieldname": "in_words",
+ "fieldtype": "Data",
+ "label": "In Words",
+ "no_copy": 0,
+ "oldfieldname": "in_words",
+ "oldfieldtype": "Data",
+ "print_hide": 1,
+ "print_width": "200px",
+ "read_only": 1,
+ "width": "200px"
+ },
+ {
+ "doctype": "DocField",
"fieldname": "terms_section_break",
"fieldtype": "Section Break",
"label": "Terms and Conditions",
@@ -601,6 +658,11 @@
},
{
"doctype": "DocField",
+ "fieldname": "column_break_59",
+ "fieldtype": "Column Break"
+ },
+ {
+ "doctype": "DocField",
"fieldname": "get_terms",
"fieldtype": "Button",
"label": "Get Terms and Conditions",
@@ -610,6 +672,11 @@
},
{
"doctype": "DocField",
+ "fieldname": "section_break_61",
+ "fieldtype": "Section Break"
+ },
+ {
+ "doctype": "DocField",
"fieldname": "terms",
"fieldtype": "Text Editor",
"label": "Terms and Conditions Details",
@@ -627,15 +694,6 @@
},
{
"doctype": "DocField",
- "fieldname": "column_break4",
- "fieldtype": "Column Break",
- "print_hide": 1,
- "print_width": "50%",
- "read_only": 0,
- "width": "50%"
- },
- {
- "doctype": "DocField",
"fieldname": "transporter_name",
"fieldtype": "Data",
"label": "Transporter Name",
@@ -696,32 +754,6 @@
},
{
"doctype": "DocField",
- "fieldname": "col_break20",
- "fieldtype": "Column Break",
- "print_width": "50%",
- "read_only": 0,
- "width": "50%"
- },
- {
- "doctype": "DocField",
- "fieldname": "contact_person",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Contact Person",
- "options": "Contact",
- "print_hide": 1,
- "read_only": 0
- },
- {
- "doctype": "DocField",
- "fieldname": "col_break21",
- "fieldtype": "Column Break",
- "print_width": "50%",
- "read_only": 0,
- "width": "50%"
- },
- {
- "doctype": "DocField",
"fieldname": "territory",
"fieldtype": "Link",
"hidden": 0,
@@ -745,6 +777,24 @@
"search_index": 1
},
{
+ "doctype": "DocField",
+ "fieldname": "col_break21",
+ "fieldtype": "Column Break",
+ "print_width": "50%",
+ "read_only": 0,
+ "width": "50%"
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "contact_person",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "label": "Contact Person",
+ "options": "Contact",
+ "print_hide": 1,
+ "read_only": 0
+ },
+ {
"description": "Filling in Additional Information about the Delivery Note will help you analyze your data better.",
"doctype": "DocField",
"fieldname": "more_info",
@@ -755,6 +805,52 @@
"read_only": 0
},
{
+ "description": "Track this Delivery Note against any Project",
+ "doctype": "DocField",
+ "fieldname": "project_name",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "label": "Project Name",
+ "oldfieldname": "project_name",
+ "oldfieldtype": "Link",
+ "options": "Project",
+ "read_only": 0,
+ "search_index": 1
+ },
+ {
+ "depends_on": "eval:doc.source == 'Campaign'",
+ "doctype": "DocField",
+ "fieldname": "campaign",
+ "fieldtype": "Link",
+ "label": "Campaign",
+ "oldfieldname": "campaign",
+ "oldfieldtype": "Link",
+ "options": "Campaign",
+ "print_hide": 1,
+ "read_only": 0
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "source",
+ "fieldtype": "Select",
+ "label": "Source",
+ "oldfieldname": "source",
+ "oldfieldtype": "Select",
+ "options": "\nExisting Customer\nReference\nAdvertisement\nCold Calling\nExhibition\nSupplier Reference\nMass Mailing\nCustomer's Vendor\nCampaign",
+ "print_hide": 1,
+ "read_only": 0
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "column_break5",
+ "fieldtype": "Column Break",
+ "oldfieldtype": "Column Break",
+ "print_hide": 1,
+ "print_width": "50%",
+ "read_only": 0,
+ "width": "50%"
+ },
+ {
"description": "Time at which items were delivered from warehouse",
"doctype": "DocField",
"fieldname": "posting_time",
@@ -771,19 +867,17 @@
"width": "100px"
},
{
- "default": "Draft",
"doctype": "DocField",
- "fieldname": "status",
+ "fieldname": "fiscal_year",
"fieldtype": "Select",
"in_filter": 1,
- "label": "Status",
- "no_copy": 1,
- "oldfieldname": "status",
+ "label": "Fiscal Year",
+ "oldfieldname": "fiscal_year",
"oldfieldtype": "Select",
- "options": "\nDraft\nSubmitted\nCancelled",
+ "options": "link:Fiscal Year",
"print_hide": 1,
"print_width": "150px",
- "read_only": 1,
+ "read_only": 0,
"reqd": 1,
"search_index": 1,
"width": "150px"
@@ -815,42 +909,6 @@
"report_hide": 1
},
{
- "description": "Track this Delivery Note against any Project",
- "doctype": "DocField",
- "fieldname": "project_name",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Project Name",
- "oldfieldname": "project_name",
- "oldfieldtype": "Link",
- "options": "Project",
- "read_only": 0,
- "search_index": 1
- },
- {
- "doctype": "DocField",
- "fieldname": "source",
- "fieldtype": "Select",
- "label": "Source",
- "oldfieldname": "source",
- "oldfieldtype": "Select",
- "options": "\nExisting Customer\nReference\nAdvertisement\nCold Calling\nExhibition\nSupplier Reference\nMass Mailing\nCustomer's Vendor\nCampaign",
- "print_hide": 1,
- "read_only": 0
- },
- {
- "depends_on": "eval:doc.source == 'Campaign'",
- "doctype": "DocField",
- "fieldname": "campaign",
- "fieldtype": "Link",
- "label": "Campaign",
- "oldfieldname": "campaign",
- "oldfieldtype": "Link",
- "options": "Campaign",
- "print_hide": 1,
- "read_only": 0
- },
- {
"allow_on_submit": 1,
"doctype": "DocField",
"fieldname": "print_without_amount",
@@ -863,13 +921,26 @@
},
{
"doctype": "DocField",
- "fieldname": "column_break5",
- "fieldtype": "Column Break",
- "oldfieldtype": "Column Break",
+ "fieldname": "section_break_83",
+ "fieldtype": "Section Break"
+ },
+ {
+ "default": "Draft",
+ "doctype": "DocField",
+ "fieldname": "status",
+ "fieldtype": "Select",
+ "in_filter": 1,
+ "label": "Status",
+ "no_copy": 1,
+ "oldfieldname": "status",
+ "oldfieldtype": "Select",
+ "options": "\nDraft\nSubmitted\nCancelled",
"print_hide": 1,
- "print_width": "50%",
- "read_only": 0,
- "width": "50%"
+ "print_width": "150px",
+ "read_only": 1,
+ "reqd": 1,
+ "search_index": 1,
+ "width": "150px"
},
{
"depends_on": "eval:!doc.__islocal",
@@ -924,32 +995,9 @@
"read_only": 0
},
{
- "allow_on_submit": 0,
"doctype": "DocField",
- "fieldname": "amended_from",
- "fieldtype": "Data",
- "label": "Amended From",
- "no_copy": 1,
- "oldfieldname": "amended_from",
- "oldfieldtype": "Data",
- "print_hide": 1,
- "print_width": "150px",
- "read_only": 1,
- "width": "150px"
- },
- {
- "description": "The date at which current entry is corrected in the system.",
- "doctype": "DocField",
- "fieldname": "amendment_date",
- "fieldtype": "Date",
- "label": "Amendment Date",
- "no_copy": 1,
- "oldfieldname": "amendment_date",
- "oldfieldtype": "Date",
- "print_hide": 1,
- "print_width": "100px",
- "read_only": 0,
- "width": "100px"
+ "fieldname": "column_break_89",
+ "fieldtype": "Column Break"
},
{
"description": "Required only for sample item.",
@@ -986,72 +1034,6 @@
"read_only": 0
},
{
- "description": "Select the relevant company name if you have multiple companies",
- "doctype": "DocField",
- "fieldname": "company",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Company",
- "oldfieldname": "company",
- "oldfieldtype": "Link",
- "options": "Company",
- "print_hide": 1,
- "print_width": "150px",
- "read_only": 0,
- "reqd": 1,
- "search_index": 1,
- "width": "150px"
- },
- {
- "doctype": "DocField",
- "fieldname": "fiscal_year",
- "fieldtype": "Select",
- "in_filter": 1,
- "label": "Fiscal Year",
- "oldfieldname": "fiscal_year",
- "oldfieldtype": "Select",
- "options": "link:Fiscal Year",
- "print_hide": 1,
- "print_width": "150px",
- "read_only": 0,
- "reqd": 1,
- "search_index": 1,
- "width": "150px"
- },
- {
- "depends_on": "eval:!doc.__islocal",
- "doctype": "DocField",
- "fieldname": "cancel_reason",
- "fieldtype": "Data",
- "hidden": 0,
- "label": "Cancel Reason",
- "no_copy": 1,
- "oldfieldname": "cancel_reason",
- "oldfieldtype": "Data",
- "print_hide": 1,
- "read_only": 1
- },
- {
- "doctype": "DocField",
- "fieldname": "packing_list",
- "fieldtype": "Section Break",
- "label": "Packing List",
- "oldfieldtype": "Section Break",
- "print_hide": 1,
- "read_only": 0
- },
- {
- "doctype": "DocField",
- "fieldname": "packing_details",
- "fieldtype": "Table",
- "label": "Packing Details",
- "oldfieldname": "packing_details",
- "oldfieldtype": "Table",
- "options": "Delivery Note Packing Item",
- "print_hide": 1,
- "read_only": 1
- },
- {
"doctype": "DocField",
"fieldname": "sales_team_section_break",
"fieldtype": "Section Break",
@@ -1062,15 +1044,6 @@
},
{
"doctype": "DocField",
- "fieldname": "column_break6",
- "fieldtype": "Column Break",
- "print_hide": 1,
- "print_width": "50%",
- "read_only": 0,
- "width": "50%"
- },
- {
- "doctype": "DocField",
"fieldname": "sales_partner",
"fieldtype": "Link",
"label": "Sales Partner",
