diff --git a/data/master.sql.gz b/data/master.sql.gz index 9f2ed7f0d47..8b9fdb98892 100644 Binary files a/data/master.sql.gz and b/data/master.sql.gz differ diff --git a/erpnext/accounts/doctype/pv_detail/pv_detail.txt b/erpnext/accounts/doctype/pv_detail/pv_detail.txt index cff53a95903..423f6676930 100755 --- a/erpnext/accounts/doctype/pv_detail/pv_detail.txt +++ b/erpnext/accounts/doctype/pv_detail/pv_detail.txt @@ -5,7 +5,7 @@ { 'creation': '2010-08-08 17:09:17', 'docstatus': 0, - 'modified': '2012-03-02 14:39:34', + 'modified': '2012-03-05 15:02:25', 'modified_by': u'Administrator', 'owner': u'Administrator' }, @@ -22,7 +22,7 @@ 'section_style': u'Tray', 'server_code_error': u' ', 'show_in_menu': 0, - 'version': 44 + 'version': 46 }, # These values are common for all DocField diff --git a/erpnext/accounts/doctype/rv_detail/rv_detail.txt b/erpnext/accounts/doctype/rv_detail/rv_detail.txt index f8f91da94fc..314dcd7dd3a 100644 --- a/erpnext/accounts/doctype/rv_detail/rv_detail.txt +++ b/erpnext/accounts/doctype/rv_detail/rv_detail.txt @@ -5,7 +5,7 @@ { 'creation': '2010-08-08 17:09:20', 'docstatus': 0, - 'modified': '2012-03-02 14:37:42', + 'modified': '2012-03-05 15:01:04', 'modified_by': u'Administrator', 'owner': u'Administrator' }, @@ -22,7 +22,7 @@ 'section_style': u'Tray', 'server_code_error': u' ', 'show_in_menu': 0, - 'version': 27 + 'version': 29 }, # These values are common for all DocField diff --git a/erpnext/accounts/page/accounts_home/accounts_home.html b/erpnext/accounts/page/accounts_home/accounts_home.html index 12c80ebe8f9..8282ae8eb1d 100644 --- a/erpnext/accounts/page/accounts_home/accounts_home.html +++ b/erpnext/accounts/page/accounts_home/accounts_home.html @@ -62,6 +62,11 @@ title = "Analyze Sales and Purchase trends and slice them based on item, customer, groups etc" href="#!Report/Profile/Trend Analyzer">Trend Analyzer +
+ Financial Statements +
@@ -141,4 +146,4 @@
- \ No newline at end of file + diff --git a/erpnext/analysis/doctype/mis_control/mis_control.py b/erpnext/analysis/doctype/mis_control/mis_control.py index 11e48f41ca3..b2c85f89cb4 100644 --- a/erpnext/analysis/doctype/mis_control/mis_control.py +++ b/erpnext/analysis/doctype/mis_control/mis_control.py @@ -61,7 +61,6 @@ class DocType: # ---- get companies --------- res = sql("select name from `tabCompany`") - comp.append('All') for r in res: comp.append(r[0]) #comp.append(r[0] for r in res) diff --git a/erpnext/buying/doctype/po_detail/po_detail.txt b/erpnext/buying/doctype/po_detail/po_detail.txt index cfa2d3b77bf..b625e4ea512 100755 --- a/erpnext/buying/doctype/po_detail/po_detail.txt +++ b/erpnext/buying/doctype/po_detail/po_detail.txt @@ -5,7 +5,7 @@ { 'creation': '2010-08-08 17:09:12', 'docstatus': 0, - 'modified': '2012-03-02 14:36:13', + 'modified': '2012-03-05 15:01:31', 'modified_by': u'Administrator', 'owner': u'Administrator' }, @@ -22,7 +22,7 @@ 'section_style': u'Tray', 'server_code_error': u' ', 'show_in_menu': 0, - 'version': 63 + 'version': 65 }, # These values are common for all DocField diff --git a/erpnext/buying/doctype/purchase_common/purchase_common.js b/erpnext/buying/doctype/purchase_common/purchase_common.js index 88fba5c6fa2..9a414a364ab 100644 --- a/erpnext/buying/doctype/purchase_common/purchase_common.js +++ b/erpnext/buying/doctype/purchase_common/purchase_common.js @@ -100,19 +100,19 @@ var set_dynamic_label_child = function(doc, cdt, cdn, base_curr) { for (d in item_cols_import) $('[data-grid-fieldname="'+cur_frm.cscript.tname+'-'+d+'"]').html(item_cols_import[d]+' ('+doc.currency+')'); var hide = (doc.currency == sys_defaults['currency']) ? false : true; - for (f in item_cols_import) { + for (f in item_cols_base) { cur_frm.fields_dict[cur_frm.cscript.fname].grid.set_column_disp(f, hide); } if (doc.doctype == 'Payable Voucher') { $('[data-grid-fieldname="'+cur_frm.cscript.tname+'-rate"]').html('Rate ('+base_curr+')'); - //cur_frm.fields_dict[cur_frm.cscript.fname].grid.set_column_disp('rate', hide); + cur_frm.fields_dict[cur_frm.cscript.fname].grid.set_column_disp('rate', hide); // advance table flds adv_cols = {'advance_amount': 'Advance Amount', 'allocated_amount': 'Allocated Amount', 'tds_amount': 'TDS Amount', 'tds_allocated': 'TDS Allocated'} for (d in adv_cols) $('[data-grid-fieldname="Advance Allocation Detail-'+d+'"]').html(adv_cols[d]+' ('+base_curr+')'); } else { $('[data-grid-fieldname="'+cur_frm.cscript.tname+'-purchase_rate"]').html('Rate ('+base_curr+')'); - //cur_frm.fields_dict[cur_frm.cscript.fname].grid.set_column_disp('purchase_rate', hide); + cur_frm.fields_dict[cur_frm.cscript.fname].grid.set_column_disp('purchase_rate', hide); } //tax table flds diff --git a/erpnext/patches/jan_mar_2012/reload_table.py b/erpnext/patches/jan_mar_2012/reload_table.py new file mode 100644 index 00000000000..481b46f7a57 --- /dev/null +++ b/erpnext/patches/jan_mar_2012/reload_table.py @@ -0,0 +1,11 @@ +def execute(): + import webnotes + from webnotes.modules.module_manager import reload_doc + reload_doc('selling', 'doctype', 'quotation_detail') + reload_doc('selling', 'doctype', 'sales_order_detail') + reload_doc('stock', 'doctype', 'delivery_note_detail') + reload_doc('stock', 'doctype', 'purchase_receipt_detail') + reload_doc('buying', 'doctype', 'po_detail') + reload_doc('accounts', 'doctype', 'rv_detail') + reload_doc('accounts', 'doctype', 'pv_detail') + diff --git a/erpnext/patches/patch_list.py b/erpnext/patches/patch_list.py index 4074a02ea6f..7750962963b 100644 --- a/erpnext/patches/patch_list.py +++ b/erpnext/patches/patch_list.py @@ -172,5 +172,10 @@ patch_list = [ 'patch_file': 'dt_map_fix', 'description': 'removed transaction date from dt_mapper' }, + { + 'patch_module': 'patches.jan_mar_2012', + 'patch_file': 'reload_table', + 'description': 'Relaod all item table: fld order changes' + }, ] diff --git a/erpnext/selling/doctype/quotation_detail/quotation_detail.txt b/erpnext/selling/doctype/quotation_detail/quotation_detail.txt index 3b5d9bc80cd..1b55879247f 100644 --- a/erpnext/selling/doctype/quotation_detail/quotation_detail.txt +++ b/erpnext/selling/doctype/quotation_detail/quotation_detail.txt @@ -5,7 +5,7 @@ { 'creation': '2010-08-08 17:09:18', 'docstatus': 0, - 'modified': '2012-03-02 14:40:25', + 'modified': '2012-03-05 15:00:10', 'modified_by': u'Administrator', 'owner': u'Administrator' }, @@ -23,7 +23,7 @@ 'section_style': u'Tray', 'server_code_error': u' ', 'show_in_menu': 0, - 'version': 31 + 'version': 33 }, # These values are common for all DocField @@ -205,21 +205,6 @@ 'width': u'100px' }, - # DocField - { - 'colour': u'White:FFF', - 'doctype': u'DocField', - 'fieldname': u'stock_uom', - 'fieldtype': u'Data', - 'label': u'UOM', - 'oldfieldname': u'stock_uom', - 'oldfieldtype': u'Data', - 'permlevel': 1, - 'print_hide': 0, - 'reqd': 0, - 'width': u'100px' - }, - # DocField { 'default': u'0.00', @@ -238,6 +223,21 @@ 'width': u'100px' }, + # DocField + { + 'colour': u'White:FFF', + 'doctype': u'DocField', + 'fieldname': u'stock_uom', + 'fieldtype': u'Data', + 'label': u'UOM', + 'oldfieldname': u'stock_uom', + 'oldfieldtype': u'Data', + 'permlevel': 1, + 'print_hide': 0, + 'reqd': 0, + 'width': u'100px' + }, + # DocField { 'doctype': u'DocField', diff --git a/erpnext/selling/doctype/sales_common/sales_common.js b/erpnext/selling/doctype/sales_common/sales_common.js index 4865b3fdf80..cad8ec16f7d 100644 --- a/erpnext/selling/doctype/sales_common/sales_common.js +++ b/erpnext/selling/doctype/sales_common/sales_common.js @@ -26,13 +26,15 @@ cur_frm.cscript.load_taxes = function(doc, cdt, cdn, callback) { // run if this is not executed from dt_map... doc = locals[doc.doctype][doc.name]; if(doc.customer || getchildren('RV Tax Detail', doc.name, 'other_charges', doc.doctype).length) { - if(callback) callback(doc, cdt, cdn); - return; + if(callback) { + callback(doc, cdt, cdn); + } + } else { + $c_obj([doc],'load_default_taxes','',function(r,rt){ + refresh_field('other_charges'); + if(callback) callback(doc, cdt, cdn); + }); } - $c_obj([doc],'load_default_taxes','',function(r,rt){ - refresh_field('other_charges'); - if(callback) callback(doc, cdt, cdn); - }); } @@ -119,7 +121,7 @@ var set_dynamic_label_child = function(doc, cdt, cdn, base_curr) { for (d in item_cols_export) $('[data-grid-fieldname="'+cur_frm.cscript.tname+'-'+d+'"]').html(item_cols_export[d]+' ('+doc.currency+')'); var hide = (doc.currency == sys_defaults['currency']) ? false : true; - for (f in item_cols_export) { + for (f in item_cols_base) { cur_frm.fields_dict[cur_frm.cscript.fname].grid.set_column_disp(f, hide); } @@ -656,10 +658,10 @@ cur_frm.cscript.update_fname_table = function(doc , tname , fname , n, other_fna 'basic_rate': flt(flt(cl[i].export_rate) * flt(doc.conversion_rate)), 'amount': roundNumber(flt((flt(cl[i].export_rate) * flt(doc.conversion_rate)) * flt(cl[i].qty)), 2) }, fname); - var base_ref_rate = flt(cl[i].basic_rate) + flt(flt(cl[i].basic_rate) * flt(cl[i].adj_rate) / 100); - set_multiple(tname, cl[i].name, { - 'base_ref_rate': flt(base_ref_rate) - }, fname); + //var base_ref_rate = flt(cl[i].basic_rate) + flt(flt(cl[i].basic_rate) * flt(cl[i].adj_rate) / 100); + //set_multiple(tname, cl[i].name, { + // 'base_ref_rate': flt(base_ref_rate) + //}, fname); } else if(consider_incl_rate) { if(flt(cl[i].export_rate) > 0) { diff --git a/erpnext/selling/doctype/sales_common/sales_common.py b/erpnext/selling/doctype/sales_common/sales_common.py index a57c33d00b8..9186bb831b1 100644 --- a/erpnext/selling/doctype/sales_common/sales_common.py +++ b/erpnext/selling/doctype/sales_common/sales_common.py @@ -36,7 +36,9 @@ from utilities.transaction_base import TransactionBase @webnotes.whitelist() def get_comp_base_currency(arg=None): """ get default currency of company""" - return webnotes.conn.sql("select default_currency from `tabCompany` where name = %s", webnotes.form_dict['company'])[0][0] + res = webnotes.conn.sql("""select default_currency from `tabCompany` + where name = %s""", webnotes.form_dict.get('company')) + return res and res[0][0] or None @webnotes.whitelist() def get_price_list_currency(arg=None): diff --git a/erpnext/selling/doctype/sales_order_detail/sales_order_detail.txt b/erpnext/selling/doctype/sales_order_detail/sales_order_detail.txt index 3205d6e4a27..c0a01f13d19 100644 --- a/erpnext/selling/doctype/sales_order_detail/sales_order_detail.txt +++ b/erpnext/selling/doctype/sales_order_detail/sales_order_detail.txt @@ -5,7 +5,7 @@ { 'creation': '2010-08-08 17:09:22', 'docstatus': 0, - 'modified': '2012-03-02 15:49:26', + 'modified': '2012-03-05 14:59:43', 'modified_by': u'Administrator', 'owner': u'Administrator' }, @@ -22,7 +22,7 @@ 'section_style': u'Tray', 'server_code_error': u' ', 'show_in_menu': 0, - 'version': 53 + 'version': 54 }, # These values are common for all DocField @@ -117,15 +117,18 @@ # DocField { + 'default': u'0.00', 'doctype': u'DocField', - 'fieldname': u'base_ref_rate', + 'fieldname': u'ref_rate', 'fieldtype': u'Currency', - 'label': u'Price List Rate*', - 'oldfieldname': u'base_ref_rate', + 'label': u'Price List Rate', + 'oldfieldname': u'ref_rate', 'oldfieldtype': u'Currency', - 'permlevel': 1, + 'permlevel': 0, 'print_hide': 1, - 'width': u'100px' + 'reqd': 0, + 'trigger': u'Client', + 'width': u'70px' }, # DocField @@ -143,54 +146,6 @@ 'width': u'70px' }, - # DocField - { - 'default': u'0.00', - 'doctype': u'DocField', - 'fieldname': u'basic_rate', - 'fieldtype': u'Currency', - 'label': u'Basic Rate*', - 'oldfieldname': u'basic_rate', - 'oldfieldtype': u'Currency', - 'permlevel': 0, - 'print_hide': 1, - 'reqd': 0, - 'trigger': u'Client', - 'width': u'100px' - }, - - # DocField - { - 'default': u'0.00', - 'doctype': u'DocField', - 'fieldname': u'amount', - 'fieldtype': u'Currency', - 'label': u'Amount*', - 'no_copy': 0, - 'oldfieldname': u'amount', - 'oldfieldtype': u'Currency', - 'permlevel': 1, - 'print_hide': 1, - 'reqd': 0, - 'width': u'100px' - }, - - # DocField - { - 'default': u'0.00', - 'doctype': u'DocField', - 'fieldname': u'ref_rate', - 'fieldtype': u'Currency', - 'label': u'Price List Rate', - 'oldfieldname': u'ref_rate', - 'oldfieldtype': u'Currency', - 'permlevel': 0, - 'print_hide': 1, - 'reqd': 0, - 'trigger': u'Client', - 'width': u'70px' - }, - # DocField { 'default': u'0.00', @@ -221,6 +176,51 @@ 'width': u'100px' }, + # DocField + { + 'doctype': u'DocField', + 'fieldname': u'base_ref_rate', + 'fieldtype': u'Currency', + 'label': u'Price List Rate*', + 'oldfieldname': u'base_ref_rate', + 'oldfieldtype': u'Currency', + 'permlevel': 1, + 'print_hide': 1, + 'width': u'100px' + }, + + # DocField + { + 'default': u'0.00', + 'doctype': u'DocField', + 'fieldname': u'basic_rate', + 'fieldtype': u'Currency', + 'label': u'Basic Rate*', + 'oldfieldname': u'basic_rate', + 'oldfieldtype': u'Currency', + 'permlevel': 0, + 'print_hide': 1, + 'reqd': 0, + 'trigger': u'Client', + 'width': u'100px' + }, + + # DocField + { + 'default': u'0.00', + 'doctype': u'DocField', + 'fieldname': u'amount', + 'fieldtype': u'Currency', + 'label': u'Amount*', + 'no_copy': 0, + 'oldfieldname': u'amount', + 'oldfieldtype': u'Currency', + 'permlevel': 1, + 'print_hide': 1, + 'reqd': 0, + 'width': u'100px' + }, + # DocField { 'doctype': u'DocField', diff --git a/erpnext/startup/js/feature_setup.js b/erpnext/startup/js/feature_setup.js index c5518ab7511..8006dca3173 100644 --- a/erpnext/startup/js/feature_setup.js +++ b/erpnext/startup/js/feature_setup.js @@ -122,18 +122,18 @@ pscript.feature_dict = { 'Sales Order': {'sales_order_details':['page_break']} }, 'fs_exports': { - 'Delivery Note': {'fields':['Note','conversion_rate','currency','grand_total_export','in_words_export','rounded_total_export'],'delivery_note_details':['ref_rate','export_amount','export_rate']}, + 'Delivery Note': {'fields':['Note','conversion_rate','currency','grand_total_export','in_words_export','rounded_total_export'],'delivery_note_details':['base_ref_rate','amount','basic_rate']}, 'POS Setting': {'fields':['conversion_rate','currency']}, - 'Quotation': {'fields':['Note HTML','OT Notes','conversion_rate','currency','grand_total_export','in_words_export','rounded_total_export'],'quotation_details':['ref_rate','export_amount','export_rate']}, - 'Receivable Voucher': {'fields':['conversion_rate','currency','grand_total_export','in_words_export','rounded_total_export'],'entries':['ref_rate','export_amount','export_rate']}, + 'Quotation': {'fields':['Note HTML','OT Notes','conversion_rate','currency','grand_total_export','in_words_export','rounded_total_export'],'quotation_details':['base_ref_rate','amount','basic_rate']}, + 'Receivable Voucher': {'fields':['conversion_rate','currency','grand_total_export','in_words_export','rounded_total_export'],'entries':['base_ref_rate','amount','basic_rate']}, 'Item': {'ref_rate_details':['ref_currency']}, 'Sales BOM': {'fields':['currency']}, - 'Sales Order': {'fields':['Note1','OT Notes','conversion_rate','currency','grand_total_export','in_words_export','rounded_total_export'],'sales_order_details':['ref_rate','export_amount','export_rate']} + 'Sales Order': {'fields':['Note1','OT Notes','conversion_rate','currency','grand_total_export','in_words_export','rounded_total_export'],'sales_order_details':['base_ref_rate','amount','basic_rate']} }, 'fs_imports': { - 'Payable Voucher': {'fields':['conversion_rate','currency','grand_total_import','in_words_import','net_total_import','other_charges_added_import','other_charges_deducted_import'],'entries':['import_amount','import_rate']}, - 'Purchase Order': {'fields':['Note HTML','conversion_rate','currency','grand_total_import','in_words_import','net_total_import','other_charges_added_import','other_charges_deducted_import'],'po_details':['import_amount','import_rate']}, - 'Purchase Receipt': {'fields':['conversion_rate','currency','grand_total_import','in_words_import','net_total_import','other_charges_added_import','other_charges_deducted_import'],'purchase_receipt_details':['import_amount','import_rate']}, + 'Payable Voucher': {'fields':['conversion_rate','currency','grand_total_import','in_words_import','net_total_import','other_charges_added_import','other_charges_deducted_import'],'entries':['purchase_ref_rate', 'amount','rate']}, + 'Purchase Order': {'fields':['Note HTML','conversion_rate','currency','grand_total_import','in_words_import','net_total_import','other_charges_added_import','other_charges_deducted_import'],'po_details':['purchase_ref_rate', 'amount','purchase_rate']}, + 'Purchase Receipt': {'fields':['conversion_rate','currency','grand_total_import','in_words_import','net_total_import','other_charges_added_import','other_charges_deducted_import'],'purchase_receipt_details':['purchase_ref_rate','amount','purchase_rate']}, 'Supplier Quotation': {'fields':['conversion_rate','currency']} }, 'fs_item_advanced': { diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.js b/erpnext/stock/doctype/delivery_note/delivery_note.js index b0569fcaafd..1f5170be96c 100644 --- a/erpnext/stock/doctype/delivery_note/delivery_note.js +++ b/erpnext/stock/doctype/delivery_note/delivery_note.js @@ -30,7 +30,7 @@ cur_frm.cscript.onload = function(doc, dt, dn) { if(!doc.status) set_multiple(dt,dn,{status:'Draft'}); if(!doc.transaction_date) set_multiple(dt,dn,{transaction_date:get_today()}); if(!doc.posting_date) set_multiple(dt,dn,{posting_date:get_today()}); - if(doc.__islocal && doc.customer) cur_frm.cscript.pull_item_details_onload(doc,dt,dn); + if(doc.__islocal && doc.customer) cur_frm.cscript.customer(doc,dt,dn,onload=true); if(!doc.price_list_currency) { set_multiple(dt, dn, {price_list_currency: doc.currency, plc_conversion_rate:1}); } @@ -125,16 +125,6 @@ cur_frm.cscript['Get Items'] = function(doc,dt,dn) { } -//RV-DN : Pull Item details - UOM, Item Group as it was not in Sales Invoice -//--------------------------------------------------------------------- -cur_frm.cscript.pull_item_details_onload = function(doc,dt,dn){ - var callback = function(r,rt){ - refresh_field('delivery_note_details'); - cur_frm.cscript.customer(doc,dt,dn,onload=true); - } - $c_obj(make_doclist(dt,dn),'set_item_details','',callback); -} - //================ create new contact ============================================================================ cur_frm.cscript.new_contact = function(){ tn = createLocal('Contact'); diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.py b/erpnext/stock/doctype/delivery_note/delivery_note.py index e8af7ef39f0..3d8a1011fc2 100644 --- a/erpnext/stock/doctype/delivery_note/delivery_note.py +++ b/erpnext/stock/doctype/delivery_note/delivery_note.py @@ -74,16 +74,6 @@ class DocType(TransactionBase): return cstr(self.doc.sales_order_no) - - - #-------------------set item details -uom and item group---------------- - def set_item_details(self): - for d in getlist(self.doclist,'delivery_note_details'): - res = sql("select stock_uom, item_group from `tabItem` where name ='%s'"%d.item_code) - if not d.stock_uom: d.stock_uom = res and cstr(res[0][0]) or '' - if not d.item_group: d.item_group = res and cstr(res[0][1]) or '' - d.save() - # ::::: Validates that Sales Order is not pulled twice ::::::: def validate_prev_docname(self): for d in getlist(self.doclist, 'delivery_note_details'): @@ -351,16 +341,17 @@ class DocType(TransactionBase): """ Validate that if packed qty exists, it should be equal to qty """ - if not any([d.fields.get('packed_qty') for d in self.doclist]): + if not any([flt(d.fields.get('packed_qty')) for d in self.doclist if + d.doctype=='Delivery Note Detail']): return packing_error_list = [] for d in self.doclist: if d.doctype != 'Delivery Note Detail': continue - if d.fields.get('qty') != d.fields.get('packed_qty'): + if flt(d.fields.get('qty')) != flt(d.fields.get('packed_qty')): packing_error_list.append([ d.fields.get('item_code', ''), - d.fields.get('qty', ''), - d.fields.get('packed_qty', '') + d.fields.get('qty', 0), + d.fields.get('packed_qty', 0) ]) if packing_error_list: from webnotes.utils import cstr diff --git a/erpnext/stock/doctype/delivery_note_detail/delivery_note_detail.txt b/erpnext/stock/doctype/delivery_note_detail/delivery_note_detail.txt index 7afebde4185..c4bacb37925 100644 --- a/erpnext/stock/doctype/delivery_note_detail/delivery_note_detail.txt +++ b/erpnext/stock/doctype/delivery_note_detail/delivery_note_detail.txt @@ -5,7 +5,7 @@ { 'creation': '2010-08-08 17:08:58', 'docstatus': 0, - 'modified': '2012-03-01 19:22:16', + 'modified': '2012-03-05 15:00:39', 'modified_by': u'Administrator', 'owner': u'Administrator' }, @@ -23,7 +23,7 @@ 'section_style': u'Tray', 'server_code_error': u' ', 'show_in_menu': 0, - 'version': 54 + 'version': 56 }, # These values are common for all DocField diff --git a/erpnext/stock/doctype/purchase_receipt_detail/purchase_receipt_detail.txt b/erpnext/stock/doctype/purchase_receipt_detail/purchase_receipt_detail.txt index f81715dfddd..a8d15631665 100755 --- a/erpnext/stock/doctype/purchase_receipt_detail/purchase_receipt_detail.txt +++ b/erpnext/stock/doctype/purchase_receipt_detail/purchase_receipt_detail.txt @@ -5,7 +5,7 @@ { 'creation': '2010-08-08 17:09:16', 'docstatus': 0, - 'modified': '2012-03-02 14:38:56', + 'modified': '2012-03-05 15:01:58', 'modified_by': u'Administrator', 'owner': u'Administrator' }, @@ -22,7 +22,7 @@ 'section_style': u'Tray', 'server_code_error': u' ', 'show_in_menu': 0, - 'version': 75 + 'version': 77 }, # These values are common for all DocField diff --git a/erpnext/stock/page/stock_home/stock_home.html b/erpnext/stock/page/stock_home/stock_home.html index bab93dcfbd5..ae677de296a 100644 --- a/erpnext/stock/page/stock_home/stock_home.html +++ b/erpnext/stock/page/stock_home/stock_home.html @@ -18,7 +18,7 @@

Single unit of an Item

Batch

Batch of units of an Item

-

Warehouse

+

Warehouse

Warehouse is where items are stored

@@ -102,4 +102,4 @@
- \ No newline at end of file + diff --git a/erpnext/utilities/page/users/users.py b/erpnext/utilities/page/users/users.py index 6251e432164..f2bb1a5f478 100644 --- a/erpnext/utilities/page/users/users.py +++ b/erpnext/utilities/page/users/users.py @@ -106,7 +106,7 @@ def add_user(args): # erpnext-saas if cint(webnotes.conn.get_value('Control Panel', None, 'sync_with_gateway')): from server_tools.gateway_utils import add_user_gateway - add_user_gateway(args['user']) + add_user_gateway(args) add_profile(args) diff --git a/js/all-app.js b/js/all-app.js index 48b69c3ed7a..a593e00323f 100644 --- a/js/all-app.js +++ b/js/all-app.js @@ -2230,7 +2230,7 @@ if(user_roles.indexOf("System Manager")!=-1){$('.navbar .modules').append('