From ae4d1f973cae79684e4a57f459923d53f3aaef97 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 12 Mar 2012 14:34:55 +0530 Subject: [PATCH] modules cleanup --- .../Discount_purchase_cycle.py | 2 +- .../before_jan_2012/accounts_default_form.py | 2 +- .../patches/before_jan_2012/auto_indent.py | 2 +- .../patches/before_jan_2012/c_form_patch.py | 2 +- .../before_jan_2012/deploy_email_digest.py | 2 +- .../employeewise_balance_leave_report.py | 2 +- .../erpnext_structure_cleanup.py | 2 +- .../before_jan_2012/install_print_formats.py | 2 +- erpnext/patches/before_jan_2012/lcw_patch.py | 2 +- .../patches/before_jan_2012/packing_slip.py | 2 +- .../before_jan_2012/price_list_patch.py | 2 +- .../patches/before_jan_2012/project_patch.py | 2 +- .../patches/before_jan_2012/reload_address.py | 2 +- erpnext/patches/before_jan_2012/reload_bom.py | 2 +- .../before_jan_2012/reload_doclayer.py | 2 +- .../before_jan_2012/reload_email_digest.py | 2 +- ...eload_employeewise_balance_leave_report.py | 2 +- .../before_jan_2012/reload_flat_bom.py | 2 +- .../before_jan_2012/reload_gl_mapper.py | 2 +- .../before_jan_2012/reload_lc_wizard.py | 2 +- .../before_jan_2012/reload_print_format.py | 2 +- .../before_jan_2012/reload_project_task.py | 2 +- .../patches/before_jan_2012/reload_reco.py | 2 +- erpnext/patches/before_jan_2012/reload_rv.py | 2 +- .../before_jan_2012/reload_support_ticket.py | 2 +- .../patches/before_jan_2012/sal_man_patch.py | 2 +- .../task_email_notification.py | 2 +- .../jan_mar_2012/allocated_to_profile.py | 2 +- .../patches/jan_mar_2012/apps/todo_item.py | 2 +- .../customer_address_contact_patch.py | 2 +- .../jan_mar_2012/deploy_packing_slip.py | 2 +- .../jan_mar_2012/doclabel_in_doclayer.py | 2 +- erpnext/patches/jan_mar_2012/dt_map_fix.py | 2 +- .../jan_mar_2012/email_settings_reload.py | 2 +- .../jan_mar_2012/jan_production_patches.py | 2 +- erpnext/patches/jan_mar_2012/label_cleanup.py | 2 +- .../patches/jan_mar_2012/pending_patches.py | 2 +- .../jan_mar_2012/production_cleanup.py | 2 +- .../patches/jan_mar_2012/reload_doctype.py | 2 +- erpnext/patches/jan_mar_2012/reload_item.py | 2 +- .../jan_mar_2012/reload_po_pr_mapper.py | 2 +- erpnext/patches/jan_mar_2012/reload_table.py | 2 +- .../jan_mar_2012/remove_get_tds_button.py | 2 +- .../jan_mar_2012/rename_doctype_indent.py | 2 +- .../patches/jan_mar_2012/serial_no_add_opt.py | 2 +- .../stable_branch_shift_09_01_12.py | 2 +- .../jan_mar_2012/website/domain_list.py | 2 +- .../patches/old_patches/customer_address.py | 6 +- .../old_patches/doctype_permission_patch.py | 2 +- erpnext/patches/old_patches/feed_patch.py | 2 +- erpnext/patches/old_patches/patch_1.py | 6 +- erpnext/patches/patch.py | 6 +- erpnext/projects/doctype/project/project.txt | 626 +++++++++--------- js/all-app.js | 5 +- js/all-web.js | 5 +- version.num | 2 +- 56 files changed, 369 insertions(+), 385 deletions(-) diff --git a/erpnext/patches/before_jan_2012/Discount_purchase_cycle.py b/erpnext/patches/before_jan_2012/Discount_purchase_cycle.py index 8fee8c5cf6d..9f0a5c0cee7 100644 --- a/erpnext/patches/before_jan_2012/Discount_purchase_cycle.py +++ b/erpnext/patches/before_jan_2012/Discount_purchase_cycle.py @@ -16,7 +16,7 @@ def execute(): import webnotes - from webnotes.modules.module_manager import reload_doc + from webnotes.modules import reload_doc reload_doc('accounts', 'doctype', 'pv_detail') reload_doc('buying', 'doctype', 'po_detail') diff --git a/erpnext/patches/before_jan_2012/accounts_default_form.py b/erpnext/patches/before_jan_2012/accounts_default_form.py index 282ebf573be..eb8f58699e0 100644 --- a/erpnext/patches/before_jan_2012/accounts_default_form.py +++ b/erpnext/patches/before_jan_2012/accounts_default_form.py @@ -16,7 +16,7 @@ def execute(): import webnotes - from webnotes.modules.module_manager import reload_doc + from webnotes.modules import reload_doc reload_doc('setup', 'doctype', 'company') reload_doc('setup', 'doctype', 'manage_account') diff --git a/erpnext/patches/before_jan_2012/auto_indent.py b/erpnext/patches/before_jan_2012/auto_indent.py index 7373c39bc6e..a472d80562f 100644 --- a/erpnext/patches/before_jan_2012/auto_indent.py +++ b/erpnext/patches/before_jan_2012/auto_indent.py @@ -16,7 +16,7 @@ def execute(): import webnotes - from webnotes.modules.module_manager import reload_doc + from webnotes.modules import reload_doc reload_doc('setup', 'doctype', 'manage_account') reload_doc('stock', 'doctype', 'item') webnotes.conn.sql("delete from `tabDocField` where fieldname='minimum_inventory_level' and parent='item'") diff --git a/erpnext/patches/before_jan_2012/c_form_patch.py b/erpnext/patches/before_jan_2012/c_form_patch.py index 8c00891964b..307dabc4d2e 100644 --- a/erpnext/patches/before_jan_2012/c_form_patch.py +++ b/erpnext/patches/before_jan_2012/c_form_patch.py @@ -16,7 +16,7 @@ def execute(): import webnotes - from webnotes.modules.module_manager import reload_doc + from webnotes.modules import reload_doc reload_doc('accounts', 'doctype', 'receivable_voucher') reload_doc('accounts', 'doctype', 'c_form') diff --git a/erpnext/patches/before_jan_2012/deploy_email_digest.py b/erpnext/patches/before_jan_2012/deploy_email_digest.py index 5adeb971426..8474b640dcd 100644 --- a/erpnext/patches/before_jan_2012/deploy_email_digest.py +++ b/erpnext/patches/before_jan_2012/deploy_email_digest.py @@ -21,7 +21,7 @@ def execute(): * Reload email_digest doctype * Create default email digest """ - from webnotes.modules.module_manager import reload_doc + from webnotes.modules import reload_doc # Minor fix in print_format doctype #reload_doc('core', 'doctype', 'print_format') diff --git a/erpnext/patches/before_jan_2012/employeewise_balance_leave_report.py b/erpnext/patches/before_jan_2012/employeewise_balance_leave_report.py index bab119e16f2..83f2143a9ca 100644 --- a/erpnext/patches/before_jan_2012/employeewise_balance_leave_report.py +++ b/erpnext/patches/before_jan_2012/employeewise_balance_leave_report.py @@ -22,7 +22,7 @@ """ def execute(): from webnotes.model.doc import Document - from webnotes.modules.module_manager import reload_doc + from webnotes.modules import reload_doc reload_doc('hr', 'search_criteria', 'employeewise_balance_leave_report') d = Document('Search Criteria', 'employeewise_balance_leave_report') d.criteria_name = 'Employee Leave Balance Report' diff --git a/erpnext/patches/before_jan_2012/erpnext_structure_cleanup.py b/erpnext/patches/before_jan_2012/erpnext_structure_cleanup.py index aab64a06555..a9dcd751c22 100644 --- a/erpnext/patches/before_jan_2012/erpnext_structure_cleanup.py +++ b/erpnext/patches/before_jan_2012/erpnext_structure_cleanup.py @@ -19,7 +19,7 @@ import webnotes from webnotes.model import delete_doc -from webnotes.modules.module_manager import reload_doc +from webnotes.modules import reload_doc from webnotes.modules.export_module import export_to_files sql = webnotes.conn.sql diff --git a/erpnext/patches/before_jan_2012/install_print_formats.py b/erpnext/patches/before_jan_2012/install_print_formats.py index 3a18aae43d3..ab0067c99dc 100644 --- a/erpnext/patches/before_jan_2012/install_print_formats.py +++ b/erpnext/patches/before_jan_2012/install_print_formats.py @@ -68,7 +68,7 @@ def execute(): """ Install print formats """ - from webnotes.modules.module_manager import reload_doc + from webnotes.modules import reload_doc reload_doc('core', 'doctype', 'print_format') #copy_doctype_to_pfs() diff --git a/erpnext/patches/before_jan_2012/lcw_patch.py b/erpnext/patches/before_jan_2012/lcw_patch.py index b274069149c..27e9a56f978 100644 --- a/erpnext/patches/before_jan_2012/lcw_patch.py +++ b/erpnext/patches/before_jan_2012/lcw_patch.py @@ -16,7 +16,7 @@ def execute(): import webnotes - from webnotes.modules.module_manager import reload_doc + from webnotes.modules import reload_doc reload_doc('stock', 'doctype', 'landed_cost_wizard') diff --git a/erpnext/patches/before_jan_2012/packing_slip.py b/erpnext/patches/before_jan_2012/packing_slip.py index 23c34d9d313..7fe2d5d44f0 100644 --- a/erpnext/patches/before_jan_2012/packing_slip.py +++ b/erpnext/patches/before_jan_2012/packing_slip.py @@ -16,7 +16,7 @@ def execute(): import webnotes - from webnotes.modules.module_manager import reload_doc + from webnotes.modules import reload_doc reload_doc('stock', 'doctype', 'delivery_note_detail') reload_doc('stock', 'Print Format', 'Delivery Note Packing List Wise') diff --git a/erpnext/patches/before_jan_2012/price_list_patch.py b/erpnext/patches/before_jan_2012/price_list_patch.py index ce2ff4a3e13..6cd3f9bfb35 100644 --- a/erpnext/patches/before_jan_2012/price_list_patch.py +++ b/erpnext/patches/before_jan_2012/price_list_patch.py @@ -16,7 +16,7 @@ def execute(): import webnotes - from webnotes.modules.module_manager import reload_doc + from webnotes.modules import reload_doc reload_doc('accounts', 'doctype', 'receivable_voucher') reload_doc('stock', 'doctype', 'delivery_note') diff --git a/erpnext/patches/before_jan_2012/project_patch.py b/erpnext/patches/before_jan_2012/project_patch.py index f4b0ea6d7c8..df0e1e93be2 100644 --- a/erpnext/patches/before_jan_2012/project_patch.py +++ b/erpnext/patches/before_jan_2012/project_patch.py @@ -16,7 +16,7 @@ def execute(): import webnotes - from webnotes.modules.module_manager import reload_doc + from webnotes.modules import reload_doc sql = webnotes.conn.sql # Reload item table diff --git a/erpnext/patches/before_jan_2012/reload_address.py b/erpnext/patches/before_jan_2012/reload_address.py index 3ef80d8de6a..ae68f6f4933 100644 --- a/erpnext/patches/before_jan_2012/reload_address.py +++ b/erpnext/patches/before_jan_2012/reload_address.py @@ -16,6 +16,6 @@ def execute(): import webnotes - from webnotes.modules.module_manager import reload_doc + from webnotes.modules import reload_doc reload_doc('utilities', 'doctype', 'address') diff --git a/erpnext/patches/before_jan_2012/reload_bom.py b/erpnext/patches/before_jan_2012/reload_bom.py index f925bc62120..cbacce1c4b8 100644 --- a/erpnext/patches/before_jan_2012/reload_bom.py +++ b/erpnext/patches/before_jan_2012/reload_bom.py @@ -16,6 +16,6 @@ def execute(): import webnotes - from webnotes.modules.module_manager import reload_doc + from webnotes.modules import reload_doc reload_doc('production', 'doctype', 'bill_of_materials') diff --git a/erpnext/patches/before_jan_2012/reload_doclayer.py b/erpnext/patches/before_jan_2012/reload_doclayer.py index 4ab077ede56..2c6e23e0a12 100644 --- a/erpnext/patches/before_jan_2012/reload_doclayer.py +++ b/erpnext/patches/before_jan_2012/reload_doclayer.py @@ -18,7 +18,7 @@ Reload DocLayer, DocLayerField and Print Format doctypes """ def execute(): - from webnotes.modules.module_manager import reload_doc + from webnotes.modules import reload_doc reload_doc('core', 'doctype', 'print_format') reload_doc('core', 'doctype', 'doclayer') reload_doc('core', 'doctype', 'doclayerfield') diff --git a/erpnext/patches/before_jan_2012/reload_email_digest.py b/erpnext/patches/before_jan_2012/reload_email_digest.py index 13a2614dc14..15cbfc32261 100644 --- a/erpnext/patches/before_jan_2012/reload_email_digest.py +++ b/erpnext/patches/before_jan_2012/reload_email_digest.py @@ -15,5 +15,5 @@ # along with this program. If not, see . def execute(): - from webnotes.modules.module_manager import reload_doc + from webnotes.modules import reload_doc reload_doc('Setup', 'DocType', 'Email Digest') diff --git a/erpnext/patches/before_jan_2012/reload_employeewise_balance_leave_report.py b/erpnext/patches/before_jan_2012/reload_employeewise_balance_leave_report.py index b60d3d4a0ae..53183cb1343 100644 --- a/erpnext/patches/before_jan_2012/reload_employeewise_balance_leave_report.py +++ b/erpnext/patches/before_jan_2012/reload_employeewise_balance_leave_report.py @@ -16,5 +16,5 @@ def execute(): import webnotes - from webnotes.modules.module_manager import reload_doc + from webnotes.modules import reload_doc reload_doc('hr', 'search_criteria', 'employeewise_balance_leave_report') diff --git a/erpnext/patches/before_jan_2012/reload_flat_bom.py b/erpnext/patches/before_jan_2012/reload_flat_bom.py index a46ad5e8dc1..020bd7e5c6f 100644 --- a/erpnext/patches/before_jan_2012/reload_flat_bom.py +++ b/erpnext/patches/before_jan_2012/reload_flat_bom.py @@ -16,7 +16,7 @@ def execute(): from webnotes.modules import webnotes - from webnotes.modules.module_manager import reload_doc + from webnotes.modules import reload_doc reload_doc('production', 'doctype', 'flat_bom_detail') reload_doc('production', 'doctype', 'bom_material') diff --git a/erpnext/patches/before_jan_2012/reload_gl_mapper.py b/erpnext/patches/before_jan_2012/reload_gl_mapper.py index 27f2c585606..c43ab67081f 100644 --- a/erpnext/patches/before_jan_2012/reload_gl_mapper.py +++ b/erpnext/patches/before_jan_2012/reload_gl_mapper.py @@ -16,7 +16,7 @@ def execute(): import webnotes - from webnotes.modules.module_manager import reload_doc + from webnotes.modules import reload_doc # reload jv gl mapper reload_doc('accounts', 'GL Mapper', 'Journal Voucher') diff --git a/erpnext/patches/before_jan_2012/reload_lc_wizard.py b/erpnext/patches/before_jan_2012/reload_lc_wizard.py index 7645419252e..e3df031c657 100644 --- a/erpnext/patches/before_jan_2012/reload_lc_wizard.py +++ b/erpnext/patches/before_jan_2012/reload_lc_wizard.py @@ -16,7 +16,7 @@ def execute(): import webnotes - from webnotes.modules.module_manager import reload_doc + from webnotes.modules import reload_doc from webnotes.model import delete_doc delete_doc('DocType', 'Landed Cost Wizard') diff --git a/erpnext/patches/before_jan_2012/reload_print_format.py b/erpnext/patches/before_jan_2012/reload_print_format.py index 37b83a6d21c..9948beb24f1 100644 --- a/erpnext/patches/before_jan_2012/reload_print_format.py +++ b/erpnext/patches/before_jan_2012/reload_print_format.py @@ -16,7 +16,7 @@ def execute(): import webnotes - from webnotes.modules.module_manager import reload_doc + from webnotes.modules import reload_doc from webnotes.model.doc import addchild from webnotes.model.code import get_obj reload_doc('stock', 'Print Format', 'Delivery Note Packing List Wise') diff --git a/erpnext/patches/before_jan_2012/reload_project_task.py b/erpnext/patches/before_jan_2012/reload_project_task.py index 14d39fd6ba5..f17460371b5 100644 --- a/erpnext/patches/before_jan_2012/reload_project_task.py +++ b/erpnext/patches/before_jan_2012/reload_project_task.py @@ -18,6 +18,6 @@ Reload Task Doctype of Project Module """ def execute(): - from webnotes.modules.module_manager import reload_doc + from webnotes.modules import reload_doc reload_doc('Projects', 'DocType', 'Ticket') diff --git a/erpnext/patches/before_jan_2012/reload_reco.py b/erpnext/patches/before_jan_2012/reload_reco.py index 93359920b34..782fc7fb822 100644 --- a/erpnext/patches/before_jan_2012/reload_reco.py +++ b/erpnext/patches/before_jan_2012/reload_reco.py @@ -16,7 +16,7 @@ def execute(): import webnotes - from webnotes.modules.module_manager import reload_doc + from webnotes.modules import reload_doc reload_doc('stock', 'doctype', 'stock_reconciliation') webnotes.conn.sql("delete from `tabDocField` where (label in ('Validate Data', 'Attachment HTML', 'Attachment') or fieldname in ('next_step', 'company', 'fiscal_year', 'amendment_date')) and parent = 'Stock Reconciliation'") diff --git a/erpnext/patches/before_jan_2012/reload_rv.py b/erpnext/patches/before_jan_2012/reload_rv.py index f41db4971b0..43655636f4e 100644 --- a/erpnext/patches/before_jan_2012/reload_rv.py +++ b/erpnext/patches/before_jan_2012/reload_rv.py @@ -16,7 +16,7 @@ def execute(): import webnotes - from webnotes.modules.module_manager import reload_doc + from webnotes.modules import reload_doc from webnotes.model.code import get_obj reload_doc('accounts', 'doctype', 'receivable_voucher') diff --git a/erpnext/patches/before_jan_2012/reload_support_ticket.py b/erpnext/patches/before_jan_2012/reload_support_ticket.py index 803754fba69..f889687ab43 100644 --- a/erpnext/patches/before_jan_2012/reload_support_ticket.py +++ b/erpnext/patches/before_jan_2012/reload_support_ticket.py @@ -16,7 +16,7 @@ def execute(): import webnotes - from webnotes.modules.module_manager import reload_doc + from webnotes.modules import reload_doc reload_doc('Support', 'DocType', 'Support Ticket') from webnotes.model.code import get_obj get_obj('DocType', 'Support Ticket').validate() diff --git a/erpnext/patches/before_jan_2012/sal_man_patch.py b/erpnext/patches/before_jan_2012/sal_man_patch.py index b8f53017d9b..626d2e3803f 100644 --- a/erpnext/patches/before_jan_2012/sal_man_patch.py +++ b/erpnext/patches/before_jan_2012/sal_man_patch.py @@ -17,7 +17,7 @@ def execute(): import webnotes - from webnotes.modules.module_manager import reload_doc + from webnotes.modules import reload_doc sql = webnotes.conn.sql reload_doc('hr', 'doctype', 'salary_manager') diff --git a/erpnext/patches/before_jan_2012/task_email_notification.py b/erpnext/patches/before_jan_2012/task_email_notification.py index 8d1a078d5fd..9f7669ad020 100644 --- a/erpnext/patches/before_jan_2012/task_email_notification.py +++ b/erpnext/patches/before_jan_2012/task_email_notification.py @@ -16,5 +16,5 @@ def execute(): import webnotes - from webnotes.modules.module_manager import reload_doc + from webnotes.modules import reload_doc reload_doc('projects', 'doctype', 'ticket') diff --git a/erpnext/patches/jan_mar_2012/allocated_to_profile.py b/erpnext/patches/jan_mar_2012/allocated_to_profile.py index 32c7a2c2e29..ef0ee978fbe 100644 --- a/erpnext/patches/jan_mar_2012/allocated_to_profile.py +++ b/erpnext/patches/jan_mar_2012/allocated_to_profile.py @@ -32,5 +32,5 @@ def execute(): AND label='Make Maintenance Visit' """) - from webnotes.modules.module_manager import reload_doc + from webnotes.modules import reload_doc reload_doc('support', 'doctype', 'customer_issue') diff --git a/erpnext/patches/jan_mar_2012/apps/todo_item.py b/erpnext/patches/jan_mar_2012/apps/todo_item.py index 6eec6fd624e..bbef2324443 100644 --- a/erpnext/patches/jan_mar_2012/apps/todo_item.py +++ b/erpnext/patches/jan_mar_2012/apps/todo_item.py @@ -18,5 +18,5 @@ def execute(): """ * Reload ToDo Item """ - from webnotes.modules.module_manager import reload_doc + from webnotes.modules import reload_doc reload_doc('utilities', 'doctype', 'todo_item') diff --git a/erpnext/patches/jan_mar_2012/customer_address_contact_patch.py b/erpnext/patches/jan_mar_2012/customer_address_contact_patch.py index 4671143a3a5..32a21251434 100644 --- a/erpnext/patches/jan_mar_2012/customer_address_contact_patch.py +++ b/erpnext/patches/jan_mar_2012/customer_address_contact_patch.py @@ -26,7 +26,7 @@ def execute(): patch_primary_address() def reload_sc(): - from webnotes.modules.module_manager import reload_doc + from webnotes.modules import reload_doc reload_doc('selling', 'search_criteria', 'customer_address_contact') reload_doc('selling', 'Module Def', 'Selling') diff --git a/erpnext/patches/jan_mar_2012/deploy_packing_slip.py b/erpnext/patches/jan_mar_2012/deploy_packing_slip.py index 7a28ef81119..653ff584342 100644 --- a/erpnext/patches/jan_mar_2012/deploy_packing_slip.py +++ b/erpnext/patches/jan_mar_2012/deploy_packing_slip.py @@ -15,7 +15,7 @@ # along with this program. If not, see . import webnotes -from webnotes.modules.module_manager import reload_doc +from webnotes.modules import reload_doc def execute(): delete_fields_dn_detail() diff --git a/erpnext/patches/jan_mar_2012/doclabel_in_doclayer.py b/erpnext/patches/jan_mar_2012/doclabel_in_doclayer.py index a6f7a7c3229..0b6f405ab4c 100644 --- a/erpnext/patches/jan_mar_2012/doclabel_in_doclayer.py +++ b/erpnext/patches/jan_mar_2012/doclabel_in_doclayer.py @@ -24,5 +24,5 @@ def execute(): UPDATE `tabDocField` SET options=NULL WHERE parent='DocLayer' AND fieldname='doc_type' """) - from webnotes.modules.module_manager import reload_doc + from webnotes.modules import reload_doc reload_doc('core', 'doctype', 'doclayer') diff --git a/erpnext/patches/jan_mar_2012/dt_map_fix.py b/erpnext/patches/jan_mar_2012/dt_map_fix.py index f6690097869..37732dfa5bf 100644 --- a/erpnext/patches/jan_mar_2012/dt_map_fix.py +++ b/erpnext/patches/jan_mar_2012/dt_map_fix.py @@ -1,6 +1,6 @@ def execute(): import webnotes - from webnotes.modules.module_manager import reload_doc + from webnotes.modules import reload_doc webnotes.conn.sql("delete from `tabField Mapper Detail` where from_field = 'transaction_date' and parent in ('Sales Order-Delivery Note', 'Purchase Order-Purchase Receipt')") reload_doc('stock', 'DocType Mapper', 'Sales Order-Delivery Note') diff --git a/erpnext/patches/jan_mar_2012/email_settings_reload.py b/erpnext/patches/jan_mar_2012/email_settings_reload.py index ec6f05d3044..85c683e1f8f 100644 --- a/erpnext/patches/jan_mar_2012/email_settings_reload.py +++ b/erpnext/patches/jan_mar_2012/email_settings_reload.py @@ -25,5 +25,5 @@ def execute(): WHERE parent = 'Email Settings' AND fieldname = 'mail_port' """) - from webnotes.modules.module_manager import reload_doc + from webnotes.modules import reload_doc reload_doc('setup', 'doctype', 'email_settings') diff --git a/erpnext/patches/jan_mar_2012/jan_production_patches.py b/erpnext/patches/jan_mar_2012/jan_production_patches.py index d57fb9edce8..479cecb845a 100644 --- a/erpnext/patches/jan_mar_2012/jan_production_patches.py +++ b/erpnext/patches/jan_mar_2012/jan_production_patches.py @@ -20,7 +20,7 @@ def execute(): Patch includes: * Reload of Stock Entry Detail """ - from webnotes.modules.module_manager import reload_doc + from webnotes.modules import reload_doc reload_doc('stock', 'doctype', 'stock_entry_detail') reload_doc('stock', 'doctype', 'item_supplier') diff --git a/erpnext/patches/jan_mar_2012/label_cleanup.py b/erpnext/patches/jan_mar_2012/label_cleanup.py index b40f36f8555..f158495a428 100644 --- a/erpnext/patches/jan_mar_2012/label_cleanup.py +++ b/erpnext/patches/jan_mar_2012/label_cleanup.py @@ -1,7 +1,7 @@ def execute(): import webnotes from webnotes.model import delete_doc - from webnotes.modules.module_manager import reload_doc + from webnotes.modules import reload_doc dt = { 'selling': ['quotation', 'sales_order', 'quotation_detail', 'sales_order_detail'], diff --git a/erpnext/patches/jan_mar_2012/pending_patches.py b/erpnext/patches/jan_mar_2012/pending_patches.py index 351200f88ce..821a411cdf7 100644 --- a/erpnext/patches/jan_mar_2012/pending_patches.py +++ b/erpnext/patches/jan_mar_2012/pending_patches.py @@ -17,7 +17,7 @@ def execute(): import webnotes from webnotes.model.code import get_obj - from webnotes.modules.module_manager import reload_doc + from webnotes.modules import reload_doc sql = webnotes.conn.sql reload_doc('hr', 'doctype', 'appraisal') diff --git a/erpnext/patches/jan_mar_2012/production_cleanup.py b/erpnext/patches/jan_mar_2012/production_cleanup.py index d0a5879b099..e715f273115 100644 --- a/erpnext/patches/jan_mar_2012/production_cleanup.py +++ b/erpnext/patches/jan_mar_2012/production_cleanup.py @@ -16,7 +16,7 @@ def execute(): import webnotes - from webnotes.modules.module_manager import reload_doc + from webnotes.modules import reload_doc from webnotes.model import delete_doc sql = webnotes.conn.sql diff --git a/erpnext/patches/jan_mar_2012/reload_doctype.py b/erpnext/patches/jan_mar_2012/reload_doctype.py index 51241b83c98..957864b0d41 100644 --- a/erpnext/patches/jan_mar_2012/reload_doctype.py +++ b/erpnext/patches/jan_mar_2012/reload_doctype.py @@ -16,5 +16,5 @@ def execute(): import webnotes - from webnotes.modules.module_manager import reload_doc + from webnotes.modules import reload_doc reload_doc('core', 'doctype', 'doctype') diff --git a/erpnext/patches/jan_mar_2012/reload_item.py b/erpnext/patches/jan_mar_2012/reload_item.py index c45b8187c9a..e42b50b376b 100644 --- a/erpnext/patches/jan_mar_2012/reload_item.py +++ b/erpnext/patches/jan_mar_2012/reload_item.py @@ -16,7 +16,7 @@ def execute(): import webnotes - from webnotes.modules.module_manager import reload_doc + from webnotes.modules import reload_doc reload_doc('stock', 'doctype', 'item') webnotes.conn.sql("update `tabItem` set re_order_qty = min_order_qty") diff --git a/erpnext/patches/jan_mar_2012/reload_po_pr_mapper.py b/erpnext/patches/jan_mar_2012/reload_po_pr_mapper.py index 4ed252b84d7..58664294ddd 100644 --- a/erpnext/patches/jan_mar_2012/reload_po_pr_mapper.py +++ b/erpnext/patches/jan_mar_2012/reload_po_pr_mapper.py @@ -16,5 +16,5 @@ def execute(): import webnotes - from webnotes.modules.module_manager import reload_doc + from webnotes.modules import reload_doc reload_doc('stock', 'DocType Mapper', 'Purchase Order-Purchase Receipt') diff --git a/erpnext/patches/jan_mar_2012/reload_table.py b/erpnext/patches/jan_mar_2012/reload_table.py index 481b46f7a57..28a597bc615 100644 --- a/erpnext/patches/jan_mar_2012/reload_table.py +++ b/erpnext/patches/jan_mar_2012/reload_table.py @@ -1,6 +1,6 @@ def execute(): import webnotes - from webnotes.modules.module_manager import reload_doc + from webnotes.modules import reload_doc reload_doc('selling', 'doctype', 'quotation_detail') reload_doc('selling', 'doctype', 'sales_order_detail') reload_doc('stock', 'doctype', 'delivery_note_detail') diff --git a/erpnext/patches/jan_mar_2012/remove_get_tds_button.py b/erpnext/patches/jan_mar_2012/remove_get_tds_button.py index fe804c0a170..8549e0d3350 100644 --- a/erpnext/patches/jan_mar_2012/remove_get_tds_button.py +++ b/erpnext/patches/jan_mar_2012/remove_get_tds_button.py @@ -26,5 +26,5 @@ def execute(): AND fieldtype='Button' """) - from webnotes.modules.module_manager import reload_doc + from webnotes.modules import reload_doc reload_doc('accounts', 'doctype', 'journal_voucher') diff --git a/erpnext/patches/jan_mar_2012/rename_doctype_indent.py b/erpnext/patches/jan_mar_2012/rename_doctype_indent.py index 01aeebfb2f1..4e026f720ed 100644 --- a/erpnext/patches/jan_mar_2012/rename_doctype_indent.py +++ b/erpnext/patches/jan_mar_2012/rename_doctype_indent.py @@ -47,7 +47,7 @@ def reload_related_doctype(): * purchase_order * po_detail """ - from webnotes.modules.module_manager import reload_doc + from webnotes.modules import reload_doc reload_doc('buying', 'doctype', 'indent') reload_doc('buying', 'doctype', 'purchase_order') reload_doc('buying', 'doctype', 'po_detail') diff --git a/erpnext/patches/jan_mar_2012/serial_no_add_opt.py b/erpnext/patches/jan_mar_2012/serial_no_add_opt.py index 947c28d2d6d..ec45c278b95 100644 --- a/erpnext/patches/jan_mar_2012/serial_no_add_opt.py +++ b/erpnext/patches/jan_mar_2012/serial_no_add_opt.py @@ -30,5 +30,5 @@ def execute(): webnotes.conn.commit() webnotes.conn.begin() - from webnotes.modules.module_manager import reload_doc + from webnotes.modules import reload_doc reload_doc('stock', 'doctype', 'serial_no') diff --git a/erpnext/patches/jan_mar_2012/stable_branch_shift_09_01_12.py b/erpnext/patches/jan_mar_2012/stable_branch_shift_09_01_12.py index e4078aa455c..d155107aa6a 100644 --- a/erpnext/patches/jan_mar_2012/stable_branch_shift_09_01_12.py +++ b/erpnext/patches/jan_mar_2012/stable_branch_shift_09_01_12.py @@ -15,7 +15,7 @@ # along with this program. If not, see . import webnotes -from webnotes.modules.module_manager import reload_doc +from webnotes.modules import reload_doc def execute(): """ diff --git a/erpnext/patches/jan_mar_2012/website/domain_list.py b/erpnext/patches/jan_mar_2012/website/domain_list.py index 25f50e2fb7d..26824a4aec6 100644 --- a/erpnext/patches/jan_mar_2012/website/domain_list.py +++ b/erpnext/patches/jan_mar_2012/website/domain_list.py @@ -16,7 +16,7 @@ def execute(): import webnotes - from webnotes.modules.module_manager import reload_doc + from webnotes.modules import reload_doc reload_doc('website', 'doctype', 'website_settings') res = webnotes.conn.sql("""\ diff --git a/erpnext/patches/old_patches/customer_address.py b/erpnext/patches/old_patches/customer_address.py index 44568ce3d91..4757c023fd4 100644 --- a/erpnext/patches/old_patches/customer_address.py +++ b/erpnext/patches/old_patches/customer_address.py @@ -21,7 +21,7 @@ from webnotes.utils import load_json, cint, cstr from webnotes import msgprint, errprint def make_address(): - from webnotes.modules.module_manager import reload_doc + from webnotes.modules import reload_doc reload_doc('utilities','doctype','address') from webnotes.model.db_schema import updatedb @@ -128,7 +128,7 @@ def delete_unwanted_fields(): # export_to_files(record_list=[['DocType',dt]]) def reload_doc_files(): - from webnotes.modules.module_manager import reload_doc + from webnotes.modules import reload_doc reload_doc('utilities', 'doctype', 'contact') reload_doc('selling', 'doctype', 'customer') reload_doc('support', 'doctype', 'customer_issue') @@ -149,7 +149,7 @@ def reload_doc_files(): reload_doc('buying', 'doctype', 'supplier') def reload_mapper_files(): - from webnotes.modules.module_manager import reload_doc + from webnotes.modules import reload_doc reload_doc('Mapper', 'DocType Mapper', 'Customer Issue-Maintenance Visit') reload_doc('Mapper', 'DocType Mapper', 'Delivery Note-Installation Note') reload_doc('Mapper', 'DocType Mapper', 'Delivery Note-Receivable Voucher') diff --git a/erpnext/patches/old_patches/doctype_permission_patch.py b/erpnext/patches/old_patches/doctype_permission_patch.py index 0953864a009..b23277acc54 100644 --- a/erpnext/patches/old_patches/doctype_permission_patch.py +++ b/erpnext/patches/old_patches/doctype_permission_patch.py @@ -21,7 +21,7 @@ def set_doctype_permissions(): # remove descriptions webnotes.conn.sql("update tabDocType set description=null") - from webnotes.modules.module_manager import reload_doc + from webnotes.modules import reload_doc reload_doc('core','doctype','custom_script') reload_doc('core','doctype','custom_field') reload_doc('core','doctype','property_setter') diff --git a/erpnext/patches/old_patches/feed_patch.py b/erpnext/patches/old_patches/feed_patch.py index 1edac8840d1..d1fa147dbf6 100644 --- a/erpnext/patches/old_patches/feed_patch.py +++ b/erpnext/patches/old_patches/feed_patch.py @@ -110,7 +110,7 @@ def set_subjects_and_tagfields(): def support_patch(): # relaod support and other doctypes - from webnotes.modules.module_manager import reload_doc + from webnotes.modules import reload_doc webnotes.model.delete_doc('DocType','Support Ticket') reload_doc('setup','doctype','support_email_settings') diff --git a/erpnext/patches/old_patches/patch_1.py b/erpnext/patches/old_patches/patch_1.py index 4176bf5e667..9e9cb6f1a24 100644 --- a/erpnext/patches/old_patches/patch_1.py +++ b/erpnext/patches/old_patches/patch_1.py @@ -781,12 +781,12 @@ elif patch_no == 184: except: pass # import - from webnotes.modules.module_manager import reload_doc + from webnotes.modules import reload_doc reload_doc('event_updates','doctype','feed') elif patch_no==185: sql("delete from tabDocTrigger where method = 'webnotes.widgets.follow.on_docsave'") elif patch_no==186: - from webnotes.modules.module_manager import reload_doc + from webnotes.modules import reload_doc reload_doc('event_updates','doctype','feed') elif patch_no == 187: sql("update tabDocType set autoname = '' where name = 'QA Inspection Report'") @@ -807,7 +807,7 @@ elif patch_no == 194: sql("delete from `tabModule Def Item` where parent = 'SRM' and doc_name = 'Landed Cost Wizard' and display_name = 'Landed Cost Wizard'") import_from_files(record_list = [['stock', 'Module Def', 'Material Management']]) elif patch_no == 195: - from webnotes.modules.module_manager import reload_doc + from webnotes.modules import reload_doc reload_doc('setup','doctype','manage_account') elif patch_no == 196: sql("update `tabModule Def` set module_page = null where name = 'Material Management'") diff --git a/erpnext/patches/patch.py b/erpnext/patches/patch.py index 744b102b35a..5b9f7a0c471 100644 --- a/erpnext/patches/patch.py +++ b/erpnext/patches/patch.py @@ -24,7 +24,7 @@ last_patch = 388 def execute(patch_no): return import webnotes - from webnotes.modules.module_manager import reload_doc + from webnotes.modules import reload_doc from webnotes.model.code import get_obj sql = webnotes.conn.sql @@ -377,7 +377,7 @@ def execute(patch_no): elif patch_no == 370: sql("update `tabDocField` set `hidden` = 0 where fieldname = 'group_or_ledger' and parent = 'Cost Center'") elif patch_no == 371: - from webnotes.modules.module_manager import reload_doc + from webnotes.modules import reload_doc reload_doc('setup', 'doctype','features_setup') flds = ['page_break', 'projects', 'packing_details', 'discounts', 'brands', 'item_batch_nos', 'after_sales_installations', 'item_searial_nos', 'item_group_in_details', 'exports', 'imports', 'item_advanced', 'sales_extras', 'more_info', 'quality', 'manufacturing', 'pos', 'item_serial_nos'] @@ -393,7 +393,7 @@ def execute(patch_no): get_obj('Features Setup', 'Features Setup').doc.save() elif patch_no == 372: - from webnotes.modules.module_manager import reload_doc + from webnotes.modules import reload_doc reload_doc('setup', 'doctype','features_setup') flds = ['page_break', 'projects', 'packing_details', 'discounts', 'brands', 'item_batch_nos', 'after_sales_installations', 'item_searial_nos', 'item_group_in_details', 'exports', 'imports', 'item_advanced', 'sales_extras', 'more_info', 'quality', 'manufacturing', 'pos', 'item_serial_nos'] diff --git a/erpnext/projects/doctype/project/project.txt b/erpnext/projects/doctype/project/project.txt index 3d57e12b919..f02db923285 100644 --- a/erpnext/projects/doctype/project/project.txt +++ b/erpnext/projects/doctype/project/project.txt @@ -5,47 +5,51 @@ { 'creation': '2010-08-08 17:09:14', 'docstatus': 0, - 'modified': '2011-01-05 15:24:43', - 'modified_by': 'Administrator', - 'owner': 'Administrator' + 'modified': '2012-03-12 14:25:08', + 'modified_by': u'Administrator', + 'owner': u'Administrator' }, # These values are common for all DocType { - '_last_update': '1305714062', + '_last_update': u'1331542439', + 'allow_attach': 1, 'allow_trash': 1, - 'autoname': 'field:project_name', - 'colour': 'White:FFF', + 'autoname': u'field:project_name', + 'colour': u'White:FFF', + 'default_print_format': u'Standard', 'doctype': 'DocType', - 'document_type': 'Master', - 'module': 'Projects', + 'document_type': u'Master', + 'max_attachments': 4, + 'module': u'Projects', 'name': '__common__', - 'search_fields': 'customer, status, priority, is_active', - 'section_style': 'Tabbed', - 'server_code_error': ' ', - 'subject': ' ', - 'tag_fields': 'status', - 'version': 32 + 'search_fields': u'customer, status, priority, is_active', + 'section_style': u'Tabbed', + 'server_code_error': u' ', + 'show_in_menu': 0, + 'subject': u' ', + 'tag_fields': u'status', + 'version': 37 }, # These values are common for all DocField { - 'doctype': 'DocField', + 'doctype': u'DocField', 'name': '__common__', - 'parent': 'Project', - 'parentfield': 'fields', - 'parenttype': 'DocType' + 'parent': u'Project', + 'parentfield': u'fields', + 'parenttype': u'DocType' }, # These values are common for all DocPerm { 'cancel': 1, 'create': 1, - 'doctype': 'DocPerm', + 'doctype': u'DocPerm', 'name': '__common__', - 'parent': 'Project', - 'parentfield': 'permissions', - 'parenttype': 'DocType', + 'parent': u'Project', + 'parentfield': u'permissions', + 'parenttype': u'DocType', 'permlevel': 0, 'read': 1, 'write': 1 @@ -54,45 +58,58 @@ # DocType, Project { 'doctype': 'DocType', - 'name': 'Project' + 'name': u'Project' }, # DocPerm { - 'doctype': 'DocPerm', - 'idx': 1, - 'role': 'All' + 'doctype': u'DocPerm', + 'role': u'All' }, # DocPerm { - 'doctype': 'DocPerm', - 'idx': 2, - 'role': 'Projects User' + 'doctype': u'DocPerm', + 'role': u'Projects User' }, # DocField { - 'colour': 'White:FFF', - 'description': 'Helps you keep track of your projects and links to Tasks. You can tag a task to a project to track its progress', - 'doctype': 'DocField', - 'fieldtype': 'Section Break', - 'idx': 1, - 'label': 'Basic Info', - 'oldfieldtype': 'Section Break', + 'colour': u'White:FFF', + 'description': u'Helps you keep track of your projects and links to Tasks. You can tag a task to a project to track its progress', + 'doctype': u'DocField', + 'fieldtype': u'Section Break', + 'label': u'Basic Info', + 'oldfieldtype': u'Section Break', 'permlevel': 0 }, # DocField { - 'description': 'Project will get saved and will be searchable with project name given', - 'doctype': 'DocField', - 'fieldname': 'project_name', - 'fieldtype': 'Data', - 'idx': 2, - 'label': 'Project Name', - 'oldfieldname': 'project_name', - 'oldfieldtype': 'Data', + 'description': u'Project will get saved and will be searchable with project name given', + 'doctype': u'DocField', + 'fieldname': u'project_name', + 'fieldtype': u'Data', + 'label': u'Project Name', + 'oldfieldname': u'project_name', + 'oldfieldtype': u'Data', + 'permlevel': 0, + 'reqd': 1 + }, + + # DocField + { + 'colour': u'White:FFF', + 'default': u'Open', + 'doctype': u'DocField', + 'fieldname': u'status', + 'fieldtype': u'Select', + 'in_filter': 1, + 'label': u'Status', + 'no_copy': 1, + 'oldfieldname': u'status', + 'oldfieldtype': u'Select', + 'options': u'Open\nCompleted\nCancelled', 'permlevel': 0, 'reqd': 1, 'search_index': 1 @@ -100,386 +117,355 @@ # DocField { - 'colour': 'White:FFF', - 'default': 'Open', - 'doctype': 'DocField', - 'fieldname': 'status', - 'fieldtype': 'Select', - 'idx': 3, + 'doctype': u'DocField', + 'fieldname': u'is_active', + 'fieldtype': u'Select', + 'label': u'Is Active', + 'oldfieldname': u'is_active', + 'oldfieldtype': u'Select', + 'options': u'Yes\nNo', + 'permlevel': 0 + }, + + # DocField + { + 'doctype': u'DocField', + 'fieldname': u'priority', + 'fieldtype': u'Select', + 'label': u'Priority', + 'oldfieldname': u'priority', + 'oldfieldtype': u'Select', + 'options': u'Medium\nLow\nHigh', + 'permlevel': 0 + }, + + # DocField + { + 'doctype': u'DocField', + 'fieldtype': u'Column Break', + 'permlevel': 0 + }, + + # DocField + { + 'doctype': u'DocField', + 'fieldname': u'project_type', + 'fieldtype': u'Data', + 'label': u'Project Type', + 'oldfieldname': u'project_type', + 'oldfieldtype': u'Data', + 'permlevel': 0 + }, + + # DocField + { + 'doctype': u'DocField', + 'fieldname': u'project_start_date', + 'fieldtype': u'Date', 'in_filter': 1, - 'label': 'Status', - 'oldfieldname': 'status', - 'oldfieldtype': 'Select', - 'options': 'Open\nCompleted\nCancelled', - 'permlevel': 0, - 'reqd': 1, - 'search_index': 0 - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'is_active', - 'fieldtype': 'Select', - 'idx': 4, - 'label': 'Is Active', - 'oldfieldname': 'is_active', - 'oldfieldtype': 'Select', - 'options': 'Yes\nNo', + 'label': u'Project Start Date', + 'oldfieldname': u'project_start_date', + 'oldfieldtype': u'Date', 'permlevel': 0 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'priority', - 'fieldtype': 'Select', - 'idx': 5, - 'label': 'Priority', - 'oldfieldname': 'priority', - 'oldfieldtype': 'Select', - 'options': 'Medium\nLow\nHigh', + 'doctype': u'DocField', + 'fieldname': u'completion_date', + 'fieldtype': u'Date', + 'label': u'Completion Date', + 'oldfieldname': u'completion_date', + 'oldfieldtype': u'Date', 'permlevel': 0 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'project_value', - 'fieldtype': 'Currency', - 'idx': 6, - 'label': 'Project Value', - 'oldfieldname': 'project_value', - 'oldfieldtype': 'Currency', - 'permlevel': 0, - 'reqd': 1, - 'trigger': 'Client' - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'gross_margin_value', - 'fieldtype': 'Currency', - 'idx': 7, - 'label': 'Gross Margin Value', - 'oldfieldname': 'gross_margin_value', - 'oldfieldtype': 'Currency', - 'permlevel': 0, - 'reqd': 1 - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'per_gross_margin', - 'fieldtype': 'Currency', - 'idx': 8, - 'label': 'Gross Margin %', - 'oldfieldname': 'per_gross_margin', - 'oldfieldtype': 'Currency', - 'permlevel': 0, - 'reqd': 1 - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'est_material_cost', - 'fieldtype': 'Currency', - 'idx': 9, - 'label': 'Estimated Material Cost', - 'oldfieldname': 'est_material_cost', - 'oldfieldtype': 'Currency', - 'permlevel': 0, - 'trigger': 'Client' - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'project_type', - 'fieldtype': 'Data', - 'idx': 10, - 'label': 'Project Type', - 'oldfieldname': 'project_type', - 'oldfieldtype': 'Data', + 'doctype': u'DocField', + 'fieldname': u'act_completion_date', + 'fieldtype': u'Date', + 'label': u'Actual Completion Date', + 'oldfieldname': u'act_completion_date', + 'oldfieldtype': u'Date', 'permlevel': 0 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'project_start_date', - 'fieldtype': 'Date', - 'idx': 11, - 'in_filter': 1, - 'label': 'Project Start Date', - 'oldfieldname': 'project_start_date', - 'oldfieldtype': 'Date', - 'permlevel': 0 - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'completion_date', - 'fieldtype': 'Date', - 'idx': 12, - 'label': 'Completion Date', - 'oldfieldname': 'completion_date', - 'oldfieldtype': 'Date', - 'permlevel': 0 - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'act_completion_date', - 'fieldtype': 'Date', - 'idx': 13, - 'label': 'Actual Completion Date', - 'oldfieldname': 'act_completion_date', - 'oldfieldtype': 'Date', - 'permlevel': 0 - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'amended_from', - 'fieldtype': 'Data', + 'doctype': u'DocField', + 'fieldname': u'amemdment_date', + 'fieldtype': u'Date', 'hidden': 1, - 'idx': 14, - 'label': 'Amended From', + 'label': u'Amemdment Date', 'no_copy': 1, - 'oldfieldname': 'amended_from', - 'oldfieldtype': 'Data', + 'oldfieldname': u'amemdment_date', + 'oldfieldtype': u'Date', + 'permlevel': 1 + }, + + # DocField + { + 'doctype': u'DocField', + 'fieldname': u'amended_from', + 'fieldtype': u'Data', + 'hidden': 1, + 'label': u'Amended From', + 'no_copy': 1, + 'oldfieldname': u'amended_from', + 'oldfieldtype': u'Data', 'permlevel': 1, 'print_hide': 0 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'amemdment_date', - 'fieldtype': 'Date', - 'hidden': 1, - 'idx': 15, - 'label': 'Amemdment Date', - 'no_copy': 1, - 'oldfieldname': 'amemdment_date', - 'oldfieldtype': 'Date', - 'permlevel': 1 - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldtype': 'Section Break', - 'idx': 16, - 'label': 'Project Details', - 'oldfieldtype': 'Section Break', - 'options': 'Simple', + 'doctype': u'DocField', + 'fieldtype': u'Section Break', + 'label': u'Details', + 'oldfieldtype': u'Section Break', 'permlevel': 0 }, # DocField { - 'doctype': 'DocField', - 'fieldtype': 'Column Break', - 'idx': 17, - 'oldfieldtype': 'Column Break', + 'doctype': u'DocField', + 'fieldname': u'notes', + 'fieldtype': u'Text Editor', + 'label': u'Notes', + 'oldfieldname': u'notes', + 'oldfieldtype': u'Text Editor', + 'permlevel': 0 + }, + + # DocField + { + 'doctype': u'DocField', + 'fieldtype': u'Section Break', + 'label': u'Financials', + 'oldfieldtype': u'Section Break', + 'permlevel': 0 + }, + + # DocField + { + 'colour': u'White:FFF', + 'doctype': u'DocField', + 'fieldname': u'project_value', + 'fieldtype': u'Currency', + 'label': u'Project Value', + 'oldfieldname': u'project_value', + 'oldfieldtype': u'Currency', 'permlevel': 0, - 'width': '50%' + 'reqd': 0, + 'trigger': u'Client' }, # DocField { - 'doctype': 'DocField', - 'fieldtype': 'Section Break', - 'idx': 18, - 'oldfieldtype': 'Section Break', - 'options': 'Simple', + 'doctype': u'DocField', + 'fieldname': u'est_material_cost', + 'fieldtype': u'Currency', + 'label': u'Estimated Material Cost', + 'oldfieldname': u'est_material_cost', + 'oldfieldtype': u'Currency', + 'permlevel': 0, + 'trigger': u'Client' + }, + + # DocField + { + 'doctype': u'DocField', + 'fieldtype': u'Column Break', 'permlevel': 0 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'notes', - 'fieldtype': 'Text Editor', - 'idx': 19, - 'label': 'Notes', - 'oldfieldname': 'notes', - 'oldfieldtype': 'Text Editor', + 'colour': u'White:FFF', + 'doctype': u'DocField', + 'fieldname': u'per_gross_margin', + 'fieldtype': u'Currency', + 'label': u'Gross Margin %', + 'oldfieldname': u'per_gross_margin', + 'oldfieldtype': u'Currency', + 'permlevel': 0, + 'reqd': 0 + }, + + # DocField + { + 'colour': u'White:FFF', + 'doctype': u'DocField', + 'fieldname': u'gross_margin_value', + 'fieldtype': u'Currency', + 'label': u'Gross Margin Value', + 'oldfieldname': u'gross_margin_value', + 'oldfieldtype': u'Currency', + 'permlevel': 0, + 'reqd': 0 + }, + + # DocField + { + 'doctype': u'DocField', + 'fieldtype': u'Section Break', + 'label': u'Customer Details', + 'oldfieldtype': u'Section Break', 'permlevel': 0 }, # DocField { - 'doctype': 'DocField', - 'fieldtype': 'Section Break', - 'idx': 20, - 'label': 'Customer Details', - 'oldfieldtype': 'Section Break', - 'permlevel': 0 - }, - - # DocField - { - 'colour': 'White:FFF', - 'description': 'Select name of Customer to whom project belongs', - 'doctype': 'DocField', - 'fieldname': 'customer', - 'fieldtype': 'Link', - 'idx': 21, + 'colour': u'White:FFF', + 'description': u'Select name of Customer to whom project belongs', + 'doctype': u'DocField', + 'fieldname': u'customer', + 'fieldtype': u'Link', 'in_filter': 1, - 'label': 'Customer', - 'oldfieldname': 'customer', - 'oldfieldtype': 'Link', - 'options': 'Customer', + 'label': u'Customer', + 'oldfieldname': u'customer', + 'oldfieldtype': u'Link', + 'options': u'Customer', 'permlevel': 0, 'print_hide': 1, 'reqd': 0, 'search_index': 1, - 'trigger': 'Client' + 'trigger': u'Client' }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'customer_name', - 'fieldtype': 'Data', - 'idx': 22, + 'doctype': u'DocField', + 'fieldname': u'customer_name', + 'fieldtype': u'Data', 'in_filter': 1, - 'label': 'Customer Name', - 'oldfieldname': 'customer_name', - 'oldfieldtype': 'Data', + 'label': u'Customer Name', + 'oldfieldname': u'customer_name', + 'oldfieldtype': u'Data', 'permlevel': 1, - 'search_index': 0 + 'search_index': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'customer_address', - 'fieldtype': 'Small Text', - 'idx': 23, - 'label': 'Customer Address', - 'oldfieldname': 'customer_address', - 'oldfieldtype': 'Small Text', + 'doctype': u'DocField', + 'fieldname': u'customer_address', + 'fieldtype': u'Small Text', + 'label': u'Customer Address', + 'oldfieldname': u'customer_address', + 'oldfieldtype': u'Small Text', 'permlevel': 1 }, # DocField { - 'colour': 'White:FFF', - 'doctype': 'DocField', - 'fieldname': 'contact_person', - 'fieldtype': 'Link', - 'idx': 24, + 'colour': u'White:FFF', + 'doctype': u'DocField', + 'fieldname': u'contact_person', + 'fieldtype': u'Link', 'in_filter': 1, - 'label': 'Contact Person', - 'oldfieldname': 'contact_person', - 'oldfieldtype': 'Link', + 'label': u'Contact Person', + 'oldfieldname': u'contact_person', + 'oldfieldtype': u'Link', 'permlevel': 0, 'reqd': 0, - 'trigger': 'Client' + 'trigger': u'Client' }, # DocField { - 'colour': 'White:FFF', - 'doctype': 'DocField', - 'fieldname': 'territory', - 'fieldtype': 'Link', - 'idx': 25, + 'colour': u'White:FFF', + 'doctype': u'DocField', + 'fieldname': u'territory', + 'fieldtype': u'Link', 'in_filter': 1, - 'label': 'Territory', - 'oldfieldname': 'territory', - 'oldfieldtype': 'Link', - 'options': 'Territory', + 'label': u'Territory', + 'oldfieldname': u'territory', + 'oldfieldtype': u'Link', + 'options': u'Territory', 'permlevel': 0, 'reqd': 0, - 'search_index': 0, - 'trigger': 'Client' + 'trigger': u'Client' }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'contact_no', - 'fieldtype': 'Data', - 'idx': 26, - 'label': 'Contact No', - 'oldfieldname': 'contact_no', - 'oldfieldtype': 'Data', + 'doctype': u'DocField', + 'fieldname': u'contact_no', + 'fieldtype': u'Data', + 'label': u'Contact No', + 'oldfieldname': u'contact_no', + 'oldfieldtype': u'Data', 'permlevel': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'email_id', - 'fieldtype': 'Data', - 'idx': 27, - 'label': 'Email Id', - 'oldfieldname': 'email_id', - 'oldfieldtype': 'Data', + 'doctype': u'DocField', + 'fieldname': u'email_id', + 'fieldtype': u'Data', + 'label': u'Email Id', + 'oldfieldname': u'email_id', + 'oldfieldtype': u'Data', 'permlevel': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'customer_group', - 'fieldtype': 'Link', - 'idx': 28, - 'label': 'Customer Group', - 'oldfieldname': 'customer_group', - 'oldfieldtype': 'Link', - 'options': 'Customer Group', - 'permlevel': 1, - 'search_index': 0 + 'doctype': u'DocField', + 'fieldname': u'customer_group', + 'fieldtype': u'Link', + 'label': u'Customer Group', + 'oldfieldname': u'customer_group', + 'oldfieldtype': u'Link', + 'options': u'Customer Group', + 'permlevel': 1 }, # DocField { - 'colour': 'White:FFF', - 'description': 'Important dates and commitments in your project life cycle', - 'doctype': 'DocField', - 'fieldtype': 'Section Break', - 'idx': 29, - 'label': 'Milestones', - 'oldfieldtype': 'Section Break', + 'colour': u'White:FFF', + 'description': u'Important dates and commitments in your project life cycle', + 'doctype': u'DocField', + 'fieldtype': u'Section Break', + 'label': u'Milestones', + 'oldfieldtype': u'Section Break', 'permlevel': 0 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'project_milestones', - 'fieldtype': 'Table', - 'idx': 30, - 'label': 'Project Milestones', - 'oldfieldname': 'project_milestones', - 'oldfieldtype': 'Table', - 'options': 'Project Milestone', + 'doctype': u'DocField', + 'fieldname': u'project_milestones', + 'fieldtype': u'Table', + 'label': u'Project Milestones', + 'oldfieldname': u'project_milestones', + 'oldfieldtype': u'Table', + 'options': u'Project Milestone', 'permlevel': 0 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'trash_reason', - 'fieldtype': 'Small Text', + 'doctype': u'DocField', + 'fieldname': u'trash_reason', + 'fieldtype': u'Small Text', 'hidden': 1, - 'idx': 31, - 'label': 'Trash Reason', - 'oldfieldname': 'trash_reason', - 'oldfieldtype': 'Small Text', + 'label': u'Trash Reason', + 'oldfieldname': u'trash_reason', + 'oldfieldtype': u'Small Text', 'permlevel': 0, 'print_hide': 1 + }, + + # DocField + { + 'doctype': u'DocField', + 'fieldname': u'file_list', + 'fieldtype': u'Small Text', + 'label': u'File List', + 'no_copy': 1, + 'permlevel': 0 } ] \ No newline at end of file diff --git a/js/all-app.js b/js/all-app.js index 2700ddb57b6..71e09547df1 100644 --- a/js/all-app.js +++ b/js/all-app.js @@ -1127,7 +1127,7 @@ function upload_callback(id,fid){uploaders[id].callback(fid);} /* * lib/js/legacy/webpage/page.js */ -var stylesheets=[];function Page(page_name,content){var me=this;this.name=page_name;this.trigger=function(event){try{if(pscript[event+'_'+this.name]) +function Page(page_name,content){var me=this;this.name=page_name;this.trigger=function(event){try{if(pscript[event+'_'+this.name]) pscript[event+'_'+this.name](me.wrapper);if(me.wrapper[event]){me.wrapper[event](me.wrapper);}}catch(e){console.log(e);}} this.page_show=function(){set_title(me.doc.title?me.doc.title:me.name);if(!me.onload_complete){me.trigger('onload');me.onload_complete=true;} me.trigger('onshow');cur_frm=null;} @@ -1136,11 +1136,10 @@ if(content) this.wrapper.innerHTML=content;return this;} function render_page(page_name,menuitem){if(!page_name)return;if((!locals['Page'])||(!locals['Page'][page_name])){loadpage('_home');return;} var pdoc=locals['Page'][page_name];if(pdoc.style)set_style(pdoc.style) -if(pdoc.stylesheet){set_style(locals.Stylesheet[pdoc.stylesheet].stylesheet);stylesheets.push(pdoc.stylesheet);} var p=new Page(page_name,pdoc._Page__content?pdoc._Page__content:pdoc.content);var script=pdoc.__script?pdoc.__script:pdoc.script;p.doc=pdoc;if(script){eval(script);} page_body.change_to(page_name);return p;} function refresh_page(page_name){var fn=function(r,rt){render_page(page_name)} -$c('webnotes.widgets.page.getpage',{'name':page_name,stylesheets:JSON.stringify(stylesheets)},fn);} +$c('webnotes.widgets.page.getpage',{'name':page_name},fn);} /* * lib/js/legacy/wn/page_layout.js */ diff --git a/js/all-web.js b/js/all-web.js index d02a7ada0a5..3ff2d7a4384 100644 --- a/js/all-web.js +++ b/js/all-web.js @@ -936,7 +936,7 @@ function upload_callback(id,fid){uploaders[id].callback(fid);} /* * lib/js/legacy/webpage/page.js */ -var stylesheets=[];function Page(page_name,content){var me=this;this.name=page_name;this.trigger=function(event){try{if(pscript[event+'_'+this.name]) +function Page(page_name,content){var me=this;this.name=page_name;this.trigger=function(event){try{if(pscript[event+'_'+this.name]) pscript[event+'_'+this.name](me.wrapper);if(me.wrapper[event]){me.wrapper[event](me.wrapper);}}catch(e){console.log(e);}} this.page_show=function(){set_title(me.doc.title?me.doc.title:me.name);if(!me.onload_complete){me.trigger('onload');me.onload_complete=true;} me.trigger('onshow');cur_frm=null;} @@ -945,11 +945,10 @@ if(content) this.wrapper.innerHTML=content;return this;} function render_page(page_name,menuitem){if(!page_name)return;if((!locals['Page'])||(!locals['Page'][page_name])){loadpage('_home');return;} var pdoc=locals['Page'][page_name];if(pdoc.style)set_style(pdoc.style) -if(pdoc.stylesheet){set_style(locals.Stylesheet[pdoc.stylesheet].stylesheet);stylesheets.push(pdoc.stylesheet);} var p=new Page(page_name,pdoc._Page__content?pdoc._Page__content:pdoc.content);var script=pdoc.__script?pdoc.__script:pdoc.script;p.doc=pdoc;if(script){eval(script);} page_body.change_to(page_name);return p;} function refresh_page(page_name){var fn=function(r,rt){render_page(page_name)} -$c('webnotes.widgets.page.getpage',{'name':page_name,stylesheets:JSON.stringify(stylesheets)},fn);} +$c('webnotes.widgets.page.getpage',{'name':page_name},fn);} /* * lib/js/legacy/wn/page_layout.js */ diff --git a/version.num b/version.num index bb18bf4e49c..90afd51b607 100644 --- a/version.num +++ b/version.num @@ -1 +1 @@ -939 \ No newline at end of file +940 \ No newline at end of file