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

Merge pull request #2646 from nabinhait/fix1

Browse Source 
Minor fixes
This commit is contained in:
Nabin Hait 2015-01-28 14:30:55 +05:30
commit 68b5eaa82f
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,12 +51,12 @@ class SalesOrder(SellingController):
frappe.throw(_("Reserved warehouse required for stock item {0}").format(d.item_code))
if e in check_list:
frappe.throw(_("Item {0} has been entered twice").format(d.item_code))
frappe.msgprint(_("Item {0} has been entered twice").format(d.item_code))
else:
check_list.append(e)
else:
if f in chk_dupl_itm:
frappe.throw(_("Item {0} has been entered twice").format(d.item_code))
frappe.msgprint(_("Item {0} has been entered twice").format(d.item_code))
else:
chk_dupl_itm.append(f)

6
erpnext/stock/doctype/stock_entry/stock_entry.js
View File

@ -231,8 +231,8 @@ erpnext.stock.StockEntry = erpnext.stock.StockController.extend({
if(!row.t_warehouse) row.t_warehouse = this.frm.doc.to_warehouse;
},
source_mandatory: ["Material Issue", "Material Transfer", "Purchase Return"],
target_mandatory: ["Material Receipt", "Material Transfer", "Sales Return"],
source_mandatory: ["Material Issue", "Material Transfer", "Purchase Return", "Subcontract"],
target_mandatory: ["Material Receipt", "Material Transfer", "Sales Return", "Subcontract"],
from_warehouse: function(doc) {
var me = this;
@ -462,4 +462,4 @@ cur_frm.fields_dict.supplier.get_query = function(doc, cdt, cdn) {
return { query: "erpnext.controllers.queries.supplier_query" }
}
cur_frm.add_fetch('production_order', 'total_fixed_cost', 'total_fixed_cost');
cur_frm.add_fetch('bom_no', 'total_fixed_cost', 'total_fixed_cost');
cur_frm.add_fetch('bom_no', 'total_fixed_cost', 'total_fixed_cost');

1
erpnext/support/doctype/maintenance_visit/maintenance_visit.py
View File

@ -27,6 +27,7 @@ class MaintenanceVisit(TransactionBase):
mntc_date = self.mntc_date
service_person = d.service_person
work_done = d.work_done
status = "Open"
if self.completion_status == 'Fully Completed':
status = 'Closed'
elif self.completion_status == 'Partially Completed':