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

Merge branch 'develop'

Browse Source
This commit is contained in:
Pratik Vyas 2014-10-14 17:34:01 +05:30
commit 056d627f46
7 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__version__.py
View File

@ -1 +1 @@
__version__ = '4.6.1' __version__ = '4.6.2'

2
erpnext/buying/doctype/purchase_order/test_purchase_order.py
View File

@ -112,6 +112,6 @@ class TestPurchaseOrder(unittest.TestCase):
test_recurring_document(self, test_records) test_recurring_document(self, test_records)
test_dependencies = ["BOM"] test_dependencies = ["BOM", "Item Price"]
test_records = frappe.get_test_records('Purchase Order') test_records = frappe.get_test_records('Purchase Order')

2
erpnext/hooks.py
View File

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

6
erpnext/stock/doctype/item_price/test_records.json
View File

@ -16,5 +16,11 @@
"item_code": "_Test Item 2", "item_code": "_Test Item 2",
"price_list": "_Test Price List Rest of the World", "price_list": "_Test Price List Rest of the World",
"price_list_rate": 20 "price_list_rate": 20
},
{
"doctype": "Item Price",
"item_code": "_Test Item Home Desktop 100",
"price_list": "_Test Price List",
"price_list_rate": 1000
} }
] ]

2
erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
View File

@ -151,6 +151,6 @@ def set_perpetual_inventory(enable=1):
accounts_settings.save() accounts_settings.save()
test_dependencies = ["BOM"] test_dependencies = ["BOM", "Item Price"]
test_records = frappe.get_test_records('Purchase Receipt') test_records = frappe.get_test_records('Purchase Receipt')

8
erpnext/stock/stock_ledger.py
View File

@ -275,7 +275,7 @@ def get_fifo_values(qty_after_transaction, sle, stock_queue):
incoming_rate = flt(sle.incoming_rate) incoming_rate = flt(sle.incoming_rate)
actual_qty = flt(sle.actual_qty) actual_qty = flt(sle.actual_qty)
intialize_stock_queue(stock_queue, sle.item_code, sle.warehouse) intialize_stock_queue(stock_queue, sle.item_code, sle.warehouse, actual_qty)
if actual_qty > 0: if actual_qty > 0:
if stock_queue[-1][0] > 0: if stock_queue[-1][0] > 0:
@ -289,7 +289,7 @@ def get_fifo_values(qty_after_transaction, sle, stock_queue):
else: else:
qty_to_pop = abs(actual_qty) qty_to_pop = abs(actual_qty)
while qty_to_pop: while qty_to_pop:
intialize_stock_queue(stock_queue, sle.item_code, sle.warehouse) intialize_stock_queue(stock_queue, sle.item_code, sle.warehouse, actual_qty)
batch = stock_queue[0] batch = stock_queue[0]
@ -318,9 +318,9 @@ def get_fifo_values(qty_after_transaction, sle, stock_queue):
return abs(valuation_rate) return abs(valuation_rate)
def intialize_stock_queue(stock_queue, item_code, warehouse): def intialize_stock_queue(stock_queue, item_code, warehouse, actual_qty):
if not stock_queue: if not stock_queue:
estimated_val_rate = get_valuation_rate(item_code, warehouse) estimated_val_rate = get_valuation_rate(item_code, warehouse) if actual_qty < 0 else 0
stock_queue.append([0, estimated_val_rate]) stock_queue.append([0, estimated_val_rate])
def _raise_exceptions(args, verbose=1): def _raise_exceptions(args, verbose=1):

2
setup.py
View File

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