From 3d0c9ba22dcdb2e60312ee4792935ebe5f79d75e Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 3 May 2012 10:35:51 +0530 Subject: [PATCH] added listview for stock entry, listview templates --- .../stock/doctype/stock_entry/stock_entry.py~ | 429 ------------------ js/all-app.js | 4 +- js/all-web.js | 4 +- 3 files changed, 6 insertions(+), 431 deletions(-) delete mode 100644 erpnext/stock/doctype/stock_entry/stock_entry.py~ diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py~ b/erpnext/stock/doctype/stock_entry/stock_entry.py~ deleted file mode 100644 index e90cdcef5d..0000000000 --- a/erpnext/stock/doctype/stock_entry/stock_entry.py~ +++ /dev/null @@ -1,429 +0,0 @@ -# Please edit this list and import only required elements -import webnotes - -from webnotes.utils import add_days, add_months, add_years, cint, cstr, date_diff, default_fields, flt, fmt_money, formatdate, generate_hash, getTraceback, get_defaults, get_first_day, get_last_day, getdate, has_common, month_name, now, nowdate, replace_newlines, sendmail, set_default, str_esc_quote, user_format, validate_email_add -from webnotes.model import db_exists, delete_doc -from webnotes.model.doc import Document, addchild, removechild, getchildren, make_autoname, SuperDocType -from webnotes.model.doclist import getlist, copy_doclist -from webnotes.model.code import get_obj, get_server_obj, run_server_obj, updatedb, check_syntax -from webnotes import session, form, is_testing, msgprint, errprint - -set = webnotes.conn.set -sql = webnotes.conn.sql -get_value = webnotes.conn.get_value -in_transaction = webnotes.conn.in_transaction -convert_to_lists = webnotes.conn.convert_to_lists - -# ----------------------------------------------------------------------------------------- - -class DocType: - def __init__(self, doc, doclist=[]): - self.doc = doc - self.doclist = doclist - self.item_dict = {} - self.fname = 'mtn_details' - - # Autoname - # --------- - def autoname(self): - self.doc.name = make_autoname(self.doc.naming_series+'.#####') - - - # get item details - # ---------------- - def get_item_details(self, arg): - arg, actual_qty, in_rate = eval(arg), 0, 0 - - item = sql("select stock_uom, description, item_name from `tabItem` where name = %s and (ifnull(end_of_life,'')='' or end_of_life ='0000-00-00' or end_of_life > now())", (arg.get('item_code')), as_dict = 1) - if not item: - msgprint("Item is not active", raise_exception=1) - - if arg.get('warehouse'): - actual_qty = self.get_as_on_stock(arg.get('item_code'), arg.get('warehouse'), self.doc.posting_date, self.doc.posting_time) - in_rate = self.get_incoming_rate(arg.get('item_code'), arg.get('warehouse'), self.doc.posting_date, self.doc.posting_time, arg.get('transfer_qty'), arg.get('serial_no')) or 0 - - ret = { - 'uom' : item and item[0]['stock_uom'] or '', - 'stock_uom' : item and item[0]['stock_uom'] or '', - 'description' : item and item[0]['description'] or '', - 'item_name' : item and item[0]['item_name'] or '', - 'actual_qty' : actual_qty, - 'qty' : 0, - 'transfer_qty' : 0, - 'incoming_rate' : in_rate, - 'conversion_factor' : 1, - 'batch_no' : '' - } - return str(ret) - - - # Get UOM Details - # ---------------- - def get_uom_details(self, arg = ''): - arg, ret = eval(arg), {} - uom = sql("select conversion_factor from `tabUOM Conversion Detail` where parent = %s and uom = %s", (arg['item_code'],arg['uom']), as_dict = 1) - if not uom: - msgprint("There is no Conversion Factor for UOM '%s' in Item '%s'" % (arg['uom'], arg['item_code'])) - ret = {'uom' : ''} - else: - ret = { - 'conversion_factor' : flt(uom[0]['conversion_factor']), - 'transfer_qty' : flt(arg['qty']) * flt(uom[0]['conversion_factor']), - } - return str(ret) - - - # get stock and incoming rate on posting date - # --------------------------------------------- - def get_stock_and_rate(self, bom_no = ''): - for d in getlist(self.doclist, 'mtn_details'): - # assign parent warehouse - d.s_warehouse = cstr(d.s_warehouse) or self.doc.purpose != 'Production Order' and self.doc.from_warehouse or '' - d.t_warehouse = cstr(d.t_warehouse) or self.doc.purpose != 'Production Order' and self.doc.to_warehouse or '' - - # get current stock at source warehouse - d.actual_qty = d.s_warehouse and self.get_as_on_stock(d.item_code, d.s_warehouse, self.doc.posting_date, self.doc.posting_time) or 0 - - # get incoming rate - if not flt(d.incoming_rate): - msgprint(1) - d.incoming_rate = self.get_incoming_rate(d.item_code, d.s_warehouse, self.doc.posting_date, self.doc.posting_time, d.transfer_qty, d.serial_no, d.fg_item, bom_no) - - # Get stock qty on any date - # --------------------------- - def get_as_on_stock(self, item, wh, dt, tm): - bin = sql("select name from tabBin where item_code = %s and warehouse = %s", (item, wh)) - bin_id = bin and bin[0][0] or '' - prev_sle = get_obj('Bin', bin_id).get_prev_sle(dt, tm) - qty = flt(prev_sle.get('bin_aqat', 0)) - return qty - - # Get incoming rate - # ------------------- - def get_incoming_rate(self, item, wh, dt, tm, qty = 0, serial_no = '', fg_item = 'No', bom_no = ''): - msgprint(wh) - in_rate = 0 - if fg_item == 'Yes': - # re-calculate cost for production item from bom - get_obj('BOM Control').calculate_cost(bom_no) - in_rate = get_value('Bill Of Materials', bom_no, 'cost_as_per_mar') - elif wh: - msgprint(1) - in_rate = get_obj('Valuation Control').get_incoming_rate(dt, tm, item, wh, qty, serial_no) - - return in_rate - - # makes dict of unique items with it's qty - #----------------------------------------- - def make_items_dict(self, items_list): - # items_list = [[item_name, qty]] - for i in items_list: - if self.item_dict.has_key(i[0]): - self.item_dict[i[0]][0] = flt(self.item_dict[i[0]][0]) + flt(i[1]) - else: - self.item_dict[i[0]] = [flt(i[1]), cstr(i[2]), cstr(i[3])] - - def get_raw_materials(self,pro_obj): - # get all items from flat bom except, child items of sub-contracted and sub assembly items and sub assembly items itself. - flat_bom_items = sql("select item_code, ifnull(sum(qty_consumed_per_unit), 0) * '%s', description, stock_uom from `tabFlat BOM Detail` where parent = '%s' and parent_bom = '%s' and is_pro_applicable = 'No' and docstatus < 2 group by item_code" % ((self.doc.process == 'Backflush') and flt(self.doc.fg_completed_qty) or flt(pro_obj.doc.qty), cstr(pro_obj.doc.bom_no), cstr(pro_obj.doc.bom_no))) - self.make_items_dict(flat_bom_items) - if pro_obj.doc.consider_sa_items == 'Yes': - # get all Sub Assembly items only from flat bom - fl_bom_sa_items = sql("select item_code, ifnull(sum(qty_consumed_per_unit), 0) * '%s', description, stock_uom from `tabFlat BOM Detail` where parent = '%s' and parent_bom != '%s' and is_pro_applicable = 'Yes' and docstatus < 2 group by item_code" % ((self.doc.process == 'Backflush') and flt(self.doc.fg_completed_qty) or flt(pro_obj.doc.qty), cstr(pro_obj.doc.bom_no), cstr(pro_obj.doc.bom_no))) - self.make_items_dict(fl_bom_sa_items) - - if pro_obj.doc.consider_sa_items == 'No': - # get all sub assembly childs only from flat bom - fl_bom_sa_child_item = sql("select item_code, ifnull(sum(qty_consumed_per_unit), 0) * '%s', description, stock_uom from `tabFlat BOM Detail` where parent = '%s' and parent_bom in (select distinct parent_bom from `tabFlat BOM Detail` where parent = '%s' and parent_bom != '%s' and is_pro_applicable = 'Yes' and docstatus < 2 ) and is_pro_applicable = 'No' and docstatus < 2 group by item_code" % ((self.doc.process == 'Backflush') and flt(self.doc.fg_completed_qty) or flt(pro_obj.doc.qty), cstr(pro_obj.doc.bom_no), cstr(pro_obj.doc.bom_no), cstr(pro_obj.doc.bom_no))) - self.make_items_dict(fl_bom_sa_child_item) - - def add_to_stock_entry_detail(self, pro_obj, item_dict, fg_item = 0): - sw, tw = '', '' - if self.doc.process == 'Material Transfer': - tw = cstr(pro_obj.doc.wip_warehouse) - if self.doc.process == 'Backflush': - tw = fg_item and cstr(pro_obj.doc.fg_warehouse) or '' - if not fg_item: sw = cstr(pro_obj.doc.wip_warehouse) - for d in item_dict: - se_child = addchild(self.doc, 'mtn_details', 'Stock Entry Detail', 0, self.doclist) - se_child.s_warehouse = sw - se_child.t_warehouse = tw - se_child.fg_item = fg_item - se_child.item_code = cstr(d) - se_child.description = item_dict[d][1] - se_child.uom = item_dict[d][2] - se_child.stock_uom = item_dict[d][2] - se_child.reqd_qty = flt(item_dict[d][0]) - se_child.qty = flt(item_dict[d][0]) - se_child.transfer_qty = flt(item_dict[d][0]) - se_child.conversion_factor = 1.00 - - - # get items - #------------------ - def get_items(self): - pro_obj = self.doc.production_order and get_obj('Production Order', self.doc.production_order) or '' - - self.validate_for_production_order(pro_obj) - self.get_raw_materials(pro_obj) - - self.doc.clear_table(self.doclist, 'mtn_details', 1) - - self.add_to_stock_entry_detail(pro_obj, self.item_dict) - if self.doc.process == 'Backflush': - item_dict = {cstr(pro_obj.doc.production_item) : [self.doc.fg_completed_qty, pro_obj.doc.description, pro_obj.doc.stock_uom]} - self.add_to_stock_entry_detail(pro_obj, item_dict, fg_item = 1) - - def validate_transfer_qty(self): - for d in getlist(self.doclist, 'mtn_details'): - if flt(d.transfer_qty) <= 0: - msgprint("Transfer Quantity can not be less than or equal to zero at Row No " + cstr(d.idx)) - raise Exception - if d.s_warehouse: - if flt(d.transfer_qty) > flt(d.actual_qty): - msgprint("Transfer Quantity is more than Available Qty at Row No " + cstr(d.idx)) - raise Exception - - def calc_amount(self): - total_amount = 0 - for d in getlist(self.doclist, 'mtn_details'): - d.amount = flt(d.transfer_qty) * flt(d.incoming_rate) - total_amount += flt(d.amount) - self.doc.total_amount = flt(total_amount) - - def add_to_values(self, d, wh, qty, is_cancelled): - self.values.append({ - 'item_code' : d.item_code, - 'warehouse' : wh, - 'transaction_date' : self.doc.transfer_date, - 'posting_date' : self.doc.posting_date, - 'posting_time' : self.doc.posting_time, - 'voucher_type' : 'Stock Entry', - 'voucher_no' : self.doc.name, - 'voucher_detail_no' : d.name, - 'actual_qty' : qty, - 'incoming_rate' : flt(d.incoming_rate) or 0, - 'stock_uom' : d.stock_uom, - 'company' : self.doc.company, - 'fiscal_year' : self.doc.fiscal_year, - 'is_cancelled' : (is_cancelled ==1) and 'Yes' or 'No', - 'batch_no' : d.batch_no, - 'serial_no' : d.serial_no - }) - - - def update_stock_ledger(self, is_cancelled=0): - self.values = [] - for d in getlist(self.doclist, 'mtn_details'): - if cstr(d.s_warehouse): - self.add_to_values(d, cstr(d.s_warehouse), -flt(d.transfer_qty), is_cancelled) - if cstr(d.t_warehouse): - self.add_to_values(d, cstr(d.t_warehouse), flt(d.transfer_qty), is_cancelled) - get_obj('Stock Ledger', 'Stock Ledger').update_stock(self.values) - - - def validate_for_production_order(self, pro_obj): - if self.doc.purpose == 'Production Order' or self.doc.process or self.doc.production_order or flt(self.doc.fg_completed_qty): - if self.doc.purpose != 'Production Order': - msgprint("Purpose should be 'Production Order'.") - raise Exception - if not self.doc.process: - msgprint("Process Field is mandatory.") - raise Exception - if self.doc.process == 'Backflush' and not flt(self.doc.fg_completed_qty): - msgprint("FG Completed Qty is mandatory as the process selected is 'Backflush'") - raise Exception - if self.doc.process == 'Material Transfer' and flt(self.doc.fg_completed_qty): - msgprint("FG Completed Qty should be zero. As the Process selected is 'Material Transfer'.") - raise Exception - if not self.doc.production_order: - msgprint("Production Order field is mandatory") - raise Exception - if flt(pro_obj.doc.qty) < flt(pro_obj.doc.produced_qty) + flt(self.doc.fg_completed_qty) : - msgprint("error:Already Produced Qty for %s is %s and maximum allowed Qty is %s" % (pro_obj.doc.production_item, cstr(pro_obj.doc.produced_qty) or 0.00 , cstr(pro_obj.doc.qty))) - raise Exception - - # Validate - # ------------------ - def validate(self): - sl_obj = get_obj("Stock Ledger", "Stock Ledger") - sl_obj.scrub_serial_nos(self) - sl_obj.validate_serial_no(self, 'mtn_details') - pro_obj = '' - if self.doc.production_order: - pro_obj = get_obj('Production Order', self.doc.production_order) - self.validate_for_production_order(pro_obj) - self.validate_incoming_rate() - self.validate_warehouse(pro_obj) - self.get_stock_and_rate(pro_obj and pro_obj.doc.bom_no or '') - self.calc_amount() - get_obj('Sales Common').validate_fiscal_year(self.doc.fiscal_year,self.doc.posting_date,'Posting Date') - - # If target warehouse exists, incoming rate is mandatory - # -------------------------------------------------------- - def validate_incoming_rate(self): - for d in getlist(self.doclist, 'mtn_details'): - if not flt(d.incoming_rate) and d.t_warehouse: - msgprint("Rate is mandatory for Item: %s at row %s" % (d.item_code, d.idx), raise_exception=1) - - # Validate warehouse - # ----------------------------------- - def validate_warehouse(self, pro_obj): - fg_qty = 0 - for d in getlist(self.doclist, 'mtn_details'): - if not d.s_warehouse and not d.t_warehouse: - d.s_warehouse = self.doc.from_warehouse - d.t_warehouse = self.doc.to_warehouse - - if not (d.s_warehouse or d.t_warehouse): - msgprint("Atleast one warehouse is mandatory for Stock Entry ") - raise Exception - if d.s_warehouse and not sql("select name from tabWarehouse where name = '%s'" % d.s_warehouse): - msgprint("Invalid Warehouse: %s" % self.doc.s_warehouse) - raise Exception - if d.t_warehouse and not sql("select name from tabWarehouse where name = '%s'" % d.t_warehouse): - msgprint("Invalid Warehouse: %s" % self.doc.t_warehouse) - raise Exception - if d.s_warehouse == d.t_warehouse: - msgprint("Source and Target Warehouse Cannot be Same.") - raise Exception - if self.doc.purpose == 'Material Issue': - if not cstr(d.s_warehouse): - msgprint("Source Warehouse is Mandatory for Purpose => 'Material Issue'") - raise Exception - if cstr(d.t_warehouse): - msgprint("Target Warehouse is not Required for Purpose => 'Material Issue'") - raise Exception - if self.doc.purpose == 'Material Transfer': - if not cstr(d.s_warehouse) or not cstr(d.t_warehouse): - msgprint("Source Warehouse and Target Warehouse both are Mandatory for Purpose => 'Material Transfer'") - raise Exception - if self.doc.purpose == 'Material Receipt': - if not cstr(d.t_warehouse): - msgprint("Target Warehouse is Mandatory for Purpose => 'Material Receipt'") - raise Exception - if cstr(d.s_warehouse): - msgprint("Source Warehouse is not Required for Purpose => 'Material Receipt'") - raise Exception - if self.doc.process == 'Material Transfer': - if cstr(d.t_warehouse) != (pro_obj.doc.wip_warehouse): - msgprint(" Target Warehouse should be same as WIP Warehouse %s in Production Order %s at Row No %s" % (cstr(pro_obj.doc.wip_warehouse), cstr(pro_obj.doc.name), cstr(d.idx)) ) - raise Exception - if not cstr(d.s_warehouse): - msgprint("Please Enter Source Warehouse at Row No %s is mandatory." % (cstr(d.idx))) - raise Exception - if self.doc.process == 'Backflush': - if flt(d.fg_item): - if cstr(pro_obj.doc.production_item) != cstr(d.item_code): - msgprint("Item %s in Stock Entry Detail as Row No %s do not match with Item %s in Production Order %s" % (cstr(d.item_code), cstr(d.idx), cstr(pro_obj.doc.production_item), cstr(pro_obj.doc.name))) - raise Exception - fg_qty = flt(fg_qty) + flt(d.transfer_qty) - if cstr(d.t_warehouse) != cstr(pro_obj.doc.fg_warehouse): - msgprint("As Item %s is FG Item. Target Warehouse should be same as FG Warehouse %s in Production Order %s, at Row No %s. " % ( cstr(d.item_code), cstr(pro_obj.doc.fg_warehouse), cstr(pro_obj.doc.name), cstr(d.idx))) - raise Exception - if cstr(d.s_warehouse): - msgprint("As Item %s is a FG Item. There should be no Source Warehouse at Row No %s" % (cstr(d.item_code), cstr(d.idx))) - raise Exception - if not flt(d.fg_item): - if cstr(d.t_warehouse): - msgprint("As Item %s is not a FG Item. There should no Tareget Warehouse at Row No %s" % (cstr(d.item_code), cstr(d.idx))) - raise Exception - if cstr(d.s_warehouse) != cstr(pro_obj.doc.wip_warehouse): - msgprint("As Item %s is Raw Material. Source Warehouse should be same as WIP Warehouse %s in Production Order %s, at Row No %s. " % ( cstr(d.item_code), cstr(pro_obj.doc.wip_warehouse), cstr(pro_obj.doc.name), cstr(d.idx))) - raise Exception - d.save() - if self.doc.fg_completed_qty and flt(self.doc.fg_completed_qty) != flt(fg_qty): - msgprint("The Total of FG Qty %s in Stock Entry Detail do not match with FG Completed Qty %s" % (flt(fg_qty), flt(self.doc.fg_completed_qty))) - raise Exception - - def update_production_order(self, is_submit): - if self.doc.production_order: - pro_obj = get_obj("Production Order", self.doc.production_order) - if flt(pro_obj.doc.docstatus) != 1: - msgprint("One cannot do any transaction against Production Order : %s, as it's not submitted" % (pro_obj.doc.name)) - raise Exception - if pro_obj.doc.status == 'Stopped': - msgprint("One cannot do any transaction against Production Order : %s, as it's status is 'Stopped'" % (pro_obj.doc.name)) - raise Exception - if getdate(pro_obj.doc.posting_date) > getdate(self.doc.posting_date): - msgprint("Posting Date of Stock Entry cannot be before Posting Date of Production Order "+ cstr(self.doc.production_order)) - raise Exception - if self.doc.process == 'Backflush': - pro_obj.doc.produced_qty = flt(pro_obj.doc.produced_qty) + (is_submit and 1 or -1 ) * flt(self.doc.fg_completed_qty) - get_obj('Warehouse', pro_obj.doc.fg_warehouse).update_bin(0, 0, 0, 0, (is_submit and 1 or -1 ) * flt(self.doc.fg_completed_qty), pro_obj.doc.production_item, now()) - pro_obj.doc.status = (flt(pro_obj.doc.qty) == flt(pro_obj.doc.produced_qty)) and 'Completed' or 'In Process' - pro_obj.doc.save() - - # Create / Update Serial No - # ---------------------------------- - def update_serial_no(self, is_submit): - sl_obj = get_obj('Stock Ledger') - for d in getlist(self.doclist, 'mtn_details'): - if d.serial_no: - serial_nos = sl_obj.get_sr_no_list(d.serial_no) - for x in serial_nos: - serial_no = x.strip() - if d.s_warehouse: - sl_obj.update_serial_delivery_details(self, d, serial_no, is_submit) - if d.t_warehouse: - sl_obj.update_serial_purchase_details(self, d, serial_no, is_submit, (self.doc.purpose in ['Material Transfer', 'Sales Return']) and 1 or 0) - - if self.doc.purpose == 'Purchase Return': - delete_doc("Serial No", serial_no) - - # On Submit - # ------------------ - def on_submit(self): - self.validate_transfer_qty() - # Check for Approving Authority - get_obj('Authorization Control').validate_approving_authority(self.doc.doctype, self.doc.company, self.doc.total_amount) - self.update_serial_no(1) - self.update_stock_ledger(0) - # update Production Order - self.update_production_order(1) - - # On Cancel - # ------------------- - def on_cancel(self): - self.update_serial_no(0) - self.update_stock_ledger(1) - # update Production Order - self.update_production_order(0) - - def get_cust_values(self): - tbl = self.doc.delivery_note_no and 'Delivery Note' or 'Receivable Voucher' - record_name = self.doc.delivery_note_no or self.doc.sales_invoice_no - res = sql("select customer,customer_name, customer_address from `tab%s` where name = '%s'" % (tbl, record_name)) - ret = { - 'customer' : res and res[0][0] or '', - 'customer_name' : res and res[0][1] or '', - 'customer_address' : res and res[0][2] or ''} - - return str(ret) - - - def get_cust_addr(self): - res = sql("select customer_name,address from `tabCustomer` where name = '%s'"%self.doc.customer) - ret = { - 'customer_name' : res and res[0][0] or '', - 'customer_address' : res and res[0][1] or ''} - - return str(ret) - - - - def get_supp_values(self): - res = sql("select supplier,supplier_name,supplier_address from `tabPurchase Receipt` where name = '%s'"%self.doc.purchase_receipt_no) - ret = { - 'supplier' : res and res[0][0] or '', - 'supplier_name' :res and res[0][1] or '', - 'supplier_address' : res and res[0][2] or ''} - return str(ret) - - - def get_supp_addr(self): - res = sql("select supplier_name,address from `tabSupplier` where name = '%s'"%self.doc.supplier) - ret = { - 'supplier_name' : res and res[0][0] or '', - 'supplier_address' : res and res[0][1] or ''} - return str(ret) diff --git a/js/all-app.js b/js/all-app.js index cbeb77a901..c35273ee9b 100644 --- a/js/all-app.js +++ b/js/all-app.js @@ -450,10 +450,12 @@ $(parent).append(repl('',args));} else if(opts.type=='link'&&opts.doctype){$(parent).append(repl(''+data[opts.content]+'',data));} +else if(opts.template){$(parent).append(repl(opts.template,data));} else if(data[opts.content]){$(parent).append(' '+data[opts.content]);}},render:function(row,data){var me=this;this.prepare_data(data);rowhtml='';$.each(this.columns,function(i,v){rowhtml+=repl('',v);});var tr=$(row).html(''+rowhtml+'
').find('tr').get(0);$.each(this.columns,function(i,v){me.render_column(data,tr.cells[i],v);});},prepare_data:function(data){data.fullname=wn.user_info(data.owner).fullname;data.avatar=wn.user_info(data.owner).image;data.when=dateutil.str_to_user(data.modified).split(' ')[0];var diff=dateutil.get_diff(dateutil.get_today(),data.modified.split(' ')[0]);if(diff==0){data.when='Today'} if(diff==1){data.when='Yesterday'} if(diff==2){data.when='2 days ago'} -if(data.docstatus==0||data.docstatus==null){data.docstatus_icon='icon-pencil';data.docstatus_title='Editable';}else if(data.docstatus==1){data.docstatus_icon='icon-lock';data.docstatus_title='Submitted';}else if(data.docstatus==2){data.docstatus_icon='icon-remove';data.docstatus_title='Cancelled';}},add_user_tags:function(parent,data){var me=this;if(data._user_tags){$.each(data._user_tags.split(','),function(i,t){if(t){$('' +if(data.docstatus==0||data.docstatus==null){data.docstatus_icon='icon-pencil';data.docstatus_title='Editable';}else if(data.docstatus==1){data.docstatus_icon='icon-lock';data.docstatus_title='Submitted';}else if(data.docstatus==2){data.docstatus_icon='icon-remove';data.docstatus_title='Cancelled';} +for(key in data){if(data[key]==null){data[key]='';}}},add_user_tags:function(parent,data){var me=this;if(data._user_tags){$.each(data._user_tags.split(','),function(i,t){if(t){$('' +strip(t)+'').click(function(){me.doclistview.set_filter('_user_tags',$(this).text())}).appendTo(parent);}});}},show_hide_check_column:function(){if(!this.doclistview.can_delete){this.columns=$.map(this.columns,function(v,i){if(v.content!='check')return v});}}}) /* * lib/js/wn/views/pageview.js diff --git a/js/all-web.js b/js/all-web.js index a33cd0fbe4..cb193e3edc 100644 --- a/js/all-web.js +++ b/js/all-web.js @@ -337,10 +337,12 @@ $(parent).append(repl('',args));} else if(opts.type=='link'&&opts.doctype){$(parent).append(repl(''+data[opts.content]+'',data));} +else if(opts.template){$(parent).append(repl(opts.template,data));} else if(data[opts.content]){$(parent).append(' '+data[opts.content]);}},render:function(row,data){var me=this;this.prepare_data(data);rowhtml='';$.each(this.columns,function(i,v){rowhtml+=repl('',v);});var tr=$(row).html(''+rowhtml+'
').find('tr').get(0);$.each(this.columns,function(i,v){me.render_column(data,tr.cells[i],v);});},prepare_data:function(data){data.fullname=wn.user_info(data.owner).fullname;data.avatar=wn.user_info(data.owner).image;data.when=dateutil.str_to_user(data.modified).split(' ')[0];var diff=dateutil.get_diff(dateutil.get_today(),data.modified.split(' ')[0]);if(diff==0){data.when='Today'} if(diff==1){data.when='Yesterday'} if(diff==2){data.when='2 days ago'} -if(data.docstatus==0||data.docstatus==null){data.docstatus_icon='icon-pencil';data.docstatus_title='Editable';}else if(data.docstatus==1){data.docstatus_icon='icon-lock';data.docstatus_title='Submitted';}else if(data.docstatus==2){data.docstatus_icon='icon-remove';data.docstatus_title='Cancelled';}},add_user_tags:function(parent,data){var me=this;if(data._user_tags){$.each(data._user_tags.split(','),function(i,t){if(t){$('' +if(data.docstatus==0||data.docstatus==null){data.docstatus_icon='icon-pencil';data.docstatus_title='Editable';}else if(data.docstatus==1){data.docstatus_icon='icon-lock';data.docstatus_title='Submitted';}else if(data.docstatus==2){data.docstatus_icon='icon-remove';data.docstatus_title='Cancelled';} +for(key in data){if(data[key]==null){data[key]='';}}},add_user_tags:function(parent,data){var me=this;if(data._user_tags){$.each(data._user_tags.split(','),function(i,t){if(t){$('' +strip(t)+'').click(function(){me.doclistview.set_filter('_user_tags',$(this).text())}).appendTo(parent);}});}},show_hide_check_column:function(){if(!this.doclistview.can_delete){this.columns=$.map(this.columns,function(v,i){if(v.content!='check')return v});}}}) /* * lib/js/wn/views/pageview.js