Skip to content

Commit

Permalink
Merge branch 'hotfix'
Browse files Browse the repository at this point in the history
  • Loading branch information
nabinhait committed Jan 16, 2017
2 parents 5d69900 + 71a730a commit 2bbf784
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
2 changes: 1 addition & 1 deletion erpnext/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from __future__ import unicode_literals
import frappe

__version__ = '7.2.11'
__version__ = '7.2.12'

def get_default_company(user=None):
'''Get default company for user'''
Expand Down
6 changes: 5 additions & 1 deletion erpnext/accounts/doctype/sales_invoice/pos.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,11 @@ def get_pos_data():
}

def get_meta():
doctype_meta = {'customer': frappe.get_meta('Customer')}
doctype_meta = {
'customer': frappe.get_meta('Customer'),
'invoice': frappe.get_meta('Sales Invoice')
}

for row in frappe.get_all('DocField', fields = ['fieldname', 'options'],
filters = {'parent': 'Sales Invoice', 'fieldtype': 'Table'}):
doctype_meta[row.fieldname] = frappe.get_meta(row.options)
Expand Down

0 comments on commit 2bbf784

Please sign in to comment.