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:
Rushabh Mehta 2015-11-06 16:54:17 +05:30
commit ae4c8a6a48
6 changed files with 15 additions and 8 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.7.4' __version__ = '6.7.5'

4
erpnext/accounts/doctype/pricing_rule/pricing_rule.py
View File

@ -168,7 +168,11 @@ def get_pricing_rules(args):
field = frappe.scrub(parenttype) field = frappe.scrub(parenttype)
condition = "" condition = ""
if args.get(field): if args.get(field):
try:
lft, rgt = frappe.db.get_value(parenttype, args[field], ["lft", "rgt"]) lft, rgt = frappe.db.get_value(parenttype, args[field], ["lft", "rgt"])
except TypeError:
frappe.throw(_("Invalid {0}").format(args[field]))
parent_groups = frappe.db.sql_list("""select name from `tab%s` parent_groups = frappe.db.sql_list("""select name from `tab%s`
where lft<=%s and rgt>=%s""" % (parenttype, '%s', '%s'), (lft, rgt)) where lft<=%s and rgt>=%s""" % (parenttype, '%s', '%s'), (lft, rgt))

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.7.4" app_version = "6.7.5"
source_link = "https://github.com/frappe/erpnext" source_link = "https://github.com/frappe/erpnext"
error_report_email = "support@erpnext.com" error_report_email = "support@erpnext.com"

4
erpnext/hr/doctype/process_payroll/process_payroll.py
View File

@ -196,11 +196,11 @@ class ProcessPayroll(Document):
journal_entry.set("accounts", [ journal_entry.set("accounts", [
{ {
"account": salary_account, "account": salary_account,
"debit": amount "debit_in_account_currency": amount
}, },
{ {
"account": default_bank_account, "account": default_bank_account,
"credit": amount "credit_in_account_currency": amount
}, },
]) ])

7
erpnext/selling/doctype/sales_order/sales_order.js
View File

@ -23,13 +23,16 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend(
$.each(cur_frm.doc.items, function(i, item){ $.each(cur_frm.doc.items, function(i, item){
if(item.delivered_by_supplier == 1 || item.supplier){ if(item.delivered_by_supplier == 1 || item.supplier){
if(item.qty > flt(item.ordered_qty)) if(item.qty > flt(item.ordered_qty)
&& item.qty > flt(item.delivered_qty)) {
is_delivered_by_supplier = true; is_delivered_by_supplier = true;
} }
}
else{ else{
if(item.qty > flt(item.delivered_qty)) if(item.qty > flt(item.delivered_qty)) {
is_delivery_note = true; is_delivery_note = true;
} }
}
}) })
// material request // material request

2
setup.py
View File

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