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:
Nabin Hait 2015-11-16 17:07:38 +05:30
commit e1feab1d70
6 changed files with 10 additions and 4 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.9.0' __version__ = '6.9.1'

4
erpnext/change_log/v6/v6_9_1.md Normal file
View File

@ -0,0 +1,4 @@
- Invoice Outstanding calculation fixed related to advance
- Show Close button only for users with Submit rights and for Delivery Note and Purchase Receipt, only if it is returned
- Don't show Receive for a Purchase Order having non-stock items
- Leave Allocation, Application and Balance report cleanup and fixes

2
erpnext/hooks.py
View File

@ -29,7 +29,7 @@ blogs.
""" """
app_icon = "icon-th" app_icon = "icon-th"
app_color = "#e74c3c" app_color = "#e74c3c"
app_version = "6.9.0" app_version = "6.9.1"
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"

2
erpnext/stock/doctype/item/item.js
View File

@ -87,6 +87,8 @@ frappe.ui.form.on("Item", {
is_stock_item: function(frm) { is_stock_item: function(frm) {
erpnext.item.toggle_reqd(frm); erpnext.item.toggle_reqd(frm);
if(frm.doc.is_pro_applicable && !frm.doc.is_stock_item)
frm.set_value("is_pro_applicable", 0);
}, },
has_variants: function(frm) { has_variants: function(frm) {

2
erpnext/stock/doctype/item/item.py
View File

@ -311,7 +311,7 @@ class Item(WebsiteGenerator):
def validate_item_type(self): def validate_item_type(self):
if self.is_pro_applicable == 1 and self.is_stock_item==0: if self.is_pro_applicable == 1 and self.is_stock_item==0:
frappe.throw(_("As Production Order can be made for this item, it must be a stock item.")) self.is_pro_applicable = 0
if self.has_serial_no == 1 and self.is_stock_item == 0: if self.has_serial_no == 1 and self.is_stock_item == 0:
msgprint(_("'Has Serial No' can not be 'Yes' for non-stock item"), raise_exception=1) msgprint(_("'Has Serial No' can not be 'Yes' for non-stock item"), raise_exception=1)

2
setup.py
View File

@ -1,6 +1,6 @@
from setuptools import setup, find_packages from setuptools import setup, find_packages
version = "6.9.0" version = "6.9.1"
with open("requirements.txt", "r") as f: with open("requirements.txt", "r") as f:
install_requires = f.readlines() install_requires = f.readlines()