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

removed landed cost wizard link

Browse Source
This commit is contained in:
nabinhait 2011-07-05 15:43:17 +05:30
parent 1bd56b1c08
commit 7f339e0a6d
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
patches/patch.py
View File

@ -1,7 +1,7 @@
# REMEMBER to update this # REMEMBER to update this
# ======================== # ========================
last_patch = 309 last_patch = 310
#------------------------------------------- #-------------------------------------------
@ -1222,3 +1222,5 @@ def execute(patch_no):
run_patches() run_patches()
elif patch_no == 309: elif patch_no == 309:
sql("delete from `tabDocField` where fieldname = 'item_attachments_details' and parent = 'Item'") sql("delete from `tabDocField` where fieldname = 'item_attachments_details' and parent = 'Item'")
elif patch_no == 310:
sql("delete from `tabModule Def Item` where parent = 'Stock' and doc_name = 'Landed Cost Wizard'")

3
setup/page/setup/setup.js
View File

@ -224,8 +224,7 @@ SetupData = function(cnty){
['Price List',1,'Price List','','Price list master'], ['Price List',1,'Price List','','Price list master'],
['UOM',1,'UOM','','Unit of measure (UOM) master'], ['UOM',1,'UOM','','Unit of measure (UOM) master'],
['Warehouse Type',1,'Warehouse Type','','Warehouse classifications'], ['Warehouse Type',1,'Warehouse Type','','Warehouse classifications'],
['Warehouse',1,'Warehouse','','Warehouse master'], ['Warehouse',1,'Warehouse','','Warehouse master']]};
['Landed Cost Master', 1, 'Landed Cost Master', '', 'You can create master template for landed cost wizard']]};
this.buying = {'Buying':[['Supplier Type',1,'Supplier Type','','Manage supplier classifications'], this.buying = {'Buying':[['Supplier Type',1,'Supplier Type','','Manage supplier classifications'],
['Supplier',1,'Supplier','id'+NEWLINE+'supplier_type'+NEWLINE+'supplier_status'+NEWLINE+'company','Supplier master']]}; ['Supplier',1,'Supplier','id'+NEWLINE+'supplier_type'+NEWLINE+'supplier_status'+NEWLINE+'company','Supplier master']]};

2
stock/doctype/landed_cost_wizard/landed_cost_wizard.py
View File

@ -77,6 +77,7 @@ class DocType:
else: else:
obj = get_obj('Purchase Receipt', name) obj = get_obj('Purchase Receipt', name)
sql("update `tabPurchase Tax Detail` set rate = %s, tax_amount = %s where name = %s and parent = %s",(flt(flt(lc.amount) * flt(obj.doc.net_total/ amt)),flt(flt(lc.amount) * flt(obj.doc.net_total/ amt)),pr_oc_det[0][0],name)) sql("update `tabPurchase Tax Detail` set rate = %s, tax_amount = %s where name = %s and parent = %s",(flt(flt(lc.amount) * flt(obj.doc.net_total/ amt)),flt(flt(lc.amount) * flt(obj.doc.net_total/ amt)),pr_oc_det[0][0],name))
self.calc_pr_other_charges(name) self.calc_pr_other_charges(name)
obj = get_obj('Purchase Receipt', name, with_children = 1) obj = get_obj('Purchase Receipt', name, with_children = 1)
for d in getlist(obj.doclist, 'purchase_receipt_details'): for d in getlist(obj.doclist, 'purchase_receipt_details'):
@ -84,6 +85,7 @@ class DocType:
d.valuation_rate = (flt(d.purchase_rate) + (flt(d.rm_supp_cost) / flt(d.qty)) + (flt(d.item_tax_amount)/flt(d.qty))) / flt(d.conversion_factor) d.valuation_rate = (flt(d.purchase_rate) + (flt(d.rm_supp_cost) / flt(d.qty)) + (flt(d.item_tax_amount)/flt(d.qty))) / flt(d.conversion_factor)
d.save() d.save()
sql("update `tabStock Ledger Entry` set incoming_rate = '%s' where voucher_detail_no = '%s'"%(flt(d.valuation_rate), d.name)) sql("update `tabStock Ledger Entry` set incoming_rate = '%s' where voucher_detail_no = '%s'"%(flt(d.valuation_rate), d.name))
bin_name = sql("select t1.name, t2.name, t2.posting_date, t2.posting_time from `tabBin` t1, `tabStock Ledger Entry` t2 where t2.voucher_detail_no = '%s' and t2.item_code = t1.item_code and t2.warehouse = t1.warehouse LIMIT 1"%(d.name)) bin_name = sql("select t1.name, t2.name, t2.posting_date, t2.posting_time from `tabBin` t1, `tabStock Ledger Entry` t2 where t2.voucher_detail_no = '%s' and t2.item_code = t1.item_code and t2.warehouse = t1.warehouse LIMIT 1"%(d.name))
if bin_name and bin_name[0][0]: if bin_name and bin_name[0][0]:
obj = get_obj('Bin', bin_name[0][0]).update_item_valuation(bin_name[0][1], bin_name[0][2], bin_name[0][3]) obj = get_obj('Bin', bin_name[0][0]).update_item_valuation(bin_name[0][1], bin_name[0][2], bin_name[0][3])