nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-03 12:19:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Field Rename: rate field mass replacement

Browse Source
This commit is contained in:
Nabin Hait
2014-02-10 18:26:49 +05:30
parent a7f757a3f4
commit 7979f7ed21
29 changed files with 133 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/stock/doctype/delivery_note/delivery_note.js
View File

@@ -134,15 +134,15 @@ var set_print_hide= function(doc, cdt, cdn){
if (doc.print_without_amount) {
dn_fields['currency'].print_hide = 1;
dn_item_fields['export_rate'].print_hide = 1;
dn_item_fields['rate'].print_hide = 1;
dn_item_fields['discount_percentage'].print_hide = 1;
dn_item_fields['price_list_rate'].print_hide = 1;
dn_item_fields['export_amount'].print_hide = 1;
} else {
if (dn_fields_copy['currency'].print_hide != 1)
dn_fields['currency'].print_hide = 0;
if (dn_item_fields_copy['export_rate'].print_hide != 1)
dn_item_fields['export_rate'].print_hide = 0;
if (dn_item_fields_copy['rate'].print_hide != 1)
dn_item_fields['rate'].print_hide = 0;
if (dn_item_fields_copy['export_amount'].print_hide != 1)
dn_item_fields['export_amount'].print_hide = 0;
}

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

@@ -96,7 +96,7 @@ class DocType(SellingController):
super(DocType, self).validate_with_previous_doc(self.tname, {
fn[0] + " Item": {
"ref_dn_field": "prevdoc_detail_docname",
"compare_fields": [["export_rate", "="]],
"compare_fields": [["rate", "="]],
"is_child_table": True
}
})

8
erpnext/stock/doctype/delivery_note/test_delivery_note.py
View File

@@ -37,7 +37,7 @@ class TestDeliveryNote(unittest.TestCase):
self.assertEquals(len(si), len(dn.doclist))
# modify export_amount
si[1].export_rate = 200
si[1].rate = 200
self.assertRaises(webnotes.ValidationError, webnotes.bean(si).insert)
@@ -97,7 +97,7 @@ class TestDeliveryNote(unittest.TestCase):
# back dated purchase receipt
pr = webnotes.bean(copy=pr_test_records[0])
pr.doc.posting_date = "2013-01-01"
pr.doclist[1].import_rate = 100
pr.doclist[1].rate = 100
pr.doclist[1].amount = 100
pr.insert()
@@ -243,8 +243,8 @@ test_records = [
"item_name": "_Test Item",
"parentfield": "delivery_note_details",
"qty": 5.0,
"basic_rate": 100.0,
"export_rate": 100.0,
"base_rate": 100.0,
"rate": 100.0,
"amount": 500.0,
"warehouse": "_Test Warehouse - _TC",
"stock_uom": "_Test UOM",

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

@@ -245,8 +245,7 @@ class DocType(DocListController):
self.recalculate_bin_qty(newdn)
def set_last_purchase_rate(self, newdn):
from erpnext.buying.utils import get_last_purchase_details
last_purchase_rate = get_last_purchase_details(newdn).get("purchase_rate", 0)
last_purchase_rate = get_last_purchase_details(newdn).get("base_rate", 0)
webnotes.conn.set_value("Item", newdn, "last_purchase_rate", last_purchase_rate)
def recalculate_bin_qty(self, newdn):
@@ -311,7 +310,7 @@ def get_last_purchase_details(item_code, doc_name=None, conversion_rate=1.0):
last_purchase_order = webnotes.conn.sql("""\
select po.name, po.transaction_date, po.conversion_rate,
po_item.conversion_factor, po_item.base_price_list_rate,
po_item.discount_percentage, po_item.purchase_rate
po_item.discount_percentage, po_item.base_rate
from `tabPurchase Order` po, `tabPurchase Order Item` po_item
where po.docstatus = 1 and po_item.item_code = %s and po.name != %s and
po.name = po_item.parent
@@ -322,7 +321,7 @@ def get_last_purchase_details(item_code, doc_name=None, conversion_rate=1.0):
last_purchase_receipt = webnotes.conn.sql("""\
select pr.name, pr.posting_date, pr.posting_time, pr.conversion_rate,
pr_item.conversion_factor, pr_item.base_price_list_rate, pr_item.discount_percentage,
pr_item.purchase_rate
pr_item.base_rate
from `tabPurchase Receipt` pr, `tabPurchase Receipt Item` pr_item
where pr.docstatus = 1 and pr_item.item_code = %s and pr.name != %s and
pr.name = pr_item.parent
@@ -352,7 +351,7 @@ def get_last_purchase_details(item_code, doc_name=None, conversion_rate=1.0):
conversion_factor = flt(last_purchase.conversion_factor)
out = webnotes._dict({
"base_price_list_rate": flt(last_purchase.base_price_list_rate) / conversion_factor,
"purchase_rate": flt(last_purchase.purchase_rate) / conversion_factor,
"base_rate": flt(last_purchase.base_rate) / conversion_factor,
"discount_percentage": flt(last_purchase.discount_percentage),
"purchase_date": purchase_date
})
@@ -360,8 +359,8 @@ def get_last_purchase_details(item_code, doc_name=None, conversion_rate=1.0):
conversion_rate = flt(conversion_rate) or 1.0
out.update({
"price_list_rate": out.base_price_list_rate / conversion_rate,
"import_rate": out.purchase_rate / conversion_rate,
"rate": out.purchase_rate
"rate": out.base_rate / conversion_rate,
"base_rate": out.base_rate
})
return out

3
erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
View File

@@ -121,7 +121,7 @@ class DocType(BuyingController):
super(DocType, self).validate_with_previous_doc(self.tname, {
"Purchase Order Item": {
"ref_dn_field": "prevdoc_detail_docname",
"compare_fields": [["import_rate", "="]],
"compare_fields": [["rate", "="]],
"is_child_table": True
}
})
@@ -316,7 +316,6 @@ def make_purchase_invoice(source_name, target_doclist=None):
"parent": "purchase_receipt",
"prevdoc_detail_docname": "po_detail",
"prevdoc_docname": "purchase_order",
"purchase_rate": "rate"
},
},
"Purchase Taxes and Charges": {

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

@@ -26,8 +26,8 @@ class TestPurchaseReceipt(unittest.TestCase):
self.assertEquals(pi[0]["doctype"], "Purchase Invoice")
self.assertEquals(len(pi), len(pr.doclist))
# modify import_rate
pi[1].import_rate = 200
# modify rate
pi[1].rate = 200
self.assertRaises(webnotes.ValidationError, webnotes.bean(pi).submit)
def test_purchase_receipt_no_gl_entry(self):
@@ -155,7 +155,7 @@ test_records = [
"received_qty": 5.0,
"qty": 5.0,
"rejected_qty": 0.0,
"import_rate": 50.0,
"rate": 50.0,
"amount": 250.0,
"warehouse": "_Test Warehouse - _TC",
"stock_uom": "Nos",
@@ -171,7 +171,7 @@ test_records = [
"received_qty": 5.0,
"qty": 5.0,
"rejected_qty": 0.0,
"import_rate": 50.0,
"rate": 50.0,
"amount": 250.0,
"warehouse": "_Test Warehouse 1 - _TC",
"stock_uom": "Nos",
@@ -236,7 +236,7 @@ test_records = [
"received_qty": 10.0,
"qty": 10.0,
"rejected_qty": 0.0,
"import_rate": 500.0,
"rate": 500.0,
"amount": 5000.0,
"warehouse": "_Test Warehouse - _TC",
"stock_uom": "Nos",

2
erpnext/stock/doctype/stock_entry/test_stock_entry.py
View File

@@ -562,7 +562,7 @@ class TestStockEntry(unittest.TestCase):
po = webnotes.bean(copy=purchase_order_test_records[0])
po.doc.is_subcontracted = None
po.doclist[1].item_code = "_Test Item"
po.doclist[1].import_rate = 50
po.doclist[1].rate = 50
po.insert()
po.submit()

8
erpnext/stock/report/item_prices/item_prices.py
View File

@@ -80,7 +80,7 @@ def get_last_purchase_rate():
query = """select * from (select
result.item_code,
result.purchase_rate
result.base_rate
from (
(select
po_item.item_code,
@@ -88,7 +88,7 @@ def get_last_purchase_rate():
po.transaction_date as posting_date,
po_item.base_price_list_rate,
po_item.discount_percentage,
po_item.purchase_rate
po_item.base_rate
from `tabPurchase Order` po, `tabPurchase Order Item` po_item
where po.name = po_item.parent and po.docstatus = 1)
union
@@ -98,7 +98,7 @@ def get_last_purchase_rate():
pr.posting_date,
pr_item.base_price_list_rate,
pr_item.discount_percentage,
pr_item.purchase_rate
pr_item.base_rate
from `tabPurchase Receipt` pr, `tabPurchase Receipt Item` pr_item
where pr.name = pr_item.parent and pr.docstatus = 1)
) result
@@ -106,7 +106,7 @@ def get_last_purchase_rate():
group by item_code"""
for d in webnotes.conn.sql(query, as_dict=1):
item_last_purchase_rate_map.setdefault(d.item_code, d.purchase_rate)
item_last_purchase_rate_map.setdefault(d.item_code, d.base_rate)
return item_last_purchase_rate_map