Merge branch 'v4.x.x'

This commit is contained in:
Pratik Vyas 2015-05-13 11:54:39 +05:30
commit fa67d4e0e9
7 changed files with 26 additions and 8 deletions

View File

@ -1,2 +1,2 @@
from __future__ import unicode_literals
__version__ = '4.25.5'
__version__ = '4.25.6'

View File

@ -229,19 +229,15 @@ cur_frm.cscript.hide_fields = function(doc) {
'advance_adjustment_details', 'sales_partner', 'commission_rate',
'total_commission', 'advances', 'from_date', 'to_date'];
item_flds_normal = ['sales_order', 'delivery_note']
if(cint(doc.is_pos) == 1) {
hide_field(par_flds);
unhide_field('payments_section');
cur_frm.fields_dict['entries'].grid.set_column_disp(item_flds_normal, false);
} else {
hide_field('payments_section');
for (i in par_flds) {
var docfield = frappe.meta.docfield_map[doc.doctype][par_flds[i]];
if(!docfield.hidden) unhide_field(par_flds[i]);
}
cur_frm.fields_dict['entries'].grid.set_column_disp(item_flds_normal, true);
}
item_flds_stock = ['serial_no', 'batch_no', 'actual_qty', 'actual_batch_qty', 'expense_account', 'warehouse']

View File

@ -5,7 +5,7 @@ app_publisher = "Web Notes Technologies Pvt. Ltd. and Contributors"
app_description = "Open Source Enterprise Resource Planning for Small and Midsized Organizations"
app_icon = "icon-th"
app_color = "#e74c3c"
app_version = "4.25.5"
app_version = "4.25.6"
error_report_email = "support@erpnext.com"

View File

@ -99,3 +99,4 @@ erpnext.patches.v4_2.repost_sle_for_si_with_no_warehouse
erpnext.patches.v4_2.fix_recurring_orders
erpnext.patches.v4_2.delete_gl_entries_for_cancelled_invoices
erpnext.patches.v4_2.update_advance_paid
erpnext.patches.v4_2.repost_requested_qty

View File

@ -0,0 +1,21 @@
# 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
def execute():
from erpnext.utilities.repost_stock import update_bin_qty, get_indented_qty
count=0
for item_code, warehouse in frappe.db.sql("""select distinct item_code, warehouse
from `tabMaterial Request Item` where docstatus = 1"""):
try:
count += 1
update_bin_qty(item_code, warehouse, {
"indented_qty": get_indented_qty(item_code, warehouse),
})
if count % 200 == 0:
frappe.db.commit()
except:
frappe.db.rollback()

View File

@ -94,8 +94,8 @@ class MaterialRequest(BuyingController):
def update_status(self, status):
self.check_modified_date()
self.update_requested_qty()
frappe.db.set(self, 'status', cstr(status))
self.update_requested_qty()
frappe.msgprint(_("Status updated to {0}").format(_(status)))
def on_cancel(self):

View File

@ -1,7 +1,7 @@
from setuptools import setup, find_packages
import os
version = "4.25.5"
version = "4.25.6"
with open("requirements.txt", "r") as f:
install_requires = f.readlines()