diff --git a/data/master.sql.gz b/data/master.sql.gz index 8b9fdb98892..e8f45a90516 100644 Binary files a/data/master.sql.gz and b/data/master.sql.gz differ diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.txt b/erpnext/accounts/doctype/sales_invoice/sales_invoice.txt index 5ec5552fe46..450052dc99a 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.txt +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.txt @@ -5,7 +5,7 @@ { 'creation': '2012-04-13 11:56:18', 'docstatus': 0, - 'modified': '2012-05-04 11:56:59', + 'modified': '2012-05-08 17:17:51', 'modified_by': u'Administrator', 'owner': u'Administrator' }, @@ -136,7 +136,6 @@ # DocField { 'colour': u'White:FFF', - 'depends_on': u'eval:doc.retail_transaction!="Yes"', 'description': u'To manage multiple series please go to Setup > Manage Series', 'doctype': u'DocField', 'fieldname': u'naming_series', diff --git a/erpnext/selling/doctype/sales_order/sales_order.txt b/erpnext/selling/doctype/sales_order/sales_order.txt index ea862853b03..ca24ce2e079 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.txt +++ b/erpnext/selling/doctype/sales_order/sales_order.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-04-13 11:56:28', + 'creation': '2012-05-09 10:56:36', 'docstatus': 0, - 'modified': '2012-04-30 20:07:31', + 'modified': '2012-05-09 11:06:28', 'modified_by': u'Administrator', 'owner': u'Administrator' }, @@ -58,89 +58,19 @@ 'name': u'Sales Order' }, - # DocPerm - { - 'amend': 0, - 'cancel': 0, - 'create': 0, - 'doctype': u'DocPerm', - 'permlevel': 1, - 'role': u'Sales Manager', - 'submit': 0, - 'write': 0 - }, - - # DocPerm - { - 'amend': 1, - 'cancel': 1, - 'create': 1, - 'doctype': u'DocPerm', - 'permlevel': 0, - 'role': u'Sales Manager', - 'submit': 1, - 'write': 1 - }, - # DocPerm { 'amend': 1, 'cancel': 1, 'create': 1, 'doctype': u'DocPerm', + 'match': u'owner', 'permlevel': 0, 'role': u'Sales User', 'submit': 1, 'write': 1 }, - # DocPerm - { - 'amend': 0, - 'cancel': 0, - 'create': 0, - 'doctype': u'DocPerm', - 'permlevel': 1, - 'role': u'Sales User', - 'submit': 0, - 'write': 0 - }, - - # DocPerm - { - 'doctype': u'DocPerm', - 'match': u'customer_name', - 'permlevel': 0, - 'role': u'Customer' - }, - - # DocPerm - { - 'doctype': u'DocPerm', - 'permlevel': 2, - 'role': u'Accounts User', - 'write': 1 - }, - - # DocPerm - { - 'amend': 1, - 'cancel': 1, - 'create': 1, - 'doctype': u'DocPerm', - 'permlevel': 0, - 'role': u'Maintenance Manager', - 'submit': 1, - 'write': 1 - }, - - # DocPerm - { - 'doctype': u'DocPerm', - 'permlevel': 1, - 'role': u'Maintenance Manager' - }, - # DocPerm { 'amend': 1, @@ -155,9 +85,99 @@ # DocPerm { + 'amend': 0, + 'cancel': 0, + 'create': 0, 'doctype': u'DocPerm', 'permlevel': 1, - 'role': u'Maintenance User' + 'role': u'Maintenance Manager', + 'submit': 0, + 'write': 0 + }, + + # DocPerm + { + 'amend': 1, + 'cancel': 1, + 'create': 1, + 'doctype': u'DocPerm', + 'permlevel': 0, + 'role': u'Maintenance Manager', + 'submit': 1, + 'write': 1 + }, + + # DocPerm + { + 'amend': 1, + 'cancel': 1, + 'create': 1, + 'doctype': u'DocPerm', + 'permlevel': 0, + 'role': u'Sales Manager', + 'submit': 1, + 'write': 1 + }, + + # DocPerm + { + 'amend': 0, + 'cancel': 0, + 'create': 0, + 'doctype': u'DocPerm', + 'permlevel': 1, + 'role': u'Sales Manager', + 'submit': 0, + 'write': 0 + }, + + # DocPerm + { + 'amend': 0, + 'cancel': 0, + 'create': 0, + 'doctype': u'DocPerm', + 'permlevel': 2, + 'role': u'Accounts User', + 'submit': 0, + 'write': 1 + }, + + # DocPerm + { + 'amend': 0, + 'cancel': 0, + 'create': 0, + 'doctype': u'DocPerm', + 'match': u'customer', + 'permlevel': 0, + 'role': u'Customer', + 'submit': 0, + 'write': 0 + }, + + # DocPerm + { + 'amend': 0, + 'cancel': 0, + 'create': 0, + 'doctype': u'DocPerm', + 'permlevel': 1, + 'role': u'Sales User', + 'submit': 0, + 'write': 0 + }, + + # DocPerm + { + 'amend': 0, + 'cancel': 0, + 'create': 0, + 'doctype': u'DocPerm', + 'permlevel': 1, + 'role': u'Maintenance User', + 'submit': 0, + 'write': 0 }, # DocField @@ -369,6 +389,30 @@ 'width': u'100px' }, + # DocField + { + 'doctype': u'DocField', + 'fieldname': u'shipping_address_name', + 'fieldtype': u'Data', + 'hidden': 1, + 'in_filter': 1, + 'label': u'Shipping Address Name', + 'options': u'Address', + 'permlevel': 1, + 'print_hide': 1 + }, + + # DocField + { + 'doctype': u'DocField', + 'fieldname': u'shipping_address', + 'fieldtype': u'Small Text', + 'in_filter': 0, + 'label': u'Shipping Address', + 'permlevel': 1, + 'print_hide': 1 + }, + # DocField { 'colour': u'White:FFF', @@ -929,30 +973,6 @@ 'search_index': 1 }, - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'shipping_address_name', - 'fieldtype': u'Data', - 'hidden': 1, - 'in_filter': 1, - 'label': u'Shipping Address Name', - 'options': u'Address', - 'permlevel': 1, - 'print_hide': 1 - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'shipping_address', - 'fieldtype': u'Small Text', - 'in_filter': 0, - 'label': u'Shipping Address', - 'permlevel': 1, - 'print_hide': 1 - }, - # DocField { 'colour': u'White:FFF', diff --git a/erpnext/stock/DocType Mapper/Sales Order-Delivery Note/Sales Order-Delivery Note.txt b/erpnext/stock/DocType Mapper/Sales Order-Delivery Note/Sales Order-Delivery Note.txt index 3024da529ae..bad4dcfd62a 100644 --- a/erpnext/stock/DocType Mapper/Sales Order-Delivery Note/Sales Order-Delivery Note.txt +++ b/erpnext/stock/DocType Mapper/Sales Order-Delivery Note/Sales Order-Delivery Note.txt @@ -5,7 +5,7 @@ { 'creation': '2010-08-08 17:09:35', 'docstatus': 0, - 'modified': '2012-04-02 13:05:03', + 'modified': '2012-05-08 11:50:18', 'modified_by': u'Administrator', 'owner': u'Administrator' }, @@ -127,16 +127,6 @@ 'to_field': u'export_amount' }, - # Field Mapper Detail - { - 'checking_operator': u'=', - 'doctype': u'Field Mapper Detail', - 'from_field': u'basic_rate', - 'map': u'Yes', - 'match_id': 1, - 'to_field': u'basic_rate' - }, - # Field Mapper Detail { 'checking_operator': u'=', @@ -147,16 +137,6 @@ 'to_field': u'export_rate' }, - # Field Mapper Detail - { - 'checking_operator': u'=', - 'doctype': u'Field Mapper Detail', - 'from_field': u'basic_rate', - 'map': u'Yes', - 'match_id': 1, - 'to_field': u'basic_rate' - }, - # Field Mapper Detail { 'doctype': u'Field Mapper Detail', @@ -231,15 +211,6 @@ 'to_field': u'incentives' }, - # Field Mapper Detail - { - 'doctype': u'Field Mapper Detail', - 'from_field': u'allocated_amount', - 'map': u'Yes', - 'match_id': 0, - 'to_field': u'customer_mobile_no' - }, - # Table Mapper Detail { 'doctype': u'Table Mapper Detail', @@ -262,30 +233,6 @@ 'validation_logic': u'name is not null' }, - # Table Mapper Detail - { - 'doctype': u'Table Mapper Detail', - 'from_field': u'other_charges', - 'from_table': u'Sales Taxes and Charges', - 'match_id': 2, - 'to_field': u'other_charges', - 'to_table': u'Sales Taxes and Charges', - 'validation_logic': u'name is not null' - }, - - # Table Mapper Detail - { - 'doctype': u'Table Mapper Detail', - 'from_field': u'sales_order_details', - 'from_table': u'Sales Order Item', - 'match_id': 1, - 'reference_doctype_key': u'prevdoc_doctype', - 'reference_key': u'prevdoc_detail_docname', - 'to_field': u'delivery_note_details', - 'to_table': u'Delivery Note Item', - 'validation_logic': u'qty > ifnull(delivered_qty,0) and docstatus = 1' - }, - # Table Mapper Detail { 'doctype': u'Table Mapper Detail', diff --git a/public/js/all-app.js b/public/js/all-app.js index 28d15472672..47c9ba1e8cf 100644 --- a/public/js/all-app.js +++ b/public/js/all-app.js @@ -2110,8 +2110,8 @@ this.prepare_col_heads(this.flist);var table=me.make_print_table(this.flist);thi _e.email_as_field='email_id';_e.email_as_dt='Contact';_e.email_as_in='email_id,contact_name';sendmail=function(emailto,emailfrom,cc,subject,message,fmt,with_attachments){var fn=function(html){$c('webnotes.utils.email_lib.send_form',{'sendto':emailto,'sendfrom':emailfrom?emailfrom:'','cc':cc?cc:'','subject':subject,'message':replace_newlines(message),'body':html,'full_domain':wn.urllib.get_base_url(),'with_attachments':with_attachments?1:0,'dt':cur_frm.doctype,'dn':cur_frm.docname},function(r,rtxt){});} _p.build(fmt,fn);} _e.make=function(){var d=new Dialog(440,440,"Send Email");var email_go=function(){var emailfrom=d.widgets['From'].value;var emailto=d.widgets['To'].value;if(!emailfrom) -emailfrom=user_email;var email_list=emailto.split(/[,|;]/);var valid=1;for(var i=0;i