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:
Pratik Vyas 2014-12-28 16:59:08 +05:30
commit ac86c5b6d1
4 changed files with 539 additions and 539 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__version__.py
View File

@ -1 +1 @@
__version__ = '4.15.2' __version__ = '4.15.3'

4
erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
View File

@ -156,7 +156,7 @@
"fieldtype": "Float", "fieldtype": "Float",
"hidden": 0, "hidden": 0,
"label": "Exchange Rate", "label": "Exchange Rate",
"no_copy": 1, "no_copy": 0,
"oldfieldname": "conversion_rate", "oldfieldname": "conversion_rate",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
"permlevel": 0, "permlevel": 0,
@ -575,7 +575,7 @@
"icon": "icon-shopping-cart", "icon": "icon-shopping-cart",
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"modified": "2014-09-09 05:35:35.369734", "modified": "2014-12-26 05:35:35.369734",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Buying", "module": "Buying",
"name": "Supplier Quotation", "name": "Supplier Quotation",

2
erpnext/hooks.py
View File

@ -4,7 +4,7 @@ app_publisher = "Web Notes Technologies Pvt. Ltd. and Contributors"
app_description = "Open Source Enterprise Resource Planning for Small and Midsized Organizations" app_description = "Open Source Enterprise Resource Planning for Small and Midsized Organizations"
app_icon = "icon-th" app_icon = "icon-th"
app_color = "#e74c3c" app_color = "#e74c3c"
app_version = "4.15.2" app_version = "4.15.3"
error_report_email = "support@erpnext.com" error_report_email = "support@erpnext.com"

2
setup.py
View File

@ -1,7 +1,7 @@
from setuptools import setup, find_packages from setuptools import setup, find_packages
import os import os
version = "4.15.2" version = "4.15.3"
with open("requirements.txt", "r") as f: with open("requirements.txt", "r") as f:
install_requires = f.readlines() install_requires = f.readlines()