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

Merge branch 'hotfix'

Browse Source
This commit is contained in:
Saurabh 2018-02-14 11:45:31 +05:30
commit 0500ce445f
32 changed files with 3544 additions and 3650 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__init__.py
View File

@ -5,7 +5,7 @@ import frappe
from erpnext.hooks import regional_overrides from erpnext.hooks import regional_overrides
from frappe.utils import getdate from frappe.utils import getdate
__version__ = '10.0.21' __version__ = '10.0.22'
def get_default_company(user=None): def get_default_company(user=None):
'''Get default company for user''' '''Get default company for user'''

8
erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
View File

@ -8,6 +8,10 @@ erpnext.accounts.PurchaseInvoice = erpnext.buying.BuyingController.extend({
setup: function(doc) { setup: function(doc) {
this.setup_posting_date_time_check(); this.setup_posting_date_time_check();
this._super(doc); this._super(doc);
// formatter for material request item
this.frm.set_indicator_formatter('item_code',
function(doc) { return (doc.qty<=doc.received_qty) ? "green" : "orange" })
}, },
onload: function() { onload: function() {
this._super(); this._super();
@ -20,10 +24,6 @@ erpnext.accounts.PurchaseInvoice = erpnext.buying.BuyingController.extend({
} else { } else {
this.frm.set_value("disable_rounded_total", cint(frappe.sys_defaults.disable_rounded_total)); this.frm.set_value("disable_rounded_total", cint(frappe.sys_defaults.disable_rounded_total));
} }
// formatter for material request item
this.frm.set_indicator_formatter('item_code',
function(doc) { return (doc.qty<=doc.received_qty) ? "green" : "orange" })
}, },
refresh: function(doc) { refresh: function(doc) {

15
erpnext/accounts/report/accounts_receivable/accounts_receivable.py
View File

@ -394,6 +394,21 @@ def get_pdc_details(party_type):
group by pref.reference_name""", party_type, as_dict=1): group by pref.reference_name""", party_type, as_dict=1):
pdc_details.setdefault(pdc.invoice_no, pdc) pdc_details.setdefault(pdc.invoice_no, pdc)
for pdc in frappe.db.sql("""
select
jea.reference_name as invoice_no, jea.party, jea.party_type,
max(je.cheque_date) as pdc_date, sum(ifnull(je.total_amount,0)) as pdc_amount,
GROUP_CONCAT(je.cheque_no SEPARATOR ', ') as pdc_ref
from
`tabJournal Entry` as je inner join `tabJournal Entry Account` as jea
on
(jea.parent = je.name)
where
je.docstatus = 0 and je.cheque_date > je.posting_date
and jea.party_type = %s
group by jea.reference_name""", party_type, as_dict=1):
pdc_details.setdefault(pdc.invoice_no, pdc)
return pdc_details return pdc_details
def get_dn_details(party_type): def get_dn_details(party_type):

6
erpnext/buying/doctype/purchase_order/purchase_order.js
View File

@ -12,6 +12,9 @@ frappe.ui.form.on("Purchase Order", {
'Purchase Invoice': 'Invoice', 'Purchase Invoice': 'Invoice',
'Stock Entry': 'Material to Supplier' 'Stock Entry': 'Material to Supplier'
} }
frm.set_indicator_formatter('item_code',
function(doc) { return (doc.qty<=doc.received_qty) ? "green" : "orange" })
}, },
onload: function(frm) { onload: function(frm) {
@ -25,9 +28,6 @@ frappe.ui.form.on("Purchase Order", {
frm.toggle_display('get_last_purchase_rate', frm.toggle_display('get_last_purchase_rate',
frm.doc.__onload.disable_fetch_last_purchase_rate); frm.doc.__onload.disable_fetch_last_purchase_rate);
} }
frm.set_indicator_formatter('item_code',
function(doc) { return (doc.qty<=doc.received_qty) ? "green" : "orange" })
}, },
}); });

6
erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.js
View File

@ -4,14 +4,14 @@
/* global frappe, refresh_field */ /* global frappe, refresh_field */
frappe.ui.form.on("Supplier Scorecard", { frappe.ui.form.on("Supplier Scorecard", {
setup: function(frm) {
onload: function(frm) {
if (frm.doc.indicator_color !== "") { if (frm.doc.indicator_color !== "") {
frm.set_indicator_formatter("status", function(doc) { frm.set_indicator_formatter("status", function(doc) {
return doc.indicator_color.toLowerCase(); return doc.indicator_color.toLowerCase();
}); });
} }
},
onload: function(frm) {
if (frm.doc.__unsaved == 1) { if (frm.doc.__unsaved == 1) {
loadAllCriteria(frm); loadAllCriteria(frm);
loadAllStandings(frm); loadAllStandings(frm);

110
erpnext/config/education.py
View File

@ -21,18 +21,7 @@ def get_data():
{ {
"type": "doctype", "type": "doctype",
"name": "Student Group" "name": "Student Group"
},
{
"type": "doctype",
"name": "Student Group Creation Tool"
},
{
"type": "report",
"is_query_report": True,
"name": "Student and Guardian Contact Details",
"doctype": "Program Enrollment"
} }
] ]
}, },
{ {
@ -50,10 +39,6 @@ def get_data():
{ {
"type": "doctype", "type": "doctype",
"name": "Program Enrollment" "name": "Program Enrollment"
},
{
"type": "doctype",
"name": "Program Enrollment Tool"
} }
] ]
}, },
@ -68,10 +53,6 @@ def get_data():
"type": "doctype", "type": "doctype",
"name": "Student Leave Application" "name": "Student Leave Application"
}, },
{
"type": "doctype",
"name": "Student Attendance Tool"
},
{ {
"type": "report", "type": "report",
"is_query_report": True, "is_query_report": True,
@ -84,21 +65,26 @@ def get_data():
"name": "Student Batch-Wise Attendance", "name": "Student Batch-Wise Attendance",
"doctype": "Student Attendance" "doctype": "Student Attendance"
}, },
{
"type": "report",
"is_query_report": True,
"name": "Student Monthly Attendance Sheet",
"doctype": "Student Attendance"
}
] ]
}, },
{ {
"label": _("Schedule"), "label": _("Tools"),
"items": [ "items": [
{ {
"type": "doctype", "type": "doctype",
"name": "Course Schedule", "name": "Student Attendance Tool"
"route": "List/Course Schedule/Calendar" },
{
"type": "doctype",
"name": "Assessment Result Tool"
},
{
"type": "doctype",
"name": "Student Group Creation Tool"
},
{
"type": "doctype",
"name": "Program Enrollment Tool"
}, },
{ {
"type": "doctype", "type": "doctype",
@ -125,28 +111,30 @@ def get_data():
{ {
"type": "doctype", "type": "doctype",
"name": "Assessment Criteria" "name": "Assessment Criteria"
}
]
}, },
{ {
"type": "doctype", "label": _("Assessment Reports"),
"name": "Assessment Criteria Group" "items": [
},
{
"type": "doctype",
"name": "Assessment Result Tool"
},
{ {
"type": "report", "type": "report",
"is_query_report": True, "is_query_report": True,
"name": "Course wise Assessment Report", "name": "Course wise Assessment Report",
"doctype": "Assessment Result" "doctype": "Assessment Result"
}, },
{
"type": "report",
"is_query_report": True,
"name": "Final Assessment Grades",
"doctype": "Assessment Result"
},
{ {
"type": "report", "type": "report",
"is_query_report": True, "is_query_report": True,
"name": "Assessment Plan Status", "name": "Assessment Plan Status",
"doctype": "Assessment Plan" "doctype": "Assessment Plan"
}, },
] ]
}, },
{ {
@ -167,17 +155,25 @@ def get_data():
{ {
"type": "doctype", "type": "doctype",
"name": "Fee Category" "name": "Fee Category"
},
{
"type": "report",
"name": "Student Fee Collection",
"doctype": "Fees",
"is_query_report": True
} }
] ]
}, },
{ {
"label": _("Setup"), "label": _("Schedule"),
"items": [
{
"type": "doctype",
"name": "Course Schedule",
"route": "List/Course Schedule/Calendar"
},
{
"type": "doctype",
"name": "Course Scheduling Tool"
}
]
},
{
"label": _("Masters"),
"items": [ "items": [
{ {
"type": "doctype", "type": "doctype",
@ -194,7 +190,12 @@ def get_data():
{ {
"type": "doctype", "type": "doctype",
"name": "Room" "name": "Room"
}
]
}, },
{
"label": _("Setup"),
"items": [
{ {
"type": "doctype", "type": "doctype",
"name": "Student Category" "name": "Student Category"
@ -221,4 +222,27 @@ def get_data():
} }
] ]
}, },
{
"label": _("Other Reports"),
"items": [
{
"type": "report",
"is_query_report": True,
"name": "Student and Guardian Contact Details",
"doctype": "Program Enrollment"
},
{
"type": "report",
"is_query_report": True,
"name": "Student Monthly Attendance Sheet",
"doctype": "Student Attendance"
},
{
"type": "report",
"name": "Student Fee Collection",
"doctype": "Fees",
"is_query_report": True
}
]
}
] ]

7
erpnext/controllers/selling_controller.py
View File

@ -150,13 +150,16 @@ class SellingController(StockController):
if not frappe.db.get_single_value("Selling Settings", "validate_selling_price"): if not frappe.db.get_single_value("Selling Settings", "validate_selling_price"):
return return
if hasattr(self, "is_return") and self.is_return:
return
for it in self.get("items"): for it in self.get("items"):
if not it.item_code: if not it.item_code:
continue continue
last_purchase_rate, is_stock_item = frappe.db.get_value("Item", it.item_code, ["last_purchase_rate", "is_stock_item"]) last_purchase_rate, is_stock_item = frappe.db.get_value("Item", it.item_code, ["last_purchase_rate", "is_stock_item"])
last_purchase_rate_in_sales_uom = last_purchase_rate / (it.conversion_factor or 1) last_purchase_rate_in_sales_uom = last_purchase_rate / (it.conversion_factor or 1)
if flt(it.base_rate) < flt(last_purchase_rate_in_sales_uom) and not self.is_return: if flt(it.base_rate) < flt(last_purchase_rate_in_sales_uom):
throw_message(it.item_name, last_purchase_rate_in_sales_uom, "last purchase rate") throw_message(it.item_name, last_purchase_rate_in_sales_uom, "last purchase rate")
last_valuation_rate = frappe.db.sql(""" last_valuation_rate = frappe.db.sql("""
@ -166,7 +169,7 @@ class SellingController(StockController):
""", (it.item_code, it.warehouse)) """, (it.item_code, it.warehouse))
if last_valuation_rate: if last_valuation_rate:
last_valuation_rate_in_sales_uom = last_valuation_rate[0][0] / (it.conversion_factor or 1) last_valuation_rate_in_sales_uom = last_valuation_rate[0][0] / (it.conversion_factor or 1)
if is_stock_item and flt(it.base_rate) < flt(last_valuation_rate_in_sales_uom) and not self.is_return: if is_stock_item and flt(it.base_rate) < flt(last_valuation_rate_in_sales_uom):
throw_message(it.name, last_valuation_rate_in_sales_uom, "valuation rate") throw_message(it.name, last_valuation_rate_in_sales_uom, "valuation rate")

63
erpnext/demo/data/drug_list.json
View File

@ -65,7 +65,6 @@
"taxes": [], "taxes": [],
"thumbnail": null, "thumbnail": null,
"tolerance": 0.0, "tolerance": 0.0,
"total_projected_qty": 0.0,
"uoms": [ "uoms": [
{ {
"conversion_factor": 1.0, "conversion_factor": 1.0,
@ -151,7 +150,6 @@
"taxes": [], "taxes": [],
"thumbnail": null, "thumbnail": null,
"tolerance": 0.0, "tolerance": 0.0,
"total_projected_qty": 0.0,
"uoms": [ "uoms": [
{ {
"conversion_factor": 1.0, "conversion_factor": 1.0,
@ -237,7 +235,6 @@
"taxes": [], "taxes": [],
"thumbnail": null, "thumbnail": null,
"tolerance": 0.0, "tolerance": 0.0,
"total_projected_qty": 0.0,
"uoms": [ "uoms": [
{ {
"conversion_factor": 1.0, "conversion_factor": 1.0,
@ -323,7 +320,6 @@
"taxes": [], "taxes": [],
"thumbnail": null, "thumbnail": null,
"tolerance": 0.0, "tolerance": 0.0,
"total_projected_qty": 0.0,
"uoms": [ "uoms": [
{ {
"conversion_factor": 1.0, "conversion_factor": 1.0,
@ -409,7 +405,6 @@
"taxes": [], "taxes": [],
"thumbnail": null, "thumbnail": null,
"tolerance": 0.0, "tolerance": 0.0,
"total_projected_qty": 0.0,
"uoms": [ "uoms": [
{ {
"conversion_factor": 1.0, "conversion_factor": 1.0,
@ -495,7 +490,6 @@
"taxes": [], "taxes": [],
"thumbnail": null, "thumbnail": null,
"tolerance": 0.0, "tolerance": 0.0,
"total_projected_qty": 0.0,
"uoms": [ "uoms": [
{ {
"conversion_factor": 1.0, "conversion_factor": 1.0,
@ -581,7 +575,6 @@
"taxes": [], "taxes": [],
"thumbnail": null, "thumbnail": null,
"tolerance": 0.0, "tolerance": 0.0,
"total_projected_qty": 0.0,
"uoms": [ "uoms": [
{ {
"conversion_factor": 1.0, "conversion_factor": 1.0,
@ -667,7 +660,6 @@
"taxes": [], "taxes": [],
"thumbnail": null, "thumbnail": null,
"tolerance": 0.0, "tolerance": 0.0,
"total_projected_qty": 0.0,
"uoms": [ "uoms": [
{ {
"conversion_factor": 1.0, "conversion_factor": 1.0,
@ -753,7 +745,6 @@
"taxes": [], "taxes": [],
"thumbnail": null, "thumbnail": null,
"tolerance": 0.0, "tolerance": 0.0,
"total_projected_qty": 0.0,
"uoms": [ "uoms": [
{ {
"conversion_factor": 1.0, "conversion_factor": 1.0,
@ -839,7 +830,6 @@
"taxes": [], "taxes": [],
"thumbnail": null, "thumbnail": null,
"tolerance": 0.0, "tolerance": 0.0,
"total_projected_qty": 0.0,
"uoms": [ "uoms": [
{ {
"conversion_factor": 1.0, "conversion_factor": 1.0,
@ -925,7 +915,6 @@
"taxes": [], "taxes": [],
"thumbnail": null, "thumbnail": null,
"tolerance": 0.0, "tolerance": 0.0,
"total_projected_qty": 0.0,
"uoms": [ "uoms": [
{ {
"conversion_factor": 1.0, "conversion_factor": 1.0,
@ -1011,7 +1000,6 @@
"taxes": [], "taxes": [],
"thumbnail": null, "thumbnail": null,
"tolerance": 0.0, "tolerance": 0.0,
"total_projected_qty": 0.0,
"uoms": [ "uoms": [
{ {
"conversion_factor": 1.0, "conversion_factor": 1.0,
@ -1097,7 +1085,6 @@
"taxes": [], "taxes": [],
"thumbnail": null, "thumbnail": null,
"tolerance": 0.0, "tolerance": 0.0,
"total_projected_qty": 0.0,
"uoms": [ "uoms": [
{ {
"conversion_factor": 1.0, "conversion_factor": 1.0,
@ -1183,7 +1170,6 @@
"taxes": [], "taxes": [],
"thumbnail": null, "thumbnail": null,
"tolerance": 0.0, "tolerance": 0.0,
"total_projected_qty": 0.0,
"uoms": [ "uoms": [
{ {
"conversion_factor": 1.0, "conversion_factor": 1.0,
@ -1269,7 +1255,6 @@
"taxes": [], "taxes": [],
"thumbnail": null, "thumbnail": null,
"tolerance": 0.0, "tolerance": 0.0,
"total_projected_qty": 0.0,
"uoms": [ "uoms": [
{ {
"conversion_factor": 1.0, "conversion_factor": 1.0,
@ -1355,7 +1340,6 @@
"taxes": [], "taxes": [],
"thumbnail": null, "thumbnail": null,
"tolerance": 0.0, "tolerance": 0.0,
"total_projected_qty": 0.0,
"uoms": [ "uoms": [
{ {
"conversion_factor": 1.0, "conversion_factor": 1.0,
@ -1441,7 +1425,6 @@
"taxes": [], "taxes": [],
"thumbnail": null, "thumbnail": null,
"tolerance": 0.0, "tolerance": 0.0,
"total_projected_qty": 0.0,
"uoms": [ "uoms": [
{ {
"conversion_factor": 1.0, "conversion_factor": 1.0,
@ -1527,7 +1510,6 @@
"taxes": [], "taxes": [],
"thumbnail": null, "thumbnail": null,
"tolerance": 0.0, "tolerance": 0.0,
"total_projected_qty": 0.0,
"uoms": [ "uoms": [
{ {
"conversion_factor": 1.0, "conversion_factor": 1.0,
@ -1613,7 +1595,6 @@
"taxes": [], "taxes": [],
"thumbnail": null, "thumbnail": null,
"tolerance": 0.0, "tolerance": 0.0,
"total_projected_qty": 0.0,
"uoms": [ "uoms": [
{ {
"conversion_factor": 1.0, "conversion_factor": 1.0,
@ -1699,7 +1680,6 @@
"taxes": [], "taxes": [],
"thumbnail": null, "thumbnail": null,
"tolerance": 0.0, "tolerance": 0.0,
"total_projected_qty": 0.0,
"uoms": [ "uoms": [
{ {
"conversion_factor": 1.0, "conversion_factor": 1.0,
@ -1785,7 +1765,6 @@
"taxes": [], "taxes": [],
"thumbnail": null, "thumbnail": null,
"tolerance": 0.0, "tolerance": 0.0,
"total_projected_qty": 0.0,
"uoms": [ "uoms": [
{ {
"conversion_factor": 1.0, "conversion_factor": 1.0,
@ -1871,7 +1850,6 @@
"taxes": [], "taxes": [],
"thumbnail": null, "thumbnail": null,
"tolerance": 0.0, "tolerance": 0.0,
"total_projected_qty": 0.0,
"uoms": [ "uoms": [
{ {
"conversion_factor": 1.0, "conversion_factor": 1.0,
@ -1957,7 +1935,6 @@
"taxes": [], "taxes": [],
"thumbnail": null, "thumbnail": null,
"tolerance": 0.0, "tolerance": 0.0,
"total_projected_qty": 0.0,
"uoms": [ "uoms": [
{ {
"conversion_factor": 1.0, "conversion_factor": 1.0,
@ -2043,7 +2020,6 @@
"taxes": [], "taxes": [],
"thumbnail": null, "thumbnail": null,
"tolerance": 0.0, "tolerance": 0.0,
"total_projected_qty": 0.0,
"uoms": [ "uoms": [
{ {
"conversion_factor": 1.0, "conversion_factor": 1.0,
@ -2129,7 +2105,6 @@
"taxes": [], "taxes": [],
"thumbnail": null, "thumbnail": null,
"tolerance": 0.0, "tolerance": 0.0,
"total_projected_qty": 0.0,
"uoms": [ "uoms": [
{ {
"conversion_factor": 1.0, "conversion_factor": 1.0,
@ -2215,7 +2190,6 @@
"taxes": [], "taxes": [],
"thumbnail": null, "thumbnail": null,
"tolerance": 0.0, "tolerance": 0.0,
"total_projected_qty": 0.0,
"uoms": [ "uoms": [
{ {
"conversion_factor": 1.0, "conversion_factor": 1.0,
@ -2301,7 +2275,6 @@
"taxes": [], "taxes": [],
"thumbnail": null, "thumbnail": null,
"tolerance": 0.0, "tolerance": 0.0,
"total_projected_qty": 0.0,
"uoms": [ "uoms": [
{ {
"conversion_factor": 1.0, "conversion_factor": 1.0,
@ -2387,7 +2360,6 @@
"taxes": [], "taxes": [],
"thumbnail": null, "thumbnail": null,
"tolerance": 0.0, "tolerance": 0.0,
"total_projected_qty": 0.0,
"uoms": [ "uoms": [
{ {
"conversion_factor": 1.0, "conversion_factor": 1.0,
@ -2473,7 +2445,6 @@
"taxes": [], "taxes": [],
"thumbnail": null, "thumbnail": null,
"tolerance": 0.0, "tolerance": 0.0,
"total_projected_qty": 0.0,
"uoms": [ "uoms": [
{ {
"conversion_factor": 1.0, "conversion_factor": 1.0,
@ -2559,7 +2530,6 @@
"taxes": [], "taxes": [],
"thumbnail": null, "thumbnail": null,
"tolerance": 0.0, "tolerance": 0.0,
"total_projected_qty": 0.0,
"uoms": [ "uoms": [
{ {
"conversion_factor": 1.0, "conversion_factor": 1.0,
@ -2645,7 +2615,6 @@
"taxes": [], "taxes": [],
"thumbnail": null, "thumbnail": null,
"tolerance": 0.0, "tolerance": 0.0,
"total_projected_qty": 0.0,
"uoms": [ "uoms": [
{ {
"conversion_factor": 1.0, "conversion_factor": 1.0,
@ -2731,7 +2700,6 @@
"taxes": [], "taxes": [],
"thumbnail": null, "thumbnail": null,
"tolerance": 0.0, "tolerance": 0.0,
"total_projected_qty": 0.0,
"uoms": [ "uoms": [
{ {
"conversion_factor": 1.0, "conversion_factor": 1.0,
@ -2817,7 +2785,6 @@
"taxes": [], "taxes": [],
"thumbnail": null, "thumbnail": null,
"tolerance": 0.0, "tolerance": 0.0,
"total_projected_qty": 0.0,
"uoms": [ "uoms": [
{ {
"conversion_factor": 1.0, "conversion_factor": 1.0,
@ -2903,7 +2870,6 @@
"taxes": [], "taxes": [],
"thumbnail": null, "thumbnail": null,
"tolerance": 0.0, "tolerance": 0.0,
"total_projected_qty": 0.0,
"uoms": [ "uoms": [
{ {
"conversion_factor": 1.0, "conversion_factor": 1.0,
@ -2989,7 +2955,6 @@
"taxes": [], "taxes": [],
"thumbnail": null, "thumbnail": null,
"tolerance": 0.0, "tolerance": 0.0,
"total_projected_qty": 0.0,
"uoms": [ "uoms": [
{ {
"conversion_factor": 1.0, "conversion_factor": 1.0,
@ -3075,7 +3040,6 @@
"taxes": [], "taxes": [],
"thumbnail": null, "thumbnail": null,
"tolerance": 0.0, "tolerance": 0.0,
"total_projected_qty": 0.0,
"uoms": [ "uoms": [
{ {
"conversion_factor": 1.0, "conversion_factor": 1.0,
@ -3161,7 +3125,6 @@
"taxes": [], "taxes": [],
"thumbnail": null, "thumbnail": null,
"tolerance": 0.0, "tolerance": 0.0,
"total_projected_qty": 0.0,
"uoms": [ "uoms": [
{ {
"conversion_factor": 1.0, "conversion_factor": 1.0,
@ -3247,7 +3210,6 @@
"taxes": [], "taxes": [],
"thumbnail": null, "thumbnail": null,
"tolerance": 0.0, "tolerance": 0.0,
"total_projected_qty": 0.0,
"uoms": [ "uoms": [
{ {
"conversion_factor": 1.0, "conversion_factor": 1.0,
@ -3333,7 +3295,6 @@
"taxes": [], "taxes": [],
"thumbnail": null, "thumbnail": null,
"tolerance": 0.0, "tolerance": 0.0,
"total_projected_qty": 0.0,
"uoms": [ "uoms": [
{ {
"conversion_factor": 1.0, "conversion_factor": 1.0,
@ -3419,7 +3380,6 @@
"taxes": [], "taxes": [],
"thumbnail": null, "thumbnail": null,
"tolerance": 0.0, "tolerance": 0.0,
"total_projected_qty": 0.0,
"uoms": [ "uoms": [
{ {
"conversion_factor": 1.0, "conversion_factor": 1.0,
@ -3505,7 +3465,6 @@
"taxes": [], "taxes": [],
"thumbnail": null, "thumbnail": null,
"tolerance": 0.0, "tolerance": 0.0,
"total_projected_qty": 0.0,
"uoms": [ "uoms": [
{ {
"conversion_factor": 1.0, "conversion_factor": 1.0,
@ -3591,7 +3550,6 @@
"taxes": [], "taxes": [],
"thumbnail": null, "thumbnail": null,
"tolerance": 0.0, "tolerance": 0.0,
"total_projected_qty": 0.0,
"uoms": [ "uoms": [
{ {
"conversion_factor": 1.0, "conversion_factor": 1.0,
@ -3677,7 +3635,6 @@
"taxes": [], "taxes": [],
"thumbnail": null, "thumbnail": null,
"tolerance": 0.0, "tolerance": 0.0,
"total_projected_qty": 0.0,
"uoms": [ "uoms": [
{ {
"conversion_factor": 1.0, "conversion_factor": 1.0,
@ -3763,7 +3720,6 @@
"taxes": [], "taxes": [],
"thumbnail": null, "thumbnail": null,
"tolerance": 0.0, "tolerance": 0.0,
"total_projected_qty": 0.0,
"uoms": [ "uoms": [
{ {
"conversion_factor": 1.0, "conversion_factor": 1.0,
@ -3849,7 +3805,6 @@
"taxes": [], "taxes": [],
"thumbnail": null, "thumbnail": null,
"tolerance": 0.0, "tolerance": 0.0,
"total_projected_qty": 0.0,
"uoms": [ "uoms": [
{ {
"conversion_factor": 1.0, "conversion_factor": 1.0,
@ -3935,7 +3890,6 @@
"taxes": [], "taxes": [],
"thumbnail": null, "thumbnail": null,
"tolerance": 0.0, "tolerance": 0.0,
"total_projected_qty": 0.0,
"uoms": [ "uoms": [
{ {
"conversion_factor": 1.0, "conversion_factor": 1.0,
@ -4021,7 +3975,6 @@
"taxes": [], "taxes": [],
"thumbnail": null, "thumbnail": null,
"tolerance": 0.0, "tolerance": 0.0,
"total_projected_qty": 0.0,
"uoms": [ "uoms": [
{ {
"conversion_factor": 1.0, "conversion_factor": 1.0,
@ -4107,7 +4060,6 @@
"taxes": [], "taxes": [],
"thumbnail": null, "thumbnail": null,
"tolerance": 0.0, "tolerance": 0.0,
"total_projected_qty": 0.0,
"uoms": [ "uoms": [
{ {
"conversion_factor": 1.0, "conversion_factor": 1.0,
@ -4193,7 +4145,6 @@
"taxes": [], "taxes": [],
"thumbnail": null, "thumbnail": null,
"tolerance": 0.0, "tolerance": 0.0,
"total_projected_qty": 0.0,
"uoms": [ "uoms": [
{ {
"conversion_factor": 1.0, "conversion_factor": 1.0,
@ -4279,7 +4230,6 @@
"taxes": [], "taxes": [],
"thumbnail": null, "thumbnail": null,
"tolerance": 0.0, "tolerance": 0.0,
"total_projected_qty": 0.0,
"uoms": [ "uoms": [
{ {
"conversion_factor": 1.0, "conversion_factor": 1.0,
@ -4365,7 +4315,6 @@
"taxes": [], "taxes": [],
"thumbnail": null, "thumbnail": null,
"tolerance": 0.0, "tolerance": 0.0,
"total_projected_qty": 0.0,
"uoms": [ "uoms": [
{ {
"conversion_factor": 1.0, "conversion_factor": 1.0,
@ -4451,7 +4400,6 @@
"taxes": [], "taxes": [],
"thumbnail": null, "thumbnail": null,
"tolerance": 0.0, "tolerance": 0.0,
"total_projected_qty": 0.0,
"uoms": [ "uoms": [
{ {
"conversion_factor": 1.0, "conversion_factor": 1.0,
@ -4537,7 +4485,6 @@
"taxes": [], "taxes": [],
"thumbnail": null, "thumbnail": null,
"tolerance": 0.0, "tolerance": 0.0,
"total_projected_qty": 0.0,
"uoms": [ "uoms": [
{ {
"conversion_factor": 1.0, "conversion_factor": 1.0,
@ -4623,7 +4570,6 @@
"taxes": [], "taxes": [],
"thumbnail": null, "thumbnail": null,
"tolerance": 0.0, "tolerance": 0.0,
"total_projected_qty": 0.0,
"uoms": [ "uoms": [
{ {
"conversion_factor": 1.0, "conversion_factor": 1.0,
@ -4709,7 +4655,6 @@
"taxes": [], "taxes": [],
"thumbnail": null, "thumbnail": null,
"tolerance": 0.0, "tolerance": 0.0,
"total_projected_qty": 0.0,
"uoms": [ "uoms": [
{ {
"conversion_factor": 1.0, "conversion_factor": 1.0,
@ -4795,7 +4740,6 @@
"taxes": [], "taxes": [],
"thumbnail": null, "thumbnail": null,
"tolerance": 0.0, "tolerance": 0.0,
"total_projected_qty": 0.0,
"uoms": [ "uoms": [
{ {
"conversion_factor": 1.0, "conversion_factor": 1.0,
@ -4881,7 +4825,6 @@
"taxes": [], "taxes": [],
"thumbnail": null, "thumbnail": null,
"tolerance": 0.0, "tolerance": 0.0,
"total_projected_qty": 0.0,
"uoms": [ "uoms": [
{ {
"conversion_factor": 1.0, "conversion_factor": 1.0,
@ -4967,7 +4910,6 @@
"taxes": [], "taxes": [],
"thumbnail": null, "thumbnail": null,
"tolerance": 0.0, "tolerance": 0.0,
"total_projected_qty": 0.0,
"uoms": [ "uoms": [
{ {
"conversion_factor": 1.0, "conversion_factor": 1.0,
@ -5053,7 +4995,6 @@
"taxes": [], "taxes": [],
"thumbnail": null, "thumbnail": null,
"tolerance": 0.0, "tolerance": 0.0,
"total_projected_qty": 0.0,
"uoms": [ "uoms": [
{ {
"conversion_factor": 1.0, "conversion_factor": 1.0,
@ -5139,7 +5080,6 @@
"taxes": [], "taxes": [],
"thumbnail": null, "thumbnail": null,
"tolerance": 0.0, "tolerance": 0.0,
"total_projected_qty": 0.0,
"uoms": [ "uoms": [
{ {
"conversion_factor": 1.0, "conversion_factor": 1.0,
@ -5225,7 +5165,6 @@
"taxes": [], "taxes": [],
"thumbnail": null, "thumbnail": null,
"tolerance": 0.0, "tolerance": 0.0,
"total_projected_qty": 0.0,
"uoms": [ "uoms": [
{ {
"conversion_factor": 1.0, "conversion_factor": 1.0,
@ -5311,7 +5250,6 @@
"taxes": [], "taxes": [],
"thumbnail": null, "thumbnail": null,
"tolerance": 0.0, "tolerance": 0.0,
"total_projected_qty": 0.0,
"uoms": [ "uoms": [
{ {
"conversion_factor": 1.0, "conversion_factor": 1.0,
@ -5397,7 +5335,6 @@
"taxes": [], "taxes": [],
"thumbnail": null, "thumbnail": null,
"tolerance": 0.0, "tolerance": 0.0,
"total_projected_qty": 0.0,
"uoms": [ "uoms": [
{ {
"conversion_factor": 1.0, "conversion_factor": 1.0,

4
erpnext/education/doctype/fees/fees.json
View File

@ -4,7 +4,7 @@
"allow_import": 1, "allow_import": 1,
"allow_rename": 0, "allow_rename": 0,
"autoname": "naming_series:", "autoname": "naming_series:",
"beta": 1, "beta": 0,
"creation": "2015-09-22 16:57:22.143710", "creation": "2015-09-22 16:57:22.143710",
"custom": 0, "custom": 0,
"docstatus": 0, "docstatus": 0,
@ -1276,7 +1276,7 @@
"istable": 0, "istable": 0,
"max_attachments": 0, "max_attachments": 0,
"menu_index": 0, "menu_index": 0,
"modified": "2017-12-06 05:55:10.502567", "modified": "2018-02-08 02:12:34.185245",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Education", "module": "Education",
"name": "Fees", "name": "Fees",

7
erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.json
View File

@ -7,7 +7,7 @@
"doctype": "Report", "doctype": "Report",
"idx": 0, "idx": 0,
"is_standard": "Yes", "is_standard": "Yes",
"modified": "2017-11-10 19:41:46.641227", "modified": "2018-02-08 15:11:24.904628",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Education", "module": "Education",
"name": "Course wise Assessment Report", "name": "Course wise Assessment Report",
@ -17,7 +17,10 @@
"report_type": "Script Report", "report_type": "Script Report",
"roles": [ "roles": [
{ {
"role": "Academics User" "role": "Instructor"
},
{
"role": "Education Manager"
} }
] ]
} }

11
erpnext/education/report/final_assessment_grades/final_assessment_grades.json
View File

@ -8,7 +8,7 @@
"idx": 0, "idx": 0,
"is_standard": "Yes", "is_standard": "Yes",
"letter_head": "Shishuvan Secondary School", "letter_head": "Shishuvan Secondary School",
"modified": "2018-01-22 17:04:43.412054", "modified": "2018-02-08 15:11:35.339434",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Education", "module": "Education",
"name": "Final Assessment Grades", "name": "Final Assessment Grades",
@ -16,5 +16,12 @@
"ref_doctype": "Assessment Result", "ref_doctype": "Assessment Result",
"report_name": "Final Assessment Grades", "report_name": "Final Assessment Grades",
"report_type": "Script Report", "report_type": "Script Report",
"roles": [] "roles": [
{
"role": "Instructor"
},
{
"role": "Education Manager"
}
]
} }

2
erpnext/hr/doctype/employee_loan/employee_loan.py
View File

@ -135,7 +135,7 @@ def get_employee_loan_application(employee_loan_application):
return employee_loan.as_dict() return employee_loan.as_dict()
@frappe.whitelist() @frappe.whitelist()
def make_jv_entry(employee_loan, company, employee_loan_account, employee, loan_amount, payment_account): def make_jv_entry(employee_loan, company, employee_loan_account, employee, loan_amount, payment_account=None):
journal_entry = frappe.new_doc('Journal Entry') journal_entry = frappe.new_doc('Journal Entry')
journal_entry.voucher_type = 'Bank Entry' journal_entry.voucher_type = 'Bank Entry'
journal_entry.user_remark = _('Against Employee Loan: {0}').format(employee_loan) journal_entry.user_remark = _('Against Employee Loan: {0}').format(employee_loan)

2
erpnext/hr/doctype/payroll_entry/payroll_entry.py
View File

@ -252,7 +252,7 @@ class PayrollEntry(Document):
journal_entry.user_remark = _('Accural Journal Entry for salaries from {0} to {1}')\ journal_entry.user_remark = _('Accural Journal Entry for salaries from {0} to {1}')\
.format(self.start_date, self.end_date) .format(self.start_date, self.end_date)
journal_entry.company = self.company journal_entry.company = self.company
journal_entry.posting_date = nowdate() journal_entry.posting_date = self.posting_date
accounts = [] accounts = []
payable_amount = 0 payable_amount = 0

8
erpnext/manufacturing/doctype/production_order/production_order.js
View File

@ -79,6 +79,10 @@ frappe.ui.form.on("Production Order", {
] ]
} }
}); });
// formatter for production order operation
frm.set_indicator_formatter('operation',
function(doc) { return (frm.doc.qty==doc.completed_qty) ? "green" : "orange" });
}, },
onload: function(frm) { onload: function(frm) {
@ -94,10 +98,6 @@ frappe.ui.form.on("Production Order", {
}); });
erpnext.production_order.set_default_warehouse(frm); erpnext.production_order.set_default_warehouse(frm);
} }
// formatter for production order operation
frm.set_indicator_formatter('operation',
function(doc) { return (frm.doc.qty==doc.completed_qty) ? "green" : "orange" });
}, },
refresh: function(frm) { refresh: function(frm) {

23
erpnext/manufacturing/doctype/production_order/test_production_order.py
View File

@ -10,7 +10,6 @@ from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import set_per
from erpnext.manufacturing.doctype.production_order.production_order \ from erpnext.manufacturing.doctype.production_order.production_order \
import make_stock_entry, ItemHasVariantError, stop_unstop import make_stock_entry, ItemHasVariantError, stop_unstop
from erpnext.stock.doctype.stock_entry import test_stock_entry from erpnext.stock.doctype.stock_entry import test_stock_entry
from erpnext.stock.doctype.item.test_item import get_total_projected_qty
from erpnext.stock.utils import get_bin from erpnext.stock.utils import get_bin
from erpnext.selling.doctype.sales_order.test_sales_order import make_sales_order from erpnext.selling.doctype.sales_order.test_sales_order import make_sales_order
@ -176,28 +175,6 @@ class TestProductionOrder(unittest.TestCase):
self.assertEqual(self.bin1_at_start.projected_qty, self.assertEqual(self.bin1_at_start.projected_qty,
cint(bin1_on_cancel.projected_qty)) cint(bin1_on_cancel.projected_qty))
def test_projected_qty_for_production_and_sales_order(self):
before_production_order = get_bin(self.item, self.warehouse)
before_production_order.update_reserved_qty_for_production()
self.pro_order = make_prod_order_test_record(item="_Test FG Item", qty=2,
source_warehouse=self.warehouse)
after_production_order = get_bin(self.item, self.warehouse)
sales_order = make_sales_order(item = self.item, qty = 2)
after_sales_order = get_bin(self.item, self.warehouse)
self.assertEqual(cint(before_production_order.reserved_qty_for_production) + 2,
cint(after_sales_order.reserved_qty_for_production))
self.assertEqual(cint(before_production_order.projected_qty),
cint(after_sales_order.projected_qty) + 2)
total_projected_qty = get_total_projected_qty(self.item)
item_doc = frappe.get_doc('Item', self.item)
self.assertEqual(total_projected_qty, item_doc.total_projected_qty)
def test_reserved_qty_for_production_on_stock_entry(self): def test_reserved_qty_for_production_on_stock_entry(self):
test_stock_entry.make_stock_entry(item_code="_Test Item", test_stock_entry.make_stock_entry(item_code="_Test Item",
target= self.warehouse, qty=100, basic_rate=100) target= self.warehouse, qty=100, basic_rate=100)

12
erpnext/patches/v7_0/repost_bin_qty_and_item_projected_qty.py
View File

@ -7,7 +7,6 @@ from erpnext.stock.doctype.bin.bin import update_item_projected_qty
def execute(): def execute():
repost_bin_qty() repost_bin_qty()
repost_item_projected_qty()
def repost_bin_qty(): def repost_bin_qty():
for bin in frappe.db.sql(""" select name from `tabBin` for bin in frappe.db.sql(""" select name from `tabBin`
@ -15,14 +14,3 @@ def repost_bin_qty():
bin_doc = frappe.get_doc('Bin', bin.name) bin_doc = frappe.get_doc('Bin', bin.name)
bin_doc.set_projected_qty() bin_doc.set_projected_qty()
bin_doc.db_set("projected_qty", bin_doc.projected_qty, update_modified = False) bin_doc.db_set("projected_qty", bin_doc.projected_qty, update_modified = False)
def repost_item_projected_qty():
for data in frappe.db.sql(""" select
`tabBin`.item_code as item_code,
sum(`tabBin`.projected_qty) as projected_qty,
`tabItem`.total_projected_qty as total_projected_qty
from
`tabBin`, `tabItem`
where `tabBin`.item_code = `tabItem`.name
group by `tabBin`.item_code having projected_qty <> total_projected_qty """, as_dict=1):
update_item_projected_qty(data.item_code)

8
erpnext/projects/doctype/timesheet/timesheet.py
View File

@ -156,14 +156,18 @@ class Timesheet(Document):
(self.production_order, operation_id), as_dict=1)[0] (self.production_order, operation_id), as_dict=1)[0]
def update_task_and_project(self): def update_task_and_project(self):
tasks, projects = [], []
for data in self.time_logs: for data in self.time_logs:
if data.task: if data.task and data.task not in tasks:
task = frappe.get_doc("Task", data.task) task = frappe.get_doc("Task", data.task)
task.update_time_and_costing() task.update_time_and_costing()
task.save() task.save()
tasks.append(data.task)
elif data.project: elif data.project and data.project not in projects:
frappe.get_doc("Project", data.project).update_project() frappe.get_doc("Project", data.project).update_project()
projects.append(data.project)
def validate_dates(self): def validate_dates(self):
for data in self.time_logs: for data in self.time_logs:

13
erpnext/public/js/controllers/transaction.js
View File

@ -704,7 +704,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
} }
if(!this.in_apply_price_list) { if(!this.in_apply_price_list) {
this.apply_price_list(); this.apply_price_list(null, true);
} }
}, },
@ -776,7 +776,8 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
this.frm.toggle_reqd("plc_conversion_rate", this.frm.toggle_reqd("plc_conversion_rate",
!!(this.frm.doc.price_list_name && this.frm.doc.price_list_currency)); !!(this.frm.doc.price_list_name && this.frm.doc.price_list_currency));
if(this.frm.doc_currency!==this.frm.doc.currency) { if(this.frm.doc_currency!==this.frm.doc.currency
|| this.frm.doc_currency!==this.frm.doc.price_list_currency) {
// reset names only when the currency is different // reset names only when the currency is different
var company_currency = this.get_company_currency(); var company_currency = this.get_company_currency();
@ -1056,7 +1057,13 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
if(!price_list_rate_changed) me.calculate_taxes_and_totals(); if(!price_list_rate_changed) me.calculate_taxes_and_totals();
}, },
apply_price_list: function(item) { apply_price_list: function(item, reset_plc_conversion) {
// We need to reset plc_conversion_rate sometimes because the call to
// `erpnext.stock.get_item_details.apply_price_list` is sensitive to its value
if (!reset_plc_conversion) {
this.frm.set_value("plc_conversion_rate", "");
}
var me = this; var me = this;
var args = this._get_args(item); var args = this._get_args(item);
if (!((args.items && args.items.length) || args.price_list)) { if (!((args.items && args.items.length) || args.price_list)) {

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

@ -34,6 +34,12 @@ frappe.ui.form.on("Customer", {
} }
}) })
}, },
customer_primary_contact: function(frm){
if(!frm.doc.customer_primary_contact){
frm.set_value("mobile_no", "");
frm.set_value("email_id", "");
}
},
refresh: function(frm) { refresh: function(frm) {
if(frappe.defaults.get_default("cust_master_name")!="Naming Series") { if(frappe.defaults.get_default("cust_master_name")!="Naming Series") {
frm.toggle_display("naming_series", false); frm.toggle_display("naming_series", false);

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

@ -13,6 +13,10 @@ frappe.ui.form.on("Sales Order", {
'Project': 'Project' 'Project': 'Project'
} }
frm.add_fetch('customer', 'tax_id', 'tax_id'); frm.add_fetch('customer', 'tax_id', 'tax_id');
// formatter for material request item
frm.set_indicator_formatter('item_code',
function(doc) { return (doc.stock_qty<=doc.delivered_qty) ? "green" : "orange" })
}, },
onload: function(frm) { onload: function(frm) {
erpnext.queries.setup_queries(frm, "Warehouse", function() { erpnext.queries.setup_queries(frm, "Warehouse", function() {
@ -28,10 +32,6 @@ frappe.ui.form.on("Sales Order", {
} }
}); });
// formatter for material request item
frm.set_indicator_formatter('item_code',
function(doc) { return (doc.stock_qty<=doc.delivered_qty) ? "green" : "orange" })
erpnext.queries.setup_warehouse_query(frm); erpnext.queries.setup_warehouse_query(frm);
}, },

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

@ -5,7 +5,6 @@ import frappe
from frappe.utils import flt, add_days from frappe.utils import flt, add_days
import frappe.permissions import frappe.permissions
import unittest import unittest
from erpnext.stock.doctype.item.test_item import get_total_projected_qty
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 erpnext.stock.doctype.stock_entry.stock_entry_utils import make_stock_entry from erpnext.stock.doctype.stock_entry.stock_entry_utils import make_stock_entry
@ -155,17 +154,9 @@ class TestSalesOrder(unittest.TestCase):
dn = create_dn_against_so(so.name, 15) dn = create_dn_against_so(so.name, 15)
self.assertEqual(get_reserved_qty(), existing_reserved_qty) self.assertEqual(get_reserved_qty(), existing_reserved_qty)
total_projected_qty = get_total_projected_qty('_Test Item')
item_doc_before_cancel = frappe.get_doc('Item', '_Test Item')
self.assertEqual(total_projected_qty, item_doc_before_cancel.total_projected_qty)
dn.cancel() dn.cancel()
self.assertEqual(get_reserved_qty(), existing_reserved_qty + 10) self.assertEqual(get_reserved_qty(), existing_reserved_qty + 10)
total_projected_qty = get_total_projected_qty('_Test Item')
item_doc_after_cancel = frappe.get_doc('Item', '_Test Item')
self.assertEqual(total_projected_qty, item_doc_after_cancel.total_projected_qty)
def test_reserved_qty_for_over_delivery_via_sales_invoice(self): def test_reserved_qty_for_over_delivery_via_sales_invoice(self):
make_stock_entry(target="_Test Warehouse - _TC", qty=10, rate=100) make_stock_entry(target="_Test Warehouse - _TC", qty=10, rate=100)
@ -183,10 +174,6 @@ class TestSalesOrder(unittest.TestCase):
si.insert() si.insert()
si.submit() si.submit()
total_projected_qty = get_total_projected_qty('_Test Item')
item_doc = frappe.get_doc('Item', '_Test Item')
self.assertEqual(total_projected_qty, item_doc.total_projected_qty)
self.assertEqual(get_reserved_qty(), existing_reserved_qty) self.assertEqual(get_reserved_qty(), existing_reserved_qty)
so.load_from_db() so.load_from_db()
@ -195,9 +182,6 @@ class TestSalesOrder(unittest.TestCase):
si.cancel() si.cancel()
self.assertEqual(get_reserved_qty(), existing_reserved_qty + 10) self.assertEqual(get_reserved_qty(), existing_reserved_qty + 10)
total_projected_qty = get_total_projected_qty('_Test Item')
item_doc = frappe.get_doc('Item', '_Test Item')
self.assertEqual(total_projected_qty, item_doc.total_projected_qty)
so.load_from_db() so.load_from_db()
self.assertEqual(so.get("items")[0].delivered_qty, 0) self.assertEqual(so.get("items")[0].delivered_qty, 0)
@ -229,10 +213,6 @@ class TestSalesOrder(unittest.TestCase):
self.assertEqual(get_reserved_qty("_Test Item"), existing_reserved_qty_item1) self.assertEqual(get_reserved_qty("_Test Item"), existing_reserved_qty_item1)
self.assertEqual(get_reserved_qty("_Test Item Home Desktop 100"), existing_reserved_qty_item2) self.assertEqual(get_reserved_qty("_Test Item Home Desktop 100"), existing_reserved_qty_item2)
total_projected_qty = get_total_projected_qty('_Test Item')
item_doc = frappe.get_doc('Item', '_Test Item')
self.assertEqual(total_projected_qty, item_doc.total_projected_qty)
# unclose so # unclose so
so.load_from_db() so.load_from_db()
so.update_status('Draft') so.update_status('Draft')
@ -269,10 +249,6 @@ class TestSalesOrder(unittest.TestCase):
dn = create_dn_against_so(so.name, 15) dn = create_dn_against_so(so.name, 15)
total_projected_qty = get_total_projected_qty('_Test Item')
item_doc = frappe.get_doc('Item', '_Test Item')
self.assertEqual(total_projected_qty, item_doc.total_projected_qty)
self.assertEqual(get_reserved_qty("_Test Item"), existing_reserved_qty_item1) self.assertEqual(get_reserved_qty("_Test Item"), existing_reserved_qty_item1)
self.assertEqual(get_reserved_qty("_Test Item Home Desktop 100"), self.assertEqual(get_reserved_qty("_Test Item Home Desktop 100"),
existing_reserved_qty_item2) existing_reserved_qty_item2)
@ -495,13 +471,6 @@ class TestSalesOrder(unittest.TestCase):
self.assertEquals(abs(flt(reserved_qty)), existing_reserved_qty_for_dn_item) self.assertEquals(abs(flt(reserved_qty)), existing_reserved_qty_for_dn_item)
def test_total_projected_qty_against_sales_order(self):
so = make_sales_order(item = '_Test Item')
total_projected_qty = get_total_projected_qty('_Test Item')
item_doc = frappe.get_doc('Item', '_Test Item')
self.assertEqual(total_projected_qty, item_doc.total_projected_qty)
def test_reserved_qty_for_closing_so(self): def test_reserved_qty_for_closing_so(self):
bin = frappe.get_all("Bin", filters={"item_code": "_Test Item", "warehouse": "_Test Warehouse - _TC"}, bin = frappe.get_all("Bin", filters={"item_code": "_Test Item", "warehouse": "_Test Warehouse - _TC"},
fields=["reserved_qty"]) fields=["reserved_qty"])

1
erpnext/selling/sales_common.js
View File

@ -118,6 +118,7 @@ erpnext.selling.SellingController = erpnext.TransactionController.extend({
selling_price_list: function() { selling_price_list: function() {
this.apply_price_list(); this.apply_price_list();
this.set_dynamic_labels();
}, },
price_list_rate: function(doc, cdt, cdn) { price_list_rate: function(doc, cdt, cdn) {

1
erpnext/startup/notifications.py
View File

@ -11,7 +11,6 @@ def get_notification_config():
"Warranty Claim": {"status": "Open"}, "Warranty Claim": {"status": "Open"},
"Task": {"status": ("in", ("Open", "Overdue"))}, "Task": {"status": ("in", ("Open", "Overdue"))},
"Project": {"status": "Open"}, "Project": {"status": "Open"},
"Item": {"total_projected_qty": ("<", 0)},
"Lead": {"status": "Open"}, "Lead": {"status": "Open"},
"Contact": {"status": "Open"}, "Contact": {"status": "Open"},
"Opportunity": {"status": "Open"}, "Opportunity": {"status": "Open"},

9
erpnext/stock/doctype/bin/bin.py
View File

@ -15,9 +15,6 @@ class Bin(Document):
self.validate_mandatory() self.validate_mandatory()
self.set_projected_qty() self.set_projected_qty()
def on_update(self):
update_item_projected_qty(self.item_code)
def validate_mandatory(self): def validate_mandatory(self):
qf = ['actual_qty', 'reserved_qty', 'ordered_qty', 'indented_qty'] qf = ['actual_qty', 'reserved_qty', 'ordered_qty', 'indented_qty']
for f in qf: for f in qf:
@ -94,11 +91,5 @@ class Bin(Document):
self.db_set('projected_qty', self.projected_qty) self.db_set('projected_qty', self.projected_qty)
def update_item_projected_qty(item_code):
'''Set total_projected_qty in Item as sum of projected qty in all warehouses'''
frappe.db.sql('''update tabItem set
total_projected_qty = ifnull((select sum(projected_qty) from tabBin where item_code=%s), 0)
where name=%s''', (item_code, item_code))
def on_doctype_update(): def on_doctype_update():
frappe.db.add_index("Bin", ["item_code", "warehouse"]) frappe.db.add_index("Bin", ["item_code", "warehouse"])

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

@ -110,7 +110,7 @@ frappe.ui.form.on("Item", {
const stock_exists = (frm.doc.__onload const stock_exists = (frm.doc.__onload
&& frm.doc.__onload.stock_exists) ? 1 : 0; && frm.doc.__onload.stock_exists) ? 1 : 0;
['has_serial_no', 'has_batch_no'].forEach((fieldname) => { ['is_stock_item', 'has_serial_no', 'has_batch_no'].forEach((fieldname) => {
frm.set_df_property(fieldname, 'read_only', stock_exists); frm.set_df_property(fieldname, 'read_only', stock_exists);
}); });
}, },

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

@ -386,7 +386,7 @@
"report_hide": 0, "report_hide": 0,
"reqd": 0, "reqd": 0,
"search_index": 0, "search_index": 0,
"set_only_once": 1, "set_only_once": 0,
"unique": 0 "unique": 0
}, },
{ {
@ -3253,36 +3253,6 @@
"set_only_once": 0, "set_only_once": 0,
"unique": 0 "unique": 0
}, },
{
"allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "total_projected_qty",
"fieldtype": "Float",
"hidden": 1,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Total Projected Qty",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 1,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{ {
"allow_bulk_edit": 0, "allow_bulk_edit": 0,
"allow_on_submit": 0, "allow_on_submit": 0,
@ -3453,7 +3423,7 @@
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"max_attachments": 1, "max_attachments": 1,
"modified": "2018-01-23 12:21:16.641517", "modified": "2018-02-12 14:32:48.097249",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Item", "name": "Item",

4
erpnext/stock/doctype/item/item_list.js
View File

@ -1,6 +1,6 @@
frappe.listview_settings['Item'] = { frappe.listview_settings['Item'] = {
add_fields: ["item_name", "stock_uom", "item_group", "image", "variant_of", add_fields: ["item_name", "stock_uom", "item_group", "image", "variant_of",
"has_variants", "end_of_life", "disabled", "total_projected_qty"], "has_variants", "end_of_life", "disabled"],
filters: [["disabled", "=", "0"]], filters: [["disabled", "=", "0"]],
get_indicator: function(doc) { get_indicator: function(doc) {
@ -8,8 +8,6 @@ frappe.listview_settings['Item'] = {
return [__("Disabled"), "grey", "disabled,=,Yes"]; return [__("Disabled"), "grey", "disabled,=,Yes"];
} else if (doc.end_of_life && doc.end_of_life < frappe.datetime.get_today()) { } else if (doc.end_of_life && doc.end_of_life < frappe.datetime.get_today()) {
return [__("Expired"), "grey", "end_of_life,<,Today"]; return [__("Expired"), "grey", "end_of_life,<,Today"];
} else if(doc.total_projected_qty < 0) {
return [__("Shortage"), "red", "total_projected_qty,<,0"];
} else if (doc.has_variants) { } else if (doc.has_variants) {
return [__("Template"), "orange", "has_variants,=,Yes"]; return [__("Template"), "orange", "has_variants,=,Yes"];
} else if (doc.variant_of) { } else if (doc.variant_of) {

6
erpnext/stock/doctype/item/test_item.py
View File

@ -293,12 +293,6 @@ def make_item_variant():
variant.item_name = "_Test Variant Item-S" variant.item_name = "_Test Variant Item-S"
variant.save() variant.save()
def get_total_projected_qty(item):
total_qty = frappe.db.sql(""" select sum(projected_qty) as projected_qty from tabBin
where item_code = %(item)s""", {'item': item}, as_dict=1)
return total_qty[0].projected_qty if total_qty else 0.0
test_records = frappe.get_test_records('Item') test_records = frappe.get_test_records('Item')
def create_item(item_code, is_stock_item=None): def create_item(item_code, is_stock_item=None):

9
erpnext/stock/doctype/material_request/material_request.js
View File

@ -12,6 +12,10 @@ frappe.ui.form.on('Material Request', {
'Supplier Quotation': 'Supplier Quotation', 'Supplier Quotation': 'Supplier Quotation',
'Production Order': 'Production Order' 'Production Order': 'Production Order'
} }
// formatter for material request item
frm.set_indicator_formatter('item_code',
function(doc) { return (doc.qty<=doc.ordered_qty) ? "green" : "orange" })
}, },
onload: function(frm) { onload: function(frm) {
// add item, if previous view was item // add item, if previous view was item
@ -19,11 +23,6 @@ frappe.ui.form.on('Material Request', {
//set schedule_date //set schedule_date
set_schedule_date(frm); set_schedule_date(frm);
// formatter for material request item
frm.set_indicator_formatter('item_code',
function(doc) { return (doc.qty<=doc.ordered_qty) ? "green" : "orange" }),
frm.fields_dict["items"].grid.get_field("warehouse").get_query = function(doc, cdt, cdn){ frm.fields_dict["items"].grid.get_field("warehouse").get_query = function(doc, cdt, cdn){
return{ return{
filters: {'company': doc.company} filters: {'company': doc.company}

8
erpnext/stock/get_item_details.py
View File

@ -10,6 +10,7 @@ from erpnext.accounts.doctype.pricing_rule.pricing_rule import get_pricing_rule_
from erpnext.setup.utils import get_exchange_rate from erpnext.setup.utils import get_exchange_rate
from frappe.model.meta import get_field_precision from frappe.model.meta import get_field_precision
from erpnext.stock.doctype.batch.batch import get_batch_no from erpnext.stock.doctype.batch.batch import get_batch_no
from erpnext import get_company_currency
@frappe.whitelist() @frappe.whitelist()
@ -472,8 +473,8 @@ def get_projected_qty(item_code, warehouse):
@frappe.whitelist() @frappe.whitelist()
def get_bin_details(item_code, warehouse): def get_bin_details(item_code, warehouse):
return frappe.db.get_value("Bin", {"item_code": item_code, "warehouse": warehouse}, return frappe.db.get_value("Bin", {"item_code": item_code, "warehouse": warehouse},
["projected_qty", "actual_qty", "ordered_qty"], as_dict=True) \ ["projected_qty", "actual_qty"], as_dict=True) \
or {"projected_qty": 0, "actual_qty": 0, "ordered_qty": 0} or {"projected_qty": 0, "actual_qty": 0}
@frappe.whitelist() @frappe.whitelist()
def get_serial_no_details(item_code, warehouse, stock_qty, serial_no): def get_serial_no_details(item_code, warehouse, stock_qty, serial_no):
@ -590,11 +591,12 @@ def get_price_list_currency_and_exchange_rate(args):
price_list_currency = get_price_list_currency(args.price_list) price_list_currency = get_price_list_currency(args.price_list)
price_list_uom_dependant = get_price_list_uom_dependant(args.price_list) price_list_uom_dependant = get_price_list_uom_dependant(args.price_list)
plc_conversion_rate = args.plc_conversion_rate plc_conversion_rate = args.plc_conversion_rate
company_currency = get_company_currency(args.company)
if (not plc_conversion_rate) or (price_list_currency and args.price_list_currency \ if (not plc_conversion_rate) or (price_list_currency and args.price_list_currency \
and price_list_currency != args.price_list_currency): and price_list_currency != args.price_list_currency):
# cksgb 19/09/2016: added args.transaction_date as posting_date argument for get_exchange_rate # cksgb 19/09/2016: added args.transaction_date as posting_date argument for get_exchange_rate
plc_conversion_rate = get_exchange_rate(price_list_currency, args.currency, plc_conversion_rate = get_exchange_rate(price_list_currency, company_currency,
args.transaction_date) or plc_conversion_rate args.transaction_date) or plc_conversion_rate
return frappe._dict({ return frappe._dict({

2
erpnext/stock/report/item_variant_details/item_variant_details.py
View File

@ -17,7 +17,7 @@ def get_data(item):
variant_results = frappe.db.sql("""select name from `tabItem` variant_results = frappe.db.sql("""select name from `tabItem`
where variant_of = %s""", item, as_dict=1) where variant_of = %s""", item, as_dict=1)
variants = ",".join(['"' + variant['name'] + '"' for variant in variant_results]) variants = ",".join(['"' + frappe.db.escape(variant['name']) + '"' for variant in variant_results])
order_count_map = get_open_sales_orders_map(variants) order_count_map = get_open_sales_orders_map(variants)
stock_details_map = get_stock_details_map(variants) stock_details_map = get_stock_details_map(variants)

2
erpnext/utilities/user_progress.py
View File

@ -13,8 +13,8 @@ def get_slide_settings():
doc = frappe.get_doc("Setup Progress") doc = frappe.get_doc("Setup Progress")
item = [d for d in doc.get("actions") if d.action_name == "Set Sales Target"][0] item = [d for d in doc.get("actions") if d.action_name == "Set Sales Target"][0]
if not item.action_document:
item.action_document = company item.action_document = company
item.save()
doc.save() doc.save()
# Initial state of slides # Initial state of slides