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

[Minor] Fetching and appending items in Stock Reconciliation fix (#14509)

Browse Source 
* minor fix in get_list of items in stock reconciliation

* reload doc fails because of backdated modified date

* item and item defaults should load prior to shopify refactor

* attribute value should't be none or empty, could be zero though

* Update item.py
This commit is contained in:
Zarrar 2018-06-14 11:54:18 +05:30 committed by Nabin Hait
parent 0d19744b17
commit 17089eeac3
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
View File

@ -2661,7 +2661,7 @@
"istable": 0,
"max_attachments": 0,
"menu_index": 0,
"modified": "2018-05-28 02:45:48.616334",
"modified": "2018-06-13 19:07:49.545062",
"modified_by": "Administrator",
"module": "Buying",
"name": "Supplier Quotation",

2
erpnext/patches.txt
View File

@ -539,8 +539,8 @@ erpnext.patches.v11_0.create_department_records_for_each_company
erpnext.patches.v11_0.make_location_from_warehouse
erpnext.patches.v11_0.make_asset_finance_book_against_old_entries
erpnext.patches.v11_0.check_buying_selling_in_currency_exchange
erpnext.patches.v11_0.refactor_erpnext_shopify
erpnext.patches.v11_0.move_item_defaults_to_child_table_for_multicompany
erpnext.patches.v11_0.refactor_erpnext_shopify
erpnext.patches.v11_0.rename_overproduction_percent_field
erpnext.patches.v11_0.update_backflush_subcontract_rm_based_on_bom
erpnext.patches.v10_0.update_status_in_purchase_receipt

2
erpnext/selling/doctype/quotation/quotation.json
View File

@ -3035,7 +3035,7 @@
"istable": 0,
"max_attachments": 1,
"menu_index": 0,
"modified": "2018-05-28 03:23:15.354674",
"modified": "2018-06-13 19:07:17.343682",
"modified_by": "Administrator",
"module": "Selling",
"name": "Quotation",

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

@ -3881,7 +3881,7 @@
"istable": 0,
"max_attachments": 0,
"menu_index": 0,
"modified": "2018-05-28 03:03:35.035396",
"modified": "2018-06-13 19:07:27.314521",
"modified_by": "Administrator",
"module": "Stock",
"name": "Delivery Note",

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

@ -728,7 +728,7 @@ class Item(WebsiteGenerator):
if self.variant_of and self.variant_based_on == 'Item Attribute':
args = {}
for d in self.attributes:
if not d.attribute_value:
if cstr(d.attribute_value).strip() == '':
frappe.throw(_("Please specify Attribute Value for attribute {0}").format(d.attribute))
args[d.attribute] = d.attribute_value

2
erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
View File

@ -3436,7 +3436,7 @@
"istable": 0,
"max_attachments": 0,
"menu_index": 0,
"modified": "2018-05-28 02:59:59.609643",
"modified": "2018-06-13 19:07:37.183239",
"modified_by": "Administrator",
"module": "Stock",
"name": "Purchase Receipt",

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

@ -269,7 +269,7 @@ class StockReconciliation(StockController):
@frappe.whitelist()
def get_items(warehouse, posting_date, posting_time, company):
items = frappe.get_list("Bin", fields=["item_code"], filters={"warehouse": warehouse}, as_list=1)
items = [d.item_code for d in frappe.get_list("Bin", fields=["item_code"], filters={"warehouse": warehouse})]
items += frappe.db.sql_list('''select i.name from `tabItem` i, `tabItem Default` id where i.name = id.parent
and i.is_stock_item=1 and i.has_serial_no=0 and i.has_batch_no=0 and i.has_variants=0 and i.disabled=0