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

Merge pull request #1884 from nabinhait/hotfix

Browse Source 
Hotfix
This commit is contained in:
Anand Doshi 2014-07-04 15:31:15 +05:30
commit f9cae65df5
4 changed files with 729 additions and 729 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/controllers/accounts_controller.py
View File

@ -12,7 +12,7 @@ import json
class AccountsController(TransactionBase): class AccountsController(TransactionBase):
def validate(self): def validate(self):
if self._action != "update_after_submit": if self.get("_action") and self._action != "update_after_submit":
self.set_missing_values(for_validate=True) self.set_missing_values(for_validate=True)
self.validate_date_with_fiscal_year() self.validate_date_with_fiscal_year()
if self.meta.get_field("currency"): if self.meta.get_field("currency"):

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

@ -134,7 +134,7 @@ class DeliveryNote(SellingController):
def update_current_stock(self): def update_current_stock(self):
if self._action != "update_after_submit": if self.get("_action") and self._action != "update_after_submit":
for d in self.get('delivery_note_details'): for d in self.get('delivery_note_details'):
d.actual_qty = frappe.db.get_value("Bin", {"item_code": d.item_code, d.actual_qty = frappe.db.get_value("Bin", {"item_code": d.item_code,
"warehouse": d.warehouse}, "actual_qty") "warehouse": d.warehouse}, "actual_qty")

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

@ -417,7 +417,7 @@
}, },
{ {
"depends_on": "eval:doc.is_purchase_item==\"Yes\"", "depends_on": "eval:doc.is_purchase_item==\"Yes\"",
"description": "Default Cost Center for tracking expense for this item.", "description": "",
"fieldname": "buying_cost_center", "fieldname": "buying_cost_center",
"fieldtype": "Link", "fieldtype": "Link",
"ignore_user_permissions": 1, "ignore_user_permissions": 1,
@ -825,7 +825,7 @@
"icon": "icon-tag", "icon": "icon-tag",
"idx": 1, "idx": 1,
"max_attachments": 1, "max_attachments": 1,
"modified": "2014-05-29 16:05:53.126214", "modified": "2014-07-03 10:45:19.574737",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Item", "name": "Item",

2
erpnext/stock/doctype/packed_item/packed_item.py
View File

@ -62,7 +62,7 @@ def update_packing_list_item(obj, packing_item_code, qty, warehouse, line, packi
def make_packing_list(obj, item_table_fieldname): def make_packing_list(obj, item_table_fieldname):
"""make packing list for sales bom item""" """make packing list for sales bom item"""
if obj._action == "update_after_submit": return if obj.get("_action") and obj._action == "update_after_submit": return
packing_list_idx = 0 packing_list_idx = 0
parent_items = [] parent_items = []