[cleanup] deprecated search criteria, amendment_date, cancel_reason
This commit is contained in:
parent
618edee8b7
commit
27e6f13b5d
@ -2,7 +2,7 @@
|
||||
{
|
||||
"creation": "2013-03-25 10:53:52",
|
||||
"docstatus": 0,
|
||||
"modified": "2013-04-05 11:10:35",
|
||||
"modified": "2013-06-11 16:04:20",
|
||||
"modified_by": "Administrator",
|
||||
"owner": "Administrator"
|
||||
},
|
||||
@ -459,29 +459,6 @@
|
||||
"print_hide": 1,
|
||||
"read_only": 1
|
||||
},
|
||||
{
|
||||
"description": "The date at which current entry is corrected in the system.",
|
||||
"doctype": "DocField",
|
||||
"fieldname": "amendment_date",
|
||||
"fieldtype": "Date",
|
||||
"label": "Amendment Date",
|
||||
"no_copy": 1,
|
||||
"oldfieldname": "amendment_date",
|
||||
"oldfieldtype": "Date",
|
||||
"print_hide": 1,
|
||||
"read_only": 0
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
"fieldname": "cancel_reason",
|
||||
"fieldtype": "Data",
|
||||
"label": "Cancel Reason",
|
||||
"no_copy": 1,
|
||||
"oldfieldname": "cancel_reason",
|
||||
"oldfieldtype": "Data",
|
||||
"print_hide": 1,
|
||||
"read_only": 1
|
||||
},
|
||||
{
|
||||
"amend": 1,
|
||||
"cancel": 1,
|
||||
|
@ -187,7 +187,7 @@ class DocType:
|
||||
|
||||
# Swap Debit & Credit Column and make gl entry
|
||||
for gl in gl_entries:
|
||||
fdict = {'account': gl[0], 'cost_center': '', 'against': '', 'debit': flt(gl[2]), 'credit' : flt(gl[1]), 'remarks': self.doc.cancel_reason, 'voucher_type': self.doc.doctype, 'voucher_no': self.doc.name, 'transaction_date': self.doc.transaction_date, 'posting_date': self.doc.posting_date, 'fiscal_year': self.doc.fiscal_year, 'against_voucher': '', 'against_voucher_type': '', 'company': self.doc.company, 'is_opening': 'No', 'aging_date': 'self.doc.posting_date'}
|
||||
fdict = {'account': gl[0], 'cost_center': '', 'against': '', 'debit': flt(gl[2]), 'credit' : flt(gl[1]), 'remarks': "cancelled", 'voucher_type': self.doc.doctype, 'voucher_no': self.doc.name, 'transaction_date': self.doc.transaction_date, 'posting_date': self.doc.posting_date, 'fiscal_year': self.doc.fiscal_year, 'against_voucher': '', 'against_voucher_type': '', 'company': self.doc.company, 'is_opening': 'No', 'aging_date': 'self.doc.posting_date'}
|
||||
self.save_entry(fdict, is_cancel = 'Yes')
|
||||
|
||||
# Update is_cancelled = 'Yes' to all gl entries for current voucher
|
||||
|
@ -2,7 +2,7 @@
|
||||
{
|
||||
"creation": "2013-01-10 16:34:07",
|
||||
"docstatus": 0,
|
||||
"modified": "2013-01-22 14:47:50",
|
||||
"modified": "2013-06-11 16:04:45",
|
||||
"modified_by": "Administrator",
|
||||
"owner": "jai@webnotestech.com"
|
||||
},
|
||||
@ -85,16 +85,6 @@
|
||||
"oldfieldtype": "Data",
|
||||
"read_only": 1
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
"fieldname": "amendment_date",
|
||||
"fieldtype": "Date",
|
||||
"label": "Amendment Date",
|
||||
"no_copy": 1,
|
||||
"oldfieldname": "amendment_date",
|
||||
"oldfieldtype": "Date",
|
||||
"read_only": 1
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
"fieldname": "company",
|
||||
@ -138,17 +128,6 @@
|
||||
"oldfieldtype": "Small Text",
|
||||
"reqd": 1
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
"fieldname": "cancel_reason",
|
||||
"fieldtype": "Small Text",
|
||||
"hidden": 1,
|
||||
"label": "Cancel Reason",
|
||||
"oldfieldname": "cancel_reason",
|
||||
"oldfieldtype": "Small Text",
|
||||
"print_hide": 1,
|
||||
"search_index": 0
|
||||
},
|
||||
{
|
||||
"doctype": "DocPerm",
|
||||
"role": "System Manager"
|
||||
|
@ -2,7 +2,7 @@
|
||||
{
|
||||
"creation": "2013-05-21 16:16:39",
|
||||
"docstatus": 0,
|
||||
"modified": "2013-06-05 14:57:08",
|
||||
"modified": "2013-06-11 16:16:38",
|
||||
"modified_by": "Administrator",
|
||||
"owner": "Administrator"
|
||||
},
|
||||
@ -815,18 +815,6 @@
|
||||
"read_only": 0,
|
||||
"search_index": 1
|
||||
},
|
||||
{
|
||||
"depends_on": "eval:!doc.__islocal",
|
||||
"doctype": "DocField",
|
||||
"fieldname": "cancel_reason",
|
||||
"fieldtype": "Data",
|
||||
"label": "Cancel Reason",
|
||||
"no_copy": 1,
|
||||
"oldfieldname": "cancel_reason",
|
||||
"oldfieldtype": "Data",
|
||||
"print_hide": 1,
|
||||
"read_only": 1
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
"fieldname": "remarks",
|
||||
|
@ -2,7 +2,7 @@
|
||||
{
|
||||
"creation": "2013-05-21 16:16:39",
|
||||
"docstatus": 0,
|
||||
"modified": "2013-06-05 14:45:40",
|
||||
"modified": "2013-06-11 16:05:08",
|
||||
"modified_by": "Administrator",
|
||||
"owner": "Administrator"
|
||||
},
|
||||
@ -647,18 +647,6 @@
|
||||
"read_only": 1,
|
||||
"report_hide": 0
|
||||
},
|
||||
{
|
||||
"description": "The date at which current entry is corrected in the system.",
|
||||
"doctype": "DocField",
|
||||
"fieldname": "amendment_date",
|
||||
"fieldtype": "Date",
|
||||
"hidden": 0,
|
||||
"label": "Amendment Date",
|
||||
"no_copy": 1,
|
||||
"oldfieldname": "amendment_date",
|
||||
"oldfieldtype": "Date",
|
||||
"print_hide": 1
|
||||
},
|
||||
{
|
||||
"description": "Select the relevant company name if you have multiple companies",
|
||||
"doctype": "DocField",
|
||||
@ -766,19 +754,6 @@
|
||||
"oldfieldtype": "Text",
|
||||
"print_hide": 1
|
||||
},
|
||||
{
|
||||
"depends_on": "eval:!doc.__islocal",
|
||||
"doctype": "DocField",
|
||||
"fieldname": "cancel_reason",
|
||||
"fieldtype": "Data",
|
||||
"hidden": 0,
|
||||
"label": "Cancel Reason",
|
||||
"no_copy": 1,
|
||||
"oldfieldname": "cancel_reason",
|
||||
"oldfieldtype": "Data",
|
||||
"print_hide": 1,
|
||||
"read_only": 1
|
||||
},
|
||||
{
|
||||
"description": "Required raw materials issued to the supplier for producing a sub - contracted item.",
|
||||
"doctype": "DocField",
|
||||
|
@ -2,7 +2,7 @@
|
||||
{
|
||||
"creation": "2013-04-30 13:13:03",
|
||||
"docstatus": 0,
|
||||
"modified": "2013-05-09 14:34:10",
|
||||
"modified": "2013-06-11 16:05:29",
|
||||
"modified_by": "Administrator",
|
||||
"owner": "Administrator"
|
||||
},
|
||||
@ -212,17 +212,6 @@
|
||||
"print_hide": 1,
|
||||
"read_only": 1
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
"fieldname": "amendment_date",
|
||||
"fieldtype": "Date",
|
||||
"label": "Amendment Date",
|
||||
"no_copy": 1,
|
||||
"oldfieldname": "amendment_date",
|
||||
"oldfieldtype": "Date",
|
||||
"print_hide": 1,
|
||||
"read_only": 1
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
"fieldname": "specification_details",
|
||||
|
@ -2,7 +2,7 @@
|
||||
{
|
||||
"creation": "2013-05-21 16:16:45",
|
||||
"docstatus": 0,
|
||||
"modified": "2013-06-05 14:46:30",
|
||||
"modified": "2013-06-11 16:05:53",
|
||||
"modified_by": "Administrator",
|
||||
"owner": "Administrator"
|
||||
},
|
||||
@ -585,18 +585,6 @@
|
||||
"read_only": 1,
|
||||
"report_hide": 0
|
||||
},
|
||||
{
|
||||
"description": "The date at which current entry is corrected in the system.",
|
||||
"doctype": "DocField",
|
||||
"fieldname": "amendment_date",
|
||||
"fieldtype": "Date",
|
||||
"hidden": 1,
|
||||
"label": "Amendment Date",
|
||||
"no_copy": 1,
|
||||
"oldfieldname": "amendment_date",
|
||||
"oldfieldtype": "Date",
|
||||
"print_hide": 1
|
||||
},
|
||||
{
|
||||
"description": "Select the relevant company name if you have multiple companies",
|
||||
"doctype": "DocField",
|
||||
@ -639,28 +627,6 @@
|
||||
"print_hide": 1,
|
||||
"report_hide": 1
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
"fieldname": "column_break5",
|
||||
"fieldtype": "Column Break",
|
||||
"oldfieldtype": "Column Break",
|
||||
"print_hide": 1,
|
||||
"print_width": "50%",
|
||||
"width": "50%"
|
||||
},
|
||||
{
|
||||
"depends_on": "eval:!doc.__islocal",
|
||||
"doctype": "DocField",
|
||||
"fieldname": "cancel_reason",
|
||||
"fieldtype": "Data",
|
||||
"hidden": 0,
|
||||
"label": "Cancel Reason",
|
||||
"no_copy": 1,
|
||||
"oldfieldname": "cancel_reason",
|
||||
"oldfieldtype": "Data",
|
||||
"print_hide": 1,
|
||||
"read_only": 1
|
||||
},
|
||||
{
|
||||
"amend": 1,
|
||||
"cancel": 1,
|
||||
|
@ -2,7 +2,7 @@
|
||||
{
|
||||
"creation": "2013-01-10 16:34:12",
|
||||
"docstatus": 0,
|
||||
"modified": "2013-01-29 17:50:21",
|
||||
"modified": "2013-06-11 16:06:06",
|
||||
"modified_by": "Administrator",
|
||||
"owner": "ashwini@webnotestech.com"
|
||||
},
|
||||
@ -211,20 +211,6 @@
|
||||
"options": "link:Fiscal Year",
|
||||
"reqd": 1
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
"fieldname": "amendment_date",
|
||||
"fieldtype": "Date",
|
||||
"hidden": 1,
|
||||
"label": "Amendment Date",
|
||||
"no_copy": 1,
|
||||
"oldfieldname": "amendment_date",
|
||||
"oldfieldtype": "Date",
|
||||
"print_hide": 1,
|
||||
"read_only": 1,
|
||||
"report_hide": 1,
|
||||
"width": "160px"
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
"fieldname": "amended_from",
|
||||
|
@ -2,7 +2,7 @@
|
||||
{
|
||||
"creation": "2013-01-10 16:34:13",
|
||||
"docstatus": 0,
|
||||
"modified": "2013-01-29 17:52:06",
|
||||
"modified": "2013-06-11 16:06:17",
|
||||
"modified_by": "Administrator",
|
||||
"owner": "ashwini@webnotestech.com"
|
||||
},
|
||||
@ -145,16 +145,6 @@
|
||||
"options": "link:Company",
|
||||
"reqd": 1
|
||||
},
|
||||
{
|
||||
"depends_on": "eval:doc.amended_from",
|
||||
"description": "The date at which current entry is corrected in the system.",
|
||||
"doctype": "DocField",
|
||||
"fieldname": "amendment_date",
|
||||
"fieldtype": "Date",
|
||||
"label": "Amendment Date",
|
||||
"no_copy": 1,
|
||||
"print_hide": 1
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
"fieldname": "amended_from",
|
||||
|
@ -2,7 +2,7 @@
|
||||
{
|
||||
"creation": "2013-01-10 16:34:14",
|
||||
"docstatus": 0,
|
||||
"modified": "2013-02-04 09:22:51",
|
||||
"modified": "2013-06-11 16:16:35",
|
||||
"modified_by": "Administrator",
|
||||
"owner": "harshada@webnotestech.com"
|
||||
},
|
||||
@ -215,19 +215,6 @@
|
||||
"report_hide": 1,
|
||||
"width": "160px"
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
"fieldname": "amendment_date",
|
||||
"fieldtype": "Date",
|
||||
"label": "Amendment Date",
|
||||
"no_copy": 1,
|
||||
"oldfieldname": "amendment_date",
|
||||
"oldfieldtype": "Date",
|
||||
"print_hide": 1,
|
||||
"read_only": 1,
|
||||
"report_hide": 1,
|
||||
"width": "160px"
|
||||
},
|
||||
{
|
||||
"doctype": "DocPerm",
|
||||
"match": "owner",
|
||||
|
@ -2,7 +2,7 @@
|
||||
{
|
||||
"creation": "2013-02-20 19:10:38",
|
||||
"docstatus": 0,
|
||||
"modified": "2013-02-20 19:11:03",
|
||||
"modified": "2013-06-11 16:16:32",
|
||||
"modified_by": "Administrator",
|
||||
"owner": "Administrator"
|
||||
},
|
||||
@ -162,19 +162,6 @@
|
||||
"print_hide": 1,
|
||||
"read_only": 1
|
||||
},
|
||||
{
|
||||
"description": "The date at which current entry is corrected in the system.",
|
||||
"doctype": "DocField",
|
||||
"fieldname": "amendment_date",
|
||||
"fieldtype": "Date",
|
||||
"hidden": 0,
|
||||
"label": "Amendment Date",
|
||||
"no_copy": 1,
|
||||
"oldfieldname": "amendment_date",
|
||||
"oldfieldtype": "Date",
|
||||
"print_hide": 1,
|
||||
"read_only": 1
|
||||
},
|
||||
{
|
||||
"doctype": "DocPerm",
|
||||
"match": "owner",
|
||||
|
@ -2,7 +2,7 @@
|
||||
{
|
||||
"creation": "2013-01-10 16:34:15",
|
||||
"docstatus": 0,
|
||||
"modified": "2013-01-29 17:38:08",
|
||||
"modified": "2013-06-11 16:16:35",
|
||||
"modified_by": "Administrator",
|
||||
"owner": "Administrator"
|
||||
},
|
||||
@ -254,18 +254,6 @@
|
||||
"print_hide": 1,
|
||||
"report_hide": 0
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
"fieldname": "amendment_date",
|
||||
"fieldtype": "Date",
|
||||
"hidden": 0,
|
||||
"label": "Amendment Date",
|
||||
"no_copy": 1,
|
||||
"oldfieldname": "amendment_date",
|
||||
"oldfieldtype": "Date",
|
||||
"print_hide": 1,
|
||||
"report_hide": 0
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
"fieldname": "earning_deduction",
|
||||
|
@ -1,4 +0,0 @@
|
||||
from __future__ import unicode_literals
|
||||
def execute():
|
||||
import webnotes
|
||||
webnotes.conn.sql("delete from `tabSearch Criteria` where name = 'cash_flow_statement'")
|
@ -15,8 +15,6 @@ def execute():
|
||||
webnotes.conn.sql("drop table if exists `tab%s`" % dt)
|
||||
webnotes.conn.begin()
|
||||
|
||||
delete_doc("Search Criteria", "tds_return")
|
||||
|
||||
# Add tds entry in tax table for purchase invoice
|
||||
pi_list = webnotes.conn.sql("""select name from `tabPurchase Invoice`
|
||||
where ifnull(tax_code, '')!='' and ifnull(ded_amount, 0)!=0""")
|
||||
|
@ -1,5 +0,0 @@
|
||||
def execute():
|
||||
import webnotes
|
||||
from webnotes.modules import reload_doc
|
||||
reload_doc("accounts", "search_criteria", "debtors_ledger")
|
||||
reload_doc("accounts", "search_criteria", "creditors_ledger")
|
@ -8,8 +8,6 @@ def execute():
|
||||
webnotes.rename_doc("DocType", "Purchase Request Item", "Material Request Item", force=True)
|
||||
if not "tabMaterial Request" in tables:
|
||||
webnotes.rename_doc("DocType", "Purchase Request", "Material Request", force=True)
|
||||
webnotes.reload_doc("buying", "search_criteria", "pending_po_items_to_bill")
|
||||
webnotes.reload_doc("buying", "search_criteria", "pending_po_items_to_receive")
|
||||
|
||||
webnotes.reload_doc("stock", "doctype", "material_request")
|
||||
webnotes.reload_doc("stock", "doctype", "material_request_item")
|
||||
|
@ -1,3 +0,0 @@
|
||||
def execute():
|
||||
import webnotes
|
||||
webnotes.delete_doc("Search Criteria", "sales_order_pending_items")
|
@ -1,9 +0,0 @@
|
||||
import webnotes
|
||||
|
||||
def execute():
|
||||
for sc in ["itemwise_price_list", "itemwise_receipt_details",
|
||||
"shortage_to_purchase_request", "stock_aging_report",
|
||||
"stock_ledger", "stock_level", "stock_report",
|
||||
"custom_test2", "custom_test3", "custom_test4",
|
||||
"test_so2", "test_so3"]:
|
||||
webnotes.delete_doc("Search Criteria", sc)
|
@ -1,4 +0,0 @@
|
||||
import webnotes
|
||||
def execute():
|
||||
for sc in ["warranty-amc_expiry_details", "warranty-amc_summary"]:
|
||||
webnotes.delete_doc("Search Criteria", sc)
|
@ -1,5 +0,0 @@
|
||||
from __future__ import unicode_literals
|
||||
def execute():
|
||||
import webnotes
|
||||
from webnotes.modules import reload_doc
|
||||
reload_doc('accounts', 'search_criteria', 'trial_balance')
|
@ -6,9 +6,4 @@ def execute():
|
||||
delete from `tabDocPerm`
|
||||
where parent in ('Report', 'Search Criteria')""")
|
||||
|
||||
webnotes.conn.commit()
|
||||
|
||||
webnotes.reload_doc('core', 'doctype', 'search_criteria')
|
||||
webnotes.reload_doc('core', 'doctype', 'report')
|
||||
|
||||
webnotes.conn.begin()
|
@ -1,5 +0,0 @@
|
||||
from __future__ import unicode_literals
|
||||
def execute():
|
||||
import webnotes
|
||||
import webnotes.modules
|
||||
webnotes.modules.reload_doc('selling', 'search_criteria', 'customer_address_contact')
|
@ -1,7 +0,0 @@
|
||||
from __future__ import unicode_literals
|
||||
def execute():
|
||||
import webnotes
|
||||
from webnotes.modules import reload_doc
|
||||
reload_doc('selling', 'search_criteria', 'itemwise_sales_details')
|
||||
reload_doc('selling', 'search_criteria', 'itemwise_delivery_details')
|
||||
|
@ -1,9 +0,0 @@
|
||||
from __future__ import unicode_literals
|
||||
def execute():
|
||||
import webnotes
|
||||
from webnotes.model import delete_doc
|
||||
delete_doc("Search Criteria", "sales_order_pending_items1")
|
||||
|
||||
webnotes.conn.sql("update `tabSearch Criteria` set module = 'Selling' where module = 'CRM'")
|
||||
from webnotes.modules import reload_doc
|
||||
reload_doc('selling', 'search_criteria', 'sales_order_pending_items')
|
@ -1,100 +0,0 @@
|
||||
from __future__ import unicode_literals
|
||||
def execute():
|
||||
import webnotes
|
||||
rendt = {
|
||||
'Receivable Voucher' : 'Sales Invoice',
|
||||
'RV Detail' : 'Sales Invoice Item',
|
||||
'RV Tax Detail' : 'Sales Taxes and Charges',
|
||||
'Payable Voucher' : 'Purchase Invoice',
|
||||
'PV Detail' : 'Purchase Invoice Item',
|
||||
'Purchase Tax Detail' : 'Purchase Taxes and Charges',
|
||||
'Indent' : 'Material Request',
|
||||
'Indent Detail' : 'Material Request Item',
|
||||
'QA Inspection Report' : 'Quality Inspection',
|
||||
'Ticket' : 'Task',
|
||||
'Manage Account' : 'Global Defaults',
|
||||
'ToDo Item' : 'ToDo',
|
||||
'Term' : 'Terms and Conditions',
|
||||
'Static Parameter Detail' : 'SMS Parameter',
|
||||
'SS Earning Detail' : 'Salary Slip Earning',
|
||||
'SS Deduction Detail' : 'Salary Slip Deduction',
|
||||
'Sales Order Detail' : 'Sales Order Item',
|
||||
'Sales BOM Detail' : 'Sales BOM Item',
|
||||
'Return Detail' : 'Sales and Purchase Return Item',
|
||||
'Ref Rate Detail' : 'Item Price',
|
||||
'Receiver Detail' : 'SMS Receiver',
|
||||
'Quotation Detail' : 'Quotation Item',
|
||||
'QA Specification Detail' : 'Quality Inspection Reading',
|
||||
'Purchase Receipt Detail' : 'Purchase Receipt Item',
|
||||
'Purchase Other Charges' : 'Purchase Taxes and Charges Master',
|
||||
'PR Raw Material Detail' : 'Purchase Receipt Item Supplied',
|
||||
'PP SO Detail' : 'Production Plan Sales Order',
|
||||
'PP Detail' : 'Production Plan Item',
|
||||
'PO Raw Material Detail' : 'Purchase Order Item Supplied',
|
||||
'PO Detail' : 'Purchase Order Item',
|
||||
'Packing Slip Detail' : 'Packing Slip Item',
|
||||
'Other Charges' : 'Sales Taxes and Charges Master',
|
||||
'Order Lost Reason' : 'Quotation Lost Reason',
|
||||
'Manage Account' : 'Global Defaults',
|
||||
'Maintenance Visit Detail' : 'Maintenance Visit Purpose',
|
||||
'Ledger Balance Export' : 'Multi Ledger Report',
|
||||
'LC PR Detail' : 'Landed Cost Purchase Receipt',
|
||||
'Landed Cost Detail' : 'Landed Cost Item',
|
||||
'KRA Template' : 'Appraisal Template',
|
||||
'KRA Sheet' : 'Appraisal Template Goal',
|
||||
'Item Specification Detail' : 'Item Quality Inspection Parameter',
|
||||
'Item Maintenance Detail' : 'Maintenance Schedule Item',
|
||||
'IR Payment Detail' : 'Payment to Invoice Matching Tool Detail',
|
||||
'Internal Reconciliation' : 'Payment to Invoice Matching Tool',
|
||||
'Installed Item Details' : 'Installation Note Item',
|
||||
'Holiday List Detail' : 'Holiday',
|
||||
'Follow up' : 'Communication Log',
|
||||
'Flat BOM Detail' : 'BOM Explosion Item',
|
||||
'Expense Voucher Detail' : 'Expense Claim Detail',
|
||||
'Expense Voucher' : 'Expense Claim',
|
||||
'Expense Type' : 'Expense Claim Type',
|
||||
'Enquiry Detail' : 'Opportunity Item',
|
||||
'Enquiry' : 'Opportunity',
|
||||
'Earning Detail' : 'Salary Structure Earning',
|
||||
'DocLayerField' : 'Customize Form Field',
|
||||
'DocLayer' : 'Customize Form',
|
||||
'Delivery Note Detail' : 'Delivery Note Item',
|
||||
'Deduction Detail' : 'Salary Structure Deduction',
|
||||
'Comment Widget Record' : 'Comment',
|
||||
'BOM Material' : 'BOM Item',
|
||||
'Bill Of Materials' : 'BOM',
|
||||
'Appraisal Detail' : 'Appraisal Goal',
|
||||
'Advance Allocation Detail' : 'Purchase Invoice Advance',
|
||||
'Advance Adjustment Detail' : 'Sales Invoice Advance',
|
||||
'Ledger Detail' : 'Multi Ledger Report Detail',
|
||||
'TA Control' : 'Trend Analyzer Control',
|
||||
'Sales and Purchase Return Wizard' : 'Sales and Purchase Return Tool',
|
||||
'Educational Qualifications Detail' : 'Employee Education',
|
||||
'Delivery Note Packing Detail' : 'Delivery Note Packing Item',
|
||||
'Experience In Company Detail' : 'Employee Internal Work History',
|
||||
'Professional Training Details' : 'Employee Training',
|
||||
'Previous Experience Detail' : 'Employee External Work History',
|
||||
}
|
||||
|
||||
for d in rendt:
|
||||
webnotes.conn.sql("""
|
||||
update
|
||||
`tabSearch Criteria`
|
||||
set
|
||||
doc_type = replace(doc_type, %s, %s),
|
||||
filters = replace(filters, %s, %s),
|
||||
columns = replace(columns, %s, %s),
|
||||
parent_doc_type = replace(parent_doc_type, %s, %s),
|
||||
add_cond = replace(add_cond, %s, %s),
|
||||
add_col = replace(add_col, %s, %s),
|
||||
add_tab = replace(add_tab, %s, %s),
|
||||
dis_filters = replace(dis_filters, %s, %s),
|
||||
group_by = replace(group_by, %s, %s),
|
||||
sort_by = replace(sort_by, %s, %s),
|
||||
report_script = replace(report_script, %s, %s),
|
||||
server_script = replace(server_script, %s, %s),
|
||||
custom_query = replace(custom_query, %s, %s)
|
||||
""", (d, rendt[d], d, rendt[d], d, rendt[d], d, rendt[d], d, rendt[d], d, rendt[d], d, rendt[d],
|
||||
d, rendt[d], d, rendt[d], d, rendt[d], d, rendt[d], d, rendt[d], d, rendt[d]))
|
||||
|
||||
|
@ -1,3 +0,0 @@
|
||||
def execute():
|
||||
from webnotes.model import delete_doc
|
||||
delete_doc("Search Criteria", "itemwise_sales_register1")
|
@ -1,7 +0,0 @@
|
||||
import webnotes
|
||||
|
||||
def execute():
|
||||
webnotes.delete_doc("Search Criteria", "delivery_note_itemwise_pending_to_bill")
|
||||
|
||||
from webnotes.modules import reload_doc
|
||||
reload_doc("accounts", "report", "delivered_items_to_be_billed")
|
@ -1,7 +0,0 @@
|
||||
import webnotes
|
||||
|
||||
def execute():
|
||||
webnotes.conn.sql("""delete from `tabSearch Criteria`
|
||||
where name ='employee_leave_balance_report1'""")
|
||||
webnotes.conn.sql("""delete from `tabSearch Criteria`
|
||||
where name ='employee_leave_balance_report2'""")
|
@ -1,8 +0,0 @@
|
||||
def execute():
|
||||
import webnotes
|
||||
webnotes.conn.sql("""delete from `tabSearch Criteria` \
|
||||
where name = 'customer_address_contact'""")
|
||||
|
||||
webnotes.reload_doc("core", "doctype", "docfield")
|
||||
webnotes.reload_doc("core", "doctype", "report")
|
||||
webnotes.reload_doc('selling', 'report', 'customer_addresses_and_contacts')
|
@ -1,6 +0,0 @@
|
||||
from __future__ import unicode_literals
|
||||
from webnotes.model import delete_doc
|
||||
|
||||
def execute():
|
||||
# remove search criteria
|
||||
delete_doc("Search Criteria", "trial_balance")
|
@ -38,19 +38,15 @@ patch_list = [
|
||||
"patches.may_2012.cleanup_property_setter",
|
||||
"patches.may_2012.rename_prev_doctype",
|
||||
"patches.may_2012.cleanup_notification_control",
|
||||
"patches.may_2012.renamedt_in_custom_search_criteria",
|
||||
"patches.may_2012.stock_reco_patch",
|
||||
"patches.may_2012.reload_reports",
|
||||
"patches.may_2012.page_role_series_fix",
|
||||
"patches.may_2012.reload_sales_invoice_pf",
|
||||
"patches.may_2012.std_pf_readonly",
|
||||
"patches.may_2012.reload_so_pending_items",
|
||||
"patches.may_2012.customize_form_cleanup",
|
||||
"patches.may_2012.cs_server_readonly",
|
||||
"patches.may_2012.clear_session_cache",
|
||||
"patches.may_2012.same_purchase_rate_patch",
|
||||
"patches.may_2012.create_report_manager_role",
|
||||
"patches.may_2012.reload_customer_address_contact",
|
||||
"patches.may_2012.profile_perm_patch",
|
||||
"patches.may_2012.remove_euro_currency",
|
||||
"patches.may_2012.remove_communication_log",
|
||||
@ -81,7 +77,6 @@ patch_list = [
|
||||
"patches.august_2012.task_allocated_to_assigned",
|
||||
"patches.august_2012.change_profile_permission",
|
||||
"patches.august_2012.repost_billed_amt",
|
||||
"patches.august_2012.remove_cash_flow_statement",
|
||||
"patches.september_2012.stock_report_permissions_for_accounts",
|
||||
"patches.september_2012.communication_delete_permission",
|
||||
"patches.september_2012.all_permissions_patch",
|
||||
@ -96,20 +91,15 @@ patch_list = [
|
||||
"patches.october_2012.update_permission",
|
||||
"patches.october_2012.reload_gl_mapper",
|
||||
"patches.october_2012.fix_wrong_vouchers",
|
||||
"patches.october_2012.remove_old_customer_contact_address",
|
||||
"patches.october_2012.company_fiscal_year_docstatus_patch",
|
||||
"patches.october_2012.update_account_property",
|
||||
"patches.october_2012.remove_old_trial_bal",
|
||||
"patches.october_2012.fix_cancelled_gl_entries",
|
||||
"patches.october_2012.custom_script_delete_permission",
|
||||
"patches.november_2012.custom_field_insert_after",
|
||||
"patches.november_2012.delete_item_sales_register1",
|
||||
"patches.november_2012.rename_employee_leave_balance_report",
|
||||
"patches.november_2012.report_permissions",
|
||||
"patches.november_2012.customer_issue_allocated_to_assigned",
|
||||
"patches.november_2012.reset_appraisal_permissions",
|
||||
"patches.november_2012.disable_cancelled_profiles",
|
||||
"patches.november_2012.remove_old_unbilled_items_report",
|
||||
"patches.november_2012.support_ticket_response_to_communication",
|
||||
"patches.november_2012.cancelled_bom_patch",
|
||||
"patches.november_2012.communication_sender_and_recipient",
|
||||
@ -123,7 +113,6 @@ patch_list = [
|
||||
"patches.december_2012.expense_leave_reload",
|
||||
"patches.december_2012.repost_ordered_qty",
|
||||
"patches.december_2012.repost_projected_qty",
|
||||
"patches.december_2012.reload_debtors_creditors_ledger",
|
||||
"patches.december_2012.website_cache_refactor",
|
||||
"patches.december_2012.production_cleanup",
|
||||
"patches.december_2012.fix_default_print_format",
|
||||
@ -138,8 +127,6 @@ patch_list = [
|
||||
"patches.december_2012.remove_project_mapper",
|
||||
"patches.december_2012.update_print_width",
|
||||
"patches.january_2013.remove_bad_permissions",
|
||||
"patches.january_2013.deprecate_stock_search_criteria",
|
||||
"patches.january_2013.remove_support_search_criteria",
|
||||
"patches.january_2013.holiday_list_patch",
|
||||
"patches.january_2013.stock_reconciliation_patch",
|
||||
"patches.january_2013.report_permission",
|
||||
@ -163,7 +150,6 @@ patch_list = [
|
||||
"patches.february_2013.remove_gl_mapper",
|
||||
"patches.february_2013.reload_bom_replace_tool_permission",
|
||||
"patches.february_2013.payment_reconciliation_reset_values",
|
||||
"patches.february_2013.remove_sales_order_pending_items",
|
||||
"patches.february_2013.account_negative_balance",
|
||||
"patches.february_2013.remove_account_utils_folder",
|
||||
"patches.february_2013.update_company_in_leave_application",
|
||||
@ -187,14 +173,11 @@ patch_list = [
|
||||
"execute:webnotes.delete_doc('DocType', 'Service Quotation Detail')",
|
||||
"patches.february_2013.p06_material_request_mappers",
|
||||
"execute:webnotes.delete_doc('Page', 'Query Report')",
|
||||
"execute:webnotes.delete_doc('Search Criteria', 'employeewise_balance_leave_report')",
|
||||
"execute:webnotes.delete_doc('Search Criteria', 'employee_leave_balance_report')",
|
||||
"patches.february_2013.repost_reserved_qty",
|
||||
"execute:webnotes.reload_doc('core', 'doctype', 'report') # 2013-02-25",
|
||||
"execute:webnotes.conn.sql(\"update `tabReport` set report_type=if(ifnull(query, '')='', 'Report Builder', 'Query Report') where is_standard='No'\")",
|
||||
"execute:webnotes.conn.sql(\"update `tabReport` set report_name=name where ifnull(report_name,'')='' and is_standard='No'\")",
|
||||
"patches.february_2013.p08_todo_query_report",
|
||||
"execute:webnotes.delete_doc('Search Criteria', 'gross_profit') # 2013-02-26",
|
||||
'execute:webnotes.reload_doc("accounts", "Print Format", "Sales Invoice Classic") # 2013-02-26',
|
||||
'execute:webnotes.reload_doc("accounts", "Print Format", "Sales Invoice Modern") # 2013-02-26',
|
||||
'execute:webnotes.reload_doc("accounts", "Print Format", "Sales Invoice Spartan") # 2013-02-26',
|
||||
@ -208,7 +191,6 @@ patch_list = [
|
||||
"execute:webnotes.delete_doc('DocType', 'Attendance Control Panel')",
|
||||
"patches.march_2013.p02_get_global_default",
|
||||
"patches.march_2013.p03_rename_blog_to_blog_post",
|
||||
"execute:webnotes.reload_doc('hr', 'search_criteria', 'monthly_attendance_details')",
|
||||
"patches.march_2013.p04_pos_update_stock_check",
|
||||
"patches.march_2013.p05_payment_reconciliation",
|
||||
"patches.march_2013.p06_remove_sales_purchase_return_tool",
|
||||
@ -234,7 +216,6 @@ patch_list = [
|
||||
'execute:webnotes.reload_doc("selling", "Print Format", "Quotation Modern") # 2013-04-02',
|
||||
'execute:webnotes.reload_doc("selling", "Print Format", "Quotation Spartan") # 2013-04-02',
|
||||
"patches.april_2013.p04_reverse_modules_list",
|
||||
"execute:webnotes.delete_doc('Search Criteria', 'time_log_summary')",
|
||||
"patches.april_2013.p04_update_role_in_pages",
|
||||
"patches.april_2013.p05_update_file_data",
|
||||
"patches.april_2013.p06_update_file_size",
|
||||
|
@ -7,7 +7,4 @@ def execute():
|
||||
for dt in ["Period", "Account Balance", "Multi Ledger Report",
|
||||
"Multi Ledger Report Detail", "Period Control", "Reposting Tool",
|
||||
"Lease Agreement", "Lease Installment"]:
|
||||
delete_doc("DocType", dt)
|
||||
|
||||
# remove search criteria
|
||||
delete_doc("Search Criteria", "Trial Balance")
|
||||
delete_doc("DocType", dt)
|
@ -72,11 +72,6 @@ class DocType(TransactionBase):
|
||||
get_obj('Sales Common').validate_fiscal_year(self.doc.fiscal_year, self.doc.inst_date,
|
||||
'Installation Date')
|
||||
|
||||
def validate_mandatory(self):
|
||||
if self.doc.amended_from and not self.doc.amendment_date:
|
||||
msgprint("Please Enter Amendment Date")
|
||||
raise Exception, "Validation Error. "
|
||||
|
||||
def validate_reference_value(self):
|
||||
mapper = get_obj('DocType Mapper', 'Delivery Note-Installation Note', with_children = 1)
|
||||
mapper.validate_reference_value(self, self.doc.name)
|
||||
|
@ -2,7 +2,7 @@
|
||||
{
|
||||
"creation": "2013-04-30 13:13:06",
|
||||
"docstatus": 0,
|
||||
"modified": "2013-05-09 14:43:28",
|
||||
"modified": "2013-06-11 16:16:39",
|
||||
"modified_by": "Administrator",
|
||||
"owner": "Administrator"
|
||||
},
|
||||
@ -229,18 +229,6 @@
|
||||
"print_hide": 1,
|
||||
"read_only": 1
|
||||
},
|
||||
{
|
||||
"description": "The date at which current entry is corrected in the system.",
|
||||
"doctype": "DocField",
|
||||
"fieldname": "amendment_date",
|
||||
"fieldtype": "Date",
|
||||
"hidden": 1,
|
||||
"label": "Amendment Date",
|
||||
"no_copy": 1,
|
||||
"oldfieldname": "amendment_date",
|
||||
"oldfieldtype": "Date",
|
||||
"print_hide": 1
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
"fieldname": "remarks",
|
||||
@ -250,18 +238,6 @@
|
||||
"oldfieldtype": "Small Text",
|
||||
"print_hide": 1
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
"fieldname": "cancel_reason",
|
||||
"fieldtype": "Data",
|
||||
"hidden": 1,
|
||||
"label": "Cancel Reason",
|
||||
"no_copy": 1,
|
||||
"oldfieldname": "cancel_reason",
|
||||
"oldfieldtype": "Data",
|
||||
"print_hide": 1,
|
||||
"read_only": 1
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
"fieldname": "item_details",
|
||||
|
@ -2,7 +2,7 @@
|
||||
{
|
||||
"creation": "2013-03-07 18:50:30",
|
||||
"docstatus": 0,
|
||||
"modified": "2013-04-02 16:28:08",
|
||||
"modified": "2013-06-11 16:03:41",
|
||||
"modified_by": "Administrator",
|
||||
"owner": "Administrator"
|
||||
},
|
||||
@ -429,22 +429,6 @@
|
||||
"read_only": 1,
|
||||
"width": "150px"
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
"fieldname": "amendment_date",
|
||||
"fieldtype": "Date",
|
||||
"label": "Amendment Date",
|
||||
"no_copy": 1,
|
||||
"oldfieldname": "amendment_date",
|
||||
"oldfieldtype": "Date",
|
||||
"print_hide": 1,
|
||||
"read_only": 1,
|
||||
"width": "150px"
|
||||
},
|
||||
{
|
||||
"doctype": "DocPerm",
|
||||
"role": "System Manager"
|
||||
},
|
||||
{
|
||||
"doctype": "DocPerm",
|
||||
"role": "Sales User"
|
||||
|
@ -98,13 +98,6 @@ class DocType(SellingController):
|
||||
# VALIDATE
|
||||
# ==============================================================================================
|
||||
|
||||
# Amendment date is necessary if document is amended
|
||||
# --------------------------------------------------
|
||||
def validate_mandatory(self):
|
||||
if self.doc.amended_from and not self.doc.amendment_date:
|
||||
msgprint("Please Enter Amendment Date")
|
||||
raise Exception
|
||||
|
||||
# Fiscal Year Validation
|
||||
# ----------------------
|
||||
def validate_fiscal_year(self):
|
||||
|
@ -93,10 +93,6 @@ class DocType(SellingController):
|
||||
if getdate(self.doc.transaction_date) > getdate(self.doc.delivery_date):
|
||||
msgprint("Expected Delivery Date cannot be before Sales Order Date")
|
||||
raise Exception
|
||||
# amendment date is necessary if document is amended
|
||||
if self.doc.amended_from and not self.doc.amendment_date:
|
||||
msgprint("Please Enter Amendment Date")
|
||||
raise Exception
|
||||
|
||||
def validate_po(self):
|
||||
# validate p.o date v/s delivery date
|
||||
|
@ -7,8 +7,6 @@ def pre_import():
|
||||
make_modules()
|
||||
make_roles()
|
||||
webnotes.conn.commit()
|
||||
webnotes.reload_doc("utilities", "doctype", "gl_mapper")
|
||||
webnotes.reload_doc("utilities", "doctype", "gl_mapper_detail")
|
||||
|
||||
def make_modules():
|
||||
modules = [
|
||||
|
@ -140,12 +140,6 @@ class DocType(SellingController):
|
||||
if not self.doc.installation_status: self.doc.installation_status = 'Not Installed'
|
||||
|
||||
|
||||
def validate_mandatory(self):
|
||||
if self.doc.amended_from and not self.doc.amendment_date:
|
||||
msgprint("Please Enter Amendment Date")
|
||||
raise Exception, "Validation Error. "
|
||||
|
||||
|
||||
def validate_proj_cust(self):
|
||||
"""check for does customer belong to same project as entered.."""
|
||||
if self.doc.project_name and self.doc.customer:
|
||||
|
@ -2,7 +2,7 @@
|
||||
{
|
||||
"creation": "2013-03-07 14:48:38",
|
||||
"docstatus": 0,
|
||||
"modified": "2013-06-05 14:46:10",
|
||||
"modified": "2013-06-11 16:16:36",
|
||||
"modified_by": "Administrator",
|
||||
"owner": "Administrator"
|
||||
},
|
||||
@ -268,19 +268,6 @@
|
||||
"read_only": 1,
|
||||
"width": "150px"
|
||||
},
|
||||
{
|
||||
"description": "The date at which current entry is corrected in the system.",
|
||||
"doctype": "DocField",
|
||||
"fieldname": "amendment_date",
|
||||
"fieldtype": "Date",
|
||||
"label": "Amendment Date",
|
||||
"no_copy": 1,
|
||||
"oldfieldname": "amendment_date",
|
||||
"oldfieldtype": "Date",
|
||||
"print_hide": 1,
|
||||
"print_width": "100px",
|
||||
"width": "100px"
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
"fieldname": "remark",
|
||||
|
@ -2,7 +2,7 @@
|
||||
{
|
||||
"creation": "2013-04-11 15:32:24",
|
||||
"docstatus": 0,
|
||||
"modified": "2013-04-16 17:33:38",
|
||||
"modified": "2013-06-11 16:16:37",
|
||||
"modified_by": "Administrator",
|
||||
"owner": "Administrator"
|
||||
},
|
||||
@ -210,17 +210,6 @@
|
||||
"print_hide": 1,
|
||||
"read_only": 1
|
||||
},
|
||||
{
|
||||
"depends_on": "eval:doc.amended_from",
|
||||
"description": "The date at which current entry is corrected in the system.",
|
||||
"doctype": "DocField",
|
||||
"fieldname": "amendment_date",
|
||||
"fieldtype": "Date",
|
||||
"label": "Amendment Date",
|
||||
"no_copy": 1,
|
||||
"print_hide": 1,
|
||||
"read_only": 0
|
||||
},
|
||||
{
|
||||
"doctype": "DocPerm",
|
||||
"role": "Material User"
|
||||
|
@ -2,7 +2,7 @@
|
||||
{
|
||||
"creation": "2013-05-21 16:16:39",
|
||||
"docstatus": 0,
|
||||
"modified": "2013-06-05 14:45:10",
|
||||
"modified": "2013-06-11 16:16:40",
|
||||
"modified_by": "Administrator",
|
||||
"owner": "Administrator"
|
||||
},
|
||||
@ -784,19 +784,6 @@
|
||||
"print_width": "50px",
|
||||
"width": "50px"
|
||||
},
|
||||
{
|
||||
"depends_on": "eval:!doc.__islocal",
|
||||
"doctype": "DocField",
|
||||
"fieldname": "cancel_reason",
|
||||
"fieldtype": "Data",
|
||||
"hidden": 0,
|
||||
"label": "Cancel Reason",
|
||||
"no_copy": 1,
|
||||
"oldfieldname": "cancel_reason",
|
||||
"oldfieldtype": "Data",
|
||||
"print_hide": 1,
|
||||
"read_only": 1
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
"fieldname": "instructions",
|
||||
|
@ -2,7 +2,7 @@
|
||||
{
|
||||
"creation": "2013-01-10 16:34:30",
|
||||
"docstatus": 0,
|
||||
"modified": "2013-01-28 17:54:09",
|
||||
"modified": "2013-06-11 16:16:33",
|
||||
"modified_by": "Administrator",
|
||||
"owner": "harshada@webnotestech.com"
|
||||
},
|
||||
@ -401,18 +401,6 @@
|
||||
"print_hide": 1,
|
||||
"width": "150px"
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
"fieldname": "amendment_date",
|
||||
"fieldtype": "Date",
|
||||
"hidden": 1,
|
||||
"label": "Amendment Date",
|
||||
"no_copy": 1,
|
||||
"oldfieldname": "amendment_date",
|
||||
"oldfieldtype": "Date",
|
||||
"print_hide": 1,
|
||||
"width": "100px"
|
||||
},
|
||||
{
|
||||
"amend": 1,
|
||||
"cancel": 1,
|
||||
|
@ -2,7 +2,7 @@
|
||||
{
|
||||
"creation": "2013-01-10 16:34:30",
|
||||
"docstatus": 0,
|
||||
"modified": "2013-01-28 17:35:45",
|
||||
"modified": "2013-06-11 16:16:37",
|
||||
"modified_by": "Administrator",
|
||||
"owner": "Administrator"
|
||||
},
|
||||
@ -169,19 +169,6 @@
|
||||
"oldfieldtype": "Data",
|
||||
"read_only": 1
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
"fieldname": "amendment_date",
|
||||
"fieldtype": "Date",
|
||||
"hidden": 1,
|
||||
"label": "Amendment Date",
|
||||
"no_copy": 1,
|
||||
"oldfieldname": "amendment_date",
|
||||
"oldfieldtype": "Date",
|
||||
"print_hide": 1,
|
||||
"read_only": 1,
|
||||
"report_hide": 1
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
"fieldname": "company",
|
||||
|
@ -2,7 +2,7 @@
|
||||
{
|
||||
"creation": "2013-01-10 16:34:31",
|
||||
"docstatus": 0,
|
||||
"modified": "2013-01-28 17:31:01",
|
||||
"modified": "2013-06-11 16:16:37",
|
||||
"modified_by": "Administrator",
|
||||
"owner": "ashwini@webnotestech.com"
|
||||
},
|
||||
@ -277,17 +277,6 @@
|
||||
"read_only": 1,
|
||||
"width": "150px"
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
"fieldname": "amendment_date",
|
||||
"fieldtype": "Date",
|
||||
"label": "Amendment Date",
|
||||
"no_copy": 1,
|
||||
"oldfieldname": "amendment_date",
|
||||
"oldfieldtype": "Date",
|
||||
"print_hide": 1,
|
||||
"width": "100px"
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
"fieldname": "company",
|
||||
|
@ -19,42 +19,6 @@ import webnotes
|
||||
from webnotes import _, msgprint
|
||||
from webnotes.utils import cint, comma_or
|
||||
|
||||
@webnotes.whitelist()
|
||||
def get_sc_list(arg=None):
|
||||
"""return list of reports for the given module module"""
|
||||
limit_start = webnotes.form_dict.get("limit_start")
|
||||
limit_page_length = webnotes.form_dict.get("limit_page_length")
|
||||
module = webnotes.form_dict.get("module")
|
||||
|
||||
webnotes.response['values'] = webnotes.conn.sql("""
|
||||
select distinct criteria_name, doc_type, parent_doc_type
|
||||
from `tabSearch Criteria`
|
||||
where module=%s
|
||||
and docstatus in (0, NULL)
|
||||
and ifnull(disabled, 0) = 0
|
||||
order by criteria_name
|
||||
limit %s, %s""" % \
|
||||
("%s", cint(limit_start), cint(limit_page_length)), (module,), as_dict=True)
|
||||
|
||||
@webnotes.whitelist()
|
||||
def get_report_list():
|
||||
"""return list on new style reports for modules"""
|
||||
limit_start = webnotes.form_dict.get("limit_start")
|
||||
limit_page_length = webnotes.form_dict.get("limit_page_length")
|
||||
module = webnotes.form_dict.get("module")
|
||||
|
||||
webnotes.response['values'] = webnotes.conn.sql("""
|
||||
select distinct tabReport.name, tabReport.ref_doctype,
|
||||
if(ifnull(tabReport.query, '')!='', 1, 0) as is_query_report
|
||||
from `tabReport`, `tabDocType`
|
||||
where tabDocType.module=%s
|
||||
and tabDocType.name = tabReport.ref_doctype
|
||||
and tabReport.docstatus in (0, NULL)
|
||||
and ifnull(tabReport.disabled,0) != 1
|
||||
order by tabReport.name
|
||||
limit %s, %s""" % \
|
||||
("%s", cint(limit_start), cint(limit_page_length)), (module,), as_dict=True)
|
||||
|
||||
def validate_status(status, options):
|
||||
if status not in options:
|
||||
msgprint(_("Status must be one of ") + comma_or(options), raise_exception=True)
|
||||
|
Loading…
Reference in New Issue
Block a user