From 5112b5b6b8f8f8ece3fb33f24077031448baa913 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Mon, 2 Apr 2012 19:12:29 +0530 Subject: [PATCH] rerun of rename_dt --- .../purchase_invoice/purchase_invoice.py | 2 +- .../doctype/sales_invoice/sales_invoice.py | 2 +- .../page/accounts_home/accounts_home.html | 10 +- .../doctype/purchase_order/purchase_order.txt | 2 +- .../purchase_request/purchase_request.py | 6 +- .../purchase_taxes_and_charges_master.txt | 4 +- .../raw_materials_supplied/__init__.py | 0 .../raw_materials_supplied.txt | 140 ------- .../buying/page/buying_home/buying_home.html | 6 +- .../home/doctype/widget_control/__init__.py | 0 .../doctype/widget_control/widget_control.py | 52 --- .../doctype/widget_control/widget_control.txt | 32 -- .../hr/doctype/absent_days_detail/__init__.py | 0 .../absent_days_detail/absent_days_detail.txt | 129 ------ .../doctype/earn_deduction_detail/__init__.py | 0 .../earn_deduction_detail.txt | 110 ----- .../educational_qualifications/__init__.py | 0 .../educational_qualifications.txt | 112 ----- erpnext/hr/doctype/salary_slip/salary_slip.py | 2 +- .../salary_structure/salary_structure.js | 2 +- erpnext/hr/page/hr_home/hr_home.html | 4 +- .../doctype/question_tag/__init__.py | 0 .../doctype/question_tag/question_tag.txt | 69 ---- .../before_jan_2012/reload_doclayer.py | 2 +- erpnext/patches/jan_mar_2012/rename_dt.py | 26 +- erpnext/patches/mar_2012/usertags.py | 17 + erpnext/patches/patch_list.py | 5 + .../print_formats/DeliveryNoteClassic.html | 291 ------------- .../print_formats/DeliveryNoteModern.html | 317 --------------- .../print_formats/DeliveryNoteSpartan.html | 312 -------------- .../print_formats/PurchaseOrderClassic.html | 248 ------------ .../print_formats/PurchaseOrderModern.html | 275 ------------- .../print_formats/PurchaseOrderSpartan.html | 270 ------------ .../print_formats/QuotationClassic.html | 275 ------------- .../print_formats/QuotationModern.html | 300 -------------- .../print_formats/QuotationSpartan.html | 295 -------------- .../print_formats/SalesInvoiceClassic.html | 277 ------------- .../print_formats/SalesInvoiceModern.html | 304 -------------- .../print_formats/SalesInvoiceSpartan.html | 299 -------------- .../print_formats/SalesOrderClassic.html | 277 ------------- .../print_formats/SalesOrderModern.html | 304 -------------- .../print_formats/SalesOrderSpartan.html | 299 -------------- .../doctype/bom_replace_utility/__init__.py | 0 .../bom_replace_utility.js | 36 -- .../bom_replace_utility.py | 143 ------- .../bom_replace_utility.txt | 383 ------------------ .../bom_replace_utility_detail/__init__.py | 0 .../bom_replace_utility_detail.txt | 101 ----- .../doctype/bom_report_detail/__init__.py | 0 .../bom_report_detail/bom_report_detail.txt | 152 ------- .../production/doctype/pf_detail/__init__.py | 0 .../doctype/pf_detail/pf_detail.txt | 230 ----------- .../production/doctype/ppw_detail/__init__.py | 0 .../doctype/ppw_detail/ppw_detail.txt | 51 --- .../production/doctype/pro_detail/__init__.py | 0 .../doctype/pro_detail/pro_detail.txt | 148 ------- .../doctype/pro_pp_detail/__init__.py | 0 .../doctype/pro_pp_detail/pro_pp_detail.txt | 121 ------ .../page/production_home/production_home.html | 2 +- .../doctype/opportunity/opportunity.js | 2 +- .../selling/doctype/quotation/quotation.py | 4 +- .../doctype/sales_order/sales_order.py | 2 +- .../page/selling_home/selling_home.html | 10 +- erpnext/setup/doctype/personalize/__init__.py | 0 .../setup/doctype/personalize/personalize.py | 50 --- .../setup/doctype/personalize/personalize.txt | 101 ----- .../doctype/setup_wizard_control/__init__.py | 0 .../setup_wizard_control.py | 73 ---- .../setup_wizard_control.txt | 49 --- erpnext/setup/page/setup/setup.html | 4 +- .../Purchase Order-Purchase Receipt.txt | 8 +- .../Sales Order-Delivery Note.txt | 8 +- .../doctype/delivery_note/delivery_note.py | 2 +- .../purchase_receipt/purchase_receipt.txt | 2 +- erpnext/stock/page/stock_home/stock_home.html | 4 +- .../activity_dashboard_control/__init__.py | 0 .../activity_dashboard_control.py | 111 ----- .../activity_dashboard_control.txt | 30 -- .../doctype/contact_detail/__init__.py | 0 .../doctype/contact_detail/contact_detail.txt | 93 ----- .../utilities/doctype/patch_util/__init__.py | 0 .../doctype/patch_util/patch_util.py | 118 ------ .../doctype/patch_util/patch_util.txt | 30 -- .../doctype/reposting_tool/reposting_tool.py | 2 +- wnf.py | 10 +- 85 files changed, 93 insertions(+), 7064 deletions(-) delete mode 100644 erpnext/buying/doctype/raw_materials_supplied/__init__.py delete mode 100644 erpnext/buying/doctype/raw_materials_supplied/raw_materials_supplied.txt delete mode 100644 erpnext/home/doctype/widget_control/__init__.py delete mode 100644 erpnext/home/doctype/widget_control/widget_control.py delete mode 100644 erpnext/home/doctype/widget_control/widget_control.txt delete mode 100644 erpnext/hr/doctype/absent_days_detail/__init__.py delete mode 100644 erpnext/hr/doctype/absent_days_detail/absent_days_detail.txt delete mode 100644 erpnext/hr/doctype/earn_deduction_detail/__init__.py delete mode 100644 erpnext/hr/doctype/earn_deduction_detail/earn_deduction_detail.txt delete mode 100644 erpnext/hr/doctype/educational_qualifications/__init__.py delete mode 100644 erpnext/hr/doctype/educational_qualifications/educational_qualifications.txt delete mode 100644 erpnext/knowledge_base/doctype/question_tag/__init__.py delete mode 100644 erpnext/knowledge_base/doctype/question_tag/question_tag.txt create mode 100644 erpnext/patches/mar_2012/usertags.py delete mode 100644 erpnext/patches/print_formats/DeliveryNoteClassic.html delete mode 100644 erpnext/patches/print_formats/DeliveryNoteModern.html delete mode 100644 erpnext/patches/print_formats/DeliveryNoteSpartan.html delete mode 100644 erpnext/patches/print_formats/PurchaseOrderClassic.html delete mode 100644 erpnext/patches/print_formats/PurchaseOrderModern.html delete mode 100644 erpnext/patches/print_formats/PurchaseOrderSpartan.html delete mode 100644 erpnext/patches/print_formats/QuotationClassic.html delete mode 100644 erpnext/patches/print_formats/QuotationModern.html delete mode 100644 erpnext/patches/print_formats/QuotationSpartan.html delete mode 100644 erpnext/patches/print_formats/SalesInvoiceClassic.html delete mode 100644 erpnext/patches/print_formats/SalesInvoiceModern.html delete mode 100644 erpnext/patches/print_formats/SalesInvoiceSpartan.html delete mode 100644 erpnext/patches/print_formats/SalesOrderClassic.html delete mode 100644 erpnext/patches/print_formats/SalesOrderModern.html delete mode 100644 erpnext/patches/print_formats/SalesOrderSpartan.html delete mode 100644 erpnext/production/doctype/bom_replace_utility/__init__.py delete mode 100644 erpnext/production/doctype/bom_replace_utility/bom_replace_utility.js delete mode 100644 erpnext/production/doctype/bom_replace_utility/bom_replace_utility.py delete mode 100644 erpnext/production/doctype/bom_replace_utility/bom_replace_utility.txt delete mode 100644 erpnext/production/doctype/bom_replace_utility_detail/__init__.py delete mode 100644 erpnext/production/doctype/bom_replace_utility_detail/bom_replace_utility_detail.txt delete mode 100644 erpnext/production/doctype/bom_report_detail/__init__.py delete mode 100644 erpnext/production/doctype/bom_report_detail/bom_report_detail.txt delete mode 100644 erpnext/production/doctype/pf_detail/__init__.py delete mode 100644 erpnext/production/doctype/pf_detail/pf_detail.txt delete mode 100644 erpnext/production/doctype/ppw_detail/__init__.py delete mode 100644 erpnext/production/doctype/ppw_detail/ppw_detail.txt delete mode 100644 erpnext/production/doctype/pro_detail/__init__.py delete mode 100644 erpnext/production/doctype/pro_detail/pro_detail.txt delete mode 100644 erpnext/production/doctype/pro_pp_detail/__init__.py delete mode 100644 erpnext/production/doctype/pro_pp_detail/pro_pp_detail.txt delete mode 100644 erpnext/setup/doctype/personalize/__init__.py delete mode 100644 erpnext/setup/doctype/personalize/personalize.py delete mode 100644 erpnext/setup/doctype/personalize/personalize.txt delete mode 100644 erpnext/setup/doctype/setup_wizard_control/__init__.py delete mode 100644 erpnext/setup/doctype/setup_wizard_control/setup_wizard_control.py delete mode 100644 erpnext/setup/doctype/setup_wizard_control/setup_wizard_control.txt delete mode 100644 erpnext/utilities/doctype/activity_dashboard_control/__init__.py delete mode 100644 erpnext/utilities/doctype/activity_dashboard_control/activity_dashboard_control.py delete mode 100644 erpnext/utilities/doctype/activity_dashboard_control/activity_dashboard_control.txt delete mode 100644 erpnext/utilities/doctype/contact_detail/__init__.py delete mode 100644 erpnext/utilities/doctype/contact_detail/contact_detail.txt delete mode 100644 erpnext/utilities/doctype/patch_util/__init__.py delete mode 100644 erpnext/utilities/doctype/patch_util/patch_util.py delete mode 100644 erpnext/utilities/doctype/patch_util/patch_util.txt diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py index 54078d9137..9b3968da2a 100644 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py @@ -163,7 +163,7 @@ class DocType(TransactionBase): def get_rate(self,arg): return get_obj('Purchase Common').get_rate(arg,self) - # Pull details from other charges master (Get Other Charges) + # Get Purchase Taxes and Charges Master # ----------------------------------------------------------- def get_purchase_tax_details(self): return get_obj('Purchase Common').get_purchase_tax_details(self) diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py index 848e120b6d..d89ff042d1 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py @@ -230,7 +230,7 @@ class DocType(TransactionBase): def load_default_taxes(self): return get_obj('Sales Common').load_default_taxes(self) - # Get Other Charges Details + # Get Sales Taxes and Charges Master Details # -------------------------- def get_other_charges(self): return get_obj('Sales Common').get_other_charges(self) diff --git a/erpnext/accounts/page/accounts_home/accounts_home.html b/erpnext/accounts/page/accounts_home/accounts_home.html index 8282ae8eb1..fc08360112 100644 --- a/erpnext/accounts/page/accounts_home/accounts_home.html +++ b/erpnext/accounts/page/accounts_home/accounts_home.html @@ -35,7 +35,7 @@
Payment Reconciliation + href="#!Form/Payment to Invoice Matching Tool/Payment to Invoice Matching Tool">Payment Reconciliation
Export Multiple Ledgers (GL) + href="#!Form/Multi Ledger Report/Multi Ledger Report">Export Multiple Ledgers (GL)
Sales or Purchase Returns + href="#!Form/Sales and Purchase Return Tool/Sales and Purchase Return Tool">Sales or Purchase Returns
Sales Other Charges + href="#!List/Sales Taxes and Charges Master">Sales Taxes and Charges Master
Purchase Other Charges + href="#!List/Purchase Taxes and Charges Master">Purchase Taxes and Charges Master
d.ordered_qty) and flt(flt(d.qty) - flt(d.ordered_qty)) or 0 - # Step 3 :=> Update Bin's Indent Qty by +- qty + # Step 3 :=> Update Bin's Purchase Request Qty by +- qty get_obj('Warehouse', d.warehouse).update_bin(0, 0, 0, (is_submit and 1 or -1) * flt(qty), 0, d.item_code, self.doc.transaction_date) # On Submit @@ -220,7 +220,7 @@ class DocType: # Step 2:=> Check for stopped status pc_obj.check_for_stopped_status( self.doc.doctype, self.doc.name) - # Step 3:=> Check if Purchase Order has been submitted against current Indent + # Step 3:=> Check if Purchase Order has been submitted against current Purchase Request pc_obj.check_docstatus(check = 'Next', doctype = 'Purchase Order', docname = self.doc.name, detail_doctype = 'Purchase Order Item') # Step 4:=> Update Bin self.update_bin(is_submit = 0, is_stopped = (cstr(self.doc.status) == 'Stopped') and 1 or 0) @@ -229,7 +229,7 @@ class DocType: set(self.doc,'status','Cancelled') - # Repair Indent + # Repair Purchase Request # =========================================== def repair_indent(self): get_obj('Purchase Common', 'Purchase Common').repair_curr_doctype_details(self) diff --git a/erpnext/buying/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.txt b/erpnext/buying/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.txt index 408881ab87..4c07ca14ca 100644 --- a/erpnext/buying/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.txt +++ b/erpnext/buying/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.txt @@ -122,9 +122,9 @@ 'doctype': u'DocField', 'fieldname': u'purchase_tax_details', 'fieldtype': u'Table', - 'label': u'Purchase Tax Details', + 'label': u'Purchase Taxes and Charges', 'oldfieldname': u'purchase_tax_details', 'oldfieldtype': u'Table', 'options': u'Purchase Taxes and Charges' } -] \ No newline at end of file +] diff --git a/erpnext/buying/doctype/raw_materials_supplied/__init__.py b/erpnext/buying/doctype/raw_materials_supplied/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/erpnext/buying/doctype/raw_materials_supplied/raw_materials_supplied.txt b/erpnext/buying/doctype/raw_materials_supplied/raw_materials_supplied.txt deleted file mode 100644 index 2228ff8a05..0000000000 --- a/erpnext/buying/doctype/raw_materials_supplied/raw_materials_supplied.txt +++ /dev/null @@ -1,140 +0,0 @@ -# DocType, Raw Materials Supplied -[ - - # These values are common in all dictionaries - { - 'creation': '2012-03-27 14:35:52', - 'docstatus': 0, - 'modified': '2012-03-27 14:35:52', - 'modified_by': u'Administrator', - 'owner': u'Administrator' - }, - - # These values are common for all DocType - { - 'autoname': u'RMS/.######', - 'colour': u'White:FFF', - 'doctype': 'DocType', - 'istable': 1, - 'module': u'Buying', - 'name': '__common__', - 'section_style': u'Tray', - 'show_in_menu': 0, - 'version': 8 - }, - - # These values are common for all DocField - { - 'doctype': u'DocField', - 'name': '__common__', - 'parent': u'Raw Materials Supplied', - 'parentfield': u'fields', - 'parenttype': u'DocType' - }, - - # DocType, Raw Materials Supplied - { - 'doctype': 'DocType', - 'name': u'Raw Materials Supplied' - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'po_item', - 'fieldtype': u'Select', - 'label': u'PO Item', - 'oldfieldname': u'po_item', - 'oldfieldtype': u'Select', - 'permlevel': 0, - 'reqd': 1, - 'trigger': u'Client' - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'raw_material', - 'fieldtype': u'Link', - 'label': u'Raw Material', - 'oldfieldname': u'raw_material', - 'oldfieldtype': u'Link', - 'options': u'Item', - 'permlevel': 0, - 'reqd': 1, - 'trigger': u'Client' - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'description', - 'fieldtype': u'Small Text', - 'label': u'Description', - 'oldfieldname': u'description', - 'oldfieldtype': u'Small Text', - 'permlevel': 0, - 'width': u'300px' - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'source_warehouse', - 'fieldtype': u'Select', - 'label': u'Source Warehouse', - 'oldfieldname': u'source_warehouse', - 'oldfieldtype': u'Select', - 'options': u'link:Warehouse', - 'permlevel': 0, - 'reqd': 1, - 'trigger': u'Client' - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'ma_valuation_rate', - 'fieldtype': u'Currency', - 'label': u'Valuation Rate (MA)', - 'no_copy': 1, - 'oldfieldname': u'ma_valuation_rate', - 'oldfieldtype': u'Currency', - 'permlevel': 1 - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'fifo_valuation_rate', - 'fieldtype': u'Currency', - 'label': u'Valuation Rate (FIFO)', - 'oldfieldname': u'fifo_valuation_rate', - 'oldfieldtype': u'Currency', - 'permlevel': 0 - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'qty', - 'fieldtype': u'Currency', - 'label': u'Qty', - 'oldfieldname': u'qty', - 'oldfieldtype': u'Currency', - 'permlevel': 0, - 'reqd': 1, - 'trigger': u'Client' - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'stock_uom', - 'fieldtype': u'Data', - 'label': u'Stock UOM', - 'oldfieldname': u'stock_uom', - 'oldfieldtype': u'Data', - 'permlevel': 1 - } -] \ No newline at end of file diff --git a/erpnext/buying/page/buying_home/buying_home.html b/erpnext/buying/page/buying_home/buying_home.html index 7f0e906d73..cbd347d87f 100644 --- a/erpnext/buying/page/buying_home/buying_home.html +++ b/erpnext/buying/page/buying_home/buying_home.html @@ -28,7 +28,7 @@
Purchase Other Charges + href="#!List/Purchase Taxes and Charges Master">Purchase Taxes and Charges Master
Purchase Returns + href="#!Form/Sales and Purchase Return Tool/Sales and Purchase Return Tool">Purchase Returns
-
\ No newline at end of file + diff --git a/erpnext/home/doctype/widget_control/__init__.py b/erpnext/home/doctype/widget_control/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/erpnext/home/doctype/widget_control/widget_control.py b/erpnext/home/doctype/widget_control/widget_control.py deleted file mode 100644 index b75aa93479..0000000000 --- a/erpnext/home/doctype/widget_control/widget_control.py +++ /dev/null @@ -1,52 +0,0 @@ -# ERPNext - web based ERP (http://erpnext.com) -# Copyright (C) 2012 Web Notes Technologies Pvt Ltd -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -import webnotes - -from webnotes.utils import nowdate -from webnotes.model.doc import Document -from webnotes.model.code import get_obj -from webnotes import session, form, msgprint - -sql = webnotes.conn.sql - -try: import json -except: import simplejson as json - -# ----------------------------------------------------------------------------------------- - - -class DocType: - def __init__(self,d,dl): - self.doc, self.doclist = d, dl - - def add_comment(self,args): - import time - args = eval(args) - if(args['comment']): - cmt = Document('Comment') - for arg in args: - cmt.fields[arg] = args[arg] - cmt.comment_date = nowdate() - cmt.comment_time = time.strftime('%H:%M') - cmt.save(1) - - else: - raise Exception - - def remove_comment(self, args): - args = json.loads(args) - sql("delete from `tabComment` where name=%s",args['id']) diff --git a/erpnext/home/doctype/widget_control/widget_control.txt b/erpnext/home/doctype/widget_control/widget_control.txt deleted file mode 100644 index 4de278e2ad..0000000000 --- a/erpnext/home/doctype/widget_control/widget_control.txt +++ /dev/null @@ -1,32 +0,0 @@ -# DocType, Widget Control -[ - - # These values are common in all dictionaries - { - 'creation': '2012-03-27 14:35:53', - 'docstatus': 0, - 'modified': '2012-03-27 14:35:53', - 'modified_by': u'Administrator', - 'owner': u'Administrator' - }, - - # These values are common for all DocType - { - 'colour': u'White:FFF', - 'doctype': 'DocType', - 'issingle': 1, - 'istable': 0, - 'module': u'Home', - 'name': '__common__', - 'section_style': u'Simple', - 'server_code_error': u' ', - 'show_in_menu': 0, - 'version': 27 - }, - - # DocType, Widget Control - { - 'doctype': 'DocType', - 'name': u'Widget Control' - } -] \ No newline at end of file diff --git a/erpnext/hr/doctype/absent_days_detail/__init__.py b/erpnext/hr/doctype/absent_days_detail/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/erpnext/hr/doctype/absent_days_detail/absent_days_detail.txt b/erpnext/hr/doctype/absent_days_detail/absent_days_detail.txt deleted file mode 100644 index 712b94321c..0000000000 --- a/erpnext/hr/doctype/absent_days_detail/absent_days_detail.txt +++ /dev/null @@ -1,129 +0,0 @@ -# DocType, Absent Days Detail -[ - - # These values are common in all dictionaries - { - 'creation': '2012-03-27 14:35:53', - 'docstatus': 0, - 'modified': '2012-03-27 14:35:53', - 'modified_by': u'Administrator', - 'owner': u'Administrator' - }, - - # These values are common for all DocType - { - 'colour': u'White:FFF', - 'doctype': 'DocType', - 'istable': 1, - 'module': u'HR', - 'name': '__common__', - 'section_style': u'Simple', - 'show_in_menu': 0, - 'version': 5 - }, - - # These values are common for all DocField - { - 'doctype': u'DocField', - 'name': '__common__', - 'parent': u'Absent Days Detail', - 'parentfield': u'fields', - 'parenttype': u'DocType', - 'permlevel': 0 - }, - - # These values are common for all DocPerm - { - 'create': 1, - 'doctype': u'DocPerm', - 'name': '__common__', - 'parent': u'Absent Days Detail', - 'parentfield': u'permissions', - 'parenttype': u'DocType', - 'permlevel': 0, - 'read': 1, - 'write': 1 - }, - - # DocType, Absent Days Detail - { - 'doctype': 'DocType', - 'name': u'Absent Days Detail' - }, - - # DocPerm - { - 'doctype': u'DocPerm' - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'leave_type', - 'fieldtype': u'Select', - 'label': u'Leave Type', - 'oldfieldname': u'leave_type', - 'oldfieldtype': u'Select', - 'options': u'link:Leave Type' - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'no_of_leave_days', - 'fieldtype': u'Data', - 'label': u'No of leave days', - 'oldfieldname': u'no_of_leave_days', - 'oldfieldtype': u'Data' - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'from_date', - 'fieldtype': u'Date', - 'label': u'From Date', - 'oldfieldname': u'from_date', - 'oldfieldtype': u'Date' - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'to_date', - 'fieldtype': u'Date', - 'label': u'To Date', - 'oldfieldname': u'to_date', - 'oldfieldtype': u'Date' - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'previous_balance', - 'fieldtype': u'Data', - 'label': u'Previous Balance', - 'oldfieldname': u'previous_balance', - 'oldfieldtype': u'Data' - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'current_balance', - 'fieldtype': u'Data', - 'label': u'Current Balance', - 'oldfieldname': u'current_balance', - 'oldfieldtype': u'Data' - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'max_allowed', - 'fieldtype': u'Data', - 'label': u'Max. Allowed', - 'oldfieldname': u'max_allowed', - 'oldfieldtype': u'Data' - } -] \ No newline at end of file diff --git a/erpnext/hr/doctype/earn_deduction_detail/__init__.py b/erpnext/hr/doctype/earn_deduction_detail/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/erpnext/hr/doctype/earn_deduction_detail/earn_deduction_detail.txt b/erpnext/hr/doctype/earn_deduction_detail/earn_deduction_detail.txt deleted file mode 100644 index da4a4f67dc..0000000000 --- a/erpnext/hr/doctype/earn_deduction_detail/earn_deduction_detail.txt +++ /dev/null @@ -1,110 +0,0 @@ -# DocType, Earn Deduction Detail -[ - - # These values are common in all dictionaries - { - 'creation': '2012-03-27 14:35:54', - 'docstatus': 0, - 'modified': '2012-03-27 14:35:54', - 'modified_by': u'Administrator', - 'owner': u'Administrator' - }, - - # These values are common for all DocType - { - 'colour': u'White:FFF', - 'doctype': 'DocType', - 'istable': 1, - 'module': u'HR', - 'name': '__common__', - 'section_style': u'Simple', - 'show_in_menu': 0, - 'version': 4 - }, - - # These values are common for all DocField - { - 'doctype': u'DocField', - 'name': '__common__', - 'parent': u'Earn Deduction Detail', - 'parentfield': u'fields', - 'parenttype': u'DocType', - 'permlevel': 0 - }, - - # These values are common for all DocPerm - { - 'create': 1, - 'doctype': u'DocPerm', - 'name': '__common__', - 'parent': u'Earn Deduction Detail', - 'parentfield': u'permissions', - 'parenttype': u'DocType', - 'permlevel': 0, - 'read': 1, - 'role': u'All', - 'write': 1 - }, - - # DocType, Earn Deduction Detail - { - 'doctype': 'DocType', - 'name': u'Earn Deduction Detail' - }, - - # DocPerm - { - 'doctype': u'DocPerm' - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'earn_deduction_name', - 'fieldtype': u'Data', - 'label': u'Earn/Deduction Name', - 'oldfieldname': u'earn_deduction_name', - 'oldfieldtype': u'Data' - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'mode', - 'fieldtype': u'Select', - 'label': u'Mode', - 'oldfieldname': u'mode', - 'oldfieldtype': u'Select', - 'options': u'\n%\nRs' - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'per', - 'fieldtype': u'Data', - 'label': u'Per.(%)', - 'oldfieldname': u'per', - 'oldfieldtype': u'Data' - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'amount', - 'fieldtype': u'Data', - 'label': u'Amount', - 'oldfieldname': u'amount', - 'oldfieldtype': u'Data' - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'type', - 'fieldtype': u'Data', - 'label': u'Type', - 'oldfieldname': u'type', - 'oldfieldtype': u'Data' - } -] \ No newline at end of file diff --git a/erpnext/hr/doctype/educational_qualifications/__init__.py b/erpnext/hr/doctype/educational_qualifications/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/erpnext/hr/doctype/educational_qualifications/educational_qualifications.txt b/erpnext/hr/doctype/educational_qualifications/educational_qualifications.txt deleted file mode 100644 index d45c009a29..0000000000 --- a/erpnext/hr/doctype/educational_qualifications/educational_qualifications.txt +++ /dev/null @@ -1,112 +0,0 @@ -# DocType, Educational Qualifications -[ - - # These values are common in all dictionaries - { - 'creation': '2012-03-27 14:35:54', - 'docstatus': 0, - 'modified': '2012-03-27 14:35:54', - 'modified_by': u'Administrator', - 'owner': u'Administrator' - }, - - # These values are common for all DocType - { - 'colour': u'White:FFF', - 'default_print_format': u'Standard', - 'doctype': 'DocType', - 'istable': 1, - 'module': u'HR', - 'name': '__common__', - 'section_style': u'Simple', - 'server_code_error': u' ', - 'show_in_menu': 0, - 'version': 12 - }, - - # These values are common for all DocField - { - 'doctype': u'DocField', - 'name': '__common__', - 'parent': u'Educational Qualifications', - 'parentfield': u'fields', - 'parenttype': u'DocType', - 'permlevel': 0 - }, - - # DocType, Educational Qualifications - { - 'doctype': 'DocType', - 'name': u'Educational Qualifications' - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'school_univ', - 'fieldtype': u'Data', - 'label': u'School/University', - 'oldfieldname': u'school_univ', - 'oldfieldtype': u'Data' - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'qualification', - 'fieldtype': u'Data', - 'label': u'Qualification (Degree/Diploma)', - 'oldfieldname': u'qualification', - 'oldfieldtype': u'Data', - 'reqd': 0, - 'search_index': 1, - 'width': u'170px' - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'level', - 'fieldtype': u'Select', - 'label': u'Level', - 'oldfieldname': u'level', - 'oldfieldtype': u'Select', - 'options': u'\nGraduate\nPost Graduate\nUnder Graduate', - 'reqd': 0, - 'search_index': 0 - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'year_of_passing', - 'fieldtype': u'Int', - 'label': u'Year of Passing', - 'oldfieldname': u'year_of_passing', - 'oldfieldtype': u'Int', - 'reqd': 0 - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'class_percent', - 'fieldtype': u'Data', - 'label': u'Class / Percentage', - 'oldfieldname': u'class_percent', - 'oldfieldtype': u'Data', - 'reqd': 0 - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'maj_opt_sub', - 'fieldtype': u'Data', - 'label': u'Major / Optional Subject', - 'oldfieldname': u'maj_opt_sub', - 'oldfieldtype': u'Data', - 'reqd': 0, - 'width': u'170px' - } -] \ No newline at end of file diff --git a/erpnext/hr/doctype/salary_slip/salary_slip.py b/erpnext/hr/doctype/salary_slip/salary_slip.py index f56b8a5d77..03504043e2 100644 --- a/erpnext/hr/doctype/salary_slip/salary_slip.py +++ b/erpnext/hr/doctype/salary_slip/salary_slip.py @@ -73,7 +73,7 @@ class DocType(TransactionBase): self.doc.clear_table(self.doclist, 'earning_details') self.doc.clear_table(self.doclist, 'deduction_details') - get_obj('DocType Mapper', 'Salary Structure-Salary Slip').dt_map('Salary Structure', 'Salary Slip', struct, self.doc, self.doclist, "[['Salary Structure', 'Salary Slip'],['Earning Detail', 'Salary Slip Earning'],['Deduction Detail','Salary Slip Deduction']]") + get_obj('DocType Mapper', 'Salary Structure-Salary Slip').dt_map('Salary Structure', 'Salary Slip', struct, self.doc, self.doclist, "[['Salary Structure', 'Salary Slip'],['Salary Structure Earning', 'Salary Slip Earning'],['Salary Structure Deduction','Salary Slip Deduction']]") basic_info = sql("select bank_name, bank_ac_no, esic_card_no, pf_number from `tabEmployee` where name ='%s'" % self.doc.employee) self.doc.bank_name = basic_info[0][0] diff --git a/erpnext/hr/doctype/salary_structure/salary_structure.js b/erpnext/hr/doctype/salary_structure/salary_structure.js index 383c11f3d8..eaba16b452 100644 --- a/erpnext/hr/doctype/salary_structure/salary_structure.js +++ b/erpnext/hr/doctype/salary_structure/salary_structure.js @@ -60,7 +60,7 @@ cur_frm.cscript['Make Salary Slip'] = function(){ 'from_doctype':'Salary Structure', 'to_doctype':'Salary Slip', 'from_docname':doc.name, - 'from_to_list':"[['Salary Structure', 'Salary Slip'], ['Earning Detail', 'Salary Slip Earning'], ['Deduction Detail', 'Salary Slip Deduction']]" + 'from_to_list':"[['Salary Structure', 'Salary Slip'], ['Salary Structure Earning', 'Salary Slip Earning'], ['Salary Structure Deduction', 'Salary Slip Deduction']]" }, function(r,rt) { n.fiscal_year = sys_defaults.fiscal_year; diff --git a/erpnext/hr/page/hr_home/hr_home.html b/erpnext/hr/page/hr_home/hr_home.html index 7d1f27fc2a..0b98157e8e 100644 --- a/erpnext/hr/page/hr_home/hr_home.html +++ b/erpnext/hr/page/hr_home/hr_home.html @@ -8,7 +8,7 @@

Attendance Mark

Leave Application

Applications for leave

-

Expense Voucher

+

Expense Claim

Claims for expenses

Salary Slip

Monthly salary statement

@@ -93,7 +93,7 @@
Key Performance Area (KRA) Template + href="#!List/Appraisal Template">Key Performance Area (KRA) Template
. """ - Reload DocLayer, Customize Form Field and Print Format doctypes + Reload Customize Form, Customize Form Field and Print Format doctypes """ def execute(): from webnotes.modules import reload_doc diff --git a/erpnext/patches/jan_mar_2012/rename_dt.py b/erpnext/patches/jan_mar_2012/rename_dt.py index a9a9c581b2..dfe0d276fb 100644 --- a/erpnext/patches/jan_mar_2012/rename_dt.py +++ b/erpnext/patches/jan_mar_2012/rename_dt.py @@ -7,10 +7,12 @@ from webnotes.modules import reload_doc from webnotes.utils import make_esc import os -def execute1(): - update_file_content({'Follow up': 'Communication'}) - def execute(): + rendt = get_dt_to_be_renamed() + rename_dt_files(rendt) + #update_local_file_system() + +def execute1(): # delete dt, mapper delete_dt_and_mapper() @@ -106,6 +108,7 @@ def delete_dt_and_mapper(): delete_doc('DocType', d) + def rename_in_db(ren_data, data_type, is_doctype): for d in ren_data: print colored('Renaming... ' + d + ' --> '+ ren_data[d], 'yellow') @@ -301,23 +304,30 @@ def update_local_file_system(): def update_file_content(rendt): for d in rendt: print colored('Renaming... ' + d + ' --> '+ rendt[d], 'yellow') - for extn in ['js', 'py', 'txt']: - replace_code('/var/www/erpnext/', d, rendt[d], extn) + for extn in ['js', 'py', 'txt', 'html']: + res = replace_code('/var/www/erpnext/', d, rendt[d], extn) + if res == 'skip': + break def rename_dt_files(rendt): for d in rendt: mod = webnotes.conn.sql("select module from tabDocType where name = %s", rendt[d])[0][0] - path = 'erpnext/' + '_'.join(mod.lower().split()) + '/doctype/' + if mod == 'Core': + os.chdir('/var/www/erpnext/lib/') + path = 'py/core/doctype/' + else: + os.chdir('/var/www/erpnext/') + path = 'erpnext/' + '_'.join(mod.lower().split()) + '/doctype/' old = '_'.join(d.lower().split()) new = '_'.join(rendt[d].lower().split()) + print 'git mv ' + path + old + ' ' + path + new # rename old dir os.system('git mv ' + path + old + ' ' + path + new) - print 'git mv ' + path + old + ' ' + path + new # rename all files in that dir - for extn in ['js', 'py', 'txt']: + for extn in ['js', 'py', 'txt', 'html']: if os.path.exists(path + new + '/'+ old + '.' +extn): os.system('git mv ' + path + new + '/'+ old + '.' +extn + ' ' + path + new + '/' + new + '.' +extn) print 'git mv ' + path + new + '/'+ old + '.' +extn + ' ' + path + new + '/' + new + '.' +extn diff --git a/erpnext/patches/mar_2012/usertags.py b/erpnext/patches/mar_2012/usertags.py new file mode 100644 index 0000000000..eff2543997 --- /dev/null +++ b/erpnext/patches/mar_2012/usertags.py @@ -0,0 +1,17 @@ +def execute(): + import webnotes + doctype_list = webnotes.conn.sql("""SELECT name FROM `tabDocType` + WHERE docstatus<2 AND IFNULL(issingle, 0)=0 + AND IFNULL(istable, 0)=0""") + webnotes.conn.commit() + for d in doctype_list: + add_col = True + desc = webnotes.conn.sql("DESC `tab%s`" % d[0], as_dict=1) + for td in desc: + if td.get('Field')=='_user_tags': + add_col = False + + if add_col: + webnotes.conn.sql("alter table `tab%s` add column `_user_tags` varchar(180)" % d[0]) + webnotes.conn.begin() + diff --git a/erpnext/patches/patch_list.py b/erpnext/patches/patch_list.py index db75ea4e99..d5ff35e8d0 100644 --- a/erpnext/patches/patch_list.py +++ b/erpnext/patches/patch_list.py @@ -256,5 +256,10 @@ patch_list = [ 'patch_module': 'patches.mar_2012', 'patch_file': 'delete_docformat', 'description': 'Deletes DocFormat from database' + }, + { + 'patch_module': 'patches.mar_2012', + 'patch_file': 'usertags', + 'description': 'Adds _user_tags columns to tables' } ] diff --git a/erpnext/patches/print_formats/DeliveryNoteClassic.html b/erpnext/patches/print_formats/DeliveryNoteClassic.html deleted file mode 100644 index 65d30e6577..0000000000 --- a/erpnext/patches/print_formats/DeliveryNoteClassic.html +++ /dev/null @@ -1,291 +0,0 @@ - - - - - - - - - - - -
- - - - - - - - - - - - - - - -

- - - - - - - - - - - - -
Name
Address
Contact
 - - - - - - - - -
Delivery Note Date
Sales Order No. -
- () -
-
-
- - -
-
- - - - - - - - - - - - - - -
- Terms, Conditions & Other Information:
- - 		- - - - - - - - - - - - - - - - - -
Net Total
Grand Total
Rounded Total
-
In Words
- -
-
- diff --git a/erpnext/patches/print_formats/DeliveryNoteModern.html b/erpnext/patches/print_formats/DeliveryNoteModern.html deleted file mode 100644 index 652358fca8..0000000000 --- a/erpnext/patches/print_formats/DeliveryNoteModern.html +++ /dev/null @@ -1,317 +0,0 @@ - - - - - - - - - - - -
- - - - - - - - - - - - - - - -
- - - - - - - - - - - - -
Name
Address
Contact
 - - - - - - - - - - - - -
Delivery Note No.
Delivery Note Date
Sales Order No. -
- () -
-
-
- - -
-
- - - - - - - - - - - - - - -
- Terms, Conditions & Other Information:
- - 		- - - - - - - - - - - - - - - - - -
Net Total
Grand Total
Rounded Total
-
In Words
- -
-
diff --git a/erpnext/patches/print_formats/DeliveryNoteSpartan.html b/erpnext/patches/print_formats/DeliveryNoteSpartan.html deleted file mode 100644 index 978183d2d5..0000000000 --- a/erpnext/patches/print_formats/DeliveryNoteSpartan.html +++ /dev/null @@ -1,312 +0,0 @@ - - - - - - - - - - - -
- - - - - - - - - - - - - - - -

- - - - - - - - - - - - -
Name
Address
Contact
 - - - - - - - - -
Delivery Note Date
Sales Order No. -
- () -
-
-
- - -
-
- - - - - - - - - - - - - - -
- Terms, Conditions & Other Information:
- - 		- - - - - - - - - - - - - - - - - -
Net Total
Grand Total
Rounded Total
-
In Words
- -
-
diff --git a/erpnext/patches/print_formats/PurchaseOrderClassic.html b/erpnext/patches/print_formats/PurchaseOrderClassic.html deleted file mode 100644 index e9a9ff8dae..0000000000 --- a/erpnext/patches/print_formats/PurchaseOrderClassic.html +++ /dev/null @@ -1,248 +0,0 @@ - - - - - - - - - - - -
- - - - - - - - - - - - - - - -

- - - - - - - - - - - - -
Name
Address
Contact
 - - - - -
Purchase Order Date
-
-
- - -
-
- - - - - - - - - - - - - - -
- Terms, Conditions & Other Information:
- - 		- - - - - - - - - - - - -
Net Total
Grand Total
-
In Words
- -
-
diff --git a/erpnext/patches/print_formats/PurchaseOrderModern.html b/erpnext/patches/print_formats/PurchaseOrderModern.html deleted file mode 100644 index 73b607b4ad..0000000000 --- a/erpnext/patches/print_formats/PurchaseOrderModern.html +++ /dev/null @@ -1,275 +0,0 @@ - - - - - - - - - - - -
- - - - - - - - - - - - - - - -
- - - - - - - - - - - - -
Name
Address
Contact
 - - - - - - - - -
Purchase Order No.
Purchase Order Date
-
-
- - -
-
- - - - - - - - - - - - - - -
- Terms, Conditions & Other Information:
- - 		- - - - - - - - - - - - -
Net Total
Grand Total
-
In Words
- -
-
diff --git a/erpnext/patches/print_formats/PurchaseOrderSpartan.html b/erpnext/patches/print_formats/PurchaseOrderSpartan.html deleted file mode 100644 index 9058e0c588..0000000000 --- a/erpnext/patches/print_formats/PurchaseOrderSpartan.html +++ /dev/null @@ -1,270 +0,0 @@ - - - - - - - - - - - -
- - - - - - - - - - - - - - - -

- - - - - - - - - - - - -
Name
Address
Contact
 - - - - -
Purchase Order Date
-
-
- - -
-
- - - - - - - - - - - - - - -
- Terms, Conditions & Other Information:
- - 		- - - - - - - - - - - - -
Net Total
Grand Total
-
In Words
- -
-
diff --git a/erpnext/patches/print_formats/QuotationClassic.html b/erpnext/patches/print_formats/QuotationClassic.html deleted file mode 100644 index ca6975594f..0000000000 --- a/erpnext/patches/print_formats/QuotationClassic.html +++ /dev/null @@ -1,275 +0,0 @@ - - - - - - - - - - - -
- - - - - - - - - - - - - - - -
- -

- - - - - - - - - - - - -
Name
Address
Contact
 - - - - -
Quotation Date
-
-
- - -
-
- - - - - - - - - - - - - - -
- Terms, Conditions & Other Information:
- - 		- - - - - - - - - - - - - - - - - -
Net Total
Grand Total
Rounded Total
-
In Words
- -
-
diff --git a/erpnext/patches/print_formats/QuotationModern.html b/erpnext/patches/print_formats/QuotationModern.html deleted file mode 100644 index 7f7727ab47..0000000000 --- a/erpnext/patches/print_formats/QuotationModern.html +++ /dev/null @@ -1,300 +0,0 @@ - - - - - - - - - - - -
- - - - - - - - - - - - - - - -
- - - - - - - - - - - - -
Name
Address
Contact
 - - - - - - - - -
Quotation No.
Quotation Date
-
-
- - -
-
- - - - - - - - - - - - - - -
- Terms, Conditions & Other Information:
- - 		- - - - - - - - - - - - - - - - - -
Net Total
Grand Total
Rounded Total
-
In Words
- -
-
diff --git a/erpnext/patches/print_formats/QuotationSpartan.html b/erpnext/patches/print_formats/QuotationSpartan.html deleted file mode 100644 index e0829933d5..0000000000 --- a/erpnext/patches/print_formats/QuotationSpartan.html +++ /dev/null @@ -1,295 +0,0 @@ - - - - - - - - - - - -
- - - - - - - - - - - - - - - -

- - - - - - - - - - - - -
Name
Address
Contact
 - - - - -
Quotation Date
-
-
- - -
-
- - - - - - - - - - - - - - -
- Terms, Conditions & Other Information:
- - 		- - - - - - - - - - - - - - - - - -
Net Total
Grand Total
Rounded Total
-
In Words
- -
-
diff --git a/erpnext/patches/print_formats/SalesInvoiceClassic.html b/erpnext/patches/print_formats/SalesInvoiceClassic.html deleted file mode 100644 index d40f80152b..0000000000 --- a/erpnext/patches/print_formats/SalesInvoiceClassic.html +++ /dev/null @@ -1,277 +0,0 @@ - - - - - - - - - - - -
- - - - - - - - - - - - - - - -

- - - - - - - - - - - - -
Name
Address
Contact
 - - - - - - - - -
Invoice Date
Due Date
-
-
- - -
-
- - - - - - - - - - - - - - -
- Terms, Conditions & Other Information:
- - 		- - - - - - - - - - - - - - - - - -
Net Total
Grand Total
Rounded Total
-
In Words
- -
-
diff --git a/erpnext/patches/print_formats/SalesInvoiceModern.html b/erpnext/patches/print_formats/SalesInvoiceModern.html deleted file mode 100644 index ac66423495..0000000000 --- a/erpnext/patches/print_formats/SalesInvoiceModern.html +++ /dev/null @@ -1,304 +0,0 @@ - - - - - - - - - - - -
- - - - - - - - - - - - - - - -
- - - - - - - - - - - - -
Name
Address
Contact
 - - - - - - - - - - - - -
Invoice No.
Invoice Date
Due Date
-
-
- - -
-
- - - - - - - - - - - - - - -
- Terms, Conditions & Other Information:
- - 		- - - - - - - - - - - - - - - - - -
Net Total
Grand Total
Rounded Total
-
In Words
- -
-
diff --git a/erpnext/patches/print_formats/SalesInvoiceSpartan.html b/erpnext/patches/print_formats/SalesInvoiceSpartan.html deleted file mode 100644 index 81e1c380fe..0000000000 --- a/erpnext/patches/print_formats/SalesInvoiceSpartan.html +++ /dev/null @@ -1,299 +0,0 @@ - - - - - - - - - - - -
- - - - - - - - - - - - - - - -

- - - - - - - - - - - - -
Name
Address
Contact
 - - - - - - - - -
Invoice Date
Due Date
-
-
- - -
-
- - - - - - - - - - - - - - -
- Terms, Conditions & Other Information:
- - 		- - - - - - - - - - - - - - - - - -
Net Total
Grand Total
Rounded Total
-
In Words
- -
-
diff --git a/erpnext/patches/print_formats/SalesOrderClassic.html b/erpnext/patches/print_formats/SalesOrderClassic.html deleted file mode 100644 index 070feb05e1..0000000000 --- a/erpnext/patches/print_formats/SalesOrderClassic.html +++ /dev/null @@ -1,277 +0,0 @@ - - - - - - - - - - - -
- - - - - - - - - - - - - - - -

- - - - - - - - - - - - -
Name
Address
Contact
 - - - - - - - - -
Sales Order Date
Delivery Date
-
-
- - -
-
- - - - - - - - - - - - - - -
- Terms, Conditions & Other Information:
- - 		- - - - - - - - - - - - - - - - - -
Net Total
Grand Total
Rounded Total
-
In Words
- -
-
diff --git a/erpnext/patches/print_formats/SalesOrderModern.html b/erpnext/patches/print_formats/SalesOrderModern.html deleted file mode 100644 index e2ac0c1bd4..0000000000 --- a/erpnext/patches/print_formats/SalesOrderModern.html +++ /dev/null @@ -1,304 +0,0 @@ - - - - - - - - - - - -
- - - - - - - - - - - - - - - -
- - - - - - - - - - - - -
Name
Address
Contact
 - - - - - - - - - - - - -
Sales Order No.
Sales Order Date
Delivery Date
-
-
- - -
-
- - - - - - - - - - - - - - -
- Terms, Conditions & Other Information:
- - 		- - - - - - - - - - - - - - - - - -
Net Total
Grand Total
Rounded Total
-
In Words
- -
-
diff --git a/erpnext/patches/print_formats/SalesOrderSpartan.html b/erpnext/patches/print_formats/SalesOrderSpartan.html deleted file mode 100644 index 866e84fbc0..0000000000 --- a/erpnext/patches/print_formats/SalesOrderSpartan.html +++ /dev/null @@ -1,299 +0,0 @@ - - - - - - - - - - - -
- - - - - - - - - - - - - - - -

- - - - - - - - - - - - -
Name
Address
Contact
 - - - - - - - - -
Sales Order Date
Delivery Date
-
-
- - -
-
- - - - - - - - - - - - - - -
- Terms, Conditions & Other Information:
- - 		- - - - - - - - - - - - - - - - - -
Net Total
Grand Total
Rounded Total
-
In Words
- -
-
diff --git a/erpnext/production/doctype/bom_replace_utility/__init__.py b/erpnext/production/doctype/bom_replace_utility/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/erpnext/production/doctype/bom_replace_utility/bom_replace_utility.js b/erpnext/production/doctype/bom_replace_utility/bom_replace_utility.js deleted file mode 100644 index efaf61f4e8..0000000000 --- a/erpnext/production/doctype/bom_replace_utility/bom_replace_utility.js +++ /dev/null @@ -1,36 +0,0 @@ -// ERPNext - web based ERP (http://erpnext.com) -// Copyright (C) 2012 Web Notes Technologies Pvt Ltd -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . - - -// Get Query functions -cur_frm.fields_dict['s_bom'].get_query = function(doc) { - return 'SELECT `tabBOM`.`name` FROM `tabBOM` WHERE `tabBOM`.`docstatus` = 1 AND `tabBOM`.%(key)s LIKE "%s" ORDER BY `tabBOM`.`name` DESC LIMIT 50'; -} - -cur_frm.fields_dict['r_bom'].get_query = function(doc) { - return 'SELECT `tabBOM`.`name` FROM `tabBOM` WHERE `tabBOM`.`docstatus` = 1 and `tabBOM`.%(key)s LIKE "%s" ORDER BY `tabBOM`.`name` DESC LIMIT 50'; -} - -cur_frm.fields_dict['s_item'].get_query = function(doc) { - return 'SELECT DISTINCT `tabItem`.name FROM `tabItem` WHERE (IFNULL(`tabItem`.`end_of_life`,"") = "" OR `tabItem`.`end_of_life` ="0000-00-00" OR `tabItem`.`end_of_life` > NOW()) AND (`tabItem`.is_purchase_item = "Yes" OR`tabItem`.is_sub_contracted_item = "Yes") AND tabItem.%(key)s LIKE "%s" ORDER BY `tabItem`.item_code LIMIT 50'; -} - -cur_frm.fields_dict['r_item'].get_query = function(doc) { - return 'SELECT DISTINCT `tabItem`.name FROM `tabItem` WHERE (IFNULL(`tabItem`.`end_of_life`,"") = "" OR `tabItem`.`end_of_life` ="0000-00-00" OR `tabItem`.`end_of_life` > NOW()) AND (`tabItem`.is_purchase_item = "Yes" OR`tabItem`.is_sub_contracted_item = "Yes") AND tabItem.%(key)s LIKE "%s" ORDER BY `tabItem`.item_code LIMIT 50'; -} - -// Client Triggers - diff --git a/erpnext/production/doctype/bom_replace_utility/bom_replace_utility.py b/erpnext/production/doctype/bom_replace_utility/bom_replace_utility.py deleted file mode 100644 index 31b147328e..0000000000 --- a/erpnext/production/doctype/bom_replace_utility/bom_replace_utility.py +++ /dev/null @@ -1,143 +0,0 @@ -# ERPNext - web based ERP (http://erpnext.com) -# Copyright (C) 2012 Web Notes Technologies Pvt Ltd -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -# Please edit this list and import only required elements -import webnotes - -from webnotes.utils import add_days, add_months, add_years, cint, cstr, date_diff, default_fields, flt, fmt_money, formatdate, generate_hash, getTraceback, get_defaults, get_first_day, get_last_day, getdate, has_common, month_name, now, nowdate, replace_newlines, sendmail, set_default, str_esc_quote, user_format, validate_email_add -from webnotes.model import db_exists -from webnotes.model.doc import Document, addchild, removechild, getchildren, make_autoname, SuperDocType -from webnotes.model.doclist import getlist, copy_doclist -from webnotes.model.code import get_obj, get_server_obj, run_server_obj, updatedb, check_syntax -from webnotes import session, form, is_testing, msgprint, errprint - -set = webnotes.conn.set -sql = webnotes.conn.sql -get_value = webnotes.conn.get_value -in_transaction = webnotes.conn.in_transaction -convert_to_lists = webnotes.conn.convert_to_lists - -# ----------------------------------------------------------------------------------------- - - -class DocType: - def __init__(self, doc, doclist=[]): - self.doc = doc - self.doclist = doclist - - def search_parent_bom_of_bom(self): - pbom = sql("select parent from `tabBOM Item` where bom_no = '%s' and docstatus = 1 " % self.doc.s_bom ) - self.doc.clear_table(self.doclist,'replace_bom_details', 1) - self.add_to_replace_bom_utility_detail(pbom, 'replace_bom_details') - - def search_parent_bom_of_item(self): - pbom = sql("select parent from `tabBOM Item` where item_code = '%s' and (bom_no is NULL or bom_no = '') and docstatus =1" % self.doc.s_item ) - self.doc.clear_table(self.doclist,'replace_item_details', 1) - self.add_to_replace_bom_utility_detail(pbom, 'replace_item_details') - - def add_to_replace_bom_utility_detail(self, pbom, t_fname): - for d in pbom: - br_child = addchild( self.doc, t_fname, 'BOM Replace Utility Detail', 0,self.doclist) - br_child.parent_bom = d[0] - br_child.save() - self.doc.save() - - def replace_bom(self): - # validate r_bom - bom = sql("select name, is_active, docstatus from `tabBOM` where name = %s",self.doc.r_bom, as_dict =1) - if not bom: - msgprint("Please Enter Valid BOM to replace with.") - raise Exception - if bom and bom[0]['is_active'] != 'Yes': - msgprint("BOM '%s' is not Active BOM." % cstr(self.doc.r_bom)) - raise Exception - if bom and flt(bom[0]['docstatus']) != 1: - msgprint("BOM '%s' is not Submitted BOM." % cstr(self.doc.r_bom)) - raise Exception - - # get item code of r_bom - item_code = cstr(sql("select item from `tabBOM` where name = '%s' " % self.doc.r_bom)[0][0]) - # call replace bom engine - self.replace_bom_engine('replace_bom_details', 'bom_no', self.doc.s_bom, self.doc.r_bom, item_code) - - def replace_item(self): - item = sql("select name, is_active from `tabItem` where name = %s", self.doc.r_item, as_dict = 1) - if not item: - msgprint("Please enter Valid Item Code to replace with.") - raise Exception - if item and item[0]['is_active'] != 'Yes': - msgprint("Item Code '%s' is not Active Item." % cstr(self.doc.r_item)) - raise Exception - self.replace_bom_engine('replace_item_details', 'item_code', self.doc.s_item, self.doc.r_item) - - def replace_data_in_bom_materials(self, dl, fname, s_data, r_data, item_code =''): - for d in getlist(dl, 'bom_materials'): - if d.fields[fname] == s_data: - d.fields[fname] = r_data - if fname == 'bom_no': - d.item_code = item_code - d.save() - - def replace_bom_engine(self, t_fname, fname, s_data, r_data, item_code = ''): - if not r_data: - msgprint("Please Enter '%s' and then click on '%s'." % ((t_fname == 'replace_bom_details') and 'BOM to Replace' or 'Item to Replace',(t_fname == 'replace_bom_details') and 'Replace BOM' or 'Replace Item' )) - raise Exception - - for d in getlist(self.doclist, t_fname): - if d.bom_created: - msgprint("Please click on '%s' and then on '%s'." % ((t_fname == 'replace_bom_details') and 'Search BOM' or 'Search Item',(t_fname == 'replace_bom_details') and 'Replace BOM' or 'Replace Item' )) - raise Exception - - if d.replace: - # copy_doclist is the framework funcn which create duplicate document and returns doclist of new document - # Reinder := - # make copy - if self.doc.create_new_bom: - import webnotes.model.doc - new_bom_dl = copy_doclist(webnotes.model.doc.get('BOM', d.parent_bom), no_copy = ['is_active', 'is_default', 'is_sub_assembly', 'remarks', 'flat_bom_details']) - - new_bom_dl[0].docstatus = 0 - new_bom_dl[0].save() - else: - new_bom_dl = get_obj('BOM', d.parent_bom, with_children = 1).doclist - - # replace s_data with r_data in Bom Material Detail Table - self.replace_data_in_bom_materials(new_bom_dl, fname, s_data, r_data, item_code) - - d.bom_created = new_bom_dl[0].name - d.save() - - def update_docstatus(self): - sql("update `tabBOM` set docstatus = 0 where name = '%s' limit 1" % self.doc.bom) - msgprint("Updated") - - def update_bom(self): - self.check_bom_list = [] - main_bom_list = get_obj('Production Control').traverse_bom_tree(self.doc.fg_bom_no, 1) - main_bom_list.reverse() - # run calculate cost and get - #msgprint(main_bom_list) - for bom in main_bom_list: - if bom and bom not in self.check_bom_list: - bom_obj = get_obj('BOM', bom, with_children = 1) - #print(bom_obj.doc.fields) - bom_obj.validate() - bom_obj.doc.docstatus = 1 - bom_obj.check_recursion() - bom_obj.update_flat_bom_engine(is_submit = 1) - bom_obj.doc.docstatus = 1 - bom_obj.doc.save() - self.check_bom_list.append(bom) diff --git a/erpnext/production/doctype/bom_replace_utility/bom_replace_utility.txt b/erpnext/production/doctype/bom_replace_utility/bom_replace_utility.txt deleted file mode 100644 index acfc964797..0000000000 --- a/erpnext/production/doctype/bom_replace_utility/bom_replace_utility.txt +++ /dev/null @@ -1,383 +0,0 @@ -# DocType, BOM Replace Utility -[ - - # These values are common in all dictionaries - { - 'creation': '2012-03-27 14:36:02', - 'docstatus': 0, - 'modified': '2012-03-27 14:36:02', - 'modified_by': u'Administrator', - 'owner': u'jai@webnotestech.com' - }, - - # These values are common for all DocType - { - 'colour': u'White:FFF', - 'doctype': 'DocType', - 'issingle': 1, - 'module': u'Production', - 'name': '__common__', - 'section_style': u'Tray', - 'server_code_error': u' ', - 'show_in_menu': 1, - 'version': 56 - }, - - # These values are common for all DocField - { - 'doctype': u'DocField', - 'name': '__common__', - 'parent': u'BOM Replace Utility', - 'parentfield': u'fields', - 'parenttype': u'DocType', - 'permlevel': 0 - }, - - # These values are common for all DocPerm - { - 'doctype': u'DocPerm', - 'name': '__common__', - 'parent': u'BOM Replace Utility', - 'parentfield': u'permissions', - 'parenttype': u'DocType', - 'read': 1 - }, - - # DocType, BOM Replace Utility - { - 'doctype': 'DocType', - 'name': u'BOM Replace Utility' - }, - - # DocPerm - { - 'create': 1, - 'doctype': u'DocPerm', - 'permlevel': 0, - 'role': u'System Manager', - 'write': 1 - }, - - # DocPerm - { - 'create': 1, - 'doctype': u'DocPerm', - 'permlevel': 0, - 'role': u'Production User', - 'write': 1 - }, - - # DocPerm - { - 'create': 1, - 'doctype': u'DocPerm', - 'permlevel': 0, - 'role': u'Production Manager', - 'submit': 0, - 'write': 1 - }, - - # DocPerm - { - 'doctype': u'DocPerm', - 'permlevel': 1, - 'role': u'System Manager' - }, - - # DocPerm - { - 'doctype': u'DocPerm', - 'permlevel': 1, - 'role': u'Production User' - }, - - # DocPerm - { - 'doctype': u'DocPerm', - 'permlevel': 1, - 'role': u'Production Manager' - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'create_new_bom', - 'fieldtype': u'Check', - 'label': u'Create New BOM' - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'bom_details', - 'fieldtype': u'Section Break', - 'label': u'BOM Details' - }, - - # DocField - { - 'colour': u'White:FFF', - 'description': u'Select the relevant BOM to be replaced which is actually a raw material used for a parent BOM.', - 'doctype': u'DocField', - 'fieldname': u's_bom', - 'fieldtype': u'Link', - 'label': u'Select BOM', - 'options': u'BOM', - 'trigger': u'Client' - }, - - # DocField - { - 'colour': u'White:FFF', - 'doctype': u'DocField', - 'fieldname': u'note_1', - 'fieldtype': u'HTML', - 'label': u'Note 1', - 'options': u'Click on the button "Search BOM" to fetch in the table below all the parent BOMs in which the above selected BOM is used as a raw material.' - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'column_break0', - 'fieldtype': u'Column Break' - }, - - # DocField - { - 'colour': u'White:FFF', - 'doctype': u'DocField', - 'fieldname': u'search_bom', - 'fieldtype': u'Button', - 'label': u'Search BOM', - 'options': u'search_parent_bom_of_bom' - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'section_break0', - 'fieldtype': u'Section Break', - 'options': u'Simple' - }, - - # DocField - { - 'colour': u'White:FFF', - 'description': u'Select the BOM by which you want the above sected BOM to be replaced.', - 'doctype': u'DocField', - 'fieldname': u'r_bom', - 'fieldtype': u'Link', - 'label': u'Replace Bom with', - 'options': u'BOM', - 'trigger': u'Client' - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'note_2', - 'fieldtype': u'HTML', - 'label': u'Note 2', - 'options': u'Click on the button "Replace BOM" after checking under the column Replace against relevant Parent BOMs' - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'column_break1', - 'fieldtype': u'Column Break' - }, - - # DocField - { - 'colour': u'White:FFF', - 'doctype': u'DocField', - 'fieldname': u'replace_bom', - 'fieldtype': u'Button', - 'label': u'Replace BOM', - 'options': u'replace_bom' - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'section_break1', - 'fieldtype': u'Section Break', - 'options': u'Simple' - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'replace_bom_details', - 'fieldtype': u'Table', - 'label': u'Replace BOM Detail', - 'options': u'BOM Replace Utility Detail' - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'item_details', - 'fieldtype': u'Section Break', - 'label': u'Item Details' - }, - - # DocField - { - 'colour': u'White:FFF', - 'description': u'Select the relevant item to be replaced which is actually a raw material used for a parent BOM.', - 'doctype': u'DocField', - 'fieldname': u's_item', - 'fieldtype': u'Link', - 'label': u'Select Item', - 'options': u'Item', - 'trigger': u'Client' - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'note_3', - 'fieldtype': u'HTML', - 'label': u'Note 3', - 'options': u'Click on the button "Search Item" to fetch in the table below all the parent BOMs in which the above selected item is used as a raw material.' - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'column_break2', - 'fieldtype': u'Column Break' - }, - - # DocField - { - 'colour': u'White:FFF', - 'doctype': u'DocField', - 'fieldname': u'search_item', - 'fieldtype': u'Button', - 'label': u'Search Item', - 'options': u'search_parent_bom_of_item' - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'section_break2', - 'fieldtype': u'Section Break', - 'options': u'Simple' - }, - - # DocField - { - 'colour': u'White:FFF', - 'description': u'Select the item by which you want the above sected item to be replaced.', - 'doctype': u'DocField', - 'fieldname': u'r_item', - 'fieldtype': u'Link', - 'label': u'Replace Item with', - 'options': u'Item', - 'trigger': u'Client' - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'note_4', - 'fieldtype': u'HTML', - 'label': u'Note 4', - 'options': u'Click on the button "Replace Item" after checking under the column Replace against relevant Parent BOMs' - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'column_break3', - 'fieldtype': u'Column Break' - }, - - # DocField - { - 'colour': u'White:FFF', - 'doctype': u'DocField', - 'fieldname': u'replace_item', - 'fieldtype': u'Button', - 'label': u'Replace Item', - 'options': u'replace_item' - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'section_break3', - 'fieldtype': u'Section Break', - 'options': u'Simple' - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'replace_item_details', - 'fieldtype': u'Table', - 'label': u'Replace Item Detail', - 'options': u'BOM Replace Utility Detail' - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'update_bom_tree', - 'fieldtype': u'Section Break', - 'label': u'Update BOM Tree' - }, - - # DocField - { - 'colour': u'White:FFF', - 'description': u'Select the root Bill of Materials in which raw materials are replaced and click on the button below to update costs.', - 'doctype': u'DocField', - 'fieldname': u'fg_bom_no', - 'fieldtype': u'Link', - 'label': u'FG BOM No', - 'options': u'BOM' - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'update', - 'fieldtype': u'Button', - 'label': u'Update', - 'options': u'update_bom' - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'update_bom', - 'fieldtype': u'Section Break', - 'label': u'Update BOM' - }, - - # DocField - { - 'colour': u'White:FFF', - 'doctype': u'DocField', - 'fieldname': u'bom', - 'fieldtype': u'Link', - 'label': u'BOM', - 'options': u'BOM' - }, - - # DocField - { - 'colour': u'White:FFF', - 'doctype': u'DocField', - 'fieldname': u'update_docstatus', - 'fieldtype': u'Button', - 'label': u'Update Docstatus', - 'options': u'update_docstatus' - } -] \ No newline at end of file diff --git a/erpnext/production/doctype/bom_replace_utility_detail/__init__.py b/erpnext/production/doctype/bom_replace_utility_detail/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/erpnext/production/doctype/bom_replace_utility_detail/bom_replace_utility_detail.txt b/erpnext/production/doctype/bom_replace_utility_detail/bom_replace_utility_detail.txt deleted file mode 100644 index a001555b89..0000000000 --- a/erpnext/production/doctype/bom_replace_utility_detail/bom_replace_utility_detail.txt +++ /dev/null @@ -1,101 +0,0 @@ -# DocType, BOM Replace Utility Detail -[ - - # These values are common in all dictionaries - { - 'creation': '2012-03-27 14:36:02', - 'docstatus': 0, - 'modified': '2012-03-27 14:36:02', - 'modified_by': u'Administrator', - 'owner': u'jai@webnotestech.com' - }, - - # These values are common for all DocType - { - 'autoname': u'BRUD/.#####', - 'colour': u'White:FFF', - 'doctype': 'DocType', - 'hide_toolbar': 1, - 'in_create': 1, - 'istable': 1, - 'module': u'Production', - 'name': '__common__', - 'read_only': 1, - 'section_style': u'Simple', - 'server_code_error': u' ', - 'show_in_menu': 0, - 'version': 8 - }, - - # These values are common for all DocField - { - 'doctype': u'DocField', - 'name': '__common__', - 'parent': u'BOM Replace Utility Detail', - 'parentfield': u'fields', - 'parenttype': u'DocType' - }, - - # These values are common for all DocPerm - { - 'create': 0, - 'doctype': u'DocPerm', - 'name': '__common__', - 'parent': u'BOM Replace Utility Detail', - 'parentfield': u'permissions', - 'parenttype': u'DocType', - 'permlevel': 0, - 'read': 1, - 'role': u'System Manager', - 'write': 1 - }, - - # DocType, BOM Replace Utility Detail - { - 'doctype': 'DocType', - 'name': u'BOM Replace Utility Detail' - }, - - # DocPerm - { - 'doctype': u'DocPerm' - }, - - # DocField - { - 'colour': u'White:FFF', - 'doctype': u'DocField', - 'fieldname': u'parent_bom', - 'fieldtype': u'Link', - 'label': u'Parent BOM', - 'oldfieldname': u'parent_bom', - 'oldfieldtype': u'Link', - 'options': u'BOM', - 'permlevel': 1, - 'reqd': 1 - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'replace', - 'fieldtype': u'Check', - 'label': u'Replace', - 'oldfieldname': u'replace', - 'oldfieldtype': u'Check', - 'permlevel': 0 - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'bom_created', - 'fieldtype': u'Link', - 'label': u'BOM Created', - 'oldfieldname': u'bom_created', - 'oldfieldtype': u'Link', - 'options': u'BOM', - 'permlevel': 1, - 'search_index': 0 - } -] \ No newline at end of file diff --git a/erpnext/production/doctype/bom_report_detail/__init__.py b/erpnext/production/doctype/bom_report_detail/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/erpnext/production/doctype/bom_report_detail/bom_report_detail.txt b/erpnext/production/doctype/bom_report_detail/bom_report_detail.txt deleted file mode 100644 index d74d9ba83b..0000000000 --- a/erpnext/production/doctype/bom_report_detail/bom_report_detail.txt +++ /dev/null @@ -1,152 +0,0 @@ -# DocType, BOM Report Detail -[ - - # These values are common in all dictionaries - { - 'creation': '2012-03-27 14:36:03', - 'docstatus': 0, - 'modified': '2012-03-27 14:36:03', - 'modified_by': u'Administrator', - 'owner': u'Administrator' - }, - - # These values are common for all DocType - { - 'colour': u'White:FFF', - 'doctype': 'DocType', - 'istable': 1, - 'module': u'Production', - 'name': '__common__', - 'section_style': u'Simple', - 'show_in_menu': 0, - 'version': 8 - }, - - # These values are common for all DocField - { - 'doctype': u'DocField', - 'name': '__common__', - 'parent': u'BOM Report Detail', - 'parentfield': u'fields', - 'parenttype': u'DocType' - }, - - # These values are common for all DocPerm - { - 'doctype': u'DocPerm', - 'name': '__common__', - 'parent': u'BOM Report Detail', - 'parentfield': u'permissions', - 'parenttype': u'DocType', - 'read': 1, - 'role': u'System Manager' - }, - - # DocType, BOM Report Detail - { - 'doctype': 'DocType', - 'name': u'BOM Report Detail' - }, - - # DocPerm - { - 'doctype': u'DocPerm', - 'permlevel': 0, - 'write': 1 - }, - - # DocPerm - { - 'doctype': u'DocPerm', - 'permlevel': 1 - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'item_code', - 'fieldtype': u'Link', - 'in_filter': 1, - 'label': u'Item Code', - 'oldfieldname': u'item_code', - 'oldfieldtype': u'Link', - 'options': u'Item', - 'permlevel': 0, - 'reqd': 1, - 'search_index': 1, - 'trigger': u'Client' - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'description', - 'fieldtype': u'Text', - 'label': u'Description', - 'oldfieldname': u'description', - 'oldfieldtype': u'Text', - 'permlevel': 1, - 'reqd': 0, - 'width': u'300px' - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'moving_avg_rate', - 'fieldtype': u'Currency', - 'label': u'Moving Avg Rate', - 'oldfieldname': u'moving_avg_rate', - 'oldfieldtype': u'Currency', - 'permlevel': 1 - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'amount', - 'fieldtype': u'Currency', - 'label': u'Amount', - 'oldfieldname': u'amount', - 'oldfieldtype': u'Currency', - 'permlevel': 1, - 'reqd': 0 - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'last_purchase_rate', - 'fieldtype': u'Currency', - 'label': u'Last Purchase Rate', - 'oldfieldname': u'last_purchase_rate', - 'oldfieldtype': u'Currency', - 'permlevel': 1, - 'width': u'150px' - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'qty', - 'fieldtype': u'Data', - 'label': u'Qty', - 'oldfieldname': u'qty', - 'oldfieldtype': u'Data', - 'permlevel': 1, - 'reqd': 1, - 'trigger': u'Client' - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'stock_uom', - 'fieldtype': u'Data', - 'label': u'Stock UOM', - 'oldfieldname': u'stock_uom', - 'oldfieldtype': u'Data', - 'permlevel': 1, - 'reqd': 0 - } -] \ No newline at end of file diff --git a/erpnext/production/doctype/pf_detail/__init__.py b/erpnext/production/doctype/pf_detail/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/erpnext/production/doctype/pf_detail/pf_detail.txt b/erpnext/production/doctype/pf_detail/pf_detail.txt deleted file mode 100644 index c222604244..0000000000 --- a/erpnext/production/doctype/pf_detail/pf_detail.txt +++ /dev/null @@ -1,230 +0,0 @@ -# DocType, PF Detail -[ - - # These values are common in all dictionaries - { - 'creation': '2012-03-27 14:36:03', - 'docstatus': 0, - 'modified': '2012-03-27 14:45:49', - 'modified_by': u'Administrator', - 'owner': u'Administrator' - }, - - # These values are common for all DocType - { - 'autoname': u'PFD/.#####', - 'colour': u'White:FFF', - 'doctype': 'DocType', - 'is_submittable': 1, - 'istable': 1, - 'module': u'Production', - 'name': '__common__', - 'section_style': u'Simple', - 'show_in_menu': 0, - 'version': 1 - }, - - # These values are common for all DocField - { - 'doctype': u'DocField', - 'name': '__common__', - 'parent': u'PF Detail', - 'parentfield': u'fields', - 'parenttype': u'DocType' - }, - - # These values are common for all DocPerm - { - 'doctype': u'DocPerm', - 'name': '__common__', - 'parent': u'PF Detail', - 'parentfield': u'permissions', - 'parenttype': u'DocType', - 'read': 1, - 'role': u'System Manager' - }, - - # DocType, PF Detail - { - 'doctype': 'DocType', - 'name': u'PF Detail' - }, - - # DocPerm - { - 'create': 1, - 'doctype': u'DocPerm', - 'permlevel': 0, - 'submit': 1, - 'write': 1 - }, - - # DocPerm - { - 'doctype': u'DocPerm', - 'permlevel': 1 - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'item_code', - 'fieldtype': u'Link', - 'in_filter': 1, - 'label': u'Item Code', - 'oldfieldname': u'item_code', - 'oldfieldtype': u'Link', - 'options': u'Item', - 'permlevel': 0, - 'reqd': 1, - 'search_index': 1, - 'trigger': u'Client', - 'width': u'150px' - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'description', - 'fieldtype': u'Text', - 'label': u'Description', - 'oldfieldname': u'description', - 'oldfieldtype': u'Text', - 'permlevel': 1, - 'width': u'300px' - }, - - # DocField - { - 'default': u'0.00', - 'doctype': u'DocField', - 'fieldname': u'planned_qty', - 'fieldtype': u'Currency', - 'label': u'Planned Quantity', - 'oldfieldname': u'planned_qty', - 'oldfieldtype': u'Currency', - 'permlevel': 1, - 'width': u'100px' - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'produced_qty', - 'fieldtype': u'Currency', - 'label': u'Produced Quantity', - 'oldfieldname': u'produced_qty', - 'oldfieldtype': u'Currency', - 'permlevel': 1, - 'width': u'100px' - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'start_date', - 'fieldtype': u'Date', - 'hidden': 0, - 'in_filter': 0, - 'label': u'Start Date', - 'oldfieldname': u'start_date', - 'oldfieldtype': u'Date', - 'permlevel': 0, - 'report_hide': 0, - 'reqd': 1, - 'search_index': 0, - 'width': u'100px' - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'end_date', - 'fieldtype': u'Date', - 'hidden': 0, - 'in_filter': 0, - 'label': u'End Date', - 'oldfieldname': u'end_date', - 'oldfieldtype': u'Date', - 'permlevel': 0, - 'report_hide': 0, - 'reqd': 1, - 'search_index': 0, - 'width': u'100px' - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'qty', - 'fieldtype': u'Currency', - 'label': u'Quantity', - 'oldfieldname': u'qty', - 'oldfieldtype': u'Currency', - 'permlevel': 0, - 'reqd': 1, - 'width': u'100px' - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'forecast_date', - 'fieldtype': u'Date', - 'hidden': 1, - 'label': u'Forecast Date', - 'oldfieldname': u'forecast_date', - 'oldfieldtype': u'Date', - 'permlevel': 1, - 'report_hide': 1 - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'forecast_due_date', - 'fieldtype': u'Date', - 'hidden': 1, - 'label': u'Forecast Due Date', - 'oldfieldname': u'forecast_due_date', - 'oldfieldtype': u'Date', - 'permlevel': 1, - 'report_hide': 1 - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'stock_uom', - 'fieldtype': u'Data', - 'label': u'Stock UOM', - 'oldfieldname': u'stock_uom', - 'oldfieldtype': u'Data', - 'permlevel': 1 - }, - - # DocField - { - 'depends_on': u'eval:doc.amended_from', - 'description': u'The date at which current entry is corrected in the system.', - 'doctype': u'DocField', - 'fieldname': u'amendment_date', - 'fieldtype': u'Date', - 'label': u'Amendment Date', - 'no_copy': 1, - 'permlevel': 0, - 'print_hide': 1 - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'amended_from', - 'fieldtype': u'Link', - 'label': u'Amended From', - 'no_copy': 1, - 'options': u'Sales Invoice', - 'permlevel': 1, - 'print_hide': 1 - } -] \ No newline at end of file diff --git a/erpnext/production/doctype/ppw_detail/__init__.py b/erpnext/production/doctype/ppw_detail/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/erpnext/production/doctype/ppw_detail/ppw_detail.txt b/erpnext/production/doctype/ppw_detail/ppw_detail.txt deleted file mode 100644 index 3234af1eb5..0000000000 --- a/erpnext/production/doctype/ppw_detail/ppw_detail.txt +++ /dev/null @@ -1,51 +0,0 @@ -# DocType, PPW Detail -[ - - # These values are common in all dictionaries - { - 'creation': '2012-03-27 14:36:04', - 'docstatus': 0, - 'modified': '2012-03-27 14:36:04', - 'modified_by': u'Administrator', - 'owner': u'Administrator' - }, - - # These values are common for all DocType - { - 'autoname': u'PPWD/.#######', - 'colour': u'White:FFF', - 'doctype': 'DocType', - 'module': u'Production', - 'name': '__common__', - 'section_style': u'Simple', - 'show_in_menu': 0, - 'version': 1 - }, - - # These values are common for all DocField - { - 'doctype': u'DocField', - 'fieldname': u'warehouse', - 'fieldtype': u'Link', - 'label': u'Warehouse', - 'name': '__common__', - 'oldfieldname': u'warehouse', - 'oldfieldtype': u'Link', - 'options': u'Warehouse', - 'parent': u'PPW Detail', - 'parentfield': u'fields', - 'parenttype': u'DocType', - 'permlevel': 0 - }, - - # DocType, PPW Detail - { - 'doctype': 'DocType', - 'name': u'PPW Detail' - }, - - # DocField - { - 'doctype': u'DocField' - } -] \ No newline at end of file diff --git a/erpnext/production/doctype/pro_detail/__init__.py b/erpnext/production/doctype/pro_detail/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/erpnext/production/doctype/pro_detail/pro_detail.txt b/erpnext/production/doctype/pro_detail/pro_detail.txt deleted file mode 100644 index cfe644e6be..0000000000 --- a/erpnext/production/doctype/pro_detail/pro_detail.txt +++ /dev/null @@ -1,148 +0,0 @@ -# DocType, PRO Detail -[ - - # These values are common in all dictionaries - { - 'creation': '2012-03-27 14:36:04', - 'docstatus': 0, - 'modified': '2012-03-27 14:36:04', - 'modified_by': u'Administrator', - 'owner': u'Administrator' - }, - - # These values are common for all DocType - { - 'autoname': u'PRODC/.#######', - 'colour': u'White:FFF', - 'doctype': 'DocType', - 'istable': 1, - 'module': u'Production', - 'name': '__common__', - 'section_style': u'Simple', - 'show_in_menu': 0, - 'version': 4 - }, - - # These values are common for all DocField - { - 'doctype': u'DocField', - 'name': '__common__', - 'parent': u'PRO Detail', - 'parentfield': u'fields', - 'parenttype': u'DocType' - }, - - # DocType, PRO Detail - { - 'doctype': 'DocType', - 'name': u'PRO Detail' - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'item_code', - 'fieldtype': u'Link', - 'label': u'Item Code', - 'oldfieldname': u'item_code', - 'oldfieldtype': u'Link', - 'options': u'Item', - 'permlevel': 0, - 'reqd': 1, - 'trigger': u'Client' - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'description', - 'fieldtype': u'Text', - 'label': u'Description', - 'oldfieldname': u'description', - 'oldfieldtype': u'Text', - 'permlevel': 1, - 'width': u'300px' - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'source_warehouse', - 'fieldtype': u'Link', - 'label': u'Source Warehouse', - 'oldfieldname': u'source_warehouse', - 'oldfieldtype': u'Link', - 'options': u'Warehouse', - 'permlevel': 0, - 'reqd': 1 - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'actual_qty', - 'fieldtype': u'Currency', - 'label': u'Current Stock', - 'oldfieldname': u'actual_qty', - 'oldfieldtype': u'Currency', - 'permlevel': 0, - 'reqd': 1 - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'qty_reqd', - 'fieldtype': u'Currency', - 'label': u'Qty Reqd', - 'oldfieldname': u'qty_reqd', - 'oldfieldtype': u'Currency', - 'permlevel': 0, - 'reqd': 1 - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'issued_qty', - 'fieldtype': u'Currency', - 'label': u'Issued Qty', - 'oldfieldname': u'issued_qty', - 'oldfieldtype': u'Currency', - 'permlevel': 0 - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'consumed_qty', - 'fieldtype': u'Currency', - 'label': u'Consumed Qty', - 'oldfieldname': u'consumed_qty', - 'oldfieldtype': u'Currency', - 'permlevel': 1 - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'qty_consumed_per_unit', - 'fieldtype': u'Currency', - 'label': u'Qty Consumed Per Unit', - 'oldfieldname': u'qty_consumed_per_unit', - 'oldfieldtype': u'Currency', - 'permlevel': 0 - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'stock_uom', - 'fieldtype': u'Data', - 'label': u'Stock UOM', - 'oldfieldname': u'stock_uom', - 'oldfieldtype': u'Data', - 'permlevel': 1, - 'reqd': 1 - } -] \ No newline at end of file diff --git a/erpnext/production/doctype/pro_pp_detail/__init__.py b/erpnext/production/doctype/pro_pp_detail/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/erpnext/production/doctype/pro_pp_detail/pro_pp_detail.txt b/erpnext/production/doctype/pro_pp_detail/pro_pp_detail.txt deleted file mode 100644 index 9b5e4fa404..0000000000 --- a/erpnext/production/doctype/pro_pp_detail/pro_pp_detail.txt +++ /dev/null @@ -1,121 +0,0 @@ -# DocType, PRO PP Detail -[ - - # These values are common in all dictionaries - { - 'creation': '2012-03-27 14:36:04', - 'docstatus': 0, - 'modified': '2012-03-27 14:36:04', - 'modified_by': u'Administrator', - 'owner': u'jai@webnotestech.com' - }, - - # These values are common for all DocType - { - 'colour': u'White:FFF', - 'doctype': 'DocType', - 'istable': 1, - 'module': u'Production', - 'name': '__common__', - 'section_style': u'Simple', - 'show_in_menu': 0, - 'version': 5 - }, - - # These values are common for all DocField - { - 'doctype': u'DocField', - 'name': '__common__', - 'parent': u'PRO PP Detail', - 'parentfield': u'fields', - 'parenttype': u'DocType', - 'permlevel': 0 - }, - - # DocType, PRO PP Detail - { - 'doctype': 'DocType', - 'name': u'PRO PP Detail' - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'source_doctype', - 'fieldtype': u'Data', - 'label': u'Source Doctype', - 'oldfieldname': u'source_doctype', - 'oldfieldtype': u'Data' - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'source_docname', - 'fieldtype': u'Data', - 'label': u'Source Docname', - 'oldfieldname': u'source_docname', - 'oldfieldtype': u'Data' - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'source_detail_docname', - 'fieldtype': u'Data', - 'label': u'Source Detail Docname ', - 'oldfieldname': u'source_detail_docname', - 'oldfieldtype': u'Data' - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'prevdoc_detail_docname', - 'fieldtype': u'Data', - 'label': u'Prevdoc Detail Docname', - 'oldfieldname': u'prevdoc_detail_docname', - 'oldfieldtype': u'Data' - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'confirm_date', - 'fieldtype': u'Date', - 'label': u'Confirm Date', - 'oldfieldname': u'confirm_date', - 'oldfieldtype': u'Date' - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'qty_reqd', - 'fieldtype': u'Currency', - 'label': u'Qty Reqd', - 'oldfieldname': u'qty_reqd', - 'oldfieldtype': u'Currency' - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'produced_qty', - 'fieldtype': u'Currency', - 'label': u'Produced Qty', - 'oldfieldname': u'produced_qty', - 'oldfieldtype': u'Currency' - }, - - # DocField - { - 'allow_on_submit': 1, - 'doctype': u'DocField', - 'fieldname': u'update', - 'fieldtype': u'Check', - 'label': u'Update', - 'oldfieldname': u'update', - 'oldfieldtype': u'Check' - } -] \ No newline at end of file diff --git a/erpnext/production/page/production_home/production_home.html b/erpnext/production/page/production_home/production_home.html index 13e24684c2..b2762ad60c 100644 --- a/erpnext/production/page/production_home/production_home.html +++ b/erpnext/production/page/production_home/production_home.html @@ -10,7 +10,7 @@

Generate Purchase Requisition (MRP) and Production Orders

-

Bill of Materials

+

Bill of Materials

Bill of Materials (BOM) Master

Item

Item Master

diff --git a/erpnext/selling/doctype/opportunity/opportunity.js b/erpnext/selling/doctype/opportunity/opportunity.js index 45a66ea9d3..545dcd2592 100644 --- a/erpnext/selling/doctype/opportunity/opportunity.js +++ b/erpnext/selling/doctype/opportunity/opportunity.js @@ -249,7 +249,7 @@ cur_frm.cscript['Create Quotation'] = function(){ 'from_doctype':'Opportunity', 'to_doctype':'Quotation', 'from_docname':cur_frm.docname, - 'from_to_list':"[['Enquiry', 'Quotation'],['Opportunity Item','Quotation Item']]" + 'from_to_list':"[['Opportunity', 'Quotation'],['Opportunity Item','Quotation Item']]" } , function(r,rt) { loaddoc("Quotation", n); diff --git a/erpnext/selling/doctype/quotation/quotation.py b/erpnext/selling/doctype/quotation/quotation.py index 3436b842d7..bfab69693d 100644 --- a/erpnext/selling/doctype/quotation/quotation.py +++ b/erpnext/selling/doctype/quotation/quotation.py @@ -54,7 +54,7 @@ class DocType(TransactionBase): # -------------------- def pull_enq_details(self): self.doc.clear_table(self.doclist, 'quotation_details') - get_obj('DocType Mapper', 'Enquiry-Quotation').dt_map('Enquiry', 'Quotation', self.doc.enq_no, self.doc, self.doclist, "[['Enquiry', 'Quotation'],['Opportunity Item', 'Quotation Item']]") + get_obj('DocType Mapper', 'Opportunity-Quotation').dt_map('Opportunity', 'Quotation', self.doc.enq_no, self.doc, self.doclist, "[['Opportunity', 'Quotation'],['Opportunity Item', 'Quotation Item']]") self.get_adj_percent() @@ -114,7 +114,7 @@ class DocType(TransactionBase): def load_default_taxes(self): return get_obj('Sales Common').load_default_taxes(self) - # Pull details from other charges master (Get Other Charges) + # Pull details from other charges master (Get Sales Taxes and Charges Master) # ---------------------------------------------------------- def get_other_charges(self): return get_obj('Sales Common').get_other_charges(self) diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py index f12a999da0..3270f988ce 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.py +++ b/erpnext/selling/doctype/sales_order/sales_order.py @@ -149,7 +149,7 @@ class DocType(TransactionBase): def load_default_taxes(self): return get_obj('Sales Common').load_default_taxes(self) - # Pull details from other charges master (Get Other Charges) + # Pull details from other charges master (Get Sales Taxes and Charges Master) # ---------------------------------------------------------- def get_other_charges(self): return get_obj('Sales Common').get_other_charges(self) diff --git a/erpnext/selling/page/selling_home/selling_home.html b/erpnext/selling/page/selling_home/selling_home.html index 4216f4302e..ce45e52184 100644 --- a/erpnext/selling/page/selling_home/selling_home.html +++ b/erpnext/selling/page/selling_home/selling_home.html @@ -6,7 +6,7 @@

Lead

Prospective customers

-

Enquiry

+

Opportunity

Business opportunities

Quotation

Quotes sent to Leads / Customers

@@ -32,7 +32,7 @@
Sales Other Charges + href="#!List/Sales Taxes and Charges Master">Sales Taxes and Charges Master
Order Terms Template + href="#!List/Terms and Conditions">Terms and Conditions Template
Sales Returns + href="#!Form/Sales and Purchase Return Tool/Sales and Purchase Return Tool">Sales Returns
-
\ No newline at end of file +
diff --git a/erpnext/setup/doctype/personalize/__init__.py b/erpnext/setup/doctype/personalize/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/erpnext/setup/doctype/personalize/personalize.py b/erpnext/setup/doctype/personalize/personalize.py deleted file mode 100644 index acf71e5477..0000000000 --- a/erpnext/setup/doctype/personalize/personalize.py +++ /dev/null @@ -1,50 +0,0 @@ -# ERPNext - web based ERP (http://erpnext.com) -# Copyright (C) 2012 Web Notes Technologies Pvt Ltd -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -import webnotes - -class DocType: - def __init__(self, d, dl): - self.doc, self.doclist = d, dl - - # - # load current banner - # - def onload(self): - self.doc.header_html = webnotes.conn.get_value('Control Panel', None, 'client_name') - - # - # on update - # - def validate(self): - from webnotes.utils import cint - if self.doc.file_list and cint(self.doc.set_from_attachment): - self.set_html_from_image() - - # update control panel - so it loads new letter directly - webnotes.conn.set_value('Control Panel', None, 'client_name', self.doc.header_html) - - # clear the cache so that the new letter head is uploaded - webnotes.conn.sql("delete from __SessionCache") - - # - # set html for image - # - def set_html_from_image(self): - file_name = self.doc.file_list.split(',')[0] - self.doc.header_html = """
- -
""" % file_name diff --git a/erpnext/setup/doctype/personalize/personalize.txt b/erpnext/setup/doctype/personalize/personalize.txt deleted file mode 100644 index aa5f76a27c..0000000000 --- a/erpnext/setup/doctype/personalize/personalize.txt +++ /dev/null @@ -1,101 +0,0 @@ -# DocType, Personalize -[ - - # These values are common in all dictionaries - { - 'creation': '2012-03-27 14:36:22', - 'docstatus': 0, - 'modified': '2012-03-27 14:36:22', - 'modified_by': u'Administrator', - 'owner': u'Administrator' - }, - - # These values are common for all DocType - { - '_last_update': u'1303277497', - 'allow_attach': 1, - 'allow_copy': 1, - 'allow_email': 1, - 'allow_print': 1, - 'colour': u'White:FFF', - 'doctype': 'DocType', - 'document_type': u'Other', - 'in_create': 1, - 'issingle': 1, - 'max_attachments': 1, - 'module': u'Setup', - 'name': '__common__', - 'read_only': 1, - 'section_style': u'Simple', - 'version': 4 - }, - - # These values are common for all DocField - { - 'doctype': u'DocField', - 'name': '__common__', - 'parent': u'Personalize', - 'parentfield': u'fields', - 'parenttype': u'DocType', - 'permlevel': 0 - }, - - # These values are common for all DocPerm - { - 'create': 1, - 'doctype': u'DocPerm', - 'name': '__common__', - 'parent': u'Personalize', - 'parentfield': u'permissions', - 'parenttype': u'DocType', - 'permlevel': 0, - 'read': 1, - 'role': u'System Manager', - 'write': 1 - }, - - # DocType, Personalize - { - 'doctype': 'DocType', - 'name': u'Personalize' - }, - - # DocPerm - { - 'doctype': u'DocPerm' - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'help_html', - 'fieldtype': u'HTML', - 'label': u'Help HTML', - 'options': u'
You can edit HTML for your banner or add an attachment and click on "Set from Attachment"
' - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'header_html', - 'fieldtype': u'Code', - 'label': u'Banner HTML' - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'set_from_attachment', - 'fieldtype': u'Check', - 'label': u'Set from attachment' - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'file_list', - 'fieldtype': u'Text', - 'hidden': 1, - 'label': u'File List' - } -] \ No newline at end of file diff --git a/erpnext/setup/doctype/setup_wizard_control/__init__.py b/erpnext/setup/doctype/setup_wizard_control/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/erpnext/setup/doctype/setup_wizard_control/setup_wizard_control.py b/erpnext/setup/doctype/setup_wizard_control/setup_wizard_control.py deleted file mode 100644 index ec54f54427..0000000000 --- a/erpnext/setup/doctype/setup_wizard_control/setup_wizard_control.py +++ /dev/null @@ -1,73 +0,0 @@ -# ERPNext - web based ERP (http://erpnext.com) -# Copyright (C) 2012 Web Notes Technologies Pvt Ltd -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -# Please edit this list and import only required elements -import webnotes - -from webnotes.utils import add_days, add_months, add_years, cint, cstr, date_diff, default_fields, flt, fmt_money, formatdate, generate_hash, getTraceback, get_defaults, get_first_day, get_last_day, getdate, has_common, month_name, now, nowdate, replace_newlines, sendmail, set_default, str_esc_quote, user_format, validate_email_add -from webnotes.model import db_exists -from webnotes.model.doc import Document, addchild, removechild, getchildren, make_autoname, SuperDocType -from webnotes.model.doclist import getlist -from webnotes.model.code import get_obj, get_server_obj, run_server_obj, updatedb, check_syntax -from webnotes import session, form, is_testing, msgprint, errprint - -sql = webnotes.conn.sql -convert_to_lists = webnotes.conn.convert_to_lists - -# ----------------------------------------------------------------------------------------- - - -class DocType: - - def __init__(self, doc, doclist=[]): - self.doc = doc - self.doclist = doclist - #======================================================================================================= - def get_master_lists(self): - ret = convert_to_lists(sql("select name from `tabWarehouse Type`")) - ret = ret and ret or [] - return ret - - #======================================================================================================= - def create_record(self,dict_val): - obj_dict = eval(dict_val) - - for d in obj_dict: - if not obj_dict[d] == '' and not d =='Doctype': - - ret =sql("select name from `tab%s` where name = '%s'" %(obj_dict['Doctype'],obj_dict[d])) - if ret: - return "Record already exist." - raise Exception - rec = Document(obj_dict['Doctype']) - for i in obj_dict: - if not obj_dict[i] == '' and not i == 'Doctype': - rec.fields[i] = obj_dict[i] - - rec.save(1) - return "Record created." - - #======================================================================================================= - def get_page_lst(self,nm): - ret = sql("select parent from `tabPage Role` where role in ('%s') and parent = '%s'" % ("','".join(webnotes.user.get_roles()),nm)) - return ret and True or False - - #======================================================================================================= - #------------------------get contry-------------------------------- - def get_country(self): - cty = sql("select value from `tabSingles` where field = 'country' and doctype = 'Control Panel'") - - return cty and cty[0][0] or '' diff --git a/erpnext/setup/doctype/setup_wizard_control/setup_wizard_control.txt b/erpnext/setup/doctype/setup_wizard_control/setup_wizard_control.txt deleted file mode 100644 index 765b5e1ed5..0000000000 --- a/erpnext/setup/doctype/setup_wizard_control/setup_wizard_control.txt +++ /dev/null @@ -1,49 +0,0 @@ -# DocType, Setup Wizard Control -[ - - # These values are common in all dictionaries - { - 'creation': '2012-03-27 14:36:25', - 'docstatus': 0, - 'modified': '2012-03-27 14:36:25', - 'modified_by': u'Administrator', - 'owner': u'Administrator' - }, - - # These values are common for all DocType - { - 'colour': u'White:FFF', - 'doctype': 'DocType', - 'issingle': 1, - 'module': u'Setup', - 'name': '__common__', - 'section_style': u'Simple', - 'server_code_error': u' ', - 'show_in_menu': 0, - 'version': 110 - }, - - # These values are common for all DocPerm - { - 'doctype': u'DocPerm', - 'name': '__common__', - 'parent': u'Setup Wizard Control', - 'parentfield': u'permissions', - 'parenttype': u'DocType', - 'permlevel': 0, - 'read': 1, - 'role': u'All', - 'write': 1 - }, - - # DocType, Setup Wizard Control - { - 'doctype': 'DocType', - 'name': u'Setup Wizard Control' - }, - - # DocPerm - { - 'doctype': u'DocPerm' - } -] \ No newline at end of file diff --git a/erpnext/setup/page/setup/setup.html b/erpnext/setup/page/setup/setup.html index 056a28f2f6..6e177c2b82 100644 --- a/erpnext/setup/page/setup/setup.html +++ b/erpnext/setup/page/setup/setup.html @@ -39,7 +39,7 @@ Import data from spreadsheet (csv) files

- Global Defaults
+ Global Defaults
Set default values for entry

@@ -81,7 +81,7 @@

Customize ERPNext

- Customize Forms
+ Customize Forms
Change entry properties (hide fields, make mandatory etc)

diff --git a/erpnext/stock/DocType Mapper/Purchase Order-Purchase Receipt/Purchase Order-Purchase Receipt.txt b/erpnext/stock/DocType Mapper/Purchase Order-Purchase Receipt/Purchase Order-Purchase Receipt.txt index b7e6cd4624..745ef1f83f 100644 --- a/erpnext/stock/DocType Mapper/Purchase Order-Purchase Receipt/Purchase Order-Purchase Receipt.txt +++ b/erpnext/stock/DocType Mapper/Purchase Order-Purchase Receipt/Purchase Order-Purchase Receipt.txt @@ -189,12 +189,12 @@ { 'doctype': u'Table Mapper Detail', 'from_field': u'po_details', - 'from_table': u'PO Detail', + 'from_table': u'Purchase Order Item', 'match_id': 1, 'reference_doctype_key': u'prevdoc_doctype', 'reference_key': u'prevdoc_detail_docname', 'to_field': u'purchase_receipt_details', - 'to_table': u'Purchase Receipt Detail', + 'to_table': u'Purchase Receipt Item', 'validation_logic': u'docstatus=1 and qty > ifnull(received_qty,0)' }, @@ -225,10 +225,10 @@ { 'doctype': u'Table Mapper Detail', 'from_field': u'purchase_tax_details', - 'from_table': u'Purchase Tax Detail', + 'from_table': u'Purchase Taxes and Charges', 'match_id': 2, 'to_field': u'purchase_tax_details', - 'to_table': u'Purchase Tax Detail', + 'to_table': u'Purchase Taxes and Charges', 'validation_logic': u'docstatus = 1' }, 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 bb0e53889e..3024da529a 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 @@ -255,10 +255,10 @@ { 'doctype': u'Table Mapper Detail', 'from_field': u'other_charges', - 'from_table': u'RV Tax Detail', + 'from_table': u'Sales Taxes and Charges', 'match_id': 2, 'to_field': u'other_charges', - 'to_table': u'RV Tax Detail', + 'to_table': u'Sales Taxes and Charges', 'validation_logic': u'name is not null' }, @@ -277,12 +277,12 @@ { 'doctype': u'Table Mapper Detail', 'from_field': u'sales_order_details', - 'from_table': u'Sales Order Detail', + 'from_table': u'Sales Order Item', 'match_id': 1, 'reference_doctype_key': u'prevdoc_doctype', 'reference_key': u'prevdoc_detail_docname', 'to_field': u'delivery_note_details', - 'to_table': u'Delivery Note Detail', + 'to_table': u'Delivery Note Item', 'validation_logic': u'qty > ifnull(delivered_qty,0) and docstatus = 1' }, diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.py b/erpnext/stock/doctype/delivery_note/delivery_note.py index 8d0ae99392..49d70325b4 100644 --- a/erpnext/stock/doctype/delivery_note/delivery_note.py +++ b/erpnext/stock/doctype/delivery_note/delivery_note.py @@ -151,7 +151,7 @@ class DocType(TransactionBase): return get_obj('Sales Common').load_default_taxes(self) - # **** Pull details from other charges master (Get Other Charges) **** + # **** Pull details from other charges master (Get Sales Taxes and Charges Master) **** def get_other_charges(self): return get_obj('Sales Common').get_other_charges(self) diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.txt b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.txt index 0ec091eae4..cb66d6f36d 100755 --- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.txt +++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.txt @@ -646,7 +646,7 @@ 'doctype': u'DocField', 'fieldname': u'purchase_tax_details', 'fieldtype': u'Table', - 'label': u'Purchase Tax Details', + 'label': u'Purchase Taxes and Charges', 'oldfieldname': u'purchase_tax_details', 'oldfieldtype': u'Table', 'options': u'Purchase Taxes and Charges', diff --git a/erpnext/stock/page/stock_home/stock_home.html b/erpnext/stock/page/stock_home/stock_home.html index 03c5fabd43..0ae70dc736 100644 --- a/erpnext/stock/page/stock_home/stock_home.html +++ b/erpnext/stock/page/stock_home/stock_home.html @@ -49,7 +49,7 @@

Incoming Inspection + href="#!List/Quality Inspection">Incoming Inspection
Sales or Purchase Returns + href="#!Form/Sales and Purchase Return Tool/Sales and Purchase Return Tool">Sales or Purchase Returns
diff --git a/erpnext/utilities/doctype/activity_dashboard_control/__init__.py b/erpnext/utilities/doctype/activity_dashboard_control/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/erpnext/utilities/doctype/activity_dashboard_control/activity_dashboard_control.py b/erpnext/utilities/doctype/activity_dashboard_control/activity_dashboard_control.py deleted file mode 100644 index 696a25dcff..0000000000 --- a/erpnext/utilities/doctype/activity_dashboard_control/activity_dashboard_control.py +++ /dev/null @@ -1,111 +0,0 @@ -# ERPNext - web based ERP (http://erpnext.com) -# Copyright (C) 2012 Web Notes Technologies Pvt Ltd -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -# Please edit this list and import only required elements -import webnotes - -from webnotes.utils import add_days, add_months, add_years, cint, cstr, date_diff, default_fields, flt, fmt_money, formatdate, generate_hash, getTraceback, get_defaults, get_first_day, get_last_day, getdate, has_common, month_name, now, nowdate, replace_newlines, sendmail, set_default, str_esc_quote, user_format, validate_email_add -from webnotes.model import db_exists -from webnotes.model.doc import Document, addchild, removechild, getchildren, make_autoname, SuperDocType -from webnotes.model.doclist import getlist, copy_doclist -from webnotes.model.code import get_obj, get_server_obj, run_server_obj, updatedb, check_syntax -from webnotes import session, form, is_testing, msgprint, errprint - -set = webnotes.conn.set -sql = webnotes.conn.sql -get_value = webnotes.conn.get_value -in_transaction = webnotes.conn.in_transaction -convert_to_lists = webnotes.conn.convert_to_lists - -# ----------------------------------------------------------------------------------------- - - -class DocType: - def __init__(self, doc, doclist=[]): - self.doc = doc - self.doclist = doclist - - - # get dashboard counts - # -------------------- - def get_dashboard_counts(self, dt): - dtl = eval(dt) - dt = {} - - for d in dtl: - # if Lead - if d=='Lead': - dt[d] = {'To follow up':sql("select count(name) from tabLead where status!='Converted' and docstatus=1")[0][0] or 0} - - # if Opportunity - elif d=='Enquiries': - args = {} - args['Quotations to be sent'] = sql("select count(distinct(t2.name)) from `tabQuotation`t1, `tabOpportunity`t2 where t1.enq_no!=t2.name and t2.docstatus=1")[0][0] or 0 - args['To follow up'] = sql("select count(name) from `tabQuotation` where docstatus=0")[0][0] or 0 #Draft - dt[d] = args - - # if Sales Order - elif d=='Sales Order': - args = {} - args['To be delivered'] = sql("select count(name) from `tabSales Order` where per_delivered<100 and delivery_date>now() and docstatus=1")[0][0] or 0 - args['To be billed'] = sql("select count(name) from `tabSales Order` where per_billed<100 and docstatus=1")[0][0] or 0 - args['Overdue'] = sql("select count(name) from `tabSales Order` where per_delivered<100 and delivery_datenow() and outstanding_amount!=0")[0][0] or 0 - args['Overdue'] = sql("select count(name) from `tabSales Invoice` where docstatus=1 and due_date. - -# Please edit this list and import only required elements -import webnotes - -from webnotes.utils import add_days, add_months, add_years, cint, cstr, date_diff, default_fields, flt, fmt_money, formatdate, generate_hash, getTraceback, get_defaults, get_first_day, get_last_day, getdate, has_common, month_name, now, nowdate, replace_newlines, sendmail, set_default, str_esc_quote, user_format, validate_email_add -from webnotes.model import db_exists -from webnotes.model.doc import Document, addchild, removechild, getchildren, make_autoname, SuperDocType -from webnotes.model.doclist import getlist, copy_doclist -from webnotes.model.code import get_obj, get_server_obj, run_server_obj, updatedb, check_syntax -from webnotes import session, form, is_testing, msgprint, errprint - -set = webnotes.conn.set -sql = webnotes.conn.sql -get_value = webnotes.conn.get_value -in_transaction = webnotes.conn.in_transaction -convert_to_lists = webnotes.conn.convert_to_lists - -# ----------------------------------------------------------------------------------------- - -class DocType: - def __init__(self, d, dl): - self.doc, self.doclist = d, dl - - def get_field_id(self, doctype, fieldname): - f = sql("select name, idx from tabDocField where parent=%s and fieldname=%s", (doctype, fieldname)) - if not f: - f=sql("select name, idx from tabDocField where parent=%s and label=%s", (doctype, fieldname)) - if not f: - return '__notfound__', 0 - #msgprint("No field found for %s" % fieldname) - #raise Exception - return f[0] - - def set_field_property(self, doctype, fieldname, property, value): - f = self.get_field_id(doctype, fieldname) - sql("update tabDocField set `%s`=%s where name=%s" % (property,'%s','%s'), (value, f[0])) - - def move_field(self, doctype, fieldname, before_field='', after_field=''): - f1 = self.get_field_id(doctype, fieldname) - - # get new id - new_idx = self.get_field_id(doctype, before_field or after_field)[1] - if after_field: - new_idx = new_idx + 1 - - # push fields down at new idx - sql("update tabDocField set idx=idx+1 where idx>=%s and parent=%s", (new_idx, doctype)) - - # push fields up at old idx - sql("update tabDocField set idx=idx-1 where idx>%s and parent=%s", (f1[1], doctype)) - - # set field idx - sql("update tabDocField set idx=%s where name=%s", (new_idx, f1[0])) - - def delete_field(self, doctype, fieldname): - sql("delete from tabDocField where name=%s limit 1", self.get_field_id(doctype, fieldname)[0]) - - def delete_unnamed_field(self, doctype, after_field=''): - f1 = self.get_field_id(doctype, after_field) - - if f1[0]=='__notfound__': - return - - # check if truly un-named - f2 = sql("select name, fieldname, label from tabDocField where idx=%s and parent=%s limit 1", (f1[1]+1, doctype)) - - if not f2: - return - f2 = f2[0] - - if f2[1] or f2[2]: - return - else: - sql("delete from tabDocField where name=%s limit 1", (f2[0])) - - # move fields up - sql("update tabDocField set idx=idx-1 where idx>%s and parent=%s", (f1[1], doctype)) - - def add_permission(self, doctype, role, level=0, read=0, write=0, create=0, submit=0, cancel=0, amend=0, match=''): - # check if exists - pid = sql("select name from tabDocPerm where parent=%s and role=%s and permlevel=%s", (doctype, role, level)) - if pid: - d = Document('DocPerm', pid[0][0]) - else: - d = Document('DocPerm') - d.parent = doctype - d.parenttype = 'DocType' - d.parentfield = 'permissions' - - d.permlevel = level - d.role = role - d.read = read - d.write = write - d.create = create - d.submit = submit - d.cancel = cancel - d.amend = amend - d.match = match - - d.save(new = (not d.name and 1 or 0)) - - def delete_permission(self, doctype, role, level): - sql("delete from `tabDocPerm` where role = '%s' and parent = '%s' and permlevel = '%s'" % (role, doctype, level)) diff --git a/erpnext/utilities/doctype/patch_util/patch_util.txt b/erpnext/utilities/doctype/patch_util/patch_util.txt deleted file mode 100644 index 9d64305bd0..0000000000 --- a/erpnext/utilities/doctype/patch_util/patch_util.txt +++ /dev/null @@ -1,30 +0,0 @@ -# DocType, Patch Util -[ - - # These values are common in all dictionaries - { - 'creation': '2012-03-27 14:36:47', - 'docstatus': 0, - 'modified': '2012-03-27 14:36:47', - 'modified_by': u'Administrator', - 'owner': u'Administrator' - }, - - # These values are common for all DocType - { - 'colour': u'White:FFF', - 'doctype': 'DocType', - 'issingle': 1, - 'module': u'Utilities', - 'name': '__common__', - 'section_style': u'Simple', - 'server_code_error': u' ', - 'version': 5 - }, - - # DocType, Patch Util - { - 'doctype': 'DocType', - 'name': u'Patch Util' - } -] \ No newline at end of file diff --git a/erpnext/utilities/doctype/reposting_tool/reposting_tool.py b/erpnext/utilities/doctype/reposting_tool/reposting_tool.py index cbe9380b1a..e75f27c56a 100644 --- a/erpnext/utilities/doctype/reposting_tool/reposting_tool.py +++ b/erpnext/utilities/doctype/reposting_tool/reposting_tool.py @@ -84,7 +84,7 @@ class DocType: # ============================================================================= def check_bin_qty(self, bin_obj, qty_dict): - label_dict = {'actual_qty': 'Actual Qty', 'indented_qty': 'Indent Qty', 'ordered_qty': 'Ordered Qty', 'reserved_qty': 'Reserved Qty', 'planned_qty': 'Planned Qty'} + label_dict = {'actual_qty': 'Actual Qty', 'indented_qty': 'Quantity Requested for Purchase', 'ordered_qty': 'Ordered Qty', 'reserved_qty': 'Reserved Qty', 'planned_qty': 'Planned Qty'} for f in qty_dict: if flt(bin_obj.doc.fields[f]) != qty_dict[f]: msgprint('
Difference found in %s for Item:= %s and Warehouse:= %s (Before : %s; After : %s)
' % (label_dict[f], bin_obj.doc.item_code, bin_obj.doc.warehouse, cstr(bin_obj.doc.fields[f]), cstr(qty_dict[f]))) diff --git a/wnf.py b/wnf.py index 49146a21a0..4cd1c8b581 100755 --- a/wnf.py +++ b/wnf.py @@ -30,7 +30,9 @@ def replace_code(start, txt1, txt2, extn): content = f.read() if re.search(txt1, content): - search_replace_with_prompt(fpath, txt1, txt2) + res = search_replace_with_prompt(fpath, txt1, txt2) + if res == 'skip': + return 'skip' @@ -47,10 +49,12 @@ def search_replace_with_prompt(fpath, txt1, txt2): print '\n', fpath print colored(txt1, 'red').join(c[:-1].split(txt1)) a = '' - while a not in ['y', 'n', 'Y', 'N']: - a = raw_input('Do you want to Change [y/n]?') + while a.lower() not in ['y', 'n', 'skip']: + a = raw_input('Do you want to Change [y/n/skip]?') if a.lower() == 'y': c = c.replace(txt1, txt2) + elif a.lower() == 'skip': + return 'skip' tmp.append(c) with open(fpath, 'w') as f: