Fiscal Year removed from Material Request
This commit is contained in:
parent
5b731ff73a
commit
eb00cae86c
@ -359,10 +359,7 @@ class ProductionPlanningTool(Document):
|
|||||||
|
|
||||||
def insert_purchase_request(self):
|
def insert_purchase_request(self):
|
||||||
items_to_be_requested = self.get_requested_items()
|
items_to_be_requested = self.get_requested_items()
|
||||||
|
|
||||||
from erpnext.accounts.utils import get_fiscal_year
|
|
||||||
fiscal_year = get_fiscal_year(nowdate())[0]
|
|
||||||
|
|
||||||
purchase_request_list = []
|
purchase_request_list = []
|
||||||
if items_to_be_requested:
|
if items_to_be_requested:
|
||||||
for item in items_to_be_requested:
|
for item in items_to_be_requested:
|
||||||
@ -372,7 +369,6 @@ class ProductionPlanningTool(Document):
|
|||||||
"transaction_date": nowdate(),
|
"transaction_date": nowdate(),
|
||||||
"status": "Draft",
|
"status": "Draft",
|
||||||
"company": self.company,
|
"company": self.company,
|
||||||
"fiscal_year": fiscal_year,
|
|
||||||
"requested_by": frappe.session.user,
|
"requested_by": frappe.session.user,
|
||||||
"material_request_type": "Purchase"
|
"material_request_type": "Purchase"
|
||||||
})
|
})
|
||||||
|
@ -14,19 +14,21 @@ $.extend(erpnext, {
|
|||||||
},
|
},
|
||||||
|
|
||||||
get_fiscal_year: function(company, date, fn) {
|
get_fiscal_year: function(company, date, fn) {
|
||||||
frappe.call({
|
if(frappe.meta.get_docfield(cur_frm.doctype, "fiscal_year")) {
|
||||||
type:"GET",
|
frappe.call({
|
||||||
method: "erpnext.accounts.utils.get_fiscal_year",
|
type:"GET",
|
||||||
args: {
|
method: "erpnext.accounts.utils.get_fiscal_year",
|
||||||
"company": company,
|
args: {
|
||||||
"date": date,
|
"company": company,
|
||||||
"verbose": 0
|
"date": date,
|
||||||
},
|
"verbose": 0
|
||||||
callback: function(r) {
|
},
|
||||||
if (r.message) cur_frm.set_value("fiscal_year", r.message[0]);
|
callback: function(r) {
|
||||||
if (fn) fn();
|
if (r.message) cur_frm.set_value("fiscal_year", r.message[0]);
|
||||||
}
|
if (fn) fn();
|
||||||
});
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
toggle_naming_series: function() {
|
toggle_naming_series: function() {
|
||||||
|
@ -131,21 +131,6 @@
|
|||||||
"search_index": 1,
|
"search_index": 1,
|
||||||
"width": "100px"
|
"width": "100px"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"fieldname": "fiscal_year",
|
|
||||||
"fieldtype": "Link",
|
|
||||||
"in_filter": 1,
|
|
||||||
"label": "Fiscal Year",
|
|
||||||
"oldfieldname": "fiscal_year",
|
|
||||||
"oldfieldtype": "Select",
|
|
||||||
"options": "Fiscal Year",
|
|
||||||
"permlevel": 0,
|
|
||||||
"print_hide": 1,
|
|
||||||
"print_width": "150px",
|
|
||||||
"reqd": 1,
|
|
||||||
"search_index": 1,
|
|
||||||
"width": "150px"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"fieldname": "column_break2",
|
"fieldname": "column_break2",
|
||||||
"fieldtype": "Column Break",
|
"fieldtype": "Column Break",
|
||||||
@ -236,7 +221,7 @@
|
|||||||
"icon": "icon-ticket",
|
"icon": "icon-ticket",
|
||||||
"idx": 1,
|
"idx": 1,
|
||||||
"is_submittable": 1,
|
"is_submittable": 1,
|
||||||
"modified": "2015-02-20 05:07:33.215371",
|
"modified": "2015-05-27 15:36:06.818491",
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "Stock",
|
"module": "Stock",
|
||||||
"name": "Material Request",
|
"name": "Material Request",
|
||||||
|
@ -3,7 +3,6 @@
|
|||||||
|
|
||||||
import frappe
|
import frappe
|
||||||
from frappe.utils import flt, cstr, nowdate, add_days, cint
|
from frappe.utils import flt, cstr, nowdate, add_days, cint
|
||||||
from erpnext.accounts.utils import get_fiscal_year, FiscalYearError
|
|
||||||
|
|
||||||
def reorder_item():
|
def reorder_item():
|
||||||
""" Reorder item if stock reaches reorder level"""
|
""" Reorder item if stock reaches reorder level"""
|
||||||
@ -83,7 +82,6 @@ def get_item_warehouse_projected_qty():
|
|||||||
def create_material_request(material_requests):
|
def create_material_request(material_requests):
|
||||||
""" Create indent on reaching reorder level """
|
""" Create indent on reaching reorder level """
|
||||||
mr_list = []
|
mr_list = []
|
||||||
defaults = frappe.defaults.get_defaults()
|
|
||||||
exceptions_list = []
|
exceptions_list = []
|
||||||
|
|
||||||
def _log_exception():
|
def _log_exception():
|
||||||
@ -93,14 +91,6 @@ def create_material_request(material_requests):
|
|||||||
else:
|
else:
|
||||||
exceptions_list.append(frappe.get_traceback())
|
exceptions_list.append(frappe.get_traceback())
|
||||||
|
|
||||||
try:
|
|
||||||
current_fiscal_year = get_fiscal_year(nowdate())[0] or defaults.fiscal_year
|
|
||||||
|
|
||||||
except FiscalYearError:
|
|
||||||
_log_exception()
|
|
||||||
notify_errors(exceptions_list)
|
|
||||||
return
|
|
||||||
|
|
||||||
for request_type in material_requests:
|
for request_type in material_requests:
|
||||||
for company in material_requests[request_type]:
|
for company in material_requests[request_type]:
|
||||||
try:
|
try:
|
||||||
@ -111,7 +101,6 @@ def create_material_request(material_requests):
|
|||||||
mr = frappe.new_doc("Material Request")
|
mr = frappe.new_doc("Material Request")
|
||||||
mr.update({
|
mr.update({
|
||||||
"company": company,
|
"company": company,
|
||||||
"fiscal_year": current_fiscal_year,
|
|
||||||
"transaction_date": nowdate(),
|
"transaction_date": nowdate(),
|
||||||
"material_request_type": request_type
|
"material_request_type": request_type
|
||||||
})
|
})
|
||||||
|
Loading…
x
Reference in New Issue
Block a user