Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Fix] Packing Slip creation if custom field does not have a value (#11423)

Browse Source 
* [Fix] Packing Slip creation if custom field is Column/Section Break

* Used no_value_fields and sorted imports

* Update packing_slip.py
This commit is contained in:
Alchez 2017-11-10 11:14:57 +05:30 committed by Nabin Hait
parent 15753074bf
commit 1077c782a3
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
erpnext/stock/doctype/packing_slip/packing_slip.py
View File

@ -2,11 +2,13 @@
# License: GNU General Public License v3. See license.txt # License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe
from frappe.utils import flt, cint
from frappe import _
import frappe
from frappe import _
from frappe.model import no_value_fields
from frappe.model.document import Document from frappe.model.document import Document
from frappe.utils import cint, flt
class PackingSlip(Document): class PackingSlip(Document):
@ -84,11 +86,12 @@ class PackingSlip(Document):
* No. of Cases of this packing slip * No. of Cases of this packing slip
""" """
# also pick custom fields from delivery note
rows = [d.item_code for d in self.get("items")] rows = [d.item_code for d in self.get("items")]
custom_fields = ', '.join(['dni.`{0}`'.format(d.fieldname) for d in \ # also pick custom fields from delivery note
frappe.get_meta("Delivery Note Item").get_custom_fields()]) custom_fields = ', '.join(['dni.`{0}`'.format(d.fieldname)
for d in frappe.get_meta("Delivery Note Item").get_custom_fields()
if d.fieldtype not in no_value_fields])
if custom_fields: if custom_fields:
custom_fields = ', ' + custom_fields custom_fields = ', ' + custom_fields