From a25ebe3dbf688d7e6a06aa97ca08d818292fe8c1 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 16 Jul 2012 16:34:28 +0530 Subject: [PATCH] Conversion rate fieldtype set as float (from currency) --- .../doctype/pos_setting/pos_setting.txt | 70 +++--- .../purchase_invoice/purchase_invoice.txt | 156 ++++++------ .../doctype/sales_invoice/sales_invoice.txt | 120 ++++----- .../doctype/purchase_order/purchase_order.txt | 197 +++++++-------- .../selling/doctype/quotation/quotation.txt | 196 +++++++-------- .../doctype/sales_order/sales_order.txt | 232 ++++++++---------- .../doctype/delivery_note/delivery_note.txt | 220 ++++++++--------- .../purchase_receipt/purchase_receipt.txt | 172 ++++++------- 8 files changed, 659 insertions(+), 704 deletions(-) diff --git a/erpnext/accounts/doctype/pos_setting/pos_setting.txt b/erpnext/accounts/doctype/pos_setting/pos_setting.txt index b1b90e6ed5..49ab1d3507 100755 --- a/erpnext/accounts/doctype/pos_setting/pos_setting.txt +++ b/erpnext/accounts/doctype/pos_setting/pos_setting.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-27 14:35:46', + 'creation': '2012-06-11 12:09:53', 'docstatus': 0, - 'modified': '2012-03-27 14:35:46', + 'modified': '2012-07-16 16:27:51', 'modified_by': u'Administrator', 'owner': u'Administrator' }, @@ -22,7 +22,7 @@ 'section_style': u'Simple', 'server_code_error': u' ', 'show_in_menu': 0, - 'version': 33 + 'version': 1 }, # These values are common for all DocField @@ -52,37 +52,6 @@ 'name': u'POS Setting' }, - # DocPerm - { - 'create': 1, - 'doctype': u'DocPerm', - 'role': u'System Manager', - 'submit': 0, - 'write': 1 - }, - - # DocPerm - { - 'create': 1, - 'doctype': u'DocPerm', - 'role': u'System Manager', - 'write': 1 - }, - - # DocPerm - { - 'create': 1, - 'doctype': u'DocPerm', - 'role': u'Accounts Manager', - 'write': 1 - }, - - # DocPerm - { - 'doctype': u'DocPerm', - 'role': u'Accounts User' - }, - # DocField { 'doctype': u'DocField', @@ -136,7 +105,7 @@ 'default': u'1', 'doctype': u'DocField', 'fieldname': u'conversion_rate', - 'fieldtype': u'Currency', + 'fieldtype': u'Float', 'label': u'Conversion Rate', 'oldfieldname': u'conversion_rate', 'oldfieldtype': u'Currency', @@ -279,5 +248,36 @@ 'oldfieldname': u'select_print_heading', 'oldfieldtype': u'Select', 'options': u'link:Print Heading' + }, + + # DocPerm + { + 'create': 1, + 'doctype': u'DocPerm', + 'role': u'System Manager', + 'submit': 0, + 'write': 1 + }, + + # DocPerm + { + 'create': 1, + 'doctype': u'DocPerm', + 'role': u'System Manager', + 'write': 1 + }, + + # DocPerm + { + 'create': 1, + 'doctype': u'DocPerm', + 'role': u'Accounts Manager', + 'write': 1 + }, + + # DocPerm + { + 'doctype': u'DocPerm', + 'role': u'Accounts User' } ] \ No newline at end of file diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.txt b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.txt index 3c2143ac72..1f0e75097d 100755 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.txt +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-04-13 11:56:17', + 'creation': '2012-06-11 12:09:53', 'docstatus': 0, - 'modified': '2012-05-10 14:02:05', + 'modified': '2012-07-16 16:26:02', 'modified_by': u'Administrator', 'owner': u'Administrator' }, @@ -54,81 +54,6 @@ 'name': u'Purchase 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': 0, - 'cancel': 0, - 'create': 0, - 'doctype': u'DocPerm', - 'permlevel': 1, - 'role': u'Accounts User', - 'submit': 0, - 'write': 0 - }, - - # DocPerm - { - 'doctype': u'DocPerm', - 'permlevel': 1, - 'role': u'Purchase User' - }, - - # DocPerm - { - 'amend': 0, - 'cancel': 0, - 'create': 1, - 'doctype': u'DocPerm', - 'permlevel': 0, - 'role': u'Purchase User', - 'submit': 0, - 'write': 1 - }, - - # DocPerm - { - 'amend': 1, - 'cancel': 1, - 'create': 1, - 'doctype': u'DocPerm', - 'permlevel': 0, - 'role': u'Accounts User', - 'submit': 1, - 'write': 1 - }, - - # DocPerm - { - 'doctype': u'DocPerm', - 'match': u'supplier', - 'permlevel': 0, - 'role': u'Supplier' - }, - # DocField { 'allow_on_submit': 0, @@ -381,7 +306,7 @@ 'description': u"The rate at which Bill Currency is converted into company's base currency", 'doctype': u'DocField', 'fieldname': u'conversion_rate', - 'fieldtype': u'Currency', + 'fieldtype': u'Float', 'label': u'Bill Conversion Rate', 'oldfieldname': u'conversion_rate', 'oldfieldtype': u'Currency', @@ -1193,5 +1118,80 @@ 'no_copy': 1, 'permlevel': 0, 'print_hide': 1 + }, + + # 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': 0, + 'cancel': 0, + 'create': 0, + 'doctype': u'DocPerm', + 'permlevel': 1, + 'role': u'Accounts User', + 'submit': 0, + 'write': 0 + }, + + # DocPerm + { + 'doctype': u'DocPerm', + 'permlevel': 1, + 'role': u'Purchase User' + }, + + # DocPerm + { + 'amend': 0, + 'cancel': 0, + 'create': 1, + 'doctype': u'DocPerm', + 'permlevel': 0, + 'role': u'Purchase User', + 'submit': 0, + 'write': 1 + }, + + # DocPerm + { + 'amend': 1, + 'cancel': 1, + 'create': 1, + 'doctype': u'DocPerm', + 'permlevel': 0, + 'role': u'Accounts User', + 'submit': 1, + 'write': 1 + }, + + # DocPerm + { + 'doctype': u'DocPerm', + 'match': u'supplier', + 'permlevel': 0, + 'role': u'Supplier' } ] \ No newline at end of file diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.txt b/erpnext/accounts/doctype/sales_invoice/sales_invoice.txt index a2b341fd4f..b1368d1bc3 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-07-05 11:04:09', + 'creation': '2012-07-13 11:57:13', 'docstatus': 0, - 'modified': '2012-07-11 12:19:49', + 'modified': '2012-07-16 16:25:11', 'modified_by': u'Administrator', 'owner': u'Administrator' }, @@ -55,62 +55,6 @@ '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, - 'cancel': 1, - 'create': 1, - 'doctype': u'DocPerm', - 'permlevel': 0, - 'role': u'Accounts User', - 'submit': 1, - 'write': 1 - }, - - # DocPerm - { - 'amend': 0, - 'cancel': 0, - 'create': 0, - 'doctype': u'DocPerm', - 'permlevel': 1, - 'role': u'Accounts User', - 'submit': 0, - 'write': 0 - }, - - # DocPerm - { - 'doctype': u'DocPerm', - 'match': u'customer', - 'permlevel': 0, - 'role': u'Customer' - }, - # DocField { 'doctype': u'DocField', @@ -508,7 +452,7 @@ 'description': u"Rate at which Price list currency is converted to customer's base currency", 'doctype': u'DocField', 'fieldname': u'plc_conversion_rate', - 'fieldtype': u'Currency', + 'fieldtype': u'Float', 'label': u'Price List Currency Conversion Rate', 'permlevel': 0, 'print_hide': 1, @@ -545,7 +489,7 @@ 'description': u"Rate at which Customer Currency is converted to customer's base currency", 'doctype': u'DocField', 'fieldname': u'conversion_rate', - 'fieldtype': u'Currency', + 'fieldtype': u'Float', 'label': u'Conversion Rate', 'oldfieldname': u'conversion_rate', 'oldfieldtype': u'Currency', @@ -1658,5 +1602,61 @@ 'no_copy': 1, 'permlevel': 0, 'print_hide': 1 + }, + + # 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, + 'cancel': 1, + 'create': 1, + 'doctype': u'DocPerm', + 'permlevel': 0, + 'role': u'Accounts User', + 'submit': 1, + 'write': 1 + }, + + # DocPerm + { + 'amend': 0, + 'cancel': 0, + 'create': 0, + 'doctype': u'DocPerm', + 'permlevel': 1, + 'role': u'Accounts User', + 'submit': 0, + 'write': 0 + }, + + # DocPerm + { + 'doctype': u'DocPerm', + 'match': u'customer', + 'permlevel': 0, + 'role': u'Customer' } ] \ No newline at end of file diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.txt b/erpnext/buying/doctype/purchase_order/purchase_order.txt index 13210f2e4d..169f662fe6 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.txt +++ b/erpnext/buying/doctype/purchase_order/purchase_order.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-05-11 12:00:15', + 'creation': '2012-06-11 12:09:56', 'docstatus': 0, - 'modified': '2012-05-11 16:59:10', + 'modified': '2012-07-16 16:25:43', 'modified_by': u'Administrator', 'owner': u'Administrator' }, @@ -56,114 +56,6 @@ 'name': u'Purchase Order' }, - # DocPerm - { - 'amend': 1, - 'cancel': 1, - 'create': 1, - 'doctype': u'DocPerm', - 'permlevel': 0, - 'role': u'Production 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': 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'Purchase Manager', - 'submit': 0, - 'write': 0 - }, - - # DocPerm - { - 'amend': 1, - 'cancel': 1, - 'create': 1, - 'doctype': u'DocPerm', - 'permlevel': 0, - 'role': u'Purchase Manager', - 'submit': 1, - 'write': 1 - }, - - # DocPerm - { - 'amend': 1, - 'cancel': 0, - 'create': 1, - 'doctype': u'DocPerm', - 'permlevel': 0, - 'role': u'Purchase User', - 'submit': 0, - 'write': 1 - }, - - # DocPerm - { - 'amend': 0, - 'cancel': 0, - 'create': 0, - 'doctype': u'DocPerm', - 'permlevel': 1, - 'role': u'All', - 'submit': 0, - 'write': 0 - }, - - # DocPerm - { - 'amend': 0, - 'cancel': 0, - 'create': 0, - 'doctype': u'DocPerm', - 'permlevel': 0, - 'role': u'Supplier', - 'submit': 0, - 'write': 0 - }, - - # DocPerm - { - 'amend': 0, - 'cancel': 0, - 'create': 0, - 'doctype': u'DocPerm', - 'permlevel': 2, - 'role': u'All', - 'submit': 0, - 'write': 1 - }, - # DocField { 'colour': u'White:FFF', @@ -428,7 +320,7 @@ 'description': u"Rate at which supplier's currency is converted to company's base currency", 'doctype': u'DocField', 'fieldname': u'conversion_rate', - 'fieldtype': u'Currency', + 'fieldtype': u'Float', 'hidden': 0, 'label': u'Conversion Rate', 'no_copy': 1, @@ -1092,5 +984,88 @@ 'no_copy': 1, 'permlevel': 0, 'print_hide': 1 + }, + + # 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': 1, + 'role': u'Purchase Manager', + 'submit': 0, + 'write': 0 + }, + + # DocPerm + { + 'amend': 1, + 'cancel': 1, + 'create': 1, + 'doctype': u'DocPerm', + 'permlevel': 0, + 'role': u'Purchase Manager', + 'submit': 1, + 'write': 1 + }, + + # DocPerm + { + 'amend': 1, + 'cancel': 1, + 'create': 1, + 'doctype': u'DocPerm', + 'permlevel': 0, + 'role': u'Purchase User', + 'submit': 1, + 'write': 1 + }, + + # DocPerm + { + 'doctype': u'DocPerm', + 'permlevel': 1, + 'role': u'All' + }, + + # DocPerm + { + 'doctype': u'DocPerm', + 'match': u'supplier', + 'permlevel': 0, + 'role': u'Supplier' + }, + + # DocPerm + { + 'doctype': u'DocPerm', + 'permlevel': 2, + 'role': u'All', + 'write': 1 } ] \ No newline at end of file diff --git a/erpnext/selling/doctype/quotation/quotation.txt b/erpnext/selling/doctype/quotation/quotation.txt index 1b34c51ebc..6a42cda637 100644 --- a/erpnext/selling/doctype/quotation/quotation.txt +++ b/erpnext/selling/doctype/quotation/quotation.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-06-08 15:33:49', + 'creation': '2012-07-05 11:04:12', 'docstatus': 0, - 'modified': '2012-06-08 16:10:44', + 'modified': '2012-07-16 16:23:50', 'modified_by': u'Administrator', 'owner': u'Administrator' }, @@ -61,100 +61,6 @@ 'name': u'Quotation' }, - # 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', - '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 - { - '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, - 'cancel': 1, - 'create': 1, - 'doctype': u'DocPerm', - 'permlevel': 0, - 'role': u'Maintenance User', - 'submit': 1, - 'write': 1 - }, - - # DocPerm - { - 'doctype': u'DocPerm', - 'permlevel': 1, - 'role': u'Maintenance User' - }, - # DocField { 'colour': u'White:FFF', @@ -547,7 +453,7 @@ 'description': u"Rate at which Price list currency is converted to company's base currency", 'doctype': u'DocField', 'fieldname': u'plc_conversion_rate', - 'fieldtype': u'Currency', + 'fieldtype': u'Float', 'label': u'Price List Currency Conversion Rate', 'permlevel': 0, 'print_hide': 1, @@ -590,7 +496,7 @@ 'description': u"Rate at which customer's currency is converted to company's base currency", 'doctype': u'DocField', 'fieldname': u'conversion_rate', - 'fieldtype': u'Currency', + 'fieldtype': u'Float', 'label': u'Conversion Rate', 'oldfieldname': u'conversion_rate', 'oldfieldtype': u'Currency', @@ -1271,5 +1177,99 @@ 'no_copy': 1, 'permlevel': 0, 'print_hide': 1 + }, + + # 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', + '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 + { + '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, + 'cancel': 1, + 'create': 1, + 'doctype': u'DocPerm', + 'permlevel': 0, + 'role': u'Maintenance User', + 'submit': 1, + 'write': 1 + }, + + # DocPerm + { + 'doctype': u'DocPerm', + 'permlevel': 1, + 'role': u'Maintenance User' } ] \ 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 ca24ce2e07..bdb61263f1 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-05-09 10:56:36', + 'creation': '2012-07-11 11:54:24', 'docstatus': 0, - 'modified': '2012-05-09 11:06:28', + 'modified': '2012-07-16 16:24:26', 'modified_by': u'Administrator', 'owner': u'Administrator' }, @@ -58,128 +58,6 @@ 'name': u'Sales Order' }, - # 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': 1, - 'cancel': 1, - 'create': 1, - 'doctype': u'DocPerm', - 'permlevel': 0, - 'role': u'Maintenance User', - 'submit': 1, - 'write': 1 - }, - - # DocPerm - { - 'amend': 0, - 'cancel': 0, - 'create': 0, - 'doctype': u'DocPerm', - 'permlevel': 1, - '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 { 'colour': u'White:FFF', @@ -588,7 +466,7 @@ 'description': u"Rate at which Price list currency is converted to company's base currency", 'doctype': u'DocField', 'fieldname': u'plc_conversion_rate', - 'fieldtype': u'Currency', + 'fieldtype': u'Float', 'label': u'Price List Currency Conversion Rate', 'permlevel': 0, 'print_hide': 1, @@ -628,7 +506,7 @@ 'description': u"Rate at which customer's currency is converted to company's base currency", 'doctype': u'DocField', 'fieldname': u'conversion_rate', - 'fieldtype': u'Currency', + 'fieldtype': u'Float', 'label': u'Conversion Rate', 'oldfieldname': u'conversion_rate', 'oldfieldtype': u'Currency', @@ -1391,5 +1269,107 @@ 'no_copy': 1, 'permlevel': 0, 'print_hide': 1 + }, + + # 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', + '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, + 'cancel': 1, + 'create': 1, + 'doctype': u'DocPerm', + 'permlevel': 0, + 'role': u'Maintenance User', + 'submit': 1, + 'write': 1 + }, + + # DocPerm + { + 'doctype': u'DocPerm', + 'permlevel': 1, + 'role': u'Maintenance User' } ] \ 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 a0c2df0e9c..2520c47992 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-06-11 12:10:09', + 'creation': '2012-07-13 11:57:15', 'docstatus': 0, - 'modified': '2012-07-11 11:56:53', + 'modified': '2012-07-16 16:24:46', 'modified_by': u'Administrator', 'owner': u'Administrator' }, @@ -58,112 +58,6 @@ '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, - 'create': 0, - 'doctype': u'DocPerm', - 'permlevel': 0, - 'role': u'Accounts User', - 'submit': 0, - 'write': 0 - }, - - # DocPerm - { - 'doctype': u'DocPerm', - 'permlevel': 1, - 'role': u'Accounts User' - }, - - # DocPerm - { - 'doctype': u'DocPerm', - 'match': u'customer_name', - 'permlevel': 0, - 'role': u'Customer' - }, - - # DocPerm - { - 'doctype': u'DocPerm', - 'permlevel': 2, - 'role': u'All', - 'write': 1 - }, - # DocField { 'colour': u'White:FFF', @@ -541,7 +435,7 @@ 'description': u"Rate at which Price list currency is converted to company's base currency", 'doctype': u'DocField', 'fieldname': u'plc_conversion_rate', - 'fieldtype': u'Currency', + 'fieldtype': u'Float', 'label': u'Price List Currency Conversion Rate', 'permlevel': 0, 'print_hide': 1, @@ -580,7 +474,7 @@ 'description': u"Rate at which customer's currency is converted to company's base currency", 'doctype': u'DocField', 'fieldname': u'conversion_rate', - 'fieldtype': u'Currency', + 'fieldtype': u'Float', 'label': u'Conversion Rate', 'no_copy': 0, 'oldfieldname': u'conversion_rate', @@ -1467,5 +1361,111 @@ 'no_copy': 1, 'permlevel': 0, 'print_hide': 1 + }, + + # 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, + 'create': 0, + 'doctype': u'DocPerm', + 'permlevel': 0, + 'role': u'Accounts User', + 'submit': 0, + 'write': 0 + }, + + # DocPerm + { + 'doctype': u'DocPerm', + 'permlevel': 1, + 'role': u'Accounts User' + }, + + # DocPerm + { + 'doctype': u'DocPerm', + 'match': u'customer_name', + 'permlevel': 0, + 'role': u'Customer' + }, + + # DocPerm + { + 'doctype': u'DocPerm', + 'permlevel': 2, + 'role': u'All', + 'write': 1 } ] \ No newline at end of file diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.txt b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.txt index ea50db25cf..af6b484013 100755 --- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.txt +++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-05-10 12:42:13', + 'creation': '2012-06-11 12:10:11', 'docstatus': 0, - 'modified': '2012-05-10 14:01:16', + 'modified': '2012-07-16 16:26:24', 'modified_by': u'Administrator', 'owner': u'Administrator' }, @@ -56,89 +56,6 @@ 'name': u'Purchase Receipt' }, - # 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 - }, - - # DocPerm - { - 'amend': 1, - 'cancel': 1, - 'create': 1, - 'doctype': u'DocPerm', - 'permlevel': 0, - 'role': u'Purchase User', - 'submit': 1, - 'write': 1 - }, - - # DocPerm - { - 'doctype': u'DocPerm', - 'permlevel': 1, - 'role': u'Purchase User' - }, - - # DocPerm - { - 'doctype': u'DocPerm', - 'match': u'supplier', - 'permlevel': 0, - 'role': u'Supplier' - }, - - # DocPerm - { - 'doctype': u'DocPerm', - 'permlevel': 2, - 'role': u'All', - 'write': 1 - }, - # DocField { 'colour': u'White:FFF', @@ -449,7 +366,7 @@ 'description': u"Rate at which supplier's currency is converted to company's base currency", 'doctype': u'DocField', 'fieldname': u'conversion_rate', - 'fieldtype': u'Currency', + 'fieldtype': u'Float', 'label': u'Conversion Rate', 'oldfieldname': u'conversion_rate', 'oldfieldtype': u'Currency', @@ -1183,5 +1100,88 @@ 'no_copy': 1, 'permlevel': 0, 'print_hide': 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 + }, + + # DocPerm + { + 'amend': 1, + 'cancel': 1, + 'create': 1, + 'doctype': u'DocPerm', + 'permlevel': 0, + 'role': u'Purchase User', + 'submit': 1, + 'write': 1 + }, + + # DocPerm + { + 'doctype': u'DocPerm', + 'permlevel': 1, + 'role': u'Purchase User' + }, + + # DocPerm + { + 'doctype': u'DocPerm', + 'match': u'supplier', + 'permlevel': 0, + 'role': u'Supplier' + }, + + # DocPerm + { + 'doctype': u'DocPerm', + 'permlevel': 2, + 'role': u'All', + 'write': 1 } ] \ No newline at end of file