{% if(report.report_name === "Accounts Receivable" || report.report_name === "Accounts Payable") { %}
- | {%= __("Date") %} |
- {%= __("Ref") %} |
- {%= (filters.customer || filters.supplier) ? __("Remarks"): __("Party") %} |
+ {%= __("Date") %} |
+ {%= __("Ref") %} |
+ {%= (filters.customer || filters.supplier) ? __("Remarks"): __("Party") %} |
{%= __("Invoiced Amount") %} |
- {%= __("Paid Amount") %} |
- {%= report.report_name === "Accounts Receivable" ? __('Credit Note') : __('Debit Note') %} |
- {%= __("Outstanding Amount") %} |
+ {% if(!filters.show_pdc_in_print) { %}
+ {%= __("Paid Amount") %} |
+ {%= report.report_name === "Accounts Receivable" ? __('Credit Note') : __('Debit Note') %} |
+ {% } %}
+ {%= __("Outstanding Amount") %} |
+ {% if(filters.show_pdc_in_print) { %}
+ {% if(report.report_name === "Accounts Receivable") { %}
+ {%= __("Customer LPO No.") %} |
+ {% } %}
+ {%= __("PDC/LC Date") %} |
+ {%= __("PDC/LC Ref") %} |
+ {%= __("PDC/LC Amount") %} |
+ {% } %}
{% } else { %}
{%= (filters.customer || filters.supplier) ? __("Remarks"): __("Party") %} |
{%= __("Total Invoiced Amount") %} |
@@ -48,23 +129,49 @@
{%= format_currency(data[i]["Invoiced Amount"], data[i]["currency"]) %} |
-
- {%= format_currency(data[i]["Paid Amount"], data[i]["currency"]) %} |
-
- {%= report.report_name === "Accounts Receivable" ? format_currency(data[i]["Credit Note"], data[i]["currency"]) : format_currency(data[i]["Debit Note"], data[i]["currency"]) %} |
+
+ {% if(!filters.show_pdc_in_print) { %}
+
+ {%= format_currency(data[i]["Paid Amount"], data[i]["currency"]) %} |
+
+ {%= report.report_name === "Accounts Receivable" ? format_currency(data[i]["Credit Note"], data[i]["currency"]) : format_currency(data[i]["Debit Note"], data[i]["currency"]) %} |
+ {% } %}
{%= format_currency(data[i]["Outstanding Amount"], data[i]["currency"]) %} |
+
+ {% if(filters.show_pdc_in_print) { %}
+ {% if(report.report_name === "Accounts Receivable") { %}
+
+ {%= data[i][__("Customer LPO")] %} |
+ {% } %}
+ {%= frappe.datetime.str_to_user(data[i][__("PDC/LC Date")]) %} |
+ {%= data[i][__("PDC/LC Ref")] %} |
+ {%= format_currency(data[i][__("PDC/LC Amount")], data[i]["currency"]) %} |
+ {% } %}
{% } else { %}
|
|
{%= __("Total") %} |
{%= format_currency(data[i]["Invoiced Amount"], data[i]["currency"] ) %} |
-
- {%= format_currency(data[i]["Paid Amount"], data[i]["currency"]) %} |
- {%= report.report_name === "Accounts Receivable" ? format_currency(data[i]["Credit Note"], data[i]["currency"]) : format_currency(data[i]["Debit Note"], data[i]["currency"]) %} |
+
+ {% if(!filters.show_pdc_in_print) { %}
+
+ {%= format_currency(data[i]["Paid Amount"], data[i]["currency"]) %} |
+ {%= report.report_name === "Accounts Receivable" ? format_currency(data[i]["Credit Note"], data[i]["currency"]) : format_currency(data[i]["Debit Note"], data[i]["currency"]) %} |
+ {% } %}
{%= format_currency(data[i]["Outstanding Amount"], data[i]["currency"]) %} |
+
+ {% if(filters.show_pdc_in_print) { %}
+ {% if(report.report_name === "Accounts Receivable") { %}
+
+ {%= data[i][__("Customer LPO")] %} |
+ {% } %}
+ {%= frappe.datetime.str_to_user(data[i][__("PDC/LC Date")]) %} |
+ {%= data[i][__("PDC/LC Ref")] %} |
+ {%= format_currency(data[i][__("PDC/LC Amount")], data[i]["currency"]) %} |
+ {% } %}
{% } %}
{% } else { %}
{% if(data[i][__("Customer")] || data[i][__("Supplier")]|| " ") { %}
diff --git a/erpnext/accounts/report/accounts_receivable/accounts_receivable.js b/erpnext/accounts/report/accounts_receivable/accounts_receivable.js
index ac641c29cc..82f35078a2 100644
--- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.js
+++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.js
@@ -82,6 +82,11 @@ frappe.query_reports["Accounts Receivable"] = {
"fieldtype": "Int",
"default": "90",
"reqd": 1
+ },
+ {
+ "fieldname":"show_pdc_in_print",
+ "label": __("Show PDC in Print"),
+ "fieldtype": "Check",
}
],
diff --git a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
index 14fdbbd6ce..65bd07e828 100644
--- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
+++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
@@ -72,6 +72,18 @@ class ReceivablePayableReport(object):
"options": "Currency",
"width": 100
})
+
+ columns += [
+ _("PDC/LC Date") + ":Date:110",
+ _("PDC/LC Ref") + ":Data:110",
+ _("PDC/LC Amount") + ":Currency/currency:130",
+ _("Remaining Balance") + ":Currency/currency:130"
+ ]
+
+ if args.get('party_type') == 'Customer':
+ columns += [_("Customer LPO") + ":Data:100"]
+ columns += [_("Delivery Note") + ":Data:100"]
+
if args.get("party_type") == "Customer":
columns += [
_("Territory") + ":Link/Territory:80",
@@ -89,7 +101,8 @@ class ReceivablePayableReport(object):
currency_precision = get_currency_precision() or 2
dr_or_cr = "debit" if args.get("party_type") == "Customer" else "credit"
- voucher_details = self.get_voucher_details(args.get("party_type"))
+ dn_details = get_dn_details(args.get("party_type"))
+ voucher_details = self.get_voucher_details(args.get("party_type"), dn_details)
future_vouchers = self.get_entries_after(self.filters.report_date, args.get("party_type"))
@@ -101,6 +114,8 @@ class ReceivablePayableReport(object):
return_entries = self.get_return_entries(args.get("party_type"))
data = []
+ pdc_details = get_pdc_details(args.get("party_type"))
+
for gle in self.get_entries_till(self.filters.report_date, args.get("party_type")):
if self.is_receivable_or_payable(gle, dr_or_cr, future_vouchers):
outstanding_amount, credit_note_amount = self.get_outstanding_amount(gle,
@@ -144,6 +159,18 @@ class ReceivablePayableReport(object):
else:
row.append(company_currency)
+ pdc = pdc_details.get(gle.voucher_no, {})
+ remaining_balance = outstanding_amount - flt(pdc.get("pdc_amount"))
+ row += [pdc.get("pdc_date"), pdc.get("pdc_ref"),
+ flt(pdc.get("pdc_amount")), remaining_balance]
+
+ if args.get('party_type') == 'Customer':
+ # customer LPO
+ row += [voucher_details.get(gle.voucher_no, {}).get("po_no")]
+
+ # Delivery Note
+ row += [voucher_details.get(gle.voucher_no, {}).get("delivery_note")]
+
# customer territory / supplier type
if args.get("party_type") == "Customer":
row += [self.get_territory(gle.party), self.get_customer_group(gle.party)]
@@ -225,12 +252,13 @@ class ReceivablePayableReport(object):
return self.party_map
- def get_voucher_details(self, party_type):
+ def get_voucher_details(self, party_type, dn_details):
voucher_details = frappe._dict()
if party_type == "Customer":
- for si in frappe.db.sql("""select name, due_date
+ for si in frappe.db.sql("""select name, due_date, po_no
from `tabSales Invoice` where docstatus=1""", as_dict=1):
+ si['delivery_note'] = dn_details.get(si.name)
voucher_details.setdefault(si.name, si)
if party_type == "Supplier":
@@ -363,3 +391,39 @@ def get_ageing_data(first_range, second_range, third_range, age_as_on, entry_dat
outstanding_range[index] = outstanding_amount
return [age] + outstanding_range
+
+def get_pdc_details(party_type):
+ pdc_details = frappe._dict()
+
+ for pdc in frappe.db.sql("""
+ select
+ pref.reference_name as invoice_no, pent.party, pent.party_type,
+ max(pent.reference_date) as pdc_date, sum(ifnull(pref.allocated_amount,0)) as pdc_amount,
+ GROUP_CONCAT(pent.reference_no SEPARATOR ', ') as pdc_ref
+ from
+ `tabPayment Entry` as pent inner join `tabPayment Entry Reference` as pref
+ on
+ (pref.parent = pent.name)
+ where
+ pent.docstatus = 0 and pent.reference_date > pent.posting_date
+ and pent.party_type = %s
+ group by pref.reference_name""", party_type, as_dict=1):
+ pdc_details.setdefault(pdc.invoice_no, pdc)
+
+ return pdc_details
+
+def get_dn_details(party_type):
+ dn_details = frappe._dict()
+
+ if party_type == "Customer":
+ for si in frappe.db.sql("""select parent, GROUP_CONCAT(delivery_note SEPARATOR ', ') as dn
+ from `tabSales Invoice Item`
+ where docstatus=1 and delivery_note is not null and delivery_note != '' group by parent
+ Union
+ select against_sales_invoice as parent, GROUP_CONCAT(parent SEPARATOR ', ') as dn
+ from `tabDelivery Note Item`
+ where docstatus=1 and against_sales_invoice is not null
+ and against_sales_invoice != '' group by against_sales_invoice""", as_dict=1):
+ dn_details.setdefault(si.parent, si.dn)
+
+ return dn_details
diff --git a/erpnext/controllers/taxes_and_totals.py b/erpnext/controllers/taxes_and_totals.py
index 0e35cb89e6..699e1c608f 100644
--- a/erpnext/controllers/taxes_and_totals.py
+++ b/erpnext/controllers/taxes_and_totals.py
@@ -415,13 +415,15 @@ class calculate_taxes_and_totals(object):
self.doc.total_advance = flt(total_allocated_amount, self.doc.precision("total_advance"))
+ grand_total = self.doc.rounded_total or self.doc.grand_total
+
if self.doc.party_account_currency == self.doc.currency:
- invoice_total = flt(self.doc.grand_total - flt(self.doc.write_off_amount),
+ invoice_total = flt(grand_total - flt(self.doc.write_off_amount),
self.doc.precision("grand_total"))
else:
base_write_off_amount = flt(flt(self.doc.write_off_amount) * self.doc.conversion_rate,
self.doc.precision("base_write_off_amount"))
- invoice_total = flt(self.doc.grand_total * self.doc.conversion_rate,
+ invoice_total = flt(grand_total * self.doc.conversion_rate,
self.doc.precision("grand_total")) - base_write_off_amount
if invoice_total > 0 and self.doc.total_advance > invoice_total:
diff --git a/erpnext/docs/assets/img/education/module.png b/erpnext/docs/assets/img/education/module.png
index eae84b384c..18259f029c 100644
Binary files a/erpnext/docs/assets/img/education/module.png and b/erpnext/docs/assets/img/education/module.png differ
diff --git a/erpnext/docs/assets/img/education/student/schools-settings.png b/erpnext/docs/assets/img/education/setup/education-settings.png
similarity index 100%
rename from erpnext/docs/assets/img/education/student/schools-settings.png
rename to erpnext/docs/assets/img/education/setup/education-settings.png
diff --git a/erpnext/docs/assets/img/education/setup/setup.png b/erpnext/docs/assets/img/education/setup/setup.png
new file mode 100644
index 0000000000..11f3202578
Binary files /dev/null and b/erpnext/docs/assets/img/education/setup/setup.png differ
diff --git a/erpnext/docs/assets/img/education/student/student-batch-validation.gif b/erpnext/docs/assets/img/education/setup/student-batch-validation.gif
similarity index 100%
rename from erpnext/docs/assets/img/education/student/student-batch-validation.gif
rename to erpnext/docs/assets/img/education/setup/student-batch-validation.gif
diff --git a/erpnext/docs/assets/img/education/setup/student-category.png b/erpnext/docs/assets/img/education/setup/student-category.png
new file mode 100644
index 0000000000..dc12a0d196
Binary files /dev/null and b/erpnext/docs/assets/img/education/setup/student-category.png differ
diff --git a/erpnext/docs/assets/img/education/student/student-course-validation.gif b/erpnext/docs/assets/img/education/setup/student-course-validation.gif
similarity index 100%
rename from erpnext/docs/assets/img/education/student/student-course-validation.gif
rename to erpnext/docs/assets/img/education/setup/student-course-validation.gif
diff --git a/erpnext/docs/user/manual/en/education/setup/course.md b/erpnext/docs/user/manual/en/education/setup/course.md
index 24482fffc9..609cac4c70 100644
--- a/erpnext/docs/user/manual/en/education/setup/course.md
+++ b/erpnext/docs/user/manual/en/education/setup/course.md
@@ -8,8 +8,6 @@ To create a **Course** enter the Course name and Code. Code for the course shoul
Once a **Course** is created, a course schedule can defined for the same.
-
-
The Course form is further linked to **Program, Student Group and Assessment Plan** doctypes. The links allow to view/create the related documents for a **Course**.
#### Video Tutorial for Course
diff --git a/erpnext/docs/user/manual/en/education/setup/school-settings.md b/erpnext/docs/user/manual/en/education/setup/education-settings.md
similarity index 82%
rename from erpnext/docs/user/manual/en/education/setup/school-settings.md
rename to erpnext/docs/user/manual/en/education/setup/education-settings.md
index efdf8993f5..ccff8f2d50 100644
--- a/erpnext/docs/user/manual/en/education/setup/school-settings.md
+++ b/erpnext/docs/user/manual/en/education/setup/education-settings.md
@@ -3,14 +3,14 @@
The Education Settings page allow you to setup basic settings like **Academic Year and Term** for the educational setup.
-
+
The checkbox to Validate Batch for Students in Student Group enables the Student Batch validation for every Student from the Program Enrollment for the **Batch** based on **Student Group**
-
+
You can enable the validation of Course for every Student from the enrolled Courses in Program Enrollment,for Course based Student Group by checking the settings for **Validate Enrolled Course for Students in Student Group**
-
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/education/setup/index.md b/erpnext/docs/user/manual/en/education/setup/index.md
index 1176544baa..63ebfae857 100644
--- a/erpnext/docs/user/manual/en/education/setup/index.md
+++ b/erpnext/docs/user/manual/en/education/setup/index.md
@@ -1,8 +1,8 @@
# Setup
-The Setup section of education module provides facility to make some basic configuration. Below are doctypes for basic configuration.
+The Setup section of education module provides facility to make some basic master records and configuration. Below are doctypes for those masters and configuration.
-
+
### Topics
diff --git a/erpnext/docs/user/manual/en/education/setup/student-category.md b/erpnext/docs/user/manual/en/education/setup/student-category.md
index 37abd222eb..b02b5b2c98 100644
--- a/erpnext/docs/user/manual/en/education/setup/student-category.md
+++ b/erpnext/docs/user/manual/en/education/setup/student-category.md
@@ -2,11 +2,15 @@
Student Category doctype allow you to classify student based various categories. In Institutions, there may be fee concession for some categories such as Handicapped students, foreign, nationals, reserved category by the government etc.
-To create Student category go to Setup >> Student Category >> New.
+To create Student category go to:
+
+> Setup > Student Category > New
We can create new student category by adding a name and save it
-
+
+
+You can select the Student Category while making the Fee Structure and accordingly the student from the selected groups can be filtered out while making the Fee Schedule.
{next}
\ No newline at end of file
diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js
index e44c3fb766..8ae91a4777 100644
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -458,7 +458,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
}
var party = me.frm.doc[frappe.model.scrub(party_type)];
- if(party) {
+ if(party && me.frm.doc.company) {
return frappe.call({
method: "erpnext.accounts.party.get_party_account",
args: {
diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json
index 7c23687eef..f302c1cd1c 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.json
+++ b/erpnext/selling/doctype/sales_order/sales_order.json
@@ -3529,8 +3529,8 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2017-12-19 14:51:52.710612",
- "modified_by": "nabinhait@gmail.com",
+ "modified": "2018-01-12 15:56:12.483019",
+ "modified_by": "Administrator",
"module": "Selling",
"name": "Sales Order",
"owner": "Administrator",
diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py
index 60046c819f..36d0c399cb 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.py
+++ b/erpnext/selling/doctype/sales_order/sales_order.py
@@ -476,13 +476,10 @@ def make_project(source_name, target_doc=None):
@frappe.whitelist()
def make_delivery_note(source_name, target_doc=None):
def set_missing_values(source, target):
- if source.po_no:
- if target.po_no:
- target_po_no = target.po_no.split(", ")
- target_po_no.append(source.po_no)
- target.po_no = ", ".join(list(set(target_po_no))) if len(target_po_no) > 1 else target_po_no[0]
- else:
- target.po_no = source.po_no
+ so = [d.against_sales_order for d in target.items]
+ if so:
+ po_no_list = frappe.get_all('Sales Order', 'po_no', filters = {'name': ('in', so)})
+ target.po_no = ', '.join(d.po_no for d in po_no_list if d.po_no)
target.ignore_pricing_rule = 1
target.run_method("set_missing_values")
diff --git a/erpnext/selling/page/point_of_sale/point_of_sale.js b/erpnext/selling/page/point_of_sale/point_of_sale.js
index ddc4f57fde..72250c265f 100644
--- a/erpnext/selling/page/point_of_sale/point_of_sale.js
+++ b/erpnext/selling/page/point_of_sale/point_of_sale.js
@@ -801,11 +801,19 @@ class POSCart {
return;
}
- const item_code = this.selected_item.attr('data-item-code');
- const field = this.selected_item.active_field;
- const value = this.numpad.get_value();
+ if (this.selected_item.active_field == 'discount_percentage' && this.numpad.get_value() > cint(100)) {
+ frappe.show_alert({
+ indicator: 'red',
+ message: __('Discount amount cannot be greater than 100%')
+ });
+ this.numpad.reset_value();
+ } else {
+ const item_code = this.selected_item.attr('data-item-code');
+ const field = this.selected_item.active_field;
+ const value = this.numpad.get_value();
- this.events.on_field_change(item_code, field, value);
+ this.events.on_field_change(item_code, field, value);
+ }
}
this.events.on_numpad(btn_value);
@@ -1621,4 +1629,4 @@ class Payment {
this.dialog.set_value("paid_amount", this.frm.doc.paid_amount);
this.dialog.set_value("outstanding_amount", this.frm.doc.outstanding_amount);
}
-}
+}
\ No newline at end of file
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.json b/erpnext/stock/doctype/delivery_note/delivery_note.json
index b81154e4fe..04639416a9 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.json
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.json
@@ -398,73 +398,6 @@
"set_only_once": 0,
"unique": 0
},
- {
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "po_no",
- "fieldtype": "Data",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Customer's Purchase Order No",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "po_no",
- "oldfieldtype": "Data",
- "permlevel": 0,
- "print_hide": 1,
- "print_hide_if_no_value": 0,
- "print_width": "100px",
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0,
- "width": "100px"
- },
- {
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "eval:doc.po_no",
- "fieldname": "po_date",
- "fieldtype": "Date",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Customer's Purchase Order Date",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "po_date",
- "oldfieldtype": "Data",
- "permlevel": 0,
- "print_hide": 1,
- "print_hide_if_no_value": 0,
- "print_width": "100px",
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0,
- "width": "100px"
- },
{
"allow_bulk_edit": 0,
"allow_on_submit": 0,
@@ -527,6 +460,133 @@
"set_only_once": 0,
"unique": 0
},
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 1,
+ "collapsible_depends_on": "po_no",
+ "columns": 0,
+ "fieldname": "customer_po_details",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Customer PO Details",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "po_no",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Customer's Purchase Order No",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "po_no",
+ "oldfieldtype": "Data",
+ "permlevel": 0,
+ "print_hide": 1,
+ "print_hide_if_no_value": 0,
+ "print_width": "100px",
+ "read_only": 1,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0,
+ "width": "100px"
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "column_break_17",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "eval:doc.po_no",
+ "fieldname": "po_date",
+ "fieldtype": "Date",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Customer's Purchase Order Date",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "po_date",
+ "oldfieldtype": "Data",
+ "permlevel": 0,
+ "print_hide": 1,
+ "print_hide_if_no_value": 0,
+ "print_width": "100px",
+ "read_only": 1,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0,
+ "width": "100px"
+ },
{
"allow_bulk_edit": 0,
"allow_on_submit": 0,
@@ -3730,7 +3790,7 @@
"istable": 0,
"max_attachments": 0,
"menu_index": 0,
- "modified": "2018-01-11 14:40:21.152015",
+ "modified": "2018-01-12 15:27:44.471335",
"modified_by": "Administrator",
"module": "Stock",
"name": "Delivery Note",