From 7f339e0a6d6e8df28a5f59c318adfc8cd88c2ecd Mon Sep 17 00:00:00 2001 From: nabinhait Date: Tue, 5 Jul 2011 15:43:17 +0530 Subject: [PATCH] removed landed cost wizard link --- patches/patch.py | 4 +++- setup/page/setup/setup.js | 3 +-- stock/doctype/landed_cost_wizard/landed_cost_wizard.py | 2 ++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/patches/patch.py b/patches/patch.py index f16d45fc1f..f7953cbb87 100644 --- a/patches/patch.py +++ b/patches/patch.py @@ -1,7 +1,7 @@ # REMEMBER to update this # ======================== -last_patch = 309 +last_patch = 310 #------------------------------------------- @@ -1222,3 +1222,5 @@ def execute(patch_no): run_patches() elif patch_no == 309: 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'") diff --git a/setup/page/setup/setup.js b/setup/page/setup/setup.js index 0d33465d09..c0ba3d4dc0 100644 --- a/setup/page/setup/setup.js +++ b/setup/page/setup/setup.js @@ -224,8 +224,7 @@ SetupData = function(cnty){ ['Price List',1,'Price List','','Price list master'], ['UOM',1,'UOM','','Unit of measure (UOM) master'], ['Warehouse Type',1,'Warehouse Type','','Warehouse classifications'], - ['Warehouse',1,'Warehouse','','Warehouse master'], - ['Landed Cost Master', 1, 'Landed Cost Master', '', 'You can create master template for landed cost wizard']]}; + ['Warehouse',1,'Warehouse','','Warehouse master']]}; 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']]}; diff --git a/stock/doctype/landed_cost_wizard/landed_cost_wizard.py b/stock/doctype/landed_cost_wizard/landed_cost_wizard.py index ed21d325bd..58ba751f43 100644 --- a/stock/doctype/landed_cost_wizard/landed_cost_wizard.py +++ b/stock/doctype/landed_cost_wizard/landed_cost_wizard.py @@ -77,6 +77,7 @@ class DocType: else: 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)) + self.calc_pr_other_charges(name) obj = get_obj('Purchase Receipt', name, with_children = 1) 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.save() 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)) 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])