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 2015-09-09 15:32:03 +05:30
commit f668a4d03c
139 changed files with 6783 additions and 4093 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.0.1' __version__ = '6.1.0'

10
erpnext/accounts/doctype/account/account.json
View File

@ -402,7 +402,7 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-07-20 03:54:14.297995", "modified": "2015-09-07 15:51:26",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Account", "name": "Account",
@ -410,7 +410,7 @@
"permissions": [ "permissions": [
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 1, "create": 1,
"delete": 1, "delete": 1,
@ -430,7 +430,7 @@
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,
@ -450,7 +450,7 @@
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,
@ -470,7 +470,7 @@
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,

4
erpnext/accounts/doctype/c_form/c_form.json
View File

@ -344,7 +344,7 @@
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"max_attachments": 3, "max_attachments": 3,
"modified": "2015-02-05 05:11:35.427357", "modified": "2015-09-07 15:51:26",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "C-Form", "name": "C-Form",
@ -352,7 +352,7 @@
"permissions": [ "permissions": [
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 1, "create": 1,
"delete": 0, "delete": 0,

10
erpnext/accounts/doctype/cost_center/cost_center.json
View File

@ -298,7 +298,7 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-07-13 05:28:25.504801", "modified": "2015-09-07 15:51:26",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Cost Center", "name": "Cost Center",
@ -326,7 +326,7 @@
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,
@ -346,7 +346,7 @@
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,
@ -366,7 +366,7 @@
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,
@ -386,7 +386,7 @@
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,

4
erpnext/accounts/doctype/fiscal_year/fiscal_year.json
View File

@ -133,7 +133,7 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-07-13 05:28:27.745408", "modified": "2015-09-07 15:51:26",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Fiscal Year", "name": "Fiscal Year",
@ -161,7 +161,7 @@
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,

4
erpnext/accounts/doctype/gl_entry/gl_entry.json
View File

@ -442,7 +442,7 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-07-09 15:51:04.986518", "modified": "2015-09-07 15:51:26",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "GL Entry", "name": "GL Entry",
@ -450,7 +450,7 @@
"permissions": [ "permissions": [
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,

17
erpnext/accounts/doctype/gl_entry/gl_entry.py
View File

@ -4,7 +4,7 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe import frappe
from frappe.utils import flt, fmt_money, getdate, formatdate, cstr from frappe.utils import flt, fmt_money, getdate, formatdate
from frappe import _ from frappe import _
from frappe.model.document import Document from frappe.model.document import Document
@ -124,12 +124,18 @@ def check_freezing_date(posting_date, adv_adj=False):
frappe.throw(_("You are not authorized to add or update entries before {0}").format(formatdate(acc_frozen_upto))) frappe.throw(_("You are not authorized to add or update entries before {0}").format(formatdate(acc_frozen_upto)))
def update_outstanding_amt(account, party_type, party, against_voucher_type, against_voucher, on_cancel=False): def update_outstanding_amt(account, party_type, party, against_voucher_type, against_voucher, on_cancel=False):
if party_type and party:
party_condition = " and ifnull(party_type, '')='{0}' and ifnull(party, '')='{1}'"\
.format(frappe.db.escape(party_type), frappe.db.escape(party))
else:
party_condition = ""
# get final outstanding amt # get final outstanding amt
bal = flt(frappe.db.sql("""select sum(ifnull(debit, 0)) - sum(ifnull(credit, 0)) bal = flt(frappe.db.sql("""select sum(ifnull(debit, 0)) - sum(ifnull(credit, 0))
from `tabGL Entry` from `tabGL Entry`
where against_voucher_type=%s and against_voucher=%s where against_voucher_type=%s and against_voucher=%s
and account = %s and ifnull(party_type, '')=%s and ifnull(party, '')=%s""", and account = %s {0}""".format(party_condition),
(against_voucher_type, against_voucher, account, party_type, party))[0][0] or 0.0) (against_voucher_type, against_voucher, account))[0][0] or 0.0)
if against_voucher_type == 'Purchase Invoice': if against_voucher_type == 'Purchase Invoice':
bal = -bal bal = -bal
@ -137,9 +143,8 @@ def update_outstanding_amt(account, party_type, party, against_voucher_type, aga
against_voucher_amount = flt(frappe.db.sql(""" against_voucher_amount = flt(frappe.db.sql("""
select sum(ifnull(debit, 0)) - sum(ifnull(credit, 0)) select sum(ifnull(debit, 0)) - sum(ifnull(credit, 0))
from `tabGL Entry` where voucher_type = 'Journal Entry' and voucher_no = %s from `tabGL Entry` where voucher_type = 'Journal Entry' and voucher_no = %s
and account = %s and ifnull(party_type, '')=%s and ifnull(party, '')=%s and account = %s and ifnull(against_voucher, '') = '' {0}"""
and ifnull(against_voucher, '') = ''""", .format(party_condition), (against_voucher, account))[0][0])
(against_voucher, account, cstr(party_type), cstr(party)))[0][0])
if not against_voucher_amount: if not against_voucher_amount:
frappe.throw(_("Against Journal Entry {0} is already adjusted against some other voucher") frappe.throw(_("Against Journal Entry {0} is already adjusted against some other voucher")

24
erpnext/accounts/doctype/journal_entry/journal_entry.js
View File

@ -59,7 +59,6 @@ erpnext.accounts.JournalEntry = frappe.ui.form.Controller.extend({
// journal entry // journal entry
if(jvd.reference_type==="Journal Entry") { if(jvd.reference_type==="Journal Entry") {
frappe.model.validate_missing(jvd, "account"); frappe.model.validate_missing(jvd, "account");
return { return {
query: "erpnext.accounts.doctype.journal_entry.journal_entry.get_against_jv", query: "erpnext.accounts.doctype.journal_entry.journal_entry.get_against_jv",
filters: { filters: {
@ -69,24 +68,33 @@ erpnext.accounts.JournalEntry = frappe.ui.form.Controller.extend({
}; };
} }
// against party
frappe.model.validate_missing(jvd, "party_type");
frappe.model.validate_missing(jvd, "party");
var out = { var out = {
filters: [ filters: [
[jvd.reference_type, jvd.reference_type.indexOf("Sales")===0 ? "customer" : "supplier", "=", jvd.party], [jvd.reference_type, "docstatus", "=", 1]
[jvd.reference_type, "docstatus", "=", 1],
] ]
}; };
if(in_list(["Sales Invoice", "Purchase Invoice"], jvd.reference_type)) { if(in_list(["Sales Invoice", "Purchase Invoice"], jvd.reference_type)) {
out.filters.push([jvd.reference_type, "outstanding_amount", "!=", 0]); out.filters.push([jvd.reference_type, "outstanding_amount", "!=", 0]);
// account filter
frappe.model.validate_missing(jvd, "account");
party_account_field = jvd.reference_type==="Sales Invoice" ? "debit_to": "credit_to";
out.filters.push([jvd.reference_type, party_account_field, "=", jvd.account]);
} else { } else {
// party_type and party mandatory
frappe.model.validate_missing(jvd, "party_type");
frappe.model.validate_missing(jvd, "party");
out.filters.push([jvd.reference_type, "per_billed", "<", 100]); out.filters.push([jvd.reference_type, "per_billed", "<", 100]);
} }
if(jvd.party_type && jvd.party) {
out.filters.push([jvd.reference_type,
(jvd.reference_type.indexOf("Sales")===0 ? "customer" : "supplier"), "=", jvd.party]);
}
return out; return out;
}); });

6
erpnext/accounts/doctype/journal_entry/journal_entry.json
View File

@ -1002,7 +1002,7 @@
"is_submittable": 1, "is_submittable": 1,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-08-27 03:19:18.634225", "modified": "2015-09-07 15:51:26",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Journal Entry", "name": "Journal Entry",
@ -1010,7 +1010,7 @@
"permissions": [ "permissions": [
{ {
"amend": 1, "amend": 1,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 1, "cancel": 1,
"create": 1, "create": 1,
"delete": 1, "delete": 1,
@ -1050,7 +1050,7 @@
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,

4
erpnext/accounts/doctype/mode_of_payment/mode_of_payment.json
View File

@ -65,7 +65,7 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-02-05 05:11:41.346436", "modified": "2015-09-07 15:51:26",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Mode of Payment", "name": "Mode of Payment",
@ -93,7 +93,7 @@
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,

4
erpnext/accounts/doctype/pos_profile/pos_profile.json
View File

@ -622,7 +622,7 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-08-18 17:49:09.098876", "modified": "2015-09-07 15:51:26",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "POS Profile", "name": "POS Profile",
@ -650,7 +650,7 @@
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,

10
erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
View File

@ -2175,7 +2175,7 @@
"is_submittable": 1, "is_submittable": 1,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-08-27 03:21:24.432106", "modified": "2015-09-07 15:51:26",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Purchase Invoice", "name": "Purchase Invoice",
@ -2183,7 +2183,7 @@
"permissions": [ "permissions": [
{ {
"amend": 1, "amend": 1,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 1, "cancel": 1,
"create": 1, "create": 1,
"delete": 0, "delete": 0,
@ -2203,7 +2203,7 @@
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,
@ -2223,7 +2223,7 @@
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,
@ -2263,7 +2263,7 @@
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,

6
erpnext/accounts/doctype/sales_invoice/sales_invoice.json
View File

@ -2882,7 +2882,7 @@
"is_submittable": 1, "is_submittable": 1,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-08-27 03:29:14.270731", "modified": "2015-09-07 15:51:26",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Sales Invoice", "name": "Sales Invoice",
@ -2910,7 +2910,7 @@
}, },
{ {
"amend": 1, "amend": 1,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 1, "create": 1,
"delete": 0, "delete": 0,
@ -2930,7 +2930,7 @@
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,

17
erpnext/accounts/doctype/sales_invoice/sales_invoice.py
View File

@ -88,13 +88,13 @@ class SalesInvoice(SellingController):
self.update_status_updater_args() self.update_status_updater_args()
self.update_prevdoc_status() self.update_prevdoc_status()
# this sequence because outstanding may get -ve
self.make_gl_entries()
if not self.is_return: if not self.is_return:
self.update_billing_status_for_zero_amount_refdoc("Sales Order") self.update_billing_status_for_zero_amount_refdoc("Sales Order")
self.check_credit_limit() self.check_credit_limit()
# this sequence because outstanding may get -ve
self.make_gl_entries()
if not cint(self.is_pos) == 1 and not self.is_return: if not cint(self.is_pos) == 1 and not self.is_return:
self.update_against_document_in_jv() self.update_against_document_in_jv()
@ -162,6 +162,17 @@ class SalesInvoice(SellingController):
} }
]) ])
def check_credit_limit(self):
from erpnext.selling.doctype.customer.customer import check_credit_limit
validate_against_credit_limit = False
for d in self.get("items"):
if not (d.sales_order or d.delivery_note):
validate_against_credit_limit = True
break
if validate_against_credit_limit:
check_credit_limit(self.customer, self.company)
def set_missing_values(self, for_validate=False): def set_missing_values(self, for_validate=False):
pos = self.set_pos_fields(for_validate) pos = self.set_pos_fields(for_validate)

4
erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.json
View File

@ -198,7 +198,7 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-05-06 08:51:54.662853", "modified": "2015-09-07 15:51:26",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Sales Taxes and Charges Template", "name": "Sales Taxes and Charges Template",
@ -206,7 +206,7 @@
"permissions": [ "permissions": [
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,

6
erpnext/accounts/doctype/shipping_rule/shipping_rule.json
View File

@ -296,7 +296,7 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-02-05 05:11:46.634371", "modified": "2015-09-07 15:51:26",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Shipping Rule", "name": "Shipping Rule",
@ -304,7 +304,7 @@
"permissions": [ "permissions": [
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,
@ -324,7 +324,7 @@
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,

17
erpnext/accounts/page/accounts_browser/accounts_browser.js
View File

@ -42,13 +42,13 @@ frappe.pages["Accounts Browser"].on_page_load = function(wrapper){
wrapper.page.add_menu_item(__('New Company'), function() { newdoc('Company'); }, true); wrapper.page.add_menu_item(__('New Company'), function() { newdoc('Company'); }, true);
} }
wrapper.page.set_secondary_action(__('Refresh'), function() { wrapper.page.add_menu_item(__('Refresh'), function() {
wrapper.$company_select.change(); wrapper.$company_select.change();
}); });
wrapper.page.set_primary_action(__('New'), function() { wrapper.page.set_primary_action(__('New'), function() {
erpnext.account_chart && erpnext.account_chart.make_new(); erpnext.account_chart && erpnext.account_chart.make_new();
}); }, "octicon octicon-plus");
// company-select // company-select
wrapper.$company_select = wrapper.page.add_select("Company", []) wrapper.$company_select = wrapper.page.add_select("Company", [])
@ -121,7 +121,8 @@ erpnext.AccountsChart = Class.extend({
label: __("Add Child"), label: __("Add Child"),
click: function() { click: function() {
me.make_new() me.make_new()
} },
btnClass: "hidden-xs"
}, },
{ {
condition: function(node) { condition: function(node) {
@ -137,8 +138,8 @@ erpnext.AccountsChart = Class.extend({
"company": me.company "company": me.company
}; };
frappe.set_route("query-report", "General Ledger"); frappe.set_route("query-report", "General Ledger");
} },
btnClass: "hidden-xs"
}, },
{ {
condition: function(node) { return !node.root && me.can_write }, condition: function(node) { return !node.root && me.can_write },
@ -147,7 +148,8 @@ erpnext.AccountsChart = Class.extend({
frappe.model.rename_doc(me.ctype, node.label, function(new_name) { frappe.model.rename_doc(me.ctype, node.label, function(new_name) {
node.reload(); node.reload();
}); });
} },
btnClass: "hidden-xs"
}, },
{ {
condition: function(node) { return !node.root && me.can_delete }, condition: function(node) { return !node.root && me.can_delete },
@ -156,7 +158,8 @@ erpnext.AccountsChart = Class.extend({
frappe.model.delete_doc(me.ctype, node.label, function() { frappe.model.delete_doc(me.ctype, node.label, function() {
node.parent.remove(); node.parent.remove();
}); });
} },
btnClass: "hidden-xs"
} }
], ],
onrender: function(node) { onrender: function(node) {

2
erpnext/accounts/report/gross_profit/gross_profit.py
View File

@ -226,7 +226,7 @@ class GrossProfitGenerator(object):
inner join `tabSales Invoice Item` item on item.parent = si.name inner join `tabSales Invoice Item` item on item.parent = si.name
left join `tabSales Team` sales on sales.parent = si.name left join `tabSales Team` sales on sales.parent = si.name
where where
si.docstatus = 1 %s si.docstatus = 1 and si.is_return != 1 %s
order by order by
si.posting_date desc, si.posting_time desc""" % (conditions,), self.filters, as_dict=1) si.posting_date desc, si.posting_time desc""" % (conditions,), self.filters, as_dict=1)

8
erpnext/buying/doctype/purchase_order/purchase_order.json
View File

@ -2032,7 +2032,7 @@
"is_submittable": 1, "is_submittable": 1,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-08-27 06:26:20.233037", "modified": "2015-09-07 15:51:26",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Buying", "module": "Buying",
"name": "Purchase Order", "name": "Purchase Order",
@ -2040,7 +2040,7 @@
"permissions": [ "permissions": [
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,
@ -2080,7 +2080,7 @@
}, },
{ {
"amend": 1, "amend": 1,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 1, "cancel": 1,
"create": 1, "create": 1,
"delete": 1, "delete": 1,
@ -2100,7 +2100,7 @@
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,

6
erpnext/buying/doctype/supplier/supplier.json
View File

@ -511,7 +511,7 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-08-25 07:14:56.245716", "modified": "2015-09-07 15:51:26",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Buying", "module": "Buying",
"name": "Supplier", "name": "Supplier",
@ -579,7 +579,7 @@
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,
@ -619,7 +619,7 @@
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,

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

@ -1554,7 +1554,7 @@
"is_submittable": 1, "is_submittable": 1,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-08-27 03:23:35.148488", "modified": "2015-09-07 15:51:26",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Buying", "module": "Buying",
"name": "Supplier Quotation", "name": "Supplier Quotation",
@ -1602,7 +1602,7 @@
}, },
{ {
"amend": 1, "amend": 1,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 1, "create": 1,
"delete": 0, "delete": 0,
@ -1622,7 +1622,7 @@
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,
@ -1642,7 +1642,7 @@
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,

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

@ -0,0 +1,4 @@
- Set default costing rate and billing rate in **Activity Type**
- Task not mandatory in **Time Log** and **Expense Claim**
- **Stock Settings**: Enable/Disable automatic fetching of Serial Nos. based on FIFO
- Fixes in Tree UI for mobile, Gross Profit Report and Credit Limit checking

4
erpnext/controllers/selling_controller.py
View File

@ -32,10 +32,6 @@ class SellingController(StockController):
self.validate_max_discount() self.validate_max_discount()
check_active_sales_items(self) check_active_sales_items(self)
def check_credit_limit(self):
from erpnext.selling.doctype.customer.customer import check_credit_limit
check_credit_limit(self.customer, self.company)
def set_missing_values(self, for_validate=False): def set_missing_values(self, for_validate=False):
super(SellingController, self).set_missing_values(for_validate) super(SellingController, self).set_missing_values(for_validate)

4
erpnext/crm/doctype/opportunity/opportunity.json
View File

@ -889,7 +889,7 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-08-26 06:56:09.914607", "modified": "2015-09-07 15:51:26",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "CRM", "module": "CRM",
"name": "Opportunity", "name": "Opportunity",
@ -897,7 +897,7 @@
"permissions": [ "permissions": [
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 1, "create": 1,
"delete": 1, "delete": 1,

2
erpnext/hooks.py
View File

@ -27,7 +27,7 @@ blogs.
""" """
app_icon = "icon-th" app_icon = "icon-th"
app_color = "#e74c3c" app_color = "#e74c3c"
app_version = "6.0.1" app_version = "6.1.0"
github_link = "https://github.com/frappe/erpnext" github_link = "https://github.com/frappe/erpnext"
error_report_email = "support@erpnext.com" error_report_email = "support@erpnext.com"

6
erpnext/hr/doctype/appraisal/appraisal.json
View File

@ -465,7 +465,7 @@
"is_submittable": 1, "is_submittable": 1,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-03-02 07:00:45.803789", "modified": "2015-09-07 15:51:26",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Appraisal", "name": "Appraisal",
@ -473,7 +473,7 @@
"permissions": [ "permissions": [
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 1, "create": 1,
"delete": 0, "delete": 0,
@ -513,7 +513,7 @@
}, },
{ {
"amend": 1, "amend": 1,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 1, "cancel": 1,
"create": 1, "create": 1,
"delete": 1, "delete": 1,

4
erpnext/hr/doctype/appraisal_template/appraisal_template.json
View File

@ -91,7 +91,7 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-03-02 06:32:50.109677", "modified": "2015-09-07 15:51:26",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Appraisal Template", "name": "Appraisal Template",
@ -99,7 +99,7 @@
"permissions": [ "permissions": [
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 1, "create": 1,
"delete": 0, "delete": 0,

4
erpnext/hr/doctype/attendance/attendance.json
View File

@ -277,7 +277,7 @@
"is_submittable": 1, "is_submittable": 1,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-02-20 05:09:39.161541", "modified": "2015-09-07 15:51:26",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Attendance", "name": "Attendance",
@ -305,7 +305,7 @@
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 1, "cancel": 1,
"create": 1, "create": 1,
"delete": 1, "delete": 1,

4
erpnext/hr/doctype/branch/branch.json
View File

@ -42,7 +42,7 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-02-05 05:11:35.266252", "modified": "2015-09-07 15:51:26",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Branch", "name": "Branch",
@ -50,7 +50,7 @@
"permissions": [ "permissions": [
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 1, "create": 1,
"delete": 1, "delete": 1,

4
erpnext/hr/doctype/deduction_type/deduction_type.json
View File

@ -66,7 +66,7 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-02-05 05:11:37.070363", "modified": "2015-09-07 15:51:26",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Deduction Type", "name": "Deduction Type",
@ -74,7 +74,7 @@
"permissions": [ "permissions": [
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 1, "create": 1,
"delete": 1, "delete": 1,

4
erpnext/hr/doctype/department/department.json
View File

@ -65,7 +65,7 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-02-05 05:11:37.460611", "modified": "2015-09-07 15:51:26",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Department", "name": "Department",
@ -73,7 +73,7 @@
"permissions": [ "permissions": [
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 1, "create": 1,
"delete": 1, "delete": 1,

4
erpnext/hr/doctype/designation/designation.json
View File

@ -42,7 +42,7 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-02-05 05:11:37.500898", "modified": "2015-09-07 15:51:26",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Designation", "name": "Designation",
@ -50,7 +50,7 @@
"permissions": [ "permissions": [
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 1, "create": 1,
"delete": 1, "delete": 1,

4
erpnext/hr/doctype/earning_type/earning_type.json
View File

@ -66,7 +66,7 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-02-05 05:11:37.761378", "modified": "2015-09-07 15:51:26",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Earning Type", "name": "Earning Type",
@ -74,7 +74,7 @@
"permissions": [ "permissions": [
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 1, "create": 1,
"delete": 1, "delete": 1,

6
erpnext/hr/doctype/employee/employee.json
View File

@ -1893,7 +1893,7 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-07-09 02:25:20.987412", "modified": "2015-09-07 15:51:26",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Employee", "name": "Employee",
@ -1901,7 +1901,7 @@
"permissions": [ "permissions": [
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,
@ -1921,7 +1921,7 @@
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 1, "create": 1,
"delete": 1, "delete": 1,

4
erpnext/hr/doctype/employment_type/employment_type.json
View File

@ -42,7 +42,7 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-02-05 05:11:38.516592", "modified": "2015-09-07 15:51:26",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Employment Type", "name": "Employment Type",
@ -50,7 +50,7 @@
"permissions": [ "permissions": [
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 1, "create": 1,
"delete": 1, "delete": 1,

33
erpnext/hr/doctype/expense_claim/expense_claim.json
View File

@ -456,12 +456,13 @@
"unique": 0 "unique": 0
}, },
{ {
"allow_on_submit": 0, "allow_on_submit": 1,
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"default": "{employee_name}",
"fieldname": "title", "fieldname": "title",
"fieldtype": "Data", "fieldtype": "Data",
"hidden": 0, "hidden": 1,
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
@ -535,15 +536,35 @@
"is_submittable": 1, "is_submittable": 1,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-05-02 07:42:25.202983", "modified": "2015-09-07 15:51:26",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Expense Claim", "name": "Expense Claim",
"owner": "harshada@webnotestech.com", "owner": "harshada@webnotestech.com",
"permissions": [ "permissions": [
{
"amend": 1,
"apply_user_permissions": 0,
"cancel": 1,
"create": 1,
"delete": 1,
"email": 1,
"export": 1,
"if_owner": 0,
"import": 0,
"permlevel": 0,
"print": 1,
"read": 1,
"report": 1,
"role": "HR Manager",
"set_user_permissions": 0,
"share": 1,
"submit": 1,
"write": 1
},
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 1, "create": 1,
"delete": 0, "delete": 0,
@ -563,7 +584,7 @@
}, },
{ {
"amend": 1, "amend": 1,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 1, "cancel": 1,
"create": 1, "create": 1,
"delete": 1, "delete": 1,
@ -584,7 +605,7 @@
}, },
{ {
"amend": 1, "amend": 1,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 1, "cancel": 1,
"create": 1, "create": 1,
"delete": 1, "delete": 1,

15
erpnext/hr/doctype/expense_claim/expense_claim.py
View File

@ -20,19 +20,24 @@ class ExpenseClaim(Document):
validate_fiscal_year(self.posting_date, self.fiscal_year, _("Posting Date"), self) validate_fiscal_year(self.posting_date, self.fiscal_year, _("Posting Date"), self)
self.validate_sanctioned_amount() self.validate_sanctioned_amount()
self.validate_expense_approver() self.validate_expense_approver()
self.validate_task()
self.calculate_total_amount() self.calculate_total_amount()
set_employee_name(self) set_employee_name(self)
if self.task and not self.project:
self.project = frappe.db.get_value("Task", self.task, "project")
def on_submit(self): def on_submit(self):
if self.approval_status=="Draft": if self.approval_status=="Draft":
frappe.throw(_("""Approval Status must be 'Approved' or 'Rejected'""")) frappe.throw(_("""Approval Status must be 'Approved' or 'Rejected'"""))
if self.task: self.update_task_and_project()
self.update_task()
def on_cancel(self): def on_cancel(self):
self.update_task_and_project()
def update_task_and_project(self):
if self.task: if self.task:
self.update_task() self.update_task()
elif self.project:
frappe.get_doc("Project", self.project).update_project()
def calculate_total_amount(self): def calculate_total_amount(self):
self.total_claimed_amount = 0 self.total_claimed_amount = 0
@ -51,10 +56,6 @@ class ExpenseClaim(Document):
task.update_total_expense_claim() task.update_total_expense_claim()
task.save() task.save()
def validate_task(self):
if self.project and not self.task:
frappe.throw(_("Task is mandatory if Expense Claim is against a Project"))
def validate_sanctioned_amount(self): def validate_sanctioned_amount(self):
for d in self.get('expenses'): for d in self.get('expenses'):
if flt(d.sanctioned_amount) > flt(d.claim_amount): if flt(d.sanctioned_amount) > flt(d.claim_amount):

5
erpnext/hr/doctype/expense_claim/test_expense_claim.py
View File

@ -11,6 +11,8 @@ class TestExpenseClaim(unittest.TestCase):
def test_total_expense_claim_for_project(self): def test_total_expense_claim_for_project(self):
frappe.db.sql("""delete from `tabTask` where project = "_Test Project 1" """) frappe.db.sql("""delete from `tabTask` where project = "_Test Project 1" """)
frappe.db.sql("""delete from `tabProject` where name = "_Test Project 1" """) frappe.db.sql("""delete from `tabProject` where name = "_Test Project 1" """)
frappe.db.sql("""delete from `tabExpense Claim`""")
frappe.db.sql("""delete from `tabExpense Claim Detail`""")
frappe.get_doc({ frappe.get_doc({
"project_name": "_Test Project 1", "project_name": "_Test Project 1",
@ -19,7 +21,8 @@ class TestExpenseClaim(unittest.TestCase):
[{ "title": "_Test Project Task 1", "status": "Open" }] [{ "title": "_Test Project Task 1", "status": "Open" }]
}).save() }).save()
task_name = frappe.db.get_value("Task",{"project": "_Test Project 1"}) task_name = frappe.db.get_value("Task", {"project": "_Test Project 1"})
expense_claim = frappe.get_doc({ expense_claim = frappe.get_doc({
"doctype": "Expense Claim", "doctype": "Expense Claim",
"employee": "_T-Employee-0001", "employee": "_T-Employee-0001",

4
erpnext/hr/doctype/job_applicant/job_applicant.json
View File

@ -191,7 +191,7 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-03-23 05:42:02.016041", "modified": "2015-09-07 15:51:26",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Job Applicant", "name": "Job Applicant",
@ -199,7 +199,7 @@
"permissions": [ "permissions": [
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 1, "create": 1,
"delete": 1, "delete": 1,

4
erpnext/hr/doctype/job_opening/job_opening.json
View File

@ -85,7 +85,7 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-02-05 05:11:40.083704", "modified": "2015-09-07 15:51:26",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Job Opening", "name": "Job Opening",
@ -93,7 +93,7 @@
"permissions": [ "permissions": [
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 1, "create": 1,
"delete": 1, "delete": 1,

4
erpnext/hr/doctype/leave_allocation/leave_allocation.json
View File

@ -310,7 +310,7 @@
"is_submittable": 1, "is_submittable": 1,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-05-08 03:44:08.092937", "modified": "2015-09-07 15:51:26",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Leave Allocation", "name": "Leave Allocation",
@ -318,7 +318,7 @@
"permissions": [ "permissions": [
{ {
"amend": 1, "amend": 1,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 1, "cancel": 1,
"create": 1, "create": 1,
"delete": 1, "delete": 1,

8
erpnext/hr/doctype/leave_application/leave_application.json
View File

@ -559,7 +559,7 @@
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"max_attachments": 3, "max_attachments": 3,
"modified": "2015-05-27 18:44:36.708614", "modified": "2015-09-07 15:51:26",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Leave Application", "name": "Leave Application",
@ -567,7 +567,7 @@
"permissions": [ "permissions": [
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 1, "create": 1,
"delete": 0, "delete": 0,
@ -628,7 +628,7 @@
}, },
{ {
"amend": 1, "amend": 1,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 1, "cancel": 1,
"create": 1, "create": 1,
"delete": 1, "delete": 1,
@ -649,7 +649,7 @@
}, },
{ {
"amend": 1, "amend": 1,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,

4
erpnext/hr/doctype/leave_block_list/leave_block_list.json
View File

@ -195,7 +195,7 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-02-05 05:11:40.729590", "modified": "2015-09-07 15:51:26",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Leave Block List", "name": "Leave Block List",
@ -203,7 +203,7 @@
"permissions": [ "permissions": [
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 1, "create": 1,
"delete": 0, "delete": 0,

6
erpnext/hr/doctype/leave_type/leave_type.json
View File

@ -174,7 +174,7 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-07-29 05:15:24", "modified": "2015-09-07 15:51:26",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Leave Type", "name": "Leave Type",
@ -182,7 +182,7 @@
"permissions": [ "permissions": [
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 1, "create": 1,
"delete": 1, "delete": 1,
@ -222,7 +222,7 @@
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,

6
erpnext/hr/doctype/salary_slip/salary_slip.json
View File

@ -822,7 +822,7 @@
"is_submittable": 1, "is_submittable": 1,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-02-20 05:12:10.770423", "modified": "2015-09-07 15:51:26",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Salary Slip", "name": "Salary Slip",
@ -830,7 +830,7 @@
"permissions": [ "permissions": [
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 1, "create": 1,
"delete": 0, "delete": 0,
@ -871,7 +871,7 @@
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,

4
erpnext/hr/doctype/salary_structure/salary_structure.json
View File

@ -524,7 +524,7 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-04-06 06:56:02.395512", "modified": "2015-09-07 15:51:26",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Salary Structure", "name": "Salary Structure",
@ -532,7 +532,7 @@
"permissions": [ "permissions": [
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 1, "create": 1,
"delete": 0, "delete": 0,

4
erpnext/manufacturing/doctype/bom/bom.json
View File

@ -713,7 +713,7 @@
"is_submittable": 1, "is_submittable": 1,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-08-12 08:52:36.656865", "modified": "2015-09-07 15:51:26",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Manufacturing", "module": "Manufacturing",
"name": "BOM", "name": "BOM",
@ -741,7 +741,7 @@
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 1, "cancel": 1,
"create": 1, "create": 1,
"delete": 1, "delete": 1,

6
erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.py
View File

@ -11,7 +11,5 @@ class ManufacturingSettings(Document):
pass pass
def get_mins_between_operations(): def get_mins_between_operations():
if not hasattr(frappe.local, "_mins_between_operations"): return relativedelta(minutes=cint(frappe.db.get_single_value("Manufacturing Settings",
frappe.local._mins_between_operations = cint(frappe.db.get_single_value("Manufacturing Settings", "mins_between_operations")) or 10)
"mins_between_operations")) or 10
return relativedelta(minutes=frappe.local._mins_between_operations)

6
erpnext/manufacturing/doctype/production_order/production_order.json
View File

@ -871,7 +871,7 @@
"is_submittable": 1, "is_submittable": 1,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-08-27 03:27:08.064900", "modified": "2015-09-07 15:51:26",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Manufacturing", "module": "Manufacturing",
"name": "Production Order", "name": "Production Order",
@ -879,7 +879,7 @@
"permissions": [ "permissions": [
{ {
"amend": 1, "amend": 1,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 1, "cancel": 1,
"create": 1, "create": 1,
"delete": 1, "delete": 1,
@ -899,7 +899,7 @@
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,

38
erpnext/manufacturing/doctype/production_order/production_order.py
View File

@ -2,9 +2,9 @@
# License: GNU General Public License v3. See license.txt # License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe, json import frappe
from frappe.utils import flt, nowdate, get_datetime, getdate, date_diff, cint from frappe.utils import flt, get_datetime, getdate, date_diff, cint
from frappe import _ from frappe import _
from frappe.model.document import Document from frappe.model.document import Document
from erpnext.manufacturing.doctype.bom.bom import validate_bom_no from erpnext.manufacturing.doctype.bom.bom import validate_bom_no
@ -14,6 +14,7 @@ from erpnext.manufacturing.doctype.workstation.workstation import WorkstationHol
from erpnext.projects.doctype.time_log.time_log import OverlapError from erpnext.projects.doctype.time_log.time_log import OverlapError
from erpnext.stock.doctype.stock_entry.stock_entry import get_additional_costs from erpnext.stock.doctype.stock_entry.stock_entry import get_additional_costs
from erpnext.manufacturing.doctype.manufacturing_settings.manufacturing_settings import get_mins_between_operations from erpnext.manufacturing.doctype.manufacturing_settings.manufacturing_settings import get_mins_between_operations
from erpnext.stock.stock_balance import get_planned_qty, update_bin_qty
class OverProductionError(frappe.ValidationError): pass class OverProductionError(frappe.ValidationError): pass
class StockOverProductionError(frappe.ValidationError): pass class StockOverProductionError(frappe.ValidationError): pass
@ -106,8 +107,7 @@ class ProductionOrder(Document):
def stop_unstop(self, status): def stop_unstop(self, status):
""" Called from client side on Stop/Unstop event""" """ Called from client side on Stop/Unstop event"""
self.update_status(status) self.update_status(status)
qty = (flt(self.qty)-flt(self.produced_qty)) * ((status == 'Stopped') and -1 or 1) self.update_planned_qty()
self.update_planned_qty(qty)
frappe.msgprint(_("Production Order status is {0}").format(status)) frappe.msgprint(_("Production Order status is {0}").format(status))
self.notify_modified() self.notify_modified()
@ -154,30 +154,30 @@ class ProductionOrder(Document):
frappe.throw(_("For Warehouse is required before Submit")) frappe.throw(_("For Warehouse is required before Submit"))
frappe.db.set(self,'status', 'Submitted') frappe.db.set(self,'status', 'Submitted')
self.make_time_logs() self.make_time_logs()
self.update_planned_qty(self.qty) self.update_planned_qty()
def on_cancel(self): def on_cancel(self):
self.validate_cancel()
frappe.db.set(self,'status', 'Cancelled')
self.update_planned_qty()
self.delete_time_logs()
def validate_cancel(self):
if self.status == "Stopped":
frappe.throw(_("Stopped Production Order cannot be cancelled, Unstop it first to cancel"))
# Check whether any stock entry exists against this Production Order # Check whether any stock entry exists against this Production Order
stock_entry = frappe.db.sql("""select name from `tabStock Entry` stock_entry = frappe.db.sql("""select name from `tabStock Entry`
where production_order = %s and docstatus = 1""", self.name) where production_order = %s and docstatus = 1""", self.name)
if stock_entry: if stock_entry:
frappe.throw(_("Cannot cancel because submitted Stock Entry {0} exists").format(stock_entry[0][0])) frappe.throw(_("Cannot cancel because submitted Stock Entry {0} exists").format(stock_entry[0][0]))
frappe.db.set(self,'status', 'Cancelled') def update_planned_qty(self):
self.update_planned_qty(-self.qty) update_bin_qty(self.production_item, self.fg_warehouse, {
self.delete_time_logs() "planned_qty": get_planned_qty(self.production_item, self.fg_warehouse)
})
def update_planned_qty(self, qty):
"""update planned qty in bin"""
args = {
"item_code": self.production_item,
"warehouse": self.fg_warehouse,
"posting_date": nowdate(),
"planned_qty": flt(qty)
}
from erpnext.stock.utils import update_bin
update_bin(args)
def set_production_order_operations(self): def set_production_order_operations(self):
"""Fetch operations from BOM and set in 'Production Order'""" """Fetch operations from BOM and set in 'Production Order'"""

4
erpnext/manufacturing/doctype/workstation/workstation.json
View File

@ -341,7 +341,7 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-03-10 15:12:52.857454", "modified": "2015-09-07 15:51:26",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Manufacturing", "module": "Manufacturing",
"name": "Workstation", "name": "Workstation",
@ -349,7 +349,7 @@
"permissions": [ "permissions": [
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 1, "create": 1,
"delete": 1, "delete": 1,

7
erpnext/patches.txt
View File

@ -200,4 +200,9 @@ erpnext.patches.v5_8.add_credit_note_print_heading
execute:frappe.delete_doc_if_exists("Print Format", "Credit Note - Negative Invoice") execute:frappe.delete_doc_if_exists("Print Format", "Credit Note - Negative Invoice")
# V6.0 # V6.0
erpnext.patches.v6_0.set_default_title erpnext.patches.v6_0.set_default_title # 2015-09-03
erpnext.patches.v6_0.default_activity_rate
execute:frappe.db.set_value("Stock Settings", None, "automatically_set_serial_nos_based_on_fifo", 1)
execute:frappe.db.sql("""update `tabProject` set percent_complete=round(percent_complete, 2) where percent_complete is not null""")
erpnext.patches.v6_0.fix_outstanding_amount
erpnext.patches.v6_0.fix_planned_qty

4
erpnext/patches/v5_7/item_template_attributes.py
View File

@ -40,8 +40,8 @@ def rename_and_reload_doctypes():
frappe.reload_doctype("Item") frappe.reload_doctype("Item")
frappe.reload_doc("Stock", "DocType", "Item Variant Attribute") frappe.reload_doc("Stock", "DocType", "Item Variant Attribute")
frappe.reload_doctype("Item Attribute Value") frappe.reload_doc("Stock", "DocType", "Item Attribute Value")
frappe.reload_doctype("Item Attribute") frappe.reload_doc("Stock", "DocType", "Item Attribute")
def migrate_manage_variants(): def migrate_manage_variants():
item_attribute = {} item_attribute = {}

11
erpnext/patches/v6_0/default_activity_rate.py Normal file
View File

@ -0,0 +1,11 @@
import frappe
def execute():
for cost in frappe.db.get_list("Activity Cost", filters = {"employee": ""},
fields = ("name", "activity_type", "costing_rate", "billing_rate")):
activity_type = frappe.get_doc("Activity Type", cost.activity_type)
activity_type.costing_rate = cost.costing_rate
activity_type.billing_rate = cost.billing_rate
activity_type.save()
frappe.delete_doc("Activity Cost", cost.name)

16
erpnext/patches/v6_0/fix_outstanding_amount.py Normal file
View File

@ -0,0 +1,16 @@
# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
import frappe
from erpnext.accounts.doctype.gl_entry.gl_entry import update_outstanding_amt
def execute():
for dt, party_field, account_field in (("Sales Invoice", "customer", "debit_to"),
("Purchase Invoice", "supplier", "credit_to")):
wrong_invoices = frappe.db.sql("""select name, {0} as account from `tab{1}`
where docstatus=1 and ifnull({2}, '')=''""".format(account_field, dt, party_field))
for invoice, account in wrong_invoices:
update_outstanding_amt(account, party_field.title(), None, dt, invoice)

13
erpnext/patches/v6_0/fix_planned_qty.py Normal file
View File

@ -0,0 +1,13 @@
# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
import frappe
from erpnext.stock.stock_balance import get_planned_qty, update_bin_qty
def execute():
for item_code, warehouse in frappe.db.sql("""select distinct production_item, fg_warehouse
from `tabProduction Order`"""):
update_bin_qty(item_code, warehouse, {
"planned_qty": get_planned_qty(item_code, warehouse)
})

4
erpnext/projects/doctype/activity_cost/activity_cost.json
View File

@ -7,7 +7,7 @@
"custom": 0, "custom": 0,
"docstatus": 0, "docstatus": 0,
"doctype": "DocType", "doctype": "DocType",
"document_type": "Master", "document_type": "Setup",
"fields": [ "fields": [
{ {
"allow_on_submit": 0, "allow_on_submit": 0,
@ -219,7 +219,7 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-06-16 03:12:25.644839", "modified": "2015-08-31 06:43:42.804365",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Projects", "module": "Projects",
"name": "Activity Cost", "name": "Activity Cost",

8
erpnext/projects/doctype/activity_type/activity_type.js Normal file
View File

@ -0,0 +1,8 @@
frappe.ui.form.on("Activity Type", {
refresh: function(frm) {
frm.add_custom_button("Activity Cost per Employee", function() {
frappe.route_options = {"activity_type": frm.doc.name};
frappe.set_route("List", "Activity Cost");
});
}
});

71
erpnext/projects/doctype/activity_type/activity_type.json
View File

@ -7,7 +7,7 @@
"custom": 0, "custom": 0,
"docstatus": 0, "docstatus": 0,
"doctype": "DocType", "doctype": "DocType",
"document_type": "Master", "document_type": "Setup",
"fields": [ "fields": [
{ {
"allow_on_submit": 0, "allow_on_submit": 0,
@ -29,6 +29,71 @@
"search_index": 0, "search_index": 0,
"set_only_once": 0, "set_only_once": 0,
"unique": 0 "unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"fieldname": "costing_rate",
"fieldtype": "Currency",
"hidden": 0,
"ignore_user_permissions": 0,
"in_filter": 0,
"in_list_view": 0,
"label": "Default Costing Rate",
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"fieldname": "column_break_3",
"fieldtype": "Column Break",
"hidden": 0,
"ignore_user_permissions": 0,
"in_filter": 0,
"in_list_view": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"fieldname": "billing_rate",
"fieldtype": "Currency",
"hidden": 0,
"ignore_user_permissions": 0,
"in_filter": 0,
"in_list_view": 0,
"label": "Default Billing Rate",
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
} }
], ],
"hide_heading": 0, "hide_heading": 0,
@ -40,7 +105,7 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-02-18 13:05:23.608066", "modified": "2015-09-07 15:51:26",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Projects", "module": "Projects",
"name": "Activity Type", "name": "Activity Type",
@ -68,7 +133,7 @@
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 1, "create": 1,
"delete": 0, "delete": 0,

4
erpnext/projects/doctype/project/project.json
View File

@ -900,7 +900,7 @@
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"max_attachments": 4, "max_attachments": 4,
"modified": "2015-08-12 08:51:43.620261", "modified": "2015-09-07 15:51:26",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Projects", "module": "Projects",
"name": "Project", "name": "Project",
@ -908,7 +908,7 @@
"permissions": [ "permissions": [
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 1, "create": 1,
"delete": 1, "delete": 1,

47
erpnext/projects/doctype/project/project.py
View File

@ -46,8 +46,6 @@ class Project(Document):
"""sync tasks and remove table""" """sync tasks and remove table"""
if self.flags.dont_sync_tasks: return if self.flags.dont_sync_tasks: return
task_added_or_deleted = False
task_names = [] task_names = []
for t in self.tasks: for t in self.tasks:
if t.task_id: if t.task_id:
@ -55,7 +53,6 @@ class Project(Document):
else: else:
task = frappe.new_doc("Task") task = frappe.new_doc("Task")
task.project = self.name task.project = self.name
task_added_or_deleted = True
task.update({ task.update({
"subject": t.title, "subject": t.title,
@ -73,14 +70,15 @@ class Project(Document):
# delete # delete
for t in frappe.get_all("Task", ["name"], {"project": self.name, "name": ("not in", task_names)}): for t in frappe.get_all("Task", ["name"], {"project": self.name, "name": ("not in", task_names)}):
frappe.delete_doc("Task", t.name) frappe.delete_doc("Task", t.name)
task_added_or_deleted = True
if task_added_or_deleted: self.update_percent_complete()
self.update_project() self.update_costing()
def update_project(self): def update_project(self):
self.update_percent_complete() self.update_percent_complete()
self.update_costing() self.update_costing()
self.flags.dont_sync_tasks = True
self.save()
def update_percent_complete(self): def update_percent_complete(self):
total = frappe.db.sql("""select count(*) from tabTask where project=%s""", self.name)[0][0] total = frappe.db.sql("""select count(*) from tabTask where project=%s""", self.name)[0][0]
@ -88,21 +86,34 @@ class Project(Document):
completed = frappe.db.sql("""select count(*) from tabTask where completed = frappe.db.sql("""select count(*) from tabTask where
project=%s and status in ('Closed', 'Cancelled')""", self.name)[0][0] project=%s and status in ('Closed', 'Cancelled')""", self.name)[0][0]
self.percent_complete = flt(completed) / total * 100 self.percent_complete = flt(flt(completed) / total * 100, 2)
def update_costing(self): def update_costing(self):
total_cost = frappe.db.sql("""select sum(ifnull(total_costing_amount, 0)) as costing_amount, from_time_log = frappe.db.sql("""select
sum(ifnull(total_billing_amount, 0)) as billing_amount, sum(ifnull(total_expense_claim, 0)) as expense_claim, sum(ifnull(costing_amount, 0)) as costing_amount,
min(act_start_date) as start_date, max(act_end_date) as end_date, sum(actual_time) as time sum(ifnull(billing_amount, 0)) as billing_amount,
from `tabTask` where project = %s""", self.name, as_dict=1)[0] min(from_time) as start_date,
max(to_time) as end_date,
sum(hours) as time
from `tabTime Log` where project = %s and docstatus = 1""", self.name, as_dict=1)[0]
from_expense_claim = frappe.db.sql("""select
sum(ifnull(total_sanctioned_amount, 0)) as total_sanctioned_amount
from `tabExpense Claim` where project = %s and approval_status='Approved'
and docstatus = 1""",
self.name, as_dict=1)[0]
self.actual_start_date = from_time_log.start_date
self.actual_end_date = from_time_log.end_date
self.total_costing_amount = from_time_log.costing_amount
self.total_billing_amount = from_time_log.billing_amount
self.actual_time = from_time_log.time
self.total_expense_claim = from_expense_claim.total_sanctioned_amount
self.gross_margin = flt(self.total_billing_amount) - flt(self.total_costing_amount)
self.total_costing_amount = total_cost.costing_amount
self.total_billing_amount = total_cost.billing_amount
self.total_expense_claim = total_cost.expense_claim
self.actual_start_date = total_cost.start_date
self.actual_end_date = total_cost.end_date
self.actual_time = total_cost.time
self.gross_margin = flt(total_cost.billing_amount) - flt(total_cost.costing_amount)
if self.total_billing_amount: if self.total_billing_amount:
self.per_gross_margin = (self.gross_margin / flt(self.total_billing_amount)) *100 self.per_gross_margin = (self.gross_margin / flt(self.total_billing_amount)) *100

2
erpnext/projects/doctype/project/project_list.js
View File

@ -3,7 +3,7 @@ frappe.listview_settings['Project'] = {
filters:[["status","=", "Open"]], filters:[["status","=", "Open"]],
get_indicator: function(doc) { get_indicator: function(doc) {
if(doc.status=="Open" && doc.percent_complete) { if(doc.status=="Open" && doc.percent_complete) {
return [__("{0}% Complete", [doc.percent_complete]), "orange", "percent_complete,>,0|status,=,Open"]; return [__("{0}% Complete", [cint(doc.percent_complete)]), "orange", "percent_complete,>,0|status,=,Open"];
} else { } else {
return [__(doc.status), frappe.utils.guess_colour(doc.status), "status,=," + doc.status]; return [__(doc.status), frappe.utils.guess_colour(doc.status), "status,=," + doc.status];
} }

4
erpnext/projects/doctype/task/task.json
View File

@ -682,7 +682,7 @@
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"max_attachments": 5, "max_attachments": 5,
"modified": "2015-04-30 05:48:55.176993", "modified": "2015-09-07 15:51:26",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Projects", "module": "Projects",
"name": "Task", "name": "Task",
@ -690,7 +690,7 @@
"permissions": [ "permissions": [
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 1, "create": 1,
"delete": 1, "delete": 1,

5
erpnext/projects/doctype/task/task.py
View File

@ -70,10 +70,7 @@ class Task(Document):
def update_project(self): def update_project(self):
if self.project and not self.flags.from_project: if self.project and not self.flags.from_project:
project = frappe.get_doc("Project", self.project) frappe.get_doc("Project", self.project).update_project()
project.flags.dont_sync_tasks = True
project.update_project()
project.save()
def check_recursion(self): def check_recursion(self):
if self.flags.ignore_recursion_check: return if self.flags.ignore_recursion_check: return

28
erpnext/projects/doctype/time_log/test_time_log.py
View File

@ -61,14 +61,34 @@ class TestTimeLog(unittest.TestCase):
employee="_T-Employee-0006",do_not_save= True) employee="_T-Employee-0006",do_not_save= True)
self.assertRaises(NegativeHoursError, time_log.save) self.assertRaises(NegativeHoursError, time_log.save)
def test_default_activity_cost(self):
activity_type = frappe.get_doc("Activity Type", "_Test Activity Type")
activity_type.billing_rate = 20
activity_type.costing_rate = 15
activity_type.save()
project_name = "_Test Project for Activity Type"
frappe.db.sql("delete from `tabTime Log` where project=%s or employee='_T-Employee-0002'", project_name)
frappe.delete_doc("Project", project_name)
project = frappe.get_doc({"doctype": "Project", "project_name": project_name}).insert()
make_time_log_test_record(employee="_T-Employee-0002", hours=2,
activity_type = "_Test Activity Type", project = project.name)
project = frappe.get_doc("Project", project.name)
self.assertTrue(project.total_costing_amount, 30)
self.assertTrue(project.total_billing_amount, 40)
def test_total_activity_cost_for_project(self): def test_total_activity_cost_for_project(self):
frappe.db.sql("""delete from `tabTask` where project = "_Test Project 1" """) frappe.db.sql("""delete from `tabTask` where project = "_Test Project 1" """)
frappe.db.sql("""delete from `tabProject` where name = "_Test Project 1" """) frappe.db.sql("""delete from `tabProject` where name = "_Test Project 1" """)
frappe.db.sql("""delete from `tabTime Log` where name = "_Test Project 1" """)
if not frappe.db.exists('Activity Cost', {"activity_type": "_Test Activity Type"}): if not frappe.db.exists('Activity Cost', {"activity_type": "_Test Activity Type"}):
activity_cost = frappe.get_doc({ activity_cost = frappe.get_doc({
"doctype": "Activity Cost", "doctype": "Activity Cost",
"employee": "", "employee": "_T-Employee-0002",
"activity_type": "_Test Activity Type", "activity_type": "_Test Activity Type",
"billing_rate": 100, "billing_rate": 100,
"costing_rate": 50 "costing_rate": 50
@ -84,7 +104,8 @@ class TestTimeLog(unittest.TestCase):
task_name = frappe.db.get_value("Task",{"project": "_Test Project 1"}) task_name = frappe.db.get_value("Task",{"project": "_Test Project 1"})
time_log = make_time_log_test_record(employee="_T-Employee-0002", hours=2, task= task_name) time_log = make_time_log_test_record(employee="_T-Employee-0002", hours=2,
task=task_name)
self.assertEqual(time_log.costing_rate, 50) self.assertEqual(time_log.costing_rate, 50)
self.assertEqual(time_log.costing_amount, 100) self.assertEqual(time_log.costing_amount, 100)
self.assertEqual(time_log.billing_rate, 100) self.assertEqual(time_log.billing_rate, 100)
@ -93,7 +114,8 @@ class TestTimeLog(unittest.TestCase):
self.assertEqual(frappe.db.get_value("Task", task_name, "total_billing_amount"), 200) self.assertEqual(frappe.db.get_value("Task", task_name, "total_billing_amount"), 200)
self.assertEqual(frappe.db.get_value("Project", "_Test Project 1", "total_billing_amount"), 200) self.assertEqual(frappe.db.get_value("Project", "_Test Project 1", "total_billing_amount"), 200)
time_log2 = make_time_log_test_record(employee="_T-Employee-0003", hours=2, task= task_name) time_log2 = make_time_log_test_record(employee="_T-Employee-0002",
hours=2, task= task_name, from_time = now_datetime() + datetime.timedelta(hours= 3))
self.assertEqual(frappe.db.get_value("Task", task_name, "total_billing_amount"), 400) self.assertEqual(frappe.db.get_value("Task", task_name, "total_billing_amount"), 400)
self.assertEqual(frappe.db.get_value("Project", "_Test Project 1", "total_billing_amount"), 400) self.assertEqual(frappe.db.get_value("Project", "_Test Project 1", "total_billing_amount"), 400)

2
erpnext/projects/doctype/time_log/time_log.js
View File

@ -17,6 +17,8 @@ frappe.ui.form.on("Time Log", "refresh", function(frm) {
if (frm.doc.__islocal && !frm.doc.user) { if (frm.doc.__islocal && !frm.doc.user) {
frm.set_value("user", user); frm.set_value("user", user);
} }
frm.toggle_reqd("activity_type", !frm.doc.for_manufacturing);
}); });

58
erpnext/projects/doctype/time_log/time_log.json
View File

@ -8,7 +8,7 @@
"description": "Log of Activities performed by users against Tasks that can be used for tracking time, billing.", "description": "Log of Activities performed by users against Tasks that can be used for tracking time, billing.",
"docstatus": 0, "docstatus": 0,
"doctype": "DocType", "doctype": "DocType",
"document_type": "Master", "document_type": "Setup",
"fields": [ "fields": [
{ {
"allow_on_submit": 0, "allow_on_submit": 0,
@ -181,6 +181,29 @@
"set_only_once": 0, "set_only_once": 0,
"unique": 0 "unique": 0
}, },
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"depends_on": "eval:!doc.for_manufacturing",
"fieldname": "activity_type",
"fieldtype": "Link",
"hidden": 0,
"ignore_user_permissions": 0,
"in_filter": 0,
"in_list_view": 0,
"label": "Activity Type",
"no_copy": 0,
"options": "Activity Type",
"permlevel": 0,
"print_hide": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{ {
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 0,
@ -227,29 +250,6 @@
"set_only_once": 0, "set_only_once": 0,
"unique": 0 "unique": 0
}, },
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"depends_on": "eval:!doc.for_manufacturing",
"fieldname": "activity_type",
"fieldtype": "Link",
"hidden": 0,
"ignore_user_permissions": 0,
"in_filter": 0,
"in_list_view": 0,
"label": "Activity Type",
"no_copy": 0,
"options": "Activity Type",
"permlevel": 0,
"print_hide": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{ {
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 0,
@ -618,7 +618,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Costing Rate (per hour)", "label": "Costing Rate based on Activity Type (per hour)",
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@ -686,7 +686,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Billing Rate (per hour)", "label": "Billing Rate based on Activity Type (per hour)",
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@ -812,7 +812,7 @@
"unique": 0 "unique": 0
}, },
{ {
"allow_on_submit": 0, "allow_on_submit": 1,
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"fieldname": "title", "fieldname": "title",
@ -843,7 +843,7 @@
"is_submittable": 1, "is_submittable": 1,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-04-14 09:07:28.468792", "modified": "2015-09-07 15:51:26",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Projects", "module": "Projects",
"name": "Time Log", "name": "Time Log",
@ -851,7 +851,7 @@
"permissions": [ "permissions": [
{ {
"amend": 1, "amend": 1,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 1, "cancel": 1,
"create": 1, "create": 1,
"delete": 1, "delete": 1,

50
erpnext/projects/doctype/time_log/time_log.py
View File

@ -26,16 +26,16 @@ class TimeLog(Document):
self.check_workstation_timings() self.check_workstation_timings()
self.validate_production_order() self.validate_production_order()
self.validate_manufacturing() self.validate_manufacturing()
self.validate_task() self.set_project_if_missing()
self.update_cost() self.update_cost()
def on_submit(self): def on_submit(self):
self.update_production_order() self.update_production_order()
self.update_task() self.update_task_and_project()
def on_cancel(self): def on_cancel(self):
self.update_production_order() self.update_production_order()
self.update_task() self.update_task_and_project()
def before_update_after_submit(self): def before_update_after_submit(self):
self.set_status() self.set_status()
@ -57,14 +57,17 @@ class TimeLog(Document):
self.status="Billed" self.status="Billed"
def set_title(self): def set_title(self):
"""Set default title for the Time Log"""
if self.title:
return
from frappe.utils import get_fullname
if self.production_order: if self.production_order:
self.title = _("{0} for {1}").format(self.operation, self.production_order) self.title = _("{0} for {1}").format(self.operation, self.production_order)
elif self.task: elif self.activity_type and (self.task or self.project):
self.title = _("{0} for {1}").format(self.activity_type, self.task) self.title = _("{0} for {1}").format(self.activity_type, self.task or self.project)
elif self.project:
self.title = _("{0} for {1}").format(self.activity_type, self.project)
else: else:
self.title = self.activity_type self.title = self.task or self.project or get_fullname(frappe.session.user)
def validate_overlap(self): def validate_overlap(self):
"""Checks if 'Time Log' entries overlap for a user, workstation. """ """Checks if 'Time Log' entries overlap for a user, workstation. """
@ -111,6 +114,11 @@ class TimeLog(Document):
from frappe.utils import time_diff_in_seconds from frappe.utils import time_diff_in_seconds
self.hours = flt(time_diff_in_seconds(self.to_time, self.from_time)) / 3600 self.hours = flt(time_diff_in_seconds(self.to_time, self.from_time)) / 3600
def set_project_if_missing(self):
"""Set project if task is set"""
if self.task and not self.project:
self.project = frappe.db.get_value("Task", self.task, "project")
def validate_time_log_for(self): def validate_time_log_for(self):
if not self.for_manufacturing: if not self.for_manufacturing:
for fld in ["production_order", "operation", "workstation", "completed_qty"]: for fld in ["production_order", "operation", "workstation", "completed_qty"]:
@ -221,25 +229,26 @@ class TimeLog(Document):
def update_cost(self): def update_cost(self):
rate = get_activity_cost(self.employee, self.activity_type) rate = get_activity_cost(self.employee, self.activity_type)
if rate: if rate:
self.costing_rate = rate.get('costing_rate') self.costing_rate = flt(rate.get('costing_rate'))
self.billing_rate = rate.get('billing_rate') self.billing_rate = flt(rate.get('billing_rate'))
self.costing_amount = self.costing_rate * self.hours self.costing_amount = self.costing_rate * self.hours
if self.billable: if self.billable:
self.billing_amount = self.billing_rate * self.hours self.billing_amount = self.billing_rate * self.hours
else: else:
self.billing_amount = 0 self.billing_amount = 0
def validate_task(self): def update_task_and_project(self):
# if a time log is being created against a project without production order """Update costing rate in Task or Project if either is set"""
if (self.project and not self.production_order) and not self.task:
frappe.throw(_("Task is Mandatory if Time Log is against a project"))
def update_task(self): if self.task:
if self.task and frappe.db.exists("Task", self.task):
task = frappe.get_doc("Task", self.task) task = frappe.get_doc("Task", self.task)
task.update_time_and_costing() task.update_time_and_costing()
task.save() task.save()
elif self.project:
frappe.get_doc("Project", self.project).update_project()
@frappe.whitelist() @frappe.whitelist()
def get_events(start, end, filters=None): def get_events(start, end, filters=None):
"""Returns events for Gantt / Calendar view rendering. """Returns events for Gantt / Calendar view rendering.
@ -270,9 +279,10 @@ def get_events(start, end, filters=None):
@frappe.whitelist() @frappe.whitelist()
def get_activity_cost(employee=None, activity_type=None): def get_activity_cost(employee=None, activity_type=None):
rate = frappe.db.sql("""select costing_rate, billing_rate from `tabActivity Cost` where employee= %s rate = frappe.db.get_values("Activity Cost", {"employee": employee,
and activity_type= %s""", (employee, activity_type), as_dict=1) "activity_type": activity_type}, ["costing_rate", "billing_rate"], as_dict=True)
if not rate: if not rate:
rate = frappe.db.sql("""select costing_rate, billing_rate from `tabActivity Cost` where ifnull(employee, '')='' rate = frappe.db.get_values("Activity Type", {"activity_type": activity_type},
and activity_type= %s""", (activity_type), as_dict=1) ["costing_rate", "billing_rate"], as_dict=True)
return rate[0] if rate else {} return rate[0] if rate else {}

4
erpnext/projects/doctype/time_log_batch/time_log_batch.json
View File

@ -261,7 +261,7 @@
"is_submittable": 1, "is_submittable": 1,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-04-15 08:00:52.746961", "modified": "2015-09-07 15:51:26",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Projects", "module": "Projects",
"name": "Time Log Batch", "name": "Time Log Batch",
@ -269,7 +269,7 @@
"permissions": [ "permissions": [
{ {
"amend": 1, "amend": 1,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 1, "cancel": 1,
"create": 1, "create": 1,
"delete": 1, "delete": 1,

4
erpnext/selling/doctype/campaign/campaign.json
View File

@ -111,7 +111,7 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-02-05 05:11:35.510179", "modified": "2015-09-07 15:51:26",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Selling", "module": "Selling",
"name": "Campaign", "name": "Campaign",
@ -139,7 +139,7 @@
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,

6
erpnext/selling/doctype/customer/customer.json
View File

@ -796,7 +796,7 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-08-25 07:09:26.411627", "modified": "2015-09-07 15:51:26",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Selling", "module": "Selling",
"name": "Customer", "name": "Customer",
@ -804,7 +804,7 @@
"permissions": [ "permissions": [
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 1, "create": 1,
"delete": 0, "delete": 0,
@ -964,7 +964,7 @@
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,

10
erpnext/selling/doctype/customer/customer.py
View File

@ -10,6 +10,7 @@ from frappe.utils import flt
from erpnext.utilities.transaction_base import TransactionBase from erpnext.utilities.transaction_base import TransactionBase
from erpnext.utilities.address_and_contact import load_address_and_contact from erpnext.utilities.address_and_contact import load_address_and_contact
from frappe.desk.reportview import build_match_conditions
class Customer(TransactionBase): class Customer(TransactionBase):
def get_feed(self): def get_feed(self):
@ -146,11 +147,16 @@ def get_customer_list(doctype, txt, searchfield, start, page_len, filters):
else: else:
fields = ["name", "customer_name", "customer_group", "territory"] fields = ["name", "customer_name", "customer_group", "territory"]
match_conditions = build_match_conditions("Customer")
match_conditions = "and {}".format(match_conditions) if match_conditions else ""
return frappe.db.sql("""select %s from `tabCustomer` where docstatus < 2 return frappe.db.sql("""select %s from `tabCustomer` where docstatus < 2
and (%s like %s or customer_name like %s) order by and (%s like %s or customer_name like %s)
{match_conditions}
order by
case when name like %s then 0 else 1 end, case when name like %s then 0 else 1 end,
case when customer_name like %s then 0 else 1 end, case when customer_name like %s then 0 else 1 end,
name, customer_name limit %s, %s""" % name, customer_name limit %s, %s""".format(match_conditions=match_conditions) %
(", ".join(fields), searchfield, "%s", "%s", "%s", "%s", "%s", "%s"), (", ".join(fields), searchfield, "%s", "%s", "%s", "%s", "%s", "%s"),
("%%%s%%" % txt, "%%%s%%" % txt, "%%%s%%" % txt, "%%%s%%" % txt, start, page_len)) ("%%%s%%" % txt, "%%%s%%" % txt, "%%%s%%" % txt, "%%%s%%" % txt, start, page_len))

4
erpnext/selling/doctype/industry_type/industry_type.json
View File

@ -42,7 +42,7 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-02-05 05:11:39.190793", "modified": "2015-09-07 15:51:26",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Selling", "module": "Selling",
"name": "Industry Type", "name": "Industry Type",
@ -70,7 +70,7 @@
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,

4
erpnext/selling/doctype/installation_note/installation_note.json
View File

@ -549,7 +549,7 @@
"is_submittable": 1, "is_submittable": 1,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-02-20 05:04:05.403625", "modified": "2015-09-07 15:51:26",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Selling", "module": "Selling",
"name": "Installation Note", "name": "Installation Note",
@ -557,7 +557,7 @@
"permissions": [ "permissions": [
{ {
"amend": 1, "amend": 1,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 1, "cancel": 1,
"create": 1, "create": 1,
"delete": 1, "delete": 1,

6
erpnext/selling/doctype/product_bundle/product_bundle.json
View File

@ -111,7 +111,7 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-08-03 11:23:26.263254", "modified": "2015-09-07 15:51:26",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Selling", "module": "Selling",
"name": "Product Bundle", "name": "Product Bundle",
@ -139,7 +139,7 @@
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,
@ -159,7 +159,7 @@
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 1, "create": 1,
"delete": 1, "delete": 1,

12
erpnext/selling/doctype/sales_order/sales_order.json
View File

@ -2553,7 +2553,7 @@
"is_submittable": 1, "is_submittable": 1,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-08-27 03:28:35.983445", "modified": "2015-09-07 15:51:26",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Selling", "module": "Selling",
"name": "Sales Order", "name": "Sales Order",
@ -2561,7 +2561,7 @@
"permissions": [ "permissions": [
{ {
"amend": 1, "amend": 1,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 1, "cancel": 1,
"create": 1, "create": 1,
"delete": 1, "delete": 1,
@ -2601,7 +2601,7 @@
}, },
{ {
"amend": 1, "amend": 1,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 1, "cancel": 1,
"create": 1, "create": 1,
"delete": 1, "delete": 1,
@ -2621,7 +2621,7 @@
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,
@ -2641,7 +2641,7 @@
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,
@ -2661,7 +2661,7 @@
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,

4
erpnext/selling/doctype/sales_order/sales_order.py
View File

@ -176,6 +176,10 @@ class SalesOrder(SellingController):
frappe.db.set(self, 'status', 'Cancelled') frappe.db.set(self, 'status', 'Cancelled')
def check_credit_limit(self):
from erpnext.selling.doctype.customer.customer import check_credit_limit
check_credit_limit(self.customer, self.company)
def check_nextdoc_docstatus(self): def check_nextdoc_docstatus(self):
# Checks Delivery Note # Checks Delivery Note
submit_dn = frappe.db.sql_list("""select t1.name from `tabDelivery Note` t1,`tabDelivery Note Item` t2 submit_dn = frappe.db.sql_list("""select t1.name from `tabDelivery Note` t1,`tabDelivery Note Item` t2

10
erpnext/selling/doctype/sales_order/test_sales_order.py
View File

@ -8,10 +8,16 @@ import unittest
from erpnext.selling.doctype.sales_order.sales_order \ from erpnext.selling.doctype.sales_order.sales_order \
import make_material_request, make_delivery_note, make_sales_invoice, WarehouseRequired import make_material_request, make_delivery_note, make_sales_invoice, WarehouseRequired
from frappe.tests.test_permissions import set_user_permission_doctypes
class TestSalesOrder(unittest.TestCase): class TestSalesOrder(unittest.TestCase):
def tearDown(self): def tearDown(self):
frappe.set_user("Administrator") frappe.set_user("Administrator")
for role in ("Stock User", "Sales User"):
set_user_permission_doctypes(doctype="Sales Order", role=role,
apply_user_permissions=0, user_permission_doctypes=None)
def test_make_material_request(self): def test_make_material_request(self):
so = make_sales_order(do_not_submit=True) so = make_sales_order(do_not_submit=True)
@ -187,6 +193,10 @@ class TestSalesOrder(unittest.TestCase):
existing_reserved_qty_item2 + 20) existing_reserved_qty_item2 + 20)
def test_warehouse_user(self): def test_warehouse_user(self):
for role in ("Stock User", "Sales User"):
set_user_permission_doctypes(doctype="Sales Order", role=role,
apply_user_permissions=1, user_permission_doctypes=["Warehouse"])
frappe.permissions.add_user_permission("Warehouse", "_Test Warehouse 1 - _TC", "test@example.com") frappe.permissions.add_user_permission("Warehouse", "_Test Warehouse 1 - _TC", "test@example.com")
frappe.permissions.add_user_permission("Warehouse", "_Test Warehouse 2 - _TC1", "test2@example.com") frappe.permissions.add_user_permission("Warehouse", "_Test Warehouse 2 - _TC1", "test2@example.com")
frappe.permissions.add_user_permission("Company", "_Test Company 1", "test2@example.com") frappe.permissions.add_user_permission("Company", "_Test Company 1", "test2@example.com")

13
erpnext/selling/page/sales_browser/sales_browser.js
View File

@ -7,7 +7,7 @@ frappe.pages["Sales Browser"].on_page_load = function(wrapper){
single_column: true, single_column: true,
}); });
wrapper.page.set_secondary_action(__('Refresh'), function() { wrapper.page.add_menu_item(__('Refresh'), function() {
wrapper.make_tree(); wrapper.make_tree();
}); });
@ -57,7 +57,7 @@ erpnext.SalesChart = Class.extend({
me.page.set_primary_action(__("New"), function() { me.page.set_primary_action(__("New"), function() {
me.new_node(); me.new_node();
}); }, "octicon octicon-plus");
this.tree = new frappe.ui.Tree({ this.tree = new frappe.ui.Tree({
parent: $(parent), parent: $(parent),
@ -80,7 +80,8 @@ erpnext.SalesChart = Class.extend({
condition: function(node) { return me.can_create && node.expandable; }, condition: function(node) { return me.can_create && node.expandable; },
click: function(node) { click: function(node) {
me.new_node(); me.new_node();
} },
btnClass: "hidden-xs"
}, },
{ {
label:__("Rename"), label:__("Rename"),
@ -89,7 +90,8 @@ erpnext.SalesChart = Class.extend({
frappe.model.rename_doc(me.ctype, node.label, function(new_name) { frappe.model.rename_doc(me.ctype, node.label, function(new_name) {
node.$a.html(new_name); node.$a.html(new_name);
}); });
} },
btnClass: "hidden-xs"
}, },
{ {
label:__("Delete"), label:__("Delete"),
@ -98,7 +100,8 @@ erpnext.SalesChart = Class.extend({
frappe.model.delete_doc(me.ctype, node.label, function() { frappe.model.delete_doc(me.ctype, node.label, function() {
node.parent.remove(); node.parent.remove();
}); });
} },
btnClass: "hidden-xs"
} }
] ]

10
erpnext/setup/doctype/brand/brand.json
View File

@ -66,7 +66,7 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-07-13 05:28:24.597639", "modified": "2015-09-07 15:51:26",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Setup", "module": "Setup",
"name": "Brand", "name": "Brand",
@ -94,7 +94,7 @@
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,
@ -114,7 +114,7 @@
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,
@ -134,7 +134,7 @@
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,
@ -154,7 +154,7 @@
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,

4
erpnext/setup/doctype/company/company.json
View File

@ -1092,7 +1092,7 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-07-14 02:23:45.064575", "modified": "2015-09-07 15:51:26",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Setup", "module": "Setup",
"name": "Company", "name": "Company",
@ -1120,7 +1120,7 @@
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,

8
erpnext/setup/doctype/currency_exchange/currency_exchange.json
View File

@ -85,7 +85,7 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-03-23 14:45:09.645344", "modified": "2015-09-07 15:51:26",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Setup", "module": "Setup",
"name": "Currency Exchange", "name": "Currency Exchange",
@ -113,7 +113,7 @@
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,
@ -133,7 +133,7 @@
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,
@ -153,7 +153,7 @@
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,

4
erpnext/setup/doctype/customer_group/customer_group.json
View File

@ -316,7 +316,7 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-07-09 12:43:18.846143", "modified": "2015-09-07 15:51:26",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Setup", "module": "Setup",
"name": "Customer Group", "name": "Customer Group",
@ -344,7 +344,7 @@
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,

10
erpnext/setup/doctype/item_group/item_group.json
View File

@ -430,7 +430,7 @@
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"max_attachments": 3, "max_attachments": 3,
"modified": "2015-07-13 05:28:26.719060", "modified": "2015-09-07 15:51:26",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Setup", "module": "Setup",
"name": "Item Group", "name": "Item Group",
@ -458,7 +458,7 @@
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,
@ -498,7 +498,7 @@
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,
@ -518,7 +518,7 @@
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,
@ -538,7 +538,7 @@
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,

4
erpnext/setup/doctype/print_heading/print_heading.json
View File

@ -66,7 +66,7 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-02-05 05:11:42.732646", "modified": "2015-09-07 15:51:26",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Setup", "module": "Setup",
"name": "Print Heading", "name": "Print Heading",
@ -94,7 +94,7 @@
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,

4
erpnext/setup/doctype/sales_partner/sales_partner.json
View File

@ -568,7 +568,7 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-02-19 09:26:41.397649", "modified": "2015-09-07 15:51:26",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Setup", "module": "Setup",
"name": "Sales Partner", "name": "Sales Partner",
@ -596,7 +596,7 @@
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,

4
erpnext/setup/doctype/sales_person/sales_person.json
View File

@ -320,7 +320,7 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-02-05 05:11:46.204837", "modified": "2015-09-07 15:51:26",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Setup", "module": "Setup",
"name": "Sales Person", "name": "Sales Person",
@ -348,7 +348,7 @@
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,

4
erpnext/setup/doctype/supplier_type/supplier_type.json
View File

@ -108,7 +108,7 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-02-24 17:35:22.087557", "modified": "2015-09-07 15:51:26",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Setup", "module": "Setup",
"name": "Supplier Type", "name": "Supplier Type",
@ -136,7 +136,7 @@
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,

10
erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.json
View File

@ -66,7 +66,7 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-07-13 05:28:25.035649", "modified": "2015-09-07 15:51:26",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Setup", "module": "Setup",
"name": "Terms and Conditions", "name": "Terms and Conditions",
@ -94,7 +94,7 @@
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,
@ -114,7 +114,7 @@
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,
@ -154,7 +154,7 @@
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 1, "create": 1,
"delete": 1, "delete": 1,
@ -174,7 +174,7 @@
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,

8
erpnext/setup/doctype/territory/territory.json
View File

@ -281,7 +281,7 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-07-13 05:28:25.602509", "modified": "2015-09-07 15:51:26",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Setup", "module": "Setup",
"name": "Territory", "name": "Territory",
@ -330,7 +330,7 @@
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,
@ -350,7 +350,7 @@
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,
@ -370,7 +370,7 @@
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,

4
erpnext/setup/doctype/uom/uom.json
View File

@ -64,7 +64,7 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-07-13 05:28:23.143040", "modified": "2015-09-07 15:51:26",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Setup", "module": "Setup",
"name": "UOM", "name": "UOM",
@ -112,7 +112,7 @@
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,

6
erpnext/setup/page/setup_wizard/setup_wizard.py
View File

@ -109,7 +109,8 @@ def setup_account(args=None):
def update_user_name(args): def update_user_name(args):
if args.get("email"): if args.get("email"):
args['name'] = args.get("email") args['name'] = args.get("email")
frappe.flags.mute_emails = True
_mute_emails, frappe.flags.mute_emails = frappe.flags.mute_emails, True
doc = frappe.get_doc({ doc = frappe.get_doc({
"doctype":"User", "doctype":"User",
"email": args.get("email"), "email": args.get("email"),
@ -118,7 +119,7 @@ def update_user_name(args):
}) })
doc.flags.no_welcome_mail = True doc.flags.no_welcome_mail = True
doc.insert() doc.insert()
frappe.flags.mute_emails = False frappe.flags.mute_emails = _mute_emails
from frappe.auth import _update_password from frappe.auth import _update_password
_update_password(args.get("email"), args.get("password")) _update_password(args.get("email"), args.get("password"))
@ -223,6 +224,7 @@ def set_defaults(args):
stock_settings.stock_uom = _("Nos") stock_settings.stock_uom = _("Nos")
stock_settings.auto_indent = 1 stock_settings.auto_indent = 1
stock_settings.auto_insert_price_list_rate_if_missing = 1 stock_settings.auto_insert_price_list_rate_if_missing = 1
stock_settings.automatically_set_serial_nos_based_on_fifo = 1
stock_settings.save() stock_settings.save()
selling_settings = frappe.get_doc("Selling Settings") selling_settings = frappe.get_doc("Selling Settings")

8
erpnext/stock/doctype/bin/bin.json
View File

@ -323,7 +323,7 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-07-13 05:28:24.087304", "modified": "2015-09-07 15:51:26",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Bin", "name": "Bin",
@ -331,7 +331,7 @@
"permissions": [ "permissions": [
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,
@ -351,7 +351,7 @@
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,
@ -371,7 +371,7 @@
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,

10
erpnext/stock/doctype/delivery_note/delivery_note.json
View File

@ -2438,7 +2438,7 @@
"is_submittable": 1, "is_submittable": 1,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-08-27 03:29:47.032037", "modified": "2015-09-07 15:51:26",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Delivery Note", "name": "Delivery Note",
@ -2446,7 +2446,7 @@
"permissions": [ "permissions": [
{ {
"amend": 1, "amend": 1,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 1, "cancel": 1,
"create": 1, "create": 1,
"delete": 1, "delete": 1,
@ -2486,7 +2486,7 @@
}, },
{ {
"amend": 1, "amend": 1,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 1, "cancel": 1,
"create": 1, "create": 1,
"delete": 1, "delete": 1,
@ -2506,7 +2506,7 @@
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,
@ -2526,7 +2526,7 @@
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,

11
erpnext/stock/doctype/delivery_note/delivery_note.py
View File

@ -215,6 +215,17 @@ class DeliveryNote(SellingController):
self.make_gl_entries_on_cancel() self.make_gl_entries_on_cancel()
def check_credit_limit(self):
from erpnext.selling.doctype.customer.customer import check_credit_limit
validate_against_credit_limit = False
for d in self.get("items"):
if not (d.against_sales_order or d.against_sales_invoice):
validate_against_credit_limit = True
break
if validate_against_credit_limit:
check_credit_limit(self.customer, self.company)
def validate_packed_qty(self): def validate_packed_qty(self):
""" """
Validate that if packed qty exists, it should be equal to qty Validate that if packed qty exists, it should be equal to qty

14
erpnext/stock/doctype/item/item.json
View File

@ -2090,7 +2090,7 @@
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"max_attachments": 1, "max_attachments": 1,
"modified": "2015-08-25 08:31:05.907086", "modified": "2015-09-07 15:51:26",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Item", "name": "Item",
@ -2138,7 +2138,7 @@
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,
@ -2158,7 +2158,7 @@
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,
@ -2178,7 +2178,7 @@
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,
@ -2198,7 +2198,7 @@
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,
@ -2218,7 +2218,7 @@
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,
@ -2238,7 +2238,7 @@
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,

6
erpnext/stock/doctype/material_request/material_request.json
View File

@ -510,7 +510,7 @@
"is_submittable": 1, "is_submittable": 1,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-08-27 03:40:16.238465", "modified": "2015-09-07 15:51:26",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Material Request", "name": "Material Request",
@ -558,7 +558,7 @@
}, },
{ {
"amend": 1, "amend": 1,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 1, "cancel": 1,
"create": 1, "create": 1,
"delete": 1, "delete": 1,
@ -578,7 +578,7 @@
}, },
{ {
"amend": 1, "amend": 1,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 1, "cancel": 1,
"create": 1, "create": 1,
"delete": 1, "delete": 1,

6
erpnext/stock/doctype/packing_slip/packing_slip.json
View File

@ -513,7 +513,7 @@
"is_submittable": 1, "is_submittable": 1,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-07-13 05:28:24.850528", "modified": "2015-09-07 15:51:26",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Packing Slip", "name": "Packing Slip",
@ -521,7 +521,7 @@
"permissions": [ "permissions": [
{ {
"amend": 1, "amend": 1,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 1, "cancel": 1,
"create": 1, "create": 1,
"delete": 1, "delete": 1,
@ -541,7 +541,7 @@
}, },
{ {
"amend": 1, "amend": 1,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 1, "cancel": 1,
"create": 1, "create": 1,
"delete": 1, "delete": 1,

8
erpnext/stock/doctype/price_list/price_list.json
View File

@ -193,7 +193,7 @@
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"max_attachments": 1, "max_attachments": 1,
"modified": "2015-04-17 01:54:01.907175", "modified": "2015-09-07 15:51:26",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Price List", "name": "Price List",
@ -201,7 +201,7 @@
"permissions": [ "permissions": [
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,
@ -241,7 +241,7 @@
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,
@ -281,7 +281,7 @@
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,

10
erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
View File

@ -2076,7 +2076,7 @@
"is_submittable": 1, "is_submittable": 1,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-08-27 06:27:48.950655", "modified": "2015-09-07 15:51:26",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Purchase Receipt", "name": "Purchase Receipt",
@ -2104,7 +2104,7 @@
}, },
{ {
"amend": 1, "amend": 1,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 1, "cancel": 1,
"create": 1, "create": 1,
"delete": 1, "delete": 1,
@ -2124,7 +2124,7 @@
}, },
{ {
"amend": 1, "amend": 1,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 1, "cancel": 1,
"create": 1, "create": 1,
"delete": 1, "delete": 1,
@ -2144,7 +2144,7 @@
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,
@ -2164,7 +2164,7 @@
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,

Some files were not shown because too many files have changed in this diff Show More