From f31fc22ef0b8692bf0c390ef0041ce2e67178dd3 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Fri, 13 Apr 2012 11:37:19 +0530 Subject: [PATCH] fixes in doctype --- .../doctype/sales_invoice/sales_invoice.txt | 76 ++++---- .../doctype/sales_order/sales_order.txt | 133 ++++++-------- .../doctype/delivery_note/delivery_note.txt | 164 +++++++++--------- erpnext/stock/doctype/warehouse/warehouse.txt | 160 ++++++++--------- 4 files changed, 255 insertions(+), 278 deletions(-) diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.txt b/erpnext/accounts/doctype/sales_invoice/sales_invoice.txt index 7466d4e794..c851e75952 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.txt +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-27 14:35:47', + 'creation': '2012-04-11 13:17:25', 'docstatus': 0, - 'modified': '2012-03-27 18:44:28', + 'modified': '2012-04-13 11:26:44', 'modified_by': u'Administrator', 'owner': u'Administrator' }, @@ -13,6 +13,7 @@ # These values are common for all DocType { '_last_update': u'1330671142', + 'allow_attach': 1, 'change_log': u'1. Change in pull_details method dt.-26-06-2009', 'colour': u'White:FFF', 'default_print_format': u'Standard', @@ -26,7 +27,7 @@ 'server_code_error': u' ', 'show_in_menu': 0, 'subject': u'To %(customer_name)s worth %(currency)s %(grand_total_export)s due on %(due_date)s | %(outstanding_amount)s outstanding', - 'version': 417 + 'version': 418 }, # These values are common for all DocField @@ -54,6 +55,30 @@ 'name': u'Sales Invoice' }, + # DocPerm + { + 'amend': 0, + 'cancel': 0, + 'create': 0, + 'doctype': u'DocPerm', + 'permlevel': 1, + 'role': u'Accounts Manager', + 'submit': 0, + 'write': 0 + }, + + # DocPerm + { + 'amend': 1, + 'cancel': 1, + 'create': 1, + 'doctype': u'DocPerm', + 'permlevel': 0, + 'role': u'Accounts Manager', + 'submit': 1, + 'write': 1 + }, + # DocPerm { 'amend': 1, @@ -80,38 +105,10 @@ # 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'Accounts Manager', - 'submit': 0, - 'write': 0 - }, - - # DocPerm - { - 'amend': 1, - 'cancel': 1, - 'create': 1, - 'doctype': u'DocPerm', - 'permlevel': 0, - 'role': u'Accounts Manager', - 'submit': 1, - 'write': 1 + 'role': u'Customer' }, # DocField @@ -1503,14 +1500,13 @@ # DocField { - 'allow_on_submit': 1, 'doctype': u'DocField', - 'fieldname': u'repair_outstanding_amt', - 'fieldtype': u'Button', - 'label': u'Repair Outstanding Amt', - 'oldfieldtype': u'Button', - 'options': u'repair_rv_outstanding', + 'fieldname': u'file_list', + 'fieldtype': u'Text', + 'hidden': 1, + 'label': u'File List', + 'no_copy': 1, 'permlevel': 0, 'print_hide': 1 } -] +] \ No newline at end of file diff --git a/erpnext/selling/doctype/sales_order/sales_order.txt b/erpnext/selling/doctype/sales_order/sales_order.txt index eb17cffbe9..af3d9b5585 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-03-27 14:36:14', + 'creation': '2012-04-11 13:18:19', 'docstatus': 0, - 'modified': '2012-03-27 18:49:05', + 'modified': '2012-04-13 11:32:08', 'modified_by': u'Administrator', 'owner': u'Administrator' }, @@ -13,7 +13,7 @@ # These values are common for all DocType { '_last_update': u'1330670942', - 'allow_attach': 0, + 'allow_attach': 1, 'colour': u'White:FFF', 'default_print_format': u'Standard', 'doctype': 'DocType', @@ -30,7 +30,7 @@ 'show_in_menu': 0, 'subject': u'From %(customer_name)s on %(transaction_date)s worth %(currency)s %(grand_total_export)s | %(per_delivered)s% delivered | %(per_billed)s% billed', 'tag_fields': u'delivery_status,billing_status', - 'version': 632 + 'version': 633 }, # These values are common for all DocField @@ -58,6 +58,30 @@ '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, @@ -70,18 +94,6 @@ 'write': 1 }, - # DocPerm - { - 'amend': 1, - 'cancel': 1, - 'create': 1, - 'doctype': u'DocPerm', - 'permlevel': 0, - 'role': u'Maintenance User', - 'submit': 1, - 'write': 1 - }, - # DocPerm { 'amend': 0, @@ -89,93 +101,63 @@ 'create': 0, 'doctype': u'DocPerm', 'permlevel': 1, - 'role': u'Maintenance Manager', + 'role': u'Sales User', 'submit': 0, 'write': 0 }, # DocPerm { - 'amend': 1, - 'cancel': 1, - 'create': 1, 'doctype': u'DocPerm', + 'match': u'customer_name', 'permlevel': 0, - 'role': u'Maintenance Manager', - 'submit': 1, - 'write': 1 + 'role': u'Customer' }, # 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, + 'amend': 1, + 'cancel': 1, + 'create': 1, 'doctype': u'DocPerm', 'permlevel': 0, - 'role': u'Customer', - 'submit': 0, - 'write': 0 + 'role': u'Maintenance Manager', + 'submit': 1, + 'write': 1 }, # DocPerm { - 'amend': 0, - 'cancel': 0, - 'create': 0, 'doctype': u'DocPerm', 'permlevel': 1, - 'role': u'Sales User', - 'submit': 0, - 'write': 0 + 'role': u'Maintenance Manager' }, # DocPerm { - 'amend': 0, - 'cancel': 0, - 'create': 0, + 'amend': 1, + 'cancel': 1, + 'create': 1, 'doctype': u'DocPerm', - 'permlevel': 1, + 'permlevel': 0, 'role': u'Maintenance User', - 'submit': 0, - 'write': 0 + 'submit': 1, + 'write': 1 + }, + + # DocPerm + { + 'doctype': u'DocPerm', + 'permlevel': 1, + 'role': u'Maintenance User' }, # DocField @@ -1335,14 +1317,13 @@ # DocField { - 'allow_on_submit': 1, 'doctype': u'DocField', - 'fieldname': u'repair_sales_order', - 'fieldtype': u'Button', - 'label': u'Repair Sales Order', - 'oldfieldtype': u'Button', - 'options': u'repair_sales_order', + 'fieldname': u'file_list', + 'fieldtype': u'Text', + 'hidden': 1, + 'label': u'File List', + 'no_copy': 1, 'permlevel': 0, 'print_hide': 1 } -] +] \ No newline at end of file diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.txt b/erpnext/stock/doctype/delivery_note/delivery_note.txt index 9c536cc0f2..d29acf5442 100644 --- a/erpnext/stock/doctype/delivery_note/delivery_note.txt +++ b/erpnext/stock/doctype/delivery_note/delivery_note.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-27 14:36:28', + 'creation': '2012-04-11 13:18:36', 'docstatus': 0, - 'modified': '2012-03-27 18:50:57', + 'modified': '2012-04-13 11:02:43', 'modified_by': u'Administrator', 'owner': u'Administrator' }, @@ -13,6 +13,7 @@ # These values are common for all DocType { '_last_update': u'1330593645', + 'allow_attach': 1, 'colour': u'White:FFF', 'default_print_format': u'Standard', 'doctype': 'DocType', @@ -29,7 +30,7 @@ 'show_in_menu': 0, 'subject': u'To %(customer_name)s on %(posting_date)s | %(per_billed)s% billed', 'tag_fields': u'billing_status', - 'version': 476 + 'version': 477 }, # These values are common for all DocField @@ -57,6 +58,78 @@ 'name': u'Delivery Note' }, + # DocPerm + { + 'amend': 1, + 'cancel': 1, + 'create': 1, + 'doctype': u'DocPerm', + 'permlevel': 0, + 'role': u'Material User', + 'submit': 1, + 'write': 1 + }, + + # DocPerm + { + 'amend': 0, + 'cancel': 0, + 'create': 0, + 'doctype': u'DocPerm', + 'permlevel': 1, + 'role': u'Material User', + 'submit': 0, + 'write': 0 + }, + + # DocPerm + { + 'amend': 1, + 'cancel': 1, + 'create': 1, + 'doctype': u'DocPerm', + 'permlevel': 0, + 'role': u'Material Manager', + 'submit': 1, + 'write': 1 + }, + + # DocPerm + { + 'amend': 0, + 'cancel': 0, + 'create': 0, + 'doctype': u'DocPerm', + 'permlevel': 1, + 'role': u'Material Manager', + 'submit': 0, + 'write': 0 + }, + + # DocPerm + { + 'amend': 1, + 'cancel': 1, + 'create': 1, + 'doctype': u'DocPerm', + '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 { 'cancel': 0, @@ -75,30 +148,6 @@ 'role': u'Accounts User' }, - # DocPerm - { - 'amend': 1, - 'cancel': 1, - 'create': 1, - 'doctype': u'DocPerm', - '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', @@ -115,54 +164,6 @@ 'write': 1 }, - # DocPerm - { - 'amend': 0, - 'cancel': 0, - 'create': 0, - 'doctype': u'DocPerm', - 'permlevel': 1, - 'role': u'Material Manager', - 'submit': 0, - 'write': 0 - }, - - # DocPerm - { - 'amend': 1, - 'cancel': 1, - 'create': 1, - 'doctype': u'DocPerm', - 'permlevel': 0, - 'role': u'Material Manager', - 'submit': 1, - 'write': 1 - }, - - # DocPerm - { - 'amend': 0, - 'cancel': 0, - 'create': 0, - 'doctype': u'DocPerm', - 'permlevel': 1, - 'role': u'Material User', - 'submit': 0, - 'write': 0 - }, - - # DocPerm - { - 'amend': 1, - 'cancel': 1, - 'create': 1, - 'doctype': u'DocPerm', - 'permlevel': 0, - 'role': u'Material User', - 'submit': 1, - 'write': 1 - }, - # DocField { 'colour': u'White:FFF', @@ -1368,14 +1369,13 @@ # DocField { - 'allow_on_submit': 1, 'doctype': u'DocField', - 'fieldname': u'repair_delivery_note', - 'fieldtype': u'Button', - 'label': u'Repair Delivery Note', - 'oldfieldtype': u'Button', - 'options': u'repair_delivery_note', + 'fieldname': u'file_list', + 'fieldtype': u'Text', + 'hidden': 1, + 'label': u'File List', + 'no_copy': 1, 'permlevel': 0, 'print_hide': 1 } -] +] \ No newline at end of file diff --git a/erpnext/stock/doctype/warehouse/warehouse.txt b/erpnext/stock/doctype/warehouse/warehouse.txt index 2af4eacb0e..2deacf0f61 100644 --- a/erpnext/stock/doctype/warehouse/warehouse.txt +++ b/erpnext/stock/doctype/warehouse/warehouse.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-27 14:36:40', + 'creation': '2012-04-11 13:18:57', 'docstatus': 0, - 'modified': '2012-03-27 14:36:40', + 'modified': '2012-04-11 17:47:35', 'modified_by': u'Administrator', 'owner': u'Administrator' }, @@ -25,7 +25,7 @@ 'section_style': u'Tabbed', 'server_code_error': u' ', 'show_in_menu': 0, - 'version': 58 + 'version': 59 }, # These values are common for all DocField @@ -53,6 +53,78 @@ 'name': u'Warehouse' }, + # DocPerm + { + 'amend': 0, + 'cancel': 0, + 'create': 0, + 'doctype': u'DocPerm', + 'permlevel': 2, + 'role': u'Material User', + 'submit': 0, + 'write': 0 + }, + + # DocPerm + { + 'amend': 0, + 'cancel': 0, + 'create': 0, + 'doctype': u'DocPerm', + 'permlevel': 0, + 'role': u'Material User', + 'submit': 0, + 'write': 0 + }, + + # DocPerm + { + 'amend': 0, + 'cancel': 0, + 'create': 0, + 'doctype': u'DocPerm', + 'permlevel': 1, + 'role': u'Material User', + 'submit': 0, + 'write': 0 + }, + + # DocPerm + { + 'amend': 0, + 'cancel': 0, + 'create': 0, + 'doctype': u'DocPerm', + 'permlevel': 2, + 'role': u'Material Manager', + 'submit': 0, + 'write': 0 + }, + + # DocPerm + { + 'amend': 0, + 'cancel': 0, + 'create': 0, + 'doctype': u'DocPerm', + 'permlevel': 0, + 'role': u'Material Manager', + 'submit': 0, + 'write': 0 + }, + + # DocPerm + { + 'amend': 0, + 'cancel': 0, + 'create': 0, + 'doctype': u'DocPerm', + 'permlevel': 1, + 'role': u'Material Manager', + 'submit': 0, + 'write': 0 + }, + # DocPerm { 'doctype': u'DocPerm', @@ -81,91 +153,19 @@ # DocPerm { - 'create': 0, + 'cancel': 1, + 'create': 1, 'doctype': u'DocPerm', - 'permlevel': 2, + 'permlevel': 0, 'role': u'System Manager', 'write': 1 }, # DocPerm { - 'amend': 0, - 'cancel': 0, - 'create': 0, - 'doctype': u'DocPerm', - 'permlevel': 1, - 'role': u'Material Manager', - 'submit': 0, - 'write': 0 - }, - - # DocPerm - { - 'amend': 0, - 'cancel': 0, - 'create': 0, - 'doctype': u'DocPerm', - 'permlevel': 0, - 'role': u'Material Manager', - 'submit': 0, - 'write': 0 - }, - - # DocPerm - { - 'amend': 0, - 'cancel': 0, 'create': 0, 'doctype': u'DocPerm', 'permlevel': 2, - 'role': u'Material Manager', - 'submit': 0, - 'write': 0 - }, - - # DocPerm - { - 'amend': 0, - 'cancel': 0, - 'create': 0, - 'doctype': u'DocPerm', - 'permlevel': 1, - 'role': u'Material User', - 'submit': 0, - 'write': 0 - }, - - # DocPerm - { - 'amend': 0, - 'cancel': 0, - 'create': 0, - 'doctype': u'DocPerm', - 'permlevel': 0, - 'role': u'Material User', - 'submit': 0, - 'write': 0 - }, - - # DocPerm - { - 'amend': 0, - 'cancel': 0, - 'create': 0, - 'doctype': u'DocPerm', - 'permlevel': 2, - 'role': u'Material User', - 'submit': 0, - 'write': 0 - }, - - # DocPerm - { - 'cancel': 1, - 'create': 1, - 'doctype': u'DocPerm', - 'permlevel': 0, 'role': u'System Manager', 'write': 1 }, @@ -268,7 +268,7 @@ { 'doctype': u'DocField', 'fieldname': u'phone_no', - 'fieldtype': u'Int', + 'fieldtype': u'Data', 'label': u'Phone No', 'oldfieldname': u'phone_no', 'oldfieldtype': u'Int', @@ -280,7 +280,7 @@ { 'doctype': u'DocField', 'fieldname': u'mobile_no', - 'fieldtype': u'Int', + 'fieldtype': u'Data', 'label': u'Mobile No', 'oldfieldname': u'mobile_no', 'oldfieldtype': u'Int',