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

fixed merge conflict

Browse Source
This commit is contained in:
Nabin Hait 2016-11-23 14:55:23 +05:30
commit d194cce35c
5 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__init__.py
View File

@ -2,7 +2,7 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe import frappe
__version__ = '7.1.17' __version__ = '7.1.18'
def get_default_company(user=None): def get_default_company(user=None):
'''Get default company for user''' '''Get default company for user'''

3
erpnext/accounts/doctype/account/account_tree.js
View File

@ -27,7 +27,8 @@ frappe.treeview_settings["Account"] = {
{fieldtype:'Check', fieldname:'is_group', label:__('Is Group'), {fieldtype:'Check', fieldname:'is_group', label:__('Is Group'),
description: __('Further accounts can be made under Groups, but entries can be made against non-Groups')}, description: __('Further accounts can be made under Groups, but entries can be made against non-Groups')},
{fieldtype:'Select', fieldname:'root_type', label:__('Root Type'), {fieldtype:'Select', fieldname:'root_type', label:__('Root Type'),
options: ['Asset', 'Liability', 'Equity', 'Income', 'Expense'].join('\n')}, options: ['Asset', 'Liability', 'Equity', 'Income', 'Expense'].join('\n'),
depends_on: 'eval:doc.is_group && !doc.parent_account'},
{fieldtype:'Select', fieldname:'account_type', label:__('Account Type'), {fieldtype:'Select', fieldname:'account_type', label:__('Account Type'),
options: ['', 'Bank', 'Cash', 'Stock', 'Tax', 'Chargeable', 'Fixed Asset'].join('\n'), options: ['', 'Bank', 'Cash', 'Stock', 'Tax', 'Chargeable', 'Fixed Asset'].join('\n'),
description: __("Optional. This setting will be used to filter in various transactions.") description: __("Optional. This setting will be used to filter in various transactions.")

3
erpnext/setup/doctype/naming_series/naming_series.py
View File

@ -14,7 +14,8 @@ class NamingSeriesNotSetError(frappe.ValidationError): pass
class NamingSeries(Document): class NamingSeries(Document):
def get_transactions(self, arg=None): def get_transactions(self, arg=None):
doctypes = list(set(frappe.db.sql_list("""select parent doctypes = list(set(frappe.db.sql_list("""select parent
from `tabDocField` where fieldname='naming_series'""") from `tabDocField` df where fieldname='naming_series' and
exists(select * from `tabDocPerm` dp, `tabRole` role where dp.role = role.name and dp.parent = df.parent and not role.disabled)""")
+ frappe.db.sql_list("""select dt from `tabCustom Field` + frappe.db.sql_list("""select dt from `tabCustom Field`
where fieldname='naming_series'"""))) where fieldname='naming_series'""")))

2
erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
View File

@ -1691,7 +1691,7 @@
"issingle": 0, "issingle": 0,
"istable": 1, "istable": 1,
"max_attachments": 0, "max_attachments": 0,
"modified": "2016-11-23 11:40:31.739993", "modified": "2016-11-23 12:33:37.728117",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Delivery Note Item", "name": "Delivery Note Item",

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

@ -141,7 +141,7 @@ class Item(WebsiteGenerator):
def make_route(self): def make_route(self):
if not self.route: if not self.route:
return frappe.db.get_value('Item Group', self.item_group, 'route') + '/' + self.scrub(self.item_name) return cstr(frappe.db.get_value('Item Group', self.item_group, 'route')) + '/' + self.scrub(self.item_name)
def get_parents(self, context): def get_parents(self, context):
item_group, route = frappe.db.get_value('Item Group', self.item_group, ['name', 'route']) item_group, route = frappe.db.get_value('Item Group', self.item_group, ['name', 'route'])