diff --git a/erpnext/accounts/DocType Label/Payable Voucher/Payable Voucher.txt b/erpnext/accounts/DocType Label/Payable Voucher/Payable Voucher.txt deleted file mode 100644 index fca0efe3f47..00000000000 --- a/erpnext/accounts/DocType Label/Payable Voucher/Payable Voucher.txt +++ /dev/null @@ -1 +0,0 @@ -[{'modified_by': 'Administrator', 'name': 'Purchase Invoice', 'parent': None, 'dt_label': 'Purchase Invoice', 'creation': '2010-06-10 10:44:55', 'modified': '2010-06-10 10:44:55', 'module': 'Accounts', 'doctype': 'DocType Label', 'idx': None, 'parenttype': None, 'owner': 'Administrator', 'docstatus': 0, 'dt': 'Purchase Invoice', 'parentfield': None}] \ No newline at end of file diff --git a/erpnext/accounts/DocType Label/Receivable Voucher/Receivable Voucher.txt b/erpnext/accounts/DocType Label/Receivable Voucher/Receivable Voucher.txt deleted file mode 100644 index 80aa5d1cb0e..00000000000 --- a/erpnext/accounts/DocType Label/Receivable Voucher/Receivable Voucher.txt +++ /dev/null @@ -1 +0,0 @@ -[{'modified_by': 'Administrator', 'name': 'Sales Invoice', 'parent': None, 'dt_label': 'Sales Invoice', 'creation': '2010-06-10 10:44:40', 'modified': '2010-06-10 10:44:40', 'module': 'Accounts', 'doctype': 'DocType Label', 'idx': None, 'parenttype': None, 'owner': 'Administrator', 'docstatus': 0, 'dt': 'Sales Invoice', 'parentfield': None}] \ No newline at end of file diff --git a/erpnext/accounts/DocType Mapper/Sales Order-Sales Invoice/Sales Order-Sales Invoice.txt b/erpnext/accounts/DocType Mapper/Sales Order-Sales Invoice/Sales Order-Sales Invoice.txt index 66de9491ae1..8f9afd001af 100644 --- a/erpnext/accounts/DocType Mapper/Sales Order-Sales Invoice/Sales Order-Sales Invoice.txt +++ b/erpnext/accounts/DocType Mapper/Sales Order-Sales Invoice/Sales Order-Sales Invoice.txt @@ -5,7 +5,7 @@ { 'creation': '2012-04-02 13:38:02', 'docstatus': 0, - 'modified': '2012-04-02 13:38:02', + 'modified': '2012-04-02 13:05:04', 'modified_by': u'Administrator', 'owner': u'Administrator' }, diff --git a/erpnext/buying/DocType Label/Indent/Indent.txt b/erpnext/buying/DocType Label/Indent/Indent.txt deleted file mode 100644 index ec6d001f551..00000000000 --- a/erpnext/buying/DocType Label/Indent/Indent.txt +++ /dev/null @@ -1,26 +0,0 @@ -# DocType Label, Purchase Request -[ - - # These values are common in all dictionaries - { - 'creation': '2012-01-10 15:33:53', - 'docstatus': 0, - 'modified': '2012-01-10 15:33:53', - 'modified_by': 'Administrator', - 'owner': 'Administrator' - }, - - # These values are common for all DocType Label - { - 'doctype': 'DocType Label', - 'dt': 'Purchase Request', - 'dt_label': 'Purchase Requisition', - 'name': '__common__' - }, - - # DocType Label, Purchase Request - { - 'doctype': 'DocType Label', - 'name': 'Purchase Request' - } -] \ No newline at end of file diff --git a/erpnext/buying/Role/Purchase Manager/Purchase Manager.txt b/erpnext/buying/Role/Purchase Manager/Purchase Manager.txt deleted file mode 100644 index b02d1866f99..00000000000 --- a/erpnext/buying/Role/Purchase Manager/Purchase Manager.txt +++ /dev/null @@ -1,26 +0,0 @@ -# Role, Purchase Manager -[ - - # These values are common in all dictionaries - { - 'creation': '2010-08-08 17:08:51', - 'docstatus': 0, - 'modified': '2010-04-08 12:07:53', - 'modified_by': 'Administrator', - 'owner': 'Administrator' - }, - - # These values are common for all Role - { - 'doctype': 'Role', - 'module': 'Buying', - 'name': '__common__', - 'role_name': 'Purchase Manager' - }, - - # Role, Purchase Manager - { - 'doctype': 'Role', - 'name': 'Purchase Manager' - } -] \ No newline at end of file diff --git a/erpnext/buying/Role/Purchase Master Manager/Purchase Master Manager.txt b/erpnext/buying/Role/Purchase Master Manager/Purchase Master Manager.txt deleted file mode 100644 index 41d9f23cc1a..00000000000 --- a/erpnext/buying/Role/Purchase Master Manager/Purchase Master Manager.txt +++ /dev/null @@ -1,26 +0,0 @@ -# Role, Purchase Master Manager -[ - - # These values are common in all dictionaries - { - 'creation': '2010-08-08 17:08:51', - 'docstatus': 0, - 'modified': '2010-04-08 13:50:20', - 'modified_by': 'Administrator', - 'owner': 'Administrator' - }, - - # These values are common for all Role - { - 'doctype': 'Role', - 'module': 'Buying', - 'name': '__common__', - 'role_name': 'Purchase Master Manager' - }, - - # Role, Purchase Master Manager - { - 'doctype': 'Role', - 'name': 'Purchase Master Manager' - } -] \ No newline at end of file diff --git a/erpnext/buying/Role/Purchase User/Purchase User.txt b/erpnext/buying/Role/Purchase User/Purchase User.txt deleted file mode 100644 index 1495c84610b..00000000000 --- a/erpnext/buying/Role/Purchase User/Purchase User.txt +++ /dev/null @@ -1,26 +0,0 @@ -# Role, Purchase User -[ - - # These values are common in all dictionaries - { - 'creation': '2010-08-08 17:08:51', - 'docstatus': 0, - 'modified': '2010-04-08 12:08:01', - 'modified_by': 'Administrator', - 'owner': 'Administrator' - }, - - # These values are common for all Role - { - 'doctype': 'Role', - 'module': 'Buying', - 'name': '__common__', - 'role_name': 'Purchase User' - }, - - # Role, Purchase User - { - 'doctype': 'Role', - 'name': 'Purchase User' - } -] \ No newline at end of file diff --git a/erpnext/buying/Role/Supplier/Supplier.txt b/erpnext/buying/Role/Supplier/Supplier.txt deleted file mode 100644 index 97f4d09f198..00000000000 --- a/erpnext/buying/Role/Supplier/Supplier.txt +++ /dev/null @@ -1,26 +0,0 @@ -# Role, Supplier -[ - - # These values are common in all dictionaries - { - 'creation': '2010-08-08 17:08:51', - 'docstatus': 0, - 'modified': '2009-06-26 14:42:19', - 'modified_by': 'Administrator', - 'owner': 'Administrator' - }, - - # These values are common for all Role - { - 'doctype': 'Role', - 'module': 'Buying', - 'name': '__common__', - 'role_name': 'Supplier' - }, - - # Role, Supplier - { - 'doctype': 'Role', - 'name': 'Supplier' - } -] \ No newline at end of file diff --git a/erpnext/buying/__init__.py b/erpnext/buying/__init__.py index e69de29bb2d..8e18bc5a549 100644 --- a/erpnext/buying/__init__.py +++ b/erpnext/buying/__init__.py @@ -0,0 +1,6 @@ +install_docs = [ + {"doctype":"Role", "name":"Purchase Manager"}, + {"doctype":"Role", "name":"Purchase User"}, + {"doctype":"Role", "name":"Purchase Master Manager"}, + {"doctype":"Role", "name":"Supplier"} +] \ No newline at end of file diff --git a/erpnext/patches/jan_mar_2012/rename_dt.py b/erpnext/patches/jan_mar_2012/rename_dt.py index 06bba6cc9d5..a9a9c581b20 100644 --- a/erpnext/patches/jan_mar_2012/rename_dt.py +++ b/erpnext/patches/jan_mar_2012/rename_dt.py @@ -7,10 +7,10 @@ from webnotes.modules import reload_doc from webnotes.utils import make_esc import os -def execute(): +def execute1(): update_file_content({'Follow up': 'Communication'}) -def execute1(): +def execute(): # delete dt, mapper delete_dt_and_mapper() @@ -62,8 +62,11 @@ def execute1(): # reload custom search criteria for d in webnotes.conn.sql("""select name, module from `tabSearch Criteria` where ifnull(standard, 'No') = 'Yes' and ifnull(disabled, 0) = 0"""): - print d - reload_doc(d[1], 'search_criteria', d[0].replace('-', '_')) + try: + reload_doc(d[1], 'search_criteria', d[0].replace('-', '_')) + print d + except Exception, e: + print "did not reload: " + str(d) webnotes.conn.sql("""DELETE FROM `tabPrint Format` WHERE name IN ('Delivery Note Format', 'Purchase Order Format', @@ -74,7 +77,10 @@ def execute1(): # reload custom print format for d in webnotes.conn.sql("""select name, module from `tabPrint Format` where ifnull(standard, 'No') = 'Yes'"""): - reload_doc(d[1], 'Print Format', d[0]) + try: + reload_doc(d[1], 'Print Format', d[0]) + except Exception, e: + print "did not reload: " + str(d) # Reload GL Mapper for d in webnotes.conn.sql("select name from `tabGL Mapper`"): diff --git a/erpnext/patches/mar_2012/doctype_get_refactor.py b/erpnext/patches/mar_2012/doctype_get_refactor.py index c450e0adffb..819cd83a1ba 100644 --- a/erpnext/patches/mar_2012/doctype_get_refactor.py +++ b/erpnext/patches/mar_2012/doctype_get_refactor.py @@ -16,6 +16,9 @@ def execute(): change_to_decimal() def change_property_setter_fieldnames(): + import webnotes.model.sync + webnotes.model.sync.sync('core', 'property_setter') + docfield_list = webnotes.conn.sql("""\ SELECT name, fieldname FROM `tabDocField`""", as_list=1) custom_field_list = webnotes.conn.sql("""\ diff --git a/erpnext/patches/patch_list.py b/erpnext/patches/patch_list.py index 4caf82e15ca..db75ea4e994 100644 --- a/erpnext/patches/patch_list.py +++ b/erpnext/patches/patch_list.py @@ -212,6 +212,31 @@ patch_list = [ 'patch_file': 'pos_invoice_fix', 'description': 'Reload POS Invoice' }, + { + 'patch_module': 'patches.jan_mar_2012', + 'patch_file': 'reload_mapper', + 'description': 'SO-DN, SO-Rv, DN-RV' + }, + { + 'patch_module': 'patches.jan_mar_2012', + 'patch_file': 'mapper_fix', + 'description': 'DN-RV duplicate table entry' + }, + { + 'patch_module': 'patches.mar_2012', + 'patch_file': 'so_rv_mapper_fix', + 'description': 'SO-RV duplicate mapper entry removal' + }, + { + 'patch_module': 'patches.jan_mar_2012', + 'patch_file': 'sync_ref_db', + 'description': 'Deletes non required doctypes' + }, + { + 'patch_module': 'patches.jan_mar_2012', + 'patch_file': 'rename_dt', + 'description': 'Rename DocType Patch' + }, { 'patch_module': 'patches.mar_2012', 'patch_file': 'cleanup_control_panel', @@ -231,20 +256,5 @@ patch_list = [ 'patch_module': 'patches.mar_2012', 'patch_file': 'delete_docformat', 'description': 'Deletes DocFormat from database' - }, - { - 'patch_module': 'patches.jan_mar_2012', - 'patch_file': 'reload_mapper', - 'description': 'SO-DN, SO-Rv, DN-RV' - }, - { - 'patch_module': 'patches.jan_mar_2012', - 'patch_file': 'mapper_fix', - 'description': 'DN-RV duplicate table entry' - }, - { - 'patch_module': 'patches.mar_2012', - 'patch_file': 'so_rv_mapper_fix', - 'description': 'SO-RV duplicate mapper entry removal' - }, + } ] diff --git a/erpnext/stock/DocType Label/QA Inspection Report/QA Inspection Report.txt b/erpnext/stock/DocType Label/QA Inspection Report/QA Inspection Report.txt deleted file mode 100644 index e89caa4d4d5..00000000000 --- a/erpnext/stock/DocType Label/QA Inspection Report/QA Inspection Report.txt +++ /dev/null @@ -1 +0,0 @@ -[{'modified_by': 'Administrator', 'name': 'Quality Inspection', 'parent': None, 'dt_label': 'Quality Inspection', 'creation': '2010-06-28 12:56:06', 'modified': '2010-06-28 12:56:06', 'module': 'Accounts', 'doctype': 'DocType Label', 'idx': None, 'parenttype': None, 'owner': 'Administrator', 'docstatus': 0, 'dt': 'Quality Inspection', 'parentfield': None}] \ No newline at end of file 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 aeb5ec2e59c..bb0e53889e0 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:37:14', + 'modified': '2012-04-02 13:05:03', 'modified_by': u'Administrator', 'owner': u'Administrator' }, @@ -127,6 +127,16 @@ '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'=',