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

Merge branch 'develop'

Browse Source
This commit is contained in:
Anand Doshi 2016-01-21 22:32:08 +05:30
commit f7e9a9d786
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__version__.py
View File

@ -1,2 +1,2 @@
from __future__ import unicode_literals from __future__ import unicode_literals
__version__ = '6.18.3' __version__ = '6.18.4'

2
erpnext/hooks.py
View File

@ -7,7 +7,7 @@ app_publisher = "Frappe Technologies Pvt. Ltd."
app_description = """ERP made simple""" app_description = """ERP made simple"""
app_icon = "icon-th" app_icon = "icon-th"
app_color = "#e74c3c" app_color = "#e74c3c"
app_version = "6.18.3" app_version = "6.18.4"
app_email = "info@erpnext.com" app_email = "info@erpnext.com"
app_license = "GNU General Public License (v3)" app_license = "GNU General Public License (v3)"
source_link = "https://github.com/frappe/erpnext" source_link = "https://github.com/frappe/erpnext"

6
erpnext/stock/get_item_details.py
View File

@ -84,7 +84,7 @@ def process_args(args):
args.item_code = get_item_code(barcode=args.barcode) args.item_code = get_item_code(barcode=args.barcode)
elif not args.item_code and args.serial_no: elif not args.item_code and args.serial_no:
args.item_code = get_item_code(serial_no=args.serial_no) args.item_code = get_item_code(serial_no=args.serial_no)
set_transaction_type(args) set_transaction_type(args)
return args return args
@ -200,7 +200,7 @@ def get_default_cost_center(args, item):
or args.get("cost_center")) or args.get("cost_center"))
def get_price_list_rate(args, item_doc, out): def get_price_list_rate(args, item_doc, out):
meta = frappe.get_meta(args.parenttype) meta = frappe.get_meta(args.doctype)
if meta.get_field("currency"): if meta.get_field("currency"):
validate_price_list(args) validate_price_list(args)
@ -288,7 +288,7 @@ def get_party_item_code(args, item_doc, out):
if args.transaction_type=="selling" and args.customer: if args.transaction_type=="selling" and args.customer:
customer_item_code = item_doc.get("customer_items", {"customer_name": args.customer}) customer_item_code = item_doc.get("customer_items", {"customer_name": args.customer})
out.customer_item_code = customer_item_code[0].ref_code if customer_item_code else None out.customer_item_code = customer_item_code[0].ref_code if customer_item_code else None
if args.transaction_type=="buying" and args.supplier: if args.transaction_type=="buying" and args.supplier:
item_supplier = item_doc.get("supplier_items", {"supplier": args.supplier}) item_supplier = item_doc.get("supplier_items", {"supplier": args.supplier})
out.supplier_part_no = item_supplier[0].supplier_part_no if item_supplier else None out.supplier_part_no = item_supplier[0].supplier_part_no if item_supplier else None

2
setup.py
View File

@ -1,7 +1,7 @@
from setuptools import setup, find_packages from setuptools import setup, find_packages
from pip.req import parse_requirements from pip.req import parse_requirements
version = "6.18.3" version = "6.18.4"
requirements = parse_requirements("requirements.txt", session="") requirements = parse_requirements("requirements.txt", session="")
setup( setup(