From fa0cd89a7cd5852b76cd6cfec8e3fae192f73637 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Thu, 5 Apr 2012 13:03:35 +0530 Subject: [PATCH 1/3] change from labels to fieldname in cur_frm.cscript --- .../Delivery Note-Sales Invoice.txt | 4 +- .../Project-Sales Invoice.txt | 4 +- .../Purchase Order-Purchase Invoice.txt | 4 +- .../Purchase Receipt-Purchase Invoice.txt | 4 +- .../Sales Order-Sales Invoice.txt | 4 +- erpnext/accounts/doctype/account/account.js | 4 +- .../doctype/cost_center/cost_center.js | 4 +- .../journal_voucher/journal_voucher.js | 6 +- .../multi_ledger_report.js | 2 +- .../purchase_invoice/purchase_invoice.js | 16 +- .../doctype/sales_invoice/sales_invoice.js | 12 +- .../doctype/tds_payment/tds_payment.js | 2 +- .../accounts_payable/accounts_payable.txt | 4 +- .../accounts_receivable.txt | 4 +- .../bank_clearance_report.txt | 4 +- .../bank_reconciliation_statement.txt | 4 +- .../budget_variance_report.txt | 4 +- .../business_associate_commission_report.txt | 4 +- .../cash_flow_statement.txt | 4 +- .../__init__.py | 0 .../cenvat_credit___input_or_capital_goods.js | 36 ---- .../cenvat_credit___input_or_capital_goods.py | 154 ------------------ ...cenvat_credit___input_or_capital_goods.sql | 31 ---- ...cenvat_credit___input_or_capital_goods.txt | 34 ---- .../collection_report/collection_report.txt | 4 +- .../cost_center_wise_expense.txt | 4 +- .../creditors_ledger/creditors_ledger.txt | 4 +- .../debtors_ledger/debtors_ledger.txt | 4 +- .../general_ledger/general_ledger.txt | 4 +- .../itemwise_purchase_register.txt | 4 +- .../itemwise_sales_register.txt | 4 +- .../lease_agreement_list/__init__.py | 0 .../lease_agreement_list.js | 27 --- .../lease_agreement_list.py | 29 ---- .../lease_agreement_list.sql | 3 - .../lease_agreement_list.txt | 30 ---- .../__init__.py | 0 ...ease_monthly_future_installment_inflows.js | 30 ---- ...ease_monthly_future_installment_inflows.py | 29 ---- ...ase_monthly_future_installment_inflows.sql | 9 - ...ase_monthly_future_installment_inflows.txt | 30 ---- .../lease_over_due_list/__init__.py | 0 .../lease_over_due_list.js | 30 ---- .../lease_over_due_list.py | 30 ---- .../lease_over_due_list.sql | 7 - .../lease_over_due_list.txt | 30 ---- .../lease_overdue_age_wise/__init__.py | 0 .../lease_overdue_age_wise.js | 30 ---- .../lease_overdue_age_wise.py | 32 ---- .../lease_overdue_age_wise.sql | 9 - .../lease_overdue_age_wise.txt | 30 ---- .../__init__.py | 0 .../lease_receipt_summary_month_wise.js | 27 --- .../lease_receipt_summary_month_wise.py | 29 ---- .../lease_receipt_summary_month_wise.sql | 5 - .../lease_receipt_summary_month_wise.txt | 30 ---- .../lease_receipts_client_wise/__init__.py | 0 .../lease_receipts_client_wise.js | 27 --- .../lease_receipts_client_wise.py | 28 ---- .../lease_receipts_client_wise.sql | 5 - .../lease_receipts_client_wise.txt | 31 ---- .../__init__.py | 0 ...lease_yearly_future_installment_inflows.js | 30 ---- ...lease_yearly_future_installment_inflows.py | 28 ---- ...ease_yearly_future_installment_inflows.sql | 9 - ...ease_yearly_future_installment_inflows.txt | 30 ---- .../monthly_ledger_summary_report/__init__.py | 0 .../monthly_ledger_summary_report.js | 27 --- .../monthly_ledger_summary_report.py | 29 ---- .../monthly_ledger_summary_report.txt | 36 ---- .../payment_receipt_report.txt | 4 +- .../payment_report/__init__.py | 0 .../payment_report/payment_report.js | 42 ----- .../payment_report/payment_report.py | 105 ------------ .../payment_report/payment_report.sql | 12 -- .../payment_report/payment_report.txt | 33 ---- .../progressive_total_excise_duty.txt | 4 +- .../purchase_register/purchase_register.txt | 4 +- .../sales_register/sales_register.txt | 4 +- .../service_tax_credit_account___inputs.txt | 4 +- .../search_criteria/tds_return/tds_return.txt | 4 +- ...collection_for_a_period___customerwise.txt | 4 +- .../trial_balance/trial_balance.txt | 30 ++-- .../voucher_wise_tax_details.txt | 4 +- .../monthly_transaction_summary.txt | 4 +- .../trend_analyzer/trend_analyzer.txt | 4 +- .../yearly_transaction_summary.txt | 4 +- .../Purchase Request-Purchase Order.txt | 4 +- .../Sales Order-Purchase Request.txt | 4 +- .../purchase_common/purchase_common.js | 6 +- .../doctype/purchase_order/purchase_order.js | 4 +- .../purchase_request/purchase_request.js | 2 +- .../itemwise_purchase_details.txt | 4 +- .../itemwise_receipt_details.txt | 4 +- .../pending_po_items_to_bill.txt | 4 +- .../pending_po_items_to_receive.txt | 4 +- .../purchase_in_transit.txt | 4 +- .../bills_to_be_paid/__init__.py | 0 .../bills_to_be_paid/bills_to_be_paid.txt | 34 ---- .../bills_to_be_submitted/__init__.py | 0 .../bills_to_be_submitted.txt | 33 ---- .../delivery_note_to_be_billed/__init__.py | 0 .../delivery_note_to_be_billed.txt | 34 ---- .../delivery_note_to_be_submitted/__init__.py | 0 .../delivery_note_to_be_submitted.txt | 33 ---- .../invoices_overdue/invoices_overdue.txt | 4 +- .../invoices_to_be_submitted.txt | 4 +- .../invoices_to_receive_payment.txt | 4 +- .../lead_to_follow_up/lead_to_follow_up.txt | 4 +- .../purchase_order_to_be_billed.txt | 4 +- .../purchase_order_to_be_submitted.txt | 4 +- .../purchase_order_to_receive_items.txt | 4 +- .../sales_order_overdue.txt | 4 +- .../sales_order_to_be_billed.txt | 4 +- .../sales_order_to_be_delivered.txt | 4 +- .../sales_order_to_be_submitted.txt | 4 +- .../serial_no_amc_expiring_this_month.txt | 4 +- ...serial_no_warranty_expiring_this_month.txt | 4 +- .../search_criteria/task_open/task_open.txt | 4 +- .../Appraisal Template-Appraisal.txt | 4 +- erpnext/hr/doctype/appraisal/appraisal.js | 6 +- .../attendance_control_panel.js | 4 +- .../hr/doctype/expense_claim/expense_claim.js | 8 +- .../hr/doctype/it_checklist/it_checklist.js | 2 +- .../doctype/salary_manager/salary_manager.js | 6 +- .../employee_appraisals.txt | 4 +- .../employee_information.txt | 4 +- .../employees_birthday/employees_birthday.txt | 4 +- ...employeewise_leave_transaction_details.txt | 4 +- .../monthly_attendance_details.txt | 4 +- .../monthly_salary_register.txt | 4 +- .../new_or_left_employees_for_a_month.txt | 4 +- .../pending_appraisals/pending_appraisals.txt | 4 +- .../salary_register/salary_register.txt | 4 +- .../salary_slips/salary_slips.txt | 4 +- .../salary_structure_details.txt | 4 +- erpnext/patches/jan_mar_2012/rename_dt.py | 81 +++++++-- .../production_planning_tool.js | 2 +- .../consumption_against_production.txt | 4 +- .../delivery_plan/delivery_plan.txt | 4 +- .../itemwise_production_report.txt | 4 +- .../production_orders_in_process.txt | 4 +- .../project_activity/project_activity.js | 2 +- erpnext/projects/doctype/task/task.js | 4 +- .../dispatch_report/dispatch_report.txt | 4 +- .../projectwise_delivered_qty_and_costs.txt | 4 +- .../projectwise_pending_qty_and_costs.txt | 4 +- .../projectwise_purchase_details.txt | 4 +- .../projectwise_sales_details.txt | 4 +- .../projectwise_sales_orders.txt | 4 +- .../timesheet_report/timesheet_report.txt | 4 +- .../Lead-Opportunity/Lead-Opportunity.txt | 4 +- .../Opportunity-Quotation.txt | 4 +- .../installation_note/installation_note.js | 2 +- erpnext/selling/doctype/lead/lead.js | 4 +- .../doctype/opportunity/opportunity.js | 2 +- .../selling/doctype/quotation/quotation.js | 6 +- .../doctype/sales_common/sales_common.js | 12 +- .../doctype/sales_order/sales_order.js | 8 +- .../customer_address_contact.txt | 4 +- .../delivered_items_to_be_install.txt | 4 +- ...delivery_note_itemwise_pending_to_bill.txt | 4 +- .../follow_up_report/follow_up_report.txt | 4 +- .../gross_profit/gross_profit.txt | 4 +- .../itemwise_delivery_details.txt | 4 +- .../itemwise_sales_details.txt | 4 +- .../monthly_despatched_trend.txt | 4 +- ...s_orderwise_booking_&_delivery_summary.txt | 4 +- ...sales_orderwise_pending_amount_to_bill.txt | 4 +- ...sales_orderwise_pending_qty_to_deliver.txt | 4 +- ...ersons_target_variance_item_group_wise.txt | 4 +- .../sales_personwise_transaction_summary.txt | 4 +- .../target_variance_report.txt | 4 +- ...tories_target_variance_item_group_wise.txt | 4 +- .../territory_sales___variance_report.txt | 4 +- .../total_target_variance_report.txt | 4 +- .../variance_report/variance_report.txt | 4 +- .../doctype/email_digest/email_digest.js | 2 +- .../permission_control/permission_control.py | 5 +- .../setup/doctype/price_list/price_list.js | 2 +- .../Sales Invoice-Delivery Note.txt | 4 +- .../doctype/delivery_note/delivery_note.js | 4 +- erpnext/stock/doctype/item/item.js | 2 +- .../purchase_receipt/purchase_receipt.js | 4 +- .../sales_and_purchase_return_tool.js | 10 +- erpnext/stock/doctype/sales_bom/sales_bom.js | 2 +- .../stock_reconciliation.js | 2 +- .../itemwise_price_list.txt | 4 +- .../stock_aging_report/stock_aging_report.txt | 4 +- .../stock_ledger/stock_ledger.txt | 4 +- .../stock_level/stock_level.txt | 4 +- .../stock_report/stock_report.txt | 4 +- .../doctype/customer_issue/customer_issue.js | 2 +- .../maintenance_schedule.js | 4 +- .../maintenance_visit/maintenance_visit.js | 2 +- .../amc_summary/amc_summary.txt | 4 +- .../customer_issues/customer_issues.txt | 4 +- ...nance_orderwise_pending_amount_to_bill.txt | 4 +- .../maintenance_schedule_details.txt | 4 +- .../warranty_amc_expiry_details.txt | 4 +- .../warranty_amc_summary.txt | 4 +- .../doctype/reposting_tool/reposting_tool.js | 4 +- .../doctype/sms_control/sms_control.js | 2 +- wnf.py | 7 +- 204 files changed, 389 insertions(+), 1663 deletions(-) delete mode 100644 erpnext/accounts/search_criteria/cenvat_credit___input_or_capital_goods/__init__.py delete mode 100644 erpnext/accounts/search_criteria/cenvat_credit___input_or_capital_goods/cenvat_credit___input_or_capital_goods.js delete mode 100644 erpnext/accounts/search_criteria/cenvat_credit___input_or_capital_goods/cenvat_credit___input_or_capital_goods.py delete mode 100644 erpnext/accounts/search_criteria/cenvat_credit___input_or_capital_goods/cenvat_credit___input_or_capital_goods.sql delete mode 100644 erpnext/accounts/search_criteria/cenvat_credit___input_or_capital_goods/cenvat_credit___input_or_capital_goods.txt delete mode 100644 erpnext/accounts/search_criteria/lease_agreement_list/__init__.py delete mode 100644 erpnext/accounts/search_criteria/lease_agreement_list/lease_agreement_list.js delete mode 100644 erpnext/accounts/search_criteria/lease_agreement_list/lease_agreement_list.py delete mode 100644 erpnext/accounts/search_criteria/lease_agreement_list/lease_agreement_list.sql delete mode 100644 erpnext/accounts/search_criteria/lease_agreement_list/lease_agreement_list.txt delete mode 100644 erpnext/accounts/search_criteria/lease_monthly_future_installment_inflows/__init__.py delete mode 100644 erpnext/accounts/search_criteria/lease_monthly_future_installment_inflows/lease_monthly_future_installment_inflows.js delete mode 100644 erpnext/accounts/search_criteria/lease_monthly_future_installment_inflows/lease_monthly_future_installment_inflows.py delete mode 100644 erpnext/accounts/search_criteria/lease_monthly_future_installment_inflows/lease_monthly_future_installment_inflows.sql delete mode 100644 erpnext/accounts/search_criteria/lease_monthly_future_installment_inflows/lease_monthly_future_installment_inflows.txt delete mode 100644 erpnext/accounts/search_criteria/lease_over_due_list/__init__.py delete mode 100644 erpnext/accounts/search_criteria/lease_over_due_list/lease_over_due_list.js delete mode 100644 erpnext/accounts/search_criteria/lease_over_due_list/lease_over_due_list.py delete mode 100644 erpnext/accounts/search_criteria/lease_over_due_list/lease_over_due_list.sql delete mode 100644 erpnext/accounts/search_criteria/lease_over_due_list/lease_over_due_list.txt delete mode 100644 erpnext/accounts/search_criteria/lease_overdue_age_wise/__init__.py delete mode 100644 erpnext/accounts/search_criteria/lease_overdue_age_wise/lease_overdue_age_wise.js delete mode 100644 erpnext/accounts/search_criteria/lease_overdue_age_wise/lease_overdue_age_wise.py delete mode 100644 erpnext/accounts/search_criteria/lease_overdue_age_wise/lease_overdue_age_wise.sql delete mode 100644 erpnext/accounts/search_criteria/lease_overdue_age_wise/lease_overdue_age_wise.txt delete mode 100644 erpnext/accounts/search_criteria/lease_receipt_summary_month_wise/__init__.py delete mode 100644 erpnext/accounts/search_criteria/lease_receipt_summary_month_wise/lease_receipt_summary_month_wise.js delete mode 100644 erpnext/accounts/search_criteria/lease_receipt_summary_month_wise/lease_receipt_summary_month_wise.py delete mode 100644 erpnext/accounts/search_criteria/lease_receipt_summary_month_wise/lease_receipt_summary_month_wise.sql delete mode 100644 erpnext/accounts/search_criteria/lease_receipt_summary_month_wise/lease_receipt_summary_month_wise.txt delete mode 100644 erpnext/accounts/search_criteria/lease_receipts_client_wise/__init__.py delete mode 100644 erpnext/accounts/search_criteria/lease_receipts_client_wise/lease_receipts_client_wise.js delete mode 100644 erpnext/accounts/search_criteria/lease_receipts_client_wise/lease_receipts_client_wise.py delete mode 100644 erpnext/accounts/search_criteria/lease_receipts_client_wise/lease_receipts_client_wise.sql delete mode 100644 erpnext/accounts/search_criteria/lease_receipts_client_wise/lease_receipts_client_wise.txt delete mode 100644 erpnext/accounts/search_criteria/lease_yearly_future_installment_inflows/__init__.py delete mode 100644 erpnext/accounts/search_criteria/lease_yearly_future_installment_inflows/lease_yearly_future_installment_inflows.js delete mode 100644 erpnext/accounts/search_criteria/lease_yearly_future_installment_inflows/lease_yearly_future_installment_inflows.py delete mode 100644 erpnext/accounts/search_criteria/lease_yearly_future_installment_inflows/lease_yearly_future_installment_inflows.sql delete mode 100644 erpnext/accounts/search_criteria/lease_yearly_future_installment_inflows/lease_yearly_future_installment_inflows.txt delete mode 100644 erpnext/accounts/search_criteria/monthly_ledger_summary_report/__init__.py delete mode 100644 erpnext/accounts/search_criteria/monthly_ledger_summary_report/monthly_ledger_summary_report.js delete mode 100644 erpnext/accounts/search_criteria/monthly_ledger_summary_report/monthly_ledger_summary_report.py delete mode 100644 erpnext/accounts/search_criteria/monthly_ledger_summary_report/monthly_ledger_summary_report.txt delete mode 100644 erpnext/accounts/search_criteria/payment_report/__init__.py delete mode 100644 erpnext/accounts/search_criteria/payment_report/payment_report.js delete mode 100644 erpnext/accounts/search_criteria/payment_report/payment_report.py delete mode 100644 erpnext/accounts/search_criteria/payment_report/payment_report.sql delete mode 100644 erpnext/accounts/search_criteria/payment_report/payment_report.txt delete mode 100644 erpnext/home/search_criteria/bills_to_be_paid/__init__.py delete mode 100644 erpnext/home/search_criteria/bills_to_be_paid/bills_to_be_paid.txt delete mode 100644 erpnext/home/search_criteria/bills_to_be_submitted/__init__.py delete mode 100644 erpnext/home/search_criteria/bills_to_be_submitted/bills_to_be_submitted.txt delete mode 100644 erpnext/home/search_criteria/delivery_note_to_be_billed/__init__.py delete mode 100644 erpnext/home/search_criteria/delivery_note_to_be_billed/delivery_note_to_be_billed.txt delete mode 100644 erpnext/home/search_criteria/delivery_note_to_be_submitted/__init__.py delete mode 100644 erpnext/home/search_criteria/delivery_note_to_be_submitted/delivery_note_to_be_submitted.txt diff --git a/erpnext/accounts/DocType Mapper/Delivery Note-Sales Invoice/Delivery Note-Sales Invoice.txt b/erpnext/accounts/DocType Mapper/Delivery Note-Sales Invoice/Delivery Note-Sales Invoice.txt index 66572be442d..72f326bda31 100644 --- a/erpnext/accounts/DocType Mapper/Delivery Note-Sales Invoice/Delivery Note-Sales Invoice.txt +++ b/erpnext/accounts/DocType Mapper/Delivery Note-Sales Invoice/Delivery Note-Sales Invoice.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-04-02 13:38:02', + 'creation': '2012-04-03 12:49:42', 'docstatus': 0, - 'modified': '2012-04-02 13:38:02', + 'modified': '2012-04-03 12:49:43', 'modified_by': u'Administrator', 'owner': u'Administrator' }, diff --git a/erpnext/accounts/DocType Mapper/Project-Sales Invoice/Project-Sales Invoice.txt b/erpnext/accounts/DocType Mapper/Project-Sales Invoice/Project-Sales Invoice.txt index 44cffbda523..8d87fda9a69 100644 --- a/erpnext/accounts/DocType Mapper/Project-Sales Invoice/Project-Sales Invoice.txt +++ b/erpnext/accounts/DocType Mapper/Project-Sales Invoice/Project-Sales Invoice.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2010-09-20 12:33:34', + 'creation': '2010-09-01 15:47:59', 'docstatus': 0, - 'modified': '2012-03-30 13:33:31', + 'modified': '2012-04-03 12:49:50', 'modified_by': u'Administrator', 'owner': u'ashwini@webnotestech.com' }, diff --git a/erpnext/accounts/DocType Mapper/Purchase Order-Purchase Invoice/Purchase Order-Purchase Invoice.txt b/erpnext/accounts/DocType Mapper/Purchase Order-Purchase Invoice/Purchase Order-Purchase Invoice.txt index 5e06ad39bfb..0e544576fd9 100644 --- a/erpnext/accounts/DocType Mapper/Purchase Order-Purchase Invoice/Purchase Order-Purchase Invoice.txt +++ b/erpnext/accounts/DocType Mapper/Purchase Order-Purchase Invoice/Purchase Order-Purchase Invoice.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2010-09-20 12:33:34', + 'creation': '2010-08-08 17:09:35', 'docstatus': 0, - 'modified': '2012-03-30 13:33:31', + 'modified': '2012-04-03 12:49:50', 'modified_by': u'Administrator', 'owner': u'Administrator' }, diff --git a/erpnext/accounts/DocType Mapper/Purchase Receipt-Purchase Invoice/Purchase Receipt-Purchase Invoice.txt b/erpnext/accounts/DocType Mapper/Purchase Receipt-Purchase Invoice/Purchase Receipt-Purchase Invoice.txt index 092c8df79b1..75b188b62e0 100644 --- a/erpnext/accounts/DocType Mapper/Purchase Receipt-Purchase Invoice/Purchase Receipt-Purchase Invoice.txt +++ b/erpnext/accounts/DocType Mapper/Purchase Receipt-Purchase Invoice/Purchase Receipt-Purchase Invoice.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2010-09-20 12:33:34', + 'creation': '2010-08-08 17:09:35', 'docstatus': 0, - 'modified': '2012-03-30 13:33:31', + 'modified': '2012-04-03 12:49:50', 'modified_by': u'Administrator', 'owner': u'Administrator' }, diff --git a/erpnext/accounts/DocType Mapper/Sales Order-Sales Invoice/Sales Order-Sales Invoice.txt b/erpnext/accounts/DocType Mapper/Sales Order-Sales Invoice/Sales Order-Sales Invoice.txt index 8f9afd001af..aa1cc3c9a48 100644 --- a/erpnext/accounts/DocType Mapper/Sales Order-Sales Invoice/Sales Order-Sales Invoice.txt +++ b/erpnext/accounts/DocType Mapper/Sales Order-Sales Invoice/Sales Order-Sales Invoice.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-04-02 13:38:02', + 'creation': '2012-04-03 12:49:42', 'docstatus': 0, - 'modified': '2012-04-02 13:05:04', + 'modified': '2012-04-03 12:49:42', 'modified_by': u'Administrator', 'owner': u'Administrator' }, diff --git a/erpnext/accounts/doctype/account/account.js b/erpnext/accounts/doctype/account/account.js index 32f60c7f1de..57edd5a2ecf 100644 --- a/erpnext/accounts/doctype/account/account.js +++ b/erpnext/accounts/doctype/account/account.js @@ -57,7 +57,7 @@ cur_frm.cscript.hide_unhide_group_ledger = function(doc) { // Convert group to ledger // ----------------------------------------- -cur_frm.cscript['Convert to Ledger'] = function(doc, cdt, cdn) { +cur_frm.cscript.convert_to_ledger = function(doc, cdt, cdn) { $c_obj(make_doclist(cdt,cdn),'convert_group_to_ledger','',function(r,rt) { if(r.message == 1) { doc.group_or_ledger = 'Ledger'; @@ -69,7 +69,7 @@ cur_frm.cscript['Convert to Ledger'] = function(doc, cdt, cdn) { // Convert ledger to group // ----------------------------------------- -cur_frm.cscript['Convert to Group'] = function(doc, cdt, cdn) { +cur_frm.cscript.convert_to_group = function(doc, cdt, cdn) { $c_obj(make_doclist(cdt,cdn),'convert_ledger_to_group','',function(r,rt) { if(r.message == 1) { doc.group_or_ledger = 'Group'; diff --git a/erpnext/accounts/doctype/cost_center/cost_center.js b/erpnext/accounts/doctype/cost_center/cost_center.js index 180836a4329..d638ee43fa8 100644 --- a/erpnext/accounts/doctype/cost_center/cost_center.js +++ b/erpnext/accounts/doctype/cost_center/cost_center.js @@ -65,7 +65,7 @@ cur_frm.cscript.hide_unhide_group_ledger = function(doc) { // Convert group to ledger // ----------------------------------------- -cur_frm.cscript['Convert to Ledger'] = function(doc, cdt, cdn) { +cur_frm.cscript.convert_to_ledger = function(doc, cdt, cdn) { $c_obj(make_doclist(cdt,cdn),'convert_group_to_ledger','',function(r,rt) { if(r.message == 1) { doc.group_or_ledger = 'Ledger'; @@ -77,7 +77,7 @@ cur_frm.cscript['Convert to Ledger'] = function(doc, cdt, cdn) { // Convert ledger to group // ----------------------------------------- -cur_frm.cscript['Convert to Group'] = function(doc, cdt, cdn) { +cur_frm.cscript.convert_to_group = function(doc, cdt, cdn) { $c_obj(make_doclist(cdt,cdn),'convert_ledger_to_group','',function(r,rt) { if(r.message == 1) { doc.group_or_ledger = 'Group'; diff --git a/erpnext/accounts/doctype/journal_voucher/journal_voucher.js b/erpnext/accounts/doctype/journal_voucher/journal_voucher.js index ca3205c76ff..e947133e60d 100644 --- a/erpnext/accounts/doctype/journal_voucher/journal_voucher.js +++ b/erpnext/accounts/doctype/journal_voucher/journal_voucher.js @@ -137,7 +137,7 @@ cur_frm.cscript.rate = function(doc,dt,dn) { refresh_field('ded_amount'); cur_frm.cscript.update_totals(doc); } -cur_frm.cscript['Get Balance'] = function(doc,dt,dn) { +cur_frm.cscript.get_balance = function(doc,dt,dn) { cur_frm.cscript.update_totals(doc); $c_obj(make_doclist(dt,dn), 'get_balance', '', function(r, rt){ cur_frm.refresh(); @@ -157,7 +157,7 @@ cur_frm.cscript.validate = function(doc,cdt,cdn) { // TDS // -------- -cur_frm.cscript['Get TDS'] = function(doc, dt, dn) { +cur_frm.cscript.get_tds = function(doc, dt, dn) { $c_obj(make_doclist(dt,dn), 'get_tds', '', function(r, rt){ cur_frm.refresh(); cur_frm.cscript.update_totals(doc); @@ -181,7 +181,7 @@ cur_frm.cscript.select_print_heading = function(doc,cdt,cdn){ } /****************** Get Accounting Entry *****************/ -cur_frm.cscript['View Ledger Entry'] = function(doc,cdt,cdn){ +cur_frm.cscript.view_ledger_entry = function(doc,cdt,cdn){ var callback = function(report){ report.set_filter('GL Entry', 'Voucher No',doc.name); report.dt.run(); diff --git a/erpnext/accounts/doctype/multi_ledger_report/multi_ledger_report.js b/erpnext/accounts/doctype/multi_ledger_report/multi_ledger_report.js index 10b1bc14464..2dabb66356c 100755 --- a/erpnext/accounts/doctype/multi_ledger_report/multi_ledger_report.js +++ b/erpnext/accounts/doctype/multi_ledger_report/multi_ledger_report.js @@ -14,6 +14,6 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -cur_frm.cscript['Export Report'] = function(doc, cdt, cdn) { +cur_frm.cscript.export_report = function(doc, cdt, cdn) { $c_obj_csv(make_doclist(cdt, cdn), 'get_report_data', ''); } diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js index f3b3d8a0284..a8550d5b7ea 100644 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js @@ -66,11 +66,11 @@ cur_frm.cscript.refresh = function(doc, dt, dn) { // Show / Hide button if(doc.docstatus==1 && doc.outstanding_amount > 0) - cur_frm.add_custom_button('Make Payment Entry', cur_frm.cscript['Make Bank Voucher']); + cur_frm.add_custom_button('Make Payment Entry', cur_frm.cscript.make_bank_voucher); if(doc.docstatus==1) { unhide_field(['Repair Outstanding Amt']); - cur_frm.add_custom_button('View Ledger', cur_frm.cscript['View Ledger Entry']); + cur_frm.add_custom_button('View Ledger', cur_frm.cscript.view_ledger_entry); } else hide_field(['Repair Outstanding Amt']); cur_frm.cscript.is_opening(doc, dt, dn); @@ -162,14 +162,14 @@ cur_frm.cscript.is_opening = function(doc, dt, dn) { // Recalculate Button // ------------------- -cur_frm.cscript['Recalculate'] = function(doc, cdt, cdn) { - cur_frm.cscript['Calculate Tax'](doc,cdt,cdn); +cur_frm.cscript.recalculate = function(doc, cdt, cdn) { + cur_frm.cscript.calculate_tax(doc,cdt,cdn); calc_total_advance(doc,cdt,cdn); } // Get Items Button // ----------------- -cur_frm.cscript['Get Items'] = function(doc, dt, dn) { +cur_frm.cscript.get_items = function(doc, dt, dn) { var callback = function(r,rt) { unhide_field(['supplier_address', 'contact_person', 'supplier_name', 'address_display', 'contact_display', 'contact_mobile','contact_email']); refresh_many(['credit_to','supplier','supplier_address','contact_person','supplier_name', 'address_display', 'contact_display','contact_mobile', 'contact_email','entries', 'purchase_receipt_main', 'purchase_order_main', 'purchase_tax_details']); @@ -201,7 +201,7 @@ cur_frm.cscript.ded_amount = function(doc,dt,dn) {calculate_outstanding(doc);} // Get TDS Button // --------------- -cur_frm.cscript['Get TDS'] = function(doc, dt, dn) { +cur_frm.cscript.get_tds = function(doc, dt, dn) { var callback = function(r,rt) { cur_frm.refresh(); refresh_field('ded_amount'); @@ -231,7 +231,7 @@ cur_frm.cscript.allocated_amount = function(doc,cdt,cdn){ // Make Journal Voucher // -------------------- -cur_frm.cscript['Make Bank Voucher'] = function() { +cur_frm.cscript.make_bank_voucher = function() { $c('accounts.get_default_bank_account', { company: cur_frm.doc.company }, function(r, rt) { if(!r.exc) { cur_frm.cscript.make_jv(cur_frm.doc, null, null, r.message); @@ -399,7 +399,7 @@ cur_frm.cscript.select_print_heading = function(doc,cdt,cdn){ } /****************** Get Accounting Entry *****************/ -cur_frm.cscript['View Ledger Entry'] = function(){ +cur_frm.cscript.view_ledger_entry = function(){ var callback = function(report){ report.set_filter('GL Entry', 'Voucher No',cur_frm.doc.name); report.dt.run(); diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js index 7201f3dd178..68cdf1f747b 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js @@ -108,15 +108,15 @@ cur_frm.cscript.refresh = function(doc, dt, dn) { if (!cur_frm.cscript.is_onload) cur_frm.cscript.hide_price_list_currency(doc, dt, dn); if(doc.docstatus==1) { - cur_frm.add_custom_button('View Ledger', cur_frm.cscript['View Ledger Entry']); - cur_frm.add_custom_button('Send SMS', cur_frm.cscript['Send SMS']); + cur_frm.add_custom_button('View Ledger', cur_frm.cscript.view_ledger_entry); + cur_frm.add_custom_button('Send SMS', cur_frm.cscript.send_sms); unhide_field('Repair Outstanding Amt'); if(doc.is_pos==1 && doc.update_stock!=1) cur_frm.add_custom_button('Make Delivery', cur_frm.cscript['Make Delivery Note']); if(doc.outstanding_amount!=0) - cur_frm.add_custom_button('Make Payment Entry', cur_frm.cscript['Make Bank Voucher']); + cur_frm.add_custom_button('Make Payment Entry', cur_frm.cscript.make_bank_voucher); } else hide_field('Repair Outstanding Amt'); @@ -275,7 +275,7 @@ cur_frm.cscript.is_opening = function(doc, dt, dn) { /* **************************** TRIGGERS ********************************** */ // Get Items based on SO or DN Selected -cur_frm.cscript['Get Items'] = function(doc, dt, dn) { +cur_frm.cscript.get_items = function(doc, dt, dn) { var callback = function(r,rt) { unhide_field(['customer_address','contact_person','customer_name','address_display','contact_display','contact_mobile','contact_email','territory','customer_group']); cur_frm.refresh(); @@ -314,7 +314,7 @@ cur_frm.cscript['Make Delivery Note'] = function() { // Make Bank Voucher Button // ------------------------- -cur_frm.cscript['Make Bank Voucher'] = function(doc, dt, dn) { +cur_frm.cscript.make_bank_voucher = function(doc, dt, dn) { $c('accounts.get_default_bank_account', { company: cur_frm.doc.company }, function(r, rt) { if(!r.exc) { cur_frm.cscript.make_jv(cur_frm.doc, null, null, r.message); @@ -470,7 +470,7 @@ cur_frm.cscript.make_jv = function(doc, dt, dn, bank_account) { /****************** Get Accounting Entry *****************/ -cur_frm.cscript['View Ledger Entry'] = function(){ +cur_frm.cscript.view_ledger_entry = function(){ var callback = function(report){ report.set_filter('GL Entry', 'Voucher No',cur_frm.doc.name); report.dt.run(); diff --git a/erpnext/accounts/doctype/tds_payment/tds_payment.js b/erpnext/accounts/doctype/tds_payment/tds_payment.js index e15fd138521..ad45b4293ff 100644 --- a/erpnext/accounts/doctype/tds_payment/tds_payment.js +++ b/erpnext/accounts/doctype/tds_payment/tds_payment.js @@ -44,7 +44,7 @@ cur_frm.cscript.from_date = function(doc,cdt,cdn){ // Make Journal Voucher // -------------------- -cur_frm.cscript['Make Bank Voucher'] = function(doc, dt, dn) { +cur_frm.cscript.make_bank_voucher = function(doc, dt, dn) { var call_back = function(r,rt) { cur_frm.cscript.make_jv(doc,dt,dn,r.message); } diff --git a/erpnext/accounts/search_criteria/accounts_payable/accounts_payable.txt b/erpnext/accounts/search_criteria/accounts_payable/accounts_payable.txt index 568cbbc3225..8cc99b32875 100644 --- a/erpnext/accounts/search_criteria/accounts_payable/accounts_payable.txt +++ b/erpnext/accounts/search_criteria/accounts_payable/accounts_payable.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 13:33:31', + 'creation': '2012-04-03 12:49:50', 'docstatus': 0, - 'modified': '2012-03-30 13:33:31', + 'modified': '2012-04-03 12:49:50', 'modified_by': u'Administrator', 'owner': u'Administrator' }, diff --git a/erpnext/accounts/search_criteria/accounts_receivable/accounts_receivable.txt b/erpnext/accounts/search_criteria/accounts_receivable/accounts_receivable.txt index 1ecfb074729..33a5318cf7d 100644 --- a/erpnext/accounts/search_criteria/accounts_receivable/accounts_receivable.txt +++ b/erpnext/accounts/search_criteria/accounts_receivable/accounts_receivable.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 13:33:31', + 'creation': '2012-04-03 12:49:50', 'docstatus': 0, - 'modified': '2012-03-30 13:33:31', + 'modified': '2012-04-03 12:49:50', 'modified_by': u'Administrator', 'owner': u'Administrator' }, diff --git a/erpnext/accounts/search_criteria/bank_clearance_report/bank_clearance_report.txt b/erpnext/accounts/search_criteria/bank_clearance_report/bank_clearance_report.txt index 27064a7bdb2..c329d7ed32b 100644 --- a/erpnext/accounts/search_criteria/bank_clearance_report/bank_clearance_report.txt +++ b/erpnext/accounts/search_criteria/bank_clearance_report/bank_clearance_report.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 13:33:31', + 'creation': '2012-04-03 12:49:50', 'docstatus': 0, - 'modified': '2012-03-30 13:33:31', + 'modified': '2012-04-03 12:49:50', 'modified_by': u'Administrator', 'owner': u'Administrator' }, diff --git a/erpnext/accounts/search_criteria/bank_reconciliation_statement/bank_reconciliation_statement.txt b/erpnext/accounts/search_criteria/bank_reconciliation_statement/bank_reconciliation_statement.txt index 51623a5c72c..1518e855606 100644 --- a/erpnext/accounts/search_criteria/bank_reconciliation_statement/bank_reconciliation_statement.txt +++ b/erpnext/accounts/search_criteria/bank_reconciliation_statement/bank_reconciliation_statement.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 13:33:31', + 'creation': '2012-04-03 12:49:50', 'docstatus': 0, - 'modified': '2012-03-30 13:33:31', + 'modified': '2012-04-03 12:49:50', 'modified_by': u'Administrator', 'owner': u'Administrator' }, diff --git a/erpnext/accounts/search_criteria/budget_variance_report/budget_variance_report.txt b/erpnext/accounts/search_criteria/budget_variance_report/budget_variance_report.txt index 7b9b924340f..f8df9dbe0b1 100644 --- a/erpnext/accounts/search_criteria/budget_variance_report/budget_variance_report.txt +++ b/erpnext/accounts/search_criteria/budget_variance_report/budget_variance_report.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 13:33:31', + 'creation': '2012-04-03 12:49:50', 'docstatus': 0, - 'modified': '2012-03-30 13:33:31', + 'modified': '2012-04-03 12:49:50', 'modified_by': u'Administrator', 'owner': u'harshada@webnotestech.com' }, diff --git a/erpnext/accounts/search_criteria/business_associate_commission_report/business_associate_commission_report.txt b/erpnext/accounts/search_criteria/business_associate_commission_report/business_associate_commission_report.txt index 59a1f5e0c61..aba68a82c14 100644 --- a/erpnext/accounts/search_criteria/business_associate_commission_report/business_associate_commission_report.txt +++ b/erpnext/accounts/search_criteria/business_associate_commission_report/business_associate_commission_report.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 14:50:43', + 'creation': '2012-04-03 12:49:50', 'docstatus': 0, - 'modified': '2012-03-30 14:50:43', + 'modified': '2012-04-03 12:49:50', 'modified_by': u'Administrator', 'owner': u'saumil@webnotestech.com' }, diff --git a/erpnext/accounts/search_criteria/cash_flow_statement/cash_flow_statement.txt b/erpnext/accounts/search_criteria/cash_flow_statement/cash_flow_statement.txt index 600ebb7d69e..1d33298b034 100644 --- a/erpnext/accounts/search_criteria/cash_flow_statement/cash_flow_statement.txt +++ b/erpnext/accounts/search_criteria/cash_flow_statement/cash_flow_statement.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 14:50:43', + 'creation': '2012-04-03 12:49:50', 'docstatus': 0, - 'modified': '2012-03-30 14:50:43', + 'modified': '2012-04-03 12:49:50', 'modified_by': u'Administrator', 'owner': u'Administrator' }, diff --git a/erpnext/accounts/search_criteria/cenvat_credit___input_or_capital_goods/__init__.py b/erpnext/accounts/search_criteria/cenvat_credit___input_or_capital_goods/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/erpnext/accounts/search_criteria/cenvat_credit___input_or_capital_goods/cenvat_credit___input_or_capital_goods.js b/erpnext/accounts/search_criteria/cenvat_credit___input_or_capital_goods/cenvat_credit___input_or_capital_goods.js deleted file mode 100644 index e098cc355e3..00000000000 --- a/erpnext/accounts/search_criteria/cenvat_credit___input_or_capital_goods/cenvat_credit___input_or_capital_goods.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 . - -report.customize_filters = function() { - this.hide_all_filters(); - this.add_filter({fieldname:'report', label:'Report Type', fieldtype:'Select', options:NEWLINE + 'CENVAT CREDIT ACCOUNT - INPUTS (R.G.23 A - PART II)' + NEWLINE + 'CAPITAL GOODS - INPUTS (R.G. 23 C - PART II)', ignore : 1, parent:'Journal Voucher Detail'}) - this.add_filter({fieldname:'main_acc_head', label:'Main Account Head', fieldtype:'Link', options:'Account', ignore : 1, parent:'Journal Voucher Detail'}); - this.add_filter({fieldname:'add_acc_head', label:'Additional Account Head', fieldtype:'Link', options:'Account', ignore : 1, parent:'Journal Voucher Detail'}); - this.add_filter({fieldname:'cvd_acc_head', label:'CVD Account Head', fieldtype:'Link', options:'Account', ignore : 1, parent:'Journal Voucher Detail'}); - this.add_filter({fieldname:'edu_cess_acc_head', label:'Edu Cess Account Head', fieldtype:'Link', options:'Account', ignore : 1, parent:'Journal Voucher Detail'}); - this.add_filter({fieldname:'sh_edu_cess_acc_head', label:'S.H.Edu Cess Account Head', fieldtype:'Link', options:'Account', ignore : 1, parent:'Journal Voucher Detail'}); - - - this.filter_fields_dict['Journal Voucher'+FILTER_SEP +'Company'].df.filter_hide = 0; - this.filter_fields_dict['Journal Voucher'+FILTER_SEP +'From Posting Date'].df.filter_hide = 0; - this.filter_fields_dict['Journal Voucher'+FILTER_SEP +'To Posting Date'].df.filter_hide = 0; - - this.filter_fields_dict['Journal Voucher'+FILTER_SEP +'From Posting Date'].df['report_default'] = sys_defaults.year_start_date; - this.filter_fields_dict['Journal Voucher'+FILTER_SEP +'To Posting Date'].df['report_default'] = dateutil.obj_to_str(new Date()); - this.filter_fields_dict['Journal Voucher'+FILTER_SEP +'Company'].df['report_default']=sys_defaults.company; - - //this.large_report = 1; -} \ No newline at end of file diff --git a/erpnext/accounts/search_criteria/cenvat_credit___input_or_capital_goods/cenvat_credit___input_or_capital_goods.py b/erpnext/accounts/search_criteria/cenvat_credit___input_or_capital_goods/cenvat_credit___input_or_capital_goods.py deleted file mode 100644 index cfdd45fc4e1..00000000000 --- a/erpnext/accounts/search_criteria/cenvat_credit___input_or_capital_goods/cenvat_credit___input_or_capital_goods.py +++ /dev/null @@ -1,154 +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 . - -# Add columns -# ----------- -row_list = [['Date', 'Date', '150px', ''] - ,['ARI/INVOICE/Other Approved document/Bill of entry No.', 'Date', '150px', ''] - ,['Date', 'Date', '150px', ''] - ,['Baisc Excise Duty', 'Currency', '150px', ''] - ,['Additional Duty', 'Currency', '150px', ''] - ,['Education Cess', 'Currency', '150px', ''] - ,['S.H.Education Cess', 'Currency', '150px', ''] - ,[' Basic Excise Duty', 'Currency', '150px', ''] - ,[' Education Cess', 'Currency', '150px', ''] - ,[' S.H.Education Cess', 'Currency', '150px', ''] - ,['Basic Excise Duty ', 'Currency', '150px', ''] - ,['Education Cess ', 'Currency', '150px', ''] - ,['S.H.Education Cess ', 'Currency', '150px', ''] - ,['Remarks', 'Data', '150px', ''] -] - -if not filter_values['report']: - msgprint("Please Select Report Type. ") - raise Exception - -if 'CAPITAL' not in filter_values['report']: - row_list.insert(3,['Range/ Divsion/ Custom House from where received', 'Data', '150px', '']) - row_list.insert(4,['Folio No. & Entry No. in Part I', 'Data', '150px', '']) - row_list.insert(7,['CVD', 'Currency', '150px', '']) - row_list.insert(10,['ARI/INVOICE/ Other Approved document/Bill of entry No.', 'Data', '100px', '']) - row_list.insert(11,['Date', 'Date', '150px', '']) -elif 'CAPITAL' in filter_values['report']: - row_list.insert(7,[' Basic Excise Duty ', 'Currency', '150px', '']) - row_list.insert(8,[' Education Cess ', 'Currency', '150px', '']) - row_list.insert(9,[' S.H.Education Cess ', 'Currency', '150px', '']) - row_list.insert(10,['ARI/INVOICE/ Other Approved document/Bill of entry No.', 'Data', '100px', '']) - row_list.insert(11,['Date', 'Date', '150px', '']) - -for r in row_list: - colnames.append(r[0]) - coltypes.append(r[1]) - colwidths.append(r[2]) - coloptions.append(r[3]) - col_idx[r[0]] = len(colnames)-1 - - -# get as_on_date for opening -as_on_date = '' -if filter_values.get('posting_date'): - as_on_date = add_days(filter_values['posting_date'], -1) - -ysd, from_date_year = sql("select year_start_date, name from `tabFiscal Year` where %s between year_start_date and date_add(year_start_date,interval 1 year)",as_on_date)[0] - - -# Get Opening Balance -def get_opening_balance(acc, fy, as_on_date, ysd, get_opening_balance, get_obj): - glc = get_obj('GL Control') - acc_det = sql("select debit_or_credit, is_pl_account, lft, rgt, group_or_ledger from tabAccount where name = '%s'" % acc) - return glc.get_as_on_balance(acc, fy, as_on_date, acc_det[0][0], acc_det[0][2], acc_det[0][3])[2] - -cum_sum_main_acc_head = cum_sum_add_acc_head = cum_sum_cvd_acc_head = cum_sum_edu_cess_acc_head = cum_sum_sh_edu_cess_acc_head = 0 -openg_main_acc_head = openg_add_acc_head = openg_cvd_acc_head = openg_edu_cess_acc_head = openg_sh_edu_cess_acc_head = 0 - -# Get Opening of Basic Excise Duty -if not filter_values['main_acc_head']: - msgprint("Please Enter Main Account Head") - raise Exception -cum_sum_main_acc_head = openg_main_acc_head = get_opening_balance(filter_values['main_acc_head'], from_date_year, as_on_date, ysd, get_opening_balance, get_obj) - -# Get Opening of add_acc_head -if filter_values['add_acc_head'] : cum_sum_add_acc_head = openg_add_acc_head = get_opening_balance(filter_values['add_acc_head'], from_date_year, as_on_date, ysd, get_opening_balance, get_obj) - -# Get Opening of cvd_acc_head -if filter_values['cvd_acc_head'] : cum_sum_cvd_acc_head = openg_cvd_acc_head = get_opening_balance(get_opening_balance, filter_values['cvd_acc_head'], from_date_year, as_on_date, ysd, get_opening_balance, get_obj) - -# Get Opening of edu_cess_acc_head -if not filter_values['edu_cess_acc_head'] : - msgprint("Please Enter Edu Cess Account Head") - raise Exception -cum_sum_edu_cess_acc_head = openg_edu_cess_acc_head = get_opening_balance(filter_values['edu_cess_acc_head'], from_date_year, as_on_date, ysd, get_opening_balance, get_obj) - -# Get Opening of sh_edu_cess_acc_head -if not filter_values['sh_edu_cess_acc_head'] : - msgprint("Please Enter S.H.Edu Cess Account Head") - raise Exception -cum_sum_sh_edu_cess_acc_head = openg_sh_edu_cess_acc_head = get_opening_balance(filter_values['sh_edu_cess_acc_head'], from_date_year, as_on_date, ysd, get_opening_balance, get_obj) - - -for r in res: - remarks = r[col_idx['ARI/INVOICE/ Other Approved document/Bill of entry No.']] - r[col_idx['ARI/INVOICE/ Other Approved document/Bill of entry No.']] = '' - r.append('') - if 'CAPITAL' not in filter_values['report']: - r.append(0.00) - r.append(0.00) - r.append(0.00) - cum_sum_main_acc_head = flt(cum_sum_main_acc_head) + flt(r[col_idx['Baisc Excise Duty']]) - cum_sum_add_acc_head = flt(cum_sum_add_acc_head) + flt(r[col_idx['Additional Duty']]) - cum_sum_cvd_acc_head = flt(cum_sum_cvd_acc_head) + flt(r[col_idx['CVD']]) - - r.append( cum_sum_main_acc_head + cum_sum_add_acc_head + cum_sum_cvd_acc_head) - cum_sum_edu_cess_acc_head = flt(cum_sum_edu_cess_acc_head) + flt(r[col_idx['Education Cess']]) - r.append(cum_sum_edu_cess_acc_head) - cum_sum_sh_edu_cess_acc_head = flt(cum_sum_sh_edu_cess_acc_head) + flt(r[col_idx['S.H.Education Cess']]) - r.append(cum_sum_sh_edu_cess_acc_head) - elif 'CAPITAL' in filter_values['report']: - # As there is no range and Folio No - r[col_idx['Baisc Excise Duty']] = r[col_idx['Education Cess']] - r[col_idx['Additional Duty']] = r[col_idx['S.H.Education Cess']] - r[col_idx['Education Cess']] = r[col_idx[' Education Cess ']] - r[col_idx['S.H.Education Cess']] = r[col_idx[' S.H.Education Cess ']] - - cum_sum_main_acc_head = flt(cum_sum_main_acc_head) + flt(r[col_idx['Baisc Excise Duty']]) - cum_sum_add_acc_head = flt(cum_sum_add_acc_head) + flt(r[col_idx['Additional Duty']]) - - r[col_idx[' Basic Excise Duty ']]= flt(cum_sum_main_acc_head) + flt(cum_sum_add_acc_head) - cum_sum_edu_cess_acc_head = flt(cum_sum_edu_cess_acc_head) + flt(r[col_idx['Education Cess']]) - r[col_idx[' Education Cess ']]= flt(cum_sum_edu_cess_acc_head) - cum_sum_sh_edu_cess_acc_head = flt(cum_sum_sh_edu_cess_acc_head) + flt(r[col_idx['S.H.Education Cess']]) - r[col_idx[' S.H.Education Cess ']]= flt(cum_sum_sh_edu_cess_acc_head) - - r.append(0.00) - r.append(0.00) - r.append(0.00) - - r.append( cum_sum_main_acc_head + cum_sum_add_acc_head) - r.append(cum_sum_edu_cess_acc_head) - r.append(cum_sum_sh_edu_cess_acc_head) - r.append(remarks) - - -out = [] - -if 'CAPITAL' not in cstr(filter_values['report']): - out.append(['Opening Balance of Duty in Credit', '', '', '', '', '', '', '', '', '', '', '','','','', flt(openg_main_acc_head) + flt(openg_add_acc_head) + flt(openg_cvd_acc_head), flt(openg_edu_cess_acc_head), flt(openg_sh_edu_cess_acc_head),'']) -elif 'CAPITAL' in filter_values['report']: - out.append(['Opening Balance of Duty in Credit', '', '', '', '', '', '', '', '', '', '', '', '', '', '', flt(openg_main_acc_head) + flt(openg_add_acc_head) , flt(openg_edu_cess_acc_head), flt(openg_sh_edu_cess_acc_head)]) -out += res -#if from_export == 0: -# msgprint("This is a very large report and cannot be shown in the browser as it is likely to make your browser very slow.Please click on 'Export' to open in a spreadsheet") -# raise Exception \ No newline at end of file diff --git a/erpnext/accounts/search_criteria/cenvat_credit___input_or_capital_goods/cenvat_credit___input_or_capital_goods.sql b/erpnext/accounts/search_criteria/cenvat_credit___input_or_capital_goods/cenvat_credit___input_or_capital_goods.sql deleted file mode 100644 index 6064fe4a6fe..00000000000 --- a/erpnext/accounts/search_criteria/cenvat_credit___input_or_capital_goods/cenvat_credit___input_or_capital_goods.sql +++ /dev/null @@ -1,31 +0,0 @@ -SELECT t1.posting_date, t1.bill_no, t1.bill_date, t1.range, t1.name, SUM(CASE WHEN t2.account_head like '%(main_acc_head)s%' THEN t2.tax_amount ELSE 0.00 END), SUM(CASE WHEN t2.account_head like '%(add_acc_head)s%' THEN t2.tax_amount ELSE 0.00 END), SUM(CASE WHEN t2.account_head like '%(cvd_acc_head)s%' THEN t2.tax_amount ELSE 0.00 END), SUM(CASE WHEN t2.account_head like '%(edu_cess_acc_head)s' THEN t2.tax_amount ELSE 0.00 END), SUM(CASE WHEN t2.account_head like '%(sh_edu_cess_acc_head)s' THEN t2.tax_amount ELSE 0.00 END), t1.`remarks` - FROM `tabPurchase Receipt` t1, `tabPurchase Tax Detail` t2 - WHERE t2.parent = t1.name - AND t2.parent = 'Purchase Reciept' - AND (t2.account_head LIKE '%(main_acc_head)s' and '%(main_acc_head)s%%' or '~~~~' - OR t2.account_head LIKE '%(add_acc_head)s' and '%(add_acc_head)s%%' or '~~~~' - OR t2.account_head LIKE '%(cvd_acc_head)s' and '%(cvd_acc_head)s%%' or '~~~~' - OR t2.account_head LIKE '%(edu_cess_acc_head)s' and '%(edu_cess_acc_head)s%%' or '~~~~' - OR t2.account_head LIKE '%(sh_edu_cess_acc_head)s%' and '%(sh_edu_cess_acc_head)s%%' or '~~~~') - AND t1.`posting_date` >= '%(posting_date)s' - AND t1.`posting_date` <= '%(posting_date1)s' - AND t1.docstatus =1 - GROUP BY t1.`name` - -UNION - -SELECT t1.posting_date, t1.bill_no, t1.bill_date, '' AS 'Range', t1.name, SUM(CASE WHEN t2.account like '%(main_acc_head)s%' THEN t2.debit ELSE 0.00 END), SUM(CASE WHEN t2.account like '%(add_acc_head)s%' THEN t2.debit ELSE 0.00 END), SUM(CASE WHEN t2.account like '%(cvd_acc_head)s%' THEN t2.debit ELSE 0.00 END), SUM(CASE WHEN t2.account like '%(edu_cess_acc_head)s' THEN t2.debit ELSE 0.00 END), SUM(CASE WHEN t2.account like '%(sh_edu_cess_acc_head)s' THEN t2.debit ELSE 0.00 END), t1.`remark` - FROM `tabJournal Voucher` t1, `tabJournal Voucher Detail` t2 - WHERE (t2.debit is not NULL OR t2.debit != '') - AND t2.debit > 0 - AND t2.parent = t1.name - AND (t2.account LIKE '%(main_acc_head)s' and '%(main_acc_head)s%%' or '~~~~' - OR t2.account LIKE '%(add_acc_head)s' and '%(add_acc_head)s%%' or '~~~~' - OR t2.account LIKE '%(cvd_acc_head)s' and '%(cvd_acc_head)s%%' or '~~~~' - OR t2.account LIKE '%(edu_cess_acc_head)s' and '%(edu_cess_acc_head)s%%' or '~~~~' - OR t2.account LIKE '%(sh_edu_cess_acc_head)s%' and '%(sh_edu_cess_acc_head)s%%' or '~~~~') AND t1.`posting_date` >= '%(posting_date)s' - AND t1.`posting_date` <= '%(posting_date1)s' - AND t1.docstatus =1 - GROUP BY t1.`name` - -ORDER BY `posting_date`,`name` \ No newline at end of file diff --git a/erpnext/accounts/search_criteria/cenvat_credit___input_or_capital_goods/cenvat_credit___input_or_capital_goods.txt b/erpnext/accounts/search_criteria/cenvat_credit___input_or_capital_goods/cenvat_credit___input_or_capital_goods.txt deleted file mode 100644 index 806738c0ce8..00000000000 --- a/erpnext/accounts/search_criteria/cenvat_credit___input_or_capital_goods/cenvat_credit___input_or_capital_goods.txt +++ /dev/null @@ -1,34 +0,0 @@ -# Search Criteria, cenvat_credit_-_input_or_capital_goods -[ - - # These values are common in all dictionaries - { - 'creation': '2010-11-01 10:56:14', - 'docstatus': 0, - 'modified': '2010-10-29 16:42:14', - 'modified_by': 'Administrator', - 'owner': 'jai@webnotestech.com' - }, - - # These values are common for all Search Criteria - { - 'criteria_name': 'Cenvat Credit - Input or Capital Goods', - 'dis_filters': 'fiscal_year', - 'doc_type': 'Journal Voucher Detail', - 'doctype': 'Search Criteria', - 'filters': "{'Journal Voucher\x01Submitted':1,'Journal Voucher\x01Voucher Type':'','Journal Voucher\x01Is Opening':'','Journal Voucher\x01Fiscal Year':'','Journal Voucher\x01Company':'','Journal Voucher\x01TDS Applicable':'','Journal Voucher\x01TDS Category':'','Sales Invoice\x01Aging Based On':'','Purchase Invoice\x01Aging Based On':'Transaction Date','Journal Voucher Detail\x01Report Type':'CENVAT CREDIT ACCOUNT - INPUTS (R.G.23 A - PART II)'}", - 'module': 'Accounts', - 'name': '__common__', - 'page_len': 50, - 'parent_doc_type': 'Journal Voucher', - 'sort_by': 'ID', - 'sort_order': 'DESC', - 'standard': 'Yes' - }, - - # Search Criteria, cenvat_credit_-_input_or_capital_goods - { - 'doctype': 'Search Criteria', - 'name': 'cenvat_credit_-_input_or_capital_goods' - } -] \ No newline at end of file diff --git a/erpnext/accounts/search_criteria/collection_report/collection_report.txt b/erpnext/accounts/search_criteria/collection_report/collection_report.txt index 19d64917568..dd78dfcf9e3 100644 --- a/erpnext/accounts/search_criteria/collection_report/collection_report.txt +++ b/erpnext/accounts/search_criteria/collection_report/collection_report.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 13:33:31', + 'creation': '2012-04-03 12:49:50', 'docstatus': 0, - 'modified': '2012-03-30 13:33:31', + 'modified': '2012-04-03 12:49:50', 'modified_by': u'Administrator', 'owner': u'Administrator' }, diff --git a/erpnext/accounts/search_criteria/cost_center_wise_expense/cost_center_wise_expense.txt b/erpnext/accounts/search_criteria/cost_center_wise_expense/cost_center_wise_expense.txt index a9dd1564767..2aed5078f3e 100644 --- a/erpnext/accounts/search_criteria/cost_center_wise_expense/cost_center_wise_expense.txt +++ b/erpnext/accounts/search_criteria/cost_center_wise_expense/cost_center_wise_expense.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 13:33:31', + 'creation': '2012-04-03 12:49:50', 'docstatus': 0, - 'modified': '2012-03-30 13:33:31', + 'modified': '2012-04-03 12:49:50', 'modified_by': u'Administrator', 'owner': u'swarnalata@webnotestech.com' }, diff --git a/erpnext/accounts/search_criteria/creditors_ledger/creditors_ledger.txt b/erpnext/accounts/search_criteria/creditors_ledger/creditors_ledger.txt index 2b6398c0440..9a7565c2d73 100644 --- a/erpnext/accounts/search_criteria/creditors_ledger/creditors_ledger.txt +++ b/erpnext/accounts/search_criteria/creditors_ledger/creditors_ledger.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 13:33:31', + 'creation': '2012-04-03 12:49:51', 'docstatus': 0, - 'modified': '2012-03-30 13:33:31', + 'modified': '2012-04-03 12:49:51', 'modified_by': u'Administrator', 'owner': u'nabin@webnotestech.com' }, diff --git a/erpnext/accounts/search_criteria/debtors_ledger/debtors_ledger.txt b/erpnext/accounts/search_criteria/debtors_ledger/debtors_ledger.txt index 04e9132d116..09910970d68 100644 --- a/erpnext/accounts/search_criteria/debtors_ledger/debtors_ledger.txt +++ b/erpnext/accounts/search_criteria/debtors_ledger/debtors_ledger.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 13:33:31', + 'creation': '2012-04-03 12:49:51', 'docstatus': 0, - 'modified': '2012-03-30 13:33:31', + 'modified': '2012-04-03 12:49:51', 'modified_by': u'Administrator', 'owner': u'nabin@webnotestech.com' }, diff --git a/erpnext/accounts/search_criteria/general_ledger/general_ledger.txt b/erpnext/accounts/search_criteria/general_ledger/general_ledger.txt index 26468b0b318..5cf15ea5c4a 100644 --- a/erpnext/accounts/search_criteria/general_ledger/general_ledger.txt +++ b/erpnext/accounts/search_criteria/general_ledger/general_ledger.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 14:50:43', + 'creation': '2012-04-03 12:49:51', 'docstatus': 0, - 'modified': '2012-03-30 14:50:43', + 'modified': '2012-04-03 12:49:51', 'modified_by': u'Administrator', 'owner': u'Administrator' }, diff --git a/erpnext/accounts/search_criteria/itemwise_purchase_register/itemwise_purchase_register.txt b/erpnext/accounts/search_criteria/itemwise_purchase_register/itemwise_purchase_register.txt index bb4289dcbfa..206985e7ff2 100644 --- a/erpnext/accounts/search_criteria/itemwise_purchase_register/itemwise_purchase_register.txt +++ b/erpnext/accounts/search_criteria/itemwise_purchase_register/itemwise_purchase_register.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 13:33:32', + 'creation': '2012-04-03 12:49:51', 'docstatus': 0, - 'modified': '2012-03-30 13:33:32', + 'modified': '2012-04-03 12:49:51', 'modified_by': u'Administrator', 'owner': u'Administrator' }, diff --git a/erpnext/accounts/search_criteria/itemwise_sales_register/itemwise_sales_register.txt b/erpnext/accounts/search_criteria/itemwise_sales_register/itemwise_sales_register.txt index 461426320d8..5393e005703 100644 --- a/erpnext/accounts/search_criteria/itemwise_sales_register/itemwise_sales_register.txt +++ b/erpnext/accounts/search_criteria/itemwise_sales_register/itemwise_sales_register.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 14:50:43', + 'creation': '2012-04-03 12:49:51', 'docstatus': 0, - 'modified': '2012-03-30 14:50:43', + 'modified': '2012-04-03 12:49:51', 'modified_by': u'Administrator', 'owner': u'Administrator' }, diff --git a/erpnext/accounts/search_criteria/lease_agreement_list/__init__.py b/erpnext/accounts/search_criteria/lease_agreement_list/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/erpnext/accounts/search_criteria/lease_agreement_list/lease_agreement_list.js b/erpnext/accounts/search_criteria/lease_agreement_list/lease_agreement_list.js deleted file mode 100644 index d25139c49bd..00000000000 --- a/erpnext/accounts/search_criteria/lease_agreement_list/lease_agreement_list.js +++ /dev/null @@ -1,27 +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 . - -report.customize_filters = function() { - this.hide_all_filters(); - - this.add_filter({fieldname:'date', label:'Date', fieldtype:'Date', options:'',ignore : 1, parent:'GL Entry', 'in_first_page':1}); - - this.filter_fields_dict['GL Entry'+FILTER_SEP +'From Date'].df['report_default']=sys_defaults.year_start_date; - this.filter_fields_dict['GL Entry'+FILTER_SEP +'To Date'].df['report_default']=dateutil.obj_to_str(new Date()); -} - -$dh(this.mytabs.tabs['More Filters']); -$dh(this.mytabs.tabs['Select Columns']); diff --git a/erpnext/accounts/search_criteria/lease_agreement_list/lease_agreement_list.py b/erpnext/accounts/search_criteria/lease_agreement_list/lease_agreement_list.py deleted file mode 100644 index 68f0167b4e1..00000000000 --- a/erpnext/accounts/search_criteria/lease_agreement_list/lease_agreement_list.py +++ /dev/null @@ -1,29 +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 . - -data =[ - ['Agreement No.','Data','100px',''], - ['Lessee Name','Data','300px',''], - ['Amount','Currency','120px',''] - ] - -for d in data: - colnames.append(d[0]) - coltypes.append(d[1]) - colwidths.append(d[2]) - coloptions.append(d[3]) - col_idx[d[0]] = len(colnames)-1 - diff --git a/erpnext/accounts/search_criteria/lease_agreement_list/lease_agreement_list.sql b/erpnext/accounts/search_criteria/lease_agreement_list/lease_agreement_list.sql deleted file mode 100644 index 6097b2fae3c..00000000000 --- a/erpnext/accounts/search_criteria/lease_agreement_list/lease_agreement_list.sql +++ /dev/null @@ -1,3 +0,0 @@ -select la.name, la.account, la.invoice_amount -from `tabLease Agreement` la -where start_date between '%(date)s' and '%(date1)s' order by la.name diff --git a/erpnext/accounts/search_criteria/lease_agreement_list/lease_agreement_list.txt b/erpnext/accounts/search_criteria/lease_agreement_list/lease_agreement_list.txt deleted file mode 100644 index 5e84916ffd5..00000000000 --- a/erpnext/accounts/search_criteria/lease_agreement_list/lease_agreement_list.txt +++ /dev/null @@ -1,30 +0,0 @@ -# Search Criteria, lease_agreement_list -[ - - # These values are common in all dictionaries - { - 'creation': '2011-07-27 16:17:04', - 'docstatus': 0, - 'modified': '2011-07-27 16:17:04', - 'modified_by': 'Administrator', - 'owner': 'Administrator' - }, - - # These values are common for all Search Criteria - { - 'columns': 'GL Entry\x01ID,GL Entry\x01Owner,GL Entry\x01Posting Date,GL Entry\x01Aging Date,GL Entry\x01Account,GL Entry\x01Cost Center,GL Entry\x01Against,GL Entry\x01Against Voucher,GL Entry\x01Voucher Type,GL Entry\x01Voucher No,GL Entry\x01Remarks,GL Entry\x01Is Cancelled,GL Entry\x01Is Opening,GL Entry\x01Fiscal Year,GL Entry\x01Company', - 'criteria_name': 'Lease Agreement List', - 'doc_type': 'GL Entry', - 'doctype': 'Search Criteria', - 'filters': "{'GL Entry\x01Voucher Type':'','GL Entry\x01Is Cancelled':'','GL Entry\x01Is Opening':'','GL Entry\x01Fiscal Year':''}", - 'module': 'Accounts', - 'name': '__common__', - 'standard': 'Yes' - }, - - # Search Criteria, lease_agreement_list - { - 'doctype': 'Search Criteria', - 'name': 'lease_agreement_list' - } -] diff --git a/erpnext/accounts/search_criteria/lease_monthly_future_installment_inflows/__init__.py b/erpnext/accounts/search_criteria/lease_monthly_future_installment_inflows/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/erpnext/accounts/search_criteria/lease_monthly_future_installment_inflows/lease_monthly_future_installment_inflows.js b/erpnext/accounts/search_criteria/lease_monthly_future_installment_inflows/lease_monthly_future_installment_inflows.js deleted file mode 100644 index 7d8152b218c..00000000000 --- a/erpnext/accounts/search_criteria/lease_monthly_future_installment_inflows/lease_monthly_future_installment_inflows.js +++ /dev/null @@ -1,30 +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 . - -report.customize_filters = function() { - this.hide_all_filters(); - - this.add_filter({fieldname:'date', label:'Date', fieldtype:'Date', options:'',ignore : 1, parent:'GL Entry', 'in_first_page':1}); - - this.filter_fields_dict['GL Entry'+FILTER_SEP +'From Date'].df['report_default']=dateutil.obj_to_str(new Date()); -// this.filter_fields_dict['GL Entry'+FILTER_SEP +'To Date'].df['report_default']=dateutil.obj_to_str(new Date()); - - this.filter_fields_dict['GL Entry'+FILTER_SEP +'To Date'].df.filter_hide=1; - -} - -$dh(this.mytabs.tabs['More Filters']); -$dh(this.mytabs.tabs['Select Columns']); diff --git a/erpnext/accounts/search_criteria/lease_monthly_future_installment_inflows/lease_monthly_future_installment_inflows.py b/erpnext/accounts/search_criteria/lease_monthly_future_installment_inflows/lease_monthly_future_installment_inflows.py deleted file mode 100644 index 692f6f8a71c..00000000000 --- a/erpnext/accounts/search_criteria/lease_monthly_future_installment_inflows/lease_monthly_future_installment_inflows.py +++ /dev/null @@ -1,29 +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 . - -data =[ - ['Month','Data','100px',''], - ['Year','Data','100px',''], - ['Amount','Currency','120px',''] - ] - -for d in data: - colnames.append(d[0]) - coltypes.append(d[1]) - colwidths.append(d[2]) - coloptions.append(d[3]) - col_idx[d[0]] = len(colnames)-1 - diff --git a/erpnext/accounts/search_criteria/lease_monthly_future_installment_inflows/lease_monthly_future_installment_inflows.sql b/erpnext/accounts/search_criteria/lease_monthly_future_installment_inflows/lease_monthly_future_installment_inflows.sql deleted file mode 100644 index 564a3fd82ba..00000000000 --- a/erpnext/accounts/search_criteria/lease_monthly_future_installment_inflows/lease_monthly_future_installment_inflows.sql +++ /dev/null @@ -1,9 +0,0 @@ -select date_format(due_date,'%M') as mnt,year(due_date),sum(amount) - -from `tabLease Agreement` la,`tabLease Installment` lai - -where la.name=lai.parent and (lai.cheque_date is null or lai.cheque_date > '%(date)s') - -group by date_format(due_date,'%M-%Y') - -order by year(due_date),month(due_date) \ No newline at end of file diff --git a/erpnext/accounts/search_criteria/lease_monthly_future_installment_inflows/lease_monthly_future_installment_inflows.txt b/erpnext/accounts/search_criteria/lease_monthly_future_installment_inflows/lease_monthly_future_installment_inflows.txt deleted file mode 100644 index 05a0f70b90d..00000000000 --- a/erpnext/accounts/search_criteria/lease_monthly_future_installment_inflows/lease_monthly_future_installment_inflows.txt +++ /dev/null @@ -1,30 +0,0 @@ -# Search Criteria, lease_monthly_future_installment_inflows -[ - - # These values are common in all dictionaries - { - 'creation': '2011-08-29 13:45:35', - 'docstatus': 0, - 'modified': '2011-08-29 13:45:35', - 'modified_by': 'Administrator', - 'owner': 'Administrator' - }, - - # These values are common for all Search Criteria - { - 'columns': 'GL Entry\x01ID,GL Entry\x01Owner,GL Entry\x01Posting Date,GL Entry\x01Aging Date,GL Entry\x01Account,GL Entry\x01Cost Center,GL Entry\x01Against,GL Entry\x01Against Voucher,GL Entry\x01Voucher Type,GL Entry\x01Voucher No,GL Entry\x01Remarks,GL Entry\x01Is Cancelled,GL Entry\x01Is Opening,GL Entry\x01Fiscal Year,GL Entry\x01Company', - 'criteria_name': 'Lease Monthly Future Installment Inflows', - 'doc_type': 'GL Entry', - 'doctype': 'Search Criteria', - 'filters': "{'GL Entry\x01Voucher Type':'','GL Entry\x01Is Cancelled':'','GL Entry\x01Is Opening':'','GL Entry\x01Fiscal Year':''}", - 'module': 'Accounts', - 'name': '__common__', - 'standard': 'Yes' - }, - - # Search Criteria, lease_monthly_future_installment_inflows - { - 'doctype': 'Search Criteria', - 'name': 'lease_monthly_future_installment_inflows' - } -] \ No newline at end of file diff --git a/erpnext/accounts/search_criteria/lease_over_due_list/__init__.py b/erpnext/accounts/search_criteria/lease_over_due_list/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/erpnext/accounts/search_criteria/lease_over_due_list/lease_over_due_list.js b/erpnext/accounts/search_criteria/lease_over_due_list/lease_over_due_list.js deleted file mode 100644 index 7d8152b218c..00000000000 --- a/erpnext/accounts/search_criteria/lease_over_due_list/lease_over_due_list.js +++ /dev/null @@ -1,30 +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 . - -report.customize_filters = function() { - this.hide_all_filters(); - - this.add_filter({fieldname:'date', label:'Date', fieldtype:'Date', options:'',ignore : 1, parent:'GL Entry', 'in_first_page':1}); - - this.filter_fields_dict['GL Entry'+FILTER_SEP +'From Date'].df['report_default']=dateutil.obj_to_str(new Date()); -// this.filter_fields_dict['GL Entry'+FILTER_SEP +'To Date'].df['report_default']=dateutil.obj_to_str(new Date()); - - this.filter_fields_dict['GL Entry'+FILTER_SEP +'To Date'].df.filter_hide=1; - -} - -$dh(this.mytabs.tabs['More Filters']); -$dh(this.mytabs.tabs['Select Columns']); diff --git a/erpnext/accounts/search_criteria/lease_over_due_list/lease_over_due_list.py b/erpnext/accounts/search_criteria/lease_over_due_list/lease_over_due_list.py deleted file mode 100644 index debb3ca7208..00000000000 --- a/erpnext/accounts/search_criteria/lease_over_due_list/lease_over_due_list.py +++ /dev/null @@ -1,30 +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 . - -data =[ - ['Agreement No.','Data','100px',''], - ['Lessee Name','Data','300px',''], - ['Amount','Currency','120px',''], - ['Age','Data','100px',''] - ] - -for d in data: - colnames.append(d[0]) - coltypes.append(d[1]) - colwidths.append(d[2]) - coloptions.append(d[3]) - col_idx[d[0]] = len(colnames)-1 - diff --git a/erpnext/accounts/search_criteria/lease_over_due_list/lease_over_due_list.sql b/erpnext/accounts/search_criteria/lease_over_due_list/lease_over_due_list.sql deleted file mode 100644 index 1789f7e5434..00000000000 --- a/erpnext/accounts/search_criteria/lease_over_due_list/lease_over_due_list.sql +++ /dev/null @@ -1,7 +0,0 @@ -select la.name,la.account,lai.amount,cast('%(date)s' as date)-due_date as age - -from `tabLease Agreement` la,`tabLease Installment` lai - -where la.name=lai.parent and lai.due_date cast('%(date)s' as date)) - -order by cast('%(date)s' as date)-due_date desc \ No newline at end of file diff --git a/erpnext/accounts/search_criteria/lease_over_due_list/lease_over_due_list.txt b/erpnext/accounts/search_criteria/lease_over_due_list/lease_over_due_list.txt deleted file mode 100644 index d1454425642..00000000000 --- a/erpnext/accounts/search_criteria/lease_over_due_list/lease_over_due_list.txt +++ /dev/null @@ -1,30 +0,0 @@ -# Search Criteria, lease_over_due_list -[ - - # These values are common in all dictionaries - { - 'creation': '2011-08-29 13:45:35', - 'docstatus': 0, - 'modified': '2011-08-29 13:45:35', - 'modified_by': 'Administrator', - 'owner': 'Administrator' - }, - - # These values are common for all Search Criteria - { - 'columns': 'GL Entry\x01ID,GL Entry\x01Owner,GL Entry\x01Posting Date,GL Entry\x01Aging Date,GL Entry\x01Account,GL Entry\x01Cost Center,GL Entry\x01Against,GL Entry\x01Against Voucher,GL Entry\x01Voucher Type,GL Entry\x01Voucher No,GL Entry\x01Remarks,GL Entry\x01Is Cancelled,GL Entry\x01Is Opening,GL Entry\x01Fiscal Year,GL Entry\x01Company', - 'criteria_name': 'Lease Over Due List', - 'doc_type': 'GL Entry', - 'doctype': 'Search Criteria', - 'filters': "{'GL Entry\x01Voucher Type':'','GL Entry\x01Is Cancelled':'','GL Entry\x01Is Opening':'','GL Entry\x01Fiscal Year':''}", - 'module': 'Accounts', - 'name': '__common__', - 'standard': 'Yes' - }, - - # Search Criteria, lease_over_due_list - { - 'doctype': 'Search Criteria', - 'name': 'lease_over_due_list' - } -] \ No newline at end of file diff --git a/erpnext/accounts/search_criteria/lease_overdue_age_wise/__init__.py b/erpnext/accounts/search_criteria/lease_overdue_age_wise/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/erpnext/accounts/search_criteria/lease_overdue_age_wise/lease_overdue_age_wise.js b/erpnext/accounts/search_criteria/lease_overdue_age_wise/lease_overdue_age_wise.js deleted file mode 100644 index 7d8152b218c..00000000000 --- a/erpnext/accounts/search_criteria/lease_overdue_age_wise/lease_overdue_age_wise.js +++ /dev/null @@ -1,30 +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 . - -report.customize_filters = function() { - this.hide_all_filters(); - - this.add_filter({fieldname:'date', label:'Date', fieldtype:'Date', options:'',ignore : 1, parent:'GL Entry', 'in_first_page':1}); - - this.filter_fields_dict['GL Entry'+FILTER_SEP +'From Date'].df['report_default']=dateutil.obj_to_str(new Date()); -// this.filter_fields_dict['GL Entry'+FILTER_SEP +'To Date'].df['report_default']=dateutil.obj_to_str(new Date()); - - this.filter_fields_dict['GL Entry'+FILTER_SEP +'To Date'].df.filter_hide=1; - -} - -$dh(this.mytabs.tabs['More Filters']); -$dh(this.mytabs.tabs['Select Columns']); diff --git a/erpnext/accounts/search_criteria/lease_overdue_age_wise/lease_overdue_age_wise.py b/erpnext/accounts/search_criteria/lease_overdue_age_wise/lease_overdue_age_wise.py deleted file mode 100644 index 0723760caf3..00000000000 --- a/erpnext/accounts/search_criteria/lease_overdue_age_wise/lease_overdue_age_wise.py +++ /dev/null @@ -1,32 +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 . - -data =[ - ['Lessee Name','Data','300px',''], - ['Below 30 Days','Currency','120px',''], - ['Below 90 Days','Currency','120px',''], - ['Below 180 Days','Currency','120px',''], - ['Below 360 Days','Currency','120px',''], - ['Above 360 Days','Currency','120px',''], - ] - -for d in data: - colnames.append(d[0]) - coltypes.append(d[1]) - colwidths.append(d[2]) - coloptions.append(d[3]) - col_idx[d[0]] = len(colnames)-1 - diff --git a/erpnext/accounts/search_criteria/lease_overdue_age_wise/lease_overdue_age_wise.sql b/erpnext/accounts/search_criteria/lease_overdue_age_wise/lease_overdue_age_wise.sql deleted file mode 100644 index 2e6912e23ab..00000000000 --- a/erpnext/accounts/search_criteria/lease_overdue_age_wise/lease_overdue_age_wise.sql +++ /dev/null @@ -1,9 +0,0 @@ -select account,sum(od_30)as od_30,sum(od_90)as od_90,sum(od_180)as od_180,sum(od_360)as od_360,sum(od_1yr)as od_1yr from -( - select account,case when age<=30 then amount end as od_30,case when age between 31 and 90 then amount end as od_90,case when age between 91 and 180 then amount end as od_180,case when age between 181 and 360 then amount end as od_360,case when age>360 then amount end as od_1yr from - ( - select la.account,lai.amount,cast('%(date)s' as date)-due_date as age - from `tabLease Agreement` la,`tabLease Installment` lai - where la.name=lai.parent and lai.due_date<'%(date)s' and (lai.cheque_date is null or lai.cheque_date > '%(date)s') - )a -)b group by account order by account diff --git a/erpnext/accounts/search_criteria/lease_overdue_age_wise/lease_overdue_age_wise.txt b/erpnext/accounts/search_criteria/lease_overdue_age_wise/lease_overdue_age_wise.txt deleted file mode 100644 index 1c734a86fbf..00000000000 --- a/erpnext/accounts/search_criteria/lease_overdue_age_wise/lease_overdue_age_wise.txt +++ /dev/null @@ -1,30 +0,0 @@ -# Search Criteria, lease_overdue_age_wise -[ - - # These values are common in all dictionaries - { - 'creation': '2011-08-29 13:45:35', - 'docstatus': 0, - 'modified': '2011-08-29 13:45:35', - 'modified_by': 'Administrator', - 'owner': 'Administrator' - }, - - # These values are common for all Search Criteria - { - 'columns': 'GL Entry\x01ID,GL Entry\x01Owner,GL Entry\x01Posting Date,GL Entry\x01Aging Date,GL Entry\x01Account,GL Entry\x01Cost Center,GL Entry\x01Against,GL Entry\x01Against Voucher,GL Entry\x01Voucher Type,GL Entry\x01Voucher No,GL Entry\x01Remarks,GL Entry\x01Is Cancelled,GL Entry\x01Is Opening,GL Entry\x01Fiscal Year,GL Entry\x01Company', - 'criteria_name': 'Lease Overdue Age Wise', - 'doc_type': 'GL Entry', - 'doctype': 'Search Criteria', - 'filters': "{'GL Entry\x01Voucher Type':'','GL Entry\x01Is Cancelled':'','GL Entry\x01Is Opening':'','GL Entry\x01Fiscal Year':''}", - 'module': 'Accounts', - 'name': '__common__', - 'standard': 'Yes' - }, - - # Search Criteria, lease_overdue_age_wise - { - 'doctype': 'Search Criteria', - 'name': 'lease_overdue_age_wise' - } -] \ No newline at end of file diff --git a/erpnext/accounts/search_criteria/lease_receipt_summary_month_wise/__init__.py b/erpnext/accounts/search_criteria/lease_receipt_summary_month_wise/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/erpnext/accounts/search_criteria/lease_receipt_summary_month_wise/lease_receipt_summary_month_wise.js b/erpnext/accounts/search_criteria/lease_receipt_summary_month_wise/lease_receipt_summary_month_wise.js deleted file mode 100644 index d25139c49bd..00000000000 --- a/erpnext/accounts/search_criteria/lease_receipt_summary_month_wise/lease_receipt_summary_month_wise.js +++ /dev/null @@ -1,27 +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 . - -report.customize_filters = function() { - this.hide_all_filters(); - - this.add_filter({fieldname:'date', label:'Date', fieldtype:'Date', options:'',ignore : 1, parent:'GL Entry', 'in_first_page':1}); - - this.filter_fields_dict['GL Entry'+FILTER_SEP +'From Date'].df['report_default']=sys_defaults.year_start_date; - this.filter_fields_dict['GL Entry'+FILTER_SEP +'To Date'].df['report_default']=dateutil.obj_to_str(new Date()); -} - -$dh(this.mytabs.tabs['More Filters']); -$dh(this.mytabs.tabs['Select Columns']); diff --git a/erpnext/accounts/search_criteria/lease_receipt_summary_month_wise/lease_receipt_summary_month_wise.py b/erpnext/accounts/search_criteria/lease_receipt_summary_month_wise/lease_receipt_summary_month_wise.py deleted file mode 100644 index 692f6f8a71c..00000000000 --- a/erpnext/accounts/search_criteria/lease_receipt_summary_month_wise/lease_receipt_summary_month_wise.py +++ /dev/null @@ -1,29 +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 . - -data =[ - ['Month','Data','100px',''], - ['Year','Data','100px',''], - ['Amount','Currency','120px',''] - ] - -for d in data: - colnames.append(d[0]) - coltypes.append(d[1]) - colwidths.append(d[2]) - coloptions.append(d[3]) - col_idx[d[0]] = len(colnames)-1 - diff --git a/erpnext/accounts/search_criteria/lease_receipt_summary_month_wise/lease_receipt_summary_month_wise.sql b/erpnext/accounts/search_criteria/lease_receipt_summary_month_wise/lease_receipt_summary_month_wise.sql deleted file mode 100644 index cdd48b8915e..00000000000 --- a/erpnext/accounts/search_criteria/lease_receipt_summary_month_wise/lease_receipt_summary_month_wise.sql +++ /dev/null @@ -1,5 +0,0 @@ -SELECT date_format(gl.posting_date,'%M'),year(gl.posting_date),sum(gl.credit) as amount -FROM `tabGL Entry` gl, `tabAccount` a -WHERE gl.account=a.name and a.master_type='Customer' and gl.credit>0 and gl.posting_date between '%(date)s' and '%(date1)s' -GROUP BY month(gl.posting_date),year(gl.posting_date) -ORDER BY year(gl.posting_date),month(gl.posting_date) diff --git a/erpnext/accounts/search_criteria/lease_receipt_summary_month_wise/lease_receipt_summary_month_wise.txt b/erpnext/accounts/search_criteria/lease_receipt_summary_month_wise/lease_receipt_summary_month_wise.txt deleted file mode 100644 index e6da15c2704..00000000000 --- a/erpnext/accounts/search_criteria/lease_receipt_summary_month_wise/lease_receipt_summary_month_wise.txt +++ /dev/null @@ -1,30 +0,0 @@ -# Search Criteria, lease_receipt_summary_month_wise -[ - - # These values are common in all dictionaries - { - 'creation': '2011-07-27 16:17:04', - 'docstatus': 0, - 'modified': '2011-07-27 16:17:04', - 'modified_by': 'Administrator', - 'owner': 'Administrator' - }, - - # These values are common for all Search Criteria - { - 'columns': 'GL Entry\x01ID,GL Entry\x01Owner,GL Entry\x01Posting Date,GL Entry\x01Aging Date,GL Entry\x01Account,GL Entry\x01Cost Center,GL Entry\x01Against,GL Entry\x01Against Voucher,GL Entry\x01Voucher Type,GL Entry\x01Voucher No,GL Entry\x01Remarks,GL Entry\x01Is Cancelled,GL Entry\x01Is Opening,GL Entry\x01Fiscal Year,GL Entry\x01Company', - 'criteria_name': 'Lease Receipt Summary Month Wise', - 'doc_type': 'GL Entry', - 'doctype': 'Search Criteria', - 'filters': "{'GL Entry\x01Voucher Type':'','GL Entry\x01Is Cancelled':'','GL Entry\x01Is Opening':'','GL Entry\x01Fiscal Year':''}", - 'module': 'Accounts', - 'name': '__common__', - 'standard': 'Yes' - }, - - # Search Criteria, lease_receipt_summary_month_wise - { - 'doctype': 'Search Criteria', - 'name': 'lease_receipt_summary_month_wise' - } -] diff --git a/erpnext/accounts/search_criteria/lease_receipts_client_wise/__init__.py b/erpnext/accounts/search_criteria/lease_receipts_client_wise/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/erpnext/accounts/search_criteria/lease_receipts_client_wise/lease_receipts_client_wise.js b/erpnext/accounts/search_criteria/lease_receipts_client_wise/lease_receipts_client_wise.js deleted file mode 100644 index d25139c49bd..00000000000 --- a/erpnext/accounts/search_criteria/lease_receipts_client_wise/lease_receipts_client_wise.js +++ /dev/null @@ -1,27 +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 . - -report.customize_filters = function() { - this.hide_all_filters(); - - this.add_filter({fieldname:'date', label:'Date', fieldtype:'Date', options:'',ignore : 1, parent:'GL Entry', 'in_first_page':1}); - - this.filter_fields_dict['GL Entry'+FILTER_SEP +'From Date'].df['report_default']=sys_defaults.year_start_date; - this.filter_fields_dict['GL Entry'+FILTER_SEP +'To Date'].df['report_default']=dateutil.obj_to_str(new Date()); -} - -$dh(this.mytabs.tabs['More Filters']); -$dh(this.mytabs.tabs['Select Columns']); diff --git a/erpnext/accounts/search_criteria/lease_receipts_client_wise/lease_receipts_client_wise.py b/erpnext/accounts/search_criteria/lease_receipts_client_wise/lease_receipts_client_wise.py deleted file mode 100644 index 2d138080500..00000000000 --- a/erpnext/accounts/search_criteria/lease_receipts_client_wise/lease_receipts_client_wise.py +++ /dev/null @@ -1,28 +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 . - -data =[ - ['Lessee Name','Data','300px',''], - ['Amount','Currency','120px',''] - ] - -for d in data: - colnames.append(d[0]) - coltypes.append(d[1]) - colwidths.append(d[2]) - coloptions.append(d[3]) - col_idx[d[0]] = len(colnames)-1 - diff --git a/erpnext/accounts/search_criteria/lease_receipts_client_wise/lease_receipts_client_wise.sql b/erpnext/accounts/search_criteria/lease_receipts_client_wise/lease_receipts_client_wise.sql deleted file mode 100644 index af49c813f1c..00000000000 --- a/erpnext/accounts/search_criteria/lease_receipts_client_wise/lease_receipts_client_wise.sql +++ /dev/null @@ -1,5 +0,0 @@ -SELECT gl.account,sum(gl.credit) as amount -FROM `tabGL Entry` gl, `tabAccount` a -WHERE gl.account=a.name and a.master_type='Customer' and gl.posting_date between '%(date)s' and '%(date1)s' and ifnull(gl.is_cancelled, 'No') = 'No' -GROUP BY gl.account -ORDER BY posting_date diff --git a/erpnext/accounts/search_criteria/lease_receipts_client_wise/lease_receipts_client_wise.txt b/erpnext/accounts/search_criteria/lease_receipts_client_wise/lease_receipts_client_wise.txt deleted file mode 100644 index 71c9b0ead78..00000000000 --- a/erpnext/accounts/search_criteria/lease_receipts_client_wise/lease_receipts_client_wise.txt +++ /dev/null @@ -1,31 +0,0 @@ -# Search Criteria, lease_receipts_client_wise -[ - - # These values are common in all dictionaries - { - 'creation': '2011-08-29 13:45:36', - 'docstatus': 0, - 'modified': '2011-08-29 13:45:36', - 'modified_by': 'Administrator', - 'owner': 'Administrator' - }, - - # These values are common for all Search Criteria - { - 'columns': 'GL Entry\x01ID,GL Entry\x01Owner,GL Entry\x01Posting Date,GL Entry\x01Aging Date,GL Entry\x01Account,GL Entry\x01Cost Center,GL Entry\x01Against,GL Entry\x01Against Voucher,GL Entry\x01Voucher Type,GL Entry\x01Voucher No,GL Entry\x01Remarks,GL Entry\x01Is Cancelled,GL Entry\x01Is Opening,GL Entry\x01Fiscal Year,GL Entry\x01Company', - 'criteria_name': 'Lease Receipts Client Wise', - 'doc_type': 'GL Entry', - 'doctype': 'Search Criteria', - 'filters': "{'GL Entry\x01Voucher Type':'','GL Entry\x01Is Cancelled':'','GL Entry\x01Is Opening':'','GL Entry\x01Fiscal Year':''}", - 'module': 'Accounts', - 'name': '__common__', - 'page_len': 50, - 'standard': 'Yes' - }, - - # Search Criteria, lease_receipts_client_wise - { - 'doctype': 'Search Criteria', - 'name': 'lease_receipts_client_wise' - } -] diff --git a/erpnext/accounts/search_criteria/lease_yearly_future_installment_inflows/__init__.py b/erpnext/accounts/search_criteria/lease_yearly_future_installment_inflows/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/erpnext/accounts/search_criteria/lease_yearly_future_installment_inflows/lease_yearly_future_installment_inflows.js b/erpnext/accounts/search_criteria/lease_yearly_future_installment_inflows/lease_yearly_future_installment_inflows.js deleted file mode 100644 index 7d8152b218c..00000000000 --- a/erpnext/accounts/search_criteria/lease_yearly_future_installment_inflows/lease_yearly_future_installment_inflows.js +++ /dev/null @@ -1,30 +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 . - -report.customize_filters = function() { - this.hide_all_filters(); - - this.add_filter({fieldname:'date', label:'Date', fieldtype:'Date', options:'',ignore : 1, parent:'GL Entry', 'in_first_page':1}); - - this.filter_fields_dict['GL Entry'+FILTER_SEP +'From Date'].df['report_default']=dateutil.obj_to_str(new Date()); -// this.filter_fields_dict['GL Entry'+FILTER_SEP +'To Date'].df['report_default']=dateutil.obj_to_str(new Date()); - - this.filter_fields_dict['GL Entry'+FILTER_SEP +'To Date'].df.filter_hide=1; - -} - -$dh(this.mytabs.tabs['More Filters']); -$dh(this.mytabs.tabs['Select Columns']); diff --git a/erpnext/accounts/search_criteria/lease_yearly_future_installment_inflows/lease_yearly_future_installment_inflows.py b/erpnext/accounts/search_criteria/lease_yearly_future_installment_inflows/lease_yearly_future_installment_inflows.py deleted file mode 100644 index 8c1842a4264..00000000000 --- a/erpnext/accounts/search_criteria/lease_yearly_future_installment_inflows/lease_yearly_future_installment_inflows.py +++ /dev/null @@ -1,28 +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 . - -data =[ - ['Year','Data','100px',''], - ['Amount','Currency','120px',''] - ] - -for d in data: - colnames.append(d[0]) - coltypes.append(d[1]) - colwidths.append(d[2]) - coloptions.append(d[3]) - col_idx[d[0]] = len(colnames)-1 - diff --git a/erpnext/accounts/search_criteria/lease_yearly_future_installment_inflows/lease_yearly_future_installment_inflows.sql b/erpnext/accounts/search_criteria/lease_yearly_future_installment_inflows/lease_yearly_future_installment_inflows.sql deleted file mode 100644 index ec6c8166d01..00000000000 --- a/erpnext/accounts/search_criteria/lease_yearly_future_installment_inflows/lease_yearly_future_installment_inflows.sql +++ /dev/null @@ -1,9 +0,0 @@ -select year(date_sub(due_date,interval 6 MONTH)) as yr,sum(amount) - -from `tabLease Agreement` la,`tabLease Installment` lai - -where la.name=lai.parent and (lai.cheque_date is null or lai.cheque_date > '%(date)s') - -group by year(date_sub(due_date,interval 6 MONTH)) - -order by yr \ No newline at end of file diff --git a/erpnext/accounts/search_criteria/lease_yearly_future_installment_inflows/lease_yearly_future_installment_inflows.txt b/erpnext/accounts/search_criteria/lease_yearly_future_installment_inflows/lease_yearly_future_installment_inflows.txt deleted file mode 100644 index 09697960032..00000000000 --- a/erpnext/accounts/search_criteria/lease_yearly_future_installment_inflows/lease_yearly_future_installment_inflows.txt +++ /dev/null @@ -1,30 +0,0 @@ -# Search Criteria, lease_yearly_future_installment_inflows -[ - - # These values are common in all dictionaries - { - 'creation': '2011-08-29 13:45:36', - 'docstatus': 0, - 'modified': '2011-08-29 13:45:36', - 'modified_by': 'Administrator', - 'owner': 'Administrator' - }, - - # These values are common for all Search Criteria - { - 'columns': 'GL Entry\x01ID,GL Entry\x01Owner,GL Entry\x01Posting Date,GL Entry\x01Aging Date,GL Entry\x01Account,GL Entry\x01Cost Center,GL Entry\x01Against,GL Entry\x01Against Voucher,GL Entry\x01Voucher Type,GL Entry\x01Voucher No,GL Entry\x01Remarks,GL Entry\x01Is Cancelled,GL Entry\x01Is Opening,GL Entry\x01Fiscal Year,GL Entry\x01Company', - 'criteria_name': 'Lease Yearly Future Installment Inflows', - 'doc_type': 'GL Entry', - 'doctype': 'Search Criteria', - 'filters': "{'GL Entry\x01Voucher Type':'','GL Entry\x01Is Cancelled':'','GL Entry\x01Is Opening':'','GL Entry\x01Fiscal Year':''}", - 'module': 'Accounts', - 'name': '__common__', - 'standard': 'Yes' - }, - - # Search Criteria, lease_yearly_future_installment_inflows - { - 'doctype': 'Search Criteria', - 'name': 'lease_yearly_future_installment_inflows' - } -] \ No newline at end of file diff --git a/erpnext/accounts/search_criteria/monthly_ledger_summary_report/__init__.py b/erpnext/accounts/search_criteria/monthly_ledger_summary_report/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/erpnext/accounts/search_criteria/monthly_ledger_summary_report/monthly_ledger_summary_report.js b/erpnext/accounts/search_criteria/monthly_ledger_summary_report/monthly_ledger_summary_report.js deleted file mode 100644 index 2fc1c9ceff3..00000000000 --- a/erpnext/accounts/search_criteria/monthly_ledger_summary_report/monthly_ledger_summary_report.js +++ /dev/null @@ -1,27 +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 . - -report.customize_filters = function() { - flds = ['ID','Owner','Cost Center','From Posting Date', 'To Posting Date', 'Against Voucher','Voucher Type','Voucher No','Is Cancelled','Is Opening','Remarks', 'From Aging Date', 'To Aging Date', 'Company'] - for(i=0;i. - -if not filter_values['account']: - msgprint("Please Enter filter value for Account") - raise Exception - -colwidths[col_idx['Fiscal Month']] = '120px' -colwidths[col_idx['Debit']] = '120px' -colwidths[col_idx['Credit']] = '120px' - - -month_lst={'1':'Jan','2':'Feb','3':'Mar','4':'Apr','5':'May','6':'Jun','7':'Jul','8':'Aug','9':'Sept','10':'Oct','11':'Nov','12':'Dec'} -for r in res: - mnt = '%s'%r[col_idx['Fiscal Month']] - r[col_idx['Fiscal Month']]=month_lst[mnt] \ No newline at end of file diff --git a/erpnext/accounts/search_criteria/monthly_ledger_summary_report/monthly_ledger_summary_report.txt b/erpnext/accounts/search_criteria/monthly_ledger_summary_report/monthly_ledger_summary_report.txt deleted file mode 100644 index 3247aea8775..00000000000 --- a/erpnext/accounts/search_criteria/monthly_ledger_summary_report/monthly_ledger_summary_report.txt +++ /dev/null @@ -1,36 +0,0 @@ -# Search Criteria, monthly_ledger_summary_report -[ - - # These values are common in all dictionaries - { - 'creation': '2012-03-30 14:50:43', - 'docstatus': 0, - 'modified': '2012-03-30 14:50:44', - 'modified_by': u'Administrator', - 'owner': u'Administrator' - }, - - # These values are common for all Search Criteria - { - 'add_col': u"month(`tabGL Entry`.posting_date) AS 'Fiscal Month'\nsum(`tabGL Entry`.debit) AS 'Debit'\nsum(`tabGL Entry`.credit) AS 'Credit'", - 'add_cond': u'(`tabGL Entry`.debit > 0 or `tabGL Entry`.credit > 0)', - 'criteria_name': u'Monthly Ledger Summary Report', - 'dis_filters': u'company', - 'doc_type': u'GL Entry', - 'doctype': 'Search Criteria', - 'filters': u"{'GL Entry\x01Voucher Type':'','GL Entry\x01Is Cancelled':'','GL Entry\x01Is Opening':''}", - 'group_by': u'month(`tabGL Entry`.posting_date)', - 'module': u'Accounts', - 'name': '__common__', - 'page_len': 50, - 'sort_by': u'`Fiscal Month`', - 'sort_order': u'ASC', - 'standard': u'Yes' - }, - - # Search Criteria, monthly_ledger_summary_report - { - 'doctype': 'Search Criteria', - 'name': u'monthly_ledger_summary_report' - } -] \ No newline at end of file diff --git a/erpnext/accounts/search_criteria/payment_receipt_report/payment_receipt_report.txt b/erpnext/accounts/search_criteria/payment_receipt_report/payment_receipt_report.txt index 858fec272e7..d1ef6d1a1b0 100644 --- a/erpnext/accounts/search_criteria/payment_receipt_report/payment_receipt_report.txt +++ b/erpnext/accounts/search_criteria/payment_receipt_report/payment_receipt_report.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 14:50:44', + 'creation': '2012-04-03 12:49:51', 'docstatus': 0, - 'modified': '2012-03-30 14:50:44', + 'modified': '2012-04-03 12:49:51', 'modified_by': u'Administrator', 'owner': u'jai@webnotestech.com' }, diff --git a/erpnext/accounts/search_criteria/payment_report/__init__.py b/erpnext/accounts/search_criteria/payment_report/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/erpnext/accounts/search_criteria/payment_report/payment_report.js b/erpnext/accounts/search_criteria/payment_report/payment_report.js deleted file mode 100644 index 04ea91e97b8..00000000000 --- a/erpnext/accounts/search_criteria/payment_report/payment_report.js +++ /dev/null @@ -1,42 +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 . - -report.customize_filters = function() { - this.hide_all_filters(); - - this.filter_fields_dict['Journal Voucher'+FILTER_SEP +'Voucher Type'].df.filter_hide = 0; - this.filter_fields_dict['Journal Voucher'+FILTER_SEP +'Is Opening'].df.filter_hide = 0; - this.filter_fields_dict['Journal Voucher'+FILTER_SEP +'Company'].df.filter_hide = 0; - this.filter_fields_dict['Journal Voucher'+FILTER_SEP +'From Posting Date'].df.filter_hide = 0; - this.filter_fields_dict['Journal Voucher'+FILTER_SEP +'To Posting Date'].df.filter_hide = 0; - this.filter_fields_dict['Journal Voucher Detail'+FILTER_SEP +'Account'].df.filter_hide = 0; - - this.add_filter({fieldname:'range_1', label:'Range 1', fieldtype:'Data', ignore : 1, parent:'GL Entry'}); - this.add_filter({fieldname:'range_2', label:'Range 2', fieldtype:'Data', ignore : 1, parent:'GL Entry'}); - this.add_filter({fieldname:'range_3', label:'Range 3', fieldtype:'Data', ignore : 1, parent:'GL Entry'}); - this.add_filter({fieldname:'range_4', label:'Range 4', fieldtype:'Data', ignore : 1, parent:'GL Entry'}); - - this.add_filter({fieldname:'aging_based_on', label:'Aging Based On', fieldtype:'Select', options:NEWLINE+'Transaction Date'+NEWLINE+'Aging Date',ignore : 1, parent:'Purchase Invoice', 'report_default':'Aging Date'}); - this.filter_fields_dict['Journal Voucher'+FILTER_SEP +'From Posting Date'].df.in_first_page = 1; - this.filter_fields_dict['Journal Voucher'+FILTER_SEP +'To Posting Date'].df.in_first_page = 1; - this.filter_fields_dict['Journal Voucher Detail'+FILTER_SEP +'Account'].df.in_first_page = 1; - - this.filter_fields_dict['Journal Voucher'+FILTER_SEP +'From Posting Date'].df['report_default'] = sys_defaults.year_start_date; - this.filter_fields_dict['Journal Voucher'+FILTER_SEP +'To Posting Date'].df['report_default'] = dateutil.obj_to_str(new Date()); - this.filter_fields_dict['Journal Voucher'+FILTER_SEP +'Company'].df['report_default']=sys_defaults.company; - -} -this.mytabs.items['Select Columns'].hide() \ No newline at end of file diff --git a/erpnext/accounts/search_criteria/payment_report/payment_report.py b/erpnext/accounts/search_criteria/payment_report/payment_report.py deleted file mode 100644 index 404b883bcb5..00000000000 --- a/erpnext/accounts/search_criteria/payment_report/payment_report.py +++ /dev/null @@ -1,105 +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 . - -#check mendatory -if not filter_values.get('posting_date') or not filter_values.get('posting_date1'): - msgprint("Please select From Posting Date and To Posting Date in 'Set Filters' section") - raise Exception -else: - from_date = filter_values.get('posting_date') - to_date = filter_values.get('posting_date1') - -if not filter_values['range_1'] or not filter_values['range_2'] or not filter_values['range_3'] or not filter_values['range_4']: - msgprint("Please select aging ranges in no of days in 'Set Filters' section") - raise Exception - -# ageing based on -aging_based_on = 'Aging Date' -if filter_values.has_key('aging_based_on') and filter_values['aging_based_on']: - aging_based_on = filter_values['aging_based_on'].split(NEWLINE)[-1] - - -# Add columns -# ----------- -row_list = [['ID','Data','150px',''], - ['Account','Data','150px',''], - ['Credit','Data','150px',''], - ['Debit','Data','150px',''], - ['Against Payable','Data','150px',''], - ['Is Advance','Data','150px',''], - ['Transaction Date','Date','150px',''], - ['Aging Date','Date','150px',''], - ['Cheque No','Data','100px',''], - ['Cheque Date','Date','150px',''], - ['Supplier Type','Data','150px',''], - ['Remark','Data','250px',''], - ['Advance','Data','250px',''], - ['PV Transaction Date','Date','150px',''], - ['PV Aging Date','Date','150px',''], - ['Age (Days)','Data','100px',''], - ['0-'+cstr(filter_values['range_1']),'Currency','100px',''], - [cstr(cint(filter_values['range_1']) + 1)+ '-' +cstr(filter_values['range_2']),'Currency','100px',''], - [cstr(cint(filter_values['range_2']) + 1)+ '-' +cstr(filter_values['range_3']),'Currency','100px',''], - [cstr(cint(filter_values['range_3']) + 1)+ '-' +cstr(filter_values['range_4']),'Currency','100px',''], - [cstr(filter_values['range_4']) + '-Above','Currency','100px','']] - -for r in row_list: - colnames.append(r[0]) - coltypes.append(r[1]) - colwidths.append(r[2]) - coloptions.append(r[3]) - col_idx[r[0]] = len(colnames)-1 - - -for r in res: - if r[col_idx['Against Payable']]: - dt=sql("select date(modified), aging_date from `tabPurchase Invoice` where name='%s'"%r[col_idx['Against Payable']]) - r.append('') - r.append(dt and cstr(dt[0][0]) or '') - r.append(dt and cstr(dt[0][1]) or '') - else: - r.append(r[col_idx['Debit']]) - r.append('') - r.append('') - - # Aging Credit Amount - val_l1 = val_l2 = val_l3 = val_l4 = val_l5_above = diff = 0 - - if r[col_idx['Against Payable']]: - amt = flt(r[col_idx['Debit']]) or (-1)*flt(r[col_idx['Credit']]) - - if aging_based_on == 'Transaction Date' and r[col_idx['PV Transaction Date']]: - diff = (getdate(r[col_idx['Transaction Date']]) - getdate(r[col_idx['PV Transaction Date']])).days - elif aging_based_on == 'Aging Date' and r[col_idx['PV Aging Date']]: - diff = (getdate(r[col_idx['Aging Date']]) - getdate(r[col_idx['PV Aging Date']])).days - - if diff < cint(filter_values['range_1']): - val_l1 = amt - if diff >= cint(filter_values['range_1']) and diff < cint(filter_values['range_2']): - val_l2 = amt - if diff >= cint(filter_values['range_2']) and diff < cint(filter_values['range_3']): - val_l3 = amt - if diff >= cint(filter_values['range_3']) and diff < cint(filter_values['range_4']): - val_l4 = amt - if diff >= cint(filter_values['range_4']): - val_l5_above = amt - - r.append(diff) - r.append(val_l1) - r.append(val_l2) - r.append(val_l3) - r.append(val_l4) - r.append(val_l5_above) diff --git a/erpnext/accounts/search_criteria/payment_report/payment_report.sql b/erpnext/accounts/search_criteria/payment_report/payment_report.sql deleted file mode 100644 index dec4f4ea007..00000000000 --- a/erpnext/accounts/search_criteria/payment_report/payment_report.sql +++ /dev/null @@ -1,12 +0,0 @@ -SELECT `tabJournal Voucher`.`name`,`tabJournal Voucher Detail`.`account`,`tabJournal Voucher Detail`.`credit`,`tabJournal Voucher Detail`.`debit`,`tabJournal Voucher Detail`.`against_voucher`,`tabJournal Voucher Detail`.`is_advance`,`tabJournal Voucher`.`voucher_date`,`tabJournal Voucher`.`aging_date`,`tabJournal Voucher`.`cheque_no`,`tabJournal Voucher`.`cheque_date`,`tabSupplier`.`supplier_type`,`tabJournal Voucher`.`remark` - FROM `tabJournal Voucher Detail`,`tabJournal Voucher`,`tabAccount`,`tabSupplier` - WHERE `tabJournal Voucher`.docstatus=1 - AND `tabJournal Voucher`.`posting_date`>='%(posting_date)s' - AND `tabJournal Voucher`.`posting_date`<='%(posting_date1)s' - AND `tabJournal Voucher`.`company` LIKE '%(company)s%%' - AND `tabJournal Voucher Detail`.`account` LIKE '%(account)s%%' - AND `tabAccount`.`master_type` = 'Supplier' - AND `tabAccount`.`account_name` = `tabSupplier`.`name` - AND `tabJournal Voucher Detail`.`account` = `tabAccount`.`name` - AND `tabJournal Voucher Detail`.`parent` = `tabJournal Voucher`.`name` - ORDER BY `tabJournal Voucher`.`name` \ No newline at end of file diff --git a/erpnext/accounts/search_criteria/payment_report/payment_report.txt b/erpnext/accounts/search_criteria/payment_report/payment_report.txt deleted file mode 100644 index 2c220904493..00000000000 --- a/erpnext/accounts/search_criteria/payment_report/payment_report.txt +++ /dev/null @@ -1,33 +0,0 @@ -# Search Criteria, payment_report -[ - - # These values are common in all dictionaries - { - 'creation': '2012-03-30 14:50:44', - 'docstatus': 0, - 'modified': '2012-03-30 14:50:44', - 'modified_by': u'Administrator', - 'owner': u'Administrator' - }, - - # These values are common for all Search Criteria - { - 'columns': u'Journal Voucher\x01ID,Journal Voucher\x01Posting Date,Journal Voucher\x01Company,Journal Voucher\x01Cheque No,Journal Voucher\x01Cheque Date,Journal Voucher Detail\x01Account,Journal Voucher Detail\x01Debit,Journal Voucher Detail\x01Against Payable,Journal Voucher Detail\x01Is Advance', - 'criteria_name': u'Payment Report', - 'doc_type': u'Journal Voucher Detail', - 'doctype': 'Search Criteria', - 'filters': u"{'Journal Voucher\x01Submitted':1,'Journal Voucher\x01Voucher Type':'','Journal Voucher\x01Is Opening':'','Journal Voucher\x01Company':'','Journal Voucher\x01TDS Applicable':'','Journal Voucher\x01TDS Category':'','GL Entry\x01Range 1':'30','GL Entry\x01Range 2':'45','GL Entry\x01Range 3':'60','GL Entry\x01Range 4':'90','Sales Invoice\x01Aging Based On':'','Purchase Invoice\x01Aging Based On':''}", - 'module': u'Accounts', - 'name': '__common__', - 'parent_doc_type': u'Journal Voucher', - 'sort_by': u'`tabJournal Voucher`.`aging_date`', - 'sort_order': u'DESC', - 'standard': u'Yes' - }, - - # Search Criteria, payment_report - { - 'doctype': 'Search Criteria', - 'name': u'payment_report' - } -] \ No newline at end of file diff --git a/erpnext/accounts/search_criteria/progressive_total_excise_duty/progressive_total_excise_duty.txt b/erpnext/accounts/search_criteria/progressive_total_excise_duty/progressive_total_excise_duty.txt index d0dae73ac93..c8a45620f11 100644 --- a/erpnext/accounts/search_criteria/progressive_total_excise_duty/progressive_total_excise_duty.txt +++ b/erpnext/accounts/search_criteria/progressive_total_excise_duty/progressive_total_excise_duty.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 13:33:32', + 'creation': '2012-04-03 12:49:52', 'docstatus': 0, - 'modified': '2012-03-30 13:33:32', + 'modified': '2012-04-03 12:49:52', 'modified_by': u'Administrator', 'owner': u'jai@webnotestech.com' }, diff --git a/erpnext/accounts/search_criteria/purchase_register/purchase_register.txt b/erpnext/accounts/search_criteria/purchase_register/purchase_register.txt index 451332b3617..cbc5c415c9e 100644 --- a/erpnext/accounts/search_criteria/purchase_register/purchase_register.txt +++ b/erpnext/accounts/search_criteria/purchase_register/purchase_register.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 13:33:32', + 'creation': '2012-04-03 12:49:52', 'docstatus': 0, - 'modified': '2012-03-30 13:33:32', + 'modified': '2012-04-03 12:49:52', 'modified_by': u'Administrator', 'owner': u'Administrator' }, diff --git a/erpnext/accounts/search_criteria/sales_register/sales_register.txt b/erpnext/accounts/search_criteria/sales_register/sales_register.txt index f21fa0c93f0..e68cd57a6f0 100644 --- a/erpnext/accounts/search_criteria/sales_register/sales_register.txt +++ b/erpnext/accounts/search_criteria/sales_register/sales_register.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 14:50:44', + 'creation': '2012-04-03 12:49:52', 'docstatus': 0, - 'modified': '2012-03-30 14:50:44', + 'modified': '2012-04-03 12:49:52', 'modified_by': u'Administrator', 'owner': u'Administrator' }, diff --git a/erpnext/accounts/search_criteria/service_tax_credit_account___inputs/service_tax_credit_account___inputs.txt b/erpnext/accounts/search_criteria/service_tax_credit_account___inputs/service_tax_credit_account___inputs.txt index 73e5cb6613b..cccd8d3d5a9 100644 --- a/erpnext/accounts/search_criteria/service_tax_credit_account___inputs/service_tax_credit_account___inputs.txt +++ b/erpnext/accounts/search_criteria/service_tax_credit_account___inputs/service_tax_credit_account___inputs.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 14:50:44', + 'creation': '2012-04-03 12:49:52', 'docstatus': 0, - 'modified': '2012-03-30 14:50:44', + 'modified': '2012-04-03 12:49:52', 'modified_by': u'Administrator', 'owner': u'jai@webnotestech.com' }, diff --git a/erpnext/accounts/search_criteria/tds_return/tds_return.txt b/erpnext/accounts/search_criteria/tds_return/tds_return.txt index d89d30398af..743488daee4 100644 --- a/erpnext/accounts/search_criteria/tds_return/tds_return.txt +++ b/erpnext/accounts/search_criteria/tds_return/tds_return.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 14:50:44', + 'creation': '2012-04-03 12:49:53', 'docstatus': 0, - 'modified': '2012-03-30 14:50:44', + 'modified': '2012-04-03 12:49:53', 'modified_by': u'Administrator', 'owner': u'Administrator' }, diff --git a/erpnext/accounts/search_criteria/total_amout_collection_for_a_period___customerwise/total_amout_collection_for_a_period___customerwise.txt b/erpnext/accounts/search_criteria/total_amout_collection_for_a_period___customerwise/total_amout_collection_for_a_period___customerwise.txt index 0fddd22ace3..d3b1065fe60 100644 --- a/erpnext/accounts/search_criteria/total_amout_collection_for_a_period___customerwise/total_amout_collection_for_a_period___customerwise.txt +++ b/erpnext/accounts/search_criteria/total_amout_collection_for_a_period___customerwise/total_amout_collection_for_a_period___customerwise.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 14:50:44', + 'creation': '2012-04-03 12:49:53', 'docstatus': 0, - 'modified': '2012-03-30 14:50:44', + 'modified': '2012-04-03 12:49:53', 'modified_by': u'Administrator', 'owner': u'Administrator' }, diff --git a/erpnext/accounts/search_criteria/trial_balance/trial_balance.txt b/erpnext/accounts/search_criteria/trial_balance/trial_balance.txt index 16bac7c2fb1..63e7b4950df 100644 --- a/erpnext/accounts/search_criteria/trial_balance/trial_balance.txt +++ b/erpnext/accounts/search_criteria/trial_balance/trial_balance.txt @@ -3,33 +3,33 @@ # These values are common in all dictionaries { - 'creation': '2010-12-14 10:23:28', + 'creation': '2012-04-03 12:49:53', 'docstatus': 0, - 'modified': '2011-06-22 12:29:43', - 'modified_by': 'Administrator', - 'owner': 'Administrator' + 'modified': '2012-04-03 12:49:53', + 'modified_by': u'Administrator', + 'owner': u'Administrator' }, # These values are common for all Search Criteria { - 'columns': 'Account\x01ID', - 'criteria_name': 'Trial Balance', - 'description': 'Trial Balance', - 'dis_filters': 'transaction_date', - 'doc_type': 'Account', + 'columns': u'Account\x01ID', + 'criteria_name': u'Trial Balance', + 'description': u'Trial Balance', + 'dis_filters': u'transaction_date', + 'doc_type': u'Account', 'doctype': 'Search Criteria', - 'filters': "{'Account\x01Group or Ledger':'Ledger','Account\x01Is PL Account':'','Account\x01Account Type':'','Account\x01Show Group Balance':''}", - 'module': 'Accounts', + 'filters': u"{'Account\x01Group or Ledger':'Ledger','Account\x01Is PL Account':'','Account\x01Account Type':'','Account\x01Show Group Balance':''}", + 'module': u'Accounts', 'name': '__common__', 'page_len': 50, - 'sort_by': '`tabAccount`.`name`', - 'sort_order': 'DESC', - 'standard': 'Yes' + 'sort_by': u'`tabAccount`.`name`', + 'sort_order': u'DESC', + 'standard': u'Yes' }, # Search Criteria, trial_balance { 'doctype': 'Search Criteria', - 'name': 'trial_balance' + 'name': u'trial_balance' } ] \ No newline at end of file diff --git a/erpnext/accounts/search_criteria/voucher_wise_tax_details/voucher_wise_tax_details.txt b/erpnext/accounts/search_criteria/voucher_wise_tax_details/voucher_wise_tax_details.txt index 729eefa0ee6..ac1cd4cf013 100644 --- a/erpnext/accounts/search_criteria/voucher_wise_tax_details/voucher_wise_tax_details.txt +++ b/erpnext/accounts/search_criteria/voucher_wise_tax_details/voucher_wise_tax_details.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 13:33:32', + 'creation': '2012-04-03 12:49:53', 'docstatus': 0, - 'modified': '2012-03-30 13:33:32', + 'modified': '2012-04-03 12:49:53', 'modified_by': u'Administrator', 'owner': u'Administrator' }, diff --git a/erpnext/analysis/search_criteria/monthly_transaction_summary/monthly_transaction_summary.txt b/erpnext/analysis/search_criteria/monthly_transaction_summary/monthly_transaction_summary.txt index 9166eeb828e..2842f8dd886 100644 --- a/erpnext/analysis/search_criteria/monthly_transaction_summary/monthly_transaction_summary.txt +++ b/erpnext/analysis/search_criteria/monthly_transaction_summary/monthly_transaction_summary.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 13:33:32', + 'creation': '2012-04-03 12:49:51', 'docstatus': 0, - 'modified': '2012-03-30 13:33:32', + 'modified': '2012-04-03 12:49:51', 'modified_by': u'Administrator', 'owner': u'Administrator' }, diff --git a/erpnext/analysis/search_criteria/trend_analyzer/trend_analyzer.txt b/erpnext/analysis/search_criteria/trend_analyzer/trend_analyzer.txt index 857e25e414f..8ba19cf3f14 100644 --- a/erpnext/analysis/search_criteria/trend_analyzer/trend_analyzer.txt +++ b/erpnext/analysis/search_criteria/trend_analyzer/trend_analyzer.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 14:50:45', + 'creation': '2012-04-03 12:49:53', 'docstatus': 0, - 'modified': '2012-03-30 14:50:45', + 'modified': '2012-04-03 12:49:53', 'modified_by': u'Administrator', 'owner': u'saumil@webnotestech.com' }, diff --git a/erpnext/analysis/search_criteria/yearly_transaction_summary/yearly_transaction_summary.txt b/erpnext/analysis/search_criteria/yearly_transaction_summary/yearly_transaction_summary.txt index 4d8a395bad2..c86f1e8e35f 100644 --- a/erpnext/analysis/search_criteria/yearly_transaction_summary/yearly_transaction_summary.txt +++ b/erpnext/analysis/search_criteria/yearly_transaction_summary/yearly_transaction_summary.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 14:50:45', + 'creation': '2012-04-03 12:49:53', 'docstatus': 0, - 'modified': '2012-03-30 14:50:45', + 'modified': '2012-04-03 12:49:53', 'modified_by': u'Administrator', 'owner': u'Administrator' }, diff --git a/erpnext/buying/DocType Mapper/Purchase Request-Purchase Order/Purchase Request-Purchase Order.txt b/erpnext/buying/DocType Mapper/Purchase Request-Purchase Order/Purchase Request-Purchase Order.txt index e3f5970af16..befcb8c5380 100644 --- a/erpnext/buying/DocType Mapper/Purchase Request-Purchase Order/Purchase Request-Purchase Order.txt +++ b/erpnext/buying/DocType Mapper/Purchase Request-Purchase Order/Purchase Request-Purchase Order.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2010-09-20 12:33:34', + 'creation': '2010-08-08 17:09:34', 'docstatus': 0, - 'modified': '2012-03-30 13:33:31', + 'modified': '2012-04-03 12:49:50', 'modified_by': u'Administrator', 'owner': u'Administrator' }, diff --git a/erpnext/buying/DocType Mapper/Sales Order-Purchase Request/Sales Order-Purchase Request.txt b/erpnext/buying/DocType Mapper/Sales Order-Purchase Request/Sales Order-Purchase Request.txt index 5cc46c3f6a0..6dc79e6ecbb 100755 --- a/erpnext/buying/DocType Mapper/Sales Order-Purchase Request/Sales Order-Purchase Request.txt +++ b/erpnext/buying/DocType Mapper/Sales Order-Purchase Request/Sales Order-Purchase Request.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2011-05-06 12:42:44', + 'creation': '2011-05-20 10:07:55', 'docstatus': 0, - 'modified': '2012-03-30 13:33:31', + 'modified': '2012-04-03 12:49:50', 'modified_by': u'Administrator', 'owner': u'Administrator' }, diff --git a/erpnext/buying/doctype/purchase_common/purchase_common.js b/erpnext/buying/doctype/purchase_common/purchase_common.js index c1653884a0a..9b402add6a6 100644 --- a/erpnext/buying/doctype/purchase_common/purchase_common.js +++ b/erpnext/buying/doctype/purchase_common/purchase_common.js @@ -287,11 +287,11 @@ cur_frm.cscript.validate = function(doc, cdt, cdn) { // **************** RE-CALCULATE VALUES *************************** -cur_frm.cscript['Re-Calculate Values'] = function(doc, cdt, cdn) { - cur_frm.cscript['Calculate Tax'](doc,cdt,cdn); +cur_frm.cscript.recalculate_values = function(doc, cdt, cdn) { + cur_frm.cscript.calculate_tax(doc,cdt,cdn); } -cur_frm.cscript['Calculate Tax'] = function(doc, cdt, cdn) { +cur_frm.cscript.calculate_tax = function(doc, cdt, cdn) { var other_fname = cur_frm.cscript.other_fname; var cl = getchildren('Purchase Taxes and Charges', doc.name, other_fname, doc.doctype); diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.js b/erpnext/buying/doctype/purchase_order/purchase_order.js index ce84e2a5b95..15057924172 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.js +++ b/erpnext/buying/doctype/purchase_order/purchase_order.js @@ -62,7 +62,7 @@ cur_frm.cscript.refresh = function(doc, cdt, cdn) { if(doc.docstatus == 1 && doc.status != 'Stopped'){ var ch = getchildren('Purchase Order Item',doc.name,'po_details'); var allow_billing = 0; var allow_receipt = 0; - cur_frm.add_custom_button('Send SMS', cur_frm.cscript['Send SMS']); + cur_frm.add_custom_button('Send SMS', cur_frm.cscript.send_sms); for(var i in ch){ if(ch[i].qty > ch[i].received_qty) allow_receipt = 1; @@ -159,7 +159,7 @@ cur_frm.fields_dict['supplier_qtn'].get_query = function(doc) { //========================= Get Last Purhase Rate ===================================== -cur_frm.cscript['Get Last Purchase Rate'] = function(doc, cdt, cdn){ +cur_frm.cscript.get_last_purchase_rate = function(doc, cdt, cdn){ $c_obj(make_doclist(doc.doctype, doc.name), 'get_last_purchase_rate', '', function(r, rt) { refresh_field(cur_frm.cscript.fname); diff --git a/erpnext/buying/doctype/purchase_request/purchase_request.js b/erpnext/buying/doctype/purchase_request/purchase_request.js index e3855739dac..1cb597adecc 100644 --- a/erpnext/buying/doctype/purchase_request/purchase_request.js +++ b/erpnext/buying/doctype/purchase_request/purchase_request.js @@ -63,7 +63,7 @@ cur_frm.cscript.refresh = function(doc, cdt, cdn) { cur_frm.add_custom_button('Make Purchase Order', cur_frm.cscript['Make Purchase Order']) cur_frm.add_custom_button('Stop ' + cur_frm.cscript.indent_doctype_label, cur_frm.cscript['Stop Purchase Requisition']) } - cur_frm.add_custom_button('Send SMS', cur_frm.cscript['Send SMS']); + cur_frm.add_custom_button('Send SMS', cur_frm.cscript.send_sms); } if(doc.docstatus == 1 && doc.status == 'Stopped') diff --git a/erpnext/buying/search_criteria/itemwise_purchase_details/itemwise_purchase_details.txt b/erpnext/buying/search_criteria/itemwise_purchase_details/itemwise_purchase_details.txt index 8592ebf9b9d..2b41033ab35 100644 --- a/erpnext/buying/search_criteria/itemwise_purchase_details/itemwise_purchase_details.txt +++ b/erpnext/buying/search_criteria/itemwise_purchase_details/itemwise_purchase_details.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 14:50:43', + 'creation': '2012-04-03 12:49:51', 'docstatus': 0, - 'modified': '2012-03-30 14:50:43', + 'modified': '2012-04-03 12:49:51', 'modified_by': u'Administrator', 'owner': u'Administrator' }, diff --git a/erpnext/buying/search_criteria/itemwise_receipt_details/itemwise_receipt_details.txt b/erpnext/buying/search_criteria/itemwise_receipt_details/itemwise_receipt_details.txt index 71200a52de2..093544f1426 100644 --- a/erpnext/buying/search_criteria/itemwise_receipt_details/itemwise_receipt_details.txt +++ b/erpnext/buying/search_criteria/itemwise_receipt_details/itemwise_receipt_details.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 14:50:43', + 'creation': '2012-04-03 12:49:51', 'docstatus': 0, - 'modified': '2012-03-30 14:50:43', + 'modified': '2012-04-03 12:49:51', 'modified_by': u'Administrator', 'owner': u'Administrator' }, diff --git a/erpnext/buying/search_criteria/pending_po_items_to_bill/pending_po_items_to_bill.txt b/erpnext/buying/search_criteria/pending_po_items_to_bill/pending_po_items_to_bill.txt index 23bf68e72ef..cbdcc5cc671 100644 --- a/erpnext/buying/search_criteria/pending_po_items_to_bill/pending_po_items_to_bill.txt +++ b/erpnext/buying/search_criteria/pending_po_items_to_bill/pending_po_items_to_bill.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 14:50:44', + 'creation': '2012-04-03 12:49:51', 'docstatus': 0, - 'modified': '2012-03-30 14:50:44', + 'modified': '2012-04-03 12:49:51', 'modified_by': u'Administrator', 'owner': u'dhanalekshmi@webnotestech.com' }, diff --git a/erpnext/buying/search_criteria/pending_po_items_to_receive/pending_po_items_to_receive.txt b/erpnext/buying/search_criteria/pending_po_items_to_receive/pending_po_items_to_receive.txt index 516bcd27e45..185e1559ab5 100644 --- a/erpnext/buying/search_criteria/pending_po_items_to_receive/pending_po_items_to_receive.txt +++ b/erpnext/buying/search_criteria/pending_po_items_to_receive/pending_po_items_to_receive.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 13:33:32', + 'creation': '2012-04-03 12:49:52', 'docstatus': 0, - 'modified': '2012-03-30 13:33:32', + 'modified': '2012-04-03 12:49:52', 'modified_by': u'Administrator', 'owner': u'dhanalekshmi@webnotestech.com' }, diff --git a/erpnext/buying/search_criteria/purchase_in_transit/purchase_in_transit.txt b/erpnext/buying/search_criteria/purchase_in_transit/purchase_in_transit.txt index 42941356b01..9009ccf7744 100644 --- a/erpnext/buying/search_criteria/purchase_in_transit/purchase_in_transit.txt +++ b/erpnext/buying/search_criteria/purchase_in_transit/purchase_in_transit.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 13:33:32', + 'creation': '2012-04-03 12:49:52', 'docstatus': 0, - 'modified': '2012-03-30 13:33:32', + 'modified': '2012-04-03 12:49:52', 'modified_by': u'Administrator', 'owner': u'Administrator' }, diff --git a/erpnext/home/search_criteria/bills_to_be_paid/__init__.py b/erpnext/home/search_criteria/bills_to_be_paid/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/erpnext/home/search_criteria/bills_to_be_paid/bills_to_be_paid.txt b/erpnext/home/search_criteria/bills_to_be_paid/bills_to_be_paid.txt deleted file mode 100644 index 6fb5f7f179c..00000000000 --- a/erpnext/home/search_criteria/bills_to_be_paid/bills_to_be_paid.txt +++ /dev/null @@ -1,34 +0,0 @@ -# Search Criteria, bills-to_be_paid -[ - - # These values are common in all dictionaries - { - 'creation': '2010-08-08 17:09:32', - 'docstatus': 0, - 'modified': '2010-05-13 17:26:48', - 'modified_by': 'Administrator', - 'owner': 'Administrator' - }, - - # These values are common for all Search Criteria - { - 'add_cond': '`tabPurchase Invoice`.outstanding_amount!=0\n`tabPurchase Invoice`.docstatus=1', - 'columns': 'Purchase Invoice\x01ID,Purchase Invoice\x01Voucher Date,Purchase Invoice\x01Due Date,Purchase Invoice\x01Credit To,Purchase Invoice\x01Bill Date,Purchase Invoice\x01Outstanding Amount', - 'criteria_name': 'Bills-To be paid', - 'doc_type': 'Purchase Invoice', - 'doctype': 'Search Criteria', - 'filters': "{'Purchase Invoice\x01Submitted':1,'Purchase Invoice\x01Is Opening':'','Purchase Invoice\x01Fiscal Year':''}", - 'module': 'Home', - 'name': '__common__', - 'page_len': 50, - 'sort_by': '`tabPurchase Invoice`.`name`', - 'sort_order': 'DESC', - 'standard': 'Yes' - }, - - # Search Criteria, bills-to_be_paid - { - 'doctype': 'Search Criteria', - 'name': 'bills-to_be_paid' - } -] \ No newline at end of file diff --git a/erpnext/home/search_criteria/bills_to_be_submitted/__init__.py b/erpnext/home/search_criteria/bills_to_be_submitted/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/erpnext/home/search_criteria/bills_to_be_submitted/bills_to_be_submitted.txt b/erpnext/home/search_criteria/bills_to_be_submitted/bills_to_be_submitted.txt deleted file mode 100644 index 1b4f922c443..00000000000 --- a/erpnext/home/search_criteria/bills_to_be_submitted/bills_to_be_submitted.txt +++ /dev/null @@ -1,33 +0,0 @@ -# Search Criteria, bills-to_be_submitted -[ - - # These values are common in all dictionaries - { - 'creation': '2010-08-08 17:09:32', - 'docstatus': 0, - 'modified': '2010-05-03 12:24:43', - 'modified_by': 'Administrator', - 'owner': 'Administrator' - }, - - # These values are common for all Search Criteria - { - 'columns': 'Purchase Invoice\x01ID,Purchase Invoice\x01Voucher Date,Purchase Invoice\x01Due Date,Purchase Invoice\x01Credit To,Purchase Invoice\x01Bill No,Purchase Invoice\x01Bill Date,Purchase Invoice\x01Outstanding Amount', - 'criteria_name': 'Bills-To be submitted', - 'doc_type': 'Purchase Invoice', - 'doctype': 'Search Criteria', - 'filters': "{'Purchase Invoice\x01Saved':1,'Purchase Invoice\x01Is Opening':'','Purchase Invoice\x01Fiscal Year':''}", - 'module': 'Home', - 'name': '__common__', - 'page_len': 50, - 'sort_by': '`tabPurchase Invoice`.`name`', - 'sort_order': 'DESC', - 'standard': 'Yes' - }, - - # Search Criteria, bills-to_be_submitted - { - 'doctype': 'Search Criteria', - 'name': 'bills-to_be_submitted' - } -] \ No newline at end of file diff --git a/erpnext/home/search_criteria/delivery_note_to_be_billed/__init__.py b/erpnext/home/search_criteria/delivery_note_to_be_billed/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/erpnext/home/search_criteria/delivery_note_to_be_billed/delivery_note_to_be_billed.txt b/erpnext/home/search_criteria/delivery_note_to_be_billed/delivery_note_to_be_billed.txt deleted file mode 100644 index d96981ca4c5..00000000000 --- a/erpnext/home/search_criteria/delivery_note_to_be_billed/delivery_note_to_be_billed.txt +++ /dev/null @@ -1,34 +0,0 @@ -# Search Criteria, delivery_note-to_be_billed -[ - - # These values are common in all dictionaries - { - 'creation': '2010-08-08 17:09:32', - 'docstatus': 0, - 'modified': '2010-05-13 17:24:34', - 'modified_by': 'Administrator', - 'owner': 'Administrator' - }, - - # These values are common for all Search Criteria - { - 'add_cond': 'ifnull(`tabDelivery Note`.per_billed, 0) < 100', - 'columns': 'Delivery Note\x01ID,Delivery Note\x01Owner,Delivery Note\x01Customer Name,Delivery Note\x01% Billed,Delivery Note\x01Company', - 'criteria_name': 'Delivery Note-To be billed', - 'doc_type': 'Delivery Note', - 'doctype': 'Search Criteria', - 'filters': "{'Delivery Note\x01Submitted':1,'Delivery Note\x01Status':'Submitted','Delivery Note\x01Fiscal Year':''}", - 'module': 'Home', - 'name': '__common__', - 'page_len': 50, - 'sort_by': '`tabDelivery Note`.`name`', - 'sort_order': 'DESC', - 'standard': 'Yes' - }, - - # Search Criteria, delivery_note-to_be_billed - { - 'doctype': 'Search Criteria', - 'name': 'delivery_note-to_be_billed' - } -] \ No newline at end of file diff --git a/erpnext/home/search_criteria/delivery_note_to_be_submitted/__init__.py b/erpnext/home/search_criteria/delivery_note_to_be_submitted/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/erpnext/home/search_criteria/delivery_note_to_be_submitted/delivery_note_to_be_submitted.txt b/erpnext/home/search_criteria/delivery_note_to_be_submitted/delivery_note_to_be_submitted.txt deleted file mode 100644 index 85fd7482950..00000000000 --- a/erpnext/home/search_criteria/delivery_note_to_be_submitted/delivery_note_to_be_submitted.txt +++ /dev/null @@ -1,33 +0,0 @@ -# Search Criteria, delivery_note-to_be_submitted -[ - - # These values are common in all dictionaries - { - 'creation': '2010-08-08 17:09:32', - 'docstatus': 0, - 'modified': '2010-05-13 17:17:58', - 'modified_by': 'Administrator', - 'owner': 'Administrator' - }, - - # These values are common for all Search Criteria - { - 'columns': 'Delivery Note\x01ID,Delivery Note\x01Owner,Delivery Note\x01Customer Name,Delivery Note\x01Posting Date,Delivery Note\x01Company', - 'criteria_name': 'Delivery Note-To be submitted', - 'doc_type': 'Delivery Note', - 'doctype': 'Search Criteria', - 'filters': "{'Delivery Note\x01Saved':1,'Delivery Note\x01Status':'Draft','Delivery Note\x01Fiscal Year':''}", - 'module': 'Home', - 'name': '__common__', - 'page_len': 50, - 'sort_by': '`tabDelivery Note`.`name`', - 'sort_order': 'DESC', - 'standard': 'Yes' - }, - - # Search Criteria, delivery_note-to_be_submitted - { - 'doctype': 'Search Criteria', - 'name': 'delivery_note-to_be_submitted' - } -] \ No newline at end of file diff --git a/erpnext/home/search_criteria/invoices_overdue/invoices_overdue.txt b/erpnext/home/search_criteria/invoices_overdue/invoices_overdue.txt index 671c8f8d958..d56d1ac0d2e 100644 --- a/erpnext/home/search_criteria/invoices_overdue/invoices_overdue.txt +++ b/erpnext/home/search_criteria/invoices_overdue/invoices_overdue.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 14:50:43', + 'creation': '2012-04-03 12:49:51', 'docstatus': 0, - 'modified': '2012-03-30 14:50:43', + 'modified': '2012-04-03 12:49:51', 'modified_by': u'Administrator', 'owner': u'Administrator' }, diff --git a/erpnext/home/search_criteria/invoices_to_be_submitted/invoices_to_be_submitted.txt b/erpnext/home/search_criteria/invoices_to_be_submitted/invoices_to_be_submitted.txt index 7029d85b815..79fe9b1da35 100644 --- a/erpnext/home/search_criteria/invoices_to_be_submitted/invoices_to_be_submitted.txt +++ b/erpnext/home/search_criteria/invoices_to_be_submitted/invoices_to_be_submitted.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 14:50:43', + 'creation': '2012-04-03 12:49:51', 'docstatus': 0, - 'modified': '2012-03-30 14:50:43', + 'modified': '2012-04-03 12:49:51', 'modified_by': u'Administrator', 'owner': u'Administrator' }, diff --git a/erpnext/home/search_criteria/invoices_to_receive_payment/invoices_to_receive_payment.txt b/erpnext/home/search_criteria/invoices_to_receive_payment/invoices_to_receive_payment.txt index 245e1e87fc9..de0c203d9cf 100644 --- a/erpnext/home/search_criteria/invoices_to_receive_payment/invoices_to_receive_payment.txt +++ b/erpnext/home/search_criteria/invoices_to_receive_payment/invoices_to_receive_payment.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 14:50:43', + 'creation': '2012-04-03 12:49:51', 'docstatus': 0, - 'modified': '2012-03-30 14:50:43', + 'modified': '2012-04-03 12:49:51', 'modified_by': u'Administrator', 'owner': u'Administrator' }, diff --git a/erpnext/home/search_criteria/lead_to_follow_up/lead_to_follow_up.txt b/erpnext/home/search_criteria/lead_to_follow_up/lead_to_follow_up.txt index a0a46bef6ac..6367859ac77 100644 --- a/erpnext/home/search_criteria/lead_to_follow_up/lead_to_follow_up.txt +++ b/erpnext/home/search_criteria/lead_to_follow_up/lead_to_follow_up.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 14:50:43', + 'creation': '2012-04-03 12:49:51', 'docstatus': 0, - 'modified': '2012-03-30 14:50:43', + 'modified': '2012-04-03 12:49:51', 'modified_by': u'Administrator', 'owner': u'Administrator' }, diff --git a/erpnext/home/search_criteria/purchase_order_to_be_billed/purchase_order_to_be_billed.txt b/erpnext/home/search_criteria/purchase_order_to_be_billed/purchase_order_to_be_billed.txt index a7b0a2eb69c..23ad2c9129c 100644 --- a/erpnext/home/search_criteria/purchase_order_to_be_billed/purchase_order_to_be_billed.txt +++ b/erpnext/home/search_criteria/purchase_order_to_be_billed/purchase_order_to_be_billed.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 13:33:32', + 'creation': '2012-04-03 12:49:52', 'docstatus': 0, - 'modified': '2012-03-30 13:33:32', + 'modified': '2012-04-03 12:49:52', 'modified_by': u'Administrator', 'owner': u'Administrator' }, diff --git a/erpnext/home/search_criteria/purchase_order_to_be_submitted/purchase_order_to_be_submitted.txt b/erpnext/home/search_criteria/purchase_order_to_be_submitted/purchase_order_to_be_submitted.txt index 0b79093e185..d3f144d19e8 100644 --- a/erpnext/home/search_criteria/purchase_order_to_be_submitted/purchase_order_to_be_submitted.txt +++ b/erpnext/home/search_criteria/purchase_order_to_be_submitted/purchase_order_to_be_submitted.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 13:33:32', + 'creation': '2012-04-03 12:49:52', 'docstatus': 0, - 'modified': '2012-03-30 13:33:32', + 'modified': '2012-04-03 12:49:52', 'modified_by': u'Administrator', 'owner': u'Administrator' }, diff --git a/erpnext/home/search_criteria/purchase_order_to_receive_items/purchase_order_to_receive_items.txt b/erpnext/home/search_criteria/purchase_order_to_receive_items/purchase_order_to_receive_items.txt index 7ee6c0db25e..153b05f8852 100644 --- a/erpnext/home/search_criteria/purchase_order_to_receive_items/purchase_order_to_receive_items.txt +++ b/erpnext/home/search_criteria/purchase_order_to_receive_items/purchase_order_to_receive_items.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 13:33:32', + 'creation': '2012-04-03 12:49:52', 'docstatus': 0, - 'modified': '2012-03-30 13:33:32', + 'modified': '2012-04-03 12:49:52', 'modified_by': u'Administrator', 'owner': u'Administrator' }, diff --git a/erpnext/home/search_criteria/sales_order_overdue/sales_order_overdue.txt b/erpnext/home/search_criteria/sales_order_overdue/sales_order_overdue.txt index 9122cdfbfea..5de39316d61 100644 --- a/erpnext/home/search_criteria/sales_order_overdue/sales_order_overdue.txt +++ b/erpnext/home/search_criteria/sales_order_overdue/sales_order_overdue.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 13:33:32', + 'creation': '2012-04-03 12:49:52', 'docstatus': 0, - 'modified': '2012-03-30 13:33:32', + 'modified': '2012-04-03 12:49:52', 'modified_by': u'Administrator', 'owner': u'Administrator' }, diff --git a/erpnext/home/search_criteria/sales_order_to_be_billed/sales_order_to_be_billed.txt b/erpnext/home/search_criteria/sales_order_to_be_billed/sales_order_to_be_billed.txt index 515688a4cc2..cbe8dbc21d4 100644 --- a/erpnext/home/search_criteria/sales_order_to_be_billed/sales_order_to_be_billed.txt +++ b/erpnext/home/search_criteria/sales_order_to_be_billed/sales_order_to_be_billed.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 14:50:44', + 'creation': '2012-04-03 12:49:52', 'docstatus': 0, - 'modified': '2012-03-30 14:50:44', + 'modified': '2012-04-03 12:49:52', 'modified_by': u'Administrator', 'owner': u'Administrator' }, diff --git a/erpnext/home/search_criteria/sales_order_to_be_delivered/sales_order_to_be_delivered.txt b/erpnext/home/search_criteria/sales_order_to_be_delivered/sales_order_to_be_delivered.txt index f46a031ef8b..2e859423778 100644 --- a/erpnext/home/search_criteria/sales_order_to_be_delivered/sales_order_to_be_delivered.txt +++ b/erpnext/home/search_criteria/sales_order_to_be_delivered/sales_order_to_be_delivered.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 14:50:44', + 'creation': '2012-04-03 12:49:52', 'docstatus': 0, - 'modified': '2012-03-30 14:50:44', + 'modified': '2012-04-03 12:49:52', 'modified_by': u'Administrator', 'owner': u'Administrator' }, diff --git a/erpnext/home/search_criteria/sales_order_to_be_submitted/sales_order_to_be_submitted.txt b/erpnext/home/search_criteria/sales_order_to_be_submitted/sales_order_to_be_submitted.txt index 80f25ae4455..fe5ea2f5061 100644 --- a/erpnext/home/search_criteria/sales_order_to_be_submitted/sales_order_to_be_submitted.txt +++ b/erpnext/home/search_criteria/sales_order_to_be_submitted/sales_order_to_be_submitted.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 14:50:44', + 'creation': '2012-04-03 12:49:52', 'docstatus': 0, - 'modified': '2012-03-30 14:50:44', + 'modified': '2012-04-03 12:49:52', 'modified_by': u'Administrator', 'owner': u'Administrator' }, diff --git a/erpnext/home/search_criteria/serial_no_amc_expiring_this_month/serial_no_amc_expiring_this_month.txt b/erpnext/home/search_criteria/serial_no_amc_expiring_this_month/serial_no_amc_expiring_this_month.txt index 14aaea0174e..db8f03d7cd8 100644 --- a/erpnext/home/search_criteria/serial_no_amc_expiring_this_month/serial_no_amc_expiring_this_month.txt +++ b/erpnext/home/search_criteria/serial_no_amc_expiring_this_month/serial_no_amc_expiring_this_month.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 14:50:44', + 'creation': '2012-04-03 12:49:52', 'docstatus': 0, - 'modified': '2012-03-30 14:50:44', + 'modified': '2012-04-03 12:49:52', 'modified_by': u'Administrator', 'owner': u'Administrator' }, diff --git a/erpnext/home/search_criteria/serial_no_warranty_expiring_this_month/serial_no_warranty_expiring_this_month.txt b/erpnext/home/search_criteria/serial_no_warranty_expiring_this_month/serial_no_warranty_expiring_this_month.txt index d0ba642b355..76cdeac2567 100644 --- a/erpnext/home/search_criteria/serial_no_warranty_expiring_this_month/serial_no_warranty_expiring_this_month.txt +++ b/erpnext/home/search_criteria/serial_no_warranty_expiring_this_month/serial_no_warranty_expiring_this_month.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 14:50:44', + 'creation': '2012-04-03 12:49:52', 'docstatus': 0, - 'modified': '2012-03-30 14:50:44', + 'modified': '2012-04-03 12:49:52', 'modified_by': u'Administrator', 'owner': u'Administrator' }, diff --git a/erpnext/home/search_criteria/task_open/task_open.txt b/erpnext/home/search_criteria/task_open/task_open.txt index 01a76b65d26..3794afc5df9 100644 --- a/erpnext/home/search_criteria/task_open/task_open.txt +++ b/erpnext/home/search_criteria/task_open/task_open.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 14:50:44', + 'creation': '2012-04-03 12:49:53', 'docstatus': 0, - 'modified': '2012-03-30 14:50:44', + 'modified': '2012-04-03 12:49:53', 'modified_by': u'Administrator', 'owner': u'Administrator' }, diff --git a/erpnext/hr/DocType Mapper/Appraisal Template-Appraisal/Appraisal Template-Appraisal.txt b/erpnext/hr/DocType Mapper/Appraisal Template-Appraisal/Appraisal Template-Appraisal.txt index 11fd209742c..ec2bd0696db 100644 --- a/erpnext/hr/DocType Mapper/Appraisal Template-Appraisal/Appraisal Template-Appraisal.txt +++ b/erpnext/hr/DocType Mapper/Appraisal Template-Appraisal/Appraisal Template-Appraisal.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2010-09-20 12:33:34', + 'creation': '2010-09-01 15:47:59', 'docstatus': 0, - 'modified': '2012-03-30 13:33:31', + 'modified': '2012-04-03 12:49:50', 'modified_by': u'Administrator', 'owner': u'ashwini@webnotestech.com' }, diff --git a/erpnext/hr/doctype/appraisal/appraisal.js b/erpnext/hr/doctype/appraisal/appraisal.js index 70b00a250b5..de9db7ffa22 100644 --- a/erpnext/hr/doctype/appraisal/appraisal.js +++ b/erpnext/hr/doctype/appraisal/appraisal.js @@ -60,7 +60,7 @@ cur_frm.cscript.employee = function(doc,cdt,cdn){ } } -cur_frm.cscript['Calculate Total Score'] = function(doc,cdt,cdn){ +cur_frm.cscript.calculate_total_score = function(doc,cdt,cdn){ //get_server_fields('calculate_total','','',doc,cdt,cdn,1); var val = getchildren('Appraisal Goal', doc.name, 'appraisal_details', doc.doctype); var total =0; @@ -71,7 +71,7 @@ cur_frm.cscript['Calculate Total Score'] = function(doc,cdt,cdn){ refresh_field('total_score') } -/*cur_frm.cscript['Declare Completed'] = function(doc,cdt,cdn){ +/*cur_frm.cscript.declare_completed = function(doc,cdt,cdn){ $c_obj(make_doclist(doc.doctype, doc.name),'declare_completed','', function(r,rt){ if(r.message){ refresh_field('Status'); @@ -80,7 +80,7 @@ cur_frm.cscript['Calculate Total Score'] = function(doc,cdt,cdn){ }); }*/ -cur_frm.cscript['Declare Completed'] = function(doc,cdt,cdn){ +cur_frm.cscript.declare_completed = function(doc,cdt,cdn){ var declare_completed_dialog; set_declare_completed_dialog = function() { diff --git a/erpnext/hr/doctype/attendance_control_panel/attendance_control_panel.js b/erpnext/hr/doctype/attendance_control_panel/attendance_control_panel.js index 6c141cc92e5..4c17982d724 100644 --- a/erpnext/hr/doctype/attendance_control_panel/attendance_control_panel.js +++ b/erpnext/hr/doctype/attendance_control_panel/attendance_control_panel.js @@ -26,7 +26,7 @@ cur_frm.cscript.onload = function(doc,cdt,cdn){ } //download attendance template - csv file -cur_frm.cscript['Get Template'] = function(doc,cdt,cdn){ +cur_frm.cscript.get_template = function(doc,cdt,cdn){ if(doc.att_to_date && !doc.att_fr_date) alert("Please enter 'Attendance To Date'"); @@ -37,7 +37,7 @@ cur_frm.cscript['Get Template'] = function(doc,cdt,cdn){ } //--------------------------------------------------------- -cur_frm.cscript['Import'] = function(doc,cdt,cdn){ +cur_frm.cscript.import = function(doc,cdt,cdn){ if(!doc.file_list){ alert("Please upload attendance data CSV file"); } diff --git a/erpnext/hr/doctype/expense_claim/expense_claim.js b/erpnext/hr/doctype/expense_claim/expense_claim.js index f9ce8bdfdb3..de83647981c 100644 --- a/erpnext/hr/doctype/expense_claim/expense_claim.js +++ b/erpnext/hr/doctype/expense_claim/expense_claim.js @@ -90,7 +90,7 @@ cur_frm.cscript.calculate_total = function(doc,cdt,cdn){ } } -cur_frm.cscript['Calculate Total Amount'] = function(doc,cdt,cdn){ +cur_frm.cscript.calculate_total_amount = function(doc,cdt,cdn){ cur_frm.cscript.calculate_total(doc,cdt,cdn); } cur_frm.cscript.claim_amount = function(doc,cdt,cdn){ @@ -102,7 +102,7 @@ cur_frm.cscript.sanctioned_amount = function(doc,cdt,cdn){ wn.require('erpnext/setup/doctype/notification_control/notification_control.js'); -cur_frm.cscript['Approve'] = function(doc,cdt,cdn){ +cur_frm.cscript.approve = function(doc,cdt,cdn){ if(user == doc.exp_approver){ var approve_voucher_dialog; @@ -171,7 +171,7 @@ cur_frm.cscript['Approve'] = function(doc,cdt,cdn){ } } -cur_frm.cscript['Reject'] = function(doc,cdt,cdn){ +cur_frm.cscript.reject = function(doc,cdt,cdn){ if(user == doc.exp_approver){ var reject_voucher_dialog; @@ -235,7 +235,7 @@ cur_frm.cscript['Reject'] = function(doc,cdt,cdn){ //update follow up //================================================================================= -cur_frm.cscript['Update Voucher'] = function(doc){ +cur_frm.cscript.update_voucher = function(doc){ $c_obj(make_doclist(doc.doctype, doc.name),'update_voucher','',function(r, rt){ refresh_field('expense_voucher_details'); diff --git a/erpnext/hr/doctype/it_checklist/it_checklist.js b/erpnext/hr/doctype/it_checklist/it_checklist.js index a97ae65e5d9..62993035f72 100644 --- a/erpnext/hr/doctype/it_checklist/it_checklist.js +++ b/erpnext/hr/doctype/it_checklist/it_checklist.js @@ -57,7 +57,7 @@ cur_frm.cscript.rent_acc = function(doc,cdt,cdn){ //--------------------------------------------------------- //On done button click check for all values filled or not, and accordingly add records in child tables -cur_frm.cscript['Done']=function(doc,cdt,cdn){ +cur_frm.cscript.done=function(doc,cdt,cdn){ var mydoc=doc; if(doc.employee && doc.fiscal_year && doc.metro && doc.sr_citizen && doc.part_sr_citizen && doc.basic && doc.gross_income){ diff --git a/erpnext/hr/doctype/salary_manager/salary_manager.js b/erpnext/hr/doctype/salary_manager/salary_manager.js index 91eac1a8767..d486110f1fc 100644 --- a/erpnext/hr/doctype/salary_manager/salary_manager.js +++ b/erpnext/hr/doctype/salary_manager/salary_manager.js @@ -23,7 +23,7 @@ var display_activity_log = function(msg) { //Create salary slip //----------------------- -cur_frm.cscript['Create Salary Slip'] = function(doc, cdt, cdn) { +cur_frm.cscript.create_salary_slip = function(doc, cdt, cdn) { var callback = function(r, rt){ if (r.message) display_activity_log(r.message); @@ -35,7 +35,7 @@ cur_frm.cscript['Create Salary Slip'] = function(doc, cdt, cdn) { //Submit salary slip //----------------------- -cur_frm.cscript['Submit Salary Slip'] = function(doc, cdt, cdn) { +cur_frm.cscript.submit_salary_slip = function(doc, cdt, cdn) { var check = confirm("Do you really want to Submit all Salary Slip for month : " + doc.month+" and fiscal year : "+doc.fiscal_year); if(check){ var callback = function(r, rt){ @@ -48,7 +48,7 @@ cur_frm.cscript['Submit Salary Slip'] = function(doc, cdt, cdn) { // Make Bank Voucher //----------------------- -cur_frm.cscript['Make Bank Voucher'] = function(doc,cdt,cdn){ +cur_frm.cscript.make_bank_voucher = function(doc,cdt,cdn){ if(doc.month && doc.fiscal_year){ cur_frm.cscript.make_jv(doc, cdt, cdn); } diff --git a/erpnext/hr/search_criteria/employee_appraisals/employee_appraisals.txt b/erpnext/hr/search_criteria/employee_appraisals/employee_appraisals.txt index 5bc5289ec70..c3387704eb8 100644 --- a/erpnext/hr/search_criteria/employee_appraisals/employee_appraisals.txt +++ b/erpnext/hr/search_criteria/employee_appraisals/employee_appraisals.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 13:33:31', + 'creation': '2012-04-03 12:49:51', 'docstatus': 0, - 'modified': '2012-03-30 13:33:31', + 'modified': '2012-04-03 12:49:51', 'modified_by': u'Administrator', 'owner': u'ashwini@webnotestech.com' }, diff --git a/erpnext/hr/search_criteria/employee_information/employee_information.txt b/erpnext/hr/search_criteria/employee_information/employee_information.txt index 9934f771d9e..84cb448f67e 100644 --- a/erpnext/hr/search_criteria/employee_information/employee_information.txt +++ b/erpnext/hr/search_criteria/employee_information/employee_information.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 13:33:32', + 'creation': '2012-04-03 12:49:51', 'docstatus': 0, - 'modified': '2012-03-30 13:33:32', + 'modified': '2012-04-03 12:49:51', 'modified_by': u'Administrator', 'owner': u'harshada@webnotestech.com' }, diff --git a/erpnext/hr/search_criteria/employees_birthday/employees_birthday.txt b/erpnext/hr/search_criteria/employees_birthday/employees_birthday.txt index 965d05afda9..42cfff2bd29 100644 --- a/erpnext/hr/search_criteria/employees_birthday/employees_birthday.txt +++ b/erpnext/hr/search_criteria/employees_birthday/employees_birthday.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 13:33:31', + 'creation': '2012-04-03 12:49:51', 'docstatus': 0, - 'modified': '2012-03-30 13:33:31', + 'modified': '2012-04-03 12:49:51', 'modified_by': u'Administrator', 'owner': u'Administrator' }, diff --git a/erpnext/hr/search_criteria/employeewise_leave_transaction_details/employeewise_leave_transaction_details.txt b/erpnext/hr/search_criteria/employeewise_leave_transaction_details/employeewise_leave_transaction_details.txt index 5a0447956a5..8cea5934ffc 100644 --- a/erpnext/hr/search_criteria/employeewise_leave_transaction_details/employeewise_leave_transaction_details.txt +++ b/erpnext/hr/search_criteria/employeewise_leave_transaction_details/employeewise_leave_transaction_details.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 13:33:31', + 'creation': '2012-04-03 12:49:51', 'docstatus': 0, - 'modified': '2012-03-30 13:33:31', + 'modified': '2012-04-03 12:49:51', 'modified_by': u'Administrator', 'owner': u'Administrator' }, diff --git a/erpnext/hr/search_criteria/monthly_attendance_details/monthly_attendance_details.txt b/erpnext/hr/search_criteria/monthly_attendance_details/monthly_attendance_details.txt index 9ad2e9943dc..64a0eb2a38e 100644 --- a/erpnext/hr/search_criteria/monthly_attendance_details/monthly_attendance_details.txt +++ b/erpnext/hr/search_criteria/monthly_attendance_details/monthly_attendance_details.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 14:50:43', + 'creation': '2012-04-03 12:49:51', 'docstatus': 0, - 'modified': '2012-03-30 14:50:43', + 'modified': '2012-04-03 12:49:51', 'modified_by': u'Administrator', 'owner': u'harshada@webnotestech.com' }, diff --git a/erpnext/hr/search_criteria/monthly_salary_register/monthly_salary_register.txt b/erpnext/hr/search_criteria/monthly_salary_register/monthly_salary_register.txt index e829f647378..4df2a0f6f70 100644 --- a/erpnext/hr/search_criteria/monthly_salary_register/monthly_salary_register.txt +++ b/erpnext/hr/search_criteria/monthly_salary_register/monthly_salary_register.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 14:50:44', + 'creation': '2012-04-03 12:49:51', 'docstatus': 0, - 'modified': '2012-03-30 14:50:44', + 'modified': '2012-04-03 12:49:51', 'modified_by': u'Administrator', 'owner': u'Administrator' }, diff --git a/erpnext/hr/search_criteria/new_or_left_employees_for_a_month/new_or_left_employees_for_a_month.txt b/erpnext/hr/search_criteria/new_or_left_employees_for_a_month/new_or_left_employees_for_a_month.txt index b8d0171da9e..eee5bfa8d47 100644 --- a/erpnext/hr/search_criteria/new_or_left_employees_for_a_month/new_or_left_employees_for_a_month.txt +++ b/erpnext/hr/search_criteria/new_or_left_employees_for_a_month/new_or_left_employees_for_a_month.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 14:50:44', + 'creation': '2012-04-03 12:49:51', 'docstatus': 0, - 'modified': '2012-03-30 14:50:44', + 'modified': '2012-04-03 12:49:51', 'modified_by': u'Administrator', 'owner': u'harshada@webnotestech.com' }, diff --git a/erpnext/hr/search_criteria/pending_appraisals/pending_appraisals.txt b/erpnext/hr/search_criteria/pending_appraisals/pending_appraisals.txt index cf22c7a216a..b62b452748f 100644 --- a/erpnext/hr/search_criteria/pending_appraisals/pending_appraisals.txt +++ b/erpnext/hr/search_criteria/pending_appraisals/pending_appraisals.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 14:50:44', + 'creation': '2012-04-03 12:49:51', 'docstatus': 0, - 'modified': '2012-03-30 14:50:44', + 'modified': '2012-04-03 12:49:51', 'modified_by': u'Administrator', 'owner': u'ashwini@webnotestech.com' }, diff --git a/erpnext/hr/search_criteria/salary_register/salary_register.txt b/erpnext/hr/search_criteria/salary_register/salary_register.txt index e7f33f03abc..700423b68f7 100644 --- a/erpnext/hr/search_criteria/salary_register/salary_register.txt +++ b/erpnext/hr/search_criteria/salary_register/salary_register.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 13:33:32', + 'creation': '2012-04-03 12:49:52', 'docstatus': 0, - 'modified': '2012-03-30 13:33:32', + 'modified': '2012-04-03 12:49:52', 'modified_by': u'Administrator', 'owner': u'harshada@webnotestech.com' }, diff --git a/erpnext/hr/search_criteria/salary_slips/salary_slips.txt b/erpnext/hr/search_criteria/salary_slips/salary_slips.txt index 960b226bdc9..9951896d585 100644 --- a/erpnext/hr/search_criteria/salary_slips/salary_slips.txt +++ b/erpnext/hr/search_criteria/salary_slips/salary_slips.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 13:33:32', + 'creation': '2012-04-03 12:49:52', 'docstatus': 0, - 'modified': '2012-03-30 13:33:32', + 'modified': '2012-04-03 12:49:52', 'modified_by': u'Administrator', 'owner': u'Administrator' }, diff --git a/erpnext/hr/search_criteria/salary_structure_details/salary_structure_details.txt b/erpnext/hr/search_criteria/salary_structure_details/salary_structure_details.txt index 1b726568d42..a0e343899dd 100644 --- a/erpnext/hr/search_criteria/salary_structure_details/salary_structure_details.txt +++ b/erpnext/hr/search_criteria/salary_structure_details/salary_structure_details.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 14:50:44', + 'creation': '2012-04-03 12:49:52', 'docstatus': 0, - 'modified': '2012-03-30 14:50:44', + 'modified': '2012-04-03 12:49:52', 'modified_by': u'Administrator', 'owner': u'Administrator' }, diff --git a/erpnext/patches/jan_mar_2012/rename_dt.py b/erpnext/patches/jan_mar_2012/rename_dt.py index 298459941d1..5d5e1bf9805 100644 --- a/erpnext/patches/jan_mar_2012/rename_dt.py +++ b/erpnext/patches/jan_mar_2012/rename_dt.py @@ -7,12 +7,13 @@ from webnotes.modules import reload_doc from webnotes.utils import make_esc import os -def execute1(): - rendt = get_dt_to_be_renamed() - rename_dt_files(rendt) - #update_local_file_system() - def execute(): + #rendt = get_dt_to_be_renamed() + #rename_dt_files(rendt) + #update_local_file_system() + replace_labels_with_fieldnames() + +def execute1(): # delete dt, mapper delete_dt_and_mapper() @@ -47,11 +48,10 @@ def execute(): mod = '_'.join(webnotes.conn.sql("select module from `tabDocType Mapper` where name = %s", ren_mapper[d])[0][0].lower().split()) reload_doc(mod, 'DocType Mapper', ren_mapper[d]) - webnotes.conn.sql("DELETE FROM `tabSearch Criteria` WHERE name=''") - webnotes.conn.sql("""UPDATE `tabSearch Criteria` SET standard='No' - WHERE name IN ('appraisal_custom', 'bills-to_be_paid', + webnotes.conn.sql("""DELETE FROM `tabSearch Criteria` + WHERE name IN ('', 'bills-to_be_paid', 'bills-to_be_submitted', 'cenvat_credit_-_input_or_capital_goods', - 'custom_test', 'custom_test1', 'delivery_note-to_be_billed', + 'appraisal_custom', 'custom_test', 'custom_test1', 'delivery_note-to_be_billed', 'delivery_note-to_be_submitted', 'delivery_notes', 'employee_leave_balance_report', 'flat_bom_report', 'general_ledger1', 'lead_interested', @@ -59,7 +59,13 @@ def execute(): 'projectwise_delivered_qty_and_costs_as_per_purchase_cost', 'projectwise_pending_qty_and_costs_as_per_purchase_cost', 'sales', 'sales_order1', 'sales_order_pending_items', - 'territory_wise_sales_-_target_vs_actual_', 'test_report')""") + 'territory_wise_sales_-_target_vs_actual_', 'test_report', + 'lease_agreement_list', 'lease_monthly_future_installment_inflows', + 'lease_over_due_list', 'lease_overdue_age_wise', + 'lease_receipt_summary_month_wise', 'lease_receipts_client_wise', + 'lease_yearly_future_installment_inflows', + 'monthly_ledger_summary_report', 'payables_-_as_on_outstanding', + 'payment_report')""") # reload custom search criteria for d in webnotes.conn.sql("""select name, module from @@ -102,7 +108,16 @@ def delete_dt_and_mapper(): for d in del_mapper: delete_doc('DocType Mapper', d) - del_dt = ['Widget Control', 'Update Delivery Date Detail', 'Update Delivery Date', 'Tag Detail', 'Supplier rating', 'Stylesheet', 'Question Tag', 'PRO PP Detail', 'PRO Detail', 'PPW Detail', 'PF Detail', 'Personalize', 'Patch Util', 'Page Template', 'Module Def Role', 'Module Def Item', 'File Group', 'File Browser Control', 'File', 'Educational Qualifications', 'Earn Deduction Detail', 'DocType Property Setter', 'Contact Detail', 'BOM Report Detail', 'BOM Replace Utility Detail', 'BOM Replace Utility', 'Absent Days Detail', 'Activity Dashboard Control', 'Raw Materials Supplied', 'Setup Wizard Control', 'Company Group'] # docformat + del_dt = ['Widget Control', 'Update Delivery Date Detail', 'Update Delivery Date', + 'Tag Detail', 'Supplier rating', 'Stylesheet', 'Question Tag', + 'PRO PP Detail', 'PRO Detail', 'PPW Detail', 'PF Detail', + 'Personalize', 'Patch Util', 'Page Template', 'Module Def Role', + 'Module Def Item', 'File Group', 'File Browser Control', 'File', + 'Educational Qualifications', 'Earn Deduction Detail', + 'DocType Property Setter', 'Contact Detail', 'BOM Report Detail', + 'BOM Replace Utility Detail', 'BOM Replace Utility', + 'Absent Days Detail', 'Activity Dashboard Control', 'Raw Materials Supplied', + 'Setup Wizard Control', 'Company Group', 'Lease Agreement', 'Lease Installment'] # docformat for d in del_dt: delete_doc('DocType', d) @@ -347,3 +362,47 @@ def rename_mapper_files(ren_mapper): + ' ' + esc(path + ren_mapper[d] + '/' + ren_mapper[d] + '.txt')) print 'git mv ' + esc(path + ren_mapper[d] + '/'+ d + '.txt') + ' ' + esc(path + ren_mapper[d] + '/' + ren_mapper[d] + '.txt') + +def replace_labels_with_fieldnames(): + """ + This is used for replacing instances like cur_frm.cscript['LABEL'] with + cur_frm.cscript.FIELDNAME in js files + """ + doctype = {} + doctype.update(prepare_dict_of_label_fieldname('/var/www/erpnext/erpnext/')) + doctype.update(prepare_dict_of_label_fieldname('/var/www/erpnext/lib/py')) + #print doctype + + for doc in doctype: + label_fieldname = doctype[doc] + for d in label_fieldname: + #label = "cur_frm.cscript['%s']" % d + #fieldname = "cur_frm.cscript.%s" % label_fieldname[d] + label = d + fieldname = label_fieldname[d] + print colored('Changing... ' + doc + ': ' + label + ' --> '+ fieldname, 'yellow') + #res = replace_code('/var/www/erpnext/', label, fieldname, 'js') + res = replace_code('/var/www/erpnext/', label, fieldname, 'js', + 'hide_field\(.*%s' % label) + if res == 'skip': + break + +def prepare_dict_of_label_fieldname(module_path): + from webnotes.model.utils import peval_doclist + from webnotes.model.sync import get_file_path + doctype = {} + for path, folders, files in os.walk(module_path): + if path == module_path: + modules_list = folders + for f in files: + if f.endswith(".txt"): + rel_path = os.path.relpath(path, webnotes.defs.modules_path) + path_tuple = rel_path.split(os.sep) + if (len(path_tuple)==3 and path_tuple[0] in modules_list and + path_tuple[1] == 'doctype'): + file_name = f[:-4] + with open(get_file_path(path_tuple[0], file_name), 'r') as fn: + doclist = peval_doclist(fn.read()) + doctype[file_name] = dict(([d.get('label'),d.get('fieldname')] \ + for d in doclist if d.get('doctype')=='DocField')) + return doctype diff --git a/erpnext/production/doctype/production_planning_tool/production_planning_tool.js b/erpnext/production/doctype/production_planning_tool/production_planning_tool.js index 847f00a9096..11d6e44c10f 100644 --- a/erpnext/production/doctype/production_planning_tool/production_planning_tool.js +++ b/erpnext/production/doctype/production_planning_tool/production_planning_tool.js @@ -29,7 +29,7 @@ cur_frm.cscript.sales_order = function(doc,cdt,cdn) { } -cur_frm.cscript['Download Raw Material'] = function(doc, cdt, cdn) { +cur_frm.cscript.download_raw_material = function(doc, cdt, cdn) { var callback = function(r, rt){ if (r.message) $c_obj_csv(make_doclist(cdt, cdn), 'download_raw_materials', '', ''); diff --git a/erpnext/production/search_criteria/consumption_against_production/consumption_against_production.txt b/erpnext/production/search_criteria/consumption_against_production/consumption_against_production.txt index d4db609a806..54d6a193221 100644 --- a/erpnext/production/search_criteria/consumption_against_production/consumption_against_production.txt +++ b/erpnext/production/search_criteria/consumption_against_production/consumption_against_production.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 13:33:31', + 'creation': '2012-04-03 12:49:50', 'docstatus': 0, - 'modified': '2012-03-30 13:33:31', + 'modified': '2012-04-03 12:49:50', 'modified_by': u'Administrator', 'owner': u'jai@webnotestech.com' }, diff --git a/erpnext/production/search_criteria/delivery_plan/delivery_plan.txt b/erpnext/production/search_criteria/delivery_plan/delivery_plan.txt index 6f3d30fa3fe..5ea811ad332 100644 --- a/erpnext/production/search_criteria/delivery_plan/delivery_plan.txt +++ b/erpnext/production/search_criteria/delivery_plan/delivery_plan.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 14:50:43', + 'creation': '2012-04-03 12:49:51', 'docstatus': 0, - 'modified': '2012-03-30 14:50:43', + 'modified': '2012-04-03 12:49:51', 'modified_by': u'Administrator', 'owner': u'Administrator' }, diff --git a/erpnext/production/search_criteria/itemwise_production_report/itemwise_production_report.txt b/erpnext/production/search_criteria/itemwise_production_report/itemwise_production_report.txt index c5c726e6f95..6f0c3eb7813 100644 --- a/erpnext/production/search_criteria/itemwise_production_report/itemwise_production_report.txt +++ b/erpnext/production/search_criteria/itemwise_production_report/itemwise_production_report.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 14:50:43', + 'creation': '2012-04-03 12:49:51', 'docstatus': 0, - 'modified': '2012-03-30 14:50:43', + 'modified': '2012-04-03 12:49:51', 'modified_by': u'Administrator', 'owner': u'jai@webnotestech.com' }, diff --git a/erpnext/production/search_criteria/production_orders_in_process/production_orders_in_process.txt b/erpnext/production/search_criteria/production_orders_in_process/production_orders_in_process.txt index e831d004309..51eb1f47e69 100644 --- a/erpnext/production/search_criteria/production_orders_in_process/production_orders_in_process.txt +++ b/erpnext/production/search_criteria/production_orders_in_process/production_orders_in_process.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 13:33:32', + 'creation': '2012-04-03 12:49:52', 'docstatus': 0, - 'modified': '2012-03-30 13:33:32', + 'modified': '2012-04-03 12:49:52', 'modified_by': u'Administrator', 'owner': u'jai@webnotestech.com' }, diff --git a/erpnext/projects/doctype/project_activity/project_activity.js b/erpnext/projects/doctype/project_activity/project_activity.js index 02a6dbf8696..7da3976fe45 100644 --- a/erpnext/projects/doctype/project_activity/project_activity.js +++ b/erpnext/projects/doctype/project_activity/project_activity.js @@ -88,7 +88,7 @@ cur_frm.cscript.refresh = function(doc, dt, dn) { unhide_field(fl); } } -cur_frm.cscript['Add'] = function(doc, dt, dn) { +cur_frm.cscript.add = function(doc, dt, dn) { var callback = function(r,rt) { // refresh listing diff --git a/erpnext/projects/doctype/task/task.js b/erpnext/projects/doctype/task/task.js index 322b8a19c9b..c88382bf08f 100644 --- a/erpnext/projects/doctype/task/task.js +++ b/erpnext/projects/doctype/task/task.js @@ -44,7 +44,7 @@ cur_frm.cscript.onload = function(doc,cdt,cdn){ cur_frm.cscript.refresh = function(doc,cdt,cdn) { cur_frm.clear_custom_buttons(); if(doc.status == 'Pending Review' && (doc.senders_name == user_fullname || doc.senders_email == user)) { - cur_frm.add_custom_button('Declare Completed', cur_frm.cscript['Declare Completed']); + cur_frm.add_custom_button('Declare Completed', cur_frm.cscript.declare_completed); cur_frm.add_custom_button('Reopen Task', cur_frm.cscript['Reopen Task']); } if(doc.status == 'Open' && !doc.__islocal) { @@ -111,7 +111,7 @@ cur_frm.cscript['Cancel Task'] = function(){ }); } -cur_frm.cscript['Declare Completed'] = function(){ +cur_frm.cscript.declare_completed = function(){ $c_obj(make_doclist(cur_frm.doc.doctype, cur_frm.doc.name),'declare_completed', '',function(r, rt) { if(r.message == 'true'){ doc.status = 'Closed'; //for refresh diff --git a/erpnext/projects/search_criteria/dispatch_report/dispatch_report.txt b/erpnext/projects/search_criteria/dispatch_report/dispatch_report.txt index 0d52fab76c0..0927411be74 100644 --- a/erpnext/projects/search_criteria/dispatch_report/dispatch_report.txt +++ b/erpnext/projects/search_criteria/dispatch_report/dispatch_report.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 13:33:31', + 'creation': '2012-04-03 12:49:51', 'docstatus': 0, - 'modified': '2012-03-30 13:33:31', + 'modified': '2012-04-03 12:49:51', 'modified_by': u'Administrator', 'owner': u'ashwini@webnotestech.com' }, diff --git a/erpnext/projects/search_criteria/projectwise_delivered_qty_and_costs/projectwise_delivered_qty_and_costs.txt b/erpnext/projects/search_criteria/projectwise_delivered_qty_and_costs/projectwise_delivered_qty_and_costs.txt index d45bd1010f0..e4143ba9bb1 100644 --- a/erpnext/projects/search_criteria/projectwise_delivered_qty_and_costs/projectwise_delivered_qty_and_costs.txt +++ b/erpnext/projects/search_criteria/projectwise_delivered_qty_and_costs/projectwise_delivered_qty_and_costs.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 14:50:44', + 'creation': '2012-04-03 12:49:52', 'docstatus': 0, - 'modified': '2012-03-30 14:50:44', + 'modified': '2012-04-03 12:49:52', 'modified_by': u'Administrator', 'owner': u'harshada@webnotestech.com' }, diff --git a/erpnext/projects/search_criteria/projectwise_pending_qty_and_costs/projectwise_pending_qty_and_costs.txt b/erpnext/projects/search_criteria/projectwise_pending_qty_and_costs/projectwise_pending_qty_and_costs.txt index 05807a36d95..e79520279c5 100644 --- a/erpnext/projects/search_criteria/projectwise_pending_qty_and_costs/projectwise_pending_qty_and_costs.txt +++ b/erpnext/projects/search_criteria/projectwise_pending_qty_and_costs/projectwise_pending_qty_and_costs.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 13:33:32', + 'creation': '2012-04-03 12:49:52', 'docstatus': 0, - 'modified': '2012-03-30 13:33:32', + 'modified': '2012-04-03 12:49:52', 'modified_by': u'Administrator', 'owner': u'ashwini@webnotestech.com' }, diff --git a/erpnext/projects/search_criteria/projectwise_purchase_details/projectwise_purchase_details.txt b/erpnext/projects/search_criteria/projectwise_purchase_details/projectwise_purchase_details.txt index c09a9e97c9e..4a11bac76f8 100644 --- a/erpnext/projects/search_criteria/projectwise_purchase_details/projectwise_purchase_details.txt +++ b/erpnext/projects/search_criteria/projectwise_purchase_details/projectwise_purchase_details.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 13:33:32', + 'creation': '2012-04-03 12:49:52', 'docstatus': 0, - 'modified': '2012-03-30 13:33:32', + 'modified': '2012-04-03 12:49:52', 'modified_by': u'Administrator', 'owner': u'ashwini@webnotestech.com' }, diff --git a/erpnext/projects/search_criteria/projectwise_sales_details/projectwise_sales_details.txt b/erpnext/projects/search_criteria/projectwise_sales_details/projectwise_sales_details.txt index c884739b24a..0ecb1be2853 100644 --- a/erpnext/projects/search_criteria/projectwise_sales_details/projectwise_sales_details.txt +++ b/erpnext/projects/search_criteria/projectwise_sales_details/projectwise_sales_details.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 13:33:32', + 'creation': '2012-04-03 12:49:52', 'docstatus': 0, - 'modified': '2012-03-30 13:33:32', + 'modified': '2012-04-03 12:49:52', 'modified_by': u'Administrator', 'owner': u'harshada@webnotestech.com' }, diff --git a/erpnext/projects/search_criteria/projectwise_sales_orders/projectwise_sales_orders.txt b/erpnext/projects/search_criteria/projectwise_sales_orders/projectwise_sales_orders.txt index c009cdd1e0b..c36a3261862 100644 --- a/erpnext/projects/search_criteria/projectwise_sales_orders/projectwise_sales_orders.txt +++ b/erpnext/projects/search_criteria/projectwise_sales_orders/projectwise_sales_orders.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 13:33:32', + 'creation': '2012-04-03 12:49:52', 'docstatus': 0, - 'modified': '2012-03-30 13:33:32', + 'modified': '2012-04-03 12:49:52', 'modified_by': u'Administrator', 'owner': u'harshada@webnotestech.com' }, diff --git a/erpnext/projects/search_criteria/timesheet_report/timesheet_report.txt b/erpnext/projects/search_criteria/timesheet_report/timesheet_report.txt index b7580eb7cc2..64586eba7db 100644 --- a/erpnext/projects/search_criteria/timesheet_report/timesheet_report.txt +++ b/erpnext/projects/search_criteria/timesheet_report/timesheet_report.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 14:50:44', + 'creation': '2012-04-03 12:49:53', 'docstatus': 0, - 'modified': '2012-03-30 14:50:44', + 'modified': '2012-04-03 12:49:53', 'modified_by': u'Administrator', 'owner': u'ashwini@webnotestech.com' }, diff --git a/erpnext/selling/DocType Mapper/Lead-Opportunity/Lead-Opportunity.txt b/erpnext/selling/DocType Mapper/Lead-Opportunity/Lead-Opportunity.txt index dbedbf7bdbb..ff4a9254aaf 100644 --- a/erpnext/selling/DocType Mapper/Lead-Opportunity/Lead-Opportunity.txt +++ b/erpnext/selling/DocType Mapper/Lead-Opportunity/Lead-Opportunity.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2010-09-20 12:33:34', + 'creation': '2010-08-08 17:09:34', 'docstatus': 0, - 'modified': '2012-03-30 13:33:31', + 'modified': '2012-04-03 12:49:50', 'modified_by': u'Administrator', 'owner': u'Administrator' }, diff --git a/erpnext/selling/DocType Mapper/Opportunity-Quotation/Opportunity-Quotation.txt b/erpnext/selling/DocType Mapper/Opportunity-Quotation/Opportunity-Quotation.txt index 726b1a18af7..18543e874e2 100644 --- a/erpnext/selling/DocType Mapper/Opportunity-Quotation/Opportunity-Quotation.txt +++ b/erpnext/selling/DocType Mapper/Opportunity-Quotation/Opportunity-Quotation.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2010-09-20 12:33:34', + 'creation': '2010-08-08 17:09:34', 'docstatus': 0, - 'modified': '2012-03-30 13:33:31', + 'modified': '2012-04-03 12:49:50', 'modified_by': u'Administrator', 'owner': u'Administrator' }, diff --git a/erpnext/selling/doctype/installation_note/installation_note.js b/erpnext/selling/doctype/installation_note/installation_note.js index 36c2fa9e9ec..44f6ac8bf90 100644 --- a/erpnext/selling/doctype/installation_note/installation_note.js +++ b/erpnext/selling/doctype/installation_note/installation_note.js @@ -42,7 +42,7 @@ cur_frm.fields_dict['territory'].get_query = function(doc,cdt,cdn) { return 'SELECT `tabTerritory`.`name`,`tabTerritory`.`parent_territory` FROM `tabTerritory` WHERE `tabTerritory`.`is_group` = "No" AND `tabTerritory`.`docstatus`!= 2 AND `tabTerritory`.%(key)s LIKE "%s" ORDER BY `tabTerritory`.`name` ASC LIMIT 50'; } -cur_frm.cscript['Get Items'] = function(doc, dt, dn) { +cur_frm.cscript.get_items = function(doc, dt, dn) { var callback = function(r,rt) { unhide_field(['customer_address','contact_person','customer_name','address_display','contact_display','contact_mobile','contact_email','territory','customer_group']); cur_frm.refresh(); diff --git a/erpnext/selling/doctype/lead/lead.js b/erpnext/selling/doctype/lead/lead.js index 73f5af87f29..bd2c88fcfba 100644 --- a/erpnext/selling/doctype/lead/lead.js +++ b/erpnext/selling/doctype/lead/lead.js @@ -41,7 +41,7 @@ cur_frm.cscript.refresh = function(doc, cdt, cdn) { if(!doc.__islocal && !in_list(['Converted', 'Lead Lost'], doc.status)) { cur_frm.add_custom_button('Create Customer', cur_frm.cscript['Create Customer']); cur_frm.add_custom_button('Create Opportunity', cur_frm.cscript['Create Opportunity']); - cur_frm.add_custom_button('Send SMS', cur_frm.cscript['Send SMS']); + cur_frm.add_custom_button('Send SMS', cur_frm.cscript.send_sms); } } @@ -122,7 +122,7 @@ cur_frm.cscript['Create Customer'] = function(){ // send email // =============================================================== -cur_frm.cscript['Send Email'] = function(doc,cdt,cdn){ +cur_frm.cscript.send_email = function(doc,cdt,cdn){ if(doc.__islocal != 1){ $c_obj(make_doclist(doc.doctype, doc.name),'send_mail','',function(r,rt){}); }else{ diff --git a/erpnext/selling/doctype/opportunity/opportunity.js b/erpnext/selling/doctype/opportunity/opportunity.js index 545dcd25927..6e6fbd333af 100644 --- a/erpnext/selling/doctype/opportunity/opportunity.js +++ b/erpnext/selling/doctype/opportunity/opportunity.js @@ -34,7 +34,7 @@ cur_frm.cscript.refresh = function(doc, cdt, cdn){ if(doc.docstatus == 1) { cur_frm.add_custom_button('Create Quotation', cur_frm.cscript['Create Quotation']); cur_frm.add_custom_button('Opportunity Lost', cur_frm.cscript['Declare Opportunity Lost']); - cur_frm.add_custom_button('Send SMS', cur_frm.cscript['Send SMS']); + cur_frm.add_custom_button('Send SMS', cur_frm.cscript.send_sms); } //cur_frm.cscript.clear_values(doc,cdt,cdn); diff --git a/erpnext/selling/doctype/quotation/quotation.js b/erpnext/selling/doctype/quotation/quotation.js index c1942484f8e..a589a32ffb8 100644 --- a/erpnext/selling/doctype/quotation/quotation.js +++ b/erpnext/selling/doctype/quotation/quotation.js @@ -88,7 +88,7 @@ cur_frm.cscript.refresh = function(doc, cdt, cdn) { if(doc.docstatus == 1 && doc.status!='Order Lost') { cur_frm.add_custom_button('Make Sales Order', cur_frm.cscript['Make Sales Order']); cur_frm.add_custom_button('Set as Lost', cur_frm.cscript['Declare Order Lost']); - cur_frm.add_custom_button('Send SMS', cur_frm.cscript['Send SMS']); + cur_frm.add_custom_button('Send SMS', cur_frm.cscript.send_sms); } if (!doc.docstatus) hide_field(['Update Communication Log']); @@ -178,7 +178,7 @@ cur_frm.cscript['Make Sales Order'] = function() { } //pull enquiry details -cur_frm.cscript['Pull Opportunity Detail'] = function(doc,cdt,cdn){ +cur_frm.cscript.pull_enquiry_detail = function(doc,cdt,cdn){ var callback = function(r,rt){ if(r.message){ @@ -292,7 +292,7 @@ cur_frm.cscript.quot_to_validate = function(doc,cdt,cdn){ //===================validation function ================================= cur_frm.cscript.validate = function(doc,cdt,cdn){ - cur_frm.cscript['Re-Calculate Values'](doc, cdt, cdn); + cur_frm.cscript.recalculate_values(doc, cdt, cdn); cur_frm.cscript.quot_to_validate(doc,cdt,cdn); } diff --git a/erpnext/selling/doctype/sales_common/sales_common.js b/erpnext/selling/doctype/sales_common/sales_common.js index 4cd5d511ff5..fd043af011b 100644 --- a/erpnext/selling/doctype/sales_common/sales_common.js +++ b/erpnext/selling/doctype/sales_common/sales_common.js @@ -363,8 +363,8 @@ cur_frm.fields_dict.charge.get_query = function(doc) { } // ********************* Get Charges **************************** -cur_frm.cscript['Get Taxes and Charges'] = function(doc, cdt, cdn) { - $c_obj(make_doclist(doc.doctype,doc.name),'get_other_charges','', function(r, rt) { cur_frm.cscript['Calculate Taxes and Charges'](doc, cdt, cdn);}); +cur_frm.cscript.get_charges = function(doc, cdt, cdn) { + $c_obj(make_doclist(doc.doctype,doc.name),'get_other_charges','', function(r, rt) { cur_frm.cscript.calculate_charges(doc, cdt, cdn);}); } @@ -739,11 +739,11 @@ cur_frm.cscript.get_item_wise_tax_detail = function( doc, rate, cl, i, tax, t) { // **************** RE-CALCULATE VALUES *************************** -cur_frm.cscript['Re-Calculate Values'] = function(doc, cdt, cdn) { - cur_frm.cscript['Calculate Taxes and Charges'](doc,cdt,cdn); +cur_frm.cscript.recalculate_values = function(doc, cdt, cdn) { + cur_frm.cscript.calculate_charges(doc,cdt,cdn); } -cur_frm.cscript['Calculate Taxes and Charges'] = function(doc, cdt, cdn) { +cur_frm.cscript.calculate_charges = function(doc, cdt, cdn) { var other_fname = cur_frm.cscript.other_fname; var cl = getchildren('Sales Taxes and Charges', doc.name, other_fname, doc.doctype); @@ -828,7 +828,7 @@ cur_frm.cscript.validate = function(doc, cdt, cdn) { validated = false; } } - cur_frm.cscript['Calculate Taxes and Charges'] (doc, cdt, cdn); + cur_frm.cscript.calculate_charges (doc, cdt, cdn); if (cur_frm.cscript.calc_adjustment_amount) cur_frm.cscript.calc_adjustment_amount(doc); } diff --git a/erpnext/selling/doctype/sales_order/sales_order.js b/erpnext/selling/doctype/sales_order/sales_order.js index d3d89d32535..1fe5fe1496b 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.js +++ b/erpnext/selling/doctype/sales_order/sales_order.js @@ -64,14 +64,14 @@ cur_frm.cscript.refresh = function(doc, cdt, cdn) { if(doc.docstatus==1) { if(doc.status != 'Stopped') { - cur_frm.add_custom_button('Send SMS', cur_frm.cscript['Send SMS']); + cur_frm.add_custom_button('Send SMS', cur_frm.cscript.send_sms); // delivery note if(doc.per_delivered < 100 && doc.order_type!='Maintenance') cur_frm.add_custom_button('Make Delivery', cur_frm.cscript['Make Delivery Note']); // maintenance if(doc.per_delivered < 100 && doc.order_type=='Maintenance') { - cur_frm.add_custom_button('Make Maint. Visit', cur_frm.cscript['Make Maintenance Visit']); + cur_frm.add_custom_button('Make Maint. Visit', cur_frm.cscript.make_maintenance_visit); cur_frm.add_custom_button('Make Maint. Schedule', cur_frm.cscript['Make Maintenance Schedule']); } @@ -135,7 +135,7 @@ cur_frm.fields_dict['contact_person'].get_query = function(doc, cdt, cdn) { return 'SELECT name,CONCAT(first_name," ",ifnull(last_name,"")) As FullName,department,designation FROM tabContact WHERE customer = "'+ doc.customer +'" AND docstatus != 2 AND name LIKE "%s" ORDER BY name ASC LIMIT 50'; } -cur_frm.cscript['Pull Quotation Items'] = function(doc,dt,dn) { +cur_frm.cscript.pull_quotation_details = function(doc,dt,dn) { var callback = function(r,rt){ var doc = locals[cur_frm.doctype][cur_frm.docname]; if(r.message){ @@ -233,7 +233,7 @@ cur_frm.cscript['Make Maintenance Schedule'] = function() { } //------------ make maintenance visit ------------ -cur_frm.cscript['Make Maintenance Visit'] = function() { +cur_frm.cscript.make_maintenance_visit = function() { var doc = cur_frm.doc; if (doc.docstatus == 1) { diff --git a/erpnext/selling/search_criteria/customer_address_contact/customer_address_contact.txt b/erpnext/selling/search_criteria/customer_address_contact/customer_address_contact.txt index ecba9f2c0b0..52d6d63f3c5 100644 --- a/erpnext/selling/search_criteria/customer_address_contact/customer_address_contact.txt +++ b/erpnext/selling/search_criteria/customer_address_contact/customer_address_contact.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 13:33:31', + 'creation': '2012-04-03 12:49:51', 'docstatus': 0, - 'modified': '2012-03-30 13:33:31', + 'modified': '2012-04-03 12:49:51', 'modified_by': u'Administrator', 'owner': u'Administrator' }, diff --git a/erpnext/selling/search_criteria/delivered_items_to_be_install/delivered_items_to_be_install.txt b/erpnext/selling/search_criteria/delivered_items_to_be_install/delivered_items_to_be_install.txt index 21426179c62..b3d2359beee 100644 --- a/erpnext/selling/search_criteria/delivered_items_to_be_install/delivered_items_to_be_install.txt +++ b/erpnext/selling/search_criteria/delivered_items_to_be_install/delivered_items_to_be_install.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 13:33:31', + 'creation': '2012-04-03 12:49:51', 'docstatus': 0, - 'modified': '2012-03-30 13:33:31', + 'modified': '2012-04-03 12:49:51', 'modified_by': u'Administrator', 'owner': u'Administrator' }, diff --git a/erpnext/selling/search_criteria/delivery_note_itemwise_pending_to_bill/delivery_note_itemwise_pending_to_bill.txt b/erpnext/selling/search_criteria/delivery_note_itemwise_pending_to_bill/delivery_note_itemwise_pending_to_bill.txt index 72973ad46a7..762aa9ec304 100644 --- a/erpnext/selling/search_criteria/delivery_note_itemwise_pending_to_bill/delivery_note_itemwise_pending_to_bill.txt +++ b/erpnext/selling/search_criteria/delivery_note_itemwise_pending_to_bill/delivery_note_itemwise_pending_to_bill.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 13:33:31', + 'creation': '2012-04-03 12:49:51', 'docstatus': 0, - 'modified': '2012-03-30 13:33:31', + 'modified': '2012-04-03 12:49:51', 'modified_by': u'Administrator', 'owner': u'jai@webnotestech.com' }, diff --git a/erpnext/selling/search_criteria/follow_up_report/follow_up_report.txt b/erpnext/selling/search_criteria/follow_up_report/follow_up_report.txt index d4ab9bf9766..56b547ff11b 100644 --- a/erpnext/selling/search_criteria/follow_up_report/follow_up_report.txt +++ b/erpnext/selling/search_criteria/follow_up_report/follow_up_report.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 13:33:32', + 'creation': '2012-04-03 12:49:51', 'docstatus': 0, - 'modified': '2012-03-30 13:33:32', + 'modified': '2012-04-03 12:49:51', 'modified_by': u'Administrator', 'owner': u'ashwini@webnotestech.com' }, diff --git a/erpnext/selling/search_criteria/gross_profit/gross_profit.txt b/erpnext/selling/search_criteria/gross_profit/gross_profit.txt index 7e6b71f243b..b98ced61981 100644 --- a/erpnext/selling/search_criteria/gross_profit/gross_profit.txt +++ b/erpnext/selling/search_criteria/gross_profit/gross_profit.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 14:50:43', + 'creation': '2012-04-03 12:49:51', 'docstatus': 0, - 'modified': '2012-03-30 14:50:43', + 'modified': '2012-04-03 12:49:51', 'modified_by': u'Administrator', 'owner': u'Administrator' }, diff --git a/erpnext/selling/search_criteria/itemwise_delivery_details/itemwise_delivery_details.txt b/erpnext/selling/search_criteria/itemwise_delivery_details/itemwise_delivery_details.txt index 8c636096df0..894aeee1308 100644 --- a/erpnext/selling/search_criteria/itemwise_delivery_details/itemwise_delivery_details.txt +++ b/erpnext/selling/search_criteria/itemwise_delivery_details/itemwise_delivery_details.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 14:50:43', + 'creation': '2012-04-03 12:49:51', 'docstatus': 0, - 'modified': '2012-03-30 14:50:43', + 'modified': '2012-04-03 12:49:51', 'modified_by': u'Administrator', 'owner': u'Administrator' }, diff --git a/erpnext/selling/search_criteria/itemwise_sales_details/itemwise_sales_details.txt b/erpnext/selling/search_criteria/itemwise_sales_details/itemwise_sales_details.txt index 42ef2a7fc70..3566ea99a61 100644 --- a/erpnext/selling/search_criteria/itemwise_sales_details/itemwise_sales_details.txt +++ b/erpnext/selling/search_criteria/itemwise_sales_details/itemwise_sales_details.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 14:50:43', + 'creation': '2012-04-03 12:49:51', 'docstatus': 0, - 'modified': '2012-03-30 14:50:43', + 'modified': '2012-04-03 12:49:51', 'modified_by': u'Administrator', 'owner': u'Administrator' }, diff --git a/erpnext/selling/search_criteria/monthly_despatched_trend/monthly_despatched_trend.txt b/erpnext/selling/search_criteria/monthly_despatched_trend/monthly_despatched_trend.txt index 5fb0a532dc7..22717c60616 100644 --- a/erpnext/selling/search_criteria/monthly_despatched_trend/monthly_despatched_trend.txt +++ b/erpnext/selling/search_criteria/monthly_despatched_trend/monthly_despatched_trend.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 14:50:43', + 'creation': '2012-04-03 12:49:51', 'docstatus': 0, - 'modified': '2012-03-30 14:50:43', + 'modified': '2012-04-03 12:49:51', 'modified_by': u'Administrator', 'owner': u'Administrator' }, diff --git a/erpnext/selling/search_criteria/sales_orderwise_booking_&_delivery_summary/sales_orderwise_booking_&_delivery_summary.txt b/erpnext/selling/search_criteria/sales_orderwise_booking_&_delivery_summary/sales_orderwise_booking_&_delivery_summary.txt index 669bb63725f..fa03e9fe263 100644 --- a/erpnext/selling/search_criteria/sales_orderwise_booking_&_delivery_summary/sales_orderwise_booking_&_delivery_summary.txt +++ b/erpnext/selling/search_criteria/sales_orderwise_booking_&_delivery_summary/sales_orderwise_booking_&_delivery_summary.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 14:50:44', + 'creation': '2012-04-03 12:49:52', 'docstatus': 0, - 'modified': '2012-03-30 14:50:44', + 'modified': '2012-04-03 12:49:52', 'modified_by': u'Administrator', 'owner': u'Administrator' }, diff --git a/erpnext/selling/search_criteria/sales_orderwise_pending_amount_to_bill/sales_orderwise_pending_amount_to_bill.txt b/erpnext/selling/search_criteria/sales_orderwise_pending_amount_to_bill/sales_orderwise_pending_amount_to_bill.txt index 936309a6d03..6b61745d46a 100644 --- a/erpnext/selling/search_criteria/sales_orderwise_pending_amount_to_bill/sales_orderwise_pending_amount_to_bill.txt +++ b/erpnext/selling/search_criteria/sales_orderwise_pending_amount_to_bill/sales_orderwise_pending_amount_to_bill.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 14:50:44', + 'creation': '2012-04-03 12:49:52', 'docstatus': 0, - 'modified': '2012-03-30 14:50:44', + 'modified': '2012-04-03 12:49:52', 'modified_by': u'Administrator', 'owner': u'dhanalekshmi@webnotestech.com' }, diff --git a/erpnext/selling/search_criteria/sales_orderwise_pending_qty_to_deliver/sales_orderwise_pending_qty_to_deliver.txt b/erpnext/selling/search_criteria/sales_orderwise_pending_qty_to_deliver/sales_orderwise_pending_qty_to_deliver.txt index ad37ce6d1e0..7a73d4af9f5 100644 --- a/erpnext/selling/search_criteria/sales_orderwise_pending_qty_to_deliver/sales_orderwise_pending_qty_to_deliver.txt +++ b/erpnext/selling/search_criteria/sales_orderwise_pending_qty_to_deliver/sales_orderwise_pending_qty_to_deliver.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 14:50:44', + 'creation': '2012-04-03 12:49:52', 'docstatus': 0, - 'modified': '2012-03-30 14:50:44', + 'modified': '2012-04-03 12:49:52', 'modified_by': u'Administrator', 'owner': u'dhanalekshmi@webnotestech.com' }, diff --git a/erpnext/selling/search_criteria/sales_persons_target_variance_item_group_wise/sales_persons_target_variance_item_group_wise.txt b/erpnext/selling/search_criteria/sales_persons_target_variance_item_group_wise/sales_persons_target_variance_item_group_wise.txt index a98260a93ba..f001b70d55b 100644 --- a/erpnext/selling/search_criteria/sales_persons_target_variance_item_group_wise/sales_persons_target_variance_item_group_wise.txt +++ b/erpnext/selling/search_criteria/sales_persons_target_variance_item_group_wise/sales_persons_target_variance_item_group_wise.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 14:50:44', + 'creation': '2012-04-03 12:49:52', 'docstatus': 0, - 'modified': '2012-03-30 14:50:44', + 'modified': '2012-04-03 12:49:52', 'modified_by': u'Administrator', 'owner': u'Administrator' }, diff --git a/erpnext/selling/search_criteria/sales_personwise_transaction_summary/sales_personwise_transaction_summary.txt b/erpnext/selling/search_criteria/sales_personwise_transaction_summary/sales_personwise_transaction_summary.txt index 815adc4b01a..2ca30f7852f 100755 --- a/erpnext/selling/search_criteria/sales_personwise_transaction_summary/sales_personwise_transaction_summary.txt +++ b/erpnext/selling/search_criteria/sales_personwise_transaction_summary/sales_personwise_transaction_summary.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 14:50:44', + 'creation': '2012-04-03 12:49:52', 'docstatus': 0, - 'modified': '2012-03-30 14:50:44', + 'modified': '2012-04-03 12:49:52', 'modified_by': u'Administrator', 'owner': u'Administrator' }, diff --git a/erpnext/selling/search_criteria/target_variance_report/target_variance_report.txt b/erpnext/selling/search_criteria/target_variance_report/target_variance_report.txt index 84ea8eb8bd5..06ed049624f 100644 --- a/erpnext/selling/search_criteria/target_variance_report/target_variance_report.txt +++ b/erpnext/selling/search_criteria/target_variance_report/target_variance_report.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 14:50:44', + 'creation': '2012-04-03 12:49:53', 'docstatus': 0, - 'modified': '2012-03-30 14:50:44', + 'modified': '2012-04-03 12:49:53', 'modified_by': u'Administrator', 'owner': u'harshada@webnotestech.com' }, diff --git a/erpnext/selling/search_criteria/territories_target_variance_item_group_wise/territories_target_variance_item_group_wise.txt b/erpnext/selling/search_criteria/territories_target_variance_item_group_wise/territories_target_variance_item_group_wise.txt index f98b78062c1..69bb3100f78 100644 --- a/erpnext/selling/search_criteria/territories_target_variance_item_group_wise/territories_target_variance_item_group_wise.txt +++ b/erpnext/selling/search_criteria/territories_target_variance_item_group_wise/territories_target_variance_item_group_wise.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 14:50:44', + 'creation': '2012-04-03 12:49:53', 'docstatus': 0, - 'modified': '2012-03-30 14:50:44', + 'modified': '2012-04-03 12:49:53', 'modified_by': u'Administrator', 'owner': u'Administrator' }, diff --git a/erpnext/selling/search_criteria/territory_sales___variance_report/territory_sales___variance_report.txt b/erpnext/selling/search_criteria/territory_sales___variance_report/territory_sales___variance_report.txt index 22727956fe2..b8958948350 100644 --- a/erpnext/selling/search_criteria/territory_sales___variance_report/territory_sales___variance_report.txt +++ b/erpnext/selling/search_criteria/territory_sales___variance_report/territory_sales___variance_report.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 14:50:44', + 'creation': '2012-04-03 12:49:53', 'docstatus': 0, - 'modified': '2012-03-30 14:50:44', + 'modified': '2012-04-03 12:49:53', 'modified_by': u'Administrator', 'owner': u'Administrator' }, diff --git a/erpnext/selling/search_criteria/total_target_variance_report/total_target_variance_report.txt b/erpnext/selling/search_criteria/total_target_variance_report/total_target_variance_report.txt index 8783e1f7010..510d81bd59e 100644 --- a/erpnext/selling/search_criteria/total_target_variance_report/total_target_variance_report.txt +++ b/erpnext/selling/search_criteria/total_target_variance_report/total_target_variance_report.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 14:50:44', + 'creation': '2012-04-03 12:49:53', 'docstatus': 0, - 'modified': '2012-03-30 14:50:44', + 'modified': '2012-04-03 12:49:53', 'modified_by': u'Administrator', 'owner': u'Administrator' }, diff --git a/erpnext/selling/search_criteria/variance_report/variance_report.txt b/erpnext/selling/search_criteria/variance_report/variance_report.txt index fc044c03816..f45df2ffb47 100644 --- a/erpnext/selling/search_criteria/variance_report/variance_report.txt +++ b/erpnext/selling/search_criteria/variance_report/variance_report.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 14:50:45', + 'creation': '2012-04-03 12:49:53', 'docstatus': 0, - 'modified': '2012-03-30 14:50:45', + 'modified': '2012-04-03 12:49:53', 'modified_by': u'Administrator', 'owner': u'Administrator' }, diff --git a/erpnext/setup/doctype/email_digest/email_digest.js b/erpnext/setup/doctype/email_digest/email_digest.js index 67de256a079..1380e779ab5 100644 --- a/erpnext/setup/doctype/email_digest/email_digest.js +++ b/erpnext/setup/doctype/email_digest/email_digest.js @@ -60,7 +60,7 @@ cur_frm.cscript.refresh = function(doc, dt, dn) { }, 1); } -cur_frm.cscript['Add/Remove Recipients'] = function(doc, dt, dn) { +cur_frm.cscript.addremove_recipients = function(doc, dt, dn) { // Get profile list $c_obj(make_doclist(dt, dn), 'get_profiles', '', function(r, rt) { if(r.exc) { diff --git a/erpnext/setup/doctype/permission_control/permission_control.py b/erpnext/setup/doctype/permission_control/permission_control.py index fef322e0d7d..41f3a48ccf1 100644 --- a/erpnext/setup/doctype/permission_control/permission_control.py +++ b/erpnext/setup/doctype/permission_control/permission_control.py @@ -74,8 +74,9 @@ class DocType: d.fields.get('role')]) if perm.doctype=='DocPerm'] fl = ['', 'owner'] + [d.fieldname for d in doclist \ - if d.doctype=='DocField' and d.fieldtype=='Link' \ - and cstr(d.options)!=''] + if d.doctype=='DocField' and ((d.fieldtype=='Link' \ + and cstr(d.options)!='') or (d.fieldtype=='Select' and + 'link:' in cstr(d.options).lower()))] return { 'perms':ptype, diff --git a/erpnext/setup/doctype/price_list/price_list.js b/erpnext/setup/doctype/price_list/price_list.js index 173e42f2b79..67caaf1211c 100644 --- a/erpnext/setup/doctype/price_list/price_list.js +++ b/erpnext/setup/doctype/price_list/price_list.js @@ -30,7 +30,7 @@ cur_frm.cscript.refresh = function(doc, cdt, cdn) { } } -cur_frm.cscript['Clear Prices'] = function(doc, cdt, cdn) { +cur_frm.cscript.clear_prices = function(doc, cdt, cdn) { if(confirm("This action will clear all rates for '"+ doc.name +"' from the Item Master and cannot be un-done. Are you sure you want to continue?")) { $c_obj([doc], 'clear_prices', '', function(r, rt) { }); } diff --git a/erpnext/stock/DocType Mapper/Sales Invoice-Delivery Note/Sales Invoice-Delivery Note.txt b/erpnext/stock/DocType Mapper/Sales Invoice-Delivery Note/Sales Invoice-Delivery Note.txt index a09e0cfcd08..608a1d71000 100755 --- a/erpnext/stock/DocType Mapper/Sales Invoice-Delivery Note/Sales Invoice-Delivery Note.txt +++ b/erpnext/stock/DocType Mapper/Sales Invoice-Delivery Note/Sales Invoice-Delivery Note.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2010-12-15 08:40:46', + 'creation': '2010-12-14 17:56:41', 'docstatus': 0, - 'modified': '2012-03-30 13:33:31', + 'modified': '2012-04-03 12:49:50', 'modified_by': u'Administrator', 'owner': u'Administrator' }, diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.js b/erpnext/stock/doctype/delivery_note/delivery_note.js index 810c385f543..d9368bd9b44 100644 --- a/erpnext/stock/doctype/delivery_note/delivery_note.js +++ b/erpnext/stock/doctype/delivery_note/delivery_note.js @@ -66,7 +66,7 @@ cur_frm.cscript.refresh = function(doc, cdt, cdn) { if (doc.docstatus!=1) { hide_field(['SMS', 'Send SMS', 'message', 'customer_mobile_no', 'Repair Delivery Note']); } else { - cur_frm.add_custom_button('Send SMS', cur_frm.cscript['Send SMS']); + cur_frm.add_custom_button('Send SMS', cur_frm.cscript.send_sms); unhide_field(['SMS','Send SMS', 'message', 'customer_mobile_no', 'Repair Delivery Note']); } @@ -111,7 +111,7 @@ cur_frm.fields_dict['contact_person'].get_query = function(doc, cdt, cdn) { return 'SELECT name,CONCAT(first_name," ",ifnull(last_name,"")) As FullName,department,designation FROM tabContact WHERE customer = "'+ doc.customer +'" AND docstatus != 2 AND name LIKE "%s" ORDER BY name ASC LIMIT 50'; } -cur_frm.cscript['Get Items'] = function(doc,dt,dn) { +cur_frm.cscript.get_items = function(doc,dt,dn) { var callback = function(r,rt){ var doc = locals[cur_frm.doctype][cur_frm.docname]; if(r.message){ diff --git a/erpnext/stock/doctype/item/item.js b/erpnext/stock/doctype/item/item.js index b15c0c528a6..97be19a4ec6 100644 --- a/erpnext/stock/doctype/item/item.js +++ b/erpnext/stock/doctype/item/item.js @@ -93,7 +93,7 @@ cur_frm.cscript.IGHelp = function(doc,dt,dn){ // takes the first attachment and creates // a table with both image and attachment in HTML // in the "alternate_description" field -cur_frm.cscript['Add Image'] = function(doc, dt, dn) { +cur_frm.cscript.add_image = function(doc, dt, dn) { if(!doc.file_list) { msgprint('Please attach a file first!'); } diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js index eefd706ae4b..abeac49ea8c 100644 --- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js @@ -69,7 +69,7 @@ cur_frm.cscript.refresh = function(doc, cdt, cdn) { if(ch[i].qty > ch[i].billed_qty) allow_billing = 1; } cur_frm.add_custom_button('Make Purchase Invoice', cur_frm.cscript['Make Purchase Invoice']); - cur_frm.add_custom_button('Send SMS', cur_frm.cscript['Send SMS']); + cur_frm.add_custom_button('Send SMS', cur_frm.cscript.send_sms); } else{ hide_field(['Repair Purchase Receipt']); @@ -109,7 +109,7 @@ cur_frm.fields_dict.contact_person.on_new = function(dn) { // Get Purchase Order Button // ----------------- -cur_frm.cscript['Pull Purchase Order Details'] = function(doc, dt, dn) { +cur_frm.cscript.pull_purchase_order_details = function(doc, dt, dn) { var callback = function(r,rt) { unhide_field(['supplier_address','contact_person','supplier_name','address_display', 'contact_display', 'contact_mobile','contact_email']); refresh_many(['supplier','supplier_address','contact_person', 'supplier_name', 'address_display', 'contact_display','contact_mobile', 'contact_email', 'purchase_receipt_details', 'purchase_tax_details']); diff --git a/erpnext/stock/doctype/sales_and_purchase_return_tool/sales_and_purchase_return_tool.js b/erpnext/stock/doctype/sales_and_purchase_return_tool/sales_and_purchase_return_tool.js index 131e0126100..771cb8272c4 100644 --- a/erpnext/stock/doctype/sales_and_purchase_return_tool/sales_and_purchase_return_tool.js +++ b/erpnext/stock/doctype/sales_and_purchase_return_tool/sales_and_purchase_return_tool.js @@ -65,7 +65,7 @@ cur_frm.cscript.return_type = function(doc, cdt, cdn) { // Create item table //------------------------------- -cur_frm.cscript['Get Items'] = function(doc, cdt, cdn) { +cur_frm.cscript.get_items = function(doc, cdt, cdn) { flag = 0 if(doc.return_type == 'Sales Return') { if (doc.delivery_note_no && doc.sales_invoice_no) { @@ -96,7 +96,7 @@ cur_frm.cscript.clear_fields = function(doc) { // Make Stock Entry //------------------------------- -cur_frm.cscript['Make Stock Entry'] = function(doc, cdt, cdn) { +cur_frm.cscript.make_stock_entry = function(doc, cdt, cdn) { var cl = getchildren('Sales and Purchase Return Item', doc.name, 'return_details'); if (!cl.length) msgprint("Item table can not be blank. Please click on 'Get Items'."); @@ -170,7 +170,7 @@ cur_frm.cscript.map_child_fields = function(cl, se) { // Make excise voucher //------------------------------- -cur_frm.cscript['Make Excise Invoice'] = function(doc) { +cur_frm.cscript.make_excise_invoice = function(doc) { var excise = LocalDB.create('Journal Voucher'); excise = locals['Journal Voucher'][excise]; excise.voucher_type = 'Excise Voucher'; @@ -178,7 +178,7 @@ cur_frm.cscript['Make Excise Invoice'] = function(doc) { } // Make debit note //------------------------------ -cur_frm.cscript['Make Debit Note'] = function(doc) { +cur_frm.cscript.make_debit_note = function(doc) { var doclist = make_doclist(doc.doctype, doc.name); $c('accounts.get_new_jv_details', { doclist: JSON.stringify(doclist), @@ -191,7 +191,7 @@ cur_frm.cscript['Make Debit Note'] = function(doc) { } // Make credit note //------------------------------ -cur_frm.cscript['Make Credit Note'] = function(doc) { +cur_frm.cscript.make_credit_note = function(doc) { var doclist = make_doclist(doc.doctype, doc.name); $c('accounts.get_new_jv_details', { doclist: JSON.stringify(doclist), diff --git a/erpnext/stock/doctype/sales_bom/sales_bom.js b/erpnext/stock/doctype/sales_bom/sales_bom.js index be159e72909..f7f6e4d3a49 100644 --- a/erpnext/stock/doctype/sales_bom/sales_bom.js +++ b/erpnext/stock/doctype/sales_bom/sales_bom.js @@ -41,6 +41,6 @@ cur_frm.cscript.currency = function(doc, cdt, cdn) { $c_obj(make_doclist(cdt,cdn), 'get_rates', '', function(r,rt){refresh_field('sales_bom_items');}); } -cur_frm.cscript['Find Sales BOM'] = function(doc, dt, dn) { +cur_frm.cscript.find_sales_bom = function(doc, dt, dn) { $c_obj(make_doclist(dt,dn), 'check_duplicate', 1, ''); } \ No newline at end of file diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js index 613c23026f2..a297e0badbf 100644 --- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js +++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js @@ -18,6 +18,6 @@ cur_frm.cscript.refresh = function(doc) { if (doc.docstatus) hide_field('Steps'); } -cur_frm.cscript['Download Template'] = function(doc, cdt, cdn) { +cur_frm.cscript.download_template = function(doc, cdt, cdn) { $c_obj_csv(make_doclist(cdt, cdn), 'get_template', ''); } diff --git a/erpnext/stock/search_criteria/itemwise_price_list/itemwise_price_list.txt b/erpnext/stock/search_criteria/itemwise_price_list/itemwise_price_list.txt index 1fa4441dbac..d9e99738423 100644 --- a/erpnext/stock/search_criteria/itemwise_price_list/itemwise_price_list.txt +++ b/erpnext/stock/search_criteria/itemwise_price_list/itemwise_price_list.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 14:50:43', + 'creation': '2012-04-03 12:49:51', 'docstatus': 0, - 'modified': '2012-03-30 14:50:43', + 'modified': '2012-04-03 12:49:51', 'modified_by': u'Administrator', 'owner': u'harshada@webnotestech.com' }, diff --git a/erpnext/stock/search_criteria/stock_aging_report/stock_aging_report.txt b/erpnext/stock/search_criteria/stock_aging_report/stock_aging_report.txt index 5a1ef1d011f..f2b030657bf 100644 --- a/erpnext/stock/search_criteria/stock_aging_report/stock_aging_report.txt +++ b/erpnext/stock/search_criteria/stock_aging_report/stock_aging_report.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 14:50:44', + 'creation': '2012-04-03 12:49:53', 'docstatus': 0, - 'modified': '2012-03-30 14:50:44', + 'modified': '2012-04-03 12:49:53', 'modified_by': u'Administrator', 'owner': u'ashwini@webnotestech.com' }, diff --git a/erpnext/stock/search_criteria/stock_ledger/stock_ledger.txt b/erpnext/stock/search_criteria/stock_ledger/stock_ledger.txt index c28f59292a0..d7ede00a9d3 100644 --- a/erpnext/stock/search_criteria/stock_ledger/stock_ledger.txt +++ b/erpnext/stock/search_criteria/stock_ledger/stock_ledger.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 14:50:44', + 'creation': '2012-04-03 12:49:53', 'docstatus': 0, - 'modified': '2012-03-30 14:50:44', + 'modified': '2012-04-03 12:49:53', 'modified_by': u'Administrator', 'owner': u'Administrator' }, diff --git a/erpnext/stock/search_criteria/stock_level/stock_level.txt b/erpnext/stock/search_criteria/stock_level/stock_level.txt index 1783ba43b88..f19016e1e59 100644 --- a/erpnext/stock/search_criteria/stock_level/stock_level.txt +++ b/erpnext/stock/search_criteria/stock_level/stock_level.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 14:50:44', + 'creation': '2012-04-03 12:49:53', 'docstatus': 0, - 'modified': '2012-03-30 14:50:44', + 'modified': '2012-04-03 12:49:53', 'modified_by': u'Administrator', 'owner': u'Administrator' }, diff --git a/erpnext/stock/search_criteria/stock_report/stock_report.txt b/erpnext/stock/search_criteria/stock_report/stock_report.txt index d6858fe40c3..8a922016566 100644 --- a/erpnext/stock/search_criteria/stock_report/stock_report.txt +++ b/erpnext/stock/search_criteria/stock_report/stock_report.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 14:50:44', + 'creation': '2012-04-03 12:49:53', 'docstatus': 0, - 'modified': '2012-03-30 14:50:44', + 'modified': '2012-04-03 12:49:53', 'modified_by': u'Administrator', 'owner': u'Administrator' }, diff --git a/erpnext/support/doctype/customer_issue/customer_issue.js b/erpnext/support/doctype/customer_issue/customer_issue.js index 72d592e1377..cb909ac4ac3 100644 --- a/erpnext/support/doctype/customer_issue/customer_issue.js +++ b/erpnext/support/doctype/customer_issue/customer_issue.js @@ -63,7 +63,7 @@ cur_frm.fields_dict['contact_person'].get_query = function(doc, cdt, cdn) { -cur_frm.cscript['Make Maintenance Visit'] = function(doc, cdt, cdn) { +cur_frm.cscript.make_maintenance_visit = function(doc, cdt, cdn) { if (doc.docstatus == 1) { $c_obj(make_doclist(doc.doctype, doc.name),'check_maintenance_visit','', function(r,rt){ diff --git a/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js b/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js index 0113d1fab8c..efa3eac0379 100644 --- a/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +++ b/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js @@ -63,7 +63,7 @@ cur_frm.fields_dict['item_maintenance_detail'].grid.get_field('item_code').get_q } // Get Items based on SO Selected -cur_frm.cscript['Get Items'] = function(doc, dt, dn) { +cur_frm.cscript.get_items = function(doc, dt, dn) { var callback = function(r,rt) { unhide_field(['customer_address','contact_person','customer_name','address_display','contact_display','contact_mobile','contact_email','territory','customer_group']); cur_frm.refresh(); @@ -114,7 +114,7 @@ cur_frm.cscript.periodicity = function(doc, cdt, cdn){ } } -cur_frm.cscript['Generate Schedule'] = function(doc, cdt, cdn) { +cur_frm.cscript.generate_schedule = function(doc, cdt, cdn) { if (!doc.__islocal) { $c('runserverobj', args={'method':'generate_schedule', 'docs':compress_doclist(make_doclist(cdt,cdn))}, function(r,rt){ diff --git a/erpnext/support/doctype/maintenance_visit/maintenance_visit.js b/erpnext/support/doctype/maintenance_visit/maintenance_visit.js index d9d47c6d084..a2c0772c94c 100644 --- a/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +++ b/erpnext/support/doctype/maintenance_visit/maintenance_visit.js @@ -60,7 +60,7 @@ cur_frm.fields_dict['contact_person'].get_query = function(doc, cdt, cdn) { return 'SELECT name,CONCAT(first_name," ",ifnull(last_name,"")) As FullName,department,designation FROM tabContact WHERE customer = "'+ doc.customer +'" AND docstatus != 2 AND name LIKE "%s" ORDER BY name ASC LIMIT 50'; } -cur_frm.cscript['Get Items'] = function(doc, dt, dn) { +cur_frm.cscript.get_items = function(doc, dt, dn) { var callback = function(r,rt) { unhide_field(['customer_address','contact_person','customer_name','address_display','contact_display','contact_mobile','contact_email','territory','customer_group']); cur_frm.refresh(); diff --git a/erpnext/support/search_criteria/amc_summary/amc_summary.txt b/erpnext/support/search_criteria/amc_summary/amc_summary.txt index 9a0743b9907..e6500959825 100644 --- a/erpnext/support/search_criteria/amc_summary/amc_summary.txt +++ b/erpnext/support/search_criteria/amc_summary/amc_summary.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 13:33:31', + 'creation': '2012-04-03 12:49:50', 'docstatus': 0, - 'modified': '2012-03-30 13:33:31', + 'modified': '2012-04-03 12:49:50', 'modified_by': u'Administrator', 'owner': u'Administrator' }, diff --git a/erpnext/support/search_criteria/customer_issues/customer_issues.txt b/erpnext/support/search_criteria/customer_issues/customer_issues.txt index 25d5cec92f4..c313235b1cd 100644 --- a/erpnext/support/search_criteria/customer_issues/customer_issues.txt +++ b/erpnext/support/search_criteria/customer_issues/customer_issues.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 13:33:31', + 'creation': '2012-04-03 12:49:51', 'docstatus': 0, - 'modified': '2012-03-30 13:33:31', + 'modified': '2012-04-03 12:49:51', 'modified_by': u'Administrator', 'owner': u'Administrator' }, diff --git a/erpnext/support/search_criteria/maintenance_orderwise_pending_amount_to_bill/maintenance_orderwise_pending_amount_to_bill.txt b/erpnext/support/search_criteria/maintenance_orderwise_pending_amount_to_bill/maintenance_orderwise_pending_amount_to_bill.txt index 8f748454979..2e6e11d0484 100644 --- a/erpnext/support/search_criteria/maintenance_orderwise_pending_amount_to_bill/maintenance_orderwise_pending_amount_to_bill.txt +++ b/erpnext/support/search_criteria/maintenance_orderwise_pending_amount_to_bill/maintenance_orderwise_pending_amount_to_bill.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 14:50:43', + 'creation': '2012-04-03 12:49:51', 'docstatus': 0, - 'modified': '2012-03-30 14:50:43', + 'modified': '2012-04-03 12:49:51', 'modified_by': u'Administrator', 'owner': u'ashwini@webnotestech.com' }, diff --git a/erpnext/support/search_criteria/maintenance_schedule_details/maintenance_schedule_details.txt b/erpnext/support/search_criteria/maintenance_schedule_details/maintenance_schedule_details.txt index d0030a7c0e7..a81b187b818 100644 --- a/erpnext/support/search_criteria/maintenance_schedule_details/maintenance_schedule_details.txt +++ b/erpnext/support/search_criteria/maintenance_schedule_details/maintenance_schedule_details.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 14:50:43', + 'creation': '2012-04-03 12:49:51', 'docstatus': 0, - 'modified': '2012-03-30 14:50:43', + 'modified': '2012-04-03 12:49:51', 'modified_by': u'Administrator', 'owner': u'nabin@webnotestech.com' }, diff --git a/erpnext/support/search_criteria/warranty_amc_expiry_details/warranty_amc_expiry_details.txt b/erpnext/support/search_criteria/warranty_amc_expiry_details/warranty_amc_expiry_details.txt index 442a7bdfe31..a80ee64b1b2 100644 --- a/erpnext/support/search_criteria/warranty_amc_expiry_details/warranty_amc_expiry_details.txt +++ b/erpnext/support/search_criteria/warranty_amc_expiry_details/warranty_amc_expiry_details.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 14:50:45', + 'creation': '2012-04-03 12:49:53', 'docstatus': 0, - 'modified': '2012-03-30 14:50:45', + 'modified': '2012-04-03 12:49:53', 'modified_by': u'Administrator', 'owner': u'Administrator' }, diff --git a/erpnext/support/search_criteria/warranty_amc_summary/warranty_amc_summary.txt b/erpnext/support/search_criteria/warranty_amc_summary/warranty_amc_summary.txt index 52e69dfab0a..cdc76d24d46 100644 --- a/erpnext/support/search_criteria/warranty_amc_summary/warranty_amc_summary.txt +++ b/erpnext/support/search_criteria/warranty_amc_summary/warranty_amc_summary.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-30 13:33:32', + 'creation': '2012-04-03 12:49:53', 'docstatus': 0, - 'modified': '2012-03-30 13:33:32', + 'modified': '2012-04-03 12:49:53', 'modified_by': u'Administrator', 'owner': u'Administrator' }, diff --git a/erpnext/utilities/doctype/reposting_tool/reposting_tool.js b/erpnext/utilities/doctype/reposting_tool/reposting_tool.js index 006ef9a2767..d44a2cd1740 100644 --- a/erpnext/utilities/doctype/reposting_tool/reposting_tool.js +++ b/erpnext/utilities/doctype/reposting_tool/reposting_tool.js @@ -18,7 +18,7 @@ var bin_list = []; var msg = []; var binidx = 0; -cur_frm.cscript['Repost Bin'] = function(doc,cdt,cdn) { +cur_frm.cscript.repost_bin = function(doc,cdt,cdn) { args = {'check': 'Bin'}; $c_obj('Reposting Tool','get_count_for_reposting', docstring(args), function(r,rt) { bin_list = r.message; @@ -50,7 +50,7 @@ function repair_bin(){ //====================================================== var acc_list = []; var accidx = 0; -cur_frm.cscript['Repost Account Balances'] = function(doc,cdt,cdn) { +cur_frm.cscript.repost_account_balances = function(doc,cdt,cdn) { args = {'check': 'Account Balance'}; $c_obj('Reposting Tool','get_count_for_reposting', docstring(args), function(r,rt) { acc_list = r.message; diff --git a/erpnext/utilities/doctype/sms_control/sms_control.js b/erpnext/utilities/doctype/sms_control/sms_control.js index e28e9b28914..cd3db12626e 100644 --- a/erpnext/utilities/doctype/sms_control/sms_control.js +++ b/erpnext/utilities/doctype/sms_control/sms_control.js @@ -77,7 +77,7 @@ function SMSManager() { } } -cur_frm.cscript['Send SMS'] = function(doc,dt,dn) { +cur_frm.cscript.send_sms = function(doc,dt,dn) { var doc = cur_frm.doc; var sms_man = new SMSManager(); var default_msg = { diff --git a/wnf.py b/wnf.py index 4cd1c8b581d..ad450cda417 100755 --- a/wnf.py +++ b/wnf.py @@ -18,9 +18,12 @@ import os, sys -def replace_code(start, txt1, txt2, extn): +def replace_code(start, txt1, txt2, extn, search=None): """replace all txt1 by txt2 in files with extension (extn)""" + import webnotes.utils import os, re + esc = webnotes.utils.make_esc('[]') + if not search: search = esc(txt1) for wt in os.walk(start, followlinks=1): for fn in wt[2]: if fn.split('.')[-1]==extn: @@ -29,7 +32,7 @@ def replace_code(start, txt1, txt2, extn): with open(fpath, 'r') as f: content = f.read() - if re.search(txt1, content): + if re.search(search, content): res = search_replace_with_prompt(fpath, txt1, txt2) if res == 'skip': return 'skip' From 7e0479bc4cd51832530ab91a81231c9d49f50e5c Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Thu, 5 Apr 2012 18:27:56 +0530 Subject: [PATCH 2/3] cleanup of search criteria --- .../mis_control}/__init__.py | 0 .../doctype/mis_control/mis_control.py | 0 .../doctype/mis_control/mis_control.txt | 4 +- .../trend_analyzer_control}/__init__.py | 0 .../trend_analyzer_control.py | 0 .../trend_analyzer_control.txt | 4 +- .../__init__.py | 0 .../invoices_overdue/invoices_overdue.txt | 4 +- .../monthly_transaction_summary}/__init__.py | 0 .../monthly_transaction_summary.js | 0 .../monthly_transaction_summary.py | 0 .../monthly_transaction_summary.sql | 0 .../monthly_transaction_summary.txt | 4 +- .../progressive_total_excise_duty.js | 44 -- .../progressive_total_excise_duty.py | 86 --- .../progressive_total_excise_duty.sql | 28 - .../progressive_total_excise_duty.txt | 34 -- .../service_tax_credit_account___inputs.js | 43 -- .../service_tax_credit_account___inputs.py | 135 ----- .../service_tax_credit_account___inputs.sql | 13 - .../service_tax_credit_account___inputs.txt | 34 -- ..._collection_for_a_period___customerwise.js | 42 -- ..._collection_for_a_period___customerwise.py | 60 -- ...collection_for_a_period___customerwise.txt | 36 -- .../trend_analyzer}/__init__.py | 0 .../trend_analyzer/trend_analyzer.js | 0 .../trend_analyzer/trend_analyzer.py | 0 .../trend_analyzer/trend_analyzer.txt | 4 +- .../yearly_transaction_summary}/__init__.py | 0 .../yearly_transaction_summary.js | 0 .../yearly_transaction_summary.py | 0 .../yearly_transaction_summary.sql | 0 .../yearly_transaction_summary.txt | 4 +- .../analysis/Module Def/Analysis/Analysis.txt | 253 --------- .../yearly_transaction_summary/__init__.py | 0 erpnext/home/Module Def/Home/Home.txt | 28 - erpnext/home/search_criteria/__init__.py | 0 .../invoices_overdue/__init__.py | 0 .../invoices_to_be_submitted/__init__.py | 0 .../invoices_to_be_submitted.txt | 33 -- .../invoices_to_receive_payment/__init__.py | 0 .../invoices_to_receive_payment.txt | 34 -- .../lead_to_follow_up/__init__.py | 0 .../__init__.py | 0 .../opportunity_quotations_to_be_sent.txt | 35 -- .../opportunity_to_follow_up/__init__.py | 0 .../purchase_order_to_be_billed/__init__.py | 0 .../purchase_order_to_be_billed.txt | 34 -- .../__init__.py | 0 .../purchase_order_to_be_submitted.txt | 33 -- .../__init__.py | 0 .../purchase_order_to_receive_items.txt | 34 -- .../__init__.py | 0 ...hase_request_purchase_order_to_be_made.txt | 34 -- .../__init__.py | 0 .../purchase_request_to_be_submitted.txt | 34 -- .../sales_order_overdue/__init__.py | 0 .../sales_order_overdue.txt | 34 -- .../sales_order_to_be_billed/__init__.py | 0 .../sales_order_to_be_billed.txt | 34 -- .../sales_order_to_be_delivered/__init__.py | 0 .../sales_order_to_be_delivered.txt | 34 -- .../sales_order_to_be_submitted/__init__.py | 0 .../sales_order_to_be_submitted.txt | 34 -- .../__init__.py | 0 .../__init__.py | 0 .../search_criteria/task_open/__init__.py | 0 .../search_criteria/task_open/task_open.txt | 34 -- erpnext/hr/Module Def/HR/HR.txt | 318 ----------- erpnext/hr/Role/Employee/Employee.txt | 17 - erpnext/hr/Role/HR Manager/HR Manager.txt | 26 - erpnext/hr/Role/HR User/HR User.txt | 26 - erpnext/hr/__init__.py | 5 + .../employee_details/__init__.py | 0 .../employee_details/employee_details.txt | 37 -- .../__init__.py | 0 .../employee_in_company_experience.txt | 37 -- .../__init__.py | 0 ...employeewise_leave_transaction_details.txt | 33 -- .../monthly_salary_register.py | 98 ++++ .../monthly_salary_register.txt | 8 +- .../pending_appraisals/__init__.py | 0 .../pending_appraisals/pending_appraisals.js | 57 -- .../pending_appraisals/pending_appraisals.txt | 33 -- .../pending_expense_claims/__init__.py | 0 .../pending_expense_claims.txt | 31 -- .../Knowledge Base/Knowledge Base.txt | 42 -- erpnext/patches/jan_mar_2012/rename_dt.py | 34 +- .../Module Def/Production/Production.txt | 519 ------------------ .../Production Manager/Production Manager.txt | 26 - .../Role/Production User/Production User.txt | 26 - erpnext/production/__init__.py | 4 + .../search_criteria/delivery_plan/__init__.py | 0 .../delivery_plan/delivery_plan.js | 34 -- .../delivery_plan/delivery_plan.txt | 37 -- .../Role/Projects User/Projects User.txt | 26 - erpnext/projects/__init__.py | 3 + .../dispatch_report/__init__.py | 0 .../dispatch_report/dispatch_report.js | 21 - .../dispatch_report/dispatch_report.txt | 34 -- erpnext/selling/Role/Customer/Customer.txt | 26 - erpnext/selling/Role/Partner/Partner.txt | 26 - .../Role/Sales Manager/Sales Manager.txt | 26 - .../Sales Master Manager.txt | 26 - .../selling/Role/Sales User/Sales User.txt | 26 - erpnext/selling/__init__.py | 7 + .../lead_to_follow_up}/__init__.py | 0 .../lead_to_follow_up/lead_to_follow_up.js | 0 .../lead_to_follow_up/lead_to_follow_up.txt | 4 +- .../lead_to_follow_up/sales_order_overdue.js | 0 .../monthly_despatched_trend/__init__.py | 0 .../monthly_despatched_trend.js | 18 - .../monthly_despatched_trend.py | 23 - .../monthly_despatched_trend.txt | 38 -- .../opportunity_to_follow_up}/__init__.py | 0 .../opportunity_to_follow_up.txt | 4 +- .../periodic_sales_summary/__init__.py | 0 .../periodic_sales_summary.js | 35 -- .../periodic_sales_summary.txt | 37 -- .../sales_agentwise_commission/__init__.py | 0 .../sales_agentwise_commission.js | 25 - .../sales_agentwise_commission.py | 24 - .../sales_agentwise_commission.txt | 37 -- .../sales_order_pending_items}/__init__.py | 0 .../sales_order_pending_items.js} | 0 .../sales_order_pending_items.txt} | 6 +- .../sales_order_pending_items1/__init__.py | 0 .../search_criteria/sales_orderwise_booking_ | 4 - .../__init__.py | 0 .../serial_no_amc_expiring_this_month.txt | 4 +- .../__init__.py | 0 ...serial_no_warranty_expiring_this_month.txt | 4 +- .../territory_item_group_wise_gp/__init__.py | 0 .../territory_item_group_wise_gp.py | 123 ----- .../territory_item_group_wise_gp.txt | 37 -- .../Setup Masters/Setup Masters.txt | 29 - .../Material Manager/Material Manager.txt | 26 - .../Material Master Manager.txt | 26 - .../Role/Material User/Material User.txt | 26 - .../Role/Quality Manager/Quality Manager.txt | 26 - erpnext/stock/__init__.py | 6 + 141 files changed, 181 insertions(+), 3351 deletions(-) rename erpnext/accounts/{search_criteria/progressive_total_excise_duty => doctype/mis_control}/__init__.py (100%) rename erpnext/{analysis => accounts}/doctype/mis_control/mis_control.py (100%) rename erpnext/{analysis => accounts}/doctype/mis_control/mis_control.txt (95%) rename erpnext/accounts/{search_criteria/service_tax_credit_account___inputs => doctype/trend_analyzer_control}/__init__.py (100%) mode change 100644 => 100755 rename erpnext/{analysis => accounts}/doctype/trend_analyzer_control/trend_analyzer_control.py (100%) rename erpnext/{analysis => accounts}/doctype/trend_analyzer_control/trend_analyzer_control.txt (95%) rename erpnext/accounts/search_criteria/{total_amout_collection_for_a_period___customerwise => invoices_overdue}/__init__.py (100%) rename erpnext/{home => accounts}/search_criteria/invoices_overdue/invoices_overdue.txt (97%) rename erpnext/{analysis => accounts/search_criteria/monthly_transaction_summary}/__init__.py (100%) rename erpnext/{analysis => accounts}/search_criteria/monthly_transaction_summary/monthly_transaction_summary.js (100%) rename erpnext/{analysis => accounts}/search_criteria/monthly_transaction_summary/monthly_transaction_summary.py (100%) rename erpnext/{analysis => accounts}/search_criteria/monthly_transaction_summary/monthly_transaction_summary.sql (100%) rename erpnext/{analysis => accounts}/search_criteria/monthly_transaction_summary/monthly_transaction_summary.txt (96%) delete mode 100644 erpnext/accounts/search_criteria/progressive_total_excise_duty/progressive_total_excise_duty.js delete mode 100644 erpnext/accounts/search_criteria/progressive_total_excise_duty/progressive_total_excise_duty.py delete mode 100644 erpnext/accounts/search_criteria/progressive_total_excise_duty/progressive_total_excise_duty.sql delete mode 100644 erpnext/accounts/search_criteria/progressive_total_excise_duty/progressive_total_excise_duty.txt delete mode 100644 erpnext/accounts/search_criteria/service_tax_credit_account___inputs/service_tax_credit_account___inputs.js delete mode 100644 erpnext/accounts/search_criteria/service_tax_credit_account___inputs/service_tax_credit_account___inputs.py delete mode 100644 erpnext/accounts/search_criteria/service_tax_credit_account___inputs/service_tax_credit_account___inputs.sql delete mode 100644 erpnext/accounts/search_criteria/service_tax_credit_account___inputs/service_tax_credit_account___inputs.txt delete mode 100644 erpnext/accounts/search_criteria/total_amout_collection_for_a_period___customerwise/total_amout_collection_for_a_period___customerwise.js delete mode 100644 erpnext/accounts/search_criteria/total_amout_collection_for_a_period___customerwise/total_amout_collection_for_a_period___customerwise.py delete mode 100644 erpnext/accounts/search_criteria/total_amout_collection_for_a_period___customerwise/total_amout_collection_for_a_period___customerwise.txt rename erpnext/{analysis/doctype => accounts/search_criteria/trend_analyzer}/__init__.py (100%) rename erpnext/{analysis => accounts}/search_criteria/trend_analyzer/trend_analyzer.js (100%) rename erpnext/{analysis => accounts}/search_criteria/trend_analyzer/trend_analyzer.py (100%) rename erpnext/{analysis => accounts}/search_criteria/trend_analyzer/trend_analyzer.txt (96%) rename erpnext/{analysis/doctype/mis_control => accounts/search_criteria/yearly_transaction_summary}/__init__.py (100%) rename erpnext/{analysis => accounts}/search_criteria/yearly_transaction_summary/yearly_transaction_summary.js (100%) rename erpnext/{analysis => accounts}/search_criteria/yearly_transaction_summary/yearly_transaction_summary.py (100%) rename erpnext/{analysis => accounts}/search_criteria/yearly_transaction_summary/yearly_transaction_summary.sql (100%) rename erpnext/{analysis => accounts}/search_criteria/yearly_transaction_summary/yearly_transaction_summary.txt (96%) delete mode 100644 erpnext/analysis/Module Def/Analysis/Analysis.txt delete mode 100644 erpnext/analysis/search_criteria/yearly_transaction_summary/__init__.py delete mode 100644 erpnext/home/Module Def/Home/Home.txt delete mode 100644 erpnext/home/search_criteria/__init__.py delete mode 100644 erpnext/home/search_criteria/invoices_overdue/__init__.py delete mode 100644 erpnext/home/search_criteria/invoices_to_be_submitted/__init__.py delete mode 100644 erpnext/home/search_criteria/invoices_to_be_submitted/invoices_to_be_submitted.txt delete mode 100644 erpnext/home/search_criteria/invoices_to_receive_payment/__init__.py delete mode 100644 erpnext/home/search_criteria/invoices_to_receive_payment/invoices_to_receive_payment.txt delete mode 100644 erpnext/home/search_criteria/lead_to_follow_up/__init__.py delete mode 100644 erpnext/home/search_criteria/opportunity_quotations_to_be_sent/__init__.py delete mode 100644 erpnext/home/search_criteria/opportunity_quotations_to_be_sent/opportunity_quotations_to_be_sent.txt delete mode 100644 erpnext/home/search_criteria/opportunity_to_follow_up/__init__.py delete mode 100644 erpnext/home/search_criteria/purchase_order_to_be_billed/__init__.py delete mode 100644 erpnext/home/search_criteria/purchase_order_to_be_billed/purchase_order_to_be_billed.txt delete mode 100644 erpnext/home/search_criteria/purchase_order_to_be_submitted/__init__.py delete mode 100644 erpnext/home/search_criteria/purchase_order_to_be_submitted/purchase_order_to_be_submitted.txt delete mode 100644 erpnext/home/search_criteria/purchase_order_to_receive_items/__init__.py delete mode 100644 erpnext/home/search_criteria/purchase_order_to_receive_items/purchase_order_to_receive_items.txt delete mode 100644 erpnext/home/search_criteria/purchase_request_purchase_order_to_be_made/__init__.py delete mode 100644 erpnext/home/search_criteria/purchase_request_purchase_order_to_be_made/purchase_request_purchase_order_to_be_made.txt delete mode 100644 erpnext/home/search_criteria/purchase_request_to_be_submitted/__init__.py delete mode 100644 erpnext/home/search_criteria/purchase_request_to_be_submitted/purchase_request_to_be_submitted.txt delete mode 100644 erpnext/home/search_criteria/sales_order_overdue/__init__.py delete mode 100644 erpnext/home/search_criteria/sales_order_overdue/sales_order_overdue.txt delete mode 100644 erpnext/home/search_criteria/sales_order_to_be_billed/__init__.py delete mode 100644 erpnext/home/search_criteria/sales_order_to_be_billed/sales_order_to_be_billed.txt delete mode 100644 erpnext/home/search_criteria/sales_order_to_be_delivered/__init__.py delete mode 100644 erpnext/home/search_criteria/sales_order_to_be_delivered/sales_order_to_be_delivered.txt delete mode 100644 erpnext/home/search_criteria/sales_order_to_be_submitted/__init__.py delete mode 100644 erpnext/home/search_criteria/sales_order_to_be_submitted/sales_order_to_be_submitted.txt delete mode 100644 erpnext/home/search_criteria/serial_no_amc_expiring_this_month/__init__.py delete mode 100644 erpnext/home/search_criteria/serial_no_warranty_expiring_this_month/__init__.py delete mode 100644 erpnext/home/search_criteria/task_open/__init__.py delete mode 100644 erpnext/home/search_criteria/task_open/task_open.txt delete mode 100644 erpnext/hr/Module Def/HR/HR.txt delete mode 100644 erpnext/hr/Role/Employee/Employee.txt delete mode 100644 erpnext/hr/Role/HR Manager/HR Manager.txt delete mode 100644 erpnext/hr/Role/HR User/HR User.txt delete mode 100644 erpnext/hr/search_criteria/employee_details/__init__.py delete mode 100644 erpnext/hr/search_criteria/employee_details/employee_details.txt delete mode 100644 erpnext/hr/search_criteria/employee_in_company_experience/__init__.py delete mode 100644 erpnext/hr/search_criteria/employee_in_company_experience/employee_in_company_experience.txt delete mode 100644 erpnext/hr/search_criteria/employeewise_leave_transaction_details/__init__.py delete mode 100644 erpnext/hr/search_criteria/employeewise_leave_transaction_details/employeewise_leave_transaction_details.txt create mode 100644 erpnext/hr/search_criteria/monthly_salary_register/monthly_salary_register.py delete mode 100644 erpnext/hr/search_criteria/pending_appraisals/__init__.py delete mode 100644 erpnext/hr/search_criteria/pending_appraisals/pending_appraisals.js delete mode 100644 erpnext/hr/search_criteria/pending_appraisals/pending_appraisals.txt delete mode 100644 erpnext/hr/search_criteria/pending_expense_claims/__init__.py delete mode 100644 erpnext/hr/search_criteria/pending_expense_claims/pending_expense_claims.txt delete mode 100644 erpnext/knowledge_base/Module Def/Knowledge Base/Knowledge Base.txt delete mode 100644 erpnext/production/Module Def/Production/Production.txt delete mode 100644 erpnext/production/Role/Production Manager/Production Manager.txt delete mode 100644 erpnext/production/Role/Production User/Production User.txt delete mode 100644 erpnext/production/search_criteria/delivery_plan/__init__.py delete mode 100644 erpnext/production/search_criteria/delivery_plan/delivery_plan.js delete mode 100644 erpnext/production/search_criteria/delivery_plan/delivery_plan.txt delete mode 100644 erpnext/projects/Role/Projects User/Projects User.txt delete mode 100644 erpnext/projects/search_criteria/dispatch_report/__init__.py delete mode 100644 erpnext/projects/search_criteria/dispatch_report/dispatch_report.js delete mode 100644 erpnext/projects/search_criteria/dispatch_report/dispatch_report.txt delete mode 100644 erpnext/selling/Role/Customer/Customer.txt delete mode 100644 erpnext/selling/Role/Partner/Partner.txt delete mode 100644 erpnext/selling/Role/Sales Manager/Sales Manager.txt delete mode 100644 erpnext/selling/Role/Sales Master Manager/Sales Master Manager.txt delete mode 100644 erpnext/selling/Role/Sales User/Sales User.txt rename erpnext/{analysis/doctype/trend_analyzer_control => selling/search_criteria/lead_to_follow_up}/__init__.py (100%) mode change 100755 => 100644 rename erpnext/{home => selling}/search_criteria/lead_to_follow_up/lead_to_follow_up.js (100%) rename erpnext/{home => selling}/search_criteria/lead_to_follow_up/lead_to_follow_up.txt (97%) rename erpnext/{home => selling}/search_criteria/lead_to_follow_up/sales_order_overdue.js (100%) delete mode 100644 erpnext/selling/search_criteria/monthly_despatched_trend/__init__.py delete mode 100644 erpnext/selling/search_criteria/monthly_despatched_trend/monthly_despatched_trend.js delete mode 100644 erpnext/selling/search_criteria/monthly_despatched_trend/monthly_despatched_trend.py delete mode 100644 erpnext/selling/search_criteria/monthly_despatched_trend/monthly_despatched_trend.txt rename erpnext/{analysis/page => selling/search_criteria/opportunity_to_follow_up}/__init__.py (100%) rename erpnext/{home => selling}/search_criteria/opportunity_to_follow_up/opportunity_to_follow_up.txt (97%) delete mode 100644 erpnext/selling/search_criteria/periodic_sales_summary/__init__.py delete mode 100644 erpnext/selling/search_criteria/periodic_sales_summary/periodic_sales_summary.js delete mode 100644 erpnext/selling/search_criteria/periodic_sales_summary/periodic_sales_summary.txt delete mode 100644 erpnext/selling/search_criteria/sales_agentwise_commission/__init__.py delete mode 100644 erpnext/selling/search_criteria/sales_agentwise_commission/sales_agentwise_commission.js delete mode 100644 erpnext/selling/search_criteria/sales_agentwise_commission/sales_agentwise_commission.py delete mode 100644 erpnext/selling/search_criteria/sales_agentwise_commission/sales_agentwise_commission.txt rename erpnext/{analysis/search_criteria => selling/search_criteria/sales_order_pending_items}/__init__.py (100%) rename erpnext/selling/search_criteria/{sales_order_pending_items1/sales_order_pending_items1.js => sales_order_pending_items/sales_order_pending_items.js} (100%) rename erpnext/selling/search_criteria/{sales_order_pending_items1/sales_order_pending_items1.txt => sales_order_pending_items/sales_order_pending_items.txt} (95%) delete mode 100644 erpnext/selling/search_criteria/sales_order_pending_items1/__init__.py delete mode 100644 erpnext/selling/search_criteria/sales_orderwise_booking_ rename erpnext/{analysis/search_criteria/monthly_transaction_summary => selling/search_criteria/serial_no_amc_expiring_this_month}/__init__.py (100%) rename erpnext/{home => selling}/search_criteria/serial_no_amc_expiring_this_month/serial_no_amc_expiring_this_month.txt (97%) rename erpnext/{analysis/search_criteria/trend_analyzer => selling/search_criteria/serial_no_warranty_expiring_this_month}/__init__.py (100%) rename erpnext/{home => selling}/search_criteria/serial_no_warranty_expiring_this_month/serial_no_warranty_expiring_this_month.txt (98%) delete mode 100644 erpnext/selling/search_criteria/territory_item_group_wise_gp/__init__.py delete mode 100644 erpnext/selling/search_criteria/territory_item_group_wise_gp/territory_item_group_wise_gp.py delete mode 100644 erpnext/selling/search_criteria/territory_item_group_wise_gp/territory_item_group_wise_gp.txt delete mode 100644 erpnext/setup_masters/Module Def/Setup Masters/Setup Masters.txt delete mode 100644 erpnext/stock/Role/Material Manager/Material Manager.txt delete mode 100644 erpnext/stock/Role/Material Master Manager/Material Master Manager.txt delete mode 100644 erpnext/stock/Role/Material User/Material User.txt delete mode 100644 erpnext/stock/Role/Quality Manager/Quality Manager.txt diff --git a/erpnext/accounts/search_criteria/progressive_total_excise_duty/__init__.py b/erpnext/accounts/doctype/mis_control/__init__.py similarity index 100% rename from erpnext/accounts/search_criteria/progressive_total_excise_duty/__init__.py rename to erpnext/accounts/doctype/mis_control/__init__.py diff --git a/erpnext/analysis/doctype/mis_control/mis_control.py b/erpnext/accounts/doctype/mis_control/mis_control.py similarity index 100% rename from erpnext/analysis/doctype/mis_control/mis_control.py rename to erpnext/accounts/doctype/mis_control/mis_control.py diff --git a/erpnext/analysis/doctype/mis_control/mis_control.txt b/erpnext/accounts/doctype/mis_control/mis_control.txt similarity index 95% rename from erpnext/analysis/doctype/mis_control/mis_control.txt rename to erpnext/accounts/doctype/mis_control/mis_control.txt index bccfc7b3cea..ebfca08e160 100644 --- a/erpnext/analysis/doctype/mis_control/mis_control.txt +++ b/erpnext/accounts/doctype/mis_control/mis_control.txt @@ -15,7 +15,7 @@ 'colour': u'White:FFF', 'doctype': 'DocType', 'issingle': 1, - 'module': u'Analysis', + 'module': u'Accounts', 'name': '__common__', 'section_style': u'Simple', 'server_code_error': u' ', @@ -28,4 +28,4 @@ 'doctype': 'DocType', 'name': u'MIS Control' } -] \ No newline at end of file +] diff --git a/erpnext/accounts/search_criteria/service_tax_credit_account___inputs/__init__.py b/erpnext/accounts/doctype/trend_analyzer_control/__init__.py old mode 100644 new mode 100755 similarity index 100% rename from erpnext/accounts/search_criteria/service_tax_credit_account___inputs/__init__.py rename to erpnext/accounts/doctype/trend_analyzer_control/__init__.py diff --git a/erpnext/analysis/doctype/trend_analyzer_control/trend_analyzer_control.py b/erpnext/accounts/doctype/trend_analyzer_control/trend_analyzer_control.py similarity index 100% rename from erpnext/analysis/doctype/trend_analyzer_control/trend_analyzer_control.py rename to erpnext/accounts/doctype/trend_analyzer_control/trend_analyzer_control.py diff --git a/erpnext/analysis/doctype/trend_analyzer_control/trend_analyzer_control.txt b/erpnext/accounts/doctype/trend_analyzer_control/trend_analyzer_control.txt similarity index 95% rename from erpnext/analysis/doctype/trend_analyzer_control/trend_analyzer_control.txt rename to erpnext/accounts/doctype/trend_analyzer_control/trend_analyzer_control.txt index 1d76b06a83f..e7dc9b4a4e0 100755 --- a/erpnext/analysis/doctype/trend_analyzer_control/trend_analyzer_control.txt +++ b/erpnext/accounts/doctype/trend_analyzer_control/trend_analyzer_control.txt @@ -16,7 +16,7 @@ 'doctype': 'DocType', 'in_create': 1, 'issingle': 1, - 'module': u'Analysis', + 'module': u'Accounts', 'name': '__common__', 'read_only': 1, 'section_style': u'Simple', @@ -29,4 +29,4 @@ 'doctype': 'DocType', 'name': u'Trend Analyzer Control' } -] \ No newline at end of file +] diff --git a/erpnext/accounts/search_criteria/total_amout_collection_for_a_period___customerwise/__init__.py b/erpnext/accounts/search_criteria/invoices_overdue/__init__.py similarity index 100% rename from erpnext/accounts/search_criteria/total_amout_collection_for_a_period___customerwise/__init__.py rename to erpnext/accounts/search_criteria/invoices_overdue/__init__.py diff --git a/erpnext/home/search_criteria/invoices_overdue/invoices_overdue.txt b/erpnext/accounts/search_criteria/invoices_overdue/invoices_overdue.txt similarity index 97% rename from erpnext/home/search_criteria/invoices_overdue/invoices_overdue.txt rename to erpnext/accounts/search_criteria/invoices_overdue/invoices_overdue.txt index d56d1ac0d2e..a83d490e116 100644 --- a/erpnext/home/search_criteria/invoices_overdue/invoices_overdue.txt +++ b/erpnext/accounts/search_criteria/invoices_overdue/invoices_overdue.txt @@ -18,7 +18,7 @@ 'doc_type': u'Sales Invoice', 'doctype': 'Search Criteria', 'filters': u"{'Sales Invoice\x01Saved':1,'Sales Invoice\x01Submitted':1,'Sales Invoice\x01Is Opening':'','Sales Invoice\x01Fiscal Year':''}", - 'module': u'Home', + 'module': u'Accounts', 'name': '__common__', 'page_len': 50, 'sort_by': u'`tabSales Invoice`.`name`', @@ -31,4 +31,4 @@ 'doctype': 'Search Criteria', 'name': u'invoices-overdue' } -] \ No newline at end of file +] diff --git a/erpnext/analysis/__init__.py b/erpnext/accounts/search_criteria/monthly_transaction_summary/__init__.py similarity index 100% rename from erpnext/analysis/__init__.py rename to erpnext/accounts/search_criteria/monthly_transaction_summary/__init__.py diff --git a/erpnext/analysis/search_criteria/monthly_transaction_summary/monthly_transaction_summary.js b/erpnext/accounts/search_criteria/monthly_transaction_summary/monthly_transaction_summary.js similarity index 100% rename from erpnext/analysis/search_criteria/monthly_transaction_summary/monthly_transaction_summary.js rename to erpnext/accounts/search_criteria/monthly_transaction_summary/monthly_transaction_summary.js diff --git a/erpnext/analysis/search_criteria/monthly_transaction_summary/monthly_transaction_summary.py b/erpnext/accounts/search_criteria/monthly_transaction_summary/monthly_transaction_summary.py similarity index 100% rename from erpnext/analysis/search_criteria/monthly_transaction_summary/monthly_transaction_summary.py rename to erpnext/accounts/search_criteria/monthly_transaction_summary/monthly_transaction_summary.py diff --git a/erpnext/analysis/search_criteria/monthly_transaction_summary/monthly_transaction_summary.sql b/erpnext/accounts/search_criteria/monthly_transaction_summary/monthly_transaction_summary.sql similarity index 100% rename from erpnext/analysis/search_criteria/monthly_transaction_summary/monthly_transaction_summary.sql rename to erpnext/accounts/search_criteria/monthly_transaction_summary/monthly_transaction_summary.sql diff --git a/erpnext/analysis/search_criteria/monthly_transaction_summary/monthly_transaction_summary.txt b/erpnext/accounts/search_criteria/monthly_transaction_summary/monthly_transaction_summary.txt similarity index 96% rename from erpnext/analysis/search_criteria/monthly_transaction_summary/monthly_transaction_summary.txt rename to erpnext/accounts/search_criteria/monthly_transaction_summary/monthly_transaction_summary.txt index 2842f8dd886..92900415d13 100644 --- a/erpnext/analysis/search_criteria/monthly_transaction_summary/monthly_transaction_summary.txt +++ b/erpnext/accounts/search_criteria/monthly_transaction_summary/monthly_transaction_summary.txt @@ -17,7 +17,7 @@ 'doc_type': u'Profile', 'doctype': 'Search Criteria', 'filters': u"{'DocType\x01Period':'Monthly'}", - 'module': u'Analysis', + 'module': u'Accounts', 'name': '__common__', 'sort_by': u'`tabProfile`.`name`', 'sort_order': u'DESC', @@ -29,4 +29,4 @@ 'doctype': 'Search Criteria', 'name': u'monthly_transaction_summary' } -] \ No newline at end of file +] diff --git a/erpnext/accounts/search_criteria/progressive_total_excise_duty/progressive_total_excise_duty.js b/erpnext/accounts/search_criteria/progressive_total_excise_duty/progressive_total_excise_duty.js deleted file mode 100644 index f96e9336505..00000000000 --- a/erpnext/accounts/search_criteria/progressive_total_excise_duty/progressive_total_excise_duty.js +++ /dev/null @@ -1,44 +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 . - -report.customize_filters = function() { - this.hide_all_filters(); - - this.add_filter({fieldname:'main_acc_head', label:'Main Account Head', fieldtype:'Link', options:'Account', ignore : 1, parent:'Journal Voucher Detail'}); - this.add_filter({fieldname:'edu_cess_acc_head', label:'Edu Cess Account Head', fieldtype:'Link', options:'Account', ignore : 1, parent:'Journal Voucher Detail'}); - this.add_filter({fieldname:'sh_edu_cess_acc_head', label:'S.H.Edu Cess Account Head', fieldtype:'Link', options:'Account', ignore : 1, parent:'Journal Voucher Detail'}); - - // un-hide fields - //this.add_filter({fieldname:'company', label:'Company', fieldtype:'Link', options:'Company', ignore : 1, parent:'Journal Voucher Detail'}); - //this.add_filter({fieldname:'fiscal_year', label:'Fiscal Year', fieldtype:'Link', options:'Fiscal Year', ignore : 1, parent:'Journal Voucher Detail'}); - //this.add_filter({fieldname:'posting_date', label:'Posting Date', fieldtype:'Date', ignore : 1, parent:'Journal Voucher Detail'}); - - - - this.filter_fields_dict['Journal Voucher'+FILTER_SEP +'Company'].df.filter_hide = 0; - this.filter_fields_dict['Journal Voucher'+FILTER_SEP +'Fiscal Year'].df.filter_hide = 0; - this.filter_fields_dict['Journal Voucher'+FILTER_SEP +'From Posting Date'].df.filter_hide = 0; - this.filter_fields_dict['Journal Voucher'+FILTER_SEP +'To Posting Date'].df.filter_hide = 0; - - // set defaults - this.filter_fields_dict['Journal Voucher'+FILTER_SEP +'From Posting Date'].df.in_first_page = 1; - this.filter_fields_dict['Journal Voucher'+FILTER_SEP +'To Posting Date'].df.in_first_page = 1; - - this.filter_fields_dict['Journal Voucher'+FILTER_SEP +'From Posting Date'].df['report_default'] = sys_defaults.year_start_date; - this.filter_fields_dict['Journal Voucher'+FILTER_SEP +'To Posting Date'].df['report_default'] = dateutil.obj_to_str(new Date()); - - //this.large_report = 1; -} \ No newline at end of file diff --git a/erpnext/accounts/search_criteria/progressive_total_excise_duty/progressive_total_excise_duty.py b/erpnext/accounts/search_criteria/progressive_total_excise_duty/progressive_total_excise_duty.py deleted file mode 100644 index 3cac1676756..00000000000 --- a/erpnext/accounts/search_criteria/progressive_total_excise_duty/progressive_total_excise_duty.py +++ /dev/null @@ -1,86 +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 . - -# Add columns -# ----------- -row_list = [['Date', 'Date', '150px', ''] - ,['INVOICE', 'Date', '150px', ''] - ,['Baisc Excise Duty', 'Currency', '150px', ''] - ,['Education Cess', 'Currency', '150px', ''] - ,['S.H.Education Cess', 'Currency', '150px', ''] - ,['Remarks', 'Data', '150px', ''] -] - -for r in row_list: - colnames.append(r[0]) - coltypes.append(r[1]) - colwidths.append(r[2]) - coloptions.append(r[3]) - col_idx[r[0]] = len(colnames)-1 - -# Get Object Of GL Control -#import webnotes -#import webnotes.model.code -#from webnotes.model.code import get_obj -#glc = webnotes.model.code.get_obj('GL Control') - -# Get Year Start Date -ysd = sql("select year_start_date from `tabFiscal Year` where name='%s'" % filter_values['fiscal_year']) -ysd = ysd and ysd[0][0] or '' - -# get as_on_date for opening -as_on_date = '' -if filter_values.get('posting_date'): - as_on_date = add_days(filter_values['posting_date'], -1) - -# Get Opening Balance -def get_opening_balance(acc, fy, as_on_date, ysd, get_opening_balance): - #import webnotes - #import webnotes.model.code - #from webnotes.model.code import get_obj - #glc = webnotes.model.code.get_obj('GL Control') - glc = get_obj('GL Control') - acc_det = sql("select debit_or_credit, is_pl_account, lft, rgt, group_or_ledger from tabAccount where name = '%s'" % acc) - return glc.get_as_on_balance(acc, fy, as_on_date, acc_det[0][0], acc_det[0][2], acc_det[0][3])[2] - -cum_sum_main_acc_head = cum_sum_add_acc_head = cum_sum_cvd_acc_head = cum_sum_edu_cess_acc_head = cum_sum_sh_edu_cess_acc_head = 0 -openg_main_acc_head = openg_add_acc_head = openg_cvd_acc_head = openg_edu_cess_acc_head = openg_sh_edu_cess_acc_head = 0 - -# Get Opening of Basic Excise Duty -if not filter_values['main_acc_head']: - msgprint("Please Enter Main Account Head") - raise Exception -cum_sum_main_acc_head = openg_main_acc_head = get_opening_balance(filter_values['main_acc_head'], filter_values['fiscal_year'], as_on_date, ysd, get_opening_balance) - -# Get Opening of edu_cess_acc_head -if not filter_values['edu_cess_acc_head'] : - msgprint("Please Enter Edu Cess Account Head") - raise Exception -cum_sum_edu_cess_acc_head = openg_edu_cess_acc_head = get_opening_balance(filter_values['edu_cess_acc_head'], filter_values['fiscal_year'], as_on_date, ysd, get_opening_balance) - -# Get Opening of sh_edu_cess_acc_head -if not filter_values['sh_edu_cess_acc_head'] : - msgprint("Please Enter S.H.Edu Cess Account Head") - raise Exception -cum_sum_sh_edu_cess_acc_head = openg_sh_edu_cess_acc_head = get_opening_balance(filter_values['sh_edu_cess_acc_head'], filter_values['fiscal_year'], as_on_date, ysd, get_opening_balance) - -out = [] - -out.append(['Opening Balance of Duty in Credit', '', flt(openg_main_acc_head) + flt(openg_add_acc_head) , flt(openg_edu_cess_acc_head), flt(openg_sh_edu_cess_acc_head),'']) -out += res -#if from_export == 0: -# msgprint("This is a very large report and cannot be shown in the browser as it is likely to make your browser very slow.Please click on 'Export' to open in a spreadsheet") -# raise Exception \ No newline at end of file diff --git a/erpnext/accounts/search_criteria/progressive_total_excise_duty/progressive_total_excise_duty.sql b/erpnext/accounts/search_criteria/progressive_total_excise_duty/progressive_total_excise_duty.sql deleted file mode 100644 index e43917ac4d1..00000000000 --- a/erpnext/accounts/search_criteria/progressive_total_excise_duty/progressive_total_excise_duty.sql +++ /dev/null @@ -1,28 +0,0 @@ -SELECT t1.posting_date, t1.name, SUM(CASE WHEN t2.account_head like '%(main_acc_head)s%' THEN t2.tax_amount ELSE 0.00 END), SUM(CASE WHEN t2.account_head like '%(edu_cess_acc_head)s' THEN t2.tax_amount ELSE 0.00 END), SUM(CASE WHEN t2.account_head like '%(sh_edu_cess_acc_head)s' THEN t2.tax_amount ELSE 0.00 END), '' AS remarks - FROM `tabDelivery Note` t1, `tabRV Tax Detail` t2 - WHERE t2.parent = t1.name - AND t2.parenttype = 'Delivery Note' - AND (t2.account_head LIKE '%(main_acc_head)s%%' - OR t2.account_head LIKE '%(edu_cess_acc_head)s%%' - OR t2.account_head LIKE '%(sh_edu_cess_acc_head)s%%') - AND t1.`posting_date` >= '%(posting_date)s' - AND t1.`posting_date` <= '%(posting_date1)s' - AND t1.docstatus =1 - GROUP BY t1.`name` - -UNION - -SELECT t1.posting_date, t1.name, SUM(CASE WHEN t2.account like '%(main_acc_head)s' THEN t2.credit ELSE 0.00 END), SUM(CASE WHEN t2.account like '%(edu_cess_acc_head)s' THEN t2.credit ELSE 0.00 END), SUM(CASE WHEN t2.account like '%(sh_edu_cess_acc_head)s' THEN t2.credit ELSE 0.00 END), t1.`remark` - FROM `tabJournal Voucher` t1, `tabJournal Voucher Detail` t2 - WHERE (t2.credit is not NULL OR t2.credit != '') - AND t2.credit > 0 - AND t2.parent = t1.name - AND (t2.account LIKE '%(main_acc_head)s%' - OR t2.account LIKE '%(edu_cess_acc_head)s%' - OR t2.account LIKE '%(sh_edu_cess_acc_head)s%') - AND t1.`posting_date` >= '%(posting_date)s' - AND t1.`posting_date` <= '%(posting_date1)s' - AND t1.docstatus =1 - GROUP BY t2.`parent` - -ORDER BY `posting_date`,`name` \ No newline at end of file diff --git a/erpnext/accounts/search_criteria/progressive_total_excise_duty/progressive_total_excise_duty.txt b/erpnext/accounts/search_criteria/progressive_total_excise_duty/progressive_total_excise_duty.txt deleted file mode 100644 index c8a45620f11..00000000000 --- a/erpnext/accounts/search_criteria/progressive_total_excise_duty/progressive_total_excise_duty.txt +++ /dev/null @@ -1,34 +0,0 @@ -# Search Criteria, progressive_total_excise_duty -[ - - # These values are common in all dictionaries - { - 'creation': '2012-04-03 12:49:52', - 'docstatus': 0, - 'modified': '2012-04-03 12:49:52', - 'modified_by': u'Administrator', - 'owner': u'jai@webnotestech.com' - }, - - # These values are common for all Search Criteria - { - 'columns': u'Journal Voucher\x01ID,Journal Voucher\x01Owner,Journal Voucher\x01Voucher Type,Journal Voucher\x01Voucher Date,Journal Voucher\x01Posting Date,Journal Voucher\x01Is Opening,Journal Voucher\x01Fiscal Year,Journal Voucher\x01Company,Journal Voucher\x01Cheque No,Journal Voucher\x01Clearance Date,Journal Voucher\x01TDS Applicable,Journal Voucher\x01TDS Category,Journal Voucher Detail\x01Account,Journal Voucher Detail\x01Cost Center,Journal Voucher Detail\x01Against Payable,Journal Voucher Detail\x01Against Receivable', - 'criteria_name': u'Progressive Total Excise Duty', - 'doc_type': u'Journal Voucher Detail', - 'doctype': 'Search Criteria', - 'filters': u"{'Journal Voucher\x01Saved':1,'Journal Voucher\x01Submitted':1,'Journal Voucher\x01Voucher Type':'','Journal Voucher\x01Is Opening':'','Journal Voucher\x01Fiscal Year':'','Journal Voucher\x01Company':'','Journal Voucher\x01TDS Applicable':'','Journal Voucher\x01TDS Category':''}", - 'module': u'Accounts', - 'name': '__common__', - 'page_len': 50, - 'parent_doc_type': u'Journal Voucher', - 'sort_by': u'ID', - 'sort_order': u'DESC', - 'standard': u'Yes' - }, - - # Search Criteria, progressive_total_excise_duty - { - 'doctype': 'Search Criteria', - 'name': u'progressive_total_excise_duty' - } -] \ No newline at end of file diff --git a/erpnext/accounts/search_criteria/service_tax_credit_account___inputs/service_tax_credit_account___inputs.js b/erpnext/accounts/search_criteria/service_tax_credit_account___inputs/service_tax_credit_account___inputs.js deleted file mode 100644 index 7c4c3312cf7..00000000000 --- a/erpnext/accounts/search_criteria/service_tax_credit_account___inputs/service_tax_credit_account___inputs.js +++ /dev/null @@ -1,43 +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 . - -report.customize_filters = function() { - this.hide_all_filters(); - this.add_filter({fieldname:'main_acc_head', label:'Main Account Head', fieldtype:'Link', options:'Account', ignore : 1, parent:'Journal Voucher Detail'}); - this.add_filter({fieldname:'edu_cess_acc_head', label:'Edu Cess Account Head', fieldtype:'Link', options:'Account', ignore : 1, parent:'Journal Voucher Detail'}); - this.add_filter({fieldname:'sh_edu_cess_acc_head', label:'S.H.Edu Cess Account Head', fieldtype:'Link', options:'Account', ignore : 1, parent:'Journal Voucher Detail'}); - - // un-hide fields - //this.add_filter({fieldname:'company', label:'Company', fieldtype:'Link', options:'Company', ignore : 1, parent:'Journal Voucher Detail'}); - //this.add_filter({fieldname:'fiscal_year', label:'Fiscal Year', fieldtype:'Link', options:'Fiscal Year', ignore : 1, parent:'Journal Voucher Detail'}); - //this.add_filter({fieldname:'posting_date', label:'Posting Date', fieldtype:'Date', ignore : 1, parent:'Journal Voucher Detail'}); - - - - this.filter_fields_dict['Journal Voucher'+FILTER_SEP +'Company'].df.filter_hide = 0; - this.filter_fields_dict['Journal Voucher'+FILTER_SEP +'Fiscal Year'].df.filter_hide = 0; - this.filter_fields_dict['Journal Voucher'+FILTER_SEP +'From Posting Date'].df.filter_hide = 0; - this.filter_fields_dict['Journal Voucher'+FILTER_SEP +'To Posting Date'].df.filter_hide = 0; - - // set defaults - this.filter_fields_dict['Journal Voucher'+FILTER_SEP +'From Posting Date'].df.in_first_page = 1; - this.filter_fields_dict['Journal Voucher'+FILTER_SEP +'To Posting Date'].df.in_first_page = 1; - - this.filter_fields_dict['Journal Voucher'+FILTER_SEP +'From Posting Date'].df['report_default'] = sys_defaults.year_start_date; - this.filter_fields_dict['Journal Voucher'+FILTER_SEP +'To Posting Date'].df['report_default'] = dateutil.obj_to_str(new Date()); - - //this.large_report = 1; -} \ No newline at end of file diff --git a/erpnext/accounts/search_criteria/service_tax_credit_account___inputs/service_tax_credit_account___inputs.py b/erpnext/accounts/search_criteria/service_tax_credit_account___inputs/service_tax_credit_account___inputs.py deleted file mode 100644 index 78b992cd7b8..00000000000 --- a/erpnext/accounts/search_criteria/service_tax_credit_account___inputs/service_tax_credit_account___inputs.py +++ /dev/null @@ -1,135 +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 . - -# Add columns -# ----------- -row_list = [['Date', 'Date', '150px', ''] - ,['ARI/INVOICE/Other Approved document/Bill of entry No.', 'Date', '150px', ''] - ,['Date', 'Date', '150px', ''] - ,['Service Tax', 'Currency', '150px', ''] - ,['Education Cess', 'Currency', '150px', ''] - ,['S.H.Education Cess', 'Currency', '150px', ''] - ,[' Service Tax ', 'Currency', '150px', ''] - ,[' Education Cess ', 'Currency', '150px', ''] - ,[' S.H.Education Cess ', 'Currency', '150px', ''] - ,['ARI/INVOICE/ Other Approved document/Bill of entry No.', 'Data', '100px', ''] - ,['Date', 'Date', '150px', ''] - ,[' Service Tax', 'Currency', '150px', ''] - ,[' Education Cess', 'Currency', '150px', ''] - ,[' S.H.Education Cess', 'Currency', '150px', ''] - ,['Service Tax ', 'Currency', '150px', ''] - ,['Education Cess ', 'Currency', '150px', ''] - ,['S.H.Education Cess ', 'Currency', '150px', ''] - ,['Remarks', 'Data', '150px', ''] -] - - -for r in row_list: - colnames.append(r[0]) - coltypes.append(r[1]) - colwidths.append(r[2]) - coloptions.append(r[3]) - col_idx[r[0]] = len(colnames)-1 - -# Get Object Of GL Control -#import webnotes -#import webnotes.model.code -#from webnotes.model.code import get_obj -#glc = webnotes.model.code.get_obj('GL Control') - -# Get Year Start Date -ysd = sql("select year_start_date from `tabFiscal Year` where name='%s'" % filter_values['fiscal_year']) -ysd = ysd and ysd[0][0] or '' - -# get as_on_date for opening -as_on_date = '' -if filter_values.get('posting_date'): - as_on_date = add_days(filter_values['posting_date'], -1) - -# Get Opening Balance -def get_opening_balance(acc, fy, as_on_date, ysd, get_opening_balance): - #import webnotes - #import webnotes.model.code - #from webnotes.model.code import get_obj - #glc = webnotes.model.code.get_obj('GL Control') - glc = get_obj('GL Control') - acc_det = sql("select debit_or_credit, is_pl_account, lft, rgt, group_or_ledger from tabAccount where name = '%s'" % acc) - return glc.get_as_on_balance(acc, fy, as_on_date, acc_det[0][0], acc_det[0][2], acc_det[0][3])[2] - -cum_sum_main_acc_head = cum_sum_edu_cess_acc_head = cum_sum_sh_edu_cess_acc_head = 0 -openg_main_acc_head = openg_edu_cess_acc_head = openg_sh_edu_cess_acc_head = 0 - -# Get Opening of Basic Excise Duty -if not filter_values['main_acc_head']: - msgprint("Please Enter Main Account Head") - raise Exception -cum_sum_main_acc_head = openg_main_acc_head = get_opening_balance(filter_values['main_acc_head'], filter_values['fiscal_year'], as_on_date, ysd, get_opening_balance) - -# Get Opening of edu_cess_acc_head -if not filter_values['edu_cess_acc_head'] : - msgprint("Please Enter Edu Cess Account Head") - raise Exception -cum_sum_edu_cess_acc_head = openg_edu_cess_acc_head = get_opening_balance(filter_values['edu_cess_acc_head'], filter_values['fiscal_year'], as_on_date, ysd, get_opening_balance) - -# Get Opening of sh_edu_cess_acc_head -if not filter_values['sh_edu_cess_acc_head'] : - msgprint("Please Enter S.H.Edu Cess Account Head") - raise Exception -cum_sum_sh_edu_cess_acc_head = openg_sh_edu_cess_acc_head = get_opening_balance(filter_values['sh_edu_cess_acc_head'], filter_values['fiscal_year'], as_on_date, ysd, get_opening_balance) - -msgprint("Column No "+ cstr(len(col_idx))) -msgprint(openg_sh_edu_cess_acc_head) -msgprint(openg_main_acc_head) -for r in res: - msgprint(r) - r[col_idx['Service Tax']] = flt(r[col_idx['Education Cess']]) - r[col_idx['Education Cess']] = flt(r[col_idx['S.H.Education Cess']]) - r[col_idx['S.H.Education Cess']] = flt(r[col_idx[' Service Tax ']]) - - remarks = r[col_idx[' Education Cess ']] - - cum_sum_main_acc_head = flt(cum_sum_main_acc_head) + flt(r[col_idx['Service Tax']]) - r[col_idx[' Service Tax ']] = cum_sum_main_acc_head - - cum_sum_edu_cess_acc_head = flt(cum_sum_edu_cess_acc_head) + flt(r[col_idx['Education Cess']]) - r[col_idx[' Education Cess ']] = cum_sum_edu_cess_acc_head - - cum_sum_sh_edu_cess_acc_head = flt(cum_sum_sh_edu_cess_acc_head) + flt(r[col_idx['S.H.Education Cess']]) - r.append(cum_sum_sh_edu_cess_acc_head) - - r.append('') - r.append('') - - r.append(0) - r.append(0) - r.append(0) - - r.append(cum_sum_main_acc_head) - r.append(cum_sum_edu_cess_acc_head) - r.append(cum_sum_sh_edu_cess_acc_head) - - r.append(remarks) - -#msgprint(len(res)) -#msgprint(query) -out = [] - -msgprint(len(['Opening Balance of Duty in Credit', '', '', '', '', '', '', '', '', '', '', '', '', '', flt(openg_main_acc_head) , flt(openg_edu_cess_acc_head), flt(openg_sh_edu_cess_acc_head)])) -out.append(['Opening Balance of Duty in Credit', '', '', '', '', '', '', '', '', '', '', '', '', '', flt(openg_main_acc_head) , flt(openg_edu_cess_acc_head), flt(openg_sh_edu_cess_acc_head)]) -out += res -#if from_export == 0: -# msgprint("This is a very large report and cannot be shown in the browser as it is likely to make your browser very slow.Please click on 'Export' to open in a spreadsheet") -# raise Exception \ No newline at end of file diff --git a/erpnext/accounts/search_criteria/service_tax_credit_account___inputs/service_tax_credit_account___inputs.sql b/erpnext/accounts/search_criteria/service_tax_credit_account___inputs/service_tax_credit_account___inputs.sql deleted file mode 100644 index 0ecbcbb5680..00000000000 --- a/erpnext/accounts/search_criteria/service_tax_credit_account___inputs/service_tax_credit_account___inputs.sql +++ /dev/null @@ -1,13 +0,0 @@ -SELECT t1.posting_date, t1.bill_no, t1.bill_date, t1.name, SUM(CASE WHEN t2.account like '%(main_acc_head)s%' THEN t2.debit ELSE 0.00 END), SUM(CASE WHEN t2.account like '%(edu_cess_acc_head)s' THEN t2.debit ELSE 0.00 END), SUM(CASE WHEN t2.account like '%(sh_edu_cess_acc_head)s' THEN t2.debit ELSE 0.00 END), t1.`remark` - FROM `tabJournal Voucher` t1, `tabJournal Voucher Detail` t2 - WHERE (t2.debit is not NULL OR t2.debit != '') - AND t2.debit > 0 - AND t2.parent = t1.name - AND (t2.account LIKE '%(main_acc_head)s%%' - OR t2.account LIKE '%(edu_cess_acc_head)s%%' - OR t2.account LIKE '%(sh_edu_cess_acc_head)s%%') - AND t1.`posting_date` >= '%(posting_date)s' - AND t1.`posting_date` <= '%(posting_date1)s' - AND t1.docstatus =1 - GROUP BY t2.`parent` - ORDER BY t1.`posting_date`,t1.`name` \ No newline at end of file diff --git a/erpnext/accounts/search_criteria/service_tax_credit_account___inputs/service_tax_credit_account___inputs.txt b/erpnext/accounts/search_criteria/service_tax_credit_account___inputs/service_tax_credit_account___inputs.txt deleted file mode 100644 index cccd8d3d5a9..00000000000 --- a/erpnext/accounts/search_criteria/service_tax_credit_account___inputs/service_tax_credit_account___inputs.txt +++ /dev/null @@ -1,34 +0,0 @@ -# Search Criteria, service_tax_credit_account_-_inputs -[ - - # These values are common in all dictionaries - { - 'creation': '2012-04-03 12:49:52', - 'docstatus': 0, - 'modified': '2012-04-03 12:49:52', - 'modified_by': u'Administrator', - 'owner': u'jai@webnotestech.com' - }, - - # These values are common for all Search Criteria - { - 'columns': u'Journal Voucher\x01ID,Journal Voucher\x01Owner,Journal Voucher\x01Voucher Type,Journal Voucher\x01Voucher Date,Journal Voucher\x01Posting Date,Journal Voucher\x01Is Opening,Journal Voucher\x01Fiscal Year,Journal Voucher\x01Company,Journal Voucher\x01Cheque No,Journal Voucher\x01Clearance Date,Journal Voucher\x01TDS Applicable,Journal Voucher\x01TDS Category,Journal Voucher Detail\x01Account,Journal Voucher Detail\x01Cost Center,Journal Voucher Detail\x01Against Payable,Journal Voucher Detail\x01Against Receivable', - 'criteria_name': u'Service Tax Credit Account - Inputs', - 'doc_type': u'Journal Voucher Detail', - 'doctype': 'Search Criteria', - 'filters': u"{'Journal Voucher\x01Saved':1,'Journal Voucher\x01Submitted':1,'Journal Voucher\x01Voucher Type':'','Journal Voucher\x01Is Opening':'','Journal Voucher\x01Fiscal Year':'','Journal Voucher\x01Company':'','Journal Voucher\x01TDS Applicable':'','Journal Voucher\x01TDS Category':''}", - 'module': u'Accounts', - 'name': '__common__', - 'page_len': 50, - 'parent_doc_type': u'Journal Voucher', - 'sort_by': u'ID', - 'sort_order': u'DESC', - 'standard': u'Yes' - }, - - # Search Criteria, service_tax_credit_account_-_inputs - { - 'doctype': 'Search Criteria', - 'name': u'service_tax_credit_account_-_inputs' - } -] \ No newline at end of file diff --git a/erpnext/accounts/search_criteria/total_amout_collection_for_a_period___customerwise/total_amout_collection_for_a_period___customerwise.js b/erpnext/accounts/search_criteria/total_amout_collection_for_a_period___customerwise/total_amout_collection_for_a_period___customerwise.js deleted file mode 100644 index 72fd4b5faaf..00000000000 --- a/erpnext/accounts/search_criteria/total_amout_collection_for_a_period___customerwise/total_amout_collection_for_a_period___customerwise.js +++ /dev/null @@ -1,42 +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 . - -report.customize_filters = function() { - this.hide_all_filters(); - - this.add_filter({fieldname:'transaction_date', label:'Date', fieldtype:'Date', options:'',ignore : 1, parent:'Account'}); - - this.filter_fields_dict['Account'+FILTER_SEP +'Company'].df.filter_hide = 0; - this.filter_fields_dict['Account'+FILTER_SEP +'From Date'].df.filter_hide = 0; - this.filter_fields_dict['Account'+FILTER_SEP +'To Date'].df.filter_hide = 0; - - this.filter_fields_dict['Account'+FILTER_SEP +'From Date'].df.in_first_page = 1; - this.filter_fields_dict['Account'+FILTER_SEP +'To Date'].df.in_first_page = 1; - this.filter_fields_dict['Account'+FILTER_SEP +'Company'].df.in_first_page = 1; - - this.filter_fields_dict['Account'+FILTER_SEP +'From Date'].df['report_default']=sys_defaults.year_start_date; - this.filter_fields_dict['Account'+FILTER_SEP +'To Date'].df['report_default']=dateutil.obj_to_str(new Date()); - this.filter_fields_dict['Account'+FILTER_SEP+'Company'].df['report_default']=sys_defaults.company; - - this.dt.set_no_limit(1); - - report.aftertableprint = function(t) { - $yt(t,'*',1,{whiteSpace:'pre'}); - } -} - -this.mytabs.items['Select Columns'].hide(); -this.mytabs.items['More Filters'].hide(); \ No newline at end of file diff --git a/erpnext/accounts/search_criteria/total_amout_collection_for_a_period___customerwise/total_amout_collection_for_a_period___customerwise.py b/erpnext/accounts/search_criteria/total_amout_collection_for_a_period___customerwise/total_amout_collection_for_a_period___customerwise.py deleted file mode 100644 index c3f819fc255..00000000000 --- a/erpnext/accounts/search_criteria/total_amout_collection_for_a_period___customerwise/total_amout_collection_for_a_period___customerwise.py +++ /dev/null @@ -1,60 +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 . - -# columns -colnames[0] = 'Account' -col_idx['Account'] = 0 -coltypes[0] = 'Link' -coloptions[0] = 'Account' -colwidths[0] = '200px' - -cl = [['Debit', 'Data', '100px'],['Credit', 'Data', '100px']] -for c in cl: - colnames.append(c[0]) - coltypes.append(c[1]) - colwidths.append(c[2]) - coloptions.append('') - col_idx[c[0]] = len(colnames)-1 - - -# transaction date -if not filter_values.get('transaction_date') or not filter_values.get('transaction_date1'): - msgprint("Please enter From Date and To Date") - raise Exception -else: - from_date = add_days(filter_values['transaction_date'], -1) - to_date = filter_values['transaction_date1'] - -# if output is more than 300 lines then it will ask to export -if len(res) > 300 and from_export == 0: - msgprint("This is a very large report and cannot be shown in the browser as it is likely to make your browser very slow.Please click on 'Export' to open in a spreadsheet") - raise Exception - -total_debit, total_credit = 0,0 - -for r in res: - amount = sql("select sum(debit), sum(credit) from `tabGL Entry` WHERE posting_date >= '%s' AND posting_date <= '%s' and ifnull(is_opening,'No') = 'No' AND account = '%s' AND ifnull(is_cancelled, 'No') = 'No'" % (from_date,to_date, r[col_idx['Account']].strip())) - total_debit = flt(total_debit) + flt(amount[0][0]) - total_credit = flt(total_credit) + flt(amount[0][1]) - - r.append(flt(amount[0][0])) - r.append(flt(amount[0][1])) - -t_row = ['' for i in range(len(colnames))] -t_row[col_idx['Account']] = 'Total' -t_row[col_idx['Debit']] = total_debit -t_row[col_idx['Credit']] = total_credit -res.append(t_row) \ No newline at end of file diff --git a/erpnext/accounts/search_criteria/total_amout_collection_for_a_period___customerwise/total_amout_collection_for_a_period___customerwise.txt b/erpnext/accounts/search_criteria/total_amout_collection_for_a_period___customerwise/total_amout_collection_for_a_period___customerwise.txt deleted file mode 100644 index d3b1065fe60..00000000000 --- a/erpnext/accounts/search_criteria/total_amout_collection_for_a_period___customerwise/total_amout_collection_for_a_period___customerwise.txt +++ /dev/null @@ -1,36 +0,0 @@ -# Search Criteria, total_amout_collection_for_a_period_-_customerwise -[ - - # These values are common in all dictionaries - { - 'creation': '2012-04-03 12:49:53', - 'docstatus': 0, - 'modified': '2012-04-03 12:49:53', - 'modified_by': u'Administrator', - 'owner': u'Administrator' - }, - - # These values are common for all Search Criteria - { - 'add_cond': u'(master_type = "Customer" or parent_account like "Sundry Debtors%" or parent_account like "Accounts Receivable%")', - 'columns': u'Account\x01ID', - 'criteria_name': u'Total amout collection for a period - Customerwise', - 'dis_filters': u'transaction_date', - 'disabled': 0, - 'doc_type': u'Account', - 'doctype': 'Search Criteria', - 'filters': u"{'Account\x01Saved':1,'Account\x01Group or Ledger':'','Account\x01Is PL Account':'','Account\x01Account Type':'','Account\x01From Date\x01lower':'2010-04-01','Account\x01To Date\x01upper':'2010-06-09'}", - 'module': u'Accounts', - 'name': '__common__', - 'page_len': 50, - 'sort_by': u'`tabAccount`.`name`', - 'sort_order': u'DESC', - 'standard': u'Yes' - }, - - # Search Criteria, total_amout_collection_for_a_period_-_customerwise - { - 'doctype': 'Search Criteria', - 'name': u'total_amout_collection_for_a_period_-_customerwise' - } -] \ No newline at end of file diff --git a/erpnext/analysis/doctype/__init__.py b/erpnext/accounts/search_criteria/trend_analyzer/__init__.py similarity index 100% rename from erpnext/analysis/doctype/__init__.py rename to erpnext/accounts/search_criteria/trend_analyzer/__init__.py diff --git a/erpnext/analysis/search_criteria/trend_analyzer/trend_analyzer.js b/erpnext/accounts/search_criteria/trend_analyzer/trend_analyzer.js similarity index 100% rename from erpnext/analysis/search_criteria/trend_analyzer/trend_analyzer.js rename to erpnext/accounts/search_criteria/trend_analyzer/trend_analyzer.js diff --git a/erpnext/analysis/search_criteria/trend_analyzer/trend_analyzer.py b/erpnext/accounts/search_criteria/trend_analyzer/trend_analyzer.py similarity index 100% rename from erpnext/analysis/search_criteria/trend_analyzer/trend_analyzer.py rename to erpnext/accounts/search_criteria/trend_analyzer/trend_analyzer.py diff --git a/erpnext/analysis/search_criteria/trend_analyzer/trend_analyzer.txt b/erpnext/accounts/search_criteria/trend_analyzer/trend_analyzer.txt similarity index 96% rename from erpnext/analysis/search_criteria/trend_analyzer/trend_analyzer.txt rename to erpnext/accounts/search_criteria/trend_analyzer/trend_analyzer.txt index 8ba19cf3f14..93a60e05c28 100644 --- a/erpnext/analysis/search_criteria/trend_analyzer/trend_analyzer.txt +++ b/erpnext/accounts/search_criteria/trend_analyzer/trend_analyzer.txt @@ -17,7 +17,7 @@ 'doc_type': u'Profile', 'doctype': 'Search Criteria', 'filters': u'{}', - 'module': u'Analysis', + 'module': u'Accounts', 'name': '__common__', 'page_len': 50, 'sort_by': u'`tabProfile`.`name`', @@ -30,4 +30,4 @@ 'doctype': 'Search Criteria', 'name': u'trend_analyzer' } -] \ No newline at end of file +] diff --git a/erpnext/analysis/doctype/mis_control/__init__.py b/erpnext/accounts/search_criteria/yearly_transaction_summary/__init__.py similarity index 100% rename from erpnext/analysis/doctype/mis_control/__init__.py rename to erpnext/accounts/search_criteria/yearly_transaction_summary/__init__.py diff --git a/erpnext/analysis/search_criteria/yearly_transaction_summary/yearly_transaction_summary.js b/erpnext/accounts/search_criteria/yearly_transaction_summary/yearly_transaction_summary.js similarity index 100% rename from erpnext/analysis/search_criteria/yearly_transaction_summary/yearly_transaction_summary.js rename to erpnext/accounts/search_criteria/yearly_transaction_summary/yearly_transaction_summary.js diff --git a/erpnext/analysis/search_criteria/yearly_transaction_summary/yearly_transaction_summary.py b/erpnext/accounts/search_criteria/yearly_transaction_summary/yearly_transaction_summary.py similarity index 100% rename from erpnext/analysis/search_criteria/yearly_transaction_summary/yearly_transaction_summary.py rename to erpnext/accounts/search_criteria/yearly_transaction_summary/yearly_transaction_summary.py diff --git a/erpnext/analysis/search_criteria/yearly_transaction_summary/yearly_transaction_summary.sql b/erpnext/accounts/search_criteria/yearly_transaction_summary/yearly_transaction_summary.sql similarity index 100% rename from erpnext/analysis/search_criteria/yearly_transaction_summary/yearly_transaction_summary.sql rename to erpnext/accounts/search_criteria/yearly_transaction_summary/yearly_transaction_summary.sql diff --git a/erpnext/analysis/search_criteria/yearly_transaction_summary/yearly_transaction_summary.txt b/erpnext/accounts/search_criteria/yearly_transaction_summary/yearly_transaction_summary.txt similarity index 96% rename from erpnext/analysis/search_criteria/yearly_transaction_summary/yearly_transaction_summary.txt rename to erpnext/accounts/search_criteria/yearly_transaction_summary/yearly_transaction_summary.txt index c86f1e8e35f..122d1d173f6 100644 --- a/erpnext/analysis/search_criteria/yearly_transaction_summary/yearly_transaction_summary.txt +++ b/erpnext/accounts/search_criteria/yearly_transaction_summary/yearly_transaction_summary.txt @@ -17,7 +17,7 @@ 'doc_type': u'Profile', 'doctype': 'Search Criteria', 'filters': u"{'DocType\x01Fiscal Year':'2009-2010','DocType\x01Company':'Alpha Company','DocType\x01Period':'Monthly'}", - 'module': u'Analysis', + 'module': u'Accounts', 'name': '__common__', 'sort_by': u'`tabProfile`.`name`', 'sort_order': u'DESC', @@ -29,4 +29,4 @@ 'doctype': 'Search Criteria', 'name': u'yearly_transaction_summary' } -] \ No newline at end of file +] diff --git a/erpnext/analysis/Module Def/Analysis/Analysis.txt b/erpnext/analysis/Module Def/Analysis/Analysis.txt deleted file mode 100644 index 97bbb43fbe7..00000000000 --- a/erpnext/analysis/Module Def/Analysis/Analysis.txt +++ /dev/null @@ -1,253 +0,0 @@ -[ - { - '_last_update': '1300959286', - 'creation': '2010-11-30 17:31:05', - 'disabled': 'No', - 'docstatus': 0, - 'doctype': u'Module Def', - 'doctype_list': None, - 'file_list': None, - 'idx': None, - 'is_hidden': 'No', - 'last_updated_date': '2010-12-02 09:25:40', - 'modified': '2011-03-24 15:28:54', - 'modified_by': 'Administrator', - 'module_desc': None, - 'module_icon': 'chart.png', - 'module_label': 'Analysis', - 'module_name': 'Analysis', - 'module_page': None, - 'module_seq': 10, - 'name': 'Analysis', - 'owner': 'Administrator', - 'parent': None, - 'parentfield': None, - 'parenttype': None, - 'trash_reason': None, - 'widget_code': None - }, - { - 'click_function': None, - 'creation': '2011-03-24 12:00:50', - 'description': None, - 'display_name': None, - 'doc_name': 'Reports', - 'doc_type': 'Separator', - 'docstatus': 0, - 'doctype': 'Module Def Item', - 'fields': None, - 'hide': None, - 'icon': None, - 'idx': 1, - 'modified': '2011-03-24 15:28:54', - 'modified_by': 'Administrator', - 'name': '000003012', - 'owner': 'Administrator', - 'parent': 'Analysis', - 'parentfield': 'items', - 'parenttype': 'Module Def' - }, - { - 'click_function': None, - 'creation': '2011-03-24 12:00:50', - 'description': None, - 'display_name': 'Yearly Transaction Summary', - 'doc_name': 'Profile', - 'doc_type': 'Reports', - 'docstatus': 0, - 'doctype': 'Module Def Item', - 'fields': None, - 'hide': None, - 'icon': None, - 'idx': 2, - 'modified': '2011-03-24 15:28:54', - 'modified_by': 'Administrator', - 'name': '000003014', - 'owner': 'Administrator', - 'parent': 'Analysis', - 'parentfield': 'items', - 'parenttype': 'Module Def' - }, - { - 'click_function': None, - 'creation': '2010-11-30 17:31:05', - 'description': 'A quick glance at your work in progress and pipeline', - 'display_name': 'Work in Progress Monitor', - 'doc_name': 'WIP Monitor', - 'doc_type': 'Pages', - 'docstatus': 0, - 'doctype': 'Module Def Item', - 'fields': None, - 'hide': None, - 'icon': 'magnifier.gif', - 'idx': 3, - 'modified': '2011-03-24 15:28:54', - 'modified_by': 'Administrator', - 'name': 'MDI00063', - 'owner': 'Administrator', - 'parent': 'Analysis', - 'parentfield': 'items', - 'parenttype': 'Module Def' - }, - { - 'click_function': None, - 'creation': '2011-03-24 12:00:50', - 'description': 'Analyze trend of sales, purchase and stock over any period', - 'display_name': 'Monthly Trend Analyzer', - 'doc_name': 'Profile', - 'doc_type': 'Reports', - 'docstatus': 0, - 'doctype': 'Module Def Item', - 'fields': None, - 'hide': None, - 'icon': 'chart_bar.gif', - 'idx': 4, - 'modified': '2011-03-24 15:28:54', - 'modified_by': 'Administrator', - 'name': '000003013', - 'owner': 'saumil@webnotestech.com', - 'parent': 'Analysis', - 'parentfield': 'items', - 'parenttype': 'Module Def' - }, - { - 'click_function': None, - 'creation': '2011-03-24 12:00:50', - 'description': None, - 'display_name': None, - 'doc_name': 'Reports', - 'doc_type': 'Separator', - 'docstatus': 0, - 'doctype': 'Module Def Item', - 'fields': None, - 'hide': None, - 'icon': None, - 'idx': 1, - 'modified': '2011-03-24 15:28:54', - 'modified_by': 'Administrator', - 'name': '000003012', - 'owner': 'Administrator', - 'parent': 'Analysis', - 'parentfield': 'items', - 'parenttype': 'Module Def' - }, - { - 'click_function': None, - 'creation': '2011-03-24 12:00:50', - 'description': None, - 'display_name': 'Yearly Transaction Summary', - 'doc_name': 'Profile', - 'doc_type': 'Reports', - 'docstatus': 0, - 'doctype': 'Module Def Item', - 'fields': None, - 'hide': None, - 'icon': None, - 'idx': 2, - 'modified': '2011-03-24 15:28:54', - 'modified_by': 'Administrator', - 'name': '000003014', - 'owner': 'Administrator', - 'parent': 'Analysis', - 'parentfield': 'items', - 'parenttype': 'Module Def' - }, - { - 'click_function': None, - 'creation': '2010-11-30 17:31:05', - 'description': 'A quick glance at your work in progress and pipeline', - 'display_name': 'Work in Progress Monitor', - 'doc_name': 'WIP Monitor', - 'doc_type': 'Pages', - 'docstatus': 0, - 'doctype': 'Module Def Item', - 'fields': None, - 'hide': None, - 'icon': 'magnifier.gif', - 'idx': 3, - 'modified': '2011-03-24 15:28:54', - 'modified_by': 'Administrator', - 'name': 'MDI00063', - 'owner': 'Administrator', - 'parent': 'Analysis', - 'parentfield': 'items', - 'parenttype': 'Module Def' - }, - { - 'click_function': None, - 'creation': '2011-03-24 12:00:50', - 'description': 'Analyze trend of sales, purchase and stock over any period', - 'display_name': 'Monthly Trend Analyzer', - 'doc_name': 'Profile', - 'doc_type': 'Reports', - 'docstatus': 0, - 'doctype': 'Module Def Item', - 'fields': None, - 'hide': None, - 'icon': 'chart_bar.gif', - 'idx': 4, - 'modified': '2011-03-24 15:28:54', - 'modified_by': 'Administrator', - 'name': '000003013', - 'owner': 'saumil@webnotestech.com', - 'parent': 'Analysis', - 'parentfield': 'items', - 'parenttype': 'Module Def' - }, - { - 'creation': '2010-11-30 17:31:05', - 'docstatus': 0, - 'doctype': 'Module Def Role', - 'idx': 1, - 'modified': '2011-03-24 15:28:54', - 'modified_by': 'Administrator', - 'name': 'MDR00004', - 'owner': 'saumil@webnotestech.com', - 'parent': 'Analysis', - 'parentfield': 'roles', - 'parenttype': 'Module Def', - 'role': 'Sales Manager' - }, - { - 'creation': '2010-11-30 17:31:05', - 'docstatus': 0, - 'doctype': 'Module Def Role', - 'idx': 2, - 'modified': '2011-03-24 15:28:54', - 'modified_by': 'Administrator', - 'name': 'MDR00005', - 'owner': 'saumil@webnotestech.com', - 'parent': 'Analysis', - 'parentfield': 'roles', - 'parenttype': 'Module Def', - 'role': 'Purchase Manager' - }, - { - 'creation': '2010-11-30 17:31:05', - 'docstatus': 0, - 'doctype': 'Module Def Role', - 'idx': 3, - 'modified': '2011-03-24 15:28:54', - 'modified_by': 'Administrator', - 'name': 'MDR00006', - 'owner': 'saumil@webnotestech.com', - 'parent': 'Analysis', - 'parentfield': 'roles', - 'parenttype': 'Module Def', - 'role': 'Material Manager' - }, - { - 'creation': '2010-11-30 17:31:05', - 'docstatus': 0, - 'doctype': 'Module Def Role', - 'idx': 4, - 'modified': '2011-03-24 15:28:54', - 'modified_by': 'Administrator', - 'name': 'MDR00007', - 'owner': 'saumil@webnotestech.com', - 'parent': 'Analysis', - 'parentfield': 'roles', - 'parenttype': 'Module Def', - 'role': 'Accounts Manager' - } -] \ No newline at end of file diff --git a/erpnext/analysis/search_criteria/yearly_transaction_summary/__init__.py b/erpnext/analysis/search_criteria/yearly_transaction_summary/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/erpnext/home/Module Def/Home/Home.txt b/erpnext/home/Module Def/Home/Home.txt deleted file mode 100644 index 7613ee8ec34..00000000000 --- a/erpnext/home/Module Def/Home/Home.txt +++ /dev/null @@ -1,28 +0,0 @@ -[ - { - 'creation': '2011-06-09 16:14:42', - 'disabled': 'No', - 'docstatus': 0, - 'doctype': 'Module Def', - 'doctype_list': None, - 'file_list': None, - 'idx': None, - 'is_hidden': 'No', - 'last_updated_date': None, - 'modified': '2011-06-09 16:57:36', - 'modified_by': 'Administrator', - 'module_desc': None, - 'module_icon': None, - 'module_label': 'Home', - 'module_name': 'Home', - 'module_page': 'Event Updates', - 'module_seq': -1, - 'name': 'Home', - 'owner': 'Administrator', - 'parent': None, - 'parentfield': None, - 'parenttype': None, - 'trash_reason': None, - 'widget_code': None - } -] \ No newline at end of file diff --git a/erpnext/home/search_criteria/__init__.py b/erpnext/home/search_criteria/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/erpnext/home/search_criteria/invoices_overdue/__init__.py b/erpnext/home/search_criteria/invoices_overdue/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/erpnext/home/search_criteria/invoices_to_be_submitted/__init__.py b/erpnext/home/search_criteria/invoices_to_be_submitted/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/erpnext/home/search_criteria/invoices_to_be_submitted/invoices_to_be_submitted.txt b/erpnext/home/search_criteria/invoices_to_be_submitted/invoices_to_be_submitted.txt deleted file mode 100644 index 79fe9b1da35..00000000000 --- a/erpnext/home/search_criteria/invoices_to_be_submitted/invoices_to_be_submitted.txt +++ /dev/null @@ -1,33 +0,0 @@ -# Search Criteria, invoices-to_be_submitted -[ - - # These values are common in all dictionaries - { - 'creation': '2012-04-03 12:49:51', - 'docstatus': 0, - 'modified': '2012-04-03 12:49:51', - 'modified_by': u'Administrator', - 'owner': u'Administrator' - }, - - # These values are common for all Search Criteria - { - 'columns': u'Sales Invoice\x01ID,Sales Invoice\x01Debit To,Sales Invoice\x01Voucher Date,Sales Invoice\x01Due Date', - 'criteria_name': u'Invoices-To be submitted', - 'doc_type': u'Sales Invoice', - 'doctype': 'Search Criteria', - 'filters': u"{'Sales Invoice\x01Saved':1,'Sales Invoice\x01Is Opening':'','Sales Invoice\x01Fiscal Year':''}", - 'module': u'Home', - 'name': '__common__', - 'page_len': 50, - 'sort_by': u'`tabSales Invoice`.`name`', - 'sort_order': u'DESC', - 'standard': u'Yes' - }, - - # Search Criteria, invoices-to_be_submitted - { - 'doctype': 'Search Criteria', - 'name': u'invoices-to_be_submitted' - } -] \ No newline at end of file diff --git a/erpnext/home/search_criteria/invoices_to_receive_payment/__init__.py b/erpnext/home/search_criteria/invoices_to_receive_payment/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/erpnext/home/search_criteria/invoices_to_receive_payment/invoices_to_receive_payment.txt b/erpnext/home/search_criteria/invoices_to_receive_payment/invoices_to_receive_payment.txt deleted file mode 100644 index de0c203d9cf..00000000000 --- a/erpnext/home/search_criteria/invoices_to_receive_payment/invoices_to_receive_payment.txt +++ /dev/null @@ -1,34 +0,0 @@ -# Search Criteria, invoices-to_receive_payment -[ - - # These values are common in all dictionaries - { - 'creation': '2012-04-03 12:49:51', - 'docstatus': 0, - 'modified': '2012-04-03 12:49:51', - 'modified_by': u'Administrator', - 'owner': u'Administrator' - }, - - # These values are common for all Search Criteria - { - 'add_cond': u'`tabSales Invoice`.due_date>now() \n`tabSales Invoice`.outstanding_amount!=0\n`tabSales Invoice`.docstatus=1', - 'columns': u'Sales Invoice\x01ID,Sales Invoice\x01Owner,Sales Invoice\x01Debit To,Sales Invoice\x01Voucher Date,Sales Invoice\x01Due Date,Sales Invoice\x01Outstanding Amount', - 'criteria_name': u'Invoices-To receive payment', - 'doc_type': u'Sales Invoice', - 'doctype': 'Search Criteria', - 'filters': u"{'Sales Invoice\x01Submitted':1,'Sales Invoice\x01Is Opening':'','Sales Invoice\x01Fiscal Year':''}", - 'module': u'Home', - 'name': '__common__', - 'page_len': 50, - 'sort_by': u'`tabSales Invoice`.`name`', - 'sort_order': u'DESC', - 'standard': u'Yes' - }, - - # Search Criteria, invoices-to_receive_payment - { - 'doctype': 'Search Criteria', - 'name': u'invoices-to_receive_payment' - } -] \ No newline at end of file diff --git a/erpnext/home/search_criteria/lead_to_follow_up/__init__.py b/erpnext/home/search_criteria/lead_to_follow_up/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/erpnext/home/search_criteria/opportunity_quotations_to_be_sent/__init__.py b/erpnext/home/search_criteria/opportunity_quotations_to_be_sent/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/erpnext/home/search_criteria/opportunity_quotations_to_be_sent/opportunity_quotations_to_be_sent.txt b/erpnext/home/search_criteria/opportunity_quotations_to_be_sent/opportunity_quotations_to_be_sent.txt deleted file mode 100644 index 891bafda7f0..00000000000 --- a/erpnext/home/search_criteria/opportunity_quotations_to_be_sent/opportunity_quotations_to_be_sent.txt +++ /dev/null @@ -1,35 +0,0 @@ -# Search Criteria, opportunity-quotations_to_be_sent -[ - - # These values are common in all dictionaries - { - 'creation': '2012-03-30 14:50:44', - 'docstatus': 0, - 'modified': '2012-03-30 14:50:44', - 'modified_by': u'Administrator', - 'owner': u'Administrator' - }, - - # These values are common for all Search Criteria - { - 'add_cond': u'`tabQuotation`.enq_no!=`tabOpportunity`.name\n', - 'add_tab': u'tabQuotation', - 'columns': u'Opportunity\x01ID,Opportunity\x01Owner', - 'criteria_name': u'Opportunity-Quotations to be sent', - 'doc_type': u'Opportunity', - 'doctype': 'Search Criteria', - 'filters': u'{}', - 'module': u'Home', - 'name': '__common__', - 'page_len': 50, - 'sort_by': u'`tabOpportunity`.`name`', - 'sort_order': u'DESC', - 'standard': u'Yes' - }, - - # Search Criteria, opportunity-quotations_to_be_sent - { - 'doctype': 'Search Criteria', - 'name': u'opportunity-quotations_to_be_sent' - } -] \ No newline at end of file diff --git a/erpnext/home/search_criteria/opportunity_to_follow_up/__init__.py b/erpnext/home/search_criteria/opportunity_to_follow_up/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/erpnext/home/search_criteria/purchase_order_to_be_billed/__init__.py b/erpnext/home/search_criteria/purchase_order_to_be_billed/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/erpnext/home/search_criteria/purchase_order_to_be_billed/purchase_order_to_be_billed.txt b/erpnext/home/search_criteria/purchase_order_to_be_billed/purchase_order_to_be_billed.txt deleted file mode 100644 index 23ad2c9129c..00000000000 --- a/erpnext/home/search_criteria/purchase_order_to_be_billed/purchase_order_to_be_billed.txt +++ /dev/null @@ -1,34 +0,0 @@ -# Search Criteria, purchase_order-to_be_billed -[ - - # These values are common in all dictionaries - { - 'creation': '2012-04-03 12:49:52', - 'docstatus': 0, - 'modified': '2012-04-03 12:49:52', - 'modified_by': u'Administrator', - 'owner': u'Administrator' - }, - - # These values are common for all Search Criteria - { - 'add_cond': u"ifnull(`tabPurchase Order`.per_billed,0)<100\n`tabPurchase Order`.status='Submitted'", - 'columns': u'Purchase Order\x01ID,Purchase Order\x01Supplier,Purchase Order\x01PO Date,Purchase Order\x01Company,Purchase Order\x01Grand Total', - 'criteria_name': u'Purchase Order-To be billed', - 'doc_type': u'Purchase Order', - 'doctype': 'Search Criteria', - 'filters': u"{'Purchase Order\x01Submitted':1,'Purchase Order\x01Status':'Submitted','Purchase Order\x01Fiscal Year':''}", - 'module': u'Home', - 'name': '__common__', - 'page_len': 50, - 'sort_by': u'`tabPurchase Order`.`name`', - 'sort_order': u'DESC', - 'standard': u'Yes' - }, - - # Search Criteria, purchase_order-to_be_billed - { - 'doctype': 'Search Criteria', - 'name': u'purchase_order-to_be_billed' - } -] \ No newline at end of file diff --git a/erpnext/home/search_criteria/purchase_order_to_be_submitted/__init__.py b/erpnext/home/search_criteria/purchase_order_to_be_submitted/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/erpnext/home/search_criteria/purchase_order_to_be_submitted/purchase_order_to_be_submitted.txt b/erpnext/home/search_criteria/purchase_order_to_be_submitted/purchase_order_to_be_submitted.txt deleted file mode 100644 index d3f144d19e8..00000000000 --- a/erpnext/home/search_criteria/purchase_order_to_be_submitted/purchase_order_to_be_submitted.txt +++ /dev/null @@ -1,33 +0,0 @@ -# Search Criteria, purchase_order-to_be_submitted -[ - - # These values are common in all dictionaries - { - 'creation': '2012-04-03 12:49:52', - 'docstatus': 0, - 'modified': '2012-04-03 12:49:52', - 'modified_by': u'Administrator', - 'owner': u'Administrator' - }, - - # These values are common for all Search Criteria - { - 'columns': u'Purchase Order\x01ID,Purchase Order\x01Supplier,Purchase Order\x01PO Date,Purchase Order\x01Company,Purchase Order\x01Grand Total', - 'criteria_name': u'Purchase Order-To be submitted', - 'doc_type': u'Purchase Order', - 'doctype': 'Search Criteria', - 'filters': u"{'Purchase Order\x01Saved':1,'Purchase Order\x01Submitted':0,'Purchase Order\x01Status':'Draft','Purchase Order\x01Fiscal Year':''}", - 'module': u'Home', - 'name': '__common__', - 'page_len': 50, - 'sort_by': u'`tabPurchase Order`.`name`', - 'sort_order': u'DESC', - 'standard': u'Yes' - }, - - # Search Criteria, purchase_order-to_be_submitted - { - 'doctype': 'Search Criteria', - 'name': u'purchase_order-to_be_submitted' - } -] \ No newline at end of file diff --git a/erpnext/home/search_criteria/purchase_order_to_receive_items/__init__.py b/erpnext/home/search_criteria/purchase_order_to_receive_items/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/erpnext/home/search_criteria/purchase_order_to_receive_items/purchase_order_to_receive_items.txt b/erpnext/home/search_criteria/purchase_order_to_receive_items/purchase_order_to_receive_items.txt deleted file mode 100644 index 153b05f8852..00000000000 --- a/erpnext/home/search_criteria/purchase_order_to_receive_items/purchase_order_to_receive_items.txt +++ /dev/null @@ -1,34 +0,0 @@ -# Search Criteria, purchase_order-to_receive_items -[ - - # These values are common in all dictionaries - { - 'creation': '2012-04-03 12:49:52', - 'docstatus': 0, - 'modified': '2012-04-03 12:49:52', - 'modified_by': u'Administrator', - 'owner': u'Administrator' - }, - - # These values are common for all Search Criteria - { - 'add_cond': u"ifnull(`tabPurchase Order`.per_received,0)<100\n`tabPurchase Order`.status='Submitted'", - 'columns': u'Purchase Order\x01ID,Purchase Order\x01Supplier,Purchase Order\x01PO Date,Purchase Order\x01Company,Purchase Order\x01% Received,Purchase Order\x01Grand Total', - 'criteria_name': u'Purchase Order-To receive items', - 'doc_type': u'Purchase Order', - 'doctype': 'Search Criteria', - 'filters': u"{'Purchase Order\x01Submitted':1,'Purchase Order\x01Status':'Submitted','Purchase Order\x01Fiscal Year':''}", - 'module': u'Home', - 'name': '__common__', - 'page_len': 50, - 'sort_by': u'`tabPurchase Order`.`name`', - 'sort_order': u'DESC', - 'standard': u'Yes' - }, - - # Search Criteria, purchase_order-to_receive_items - { - 'doctype': 'Search Criteria', - 'name': u'purchase_order-to_receive_items' - } -] \ No newline at end of file diff --git a/erpnext/home/search_criteria/purchase_request_purchase_order_to_be_made/__init__.py b/erpnext/home/search_criteria/purchase_request_purchase_order_to_be_made/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/erpnext/home/search_criteria/purchase_request_purchase_order_to_be_made/purchase_request_purchase_order_to_be_made.txt b/erpnext/home/search_criteria/purchase_request_purchase_order_to_be_made/purchase_request_purchase_order_to_be_made.txt deleted file mode 100644 index e40868ba03d..00000000000 --- a/erpnext/home/search_criteria/purchase_request_purchase_order_to_be_made/purchase_request_purchase_order_to_be_made.txt +++ /dev/null @@ -1,34 +0,0 @@ -# Search Criteria, purchase_request-purchase_order_to_be_made -[ - - # These values are common in all dictionaries - { - 'creation': '2012-03-30 13:33:32', - 'docstatus': 0, - 'modified': '2012-03-30 13:33:32', - 'modified_by': u'Administrator', - 'owner': u'Administrator' - }, - - # These values are common for all Search Criteria - { - 'add_cond': u"`tabPurchase Request`.status='Submitted'\nifnull(`tabPurchase Request`.per_ordered,0)<100", - 'columns': u'Purchase Request\x01ID,Purchase Request\x01Purchase Request Date,Purchase Request\x01Requested By,Purchase Request\x01Owner,Purchase Request\x01% Ordered', - 'criteria_name': u'Purchase Request-Purchase Order to be made', - 'doc_type': u'Purchase Request', - 'doctype': 'Search Criteria', - 'filters': u"{'Purchase Request\x01Submitted':1,'Purchase Request\x01Status':'Submitted','Purchase Request\x01Fiscal Year':''}", - 'module': u'Home', - 'name': '__common__', - 'page_len': 50, - 'sort_by': u'`tabPurchase Request`.`name`', - 'sort_order': u'DESC', - 'standard': u'Yes' - }, - - # Search Criteria, purchase_request-purchase_order_to_be_made - { - 'doctype': 'Search Criteria', - 'name': u'purchase_request-purchase_order_to_be_made' - } -] \ No newline at end of file diff --git a/erpnext/home/search_criteria/purchase_request_to_be_submitted/__init__.py b/erpnext/home/search_criteria/purchase_request_to_be_submitted/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/erpnext/home/search_criteria/purchase_request_to_be_submitted/purchase_request_to_be_submitted.txt b/erpnext/home/search_criteria/purchase_request_to_be_submitted/purchase_request_to_be_submitted.txt deleted file mode 100644 index 1fc78d1f340..00000000000 --- a/erpnext/home/search_criteria/purchase_request_to_be_submitted/purchase_request_to_be_submitted.txt +++ /dev/null @@ -1,34 +0,0 @@ -# Search Criteria, purchase_request-to_be_submitted -[ - - # These values are common in all dictionaries - { - 'creation': '2012-03-30 13:33:32', - 'docstatus': 0, - 'modified': '2012-03-30 13:33:32', - 'modified_by': u'Administrator', - 'owner': u'Administrator' - }, - - # These values are common for all Search Criteria - { - 'add_cond': u"`tabPurchase Request`.status='Draft'", - 'columns': u'Purchase Request\x01ID,Purchase Request\x01Owner,Purchase Request\x01Purchase Request Date,Purchase Request\x01Remarks', - 'criteria_name': u'Purchase Request-To be submitted', - 'doc_type': u'Purchase Request', - 'doctype': 'Search Criteria', - 'filters': u"{'Purchase Request\x01Saved':1,'Purchase Request\x01Status':'Draft','Purchase Request\x01Fiscal Year':''}", - 'module': u'Home', - 'name': '__common__', - 'page_len': 50, - 'sort_by': u'`tabPurchase Request`.`name`', - 'sort_order': u'DESC', - 'standard': u'Yes' - }, - - # Search Criteria, purchase_request-to_be_submitted - { - 'doctype': 'Search Criteria', - 'name': u'purchase_request-to_be_submitted' - } -] \ No newline at end of file diff --git a/erpnext/home/search_criteria/sales_order_overdue/__init__.py b/erpnext/home/search_criteria/sales_order_overdue/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/erpnext/home/search_criteria/sales_order_overdue/sales_order_overdue.txt b/erpnext/home/search_criteria/sales_order_overdue/sales_order_overdue.txt deleted file mode 100644 index 5de39316d61..00000000000 --- a/erpnext/home/search_criteria/sales_order_overdue/sales_order_overdue.txt +++ /dev/null @@ -1,34 +0,0 @@ -# Search Criteria, sales_order-overdue -[ - - # These values are common in all dictionaries - { - 'creation': '2012-04-03 12:49:52', - 'docstatus': 0, - 'modified': '2012-04-03 12:49:52', - 'modified_by': u'Administrator', - 'owner': u'Administrator' - }, - - # These values are common for all Search Criteria - { - 'add_cond': u'`tabSales Order`.delivery_date now()", - 'columns': u'Sales Order\x01ID,Sales Order\x01Owner,Sales Order\x01Status,Sales Order\x01Customer,Sales Order\x01Sales Order Date,Sales Order\x01Expected Delivery Date,Sales Order\x01Quotation No', - 'criteria_name': u'Sales Order-To be delivered', - 'doc_type': u'Sales Order', - 'doctype': 'Search Criteria', - 'filters': u"{'Sales Order\x01Saved':1,'Sales Order\x01Submitted':1,'Sales Order\x01Fiscal Year':''}", - 'module': u'Home', - 'name': '__common__', - 'page_len': 100, - 'sort_by': u'`tabSales Order`.`name`', - 'sort_order': u'DESC', - 'standard': u'Yes' - }, - - # Search Criteria, sales_order-to_be_delivered - { - 'doctype': 'Search Criteria', - 'name': u'sales_order-to_be_delivered' - } -] \ No newline at end of file diff --git a/erpnext/home/search_criteria/sales_order_to_be_submitted/__init__.py b/erpnext/home/search_criteria/sales_order_to_be_submitted/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/erpnext/home/search_criteria/sales_order_to_be_submitted/sales_order_to_be_submitted.txt b/erpnext/home/search_criteria/sales_order_to_be_submitted/sales_order_to_be_submitted.txt deleted file mode 100644 index fe5ea2f5061..00000000000 --- a/erpnext/home/search_criteria/sales_order_to_be_submitted/sales_order_to_be_submitted.txt +++ /dev/null @@ -1,34 +0,0 @@ -# Search Criteria, sales_order-to_be_submitted -[ - - # These values are common in all dictionaries - { - 'creation': '2012-04-03 12:49:52', - 'docstatus': 0, - 'modified': '2012-04-03 12:49:52', - 'modified_by': u'Administrator', - 'owner': u'Administrator' - }, - - # These values are common for all Search Criteria - { - 'add_cond': u"`tabSales Order`.status='Draft'", - 'columns': u'Sales Order\x01ID,Sales Order\x01Customer,Sales Order\x01Sales Order Date,Sales Order\x01Quotation No', - 'criteria_name': u'Sales Order-To be submitted', - 'doc_type': u'Sales Order', - 'doctype': 'Search Criteria', - 'filters': u"{'Sales Order\x01Saved':1,'Sales Order\x01Fiscal Year':''}", - 'module': u'Home', - 'name': '__common__', - 'page_len': 100, - 'sort_by': u'`tabSales Order`.`name`', - 'sort_order': u'DESC', - 'standard': u'Yes' - }, - - # Search Criteria, sales_order-to_be_submitted - { - 'doctype': 'Search Criteria', - 'name': u'sales_order-to_be_submitted' - } -] \ No newline at end of file diff --git a/erpnext/home/search_criteria/serial_no_amc_expiring_this_month/__init__.py b/erpnext/home/search_criteria/serial_no_amc_expiring_this_month/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/erpnext/home/search_criteria/serial_no_warranty_expiring_this_month/__init__.py b/erpnext/home/search_criteria/serial_no_warranty_expiring_this_month/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/erpnext/home/search_criteria/task_open/__init__.py b/erpnext/home/search_criteria/task_open/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/erpnext/home/search_criteria/task_open/task_open.txt b/erpnext/home/search_criteria/task_open/task_open.txt deleted file mode 100644 index 3794afc5df9..00000000000 --- a/erpnext/home/search_criteria/task_open/task_open.txt +++ /dev/null @@ -1,34 +0,0 @@ -# Search Criteria, task-open -[ - - # These values are common in all dictionaries - { - 'creation': '2012-04-03 12:49:53', - 'docstatus': 0, - 'modified': '2012-04-03 12:49:53', - 'modified_by': u'Administrator', - 'owner': u'Administrator' - }, - - # These values are common for all Search Criteria - { - 'add_cond': u"`tabTask`.status='Open'", - 'columns': u'Task\x01ID,Task\x01Subject,Task\x01Priority,Task\x01Raised By,Task\x01Allocated To', - 'criteria_name': u'Task-Open', - 'doc_type': u'Task', - 'doctype': 'Search Criteria', - 'filters': u"{'Task\x01Priority':''}", - 'module': u'Home', - 'name': '__common__', - 'page_len': 50, - 'sort_by': u'`tabTask`.`name`', - 'sort_order': u'DESC', - 'standard': u'Yes' - }, - - # Search Criteria, task-open - { - 'doctype': 'Search Criteria', - 'name': u'task-open' - } -] \ No newline at end of file diff --git a/erpnext/hr/Module Def/HR/HR.txt b/erpnext/hr/Module Def/HR/HR.txt deleted file mode 100644 index 623bdc5233a..00000000000 --- a/erpnext/hr/Module Def/HR/HR.txt +++ /dev/null @@ -1,318 +0,0 @@ -# Module Def, HR -[ - - # These values are common in all dictionaries - { - 'creation': '2011-07-01 17:41:43', - 'docstatus': 0, - 'modified': '2011-08-25 13:54:43', - 'modified_by': 'Administrator', - 'owner': 'Administrator' - }, - - # These values are common for all Module Def Role - { - 'doctype': 'Module Def Role', - 'name': '__common__', - 'parent': 'HR', - 'parentfield': 'roles', - 'parenttype': 'Module Def' - }, - - # These values are common for all Module Def Item - { - 'doctype': 'Module Def Item', - 'name': '__common__', - 'parent': 'HR', - 'parentfield': 'items', - 'parenttype': 'Module Def' - }, - - # These values are common for all Module Def - { - 'disabled': 'No', - 'doctype': u'Module Def', - 'is_hidden': 'No', - 'module_desc': 'Human Resource Management - Employee Database, Salaries etc.', - 'module_icon': 'HR.gif', - 'module_label': 'HR', - 'module_name': 'HR', - 'module_seq': 9, - 'name': '__common__' - }, - - # Module Def, HR - { - 'doctype': u'Module Def', - 'name': 'HR' - }, - - # Module Def Item - { - 'description': 'Your Employee Database', - 'display_name': 'Employee', - 'doc_name': 'Employee', - 'doc_type': 'Forms', - 'doctype': 'Module Def Item', - 'fields': 'employee_name\nemployment_type\nstatus\nbranch\ndesignation\ndepartment\ngrade\nreports_to', - 'idx': 1 - }, - - # Module Def Item - { - 'description': 'Employees Daily Attendance Tracking Form', - 'display_name': 'Attendance', - 'doc_name': 'Attendance', - 'doc_type': 'Forms', - 'doctype': 'Module Def Item', - 'fields': 'employee\nemployee_name\nstatus\natt_date\nfiscal_year\ncompany', - 'idx': 2 - }, - - # Module Def Item - { - 'description': 'Upload Attendance data', - 'display_name': 'Attendance Control Panel', - 'doc_name': 'Attendance Control Panel', - 'doc_type': 'Single DocType', - 'doctype': 'Module Def Item', - 'idx': 3 - }, - - # Module Def Item - { - 'description': 'Leave allocation for selected employees at a time', - 'display_name': 'Leave Control Panel', - 'doc_name': 'Leave Control Panel', - 'doc_type': 'Single DocType', - 'doctype': 'Module Def Item', - 'idx': 4 - }, - - # Module Def Item - { - 'description': 'Allocate leave for fiscal year', - 'display_name': 'Leave Allocation', - 'doc_name': 'Leave Allocation', - 'doc_type': 'Forms', - 'doctype': 'Module Def Item', - 'fields': 'employee\nleave_type\nfiscal_year\ntotal_leaves_allocated\nposting_date', - 'idx': 5 - }, - - # Module Def Item - { - 'description': 'Apply Leave', - 'display_name': 'Leave Application', - 'doc_name': 'Leave Application', - 'doc_type': 'Forms', - 'doctype': 'Module Def Item', - 'fields': 'employee\nleave_type\nfiscal_year\nfrom_date\nto_date\ntotal_leave_days', - 'idx': 6 - }, - - # Module Def Item - { - 'description': 'Submit Employees Expenses', - 'display_name': 'Expense Claim', - 'doc_name': 'Expense Claim', - 'doc_type': 'Forms', - 'doctype': 'Module Def Item', - 'fields': 'status\nemployee\nemployee_name\nposting_date\ntotal_claimed_amount\ntotal_sanctioned_amount\nexp_approver', - 'idx': 7 - }, - - # Module Def Item - { - 'description': 'Assign Responsibilities to employee and evaluate', - 'display_name': 'Appraisal', - 'doc_name': 'Appraisal', - 'doc_type': 'Forms', - 'doctype': 'Module Def Item', - 'fields': 'status\nemployee\nemployee_name\nstart_date\nend_date\ntotal_score\nkra_approver', - 'idx': 8 - }, - - # Module Def Item - { - 'description': 'Generate Salary Structure heads for an employee', - 'display_name': 'Salary Structure', - 'doc_name': 'Salary Structure', - 'doc_type': 'Forms', - 'doctype': 'Module Def Item', - 'fields': 'employee\nis_active\nfiscal_year\nfrom_date\nctc\ntotal_earning\ntotal_deduction\ntotal', - 'idx': 9 - }, - - # Module Def Item - { - 'description': 'Generate Salary Slip for an employee', - 'display_name': 'Salary Slip', - 'doc_name': 'Salary Slip', - 'doc_type': 'Forms', - 'doctype': 'Module Def Item', - 'fields': 'month\nyear\nemployee\nemployee_name\npayment_days\narrear_amount\nencashment_amount\ngross_pay\ntotal_deduction\nnet_pay', - 'idx': 10 - }, - - # Module Def Item - { - 'description': 'Generate Salary Slip for multiple employee at a time based on selected criteria', - 'display_name': 'Salary Manager', - 'doc_name': 'Salary Manager', - 'doc_type': 'Single DocType', - 'doctype': 'Module Def Item', - 'idx': 11 - }, - - # Module Def Item - { - 'description': 'Job Applications received for various positions', - 'display_name': 'Job Application', - 'doc_name': 'Job Application', - 'doc_type': 'Forms', - 'doctype': 'Module Def Item', - 'fields': 'applicant_name\nemail\nposition', - 'idx': 12 - }, - - # Module Def Item - { - 'display_name': 'Employee Information', - 'doc_name': 'Employee', - 'doc_type': 'Reports', - 'doctype': 'Module Def Item', - 'idx': 13 - }, - - # Module Def Item - { - 'display_name': "Employee's Birthday", - 'doc_name': 'Employee', - 'doc_type': 'Reports', - 'doctype': 'Module Def Item', - 'idx': 14 - }, - - # Module Def Item - { - 'display_name': 'New or left employees for a month', - 'doc_name': 'Employee', - 'doc_type': 'Reports', - 'doctype': 'Module Def Item', - 'idx': 15 - }, - - # Module Def Item - { - 'display_name': 'Monthly Attendance Details', - 'doc_name': 'Attendance', - 'doc_type': 'Reports', - 'doctype': 'Module Def Item', - 'idx': 16 - }, - - # Module Def Item - { - 'display_name': 'Leave Application Details', - 'doc_name': 'Leave Application', - 'doc_type': 'Reports', - 'doctype': 'Module Def Item', - 'idx': 17 - }, - - # Module Def Item - { - 'display_name': 'Leave Allocation Details', - 'doc_name': 'Leave Allocation', - 'doc_type': 'Reports', - 'doctype': 'Module Def Item', - 'idx': 18 - }, - - # Module Def Item - { - 'display_name': 'Employee Leave Balance Report', - 'doc_name': 'Employee', - 'doc_type': 'Reports', - 'doctype': 'Module Def Item', - 'idx': 19 - }, - - # Module Def Item - { - 'display_name': 'Salary Structure Details', - 'doc_name': 'Salary Structure', - 'doc_type': 'Reports', - 'doctype': 'Module Def Item', - 'idx': 20 - }, - - # Module Def Item - { - 'display_name': 'Salary Register', - 'doc_name': 'Salary Slip', - 'doc_type': 'Reports', - 'doctype': 'Module Def Item', - 'idx': 21 - }, - - # Module Def Item - { - 'display_name': 'Salary Slips', - 'doc_name': 'Salary Slip', - 'doc_type': 'Reports', - 'doctype': 'Module Def Item', - 'idx': 22 - }, - - # Module Def Item - { - 'display_name': 'Pending Appraisals', - 'doc_name': 'Appraisal', - 'doc_type': 'Reports', - 'doctype': 'Module Def Item', - 'idx': 23 - }, - - # Module Def Item - { - 'display_name': 'Employee Appraisals', - 'doc_name': 'Appraisal', - 'doc_type': 'Reports', - 'doctype': 'Module Def Item', - 'idx': 24 - }, - - # Module Def Item - { - 'display_name': 'Pending Expense Claims', - 'doc_name': 'Expense Claim', - 'doc_type': 'Reports', - 'doctype': 'Module Def Item', - 'idx': 25 - }, - - # Module Def Item - { - 'display_name': 'Expense Claims', - 'doc_name': 'Expense Claim', - 'doc_type': 'Reports', - 'doctype': 'Module Def Item', - 'idx': 26 - }, - - # Module Def Role - { - 'doctype': 'Module Def Role', - 'idx': 1, - 'role': 'HR Manager' - }, - - # Module Def Role - { - 'doctype': 'Module Def Role', - 'idx': 2, - 'role': 'HR User' - } -] \ No newline at end of file diff --git a/erpnext/hr/Role/Employee/Employee.txt b/erpnext/hr/Role/Employee/Employee.txt deleted file mode 100644 index 4b73c1a0df9..00000000000 --- a/erpnext/hr/Role/Employee/Employee.txt +++ /dev/null @@ -1,17 +0,0 @@ -[ - { - 'creation': '2011-02-12 15:07:26', - 'docstatus': 0, - 'doctype': 'Role', - 'idx': None, - 'modified': '2011-02-14 14:05:55', - 'modified_by': 'Administrator', - 'module': 'Roles', - 'name': 'Employee', - 'owner': 'Administrator', - 'parent': None, - 'parentfield': None, - 'parenttype': None, - 'role_name': 'Employee' - } -] \ No newline at end of file diff --git a/erpnext/hr/Role/HR Manager/HR Manager.txt b/erpnext/hr/Role/HR Manager/HR Manager.txt deleted file mode 100644 index d07db8652f7..00000000000 --- a/erpnext/hr/Role/HR Manager/HR Manager.txt +++ /dev/null @@ -1,26 +0,0 @@ -# Role, HR Manager -[ - - # These values are common in all dictionaries - { - 'creation': '2010-08-08 17:08:51', - 'docstatus': 0, - 'modified': '2010-04-01 10:19:09', - 'modified_by': 'Administrator', - 'owner': 'Administrator' - }, - - # These values are common for all Role - { - 'doctype': 'Role', - 'module': 'HR', - 'name': '__common__', - 'role_name': 'HR Manager' - }, - - # Role, HR Manager - { - 'doctype': 'Role', - 'name': 'HR Manager' - } -] \ No newline at end of file diff --git a/erpnext/hr/Role/HR User/HR User.txt b/erpnext/hr/Role/HR User/HR User.txt deleted file mode 100644 index b0c5b76c43f..00000000000 --- a/erpnext/hr/Role/HR User/HR User.txt +++ /dev/null @@ -1,26 +0,0 @@ -# Role, HR User -[ - - # These values are common in all dictionaries - { - 'creation': '2010-08-08 17:08:51', - 'docstatus': 0, - 'modified': '2010-04-01 10:18:55', - 'modified_by': 'Administrator', - 'owner': 'Administrator' - }, - - # These values are common for all Role - { - 'doctype': 'Role', - 'module': 'HR', - 'name': '__common__', - 'role_name': 'HR User' - }, - - # Role, HR User - { - 'doctype': 'Role', - 'name': 'HR User' - } -] \ No newline at end of file diff --git a/erpnext/hr/__init__.py b/erpnext/hr/__init__.py index e69de29bb2d..ab2d1976b11 100644 --- a/erpnext/hr/__init__.py +++ b/erpnext/hr/__init__.py @@ -0,0 +1,5 @@ +install_docs = [ + {"doctype":"Role", "name":"Employee"}, + {"doctype":"Role", "name":"HR Manager"}, + {"doctype":"Role", "name":"HR User"}, +] diff --git a/erpnext/hr/search_criteria/employee_details/__init__.py b/erpnext/hr/search_criteria/employee_details/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/erpnext/hr/search_criteria/employee_details/employee_details.txt b/erpnext/hr/search_criteria/employee_details/employee_details.txt deleted file mode 100644 index 08d785b5231..00000000000 --- a/erpnext/hr/search_criteria/employee_details/employee_details.txt +++ /dev/null @@ -1,37 +0,0 @@ -[ - { - 'add_col': None, - 'add_cond': None, - 'add_tab': None, - 'columns': 'Employee\x01ID,Employee\x01Employee Name,Employee\x01Employee Code,Employee\x01Employee Number,Employee\x01Gender,Employee\x01Employment Type,Employee\x01Date of Joining,Employee\x01Scheduled Confirmation Date,Employee\x01Contract End Date,Employee\x01Status,Employee\x01Branch,Employee\x01Department,Employee\x01Designation,Employee\x01Grade,Employee\x01Company Email,Employee\x01Relieving Date', - 'creation': '2010-12-14 10:33:09', - 'criteria_name': 'Employee Details', - 'custom_query': '', - 'description': None, - 'dis_filters': None, - 'disabled': None, - 'doc_type': 'Employee', - 'docstatus': 0, - 'doctype': 'Search Criteria', - 'filters': "{'Employee\x01Gender':'','Employee\x01Month of Birth':'','Employee\x01Status':''}", - 'graph_series': None, - 'graph_values': None, - 'group_by': None, - 'idx': None, - 'modified': '2010-04-01 14:27:15', - 'modified_by': 'Administrator', - 'module': 'Payroll', - 'name': 'employee_details', - 'owner': 'Administrator', - 'page_len': 50, - 'parent': None, - 'parent_doc_type': None, - 'parentfield': None, - 'parenttype': None, - 'report_script': '', - 'server_script': None, - 'sort_by': 'ID', - 'sort_order': 'DESC', - 'standard': 'Yes' - } -] \ No newline at end of file diff --git a/erpnext/hr/search_criteria/employee_in_company_experience/__init__.py b/erpnext/hr/search_criteria/employee_in_company_experience/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/erpnext/hr/search_criteria/employee_in_company_experience/employee_in_company_experience.txt b/erpnext/hr/search_criteria/employee_in_company_experience/employee_in_company_experience.txt deleted file mode 100644 index 62b9aa60bd3..00000000000 --- a/erpnext/hr/search_criteria/employee_in_company_experience/employee_in_company_experience.txt +++ /dev/null @@ -1,37 +0,0 @@ -[ - { - 'add_col': None, - 'add_cond': None, - 'add_tab': None, - 'columns': 'Employee Profile\x01Employee,Employee Internal Work History\x01Branch,Employee Internal Work History\x01Department,Employee Internal Work History\x01Designation,Employee Internal Work History\x01Grade,Employee Internal Work History\x01From Date,Employee Internal Work History\x01To Date', - 'creation': '2010-12-14 10:33:09', - 'criteria_name': 'Employee In Company Experience', - 'custom_query': '', - 'description': None, - 'dis_filters': None, - 'disabled': 1, - 'doc_type': 'Employee Internal Work History', - 'docstatus': 0, - 'doctype': 'Search Criteria', - 'filters': '{}', - 'graph_series': None, - 'graph_values': None, - 'group_by': None, - 'idx': None, - 'modified': '2010-04-01 14:27:15', - 'modified_by': 'Administrator', - 'module': 'Payroll', - 'name': 'employee_in_company_experience', - 'owner': 'Administrator', - 'page_len': 50, - 'parent': None, - 'parent_doc_type': 'Employee Profile', - 'parentfield': None, - 'parenttype': None, - 'report_script': '', - 'server_script': '', - 'sort_by': 'ID', - 'sort_order': 'DESC', - 'standard': 'Yes' - } -] \ No newline at end of file diff --git a/erpnext/hr/search_criteria/employeewise_leave_transaction_details/__init__.py b/erpnext/hr/search_criteria/employeewise_leave_transaction_details/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/erpnext/hr/search_criteria/employeewise_leave_transaction_details/employeewise_leave_transaction_details.txt b/erpnext/hr/search_criteria/employeewise_leave_transaction_details/employeewise_leave_transaction_details.txt deleted file mode 100644 index 8cea5934ffc..00000000000 --- a/erpnext/hr/search_criteria/employeewise_leave_transaction_details/employeewise_leave_transaction_details.txt +++ /dev/null @@ -1,33 +0,0 @@ -# Search Criteria, employeewise_leave_transaction_details -[ - - # These values are common in all dictionaries - { - 'creation': '2012-04-03 12:49:51', - 'docstatus': 0, - 'modified': '2012-04-03 12:49:51', - 'modified_by': u'Administrator', - 'owner': u'Administrator' - }, - - # These values are common for all Search Criteria - { - 'columns': u'Leave Transaction\x01ID,Leave Transaction\x01Fiscal Year,Leave Transaction\x01Employee,Leave Transaction\x01Leave Type,Leave Transaction\x01Previous Balance,Leave Transaction\x01Leave Transaction Type,Leave Transaction\x01Allocation Type,Leave Transaction\x01Deduction Type,Leave Transaction\x01Half Day,Leave Transaction\x01From Date,Leave Transaction\x01To Date,Leave Transaction\x01Encashment Date,Leave Transaction\x01Total Leave Days,Leave Transaction\x01Status', - 'criteria_name': u'Employeewise Leave Transaction Details', - 'doc_type': u'Leave Transaction', - 'doctype': 'Search Criteria', - 'filters': u"{'Leave Transaction\x01Saved':1,'Leave Transaction\x01Submitted':1}", - 'module': u'HR', - 'name': '__common__', - 'page_len': 50, - 'sort_by': u'`tabLeave Transaction`.`name`', - 'sort_order': u'DESC', - 'standard': u'Yes' - }, - - # Search Criteria, employeewise_leave_transaction_details - { - 'doctype': 'Search Criteria', - 'name': u'employeewise_leave_transaction_details' - } -] \ No newline at end of file diff --git a/erpnext/hr/search_criteria/monthly_salary_register/monthly_salary_register.py b/erpnext/hr/search_criteria/monthly_salary_register/monthly_salary_register.py new file mode 100644 index 00000000000..998b9270c3c --- /dev/null +++ b/erpnext/hr/search_criteria/monthly_salary_register/monthly_salary_register.py @@ -0,0 +1,98 @@ +colwidths[col_idx['Employee Name']]="120px" +colwidths[col_idx['Leave Without Pay']] = '120px' + +sum_net = total_earning = total_deduction = total_lwp = total_arr = 0 +total = ['Total Net Pay','',''] + + +earn_type_lst = sql("select name from `tabEarning Type`") + +ded_type_lst = sql("select name from `tabDeduction Type`") +li=[] +for lst in earn_type_lst: + + li.append(lst[0]) + + + +li.append('Total Earning') +for lst in ded_type_lst: + + li.append(lst[0]) + + +li.append('Total Deduction') +li.append('Net Pay') + + + +for d in li: + colnames.append(d) + colwidths.append("150px") + coltypes.append("Currency") + coloptions.append("") + col_idx[d] = len(colnames)-1 + for r in res: + r.append("0") + +for r in res: + + total_lwp += r[col_idx['Leave Without Pay']] + total_arr += r[col_idx['Arrear Amount']] + + for d1 in li: + d2 = '%s'%d1 + + earn_ret=convert_to_lists(sql("select e_type,e_amount from `tabSS Earning Detail` where parent = '%s'"%r[col_idx['ID']])) + ded_ret=convert_to_lists(sql("select d_type,d_amount from `tabSS Deduction Detail` where parent = '%s'"%r[col_idx['ID']])) + + + for e in earn_ret: + e0 = '%s'%e[0] + r[col_idx[e0]]=flt(e[1]) or 0.00 + + + for d in ded_ret: + d0 = '%s'%d[0] + r[col_idx[d0]]=flt(d[1]) or 0.00 + + + tot_earn_ded_net_ret = sql("select gross_pay, total_deduction,net_pay from `tabSalary Slip` where name = '%s'"%r[col_idx['ID']]) + if d2 == 'Total Earning': + r[col_idx[d2]] = flt(tot_earn_ded_net_ret[0][0]) or 0 + total_earning += flt(tot_earn_ded_net_ret[0][0]) or 0 + elif d2 == 'Total Deduction': + r[col_idx[d2]] = flt(tot_earn_ded_net_ret[0][1]) or 0 + total_deduction += flt(tot_earn_ded_net_ret[0][1]) or 0 + elif d2 == 'Net Pay': + r[col_idx[d2]] = flt(tot_earn_ded_net_ret[0][2]) or 0 + sum_net += flt(tot_earn_ded_net_ret[0][2]) or 0 + + +total.append(total_lwp) +total.append(total_arr) + +for lst in earn_type_lst: + + total_ear = 0 + for r in res: + + lst0 = '%s'%lst[0] + total_ear += r[col_idx[lst0]] + + total.append(total_ear) + +total.append(total_earning) +for lst in ded_type_lst: + total_ded = 0 + for r in res: + lst0 = '%s'%lst[0] + total_ded += r[col_idx[lst0]] + + total.append(total_ded) + + +total.append(total_deduction) +total.append(sum_net) + +res.append(total) diff --git a/erpnext/hr/search_criteria/monthly_salary_register/monthly_salary_register.txt b/erpnext/hr/search_criteria/monthly_salary_register/monthly_salary_register.txt index 4df2a0f6f70..b24bfb1b930 100644 --- a/erpnext/hr/search_criteria/monthly_salary_register/monthly_salary_register.txt +++ b/erpnext/hr/search_criteria/monthly_salary_register/monthly_salary_register.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-04-03 12:49:51', + 'creation': '2012-03-30 14:50:44', 'docstatus': 0, - 'modified': '2012-04-03 12:49:51', + 'modified': '2012-04-05 17:23:13', 'modified_by': u'Administrator', 'owner': u'Administrator' }, @@ -16,11 +16,11 @@ 'criteria_name': u'Monthly Salary Register', 'doc_type': u'Salary Slip', 'doctype': 'Search Criteria', - 'filters': u"{'Salary Slip\x01Month':'','Salary Slip\x01Year':''}", + 'filters': u'{"Salary Slip\\u0001Submitted":1,"Salary Slip\\u0001Company":[""],"Salary Slip\\u0001Month":[""]}', 'module': u'HR', 'name': '__common__', 'page_len': 50, - 'sort_by': u'ID', + 'sort_by': u'`tabSalary Slip`.`name`', 'sort_order': u'DESC', 'standard': u'Yes' }, diff --git a/erpnext/hr/search_criteria/pending_appraisals/__init__.py b/erpnext/hr/search_criteria/pending_appraisals/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/erpnext/hr/search_criteria/pending_appraisals/pending_appraisals.js b/erpnext/hr/search_criteria/pending_appraisals/pending_appraisals.js deleted file mode 100644 index 810fe16fc33..00000000000 --- a/erpnext/hr/search_criteria/pending_appraisals/pending_appraisals.js +++ /dev/null @@ -1,57 +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 . - -report.customize_filters = function() { - this.hide_all_filters(); - - this.add_filter({fieldname:'approver', label:'Approver', fieldtype:'Link', options:'Profile', ignore : 1, parent:'Appraisal'}); - this.filter_fields_dict['Appraisal'+FILTER_SEP +'Approver'].df.in_first_page = 1; - - this.filter_fields_dict['Appraisal'+FILTER_SEP +'Employee'].df.filter_hide = 0; - this.filter_fields_dict['Appraisal'+FILTER_SEP +'Employee Name'].df.filter_hide = 0; - this.filter_fields_dict['Appraisal'+FILTER_SEP +'Fiscal Year'].df.filter_hide = 0; - this.filter_fields_dict['Appraisal'+FILTER_SEP +'From Start Date'].df.filter_hide = 0; - //this.filter_fields_dict['Appraisal'+FILTER_SEP +'To Start Date'].df.filter_hide = 0; - //this.filter_fields_dict['Appraisal'+FILTER_SEP +'From End Date'].df.filter_hide = 0; - this.filter_fields_dict['Appraisal'+FILTER_SEP +'To End Date'].df.filter_hide = 0; -} -this.mytabs.items['Select Columns'].hide(); - -report.get_query = function(){ - //get filter values - emp = this.filter_fields_dict['Appraisal'+FILTER_SEP+'Employee'].get_value(); - emp_nm = this.filter_fields_dict['Appraisal'+FILTER_SEP+'Employee Name'].get_value(); - frm_start_date = this.filter_fields_dict['Appraisal'+FILTER_SEP+'From Start Date'].get_value(); - //to_start_date = this.filter_fields_dict['Appraisal'+FILTER_SEP+'To Start Date'].get_value(); - //frm_end_date = this.filter_fields_dict['Appraisal'+FILTER_SEP+'From End Date'].get_value(); - to_end_date = this.filter_fields_dict['Appraisal'+FILTER_SEP+'To End Date'].get_value(); - fiscal_year = this.filter_fields_dict['Appraisal'+FILTER_SEP+'Fiscal Year'].get_value(); - approver = this.filter_fields_dict['Appraisal'+FILTER_SEP+'Approver'].get_value(); - - var cond = ''; - if(emp) cond += ' AND `tabAppraisal`.employee = "'+emp+'"'; - if(emp_nm) cond += ' AND `tabAppraisal`.employee_name = "'+emp_nm+'"'; - if(frm_start_date) cond += ' AND `tabAppraisal`.start_date >= "'+frm_start_date+'"'; - //if(to_start_date) cond += ' AND `tabAppraisal`.start_date <= "'+to_start_date+'"'; - //if(frm_end_date) cond += ' AND `tabAppraisal`.end_date >= "'+frm_end_date+'"'; - if(to_end_date) cond += ' AND `tabAppraisal`.end_date <= "'+to_end_date+'"'; - if(fiscal_year !='') cond += ' AND `tabAppraisal`.fiscal_year = "'+fiscal_year+'"'; - if(approver) cond += ' AND `tabAppraisal`.kra_approver = "'+approver+'"'; - - //var q = 'SELECT DISTINCT `tabAppraisal`.name, `tabAppraisal`.status, `tabAppraisal`.employee, `tabAppraisal`.employee_name, `tabAppraisal`.start_date,`tabAppraisal`.end_date,`tabAppraisal`.kra_approver, `tabAppraisal`.total_score FROM `tabAppraisal` WHERE `tabAppraisal`.status= "Submitted" AND `tabAppraisal`.kra_approver = "'+ user+'"'+cond; - var q = 'SELECT DISTINCT `tabAppraisal`.name, `tabAppraisal`.employee, `tabAppraisal`.employee_name, `tabAppraisal`.start_date,`tabAppraisal`.end_date,`tabAppraisal`.kra_approver, `tabAppraisal`.total_score FROM `tabAppraisal` WHERE `tabAppraisal`.status= "Submitted"'+cond; - return q; -} \ No newline at end of file diff --git a/erpnext/hr/search_criteria/pending_appraisals/pending_appraisals.txt b/erpnext/hr/search_criteria/pending_appraisals/pending_appraisals.txt deleted file mode 100644 index b62b452748f..00000000000 --- a/erpnext/hr/search_criteria/pending_appraisals/pending_appraisals.txt +++ /dev/null @@ -1,33 +0,0 @@ -# Search Criteria, pending_appraisals -[ - - # These values are common in all dictionaries - { - 'creation': '2012-04-03 12:49:51', - 'docstatus': 0, - 'modified': '2012-04-03 12:49:51', - 'modified_by': u'Administrator', - 'owner': u'ashwini@webnotestech.com' - }, - - # These values are common for all Search Criteria - { - 'criteria_name': u'Pending Appraisals', - 'disabled': 0, - 'doc_type': u'Appraisal', - 'doctype': 'Search Criteria', - 'filters': u"{'Appraisal\x01Submitted':1,'Appraisal\x01Status':'Submitted','Appraisal\x01Fiscal Year':'','Appraisal\x01Approver':''}", - 'module': u'HR', - 'name': '__common__', - 'page_len': 50, - 'sort_by': u'`tabAppraisal`.`name`', - 'sort_order': u'DESC', - 'standard': u'Yes' - }, - - # Search Criteria, pending_appraisals - { - 'doctype': 'Search Criteria', - 'name': u'pending_appraisals' - } -] \ No newline at end of file diff --git a/erpnext/hr/search_criteria/pending_expense_claims/__init__.py b/erpnext/hr/search_criteria/pending_expense_claims/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/erpnext/hr/search_criteria/pending_expense_claims/pending_expense_claims.txt b/erpnext/hr/search_criteria/pending_expense_claims/pending_expense_claims.txt deleted file mode 100644 index 0bff5ad1421..00000000000 --- a/erpnext/hr/search_criteria/pending_expense_claims/pending_expense_claims.txt +++ /dev/null @@ -1,31 +0,0 @@ -# Search Criteria, pending_expense_claims -[ - - # These values are common in all dictionaries - { - 'creation': '2012-03-30 14:50:44', - 'docstatus': 0, - 'modified': '2012-03-30 14:50:44', - 'modified_by': u'Administrator', - 'owner': u'ashwini@webnotestech.com' - }, - - # These values are common for all Search Criteria - { - 'criteria_name': u'Pending Expense Claims', - 'doc_type': u'Expense Claim', - 'doctype': 'Search Criteria', - 'filters': u"{'Expense Claim\x01Approval Status':'','Expense Claim\x01Fiscal Year':''}", - 'module': u'HR', - 'name': '__common__', - 'page_len': 50, - 'sort_order': u'DESC', - 'standard': u'Yes' - }, - - # Search Criteria, pending_expense_claims - { - 'doctype': 'Search Criteria', - 'name': u'pending_expense_claims' - } -] \ No newline at end of file diff --git a/erpnext/knowledge_base/Module Def/Knowledge Base/Knowledge Base.txt b/erpnext/knowledge_base/Module Def/Knowledge Base/Knowledge Base.txt deleted file mode 100644 index 8aee002f2bd..00000000000 --- a/erpnext/knowledge_base/Module Def/Knowledge Base/Knowledge Base.txt +++ /dev/null @@ -1,42 +0,0 @@ -[ - { - 'creation': '2010-08-08 17:35:42', - 'disabled': 'Yes', - 'docstatus': 0, - 'doctype': u'Module Def', - 'doctype_list': None, - 'file_list': None, - 'idx': None, - 'is_hidden': None, - 'last_updated_date': None, - 'modified': '2011-05-02 12:40:40', - 'modified_by': 'Administrator', - 'module_desc': '

Maintain your knowledge base of Questions & Answers

', - 'module_icon': 'help.png', - 'module_label': 'Knowledge Base', - 'module_name': 'Knowledge Base', - 'module_page': 'questions', - 'module_seq': 13, - 'name': 'Knowledge Base', - 'owner': 'Administrator', - 'parent': None, - 'parentfield': None, - 'parenttype': None, - 'trash_reason': None, - 'widget_code': None - }, - { - 'creation': '2010-08-08 17:35:42', - 'docstatus': 0, - 'doctype': 'Module Def Role', - 'idx': 1, - 'modified': '2010-08-08 17:35:42', - 'modified_by': 'Administrator', - 'name': 'MDR00106', - 'owner': 'Administrator', - 'parent': 'Knowledge Base', - 'parentfield': 'roles', - 'parenttype': 'Module Def', - 'role': 'All' - } -] \ No newline at end of file diff --git a/erpnext/patches/jan_mar_2012/rename_dt.py b/erpnext/patches/jan_mar_2012/rename_dt.py index 5d5e1bf9805..01e6bafd082 100644 --- a/erpnext/patches/jan_mar_2012/rename_dt.py +++ b/erpnext/patches/jan_mar_2012/rename_dt.py @@ -7,13 +7,13 @@ from webnotes.modules import reload_doc from webnotes.utils import make_esc import os -def execute(): +def execute1(): #rendt = get_dt_to_be_renamed() #rename_dt_files(rendt) #update_local_file_system() replace_labels_with_fieldnames() -def execute1(): +def execute(): # delete dt, mapper delete_dt_and_mapper() @@ -65,7 +65,35 @@ def execute1(): 'lease_receipt_summary_month_wise', 'lease_receipts_client_wise', 'lease_yearly_future_installment_inflows', 'monthly_ledger_summary_report', 'payables_-_as_on_outstanding', - 'payment_report')""") + 'payment_report', 'progressive_total_excise_duty', + 'service_tax_credit_account_-_inputs', + 'total_amout_collection_for_a_period_-_customerwise', + 'invoices-to_be_submitted', 'invoices-to_receive_payment', + 'opportunity-quotations_to_be_sent', 'purchase_order-to_be_billed', + 'purchase_order-to_be_submitted', + 'purchase_order-to_receive_items', + 'purchase_request-purchase_order_to_be_made', + 'purchase_request-to_be_submitted', + 'sales-order_to_be_submitted', 'sales_order-overdue', + 'sales_order-to_be_billed', 'sales_order-to_be_delivered', + 'sales_order-to_be_submitted', 'task-open', 'appraisal_custom', + 'employee_details', 'employee_in_company_experience', + 'employee_leave_balance_report', 'employeewise_leave_transaction_details', + 'pending_appraisals', 'pending_expense_claims', 'delivery_plan', 'flat_bom_report', + 'dispatch_report', 'projectwise_delivered_qty_and_costs_as_per_purchase_cost', + 'projectwise_pending_qty_and_costs_as_per_purchase_cost', 'custom_test', 'custom_test1', + 'delivery_notes', 'delivery_note_disabled', 'lead', 'lead_interested', 'lead_report', + 'periodic_sales_summary', 'monthly_despatched_trend', 'sales', 'sales_order', + 'sales_order1', 'sales_agentwise_commission', 'test_report', 'territory_wise_sales_-_target_vs_actual_')""") + + webnotes.conn.sql(""" + DELETE FROM `tabSearch Criteria` + WHERE name IN ('monthly_transaction_summary', 'trend_analyzer', + 'yearly_transaction_summary', 'invoices-overdue', 'lead-to_follow_up', + 'opportunity-to_follow_up', 'serial_no-amc_expiring_this_month', + 'serial_no-warranty_expiring_this_month', ) + AND IFNULL(standard, 'No') = 'Yes' + """) # reload custom search criteria for d in webnotes.conn.sql("""select name, module from diff --git a/erpnext/production/Module Def/Production/Production.txt b/erpnext/production/Module Def/Production/Production.txt deleted file mode 100644 index 50e9adce95f..00000000000 --- a/erpnext/production/Module Def/Production/Production.txt +++ /dev/null @@ -1,519 +0,0 @@ -[ - { - '_last_update': '1300959287', - 'creation': '2010-11-30 22:42:49', - 'disabled': 'No', - 'docstatus': 0, - 'doctype': u'Module Def', - 'doctype_list': None, - 'file_list': 'support.gif,FileData/00214', - 'idx': None, - 'is_hidden': 'No', - 'last_updated_date': '2010-11-29 12:02:02', - 'modified': '2011-03-24 15:29:36', - 'modified_by': 'Administrator', - 'module_desc': '

Production Documents

', - 'module_icon': 'process.png', - 'module_label': 'Production', - 'module_name': 'Production', - 'module_page': None, - 'module_seq': 7, - 'name': 'Production', - 'owner': 'Administrator', - 'parent': None, - 'parentfield': None, - 'parenttype': None, - 'trash_reason': None, - 'widget_code': None - }, - { - 'click_function': None, - 'creation': '2010-11-30 22:42:49', - 'description': 'Bill of material master containing raw materials, operation and costs', - 'display_name': 'BOM', - 'doc_name': 'BOM', - 'doc_type': 'Forms', - 'docstatus': 0, - 'doctype': 'Module Def Item', - 'fields': 'id\nitem\ndescription\noperating_cost\nmaintained_by', - 'hide': None, - 'icon': None, - 'idx': 1, - 'modified': '2011-03-24 15:29:36', - 'modified_by': 'Administrator', - 'name': 'MDI00209', - 'owner': 'Administrator', - 'parent': 'Production', - 'parentfield': 'items', - 'parenttype': 'Module Def' - }, - { - 'click_function': None, - 'creation': '2010-11-30 22:42:49', - 'description': 'Machinery in warehouse where operations are performed on raw materials', - 'display_name': 'Workstation', - 'doc_name': 'Workstation', - 'doc_type': 'Forms', - 'docstatus': 0, - 'doctype': 'Module Def Item', - 'fields': 'id\nworkstation_name\nwarehouse\ndescription', - 'hide': None, - 'icon': None, - 'idx': 2, - 'modified': '2011-03-24 15:29:36', - 'modified_by': 'Administrator', - 'name': 'MDI00210', - 'owner': 'Administrator', - 'parent': 'Production', - 'parentfield': 'items', - 'parenttype': 'Module Def' - }, - { - 'click_function': None, - 'creation': '2010-11-30 22:42:49', - 'description': 'Explode Bill of Materials in a tree and calculate the cost', - 'display_name': 'Bill of Materials (Tree)', - 'doc_name': 'Bill of Materials', - 'doc_type': 'Pages', - 'docstatus': 0, - 'doctype': 'Module Def Item', - 'fields': None, - 'hide': None, - 'icon': None, - 'idx': 3, - 'modified': '2011-03-24 15:29:36', - 'modified_by': 'Administrator', - 'name': 'MDI00211', - 'owner': 'Administrator', - 'parent': 'Production', - 'parentfield': 'items', - 'parenttype': 'Module Def' - }, - { - 'click_function': None, - 'creation': '2010-11-30 22:42:49', - 'description': 'Update confirmed delivery dates in Sales Orders included in Production Plan', - 'display_name': 'Update Delivery Dates', - 'doc_name': 'Update Delivery Date', - 'doc_type': 'Single DocType', - 'docstatus': 0, - 'doctype': 'Module Def Item', - 'fields': None, - 'hide': None, - 'icon': None, - 'idx': 4, - 'modified': '2011-03-24 15:29:36', - 'modified_by': 'Administrator', - 'name': 'MDI00212', - 'owner': 'jai@webnotestech.com', - 'parent': 'Production', - 'parentfield': 'items', - 'parenttype': 'Module Def' - }, - { - 'click_function': None, - 'creation': '2010-11-30 22:42:49', - 'description': 'Plan your production by including relevant Sales Orders in your plan', - 'display_name': 'Production Planning Tool', - 'doc_name': 'Production Planning Tool', - 'doc_type': 'Single DocType', - 'docstatus': 0, - 'doctype': 'Module Def Item', - 'fields': None, - 'hide': None, - 'icon': None, - 'idx': 5, - 'modified': '2011-03-24 15:29:36', - 'modified_by': 'Administrator', - 'name': 'MDI00213', - 'owner': 'saumil@webnotestech.com', - 'parent': 'Production', - 'parentfield': 'items', - 'parenttype': 'Module Def' - }, - { - 'click_function': None, - 'creation': '2010-11-30 22:42:49', - 'description': 'Change raw materials used in a Bill of Material through BOM replace utility', - 'display_name': 'BOM Replace Utility', - 'doc_name': 'BOM Replace Utility', - 'doc_type': 'Single DocType', - 'docstatus': 0, - 'doctype': 'Module Def Item', - 'fields': None, - 'hide': None, - 'icon': None, - 'idx': 6, - 'modified': '2011-03-24 15:29:36', - 'modified_by': 'Administrator', - 'name': 'MDI00214', - 'owner': 'jai@webnotestech.com', - 'parent': 'Production', - 'parentfield': 'items', - 'parenttype': 'Module Def' - }, - { - 'click_function': None, - 'creation': '2010-11-30 22:42:49', - 'description': 'Raise your Production Orders Manually', - 'display_name': 'Production Order', - 'doc_name': 'Production Order', - 'doc_type': 'Forms', - 'docstatus': 0, - 'doctype': 'Module Def Item', - 'fields': None, - 'hide': None, - 'icon': None, - 'idx': 7, - 'modified': '2011-03-24 15:29:36', - 'modified_by': 'Administrator', - 'name': 'MDI00215', - 'owner': 'Administrator', - 'parent': 'Production', - 'parentfield': 'items', - 'parenttype': 'Module Def' - }, - { - 'click_function': None, - 'creation': '2011-03-24 15:04:47', - 'description': None, - 'display_name': None, - 'doc_name': 'Reports', - 'doc_type': 'Separator', - 'docstatus': 0, - 'doctype': 'Module Def Item', - 'fields': None, - 'hide': None, - 'icon': None, - 'idx': 8, - 'modified': '2011-03-24 15:29:36', - 'modified_by': 'Administrator', - 'name': '000003093', - 'owner': 'saumil@webnotestech.com', - 'parent': 'Production', - 'parentfield': 'items', - 'parenttype': 'Module Def' - }, - { - 'click_function': None, - 'creation': '2011-03-24 15:04:47', - 'description': None, - 'display_name': 'Delivery Plan', - 'doc_name': 'Sales Order Item', - 'doc_type': 'Reports', - 'docstatus': 0, - 'doctype': 'Module Def Item', - 'fields': None, - 'hide': None, - 'icon': None, - 'idx': 9, - 'modified': '2011-03-24 15:29:36', - 'modified_by': 'Administrator', - 'name': '000003094', - 'owner': 'Administrator', - 'parent': 'Production', - 'parentfield': 'items', - 'parenttype': 'Module Def' - }, - { - 'click_function': None, - 'creation': '2011-03-24 15:04:47', - 'description': None, - 'display_name': 'Itemwise Production Report', - 'doc_name': 'Stock Entry Detail', - 'doc_type': 'Reports', - 'docstatus': 0, - 'doctype': 'Module Def Item', - 'fields': None, - 'hide': None, - 'icon': None, - 'idx': 10, - 'modified': '2011-03-24 15:29:36', - 'modified_by': 'Administrator', - 'name': '000003095', - 'owner': 'jai@webnotestech.com', - 'parent': 'Production', - 'parentfield': 'items', - 'parenttype': 'Module Def' - }, - { - 'click_function': None, - 'creation': '2011-03-24 15:04:47', - 'description': None, - 'display_name': 'Production Orders In Process', - 'doc_name': 'Production Order', - 'doc_type': 'Reports', - 'docstatus': 0, - 'doctype': 'Module Def Item', - 'fields': None, - 'hide': None, - 'icon': None, - 'idx': 11, - 'modified': '2011-03-24 15:29:36', - 'modified_by': 'Administrator', - 'name': '000003096', - 'owner': 'jai@webnotestech.com', - 'parent': 'Production', - 'parentfield': 'items', - 'parenttype': 'Module Def' - }, - { - 'click_function': None, - 'creation': '2010-11-30 22:42:49', - 'description': 'Bill of material master containing raw materials, operation and costs', - 'display_name': 'BOM', - 'doc_name': 'BOM', - 'doc_type': 'Forms', - 'docstatus': 0, - 'doctype': 'Module Def Item', - 'fields': 'id\nitem\ndescription\noperating_cost\nmaintained_by', - 'hide': None, - 'icon': None, - 'idx': 1, - 'modified': '2011-03-24 15:29:36', - 'modified_by': 'Administrator', - 'name': 'MDI00209', - 'owner': 'Administrator', - 'parent': 'Production', - 'parentfield': 'items', - 'parenttype': 'Module Def' - }, - { - 'click_function': None, - 'creation': '2010-11-30 22:42:49', - 'description': 'Machinery in warehouse where operations are performed on raw materials', - 'display_name': 'Workstation', - 'doc_name': 'Workstation', - 'doc_type': 'Forms', - 'docstatus': 0, - 'doctype': 'Module Def Item', - 'fields': 'id\nworkstation_name\nwarehouse\ndescription', - 'hide': None, - 'icon': None, - 'idx': 2, - 'modified': '2011-03-24 15:29:36', - 'modified_by': 'Administrator', - 'name': 'MDI00210', - 'owner': 'Administrator', - 'parent': 'Production', - 'parentfield': 'items', - 'parenttype': 'Module Def' - }, - { - 'click_function': None, - 'creation': '2010-11-30 22:42:49', - 'description': 'Explode Bill of Materials in a tree and calculate the cost', - 'display_name': 'Bill of Materials (Tree)', - 'doc_name': 'Bill of Materials', - 'doc_type': 'Pages', - 'docstatus': 0, - 'doctype': 'Module Def Item', - 'fields': None, - 'hide': None, - 'icon': None, - 'idx': 3, - 'modified': '2011-03-24 15:29:36', - 'modified_by': 'Administrator', - 'name': 'MDI00211', - 'owner': 'Administrator', - 'parent': 'Production', - 'parentfield': 'items', - 'parenttype': 'Module Def' - }, - { - 'click_function': None, - 'creation': '2010-11-30 22:42:49', - 'description': 'Update confirmed delivery dates in Sales Orders included in Production Plan', - 'display_name': 'Update Delivery Dates', - 'doc_name': 'Update Delivery Date', - 'doc_type': 'Single DocType', - 'docstatus': 0, - 'doctype': 'Module Def Item', - 'fields': None, - 'hide': None, - 'icon': None, - 'idx': 4, - 'modified': '2011-03-24 15:29:36', - 'modified_by': 'Administrator', - 'name': 'MDI00212', - 'owner': 'jai@webnotestech.com', - 'parent': 'Production', - 'parentfield': 'items', - 'parenttype': 'Module Def' - }, - { - 'click_function': None, - 'creation': '2010-11-30 22:42:49', - 'description': 'Plan your production by including relevant Sales Orders in your plan', - 'display_name': 'Production Planning Tool', - 'doc_name': 'Production Planning Tool', - 'doc_type': 'Single DocType', - 'docstatus': 0, - 'doctype': 'Module Def Item', - 'fields': None, - 'hide': None, - 'icon': None, - 'idx': 5, - 'modified': '2011-03-24 15:29:36', - 'modified_by': 'Administrator', - 'name': 'MDI00213', - 'owner': 'saumil@webnotestech.com', - 'parent': 'Production', - 'parentfield': 'items', - 'parenttype': 'Module Def' - }, - { - 'click_function': None, - 'creation': '2010-11-30 22:42:49', - 'description': 'Change raw materials used in a Bill of Material through BOM replace utility', - 'display_name': 'BOM Replace Utility', - 'doc_name': 'BOM Replace Utility', - 'doc_type': 'Single DocType', - 'docstatus': 0, - 'doctype': 'Module Def Item', - 'fields': None, - 'hide': None, - 'icon': None, - 'idx': 6, - 'modified': '2011-03-24 15:29:36', - 'modified_by': 'Administrator', - 'name': 'MDI00214', - 'owner': 'jai@webnotestech.com', - 'parent': 'Production', - 'parentfield': 'items', - 'parenttype': 'Module Def' - }, - { - 'click_function': None, - 'creation': '2010-11-30 22:42:49', - 'description': 'Raise your Production Orders Manually', - 'display_name': 'Production Order', - 'doc_name': 'Production Order', - 'doc_type': 'Forms', - 'docstatus': 0, - 'doctype': 'Module Def Item', - 'fields': None, - 'hide': None, - 'icon': None, - 'idx': 7, - 'modified': '2011-03-24 15:29:36', - 'modified_by': 'Administrator', - 'name': 'MDI00215', - 'owner': 'Administrator', - 'parent': 'Production', - 'parentfield': 'items', - 'parenttype': 'Module Def' - }, - { - 'click_function': None, - 'creation': '2011-03-24 15:04:47', - 'description': None, - 'display_name': None, - 'doc_name': 'Reports', - 'doc_type': 'Separator', - 'docstatus': 0, - 'doctype': 'Module Def Item', - 'fields': None, - 'hide': None, - 'icon': None, - 'idx': 8, - 'modified': '2011-03-24 15:29:36', - 'modified_by': 'Administrator', - 'name': '000003093', - 'owner': 'saumil@webnotestech.com', - 'parent': 'Production', - 'parentfield': 'items', - 'parenttype': 'Module Def' - }, - { - 'click_function': None, - 'creation': '2011-03-24 15:04:47', - 'description': None, - 'display_name': 'Delivery Plan', - 'doc_name': 'Sales Order Item', - 'doc_type': 'Reports', - 'docstatus': 0, - 'doctype': 'Module Def Item', - 'fields': None, - 'hide': None, - 'icon': None, - 'idx': 9, - 'modified': '2011-03-24 15:29:36', - 'modified_by': 'Administrator', - 'name': '000003094', - 'owner': 'Administrator', - 'parent': 'Production', - 'parentfield': 'items', - 'parenttype': 'Module Def' - }, - { - 'click_function': None, - 'creation': '2011-03-24 15:04:47', - 'description': None, - 'display_name': 'Itemwise Production Report', - 'doc_name': 'Stock Entry Detail', - 'doc_type': 'Reports', - 'docstatus': 0, - 'doctype': 'Module Def Item', - 'fields': None, - 'hide': None, - 'icon': None, - 'idx': 10, - 'modified': '2011-03-24 15:29:36', - 'modified_by': 'Administrator', - 'name': '000003095', - 'owner': 'jai@webnotestech.com', - 'parent': 'Production', - 'parentfield': 'items', - 'parenttype': 'Module Def' - }, - { - 'click_function': None, - 'creation': '2011-03-24 15:04:47', - 'description': None, - 'display_name': 'Production Orders In Process', - 'doc_name': 'Production Order', - 'doc_type': 'Reports', - 'docstatus': 0, - 'doctype': 'Module Def Item', - 'fields': None, - 'hide': None, - 'icon': None, - 'idx': 11, - 'modified': '2011-03-24 15:29:36', - 'modified_by': 'Administrator', - 'name': '000003096', - 'owner': 'jai@webnotestech.com', - 'parent': 'Production', - 'parentfield': 'items', - 'parenttype': 'Module Def' - }, - { - 'creation': '2010-11-30 22:42:49', - 'docstatus': 0, - 'doctype': 'Module Def Role', - 'idx': 1, - 'modified': '2011-03-24 15:29:36', - 'modified_by': 'Administrator', - 'name': 'MDR00040', - 'owner': 'Administrator', - 'parent': 'Production', - 'parentfield': 'roles', - 'parenttype': 'Module Def', - 'role': 'Production User' - }, - { - 'creation': '2010-11-30 22:42:49', - 'docstatus': 0, - 'doctype': 'Module Def Role', - 'idx': 2, - 'modified': '2011-03-24 15:29:36', - 'modified_by': 'Administrator', - 'name': 'MDR00041', - 'owner': 'Administrator', - 'parent': 'Production', - 'parentfield': 'roles', - 'parenttype': 'Module Def', - 'role': 'Production Manager' - } -] \ No newline at end of file diff --git a/erpnext/production/Role/Production Manager/Production Manager.txt b/erpnext/production/Role/Production Manager/Production Manager.txt deleted file mode 100644 index b87fc745223..00000000000 --- a/erpnext/production/Role/Production Manager/Production Manager.txt +++ /dev/null @@ -1,26 +0,0 @@ -# Role, Production Manager -[ - - # These values are common in all dictionaries - { - 'creation': '2010-08-08 17:08:51', - 'docstatus': 0, - 'modified': '2009-09-23 16:35:35', - 'modified_by': 'Administrator', - 'owner': 'Administrator' - }, - - # These values are common for all Role - { - 'doctype': 'Role', - 'module': 'Production', - 'name': '__common__', - 'role_name': 'Production Manager' - }, - - # Role, Production Manager - { - 'doctype': 'Role', - 'name': 'Production Manager' - } -] \ No newline at end of file diff --git a/erpnext/production/Role/Production User/Production User.txt b/erpnext/production/Role/Production User/Production User.txt deleted file mode 100644 index ed6d6d69a2b..00000000000 --- a/erpnext/production/Role/Production User/Production User.txt +++ /dev/null @@ -1,26 +0,0 @@ -# Role, Production User -[ - - # These values are common in all dictionaries - { - 'creation': '2010-08-08 17:08:51', - 'docstatus': 0, - 'modified': '2009-09-23 16:36:08', - 'modified_by': 'Administrator', - 'owner': 'Administrator' - }, - - # These values are common for all Role - { - 'doctype': 'Role', - 'module': 'Production', - 'name': '__common__', - 'role_name': 'Production User' - }, - - # Role, Production User - { - 'doctype': 'Role', - 'name': 'Production User' - } -] \ No newline at end of file diff --git a/erpnext/production/__init__.py b/erpnext/production/__init__.py index e69de29bb2d..4da0c58ae93 100644 --- a/erpnext/production/__init__.py +++ b/erpnext/production/__init__.py @@ -0,0 +1,4 @@ +install_docs = [ + {"doctype":"Role", "name":"Production Manager"}, + {"doctype":"Role", "name":"Production User"}, +] diff --git a/erpnext/production/search_criteria/delivery_plan/__init__.py b/erpnext/production/search_criteria/delivery_plan/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/erpnext/production/search_criteria/delivery_plan/delivery_plan.js b/erpnext/production/search_criteria/delivery_plan/delivery_plan.js deleted file mode 100644 index 03f910550f2..00000000000 --- a/erpnext/production/search_criteria/delivery_plan/delivery_plan.js +++ /dev/null @@ -1,34 +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 . - -report.customize_filters = function() { - - //to hide all filters - //this.hide_all_filters(); - - // to disable a filter from query set - this.filter_fields_dict['Sales Order'+FILTER_SEP +'Status'].df.ignore = 1; - - // to unhide required filters - this.filter_fields_dict['Sales Order'+FILTER_SEP +'Customer'].df.filter_hide = 0; - this.filter_fields_dict['Sales Order'+FILTER_SEP +'Customer Name'].df.filter_hide = 0; - this.filter_fields_dict['Sales Order Item'+FILTER_SEP +'From Confirmed Delivery Date'].df.filter_hide = 0; - this.filter_fields_dict['Sales Order Item'+FILTER_SEP +'To Confirmed Delivery Date'].df.filter_hide = 0; - - - this.filter_fields_dict['Sales Order'+FILTER_SEP +'Company'].df['report_default'] = sys_defaults.company; - this.filter_fields_dict['Sales Order'+FILTER_SEP +'Fiscal Year'].df['report_default'] = sys_defaults.fiscal_year; -} \ No newline at end of file diff --git a/erpnext/production/search_criteria/delivery_plan/delivery_plan.txt b/erpnext/production/search_criteria/delivery_plan/delivery_plan.txt deleted file mode 100644 index 5ea811ad332..00000000000 --- a/erpnext/production/search_criteria/delivery_plan/delivery_plan.txt +++ /dev/null @@ -1,37 +0,0 @@ -# Search Criteria, delivery_plan -[ - - # These values are common in all dictionaries - { - 'creation': '2012-04-03 12:49:51', - 'docstatus': 0, - 'modified': '2012-04-03 12:49:51', - 'modified_by': u'Administrator', - 'owner': u'Administrator' - }, - - # These values are common for all Search Criteria - { - 'add_col': u"SUM(`tabSales Order Item`.`pending_qty` * `tabSales Order Item`.`basic_rate` ) AS 'Amount'", - 'add_cond': u"`tabSales Order Item`.pending_qty > 0 and (`tabSales Order Item`.confirmation_date is not null or `tabSales Order Item`.confirmation_date!='' or `tabSales Order Item`.confirmation_date != '00-00-0000')", - 'columns': u'Sales Order\x01ID,Sales Order\x01Customer,Sales Order\x01Customer Name', - 'criteria_name': u'Delivery Plan', - 'doc_type': u'Sales Order Item', - 'doctype': 'Search Criteria', - 'filters': u"{'Sales Order\x01Saved':1,'Sales Order\x01Submitted':1,'Sales Order\x01Status':'','Sales Order\x01Fiscal Year':''}", - 'group_by': u'`tabSales Order Item`.`confirmation_date`, `tabSales Order`.`name`', - 'module': u'Production', - 'name': '__common__', - 'page_len': 50, - 'parent_doc_type': u'Sales Order', - 'sort_by': u'`tabSales Order`.`name`', - 'sort_order': u'DESC', - 'standard': u'Yes' - }, - - # Search Criteria, delivery_plan - { - 'doctype': 'Search Criteria', - 'name': u'delivery_plan' - } -] \ No newline at end of file diff --git a/erpnext/projects/Role/Projects User/Projects User.txt b/erpnext/projects/Role/Projects User/Projects User.txt deleted file mode 100644 index 61a5a3b1177..00000000000 --- a/erpnext/projects/Role/Projects User/Projects User.txt +++ /dev/null @@ -1,26 +0,0 @@ -# Role, Projects User -[ - - # These values are common in all dictionaries - { - 'creation': '2010-08-08 17:08:51', - 'docstatus': 0, - 'modified': '2010-05-08 09:40:07', - 'modified_by': 'Administrator', - 'owner': 'Administrator' - }, - - # These values are common for all Role - { - 'doctype': 'Role', - 'module': 'Projects', - 'name': '__common__', - 'role_name': 'Projects User' - }, - - # Role, Projects User - { - 'doctype': 'Role', - 'name': 'Projects User' - } -] \ No newline at end of file diff --git a/erpnext/projects/__init__.py b/erpnext/projects/__init__.py index e69de29bb2d..636248f51f9 100644 --- a/erpnext/projects/__init__.py +++ b/erpnext/projects/__init__.py @@ -0,0 +1,3 @@ +install_docs = [ + {"doctype":"Role", "name":"Projects User"}, +] diff --git a/erpnext/projects/search_criteria/dispatch_report/__init__.py b/erpnext/projects/search_criteria/dispatch_report/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/erpnext/projects/search_criteria/dispatch_report/dispatch_report.js b/erpnext/projects/search_criteria/dispatch_report/dispatch_report.js deleted file mode 100644 index a31d6e4ea6a..00000000000 --- a/erpnext/projects/search_criteria/dispatch_report/dispatch_report.js +++ /dev/null @@ -1,21 +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 . - -report.customize_filters = function() { - this.mytabs.items['Select Columns'].hide() - //this.mytabs.items['More Filters'].hide() - //this.hide_all_filters(); -} \ No newline at end of file diff --git a/erpnext/projects/search_criteria/dispatch_report/dispatch_report.txt b/erpnext/projects/search_criteria/dispatch_report/dispatch_report.txt deleted file mode 100644 index 0927411be74..00000000000 --- a/erpnext/projects/search_criteria/dispatch_report/dispatch_report.txt +++ /dev/null @@ -1,34 +0,0 @@ -# Search Criteria, dispatch_report -[ - - # These values are common in all dictionaries - { - 'creation': '2012-04-03 12:49:51', - 'docstatus': 0, - 'modified': '2012-04-03 12:49:51', - 'modified_by': u'Administrator', - 'owner': u'ashwini@webnotestech.com' - }, - - # These values are common for all Search Criteria - { - 'columns': u'Delivery Note\x01ID,Delivery Note\x01Project Name,Delivery Note\x01Customer,Delivery Note\x01Customer Name,Delivery Note\x01Posting Date,Delivery Note Item\x01Item Code,Delivery Note Item\x01Item Name,Delivery Note Item\x01Quantity,Delivery Note Item\x01Amount*', - 'criteria_name': u'Dispatch Report', - 'doc_type': u'Delivery Note Item', - 'doctype': 'Search Criteria', - 'filters': u"{'Delivery Note\x01Saved':1,'Delivery Note\x01Submitted':1,'Delivery Note\x01Status':'Submitted','Delivery Note\x01Fiscal Year':''}", - 'module': u'Projects', - 'name': '__common__', - 'page_len': 50, - 'parent_doc_type': u'Delivery Note', - 'sort_by': u'`tabDelivery Note`.`name`', - 'sort_order': u'DESC', - 'standard': u'Yes' - }, - - # Search Criteria, dispatch_report - { - 'doctype': 'Search Criteria', - 'name': u'dispatch_report' - } -] \ No newline at end of file diff --git a/erpnext/selling/Role/Customer/Customer.txt b/erpnext/selling/Role/Customer/Customer.txt deleted file mode 100644 index 3f7e9d21825..00000000000 --- a/erpnext/selling/Role/Customer/Customer.txt +++ /dev/null @@ -1,26 +0,0 @@ -# Role, Customer -[ - - # These values are common in all dictionaries - { - 'creation': '2010-08-08 17:08:51', - 'docstatus': 0, - 'modified': '2009-06-26 14:42:33', - 'modified_by': 'Administrator', - 'owner': 'Administrator' - }, - - # These values are common for all Role - { - 'doctype': 'Role', - 'module': 'Selling', - 'name': '__common__', - 'role_name': 'Customer' - }, - - # Role, Customer - { - 'doctype': 'Role', - 'name': 'Customer' - } -] \ No newline at end of file diff --git a/erpnext/selling/Role/Partner/Partner.txt b/erpnext/selling/Role/Partner/Partner.txt deleted file mode 100644 index 339929cbbae..00000000000 --- a/erpnext/selling/Role/Partner/Partner.txt +++ /dev/null @@ -1,26 +0,0 @@ -# Role, Partner -[ - - # These values are common in all dictionaries - { - 'creation': '2010-08-08 17:08:51', - 'docstatus': 0, - 'modified': '2009-07-13 11:29:39', - 'modified_by': 'Administrator', - 'owner': 'Administrator' - }, - - # These values are common for all Role - { - 'doctype': 'Role', - 'module': 'Selling', - 'name': '__common__', - 'role_name': 'Partner' - }, - - # Role, Partner - { - 'doctype': 'Role', - 'name': 'Partner' - } -] \ No newline at end of file diff --git a/erpnext/selling/Role/Sales Manager/Sales Manager.txt b/erpnext/selling/Role/Sales Manager/Sales Manager.txt deleted file mode 100644 index 5d975fc51f8..00000000000 --- a/erpnext/selling/Role/Sales Manager/Sales Manager.txt +++ /dev/null @@ -1,26 +0,0 @@ -# Role, Sales Manager -[ - - # These values are common in all dictionaries - { - 'creation': '2010-08-08 17:08:51', - 'docstatus': 0, - 'modified': '2010-04-08 12:07:36', - 'modified_by': 'Administrator', - 'owner': 'Administrator' - }, - - # These values are common for all Role - { - 'doctype': 'Role', - 'module': 'Selling', - 'name': '__common__', - 'role_name': 'Sales Manager' - }, - - # Role, Sales Manager - { - 'doctype': 'Role', - 'name': 'Sales Manager' - } -] \ No newline at end of file diff --git a/erpnext/selling/Role/Sales Master Manager/Sales Master Manager.txt b/erpnext/selling/Role/Sales Master Manager/Sales Master Manager.txt deleted file mode 100644 index 1140f99fc97..00000000000 --- a/erpnext/selling/Role/Sales Master Manager/Sales Master Manager.txt +++ /dev/null @@ -1,26 +0,0 @@ -# Role, Sales Master Manager -[ - - # These values are common in all dictionaries - { - 'creation': '2010-08-08 17:08:51', - 'docstatus': 0, - 'modified': '2010-04-08 13:50:11', - 'modified_by': 'Administrator', - 'owner': 'Administrator' - }, - - # These values are common for all Role - { - 'doctype': 'Role', - 'module': 'Selling', - 'name': '__common__', - 'role_name': 'Sales Master Manager' - }, - - # Role, Sales Master Manager - { - 'doctype': 'Role', - 'name': 'Sales Master Manager' - } -] \ No newline at end of file diff --git a/erpnext/selling/Role/Sales User/Sales User.txt b/erpnext/selling/Role/Sales User/Sales User.txt deleted file mode 100644 index 97229b853b1..00000000000 --- a/erpnext/selling/Role/Sales User/Sales User.txt +++ /dev/null @@ -1,26 +0,0 @@ -# Role, Sales User -[ - - # These values are common in all dictionaries - { - 'creation': '2010-08-08 17:08:51', - 'docstatus': 0, - 'modified': '2010-04-08 12:07:44', - 'modified_by': 'Administrator', - 'owner': 'Administrator' - }, - - # These values are common for all Role - { - 'doctype': 'Role', - 'module': 'Selling', - 'name': '__common__', - 'role_name': 'Sales User' - }, - - # Role, Sales User - { - 'doctype': 'Role', - 'name': 'Sales User' - } -] \ No newline at end of file diff --git a/erpnext/selling/__init__.py b/erpnext/selling/__init__.py index e69de29bb2d..c61f23cc043 100644 --- a/erpnext/selling/__init__.py +++ b/erpnext/selling/__init__.py @@ -0,0 +1,7 @@ +install_docs = [ + {"doctype":"Role", "name":"Customer"}, + {"doctype":"Role", "name":"Partner"}, + {"doctype":"Role", "name":"Sales Manager"}, + {"doctype":"Role", "name":"Sales Master Manager"}, + {"doctype":"Role", "name":"Sales User"}, +] diff --git a/erpnext/analysis/doctype/trend_analyzer_control/__init__.py b/erpnext/selling/search_criteria/lead_to_follow_up/__init__.py old mode 100755 new mode 100644 similarity index 100% rename from erpnext/analysis/doctype/trend_analyzer_control/__init__.py rename to erpnext/selling/search_criteria/lead_to_follow_up/__init__.py diff --git a/erpnext/home/search_criteria/lead_to_follow_up/lead_to_follow_up.js b/erpnext/selling/search_criteria/lead_to_follow_up/lead_to_follow_up.js similarity index 100% rename from erpnext/home/search_criteria/lead_to_follow_up/lead_to_follow_up.js rename to erpnext/selling/search_criteria/lead_to_follow_up/lead_to_follow_up.js diff --git a/erpnext/home/search_criteria/lead_to_follow_up/lead_to_follow_up.txt b/erpnext/selling/search_criteria/lead_to_follow_up/lead_to_follow_up.txt similarity index 97% rename from erpnext/home/search_criteria/lead_to_follow_up/lead_to_follow_up.txt rename to erpnext/selling/search_criteria/lead_to_follow_up/lead_to_follow_up.txt index 6367859ac77..3a5c98311d1 100644 --- a/erpnext/home/search_criteria/lead_to_follow_up/lead_to_follow_up.txt +++ b/erpnext/selling/search_criteria/lead_to_follow_up/lead_to_follow_up.txt @@ -18,7 +18,7 @@ 'doc_type': u'Lead', 'doctype': 'Search Criteria', 'filters': u"{'Lead\x01Status':'','Lead\x01Source':'','Lead\x01Expected Month':'','Lead\x01Industry':'','Lead\x01Market Segment':'','Lead\x01Rating':''}", - 'module': u'Home', + 'module': u'Selling', 'name': '__common__', 'page_len': 50, 'sort_by': u'`tabLead`.`name`', @@ -31,4 +31,4 @@ 'doctype': 'Search Criteria', 'name': u'lead-to_follow_up' } -] \ No newline at end of file +] diff --git a/erpnext/home/search_criteria/lead_to_follow_up/sales_order_overdue.js b/erpnext/selling/search_criteria/lead_to_follow_up/sales_order_overdue.js similarity index 100% rename from erpnext/home/search_criteria/lead_to_follow_up/sales_order_overdue.js rename to erpnext/selling/search_criteria/lead_to_follow_up/sales_order_overdue.js diff --git a/erpnext/selling/search_criteria/monthly_despatched_trend/__init__.py b/erpnext/selling/search_criteria/monthly_despatched_trend/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/erpnext/selling/search_criteria/monthly_despatched_trend/monthly_despatched_trend.js b/erpnext/selling/search_criteria/monthly_despatched_trend/monthly_despatched_trend.js deleted file mode 100644 index ac04e287fea..00000000000 --- a/erpnext/selling/search_criteria/monthly_despatched_trend/monthly_despatched_trend.js +++ /dev/null @@ -1,18 +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 . - -this.mytabs.items['Select Columns'].hide(); -this.mytabs.items['More Filters'].hide(); \ No newline at end of file diff --git a/erpnext/selling/search_criteria/monthly_despatched_trend/monthly_despatched_trend.py b/erpnext/selling/search_criteria/monthly_despatched_trend/monthly_despatched_trend.py deleted file mode 100644 index f18ee153be1..00000000000 --- a/erpnext/selling/search_criteria/monthly_despatched_trend/monthly_despatched_trend.py +++ /dev/null @@ -1,23 +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 . - -total = 0.0 -monthlist = ['','Jan','Feb','Mar','Apr','May','Jun','Jul','Aug','Sep','Oct','Nov','Dec'] -for r in res: - r[0] = monthlist[r[0]] - total += r[1] - -colwidths[col_idx['Total Despatched']] = '200px' \ No newline at end of file diff --git a/erpnext/selling/search_criteria/monthly_despatched_trend/monthly_despatched_trend.txt b/erpnext/selling/search_criteria/monthly_despatched_trend/monthly_despatched_trend.txt deleted file mode 100644 index 22717c60616..00000000000 --- a/erpnext/selling/search_criteria/monthly_despatched_trend/monthly_despatched_trend.txt +++ /dev/null @@ -1,38 +0,0 @@ -# Search Criteria, monthly_despatched_trend -[ - - # These values are common in all dictionaries - { - 'creation': '2012-04-03 12:49:51', - 'docstatus': 0, - 'modified': '2012-04-03 12:49:51', - 'modified_by': u'Administrator', - 'owner': u'Administrator' - }, - - # These values are common for all Search Criteria - { - 'add_col': u"month(`tabDelivery Note`.posting_date) AS 'Sales Month'\nsum(`tabDelivery Note`.net_total) AS 'Total Despatched'", - 'add_cond': u'`tabDelivery Note`.net_total > 10', - 'criteria_name': u'Monthly Despatched Trend', - 'description': u'Monthly Despatched Trend', - 'doc_type': u'Delivery Note', - 'doctype': 'Search Criteria', - 'filters': u"{'Delivery Note\x01Submitted':1,'Delivery Note\x01Status':'','Delivery Note\x01Chargeable':'Yes','Delivery Note\x01Department':'','Delivery Note\x01Type':'','Delivery Note\x01Company Name':'Janak Healthcare Pvt Ltd','Delivery Note\x01Fiscal Year':'2009-2010'}", - 'graph_series': u'Despatched Month', - 'graph_values': u'Total Despatched', - 'group_by': u'month(`tabDelivery Note`.Posting_date)', - 'module': u'Selling', - 'name': '__common__', - 'page_len': 50, - 'sort_by': u'`Sales Month`', - 'sort_order': u'DESC', - 'standard': u'Yes' - }, - - # Search Criteria, monthly_despatched_trend - { - 'doctype': 'Search Criteria', - 'name': u'monthly_despatched_trend' - } -] \ No newline at end of file diff --git a/erpnext/analysis/page/__init__.py b/erpnext/selling/search_criteria/opportunity_to_follow_up/__init__.py similarity index 100% rename from erpnext/analysis/page/__init__.py rename to erpnext/selling/search_criteria/opportunity_to_follow_up/__init__.py diff --git a/erpnext/home/search_criteria/opportunity_to_follow_up/opportunity_to_follow_up.txt b/erpnext/selling/search_criteria/opportunity_to_follow_up/opportunity_to_follow_up.txt similarity index 97% rename from erpnext/home/search_criteria/opportunity_to_follow_up/opportunity_to_follow_up.txt rename to erpnext/selling/search_criteria/opportunity_to_follow_up/opportunity_to_follow_up.txt index ee57967db83..3ca813b5c1d 100644 --- a/erpnext/home/search_criteria/opportunity_to_follow_up/opportunity_to_follow_up.txt +++ b/erpnext/selling/search_criteria/opportunity_to_follow_up/opportunity_to_follow_up.txt @@ -18,7 +18,7 @@ 'doc_type': u'Opportunity', 'doctype': 'Search Criteria', 'filters': u"{'Opportunity\x01Fiscal Year':''}", - 'module': u'Home', + 'module': u'Selling', 'name': '__common__', 'page_len': 50, 'sort_by': u'`tabOpportunity`.`name`', @@ -31,4 +31,4 @@ 'doctype': 'Search Criteria', 'name': u'opportunity-to_follow_up' } -] \ No newline at end of file +] diff --git a/erpnext/selling/search_criteria/periodic_sales_summary/__init__.py b/erpnext/selling/search_criteria/periodic_sales_summary/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/erpnext/selling/search_criteria/periodic_sales_summary/periodic_sales_summary.js b/erpnext/selling/search_criteria/periodic_sales_summary/periodic_sales_summary.js deleted file mode 100644 index 2fa8a0fae0d..00000000000 --- a/erpnext/selling/search_criteria/periodic_sales_summary/periodic_sales_summary.js +++ /dev/null @@ -1,35 +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 . - -report.customize_filters = function() { - this.hide_all_filters(); - this.add_filter({fieldname:'transaction_date', label:'Sales Order Date', fieldtype:'Date', parent:'Sales Order', in_first_page : 1,default:''}); - - //this.filter_fields_dict['Sales Order'+FILTER_SEP +'Territory'].df.filter_hide = 0; - //this.filter_fields_dict['Sales Order'+FILTER_SEP +'Sales Order Date'].df.filter_hide = 0; - //this.filter_fields_dict['Sales Order'+FILTER_SEP +'Sales Order Date'].df.in_first_page = 1; - - this.filter_fields_dict['Sales Order Item'+FILTER_SEP +'Item Code'].df.filter_hide = 0; - this.filter_fields_dict['Sales Order Item'+FILTER_SEP +'Item Code'].df.in_first_page = 1; - - this.filter_fields_dict['Sales Order'+FILTER_SEP +'Company'].df.filter_hide = 0; - this.filter_fields_dict['Sales Order'+FILTER_SEP +'Company'].df.in_first_page = 1; - - this.filter_fields_dict['Sales Order'+FILTER_SEP +'Company'].df['report_default'] = sys_defaults.company; - - //this.mytabs.items['Select Columns'].hide(); - //this.mytabs.items['More Filters'].hide(); -} \ No newline at end of file diff --git a/erpnext/selling/search_criteria/periodic_sales_summary/periodic_sales_summary.txt b/erpnext/selling/search_criteria/periodic_sales_summary/periodic_sales_summary.txt deleted file mode 100644 index b4d370fde92..00000000000 --- a/erpnext/selling/search_criteria/periodic_sales_summary/periodic_sales_summary.txt +++ /dev/null @@ -1,37 +0,0 @@ -# Search Criteria, periodic_sales_summary -[ - - # These values are common in all dictionaries - { - 'creation': '2010-08-08 17:09:31', - 'docstatus': 0, - 'modified': '2010-06-03 13:09:00', - 'modified_by': 'Administrator', - 'owner': 'Administrator' - }, - - # These values are common for all Search Criteria - { - 'columns': 'Sales Order Item\x01Item Code,Sales Order Item\x01Quantity,Sales Order Item\x01Delivered Qty,Sales Order Item\x01Billed Qty', - 'criteria_name': 'Periodic Sales Summary', - 'dis_filters': 'fiscal_year', - 'disabled': 1, - 'doc_type': 'Sales Order Item', - 'doctype': 'Search Criteria', - 'filters': "{'Sales Order\x01Submitted':1,'Sales Order\x01Company Name':'','Sales Order\x01Fiscal Year':''}", - 'group_by': '`tabSales Order Item`.`item_code`', - 'module': 'Selling', - 'name': '__common__', - 'page_len': 50, - 'parent_doc_type': 'Sales Order', - 'sort_by': '`tabSales Order Item`.`item_code`', - 'sort_order': 'DESC', - 'standard': 'Yes' - }, - - # Search Criteria, periodic_sales_summary - { - 'doctype': 'Search Criteria', - 'name': 'periodic_sales_summary' - } -] \ No newline at end of file diff --git a/erpnext/selling/search_criteria/sales_agentwise_commission/__init__.py b/erpnext/selling/search_criteria/sales_agentwise_commission/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/erpnext/selling/search_criteria/sales_agentwise_commission/sales_agentwise_commission.js b/erpnext/selling/search_criteria/sales_agentwise_commission/sales_agentwise_commission.js deleted file mode 100644 index 049c5979748..00000000000 --- a/erpnext/selling/search_criteria/sales_agentwise_commission/sales_agentwise_commission.js +++ /dev/null @@ -1,25 +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 . - -report.customize_filters = function() { - this.hide_all_filters(); - this.filter_fields_dict['Sales Order'+FILTER_SEP +'Sales Partner'].df.filter_hide = 0; - this.filter_fields_dict['Sales Order'+FILTER_SEP +'Sales Partner'].df.in_first_page = 1; -} - - -this.mytabs.items['Select Columns'].hide(); -this.mytabs.items['More Filters'].hide(); \ No newline at end of file diff --git a/erpnext/selling/search_criteria/sales_agentwise_commission/sales_agentwise_commission.py b/erpnext/selling/search_criteria/sales_agentwise_commission/sales_agentwise_commission.py deleted file mode 100644 index 4958674d141..00000000000 --- a/erpnext/selling/search_criteria/sales_agentwise_commission/sales_agentwise_commission.py +++ /dev/null @@ -1,24 +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 . - -coltypes[col_idx['Average Commission Rate']] = 'Currency' -colwidths[col_idx['Average Commission Rate']] = '200px' - -coltypes[col_idx['Net Total']] = 'Currency' -colwidths[col_idx['Net Total']] = '150px' - -coltypes[col_idx['Total Commission']] = 'Currency' -colwidths[col_idx['Total Commission']] = '150px' diff --git a/erpnext/selling/search_criteria/sales_agentwise_commission/sales_agentwise_commission.txt b/erpnext/selling/search_criteria/sales_agentwise_commission/sales_agentwise_commission.txt deleted file mode 100644 index 047a175d213..00000000000 --- a/erpnext/selling/search_criteria/sales_agentwise_commission/sales_agentwise_commission.txt +++ /dev/null @@ -1,37 +0,0 @@ -# Search Criteria, sales_agentwise_commission -[ - - # These values are common in all dictionaries - { - 'creation': '2010-08-26 11:52:28', - 'docstatus': 0, - 'modified': '2010-08-26 11:48:17', - 'modified_by': 'Administrator', - 'owner': 'Administrator' - }, - - # These values are common for all Search Criteria - { - 'add_col': "SUM(`tabSales Order`.`total_commission`) AS 'Total Commission'\nSUM(`tabSales Order`.`net_total`) AS 'Net Total'\n((SUM(`tabSales Order`.`total_commission`) / SUM(`tabSales Order`.`net_total`)) * 100) AS 'Average Commission Rate'", - 'add_cond': '`tabSales Order`.`net_total` > 0', - 'columns': 'Sales Order\x01Business Associate', - 'criteria_name': 'Sales Agentwise Commission', - 'description': 'Sales Agentwise Commission', - 'disabled': 1, - 'doc_type': 'Sales Order', - 'doctype': 'Search Criteria', - 'filters': "{'Sales Order\x01Submitted':1}", - 'group_by': '`tabSales Order`.`sales_partner`', - 'module': 'Selling', - 'name': '__common__', - 'page_len': 50, - 'sort_order': 'DESC', - 'standard': 'Yes' - }, - - # Search Criteria, sales_agentwise_commission - { - 'doctype': 'Search Criteria', - 'name': 'sales_agentwise_commission' - } -] \ No newline at end of file diff --git a/erpnext/analysis/search_criteria/__init__.py b/erpnext/selling/search_criteria/sales_order_pending_items/__init__.py similarity index 100% rename from erpnext/analysis/search_criteria/__init__.py rename to erpnext/selling/search_criteria/sales_order_pending_items/__init__.py diff --git a/erpnext/selling/search_criteria/sales_order_pending_items1/sales_order_pending_items1.js b/erpnext/selling/search_criteria/sales_order_pending_items/sales_order_pending_items.js similarity index 100% rename from erpnext/selling/search_criteria/sales_order_pending_items1/sales_order_pending_items1.js rename to erpnext/selling/search_criteria/sales_order_pending_items/sales_order_pending_items.js diff --git a/erpnext/selling/search_criteria/sales_order_pending_items1/sales_order_pending_items1.txt b/erpnext/selling/search_criteria/sales_order_pending_items/sales_order_pending_items.txt similarity index 95% rename from erpnext/selling/search_criteria/sales_order_pending_items1/sales_order_pending_items1.txt rename to erpnext/selling/search_criteria/sales_order_pending_items/sales_order_pending_items.txt index a13b00b3fb0..036d689ad68 100644 --- a/erpnext/selling/search_criteria/sales_order_pending_items1/sales_order_pending_items1.txt +++ b/erpnext/selling/search_criteria/sales_order_pending_items/sales_order_pending_items.txt @@ -5,7 +5,7 @@ 'add_tab': None, 'columns': 'Sales Order\x01ID,Sales Order\x01Sales Order Date,Sales Order\x01Customer,Sales Order\x01Customer Name,Sales Order Item\x01Item Code,Sales Order Item\x01Item Name,Sales Order Item\x01Description,Sales Order Item\x01Quantity,Sales Order Item\x01Delivered Qty,Sales Order Item\x01Billed Qty', 'creation': '2011-05-09 11:04:19', - 'criteria_name': 'Sales Order Pending Items1', + 'criteria_name': 'Sales Order Pending Items', 'custom_query': '', 'description': 'Sales Order Pending Items', 'dis_filters': None, @@ -21,7 +21,7 @@ 'modified': '2011-05-09 11:08:05', 'modified_by': 'Administrator', 'module': 'CRM', - 'name': 'sales_order_pending_items1', + 'name': 'sales_order_pending_items', 'owner': 'Administrator', 'page_len': 50, 'parent': None, @@ -34,4 +34,4 @@ 'sort_order': 'DESC', 'standard': 'Yes' } -] \ No newline at end of file +] diff --git a/erpnext/selling/search_criteria/sales_order_pending_items1/__init__.py b/erpnext/selling/search_criteria/sales_order_pending_items1/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/erpnext/selling/search_criteria/sales_orderwise_booking_ b/erpnext/selling/search_criteria/sales_orderwise_booking_ deleted file mode 100644 index 46a478cd762..00000000000 --- a/erpnext/selling/search_criteria/sales_orderwise_booking_ +++ /dev/null @@ -1,4 +0,0 @@ -report.customize_filters = function() { - this.filter_fields_dict['Sales Order'+FILTER_SEP +'Company'].df['report_default'] = sys_defaults.company; - this.filter_fields_dict['Sales Order'+FILTER_SEP +'Fiscal Year'].df['report_default'] = sys_defaults.fiscal_year; -} diff --git a/erpnext/analysis/search_criteria/monthly_transaction_summary/__init__.py b/erpnext/selling/search_criteria/serial_no_amc_expiring_this_month/__init__.py similarity index 100% rename from erpnext/analysis/search_criteria/monthly_transaction_summary/__init__.py rename to erpnext/selling/search_criteria/serial_no_amc_expiring_this_month/__init__.py diff --git a/erpnext/home/search_criteria/serial_no_amc_expiring_this_month/serial_no_amc_expiring_this_month.txt b/erpnext/selling/search_criteria/serial_no_amc_expiring_this_month/serial_no_amc_expiring_this_month.txt similarity index 97% rename from erpnext/home/search_criteria/serial_no_amc_expiring_this_month/serial_no_amc_expiring_this_month.txt rename to erpnext/selling/search_criteria/serial_no_amc_expiring_this_month/serial_no_amc_expiring_this_month.txt index db8f03d7cd8..1f303229e55 100644 --- a/erpnext/home/search_criteria/serial_no_amc_expiring_this_month/serial_no_amc_expiring_this_month.txt +++ b/erpnext/selling/search_criteria/serial_no_amc_expiring_this_month/serial_no_amc_expiring_this_month.txt @@ -18,7 +18,7 @@ 'doc_type': u'Serial No', 'doctype': 'Search Criteria', 'filters': u"{'Serial No\x01Saved':1,'Serial No\x01Submitted':1,'Serial No\x01Status':'','Serial No\x01Warranty Status':''}", - 'module': u'Home', + 'module': u'Selling', 'name': '__common__', 'page_len': 50, 'sort_by': u'`tabSerial No`.`name`', @@ -31,4 +31,4 @@ 'doctype': 'Search Criteria', 'name': u'serial_no-amc_expiring_this_month' } -] \ No newline at end of file +] diff --git a/erpnext/analysis/search_criteria/trend_analyzer/__init__.py b/erpnext/selling/search_criteria/serial_no_warranty_expiring_this_month/__init__.py similarity index 100% rename from erpnext/analysis/search_criteria/trend_analyzer/__init__.py rename to erpnext/selling/search_criteria/serial_no_warranty_expiring_this_month/__init__.py diff --git a/erpnext/home/search_criteria/serial_no_warranty_expiring_this_month/serial_no_warranty_expiring_this_month.txt b/erpnext/selling/search_criteria/serial_no_warranty_expiring_this_month/serial_no_warranty_expiring_this_month.txt similarity index 98% rename from erpnext/home/search_criteria/serial_no_warranty_expiring_this_month/serial_no_warranty_expiring_this_month.txt rename to erpnext/selling/search_criteria/serial_no_warranty_expiring_this_month/serial_no_warranty_expiring_this_month.txt index 76cdeac2567..63c3e747dca 100644 --- a/erpnext/home/search_criteria/serial_no_warranty_expiring_this_month/serial_no_warranty_expiring_this_month.txt +++ b/erpnext/selling/search_criteria/serial_no_warranty_expiring_this_month/serial_no_warranty_expiring_this_month.txt @@ -18,7 +18,7 @@ 'doc_type': u'Serial No', 'doctype': 'Search Criteria', 'filters': u"{'Serial No\x01Saved':1,'Serial No\x01Submitted':1,'Serial No\x01Status':'Issued','Serial No\x01Maintenance Status':''}", - 'module': u'Home', + 'module': u'Selling', 'name': '__common__', 'page_len': 50, 'sort_by': u'`tabSerial No`.`name`', @@ -31,4 +31,4 @@ 'doctype': 'Search Criteria', 'name': u'serial_no-warranty_expiring_this_month' } -] \ No newline at end of file +] diff --git a/erpnext/selling/search_criteria/territory_item_group_wise_gp/__init__.py b/erpnext/selling/search_criteria/territory_item_group_wise_gp/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/erpnext/selling/search_criteria/territory_item_group_wise_gp/territory_item_group_wise_gp.py b/erpnext/selling/search_criteria/territory_item_group_wise_gp/territory_item_group_wise_gp.py deleted file mode 100644 index 560596e8d25..00000000000 --- a/erpnext/selling/search_criteria/territory_item_group_wise_gp/territory_item_group_wise_gp.py +++ /dev/null @@ -1,123 +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 . - -# Add Columns -# ------------ -based_on = filter_values.get('based_on') - -columns = [[based_on,'Data','150px',''], - ['Total Qty','Currency','150px',''], - ['Revenue','Currency','150px',''], - ['Valuation Amount','Currency','150px',''], - ['Gross Profit (%)','Currrency','150px',''], - ['Gross Profit','Currency','150px','']] - -for c in columns: - colnames.append(c[0]) - coltypes.append(c[1]) - colwidths.append(c[2]) - coloptions.append(c[3]) - col_idx[c[0]] = len(colnames)-1 - - - -def make_child_lst(based_on,name): - rg = sql("select lft, rgt from `tab%s` where name = '%s'"%(based_on,name)) - ch_name = sql("select name from `tab%s` where lft between %d and %d"%(based_on,int(rg[0][0]),int(rg[0][1]))) - chl ='(' - flag = 1 - for c in ch_name: - if flag == 1: - chl += "'%s'"%c[0] - flag = 2 - else: - chl +=",'%s'"%c[0] - - chl +=")" - return chl - - - -for r in res: - - qty, rate, amt, tot_val_rate, val_amount = 0, 0, 0, 0,0 - cn = make_child_lst(based_on,r[0].strip()) - - - - if based_on == 'Item Group': - - dn = sql("select name from `tabItem` where item_group in %s"%(cn)) - for n in dn: - - dt = sql("select sum(qty),sum(amount) from `tabDelivery Note Item` where item_code ='%s' and docstatus = 1"%n[0]) - - qty += dt[0][0] and dt[0][0] or 0 - amt += dt[0][1] and dt[0][1] or 0 - prt = sql("select distinct t1.name from `tabDelivery Note` t1, `tabDelivery Note Item` t2 where t1.name = t2.parent and t2.item_code = '%s' and t1.docstatus = 1 and t2.docstatus =1 order by t1.name"%n[0]) - for p in prt: - d1 = sql("select qty from `tabDelivery Note Item` where parent = '%s' and parenttype ='Delivery Note' and docstatus =1 and item_code = '%s'"%(p[0],n[0])) - for t in d1: - tot_val_rate = 0 - packing_list_items = sql("select item_code, warehouse, qty from `tabDelivery Note Packing Item` where parent = '%s' and parent_item = '%s' and docstatus = 1 order by item_code, warehouse, qty"%(p[0],n[0])) - - for d in packing_list_items: - if d[1]: - val_rate = sql("select valuation_rate from `tabStock Ledger Entry` where item_code = '%s' and warehouse = '%s' and voucher_type = 'Delivery Note' and voucher_no = '%s' and is_cancelled = 'No'"%(d[0], d[1], p[0])) - - val_rate = val_rate and val_rate[0][0] or 0 - - tot_val_rate += t[0] and (flt(val_rate) * flt(d[2]) / flt(t[0])) or 0 - val_amount += flt(tot_val_rate) * flt(t[0]) - elif based_on == 'Territory': - - - dn = sql("select name from `tabDelivery Note` where territory in %s and docstatus =1 order by name"%(cn)) - - for n in dn: - - dt = sql("select sum(qty), sum(amount) from `tabDelivery Note Item` where parent = '%s' and docstatus = 1"%n[0]) - qty += dt[0][0] and dt[0][0] or 0 - amt += dt[0][1] and dt[0][1] or 0 - - d1 = sql("select item_code,qty from `tabDelivery Note Item` where parent = '%s' and parenttype ='Delivery Note' and docstatus =1"%n[0]) - - for t in d1: - tot_val_rate = 0 - packing_list_items = sql("select item_code, warehouse, qty from `tabDelivery Note Packing Item` where parent = '%s' and parent_item = '%s' and docstatus = 1 order by item_code, warehouse,qty"%(n[0],t[0])) - - for d in packing_list_items: - if d[1]: - - val_rate = sql("select valuation_rate from `tabStock Ledger Entry` where item_code = '%s' and warehouse = '%s' and voucher_type = 'Delivery Note' and voucher_no = '%s' and is_cancelled = 'No'"%(d[0], d[1], n[0])) - val_rate = val_rate and val_rate[0][0] or 0 - - tot_val_rate += t[1] and (flt(val_rate) * flt(d[2]) / flt(t[1])) or 0 - val_amount += flt(tot_val_rate) * flt(t[1]) - r.append(fmt_money(qty)) - - r.append(fmt_money(amt)) - gp = flt(r[col_idx['Revenue']]) - flt(val_amount) - - if val_amount: gp_percent = gp * 100 / flt(val_amount) - else: gp_percent = gp - gp_percent = '%0.2f'%gp_percent - - - - r.append(fmt_money(val_amount)) - r.append(fmt_money(gp_percent)) - r.append(fmt_money(gp)) \ No newline at end of file diff --git a/erpnext/selling/search_criteria/territory_item_group_wise_gp/territory_item_group_wise_gp.txt b/erpnext/selling/search_criteria/territory_item_group_wise_gp/territory_item_group_wise_gp.txt deleted file mode 100644 index ff29d1d1c29..00000000000 --- a/erpnext/selling/search_criteria/territory_item_group_wise_gp/territory_item_group_wise_gp.txt +++ /dev/null @@ -1,37 +0,0 @@ -[ - { - 'add_col': None, - 'add_cond': None, - 'add_tab': None, - 'columns': None, - 'creation': '2010-12-14 17:52:48', - 'criteria_name': 'Territory, Item Group wise GP', - 'custom_query': '', - 'description': None, - 'dis_filters': None, - 'disabled': None, - 'doc_type': 'Delivery Note', - 'docstatus': 0, - 'doctype': 'Search Criteria', - 'filters': "{'Delivery Note\x01Status':'','Delivery Note\x01Fiscal Year':''}", - 'graph_series': None, - 'graph_values': None, - 'group_by': None, - 'idx': None, - 'modified': '2011-05-09 14:40:26', - 'modified_by': 'Administrator', - 'module': 'CRM', - 'name': 'territory_item_group_wise_gp', - 'owner': 'harshada@webnotestech.com', - 'page_len': 50, - 'parent': None, - 'parent_doc_type': None, - 'parentfield': None, - 'parenttype': None, - 'report_script': '', - 'server_script': None, - 'sort_by': None, - 'sort_order': 'DESC', - 'standard': 'Yes' - } -] \ No newline at end of file diff --git a/erpnext/setup_masters/Module Def/Setup Masters/Setup Masters.txt b/erpnext/setup_masters/Module Def/Setup Masters/Setup Masters.txt deleted file mode 100644 index fe1a04840c3..00000000000 --- a/erpnext/setup_masters/Module Def/Setup Masters/Setup Masters.txt +++ /dev/null @@ -1,29 +0,0 @@ -# Module Def, Setup Masters -[ - - # These values are common in all dictionaries - { - 'creation': '2010-08-08 17:35:42', - 'docstatus': 0, - 'modified': '2012-01-23 17:04:53', - 'modified_by': 'Administrator', - 'owner': 'Administrator' - }, - - # These values are common for all Module Def - { - 'disabled': 'No', - 'doctype': u'Module Def', - 'is_hidden': 'No', - 'last_updated_date': '2010-11-29 12:02:02', - 'module_label': 'Setup Masters', - 'module_name': 'Setup Masters', - 'name': '__common__' - }, - - # Module Def, Setup Masters - { - 'doctype': u'Module Def', - 'name': 'Setup Masters' - } -] \ No newline at end of file diff --git a/erpnext/stock/Role/Material Manager/Material Manager.txt b/erpnext/stock/Role/Material Manager/Material Manager.txt deleted file mode 100644 index 1d6369b53fe..00000000000 --- a/erpnext/stock/Role/Material Manager/Material Manager.txt +++ /dev/null @@ -1,26 +0,0 @@ -# Role, Material Manager -[ - - # These values are common in all dictionaries - { - 'creation': '2010-08-08 17:08:51', - 'docstatus': 0, - 'modified': '2009-03-19 14:56:51', - 'modified_by': 'Administrator', - 'owner': 'Administrator' - }, - - # These values are common for all Role - { - 'doctype': 'Role', - 'module': 'Stock', - 'name': '__common__', - 'role_name': 'Material Manager' - }, - - # Role, Material Manager - { - 'doctype': 'Role', - 'name': 'Material Manager' - } -] \ No newline at end of file diff --git a/erpnext/stock/Role/Material Master Manager/Material Master Manager.txt b/erpnext/stock/Role/Material Master Manager/Material Master Manager.txt deleted file mode 100644 index 10fac2c5ae3..00000000000 --- a/erpnext/stock/Role/Material Master Manager/Material Master Manager.txt +++ /dev/null @@ -1,26 +0,0 @@ -# Role, Material Master Manager -[ - - # These values are common in all dictionaries - { - 'creation': '2010-08-08 17:08:51', - 'docstatus': 0, - 'modified': '2010-04-08 13:49:58', - 'modified_by': 'Administrator', - 'owner': 'Administrator' - }, - - # These values are common for all Role - { - 'doctype': 'Role', - 'module': 'Stock', - 'name': '__common__', - 'role_name': 'Material Master Manager' - }, - - # Role, Material Master Manager - { - 'doctype': 'Role', - 'name': 'Material Master Manager' - } -] \ No newline at end of file diff --git a/erpnext/stock/Role/Material User/Material User.txt b/erpnext/stock/Role/Material User/Material User.txt deleted file mode 100644 index 1436ccb89cd..00000000000 --- a/erpnext/stock/Role/Material User/Material User.txt +++ /dev/null @@ -1,26 +0,0 @@ -# Role, Material User -[ - - # These values are common in all dictionaries - { - 'creation': '2010-08-08 17:08:51', - 'docstatus': 0, - 'modified': '2010-04-08 12:08:13', - 'modified_by': 'Administrator', - 'owner': 'Administrator' - }, - - # These values are common for all Role - { - 'doctype': 'Role', - 'module': 'Stock', - 'name': '__common__', - 'role_name': 'Material User' - }, - - # Role, Material User - { - 'doctype': 'Role', - 'name': 'Material User' - } -] \ No newline at end of file diff --git a/erpnext/stock/Role/Quality Manager/Quality Manager.txt b/erpnext/stock/Role/Quality Manager/Quality Manager.txt deleted file mode 100644 index 226e9aadc84..00000000000 --- a/erpnext/stock/Role/Quality Manager/Quality Manager.txt +++ /dev/null @@ -1,26 +0,0 @@ -# Role, Quality Manager -[ - - # These values are common in all dictionaries - { - 'creation': '2010-08-08 17:08:51', - 'docstatus': 0, - 'modified': '2010-05-04 13:12:27', - 'modified_by': 'Administrator', - 'owner': 'Administrator' - }, - - # These values are common for all Role - { - 'doctype': 'Role', - 'module': 'Stock', - 'name': '__common__', - 'role_name': 'Quality Manager' - }, - - # Role, Quality Manager - { - 'doctype': 'Role', - 'name': 'Quality Manager' - } -] \ No newline at end of file diff --git a/erpnext/stock/__init__.py b/erpnext/stock/__init__.py index e69de29bb2d..ee2b061cdcc 100644 --- a/erpnext/stock/__init__.py +++ b/erpnext/stock/__init__.py @@ -0,0 +1,6 @@ +install_docs = [ + {"doctype":"Role", "name":"Material Manager"}, + {"doctype":"Role", "name":"Material Master Manager"}, + {"doctype":"Role", "name":"Material User"}, + {"doctype":"Role", "name":"Quality Manager"}, +] From 82042f1cffbf2992764c99d6a85d9bcb7f19c1b4 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Fri, 6 Apr 2012 17:54:17 +0530 Subject: [PATCH 3/3] fixes after sync --- css/all-app.css | 7 + css/all-web.css | 7 + .../purchase_invoice/purchase_invoice.js | 2 +- .../__init__.py | 0 .../purchase_taxes_and_charges_master.js | 0 .../purchase_taxes_and_charges_master.py | 0 .../purchase_taxes_and_charges_master.txt | 2 +- .../doctype/sales_invoice/sales_invoice.js | 2 +- .../__init__.py | 0 .../sales_taxes_and_charges_master.js | 0 .../sales_taxes_and_charges_master.py | 0 .../sales_taxes_and_charges_master.txt | 4 +- .../doctype/purchase_order/purchase_order.js | 2 +- erpnext/home/page/event_updates/.DS_Store | Bin 6148 -> 0 bytes .../home/page/event_updates/event_updates.css | 62 -- .../page/event_updates/event_updates.html | 1 - .../home/page/event_updates/event_updates.js | 671 ---------------- .../home/page/event_updates/event_updates.py | 152 ---- .../home/page/event_updates/event_updates.txt | 27 - .../event_updates/event_updates_static.html | 1 - erpnext/home/page/my_company/__init__.py | 0 erpnext/home/page/my_company/my_company.css | 82 -- erpnext/home/page/my_company/my_company.html | 0 erpnext/home/page/my_company/my_company.js | 760 ------------------ erpnext/home/page/my_company/my_company.py | 218 ----- erpnext/home/page/my_company/my_company.txt | 51 -- .../page/questions/questions.py | 13 +- erpnext/patches/jan_mar_2012/rename_dt.py | 113 ++- erpnext/patches/jan_mar_2012/sync_ref_db.py | 46 +- .../selling/doctype/quotation/quotation.js | 2 +- .../doctype/sales_common/sales_common.js | 2 +- .../doctype/sales_order/sales_order.js | 2 +- .../__init__.py | 0 erpnext/startup/startup.js | 52 +- erpnext/startup/startup.py | 54 ++ .../doctype/delivery_note/delivery_note.js | 2 +- .../purchase_receipt/purchase_receipt.js | 2 +- erpnext/utilities/page/messages/messages.py | 32 + js/all-app.js | 5 +- js/all-web.js | 7 +- version.num | 2 +- wnf.py | 4 +- 42 files changed, 245 insertions(+), 2144 deletions(-) rename erpnext/{buying => accounts}/doctype/purchase_taxes_and_charges_master/__init__.py (100%) rename erpnext/{buying => accounts}/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.js (100%) rename erpnext/{buying => accounts}/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.py (100%) rename erpnext/{buying => accounts}/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.txt (98%) rename erpnext/{home/page/event_updates => accounts/doctype/sales_taxes_and_charges_master}/__init__.py (100%) rename erpnext/{setup => accounts}/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js (100%) rename erpnext/{setup => accounts}/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.py (100%) rename erpnext/{setup => accounts}/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.txt (99%) delete mode 100644 erpnext/home/page/event_updates/.DS_Store delete mode 100644 erpnext/home/page/event_updates/event_updates.css delete mode 100644 erpnext/home/page/event_updates/event_updates.html delete mode 100644 erpnext/home/page/event_updates/event_updates.js delete mode 100644 erpnext/home/page/event_updates/event_updates.py delete mode 100644 erpnext/home/page/event_updates/event_updates.txt delete mode 100644 erpnext/home/page/event_updates/event_updates_static.html delete mode 100644 erpnext/home/page/my_company/__init__.py delete mode 100644 erpnext/home/page/my_company/my_company.css delete mode 100644 erpnext/home/page/my_company/my_company.html delete mode 100644 erpnext/home/page/my_company/my_company.js delete mode 100644 erpnext/home/page/my_company/my_company.py delete mode 100644 erpnext/home/page/my_company/my_company.txt delete mode 100644 erpnext/setup/doctype/sales_taxes_and_charges_master/__init__.py create mode 100644 erpnext/startup/startup.py diff --git a/css/all-app.css b/css/all-app.css index f30d1cfaca2..4ed2d5771aa 100644 --- a/css/all-app.css +++ b/css/all-app.css @@ -1732,6 +1732,7 @@ div.stat-bar { font-weight: 400; src: local('Open Sans'), local('OpenSans'), url('../lib/css/fonts/opensans.woff') format('woff'); } + @font-face { font-family: 'Lato'; font-style: normal; @@ -1739,6 +1740,12 @@ div.stat-bar { src: local('Lato Regular'), local('Lato-Regular'), url('../lib/css/fonts/lato.woff') format('woff'); } +@font-face { + font-family: 'Cabin'; + font-style: normal; + font-weight: 400; + src: local('Cabin Regular'), local('Cabin-Regular'), url('../lib/css/fonts/cabin.woff') format('woff'); +} /* diff --git a/css/all-web.css b/css/all-web.css index ad1304ba1f3..bdd2ad584f5 100644 --- a/css/all-web.css +++ b/css/all-web.css @@ -1627,6 +1627,7 @@ button.btn.small, input[type="submit"].btn.small { font-weight: 400; src: local('Open Sans'), local('OpenSans'), url('../lib/css/fonts/opensans.woff') format('woff'); } + @font-face { font-family: 'Lato'; font-style: normal; @@ -1634,6 +1635,12 @@ button.btn.small, input[type="submit"].btn.small { src: local('Lato Regular'), local('Lato-Regular'), url('../lib/css/fonts/lato.woff') format('woff'); } +@font-face { + font-family: 'Cabin'; + font-style: normal; + font-weight: 400; + src: local('Cabin Regular'), local('Cabin-Regular'), url('../lib/css/fonts/cabin.woff') format('woff'); +} /* diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js index a8550d5b7ea..7e77068f68d 100644 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js @@ -17,7 +17,7 @@ cur_frm.cscript.tname = "Purchase Invoice Item"; cur_frm.cscript.fname = "entries"; cur_frm.cscript.other_fname = "purchase_tax_details"; -wn.require('erpnext/buying/doctype/purchase_other_charges/purchase_other_charges.js'); +wn.require('erpnext/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.js'); wn.require('erpnext/buying/doctype/purchase_common/purchase_common.js'); // On Load diff --git a/erpnext/buying/doctype/purchase_taxes_and_charges_master/__init__.py b/erpnext/accounts/doctype/purchase_taxes_and_charges_master/__init__.py similarity index 100% rename from erpnext/buying/doctype/purchase_taxes_and_charges_master/__init__.py rename to erpnext/accounts/doctype/purchase_taxes_and_charges_master/__init__.py diff --git a/erpnext/buying/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.js b/erpnext/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.js similarity index 100% rename from erpnext/buying/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.js rename to erpnext/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.js diff --git a/erpnext/buying/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.py b/erpnext/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.py similarity index 100% rename from erpnext/buying/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.py rename to erpnext/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.py diff --git a/erpnext/buying/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.txt b/erpnext/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.txt similarity index 98% rename from erpnext/buying/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.txt rename to erpnext/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.txt index 4c07ca14ca4..1ecac405f3e 100644 --- a/erpnext/buying/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.txt +++ b/erpnext/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.txt @@ -19,7 +19,7 @@ 'default_print_format': u'Standard', 'doctype': 'DocType', 'document_type': u'Master', - 'module': u'Buying', + 'module': u'Accounts', 'name': '__common__', 'section_style': u'Simple', 'server_code_error': u' ', diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js index 68cdf1f747b..8091aeeada7 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js @@ -23,7 +23,7 @@ cur_frm.cscript.sales_team_fname = "sales_team"; cur_frm.pformat.print_heading = 'Invoice'; wn.require('erpnext/selling/doctype/sales_common/sales_common.js'); -wn.require('erpnext/setup/doctype/other_charges/other_charges.js'); +wn.require('erpnext/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js'); wn.require('erpnext/utilities/doctype/sms_control/sms_control.js'); wn.require('erpnext/setup/doctype/notification_control/notification_control.js'); diff --git a/erpnext/home/page/event_updates/__init__.py b/erpnext/accounts/doctype/sales_taxes_and_charges_master/__init__.py similarity index 100% rename from erpnext/home/page/event_updates/__init__.py rename to erpnext/accounts/doctype/sales_taxes_and_charges_master/__init__.py diff --git a/erpnext/setup/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js b/erpnext/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js similarity index 100% rename from erpnext/setup/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js rename to erpnext/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js diff --git a/erpnext/setup/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.py b/erpnext/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.py similarity index 100% rename from erpnext/setup/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.py rename to erpnext/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.py diff --git a/erpnext/setup/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.txt b/erpnext/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.txt similarity index 99% rename from erpnext/setup/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.txt rename to erpnext/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.txt index 2ab0541ba02..655269c26ef 100644 --- a/erpnext/setup/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.txt +++ b/erpnext/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.txt @@ -19,7 +19,7 @@ 'default_print_format': u'Standard', 'doctype': 'DocType', 'document_type': u'Master', - 'module': u'Setup', + 'module': u'Accounts', 'name': '__common__', 'section_style': u'Tabbed', 'server_code_error': u' ', @@ -192,4 +192,4 @@ 'options': u'Sales Taxes and Charges', 'permlevel': 0 } -] \ No newline at end of file +] diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.js b/erpnext/buying/doctype/purchase_order/purchase_order.js index 15057924172..82abd6bc3cd 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.js +++ b/erpnext/buying/doctype/purchase_order/purchase_order.js @@ -18,7 +18,7 @@ cur_frm.cscript.tname = "Purchase Order Item"; cur_frm.cscript.fname = "po_details"; cur_frm.cscript.other_fname = "purchase_tax_details"; -wn.require('erpnext/buying/doctype/purchase_other_charges/purchase_other_charges.js'); +wn.require('erpnext/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.js'); wn.require('erpnext/buying/doctype/purchase_common/purchase_common.js'); wn.require('erpnext/utilities/doctype/sms_control/sms_control.js'); wn.require('erpnext/setup/doctype/notification_control/notification_control.js'); diff --git a/erpnext/home/page/event_updates/.DS_Store b/erpnext/home/page/event_updates/.DS_Store deleted file mode 100644 index 5008ddfcf53c02e82d7eee2e57c38e5672ef89f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0 \ No newline at end of file diff --git a/erpnext/home/page/event_updates/event_updates.js b/erpnext/home/page/event_updates/event_updates.js deleted file mode 100644 index 797d8e95c9d..00000000000 --- a/erpnext/home/page/event_updates/event_updates.js +++ /dev/null @@ -1,671 +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 . - -pscript['onload_Event Updates'] = function() { - if(user=='Guest') { - loadpage('Login Page'); - return; - } - - pscript.home_make_body(); - pscript.home_make_status(); - pscript.home_set_banner(); - pscript.home_make_widgets(); -} - -// ================================== - -pscript.home_make_body = function() { - var wrapper = wn.pages['Event Updates']; - - // body - $(wrapper).addClass('layout-wrapper').addClass('layout-wrapper-background') - - wrapper.body = $a(wrapper, 'div', 'layout-main-section'); - wrapper.head = $a(wrapper.body, 'div'); - wrapper.side_section =$a(wrapper, 'div', 'layout-side-section'); - $a(wrapper, 'div', '', {clear:'both'}); - - wrapper.banner_area = $a(wrapper.head, 'div'); - - wrapper.setup_wizard_area = $a(wrapper.body, 'div', 'setup-wizard'); -} - -// ================================== - -pscript.home_set_banner = function(wrapper) { - var wrapper = wn.pages['Event Updates']; - var cp = wn.control_panel; - - // banner - if(cp.client_name) { - var banner = $a(wrapper.banner_area, 'div', '', {paddingBottom:'4px'}) - banner.innerHTML = cp.client_name; - } -} - -// Widgets -// ================================== - -pscript.home_make_widgets = function() { - var wrapper = wn.pages['Event Updates']; - var cell = wrapper.side_section; - - // sidebar - sidebar = new wn.widgets.PageSidebar(cell, { - sections:[ - { - title: 'Calendar', - display: function() { return !has_common(user_roles, ['Guest','Customer','Vendor'])}, - render: function(wrapper) { - new HomeCalendar(new HomeWidget(wrapper, 'Calendar', 'Event'), wrapper); - } - }, - - { - title: 'To Do', - display: function() { return !has_common(user_roles, ['Guest','Customer','Vendor'])}, - render: function(wrapper) { - new HomeToDo(new HomeWidget(wrapper, 'To Do', 'Item')); - } - }, - - { - title: 'Online Users', - display: function() { return !has_common(user_roles, ['Guest','Customer','Vendor'])}, - render: function(wrapper) { - pscript.online_users_obj = new OnlineUsers(wrapper); - } - } - ] - }); - - new FeedList(wrapper.body); -} - -OnlineUsers = function(wrapper) { - var me = this; - this.wrapper = wrapper; - - this.my_company_link = function() { - $a($a(wrapper, 'div', '', {marginBottom:'7px'}), 'span', 'link_type', - {color:'#777', 'color:hover':'#FFF', fontSize:'11px'}, - 'See all users', function() {loadpage('My Company'); }); - } - - this.render = function(online_users) { - me.my_company_link(); - - if(online_users.length) { - var max = online_users.length; max = (max > 10 ? 10 : max) - me.wrapper.innerHTML = ""; - for(var i=0; i '; - $a($td(tab, 0, 1), 'span', 'social', {}, replace_newlines(det.description)); - - if(det.ref_type && det.ref_name && det.ref_name != 'None') { - var span=$a($a($td(tab, 0, 1),'div'),'span','link_type'); - span.innerHTML = det.ref_name; span.dt = det.ref_type; - span.onclick = function() { loaddoc(this.dt, this.innerHTML); } - } -} - -HomeCalendar.prototype.clear_dialog = function() { - this.set_dialog_values({event_date:get_today(), event_hour:'8:00', description:''}); -} - -HomeCalendar.prototype.set_dialog_values = function(det) { - var d = this.widget.dialog; - d.set_values(det); - d.det = det; -} - -HomeCalendar.prototype.save = function(btn) { - var d = this.widget.dialog; - var me = this; - var det = d.get_values(); - - if(!det) { - btn.done_working(); - return; - } - - det.name = d.det.name; - det.owner = user; - if(!det.event_type) - det.event_type = 'Private'; - - var callback = function(r,rt) { - btn.done_working(); - me.widget.dialog.hide(); - me.widget.refresh(); - } - $c_obj('Home Control','edit_event',JSON.stringify(det),callback); -} - -// Todo -// =========================== - -HomeToDo = function(widget) { - this.widget = widget; - - // methods - this.widget.get_list_method = 'get_todo_list'; - this.widget.delete_method = 'remove_todo_item'; - this.widget.no_items_message = 'Nothing to do?'; - this.widget.get_item_id = function(det) { return det.name; } - - this.widget.decorator = this; - - this.widget.dialog_fields = [ - {fieldtype:'Date', fieldname:'date', label:'Event Date', reqd:1}, - {fieldtype:'Text', fieldname:'description', label:'Description', reqd:1}, - {fieldtype:'Check', fieldname:'checked', label:'Completed'}, - {fieldtype:'Select', fieldname:'priority', label:'Priority', reqd:1, 'options':['Medium','High','Low'].join('\n')}, - {fieldtype:'Button', fieldname:'save', label:'Save'} - ]; - - this.widget.refresh(); -} - -HomeToDo.prototype.render_item = function(item, det) { - - // priority tag - var tab = make_table($td(item.tab, 0, 0), 1, 2, '100%', ['48px', null], {padding:'2px'}); - $y(tab, {tableLayout:'fixed'}); - - var span = $a($td(tab, 0, 0), 'span', '', {padding:'2px',color:'#FFF',fontSize:'10px' - , backgroundColor:(det.priority=='Low' ? '#888' : - (det.priority=='High' ? '#EDA857' : '#687FD3'))}); - - $(span).css('-moz-border-radius','3px').css('-webkit-border-radius','3px'); - span.innerHTML = det.priority; - - // text - var span = $a($td(tab, 0, 1), 'div', 'social', {lineHeight:'1.5em'}, - replace_newlines(det.description)); - if(det.checked) $y(span,{textDecoration:'line-through'}); - - // reference link - if(det.reference_name) { - $a($td(tab, 0, 1), 'div', 'social', '', - repl('%(reference_name)s', - det)) - } - - // if expired & open, then in red - if(!det.checked && dateutil.str_to_obj(det.date) < new Date()) { - $y(span,{color:'RED'}); - $a($td(tab, 0, 1), 'div', '', {fontSize:'10px', color:'#666'}, - dateutil.str_to_user(det.date) + ' (Overdue)'); - } else { - $a($td(tab, 0, 1), 'div', '', {fontSize:'10px', color:'#666'}, - dateutil.str_to_user(det.date)); - } -} - -HomeToDo.prototype.clear_dialog = function() { - this.set_dialog_values(['','',get_today(),'Medium',0]); -} - -HomeToDo.prototype.set_dialog_values = function(det) { - var d = this.widget.dialog; - d.set_values({ - date: det.date, - priority: det.priority, - description: det.description, - checked: det.checked - }); - d.det = det; -} - -HomeToDo.prototype.save = function(btn) { - var d = this.widget.dialog; - var me = this; - - var det = d.get_values() - if(!det) { - btn.done_working(); - return; - } - - det.name = d.det.name; - var callback = function(r,rt) { - btn.done_working(); - me.widget.dialog.hide(); - me.widget.refresh(); - } - $c_obj('Home Control','add_todo_item',JSON.stringify(det),callback); -} - -// Feed -// ================================== - - -FeedList = function(parent) { - // settings - this.auto_feed_off = cint(sys_defaults.auto_feed_off); - - this.wrapper = $a(parent, 'div'); - this.make_head(); - this.make_list(); - this.list.run(); -} - -FeedList.prototype.make_head = function() { - var me = this; - this.head = $a(this.wrapper, 'div', '', {marginBottom:'8px'}); - - // head - - $a(this.head,'h1','', {display:'inline'}, 'Home'); - - // refresh - $a(this.head,'span','link_type', - {marginLeft:'7px', fontSize:'11px'}, 'refresh', - function() { me.run(); } - ); - - if(has_common(user_roles, ['System Manager','Accounts Manager'])) { - $btn(this.head, 'Dashboard', function() {loadpage('dashboard'); }, {marginLeft:'7px'}, 'cupid-blue') - - } -} - -FeedList.prototype.run = function() { - this.prev_date = null; - this.list.run(); -} - -FeedList.prototype.make_list = function() { - var me = this; - this.list_area = $a(this.wrapper,'div') - - this.list = new wn.ui.Listing({ - parent: this.list_area, - query: repl('select \ - distinct t1.name, t1.feed_type, t1.doc_type, t1.doc_name, t1.subject, t1.modified_by, \ - if(ifnull(t1.full_name,"")="", t1.owner, t1.full_name) as full_name, \ - t1.modified, t1.color \ - from tabFeed t1, tabUserRole t3, tabDocPerm t4 \ - where t1.doc_type = t4.parent \ - and t3.parent = "%(user)s" \ - and t4.role = t3.role \ - and ifnull(t4.`read`,0) = 1 \ - order by t1.modified desc', {user:user}), - no_result_message: 'Nothing to show yet. Your feed will be updated as you start your activities', - render_row: function(parent, data) { - me.render_feed(parent, data) - }, - onrun: function() { - $(me.wrapper).fadeIn(); - if(me.after_run) me.after_run(); - }, - hide_refresh: true - }); -} - -FeedList.prototype.render_feed = function(parent, data) { - new FeedItem(parent, data, this); -} - -// Item -// ------------------------------- - -FeedItem = function(cell, det, feedlist) { - var me = this; - - this.det = det; this.feedlist = feedlist; - this.wrapper = $a(cell,'div','',{paddingBottom:'4px'}); - this.head = $a(this.wrapper,'div'); - - this.tab = make_table(this.wrapper, 1, 2, '100%', [(100/7)+'%', (600/7)+'%']); - $y(this.tab,{tableLayout:'fixed'}) - - $y($td(this.tab,0,0),{textAlign:'right',paddingRight:'4px'}); - - // text - this.text_area = $a($td(this.tab,0,1), 'div'); - this.render_references(this.text_area, det); - this.render_tag(det); - - // add day separator - this.add_day_sep(det); -} - -// Day separator -// ------------------------------------------------- - -FeedItem.prototype.add_day_sep = function(det) { - var me = this; - var prev_date = det.modified.split(' ')[0]; - - var make_div = function() { - var div = $a(me.head, 'div', '', - {borderBottom:'1px solid #888', margin:'8px 0px', padding:'2px 0px', color:'#888', fontSize:'11px'}); - div.innerHTML = comment_when(det.modified, 1); - - // today? - if(prev_date==get_today()) { - div.innerHTML = ''; - span = $a(div, 'span', '', {padding:'2px', color:'#000', fontWeight:'bold'}); - span.innerHTML = 'Today'; - } - } - - if(this.feedlist.prev_date && this.feedlist.prev_date != prev_date) { make_div(); } - if(!this.feedlist.prev_date) { make_div(); } - this.feedlist.prev_date = prev_date; -} - -// Tag -// ------------------------------------------------- - -FeedItem.prototype.render_tag = function(det) { - // type is the name - tag = $a($td(this.tab,0,0), 'div', '', - {color:'#FFF', padding:'3px', textAlign:'right', fontSize:'11px', - whiteSpace:'nowrap', overflow:'hidden', cursor:'pointer'}); - $br(tag,'3px'); - $y(tag, {backgroundColor:(det.color || '#273')}); - - // tag label - tag.innerHTML = det.feed_type || get_doctype_label(det.doc_type); - - // not comment / label - if(!det.feed_type) { - tag.dt = det.doc_type; - tag.onclick = function() { loaddocbrowser(this.dt); } - } -} - -FeedItem.prototype.render_references = function(div, det) { - // name - div.tab = make_table(div, 1, 2, '100%', [null, '15%']) - var dt = det.doc_type; var dn = det.doc_name - - // link - if(det.feed_type=='Login') { - // nothing - no link - } else { - var allow = in_list(profile.can_read, dt); - var span = $a($td(div.tab,0,0), 'span', (allow ? 'link_type': ''), null, - det.doc_name); - span.dt = dt; span.dn = dn; - if(allow) span.onclick = function() { loaddoc(this.dt, this.dn); } - } - - // subject - if(det.subject) { - $a($td(div.tab,0,0), 'span', '', {marginLeft:'7px', color:'#444'}, det.subject); - } - - // by - $y($td(div.tab,0,1), {fontSize:'11px'}).innerHTML = - (strip(det.full_name) ? det.full_name : det.modified_by); -} - -pscript.home_make_status = function() { - var wrapper = wn.pages['Event Updates']; - - // get values - $c_page('home', 'event_updates', 'get_status_details', user, - function(r,rt) { - //wn.container.wntoolbar.set_new_comments(r.message.unread_messages); - - // render online users - pscript.online_users_obj.render(r.message.online_users); - pscript.online_users = r.message.online_users; - - // complete registration - if(in_list(user_roles,'System Manager')) { - wn.require("erpnext/home/page/event_updates/complete_registration.js"); - pscript.complete_registration(r.message.registration_complete, r.message.profile); - } - - // setup wizard - if(r.message.setup_status) { - new SetupWizard(r.message.setup_status) - } - } - ); -} - -SetupWizard = function(status) { - var me = this; - $.extend(this, { - make: function(status) { - me.status = status; - me.wrapper = wn.pages['Event Updates'].setup_wizard_area; - $ds(me.wrapper); - me.make_percent(status.percent); - me.make_suggestion(status.ret); - }, - make_percent: function(percent) { - $a(me.wrapper, 'div', 'header', {}, 'Your setup is '+percent+'% complete'); - var o = $a(me.wrapper, 'div', 'percent-outer'); - $a(o, 'div', 'percent-inner', {width:percent + '%'}); - }, - make_suggestion: function(ret) { - me.suggest_area = $a(me.wrapper, 'div', 'suggestion'); - if(me.status.ret.length>1) { - me.prev_next = $a(me.wrapper, 'div', 'prev-next'); - - // next - me.next = $a(me.prev_next, 'span', 'link_type', null, 'Next Suggestion', - function() { me.show_suggestion(me.cur_sugg+1) }); - - // prev - me.prev = $a(me.prev_next, 'span', 'link_type', null, 'Previous Suggestion', - function() { me.show_suggestion(me.cur_sugg-1) }); - - } - if(me.status.ret.length) { - me.show_suggestion(0); - } else { - me.suggest_area.innerHTML = 'Congratulations: '.bold() + 'You are now on your track... Good luck'; - } - }, - show_suggestion: function(idx) { - me.cur_sugg = idx; - me.suggest_area.innerHTML = 'What you can do next: '.bold() + me.status.ret[idx]; - - // show hide prev, next - if(me.status.ret.length>1) { - $dh(me.prev); $dh(me.next); - if(idx>0) $ds(me.prev); - if(idx. - -import webnotes -from webnotes.utils import cint - -@webnotes.whitelist() -def get_online_users(arg=None): - # get users - return webnotes.conn.sql("""SELECT DISTINCT t1.user, t2.first_name, t2.last_name - from tabSessions t1, tabProfile t2 - where t1.user = t2.name - and t1.user not in ('Guest','Administrator') - and TIMESTAMPDIFF(HOUR,t1.lastupdate,NOW()) <= 1""", as_list=1) or [] - -def get_unread_messages(): - "returns unread (docstatus-0 messages for a user)" - return webnotes.conn.sql("""\ - SELECT name, comment - FROM `tabComment` - WHERE comment_doctype IN ('My Company', 'Message') - AND comment_docname = %s - AND ifnull(docstatus,0)=0 - """, webnotes.user.name, as_list=1) - -def get_open_support_tickets(): - """ - Returns a count of open support tickets - """ - from webnotes.utils import cint - open_support_tickets = webnotes.conn.sql("""\ - SELECT COUNT(*) FROM `tabSupport Ticket` - WHERE status = 'Open'""") - return open_support_tickets and cint(open_support_tickets[0][0]) or 0 - -def get_things_todo(): - """ - Returns a count of incomplete todos - """ - from webnotes.utils import cint - incomplete_todos = webnotes.conn.sql("""\ - SELECT COUNT(*) FROM `tabToDo` - WHERE IFNULL(checked, 0) = 0 - AND owner = %s""", webnotes.session.get('user')) - return incomplete_todos and cint(incomplete_todos[0][0]) or 0 - -def get_todays_events(): - """ - Returns a count of todays events in calendar - """ - from webnotes.utils import nowdate, cint - todays_events = webnotes.conn.sql("""\ - SELECT COUNT(*) FROM `tabEvent` - WHERE owner = %s - AND event_type != 'Cancel' - AND event_date = %s""", ( - webnotes.session.get('user'), nowdate())) - return todays_events and cint(todays_events[0][0]) or 0 - -@webnotes.whitelist() -def get_global_status_messages(arg=None): - return { - 'unread_messages': get_unread_messages(), - 'open_support_tickets': get_open_support_tickets(), - 'things_todo': get_things_todo(), - 'todays_events': get_todays_events(), - } - -@webnotes.whitelist() -def get_status_details(arg=None): - """get toolbar items""" - from webnotes.utils import cint, date_diff, nowdate, get_defaults - - online = get_online_users() - - # system messages - ret = { - 'user_count': len(online) or 0, - #'unread_messages': get_unread_messages(), - #'open_support_tickets': get_open_support_tickets(), - 'online_users': online or [], - 'setup_status': get_setup_status(), - 'registration_complete': cint(get_defaults('registration_complete')) and 'Yes' or 'No', - 'profile': webnotes.conn.sql("""\ - SELECT first_name, last_name FROM `tabProfile` - WHERE name=%s AND docstatus<2""", webnotes.user.name, as_dict=1) - } - return ret - -def get_setup_status(arg=None): - """ - Returns the setup status of the current account - """ - if cint(webnotes.conn.get_global('setup_done')): - return '' - - percent = 20 - ret = [] - - def is_header_set(): - header = webnotes.conn.get_value('Control Panel', None, 'client_name') or '' - - if header.startswith('
'\ - +(webnotes.conn.get_value('Control Panel', None, 'company_name') or '')): - return False - - elif 'Banner Comes Here' in header: - return False - - else: - return True - - if not is_header_set(): - ret.append('Upload your company banner') - else: - percent += 20 - - def check_type(doctype, ret, percent): - if not webnotes.conn.sql("select count(*) from tab%s" % doctype)[0][0]: - ret.append(''' - - Create a new %(dt)s - or - - Import from a spreadsheet''' % {'dt':doctype}) - else: - percent += 20 - return ret, percent - - ret, percent = check_type('Item', ret, percent) - ret, percent = check_type('Customer', ret, percent) - ret, percent = check_type('Supplier', ret, percent) - - if percent==100: - webnotes.conn.set_global('setup_done', '1') - return '' - - return {'ret': ret, 'percent': percent} - diff --git a/erpnext/home/page/event_updates/event_updates.txt b/erpnext/home/page/event_updates/event_updates.txt deleted file mode 100644 index 21d93500339..00000000000 --- a/erpnext/home/page/event_updates/event_updates.txt +++ /dev/null @@ -1,27 +0,0 @@ -# Page, Event Updates -[ - - # These values are common in all dictionaries - { - 'creation': '2010-12-14 10:23:23', - 'docstatus': 0, - 'modified': '2010-12-27 10:58:56', - 'modified_by': 'Administrator', - 'owner': 'Administrator' - }, - - # These values are common for all Page - { - 'doctype': 'Page', - 'module': 'Home', - 'name': '__common__', - 'page_name': 'Event Updates', - 'standard': 'Yes' - }, - - # Page, Event Updates - { - 'doctype': 'Page', - 'name': 'Event Updates' - } -] \ No newline at end of file diff --git a/erpnext/home/page/event_updates/event_updates_static.html b/erpnext/home/page/event_updates/event_updates_static.html deleted file mode 100644 index 682f1b2c5e3..00000000000 --- a/erpnext/home/page/event_updates/event_updates_static.html +++ /dev/null @@ -1 +0,0 @@ -Event Updates \ No newline at end of file diff --git a/erpnext/home/page/my_company/__init__.py b/erpnext/home/page/my_company/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/erpnext/home/page/my_company/my_company.css b/erpnext/home/page/my_company/my_company.css deleted file mode 100644 index d2d9a668f42..00000000000 --- a/erpnext/home/page/my_company/my_company.css +++ /dev/null @@ -1,82 +0,0 @@ -/* item */ - -div.my-company-member-item-selected { - background-color: #BBC; -} - - - -/* profile */ -.my-company-name-head { - font-size: 14px; - font-weight: bold; - margin-bottom: 7px; -} - -.my-company-email { - margin-bottom: 7px; - color: #888; -} - -.my-company-online-status { - font-weight: bold; - margin-left: 7px; -} - -.my-company-status { - margin-bottom: 7px; - color: #888; - font-style: italics; -} - -.my-company-bio { - margin-bottom: 7px; -} - -.my-company-toolbar { - margin: 7px 0px; -} - -/* conversation */ - -.my-company-input-wrapper { - color: #555; - padding: 13px; -} - -.my-company-input-wrapper td { - vertical-align: bottom; -} - -.my-company-input-wrapper textarea { - height: 3em; - font-size: 14px; - width: 100%; - margin: 7px 0px 3px 0px; -} - -.my-company-input-wrapper button { - margin: 0px; -} - -.my-company-conversation { - border-top: 1px solid #DDD; -} -.my-company-comment-wrapper { - padding: 7px; - border-bottom: 1px solid #DDD; -} - -.my-company-timestamp { - color: #888; - font-size: 11px; - margin: 3px; -} - -.my-company-conversation-head { - padding: 3px; - background-color: #DEDEDE; - color: #555; - font-size: 14px; - text-align: center; -} \ No newline at end of file diff --git a/erpnext/home/page/my_company/my_company.html b/erpnext/home/page/my_company/my_company.html deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/erpnext/home/page/my_company/my_company.js b/erpnext/home/page/my_company/my_company.js deleted file mode 100644 index f6425630647..00000000000 --- a/erpnext/home/page/my_company/my_company.js +++ /dev/null @@ -1,760 +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 . - -pscript['onload_My Company'] = function() { - var wrapper = wn.pages['My Company']; - - // body - wrapper.className = 'layout_wrapper'; - wrapper.head = new PageHeader(wrapper, 'People'); - wrapper.body = $a(wrapper, 'div', '', {marginRight:'11px', marginTop:'11px'}); - - wrapper.message = $a(wrapper.body, 'div'); - wrapper.tab = make_table(wrapper.body, 1, 2, '100%', ['25%','75%']); - - $y(wrapper.tab, {tableLayout:'fixed'}) - - pscript.myc_make_toolbar(wrapper); - pscript.myc_make_list(wrapper); - - if(pscript.is_erpnext_saas) { - pscript.myc_show_erpnext_message(); - } -} - -pscript.myc_make_toolbar = function(wrapper) { - if(has_common(user_roles, ['System Manager', 'Administrator'])) { - wrapper.head.add_button('Add User', pscript.myc_add_user) - } -} - -// -// Only for erpnext product - show max users allowed -// -pscript.myc_show_erpnext_message = function() { - var callback = function(r, rt) { - if(r.exc) {msgprint(r.exc); return;} - $a(wrapper.message, 'div', 'help_box', '', 'You have ' + r.message.enabled - + ' users enabled out of ' + r.message.max_user - + '. Go to Account Settings to increase the number of users'); - } - $c_page('home', 'my_company', 'get_max_users', '', callback) -} - -// -// Add user dialog and server call -// -pscript.myc_add_user = function() { - var fields = [{ - fieldtype: 'Data', - fieldname: 'user', - reqd: 1, - label: 'Email Id of the user to add' - }, - { - fieldtype: 'Data', - fieldname: 'first_name', - reqd: 1, - label: 'First Name' - }, - { - fieldtype: 'Data', - fieldname: 'last_name', - label: 'Last Name' - }, - { - fieldtype: 'Data', - fieldname: 'password', - reqd: 1, - label: 'Password' - }, - { - fieldtype: 'Button', - label: 'Add', - fieldname: 'add' - }]; - - fields.push(); - - var d = new wn.widgets.Dialog({ - title: 'Add User', - width: 400, - fields: fields - }); - d.make(); - d.fields_dict.add.input.onclick = function() { - v = d.get_values(); - if(v) { - d.fields_dict.add.input.set_working(); - $c_page('home', 'my_company', 'add_user', v, function(r,rt) { - if(r.exc) { msgprint(r.exc); return; } - else { - d.hide(); - pscript.myc_refresh(); - } - }) - } - } - d.show(); -} - -pscript.myc_refresh = function() { - wn.pages['My Company'].member_list.lst.run(); -} - -pscript.myc_make_list= function(wrapper) { - wrapper.member_list = new MemberList(wrapper) -} - -pscript.get_fullname=function(uid) { - if(uid=='Administrator') return uid; - return wn.pages['My Company'].member_list.member_items[uid].fullname; -} - - - -//============================================= - -MemberList = function(parent) { - var me = this; - this.profiles = {}; - this.member_items = {}; - this.role_objects = {}; - this.cur_profile = null; - - this.list_wrapper = $a($td(parent.tab,0,0), 'div', '', {marginLeft:'11px'}); - var cell = $td(parent.tab,0,1); - $y(cell, { border: '1px solid #aaa' }); - cell.className = 'layout_wrapper'; - this.profile_wrapper = $a(cell, 'div'); - - this.no_user_selected = $a(this.profile_wrapper, 'div', 'help_box', null, 'Please select a user to view profile'); - - this.make_search(); - if(pscript.online_users) { - this.make_list(); - } else { - $c_page('home', 'event_updates', 'get_online_users', '', function(r,rt) { - pscript.online_users = r.message; - me.make_list(); - }) - } -} - -// ---------------------- - -MemberList.prototype.make_search = function() { - var me = this; - this.search_area = $a(this.list_wrapper, 'div', '', {textAlign:'center', padding:'8px'}); - this.search_inp = $a(this.search_area, 'input', '', {fontSize:'14px', width:'80%'}); - this.search_inp.set_empty = function() { - this.value = 'Search'; $fg(this,'#888'); - } - this.search_inp.onfocus = function() { - $fg(this,'#000'); - if(this.value=='Search')this.value = ''; - } - this.search_inp.onchange = function() { - if(!this.value) this.set_empty(); - } - this.search_inp.set_empty(); -} - -// ---------------------- - -MemberList.prototype.make_list = function() { - var me = this; - this.lst_area = $a(this.list_wrapper, 'div'); - - this.lst = new wn.ui.Listing({ - parent: this.lst_area, - as_dict: 1, - get_query: function() { - var c1 = ''; - if(me.search_inp.value && me.search_inp.value != 'Search') { - var c1 = repl(' AND (first_name LIKE "%(txt)s" OR last_name LIKE "%(txt)s" OR name LIKE "%(txt)s")', {txt:'%' + me.search_inp.value + '%'}); - } - - return repl("SELECT name, \ - ifnull(concat_ws(' ', first_name, last_name),'') as full_name, \ - gender, file_list, enabled \ - FROM tabProfile \ - WHERE docstatus != 2 \ - AND name not in ('Guest','Administrator') %(cond)s \ - ORDER BY name asc",{cond:c1}); - }, - render_row: function(parent, data) { - me.member_items[data.name] = new MemberItem(parent, data, me); - } - }); - this.lst.run(); -} - - -/* -Create / show profile -*/ -MemberList.prototype.show_profile = function(uid, member_item) { - $dh(this.no_user_selected); - - // if not exists, create - if(!this.profiles[uid]) { - if(!member_item) member_item = this.member_items[uid]; - this.profiles[uid] = new MemberProfile(this.profile_wrapper, uid, member_item); - } - - // hide current - if(this.cur_profile) - this.cur_profile.hide(); - - // show this - this.profiles[uid].show(); - this.cur_profile = this.profiles[uid]; -} - - -// Member Item -// List item of all profiles -// on the left hand sidebar of the page - -MemberItem = function(parent, det, mlist) { - var me = this; - this.det = det; - this.wrapper = $a(parent, 'div'); - this.enabled = det.enabled; - - this.tab = make_table(this.wrapper, 1,2,'100%', ['20%', '70%'], {padding:'4px', overflow:'hidden'}); - $y(this.tab, {tableLayout:'fixed', borderCollapse:'collapse'}) - - this.is_online = function() { - for(var i=0;iYour Password', - description: "Your password is required to update the concerned user's password", - fieldtype: 'Password', - fieldname: 'sys_admin_pwd', - reqd: 1 - }, - - { - label: 'Continue', - fieldtype: 'Button', - fieldname: 'continue' - } - ] - }); - - pass_d.fields_dict.continue.input.onclick = function() { - btn.pwd_dialog.hide(); - args.sys_admin_pwd = btn.pwd_dialog.get_values().sys_admin_pwd; - btn.set_working(); - me.update_security(args); - btn.done_working(); - } - - pass_d.show(); - btn.pwd_dialog = pass_d; - btn.done_working(); - } else { - btn.done_working(); - me.update_security(args); - } - }; - sd.show(); - } - - this.update_security = function(args) { - $c_page('home', 'my_company', 'update_security', JSON.stringify(args), function(r,rt) { - if(r.exc) { - msgprint(r.exc); - return; - } - me.sec_dialog.hide(); - $.extend(me.profile, me.sec_dialog.get_values()); - }); - } - - // delete user - // create a confirm dialog and call server method - this.delete_user = function() { - var cp = wn.control_panel; - - var d = new Dialog(400,200,'Delete User'); - d.make_body([ - ['HTML','','Do you really want to remove '+this.uid+' from system?'],['Button','Delete'] - ]); - d.onshow = function() { - this.clear_inputs(); - } - - d.widgets['Delete'].onclick = function() { - this.set_working(); - - var callback = function(r,rt) { - d.hide(); - if(r.exc) { - msgprint(r.exc); - return; - } - pscript.myc_refresh() - msgprint("User Deleted Successfully"); - } - $c_page('home', 'my_company', 'delete_user', {'user': me.uid}, callback); - } - d.show(); - } - - // set enabled - this.set_enable_button = function() { - var me = this; - var act = this.profile.enabled ? 'Disable' : 'Enable'; - - if(this.status_button) { - this.status_button.innerHTML = act; - } else { - // make the button - this.status_button = $btn(this.toolbar_area, act, function() { - var callback = function(r,rt) { - locals['Profile'][me.profile.name].enabled = cint(r.message); - me.status_button.done_working(); - me.refresh_enable_disable(); - } - this.set_working(); - $c_page('home','my_company', this.innerHTML.toLowerCase()+'_profile',me.profile.name, callback); - }, null, null, 1); - } - if(this.uid==user) $dh(this.status_button); else $di(this.status_button); - } - - // render the details of the user from Profile - this.render = function() { - this.profile = locals['Profile'][uid]; - scroll(0, 0); - - // name - if(cstr(this.profile.first_name) || cstr(this.profile.last_name)) { - this.fullname = cstr(this.profile.first_name) + ' ' + cstr(this.profile.last_name); - } else { - this.fullname = this.profile.name; - } - this.name_area.innerHTML = this.fullname; - - // email - this.email_area.innerHTML = this.profile.name; - - // online / offline - this.online_status_area.innerHTML = (this.member_item.is_online() ? '(Online)' : '(Offline)') - if(this.member_item.is_online()) { - $y(this.online_status_area, {color:'green'}); - } - - // refresh enable / disabled - this.refresh_enable_disable(); - - // designation - this.bio_area.innerHTML = this.profile.designation ? ('Designation: ' + cstr(this.profile.designation) + '
') : ''; - this.bio_area.innerHTML += this.profile.bio ? this.profile.bio : 'No bio'; - - new MemberConversation(this.wrapper, this.profile.name, this.fullname); - } - - // refresh enable / disable - this.refresh_enable_disable = function() { - this.profile = locals['Profile'][this.uid] - - if(!this.profile.enabled) { - $fg(this.name_area,'#999'); - } else { - $fg(this.name_area,'#000'); - } - - this.member_item.enabled = this.profile.enabled; - this.member_item.refresh_name_link(); - - this.status_span.innerHTML = this.profile.enabled ? 'Enabled' : 'Disabled'; - - // set styles and buttons - if(has_common(['Administrator','System Manager'],user_roles)) { - this.set_enable_button(); - } - } - - // Load user profile (if not loaded) - this.load = function() { - if(locals['Profile'] && locals['Profile'][uid]) { - this.render(); - return; - } - var callback = function(r,rt) { - $dh(me.member_item.working_img); - $ds(me.wrapper); - me.loading = 0; - me.render(); - } - $ds(this.member_item.working_img); - $dh(this.wrapper); - this.loading = 1; - $c('webnotes.widgets.form.load.getdoc', {'name':this.uid, 'doctype':'Profile', 'user':user}, callback); // onload - } - - // show / hide - this.show = function() { - if(!this.loading)$ds(this.wrapper); - - // select profile - this.member_item.select(); - } - this.hide = function() { - $dh(this.wrapper); - - // select profile - this.member_item.deselect(); - } - - this.make_message_list = function() { - - } - - this.make(); - this.load(); -} - - - - -// Member conversation -// Between the current user and the displayed profile -// or if same, then the conversation with all other -// profiles -MemberConversation = function(parent, uid, fullname) { - var me = this; - this.wrapper = $a(parent, 'div', 'my-company-conversation'); - this.fullname = fullname; - this.make = function() { - if(user!=uid) { - this.make_input(); - } - this.make_list(); - - // set all messages - // as "read" (docstatus = 0) - if(user==uid) { - $c_page('home', 'my_company', 'set_read_all_messages', '', function(r,rt) { }); - } - } - - this.make_input = function() { - this.input_wrapper = $a(this.wrapper, 'div', 'my-company-input-wrapper'); - var tab = make_table(this.input_wrapper, 1, 2, '100%', ['64%','36%'], {padding: '3px'}) - this.input = $a($td(tab,0,0), 'textarea'); - - // button - var div = $a(this.input_wrapper, 'div'); - this.post = $btn(div, 'Post'.bold(), function() { me.post_message(); }, {margin:'0px 13px 0px 3px'}) - this.post.disabled = true; - - this.input.onkeyup = this.input.onchange = function() { - if(this.value) { - me.post.disabled = false; - } else { - me.post.disabled = true; - } - } - - // notification check - this.notify_check = $a_input(div, 'checkbox', null); - $a(div, 'span', '', {marginLeft:'3px'}, 'Notify ' + fullname + ' by email') - } - - this.post_message = function() { - if(me.input.value==$(me.input).attr('default_text')) { - msgprint('Please write a message first!'); return; - } - this.post.set_working(); - $c_page('home', 'my_company', 'post_comment', { - uid: uid, - comment: $(me.input).val(), - notify: me.notify_check.checked ? 1 : 0 - }, function(r,rt) { - $(me.input).val("").blur(); - me.post.done_working(); - if(r.exc) { msgprint(r.exc); return; } - me.notify_check.checked = false; - me.refresh(); - }) - } - - this.make_list = function() { - this.lst_area = $a(this.wrapper, 'div', 'my-company-conversation', {padding:'7px 13px'}); - - if(user==uid) { - this.my_messages_box = $a(this.lst_area, 'div', 'my-company-conversation-head', {marginBottom:'7px'}, 'Messages by everyone to me
To send a message, click on the user on the left') - } - - this.lst = new wn.ui.Listing({ - parent: this.lst_area, - as_dict: 1, - no_result_message: (user==uid - ? 'No messages by anyone yet' - : 'No messages yet. To start a conversation post a new message'), - - get_query: function() { - if(uid==user) { - return repl("SELECT comment, owner, comment_docname, creation, docstatus " + - "FROM `tabComment` "+ - "WHERE comment_doctype='My Company' " + - "AND comment_docname='%(user)s' " + - "ORDER BY creation DESC ", {user:user}); - - } else { - return repl("SELECT comment, owner, comment_docname, creation, docstatus " + - "FROM `tabComment` "+ - "WHERE comment_doctype='My Company' " + - "AND ((owner='%(user)s' AND comment_docname='%(uid)s') " + - "OR (owner='%(uid)s' AND comment_docname='%(user)s')) " + - "ORDER BY creation DESC ", {uid:uid, user:user}); - - } - }, - render_row: function(parent, data) { - new MemberCoversationComment(parent, data, me); - }, - - }) - this.refresh(); - } - - this.refresh = function() { - me.lst.run() - } - - this.make(); -} - -MemberCoversationComment = function(cell, det, conv) { - var me = this; - this.det = det; - this.wrapper = $a(cell, 'div', 'my-company-comment-wrapper'); - this.comment = $a(this.wrapper, 'div', 'my-company-comment'); - - this.user = $a(this.comment, 'span', 'link_type', {fontWeight:'bold'}, pscript.get_fullname(det.owner)); - this.user.onclick = function() { - wn.pages['My Company'].member_list.show_profile(me.det.owner); - } - - var st = (!det.docstatus ? {fontWeight: 'bold'} : null); - this.msg = $a(this.comment, 'span', 'social', st, ': ' + det.comment); - - if(det.full_name==user) { - $y(this.wrapper, {backgroundColor: '#D9D9F3'}); - } - this.timestamp = $a(this.wrapper, 'div', 'my-company-timestamp', '', comment_when(det.creation)); -} - - - - - - - diff --git a/erpnext/home/page/my_company/my_company.py b/erpnext/home/page/my_company/my_company.py deleted file mode 100644 index 5e3ba9484ce..00000000000 --- a/erpnext/home/page/my_company/my_company.py +++ /dev/null @@ -1,218 +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 cint, load_json, cstr -from webnotes.model.doc import Document - -try: import json -except: import simplejson as json - -@webnotes.whitelist() -def get_account_settings_url(arg=''): - import server_tools.gateway_utils - return server_tools.gateway_utils.get_account_settings_url() - -@webnotes.whitelist() -def get_max_users(arg=''): - from server_tools.gateway_utils import get_max_users_gateway - return { - 'max_users': get_max_users_gateway(), - 'enabled': cint(webnotes.conn.sql("select count(*) from tabProfile where ifnull(enabled,0)=1 and name not in ('Administrator', 'Guest')")[0][0]) - } - -@webnotes.whitelist() -def enable_profile(arg=''): - webnotes.conn.sql("update tabProfile set enabled=1 where name=%s", arg) - return 1 - -@webnotes.whitelist() -def disable_profile(arg=''): - if arg=='Administrator': - return 'Cannot disable Administrator' - - webnotes.conn.sql("update tabProfile set enabled=0 where name=%s", arg) - webnotes.login_manager.logout(user=arg) - return 0 - -@webnotes.whitelist() -def delete_user(args): - args = json.loads(args) - webnotes.conn.sql("update tabProfile set enabled=0, docstatus=2 where name=%s", args['user']) - # erpnext-saas - import webnotes.defs - from webnotes.utils import cint - if hasattr(webnotes.defs, 'sync_with_gateway') and \ - cint(webnotes.defs.sync_with_gateway) or 0: - from server_tools.gateway_utils import remove_user_gateway - remove_user_gateway(args['user']) - - webnotes.login_manager.logout(user=args['user']) - - -@webnotes.whitelist() -def add_user(args): - args = json.loads(args) - # erpnext-saas - import webnotes.defs - from webnotes.utils import cint - if hasattr(webnotes.defs, 'sync_with_gateway') and \ - cint(webnotes.defs.sync_with_gateway) or 0: - from server_tools.gateway_utils import add_user_gateway - add_user_gateway(args) - - add_profile(args) - -@webnotes.whitelist() -def add_profile(args): - from webnotes.utils import validate_email_add, now - email = args['user'] - - sql = webnotes.conn.sql - - if not email: - email = webnotes.form_dict.get('user') - if not validate_email_add(email): - raise Exception - return 'Invalid Email Id' - - if sql("select name from tabProfile where name = %s", email): - # exists, enable it - sql("update tabProfile set enabled = 1, docstatus=0 where name = %s", email) - webnotes.msgprint('Profile exists, enabled it with new password') - else: - # does not exist, create it! - pr = Document('Profile') - pr.name = email - pr.email = email - pr.first_name = args.get('first_name') - pr.last_name = args.get('last_name') - pr.enabled = 1 - pr.user_type = 'System User' - pr.save(1) - - if args.get('password'): - sql(""" - UPDATE tabProfile - SET password = PASSWORD(%s), modified = %s - WHERE name = %s""", (args.get('password'), now, email)) - - send_welcome_mail(email, args) - -@webnotes.whitelist() -def send_welcome_mail(email, args): - """send welcome mail to user with password and login url""" - pr = Document('Profile', email) - from webnotes.utils.email_lib import sendmail_md - args.update({ - 'company': webnotes.conn.get_default('company'), - 'password': args.get('password'), - 'account_url': webnotes.conn.get_default('account_url') - }) - if not args.get('last_name'): args['last_name'] = '' - sendmail_md(pr.email, subject="Welcome to ERPNext", msg=welcome_txt % args, from_defs=1) - -# -# post comment -# -@webnotes.whitelist() -def post_comment(arg): - arg = load_json(arg) - - from webnotes.model.doc import Document - d = Document('Comment') - d.comment_doctype = 'My Company' - d.comment_docname = arg['uid'] # to - d.owner = webnotes.user.name - d.comment = arg['comment'] - d.save(1) - - if cint(arg.get('notify')): - fn = webnotes.conn.sql('select first_name, last_name from tabProfile where name=%s', webnotes.user.name)[0] - if fn[0] or f[1]: - fn = cstr(fn[0]) + (fn[0] and ' ' or '') + cstr(fn[1]) - else: - fn = webnotes.user.name - - message = '''A new comment has been posted on your page by %s: - - Comment: %s - - To answer, please login to your erpnext account! - - https://signin.erpnext.com - ''' % (fn, arg['comment']) - - from webnotes.model.code import get_obj - note = get_obj('Notification Control') - email_msg = note.prepare_message({ - 'type': 'New Comment', - 'message': message - }) - - sender = webnotes.user.name!='Administrator' and webnotes.user.name or 'support+admin_post@erpnext.com' - - from webnotes.utils.email_lib import sendmail - sendmail([arg['uid']], sender, email_msg, fn + ' has posted a new comment') - -# -# update read messages -# -@webnotes.whitelist() -def set_read_all_messages(arg=''): - webnotes.conn.sql("""UPDATE `tabComment` - SET docstatus = 1 - WHERE comment_doctype = 'My Company' - AND comment_docname = %s - """, webnotes.user.name) - -@webnotes.whitelist() -def update_security(args=''): - import json - args = json.loads(args) - webnotes.conn.set_value('Profile', args['user'], 'restrict_ip', args.get('restrict_ip')) - webnotes.conn.set_value('Profile', args['user'], 'login_after', args.get('login_after')) - webnotes.conn.set_value('Profile', args['user'], 'login_before', args.get('login_before')) - - if 'new_password' in args: - import webnotes.defs - from webnotes.utils import cint - if hasattr(webnotes.defs, 'sync_with_gateway') and \ - cint(webnotes.defs.sync_with_gateway) or 0: - import server_tools.gateway_utils - res = server_tools.gateway_utils.change_password('', args['new_password'], args['user'], args['sys_admin_pwd']) - if 'Traceback' not in res['message']: - webnotes.msgprint(res['message']) - webnotes.conn.sql("update tabProfile set password=password(%s) where name=%s", (args['new_password'], args['user'])) - else: webnotes.msgprint('Settings Updated') - -welcome_txt = """ -## %(company)s - -Dear %(first_name)s %(last_name)s - -Welcome! - -A new account has been created for you, here are your details: - -login-id: %(user)s -password: %(password)s - -To login to your new ERPNext account, please go to: - -%(account_url)s -""" diff --git a/erpnext/home/page/my_company/my_company.txt b/erpnext/home/page/my_company/my_company.txt deleted file mode 100644 index 31833155816..00000000000 --- a/erpnext/home/page/my_company/my_company.txt +++ /dev/null @@ -1,51 +0,0 @@ -# Page, My Company -[ - - # These values are common in all dictionaries - { - 'creation': '2010-12-14 10:23:19', - 'docstatus': 0, - 'modified': '2010-12-27 17:44:15', - 'modified_by': 'Administrator', - 'owner': 'Administrator' - }, - - # These values are common for all Page - { - 'doctype': 'Page', - 'module': 'Home', - 'name': '__common__', - 'page_name': 'My Company', - 'show_in_menu': 1, - 'standard': 'Yes' - }, - - # These values are common for all Page Role - { - 'doctype': 'Page Role', - 'name': '__common__', - 'parent': 'My Company', - 'parentfield': 'roles', - 'parenttype': 'Page' - }, - - # Page, My Company - { - 'doctype': 'Page', - 'name': 'My Company' - }, - - # Page Role - { - 'doctype': 'Page Role', - 'idx': 1, - 'role': 'Administrator' - }, - - # Page Role - { - 'doctype': 'Page Role', - 'idx': 2, - 'role': 'All' - } -] \ No newline at end of file diff --git a/erpnext/knowledge_base/page/questions/questions.py b/erpnext/knowledge_base/page/questions/questions.py index 1b90fc701df..52b80fe2803 100644 --- a/erpnext/knowledge_base/page/questions/questions.py +++ b/erpnext/knowledge_base/page/questions/questions.py @@ -17,6 +17,7 @@ import webnotes from webnotes.utils import load_json, cint, cstr +import json # add a new question @webnotes.whitelist() @@ -30,14 +31,14 @@ def add_question(arg): d.save(1) if args['suggest']: - from home.page.my_company.my_company import post_comment + from utilities.page.messages import messages for s in args['suggest']: if s: - post_comment({ - 'uid': s, - 'comment': 'Please help me and answer the question "%s" in the Knowledge Base' % d.question, + messages.post(json.dumps({ + 'contact': s, + 'txt': 'Please help me and answer the question "%s" in the Knowledge Base' % d.question, 'notify': 1 - }) + })) @webnotes.whitelist() def vote(arg): @@ -60,4 +61,4 @@ def delete(arg): """ args = load_json(arg) from webnotes.model import delete_doc - delete_doc(args['dt'], args['dn']) \ No newline at end of file + delete_doc(args['dt'], args['dn']) diff --git a/erpnext/patches/jan_mar_2012/rename_dt.py b/erpnext/patches/jan_mar_2012/rename_dt.py index 01e6bafd082..a258f73ec5b 100644 --- a/erpnext/patches/jan_mar_2012/rename_dt.py +++ b/erpnext/patches/jan_mar_2012/rename_dt.py @@ -14,9 +14,7 @@ def execute1(): replace_labels_with_fieldnames() def execute(): - # delete dt, mapper - delete_dt_and_mapper() - + #--------------------------------------------------- # doctype renaming rendt = get_dt_to_be_renamed() @@ -45,9 +43,52 @@ def execute(): #--------------------------------------------------- # Reload mapper from file for d in ren_mapper: - mod = '_'.join(webnotes.conn.sql("select module from `tabDocType Mapper` where name = %s", ren_mapper[d])[0][0].lower().split()) + mod = '_'.join(webnotes.conn.sql("select module from `tabDocType Mapper` where name = %s", + ren_mapper[d])[0][0].lower().split()) reload_doc(mod, 'DocType Mapper', ren_mapper[d]) + + delete_search_criteria() + + # reload custom search criteria + #for d in webnotes.conn.sql("""select name, module from + # `tabSearch Criteria` where ifnull(standard, 'No') = 'Yes' and ifnull(disabled, 0) = 0"""): + # + for path, folders, files in os.walk(webnotes.defs.modules_path): + if not path.endswith('search_criteria'): continue + module = path.split(os.sep)[-2] + for sc in folders: + try: + reload_doc(module, 'search_criteria', sc) + print module, sc + except Exception, e: + print "did not reload: " + str(d) + webnotes.conn.sql("""DELETE FROM `tabPrint Format` + WHERE name IN ('Delivery Note Format', 'Purchase Order Format', + 'Quotation Format', 'Receivable Voucher Format', 'Sales Order', + 'SalesInvoiceModern_test', 'SalesInvoiceStdNew', + 'Service Order Format', 'Service Quotation Format')""") + + # reload custom print format + for d in webnotes.conn.sql("""select name, module from `tabPrint Format` + where ifnull(standard, 'No') = 'Yes'"""): + try: + reload_doc(d[1], 'Print Format', d[0]) + except Exception, e: + print "did not reload: " + str(d) + + # Reload GL Mapper + for d in webnotes.conn.sql("select name from `tabGL Mapper`"): + reload_doc('accounts', 'GL Mapper', d[0]) + + #gl entry, stock ledger entry, + + + + # T0-do-list + # gl mapper name + +def delete_search_criteria(): webnotes.conn.sql("""DELETE FROM `tabSearch Criteria` WHERE name IN ('', 'bills-to_be_paid', 'bills-to_be_submitted', 'cenvat_credit_-_input_or_capital_goods', @@ -84,74 +125,18 @@ def execute(): 'projectwise_pending_qty_and_costs_as_per_purchase_cost', 'custom_test', 'custom_test1', 'delivery_notes', 'delivery_note_disabled', 'lead', 'lead_interested', 'lead_report', 'periodic_sales_summary', 'monthly_despatched_trend', 'sales', 'sales_order', - 'sales_order1', 'sales_agentwise_commission', 'test_report', 'territory_wise_sales_-_target_vs_actual_')""") + 'sales_order1', 'sales_agentwise_commission', 'test_report', + 'territory_wise_sales_-_target_vs_actual_')""") webnotes.conn.sql(""" DELETE FROM `tabSearch Criteria` WHERE name IN ('monthly_transaction_summary', 'trend_analyzer', 'yearly_transaction_summary', 'invoices-overdue', 'lead-to_follow_up', 'opportunity-to_follow_up', 'serial_no-amc_expiring_this_month', - 'serial_no-warranty_expiring_this_month', ) + 'serial_no-warranty_expiring_this_month') AND IFNULL(standard, 'No') = 'Yes' """) - # reload custom search criteria - for d in webnotes.conn.sql("""select name, module from - `tabSearch Criteria` where ifnull(standard, 'No') = 'Yes' and ifnull(disabled, 0) = 0"""): - try: - reload_doc(d[1], 'search_criteria', d[0].replace('-', '_')) - print d - except Exception, e: - print "did not reload: " + str(d) - - webnotes.conn.sql("""DELETE FROM `tabPrint Format` - WHERE name IN ('Delivery Note Format', 'Purchase Order Format', - 'Quotation Format', 'Receivable Voucher Format', 'Sales Order', - 'SalesInvoiceModern_test', 'SalesInvoiceStdNew', - 'Service Order Format', 'Service Quotation Format')""") - - # reload custom print format - for d in webnotes.conn.sql("""select name, module from `tabPrint Format` - where ifnull(standard, 'No') = 'Yes'"""): - try: - reload_doc(d[1], 'Print Format', d[0]) - except Exception, e: - print "did not reload: " + str(d) - - # Reload GL Mapper - for d in webnotes.conn.sql("select name from `tabGL Mapper`"): - reload_doc('accounts', 'GL Mapper', d[0]) - - #gl entry, stock ledger entry, - - - - # T0-do-list - # gl mapper name - - - -def delete_dt_and_mapper(): - del_mapper = ['Production Forecast-Production Planning Tool', 'Production Forecast-Production Plan', 'Sales Order-Production Plan'] - for d in del_mapper: - delete_doc('DocType Mapper', d) - - del_dt = ['Widget Control', 'Update Delivery Date Detail', 'Update Delivery Date', - 'Tag Detail', 'Supplier rating', 'Stylesheet', 'Question Tag', - 'PRO PP Detail', 'PRO Detail', 'PPW Detail', 'PF Detail', - 'Personalize', 'Patch Util', 'Page Template', 'Module Def Role', - 'Module Def Item', 'File Group', 'File Browser Control', 'File', - 'Educational Qualifications', 'Earn Deduction Detail', - 'DocType Property Setter', 'Contact Detail', 'BOM Report Detail', - 'BOM Replace Utility Detail', 'BOM Replace Utility', - 'Absent Days Detail', 'Activity Dashboard Control', 'Raw Materials Supplied', - 'Setup Wizard Control', 'Company Group', 'Lease Agreement', 'Lease Installment'] # docformat - - for d in del_dt: - 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') @@ -166,7 +151,7 @@ def rename_in_db(ren_data, data_type, is_doctype): def update_dt_in_records(rendt): for d in rendt: # Feed, property setter, search criteria, gl mapper, form 16A, naming series options, doclayer - dodtype is not mentioed in options - dt_list = webnotes.conn.sql("select t1.parent, t1.fieldname from tabDocField t1, tabDocType t2 where t1.parent = t2.name and t1.fieldname in ('dt', 'doctype', 'doc_type', 'dt_type') and ifnull(t1.options, '') = '' and ifnull(t2.issingle, 0) = 0") + dt_list = webnotes.conn.sql("select t1.parent, t1.fieldname from tabDocField t1, tabDocType t2 where t1.parent = t2.name and t1.fieldname in ('dt', 'doctype', 'doc_type', 'dt_type') and ifnull(t1.options, '') = '' and ifnull(t2.issingle, 0) = 0 and t1.parent in ('Custom Field', 'Custom Script')") for dt in dt_list: webnotes.conn.sql("update `tab%s` set %s = replace(%s, '%s', '%s') where %s = '%s'" % (dt[0], dt[1], dt[1], d, rendt[d], dt[1], d)) diff --git a/erpnext/patches/jan_mar_2012/sync_ref_db.py b/erpnext/patches/jan_mar_2012/sync_ref_db.py index efc831db9e5..2997d9ccb60 100644 --- a/erpnext/patches/jan_mar_2012/sync_ref_db.py +++ b/erpnext/patches/jan_mar_2012/sync_ref_db.py @@ -1,15 +1,49 @@ -def execute(): - import webnotes - sql = webnotes.conn.sql - from webnotes.model import delete_doc +import webnotes +sql = webnotes.conn.sql +from webnotes.model import delete_doc +def execute(): del_rec = { - 'DocType' : ['Update Series', 'File', 'File Browser Control', 'File Group', 'Tag Detail', 'DocType Property Setter', 'Company Group'], - 'Page' : ['File Browser'] + 'DocType' : ['Update Series', 'File', 'File Browser Control', 'File Group', + 'Tag Detail', 'DocType Property Setter', 'Company Group', 'Widget Control', + 'Update Delivery Date Detail', 'Update Delivery Date', + 'Tag Detail', 'Supplier rating', 'Stylesheet', 'Question Tag', + 'PRO PP Detail', 'PRO Detail', 'PPW Detail', 'PF Detail', + 'Personalize', 'Patch Util', 'Page Template', 'Module Def Role', + 'Module Def Item', 'File Group', 'File Browser Control', 'File', + 'Educational Qualifications', 'Earn Deduction Detail', + 'DocType Property Setter', 'Contact Detail', 'BOM Report Detail', + 'BOM Replace Utility Detail', 'BOM Replace Utility', + 'Absent Days Detail', 'Activity Dashboard Control', 'Raw Materials Supplied', + 'Setup Wizard Control', 'Company Group', 'Lease Agreement', 'Lease Installment', + 'Terms and Conditions', 'Time Sheet', 'Time Sheet Detail', 'Naming Series Options'], + 'Page' : ['File Browser'], + 'DocType Mapper': ['Production Forecast-Production Planning Tool', 'Production Forecast-Production Plan', 'Sales Order-Production Plan'] } for d in del_rec: for r in del_rec[d]: + if d=='DocType': + sql("delete from tabFeed where doc_type=%s", r) delete_doc(d, r) sql("delete from tabDocField where label='Repair Purchase Request' and parent = 'Purchase Request'") + + drop_tables() + + +def drop_tables(): + webnotes.conn.commit() + from webnotes.model.db_schema import remove_all_foreign_keys + remove_all_foreign_keys() + count = 0 + tab_list = sql("SHOW TABLES") + for tab in tab_list: + if tab[0].startswith('_') or tab[0] in ('tabSingles', 'tabSessions', 'tabSeries'): continue + res = sql("SELECT COUNT(*) FROM `tabDocType` WHERE name = %s", tab[0][3:]) + if not res[0][0]: + count += 1 + print tab[0] + sql("DROP TABLE `%s`" % tab[0]) + print count + webnotes.conn.begin() diff --git a/erpnext/selling/doctype/quotation/quotation.js b/erpnext/selling/doctype/quotation/quotation.js index a589a32ffb8..563052f77b3 100644 --- a/erpnext/selling/doctype/quotation/quotation.js +++ b/erpnext/selling/doctype/quotation/quotation.js @@ -22,7 +22,7 @@ cur_frm.cscript.sales_team_fname = "sales_team"; // ===================================================================================== wn.require('erpnext/selling/doctype/sales_common/sales_common.js'); -wn.require('erpnext/setup/doctype/other_charges/other_charges.js'); +wn.require('erpnext/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js'); wn.require('erpnext/utilities/doctype/sms_control/sms_control.js'); wn.require('erpnext/setup/doctype/notification_control/notification_control.js'); diff --git a/erpnext/selling/doctype/sales_common/sales_common.js b/erpnext/selling/doctype/sales_common/sales_common.js index fd043af011b..2a6e5a3d121 100644 --- a/erpnext/selling/doctype/sales_common/sales_common.js +++ b/erpnext/selling/doctype/sales_common/sales_common.js @@ -18,7 +18,7 @@ // ------ // cur_frm.cscript.tname - Details table name // cur_frm.cscript.fname - Details fieldname -// cur_frm.cscript.other_fname - wn.require('erpnext/setup/doctype/other_charges/other_charges.js'); fieldname +// cur_frm.cscript.other_fname - wn.require('erpnext/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js'); fieldname // cur_frm.cscript.sales_team_fname - Sales Team fieldname // ============== Load Default Taxes =================== diff --git a/erpnext/selling/doctype/sales_order/sales_order.js b/erpnext/selling/doctype/sales_order/sales_order.js index 1fe5fe1496b..24e69a2ee03 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.js +++ b/erpnext/selling/doctype/sales_order/sales_order.js @@ -23,7 +23,7 @@ cur_frm.cscript.sales_team_fname = "sales_team"; wn.require('erpnext/selling/doctype/sales_common/sales_common.js'); -wn.require('erpnext/setup/doctype/other_charges/other_charges.js'); +wn.require('erpnext/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js'); wn.require('erpnext/utilities/doctype/sms_control/sms_control.js'); wn.require('erpnext/setup/doctype/notification_control/notification_control.js'); diff --git a/erpnext/setup/doctype/sales_taxes_and_charges_master/__init__.py b/erpnext/setup/doctype/sales_taxes_and_charges_master/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/erpnext/startup/startup.js b/erpnext/startup/startup.js index 27befaf7218..5d7e663d422 100644 --- a/erpnext/startup/startup.js +++ b/erpnext/startup/startup.js @@ -114,34 +114,38 @@ var update_messages = function(reset) { if(inList(['Guest'], user) || !wn.session_alive) { return; } if(!reset) { - $c_page('home', 'event_updates', 'get_global_status_messages', null, - function(r,rt) { - if(!r.exc) { - // This function is defined in toolbar.js - wn.container.wntoolbar.set_new_comments(r.message.unread_messages); - - var show_in_circle = function(parent_id, msg) { - var parent = $('#'+parent_id); - if(parent) { - if(msg) { - parent.find('span:first').text(msg); - parent.toggle(true); - } else { - parent.toggle(false); - } + var set_messages = function(r) { + if(!r.exc) { + // This function is defined in toolbar.js + wn.container.wntoolbar.set_new_comments(r.message.unread_messages); + + var show_in_circle = function(parent_id, msg) { + var parent = $('#'+parent_id); + if(parent) { + if(msg) { + parent.find('span:first').text(msg); + parent.toggle(true); + } else { + parent.toggle(false); } } - - show_in_circle('unread_messages', r.message.unread_messages.length); - show_in_circle('open_support_tickets', r.message.open_support_tickets); - show_in_circle('things_todo', r.message.things_todo); - show_in_circle('todays_events', r.message.todays_events); - - } else { - clearInterval(wn.updates.id); } + + show_in_circle('unread_messages', r.message.unread_messages.length); + show_in_circle('open_support_tickets', r.message.open_support_tickets); + show_in_circle('things_todo', r.message.things_todo); + show_in_circle('todays_events', r.message.todays_events); + + } else { + clearInterval(wn.updates.id); } - ); + } + + wn.call({ + method: 'startup.startup.get_global_status_messages', + callback: set_messages + }); + } else { wn.container.wntoolbar.set_new_comments(0); $('#unread_messages').toggle(false); diff --git a/erpnext/startup/startup.py b/erpnext/startup/startup.py new file mode 100644 index 00000000000..8bc13f8678d --- /dev/null +++ b/erpnext/startup/startup.py @@ -0,0 +1,54 @@ +import webnotes + +def get_unread_messages(): + "returns unread (docstatus-0 messages for a user)" + return webnotes.conn.sql("""\ + SELECT name, comment + FROM `tabComment` + WHERE comment_doctype IN ('My Company', 'Message') + AND comment_docname = %s + AND ifnull(docstatus,0)=0 + """, webnotes.user.name, as_list=1) + +def get_open_support_tickets(): + """ + Returns a count of open support tickets + """ + from webnotes.utils import cint + open_support_tickets = webnotes.conn.sql("""\ + SELECT COUNT(*) FROM `tabSupport Ticket` + WHERE status = 'Open'""") + return open_support_tickets and cint(open_support_tickets[0][0]) or 0 + +def get_things_todo(): + """ + Returns a count of incomplete todos + """ + from webnotes.utils import cint + incomplete_todos = webnotes.conn.sql("""\ + SELECT COUNT(*) FROM `tabToDo` + WHERE IFNULL(checked, 0) = 0 + AND owner = %s""", webnotes.session.get('user')) + return incomplete_todos and cint(incomplete_todos[0][0]) or 0 + +def get_todays_events(): + """ + Returns a count of todays events in calendar + """ + from webnotes.utils import nowdate, cint + todays_events = webnotes.conn.sql("""\ + SELECT COUNT(*) FROM `tabEvent` + WHERE owner = %s + AND event_type != 'Cancel' + AND event_date = %s""", ( + webnotes.session.get('user'), nowdate())) + return todays_events and cint(todays_events[0][0]) or 0 + +@webnotes.whitelist() +def get_global_status_messages(arg=None): + return { + 'unread_messages': get_unread_messages(), + 'open_support_tickets': get_open_support_tickets(), + 'things_todo': get_things_todo(), + 'todays_events': get_todays_events(), + } diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.js b/erpnext/stock/doctype/delivery_note/delivery_note.js index d9368bd9b44..8e158979e62 100644 --- a/erpnext/stock/doctype/delivery_note/delivery_note.js +++ b/erpnext/stock/doctype/delivery_note/delivery_note.js @@ -21,7 +21,7 @@ cur_frm.cscript.other_fname = "other_charges"; cur_frm.cscript.sales_team_fname = "sales_team"; wn.require('erpnext/selling/doctype/sales_common/sales_common.js'); -wn.require('erpnext/setup/doctype/other_charges/other_charges.js'); +wn.require('erpnext/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js'); wn.require('erpnext/utilities/doctype/sms_control/sms_control.js'); wn.require('erpnext/setup/doctype/notification_control/notification_control.js'); diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js index abeac49ea8c..7e81b888389 100644 --- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js @@ -18,7 +18,7 @@ cur_frm.cscript.tname = "Purchase Receipt Item"; cur_frm.cscript.fname = "purchase_receipt_details"; cur_frm.cscript.other_fname = "purchase_tax_details"; -wn.require('erpnext/buying/doctype/purchase_other_charges/purchase_other_charges.js'); +wn.require('erpnext/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.js'); wn.require('erpnext/buying/doctype/purchase_common/purchase_common.js'); wn.require('erpnext/utilities/doctype/sms_control/sms_control.js'); wn.require('erpnext/setup/doctype/notification_control/notification_control.js'); diff --git a/erpnext/utilities/page/messages/messages.py b/erpnext/utilities/page/messages/messages.py index 3a27bca2575..212a2686b09 100644 --- a/erpnext/utilities/page/messages/messages.py +++ b/erpnext/utilities/page/messages/messages.py @@ -68,9 +68,41 @@ def post(arg=None): d.comment_docname = arg['contact'] d.comment_doctype = 'Message' d.save() + + import webnotes.utils + if webnotes.utils.cint(arg.get('notify')): + notify(arg) @webnotes.whitelist() def delete(arg=None): webnotes.conn.sql("""delete from `tabComment` where name=%s""", webnotes.form_dict['name']); + +def notify(arg=None): + from webnotes.utils import cstr + fn = webnotes.conn.sql('select first_name, last_name from tabProfile where name=%s', webnotes.user.name)[0] + if fn[0] or f[1]: + fn = cstr(fn[0]) + (fn[0] and ' ' or '') + cstr(fn[1]) + else: + fn = webnotes.user.name + + message = '''A new comment has been posted on your page by %s: + Comment: %s + + To answer, please login to your erpnext account! + + https://signin.erpnext.com + ''' % (fn, arg['txt']) + + from webnotes.model.code import get_obj + note = get_obj('Notification Control') + email_msg = note.prepare_message({ + 'type': 'New Comment', + 'message': message + }) + + sender = webnotes.user.name!='Administrator' and webnotes.user.name or 'support+admin_post@erpnext.com' + + from webnotes.utils.email_lib import sendmail + sendmail([arg['contact']], sender, email_msg, fn + ' has posted a new comment') diff --git a/js/all-app.js b/js/all-app.js index 78ff3e18f29..75a130b7f9c 100644 --- a/js/all-app.js +++ b/js/all-app.js @@ -2228,8 +2228,9 @@ else if(nm=='Accounts Browser') pscript.make_chart(chart_type);} loadpage(nm,call_back);} var update_messages=function(reset){if(inList(['Guest'],user)||!wn.session_alive){return;} -if(!reset){$c_page('home','event_updates','get_global_status_messages',null,function(r,rt){if(!r.exc){wn.container.wntoolbar.set_new_comments(r.message.unread_messages);var show_in_circle=function(parent_id,msg){var parent=$('#'+parent_id);if(parent){if(msg){parent.find('span:first').text(msg);parent.toggle(true);}else{parent.toggle(false);}}} -show_in_circle('unread_messages',r.message.unread_messages.length);show_in_circle('open_support_tickets',r.message.open_support_tickets);show_in_circle('things_todo',r.message.things_todo);show_in_circle('todays_events',r.message.todays_events);}else{clearInterval(wn.updates.id);}});}else{wn.container.wntoolbar.set_new_comments(0);$('#unread_messages').toggle(false);}} +if(!reset){var set_messages=function(r){if(!r.exc){wn.container.wntoolbar.set_new_comments(r.message.unread_messages);var show_in_circle=function(parent_id,msg){var parent=$('#'+parent_id);if(parent){if(msg){parent.find('span:first').text(msg);parent.toggle(true);}else{parent.toggle(false);}}} +show_in_circle('unread_messages',r.message.unread_messages.length);show_in_circle('open_support_tickets',r.message.open_support_tickets);show_in_circle('things_todo',r.message.things_todo);show_in_circle('todays_events',r.message.todays_events);}else{clearInterval(wn.updates.id);}} +wn.call({method:'startup.startup.get_global_status_messages',callback:set_messages});}else{wn.container.wntoolbar.set_new_comments(0);$('#unread_messages').toggle(false);}} erpnext.startup.set_periodic_updates=function(){wn.updates={};if(wn.updates.id){clearInterval(wn.updates.id);} wn.updates.id=setInterval(update_messages,60000);} erpnext.set_user_background=function(src){set_style(repl('body { background: url("files/%(src)s") repeat;}',{src:src}))} diff --git a/js/all-web.js b/js/all-web.js index a25d3e8dafc..58b748db01a 100644 --- a/js/all-web.js +++ b/js/all-web.js @@ -1256,8 +1256,9 @@ else if(nm=='Accounts Browser') pscript.make_chart(chart_type);} loadpage(nm,call_back);} var update_messages=function(reset){if(inList(['Guest'],user)||!wn.session_alive){return;} -if(!reset){$c_page('home','event_updates','get_global_status_messages',null,function(r,rt){if(!r.exc){wn.container.wntoolbar.set_new_comments(r.message.unread_messages);var show_in_circle=function(parent_id,msg){var parent=$('#'+parent_id);if(parent){if(msg){parent.find('span:first').text(msg);parent.toggle(true);}else{parent.toggle(false);}}} -show_in_circle('unread_messages',r.message.unread_messages.length);show_in_circle('open_support_tickets',r.message.open_support_tickets);show_in_circle('things_todo',r.message.things_todo);show_in_circle('todays_events',r.message.todays_events);}else{clearInterval(wn.updates.id);}});}else{wn.container.wntoolbar.set_new_comments(0);$('#unread_messages').toggle(false);}} +if(!reset){var set_messages=function(r){if(!r.exc){wn.container.wntoolbar.set_new_comments(r.message.unread_messages);var show_in_circle=function(parent_id,msg){var parent=$('#'+parent_id);if(parent){if(msg){parent.find('span:first').text(msg);parent.toggle(true);}else{parent.toggle(false);}}} +show_in_circle('unread_messages',r.message.unread_messages.length);show_in_circle('open_support_tickets',r.message.open_support_tickets);show_in_circle('things_todo',r.message.things_todo);show_in_circle('todays_events',r.message.todays_events);}else{clearInterval(wn.updates.id);}} +wn.call({method:'startup.startup.get_global_status_messages',callback:set_messages});}else{wn.container.wntoolbar.set_new_comments(0);$('#unread_messages').toggle(false);}} erpnext.startup.set_periodic_updates=function(){wn.updates={};if(wn.updates.id){clearInterval(wn.updates.id);} wn.updates.id=setInterval(update_messages,60000);} erpnext.set_user_background=function(src){set_style(repl('body { background: url("files/%(src)s") repeat;}',{src:src}))} @@ -1289,4 +1290,4 @@ item.route=item.url||item.custom_page;$parent_li.find('.dropdown-menu').append(r erpnext.com
\ ',wn.boot.website_settings));this.make_items();},make_items:function(){var items=wn.boot.website_menus for(var i=0;i%(label)s',item))}}}});$(document).bind('startup',function(){erpnext.footer=new erpnext.Footer();erpnext.navbar.navbar=new erpnext.navbar.Navbar();}) + data-label="%(label)s">%(label)s',item))}}}});$(document).bind('startup',function(){erpnext.footer=new erpnext.Footer();erpnext.navbar.navbar=new erpnext.navbar.Navbar();}) \ No newline at end of file diff --git a/version.num b/version.num index 3591ec6784c..b6f9e0e3aea 100644 --- a/version.num +++ b/version.num @@ -1 +1 @@ -1492 +1495 \ No newline at end of file diff --git a/wnf.py b/wnf.py index ad450cda417..94450d8e745 100755 --- a/wnf.py +++ b/wnf.py @@ -242,11 +242,11 @@ def run(): elif options.sync_all is not None: import webnotes.model.sync - webnotes.model.sync.sync_all() + webnotes.model.sync.sync_all(options.force or 0) elif options.sync is not None: import webnotes.model.sync - webnotes.model.sync.sync(options.sync[0], options.sync[1]) + webnotes.model.sync.sync(options.sync[0], options.sync[1], options.force or 0) # print messages if webnotes.message_log: