From 793ba6bd37e0514b42c1b32749e61b20c8533300 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Fri, 14 Feb 2014 15:47:51 +0530 Subject: [PATCH] -webnotes +frappe :boom: --- README.md | 6 +- .../Print Format/POS Invoice/POS Invoice.txt | 2 +- .../Sales Invoice Classic.txt | 2 +- .../Sales Invoice Modern.txt | 2 +- .../Sales Invoice Spartan.txt | 2 +- .../SalesInvoice/SalesInvoice.html | 2 +- erpnext/accounts/doctype/account/account.js | 22 +- erpnext/accounts/doctype/account/account.py | 68 ++--- .../accounts/doctype/account/test_account.py | 4 +- .../accounts_settings/accounts_settings.py | 18 +- .../bank_reconciliation.js | 2 +- .../bank_reconciliation.py | 16 +- .../bank_reconciliation_detail.py | 2 +- .../doctype/budget_detail/budget_detail.py | 2 +- .../budget_distribution.js | 2 +- .../budget_distribution.py | 10 +- .../budget_distribution_detail.py | 2 +- erpnext/accounts/doctype/c_form/c_form.py | 28 +- .../c_form_invoice_detail.py | 2 +- .../doctype/cost_center/cost_center.js | 18 +- .../doctype/cost_center/cost_center.py | 18 +- .../doctype/fiscal_year/fiscal_year.js | 8 +- .../doctype/fiscal_year/fiscal_year.py | 26 +- erpnext/accounts/doctype/gl_entry/gl_entry.py | 62 ++-- .../journal_voucher/journal_voucher.js | 46 +-- .../journal_voucher/journal_voucher.py | 86 +++--- .../journal_voucher/test_journal_voucher.py | 48 +-- .../journal_voucher_detail.py | 2 +- .../doctype/mis_control/mis_control.py | 16 +- .../mode_of_payment/mode_of_payment.py | 2 +- .../payment_to_invoice_matching_tool.js | 8 +- .../payment_to_invoice_matching_tool.py | 22 +- .../test_payment_to_invoice_matching_tool.py | 2 +- ...payment_to_invoice_matching_tool_detail.py | 2 +- .../period_closing_voucher.py | 24 +- .../test_period_closing_voucher.py | 12 +- .../doctype/pos_setting/pos_setting.js | 2 +- .../doctype/pos_setting/pos_setting.py | 26 +- .../purchase_invoice/purchase_invoice.js | 28 +- .../purchase_invoice/purchase_invoice.py | 50 ++-- .../purchase_invoice/purchase_invoice_list.js | 2 +- .../purchase_invoice/test_purchase_invoice.py | 40 +-- .../purchase_invoice_advance.py | 2 +- .../purchase_invoice_item.py | 2 +- .../purchase_taxes_and_charges.py | 2 +- .../purchase_taxes_and_charges_master.js | 26 +- .../purchase_taxes_and_charges_master.py | 8 +- erpnext/accounts/doctype/sales_invoice/pos.js | 50 ++-- erpnext/accounts/doctype/sales_invoice/pos.py | 18 +- .../doctype/sales_invoice/sales_invoice.js | 54 ++-- .../doctype/sales_invoice/sales_invoice.py | 138 ++++----- .../sales_invoice/sales_invoice_list.js | 2 +- .../sales_invoice/sales_invoice_map.js | 2 +- .../sales_invoice/test_sales_invoice.py | 170 +++++------ .../sales_invoice_advance.py | 2 +- .../sales_invoice_item/sales_invoice_item.py | 2 +- .../sales_taxes_and_charges.py | 2 +- .../sales_taxes_and_charges_master.js | 18 +- .../sales_taxes_and_charges_master.py | 8 +- .../doctype/shipping_rule/shipping_rule.py | 14 +- .../shipping_rule/test_shipping_rule.py | 8 +- .../shipping_rule_condition.py | 2 +- erpnext/accounts/general_ledger.py | 20 +- .../page/accounts_browser/accounts_browser.js | 116 ++++---- .../page/accounts_browser/accounts_browser.py | 20 +- .../page/accounts_home/accounts_home.js | 156 +++++----- .../financial_analytics.js | 38 +-- .../financial_statements.js | 12 +- .../page/trial_balance/trial_balance.js | 10 +- erpnext/accounts/party.py | 46 +-- .../accounts_payable/accounts_payable.js | 14 +- .../accounts_payable/accounts_payable.py | 22 +- .../accounts_receivable.js | 14 +- .../accounts_receivable.py | 18 +- .../bank_clearance_summary.js | 10 +- .../bank_clearance_summary.py | 6 +- .../bank_reconciliation_statement.js | 6 +- .../bank_reconciliation_statement.py | 8 +- .../budget_variance_report.js | 10 +- .../budget_variance_report.py | 14 +- .../customer_account_head.py | 6 +- .../report/general_ledger/general_ledger.js | 24 +- .../report/general_ledger/general_ledger.py | 24 +- .../report/gross_profit/gross_profit.js | 14 +- .../report/gross_profit/gross_profit.py | 18 +- .../item_wise_purchase_register.js | 18 +- .../item_wise_purchase_register.py | 12 +- .../item_wise_sales_register.js | 16 +- .../item_wise_sales_register.py | 8 +- .../payment_period_based_on_invoice_date.js | 18 +- .../payment_period_based_on_invoice_date.py | 12 +- .../purchase_invoice_trends.js | 4 +- .../purchase_invoice_trends.py | 2 +- .../purchase_register/purchase_register.js | 16 +- .../purchase_register/purchase_register.py | 30 +- .../sales_invoice_trends.js | 4 +- .../sales_invoice_trends.py | 2 +- .../report/sales_register/sales_register.js | 16 +- .../report/sales_register/sales_register.py | 30 +- .../supplier_account_head.py | 6 +- erpnext/accounts/utils.py | 112 +++---- .../Purchase Order Classic.txt | 2 +- .../Purchase Order Modern.txt | 2 +- .../Purchase Order Spartan.txt | 2 +- .../buying_settings/buying_settings.py | 4 +- .../purchase_common/purchase_common.js | 58 ++-- .../purchase_common/purchase_common.py | 52 ++-- .../doctype/purchase_order/purchase_order.js | 42 +-- .../doctype/purchase_order/purchase_order.py | 40 +-- .../purchase_order/test_purchase_order.py | 48 +-- .../purchase_order_item.py | 2 +- .../purchase_order_item_supplied.py | 2 +- .../purchase_receipt_item_supplied.py | 2 +- .../quality_inspection/quality_inspection.py | 14 +- .../quality_inspection_reading.py | 2 +- erpnext/buying/doctype/supplier/supplier.js | 18 +- erpnext/buying/doctype/supplier/supplier.py | 58 ++-- .../supplier_quotation/supplier_quotation.js | 8 +- .../supplier_quotation/supplier_quotation.py | 14 +- .../test_supplier_quotation.py | 12 +- .../supplier_quotation_item.py | 2 +- .../buying/page/buying_home/buying_home.js | 92 +++--- .../purchase_analytics/purchase_analytics.js | 56 ++-- .../purchase_order_trends.js | 4 +- .../purchase_order_trends.py | 2 +- erpnext/config/desktop.py | 2 +- erpnext/config/setup.py | 2 +- erpnext/controllers/accounts_controller.py | 44 +-- erpnext/controllers/buying_controller.py | 28 +- .../controllers/js/contact_address_common.js | 8 +- erpnext/controllers/queries.py | 34 +-- erpnext/controllers/selling_controller.py | 48 +-- erpnext/controllers/status_updater.py | 34 +-- erpnext/controllers/stock_controller.py | 28 +- erpnext/controllers/trends.py | 24 +- erpnext/home/__init__.py | 12 +- erpnext/home/doctype/feed/feed.py | 12 +- erpnext/home/page/activity/activity.js | 22 +- erpnext/home/page/activity/activity.py | 10 +- erpnext/home/page/latest_updates/README.md | 1 - erpnext/home/page/latest_updates/__init__.py | 0 .../page/latest_updates/latest_updates.js | 50 ---- .../page/latest_updates/latest_updates.py | 63 ---- .../page/latest_updates/latest_updates.txt | 33 --- erpnext/hooks.txt | 6 +- erpnext/hr/doctype/appraisal/appraisal.js | 6 +- erpnext/hr/doctype/appraisal/appraisal.py | 24 +- .../doctype/appraisal_goal/appraisal_goal.py | 2 +- .../appraisal_template/appraisal_template.py | 6 +- .../appraisal_template_goal.py | 2 +- erpnext/hr/doctype/attendance/attendance.py | 18 +- erpnext/hr/doctype/branch/branch.py | 2 +- .../doctype/deduction_type/deduction_type.py | 2 +- erpnext/hr/doctype/department/department.py | 2 +- erpnext/hr/doctype/designation/designation.py | 2 +- .../hr/doctype/earning_type/earning_type.py | 2 +- erpnext/hr/doctype/employee/employee.js | 24 +- erpnext/hr/doctype/employee/employee.py | 54 ++-- .../employee_education/employee_education.py | 2 +- .../employee_external_work_history.py | 2 +- .../employee_internal_work_history.py | 2 +- .../employee_leave_approver.py | 2 +- .../employment_type/employment_type.py | 2 +- .../hr/doctype/expense_claim/expense_claim.js | 32 +- .../hr/doctype/expense_claim/expense_claim.py | 8 +- .../expense_claim_detail.py | 2 +- .../expense_claim_type/expense_claim_type.py | 2 +- erpnext/hr/doctype/grade/grade.py | 2 +- erpnext/hr/doctype/holiday/holiday.py | 2 +- .../hr/doctype/holiday_list/holiday_list.py | 18 +- erpnext/hr/doctype/hr_settings/hr_settings.py | 14 +- .../job_applicant/get_job_applications.py | 18 +- .../hr/doctype/job_applicant/job_applicant.js | 8 +- .../hr/doctype/job_applicant/job_applicant.py | 6 +- erpnext/hr/doctype/job_opening/job_opening.py | 2 +- .../leave_allocation/leave_allocation.py | 24 +- .../leave_application/leave_application.js | 16 +- .../leave_application/leave_application.py | 92 +++--- .../leave_application_calendar.js | 2 +- .../test_leave_application.py | 76 ++--- .../leave_block_list/leave_block_list.py | 22 +- .../leave_block_list/test_leave_block_list.py | 16 +- .../leave_block_list_allow.py | 2 +- .../leave_block_list_date.py | 2 +- .../leave_control_panel.js | 4 +- .../leave_control_panel.py | 14 +- erpnext/hr/doctype/leave_type/leave_type.py | 2 +- erpnext/hr/doctype/salary_manager/__init__.py | 2 +- .../doctype/salary_manager/salary_manager.js | 20 +- .../doctype/salary_manager/salary_manager.py | 26 +- .../salary_manager/test_salary_manager.py | 28 +- erpnext/hr/doctype/salary_slip/salary_slip.py | 44 +-- .../doctype/salary_slip/test_salary_slip.py | 16 +- .../salary_slip_deduction.py | 2 +- .../salary_slip_earning.py | 2 +- .../salary_structure/salary_structure.js | 4 +- .../salary_structure/salary_structure.py | 22 +- .../salary_structure_deduction.py | 2 +- .../salary_structure_earning.py | 2 +- .../upload_attendance/upload_attendance.js | 16 +- .../upload_attendance/upload_attendance.py | 54 ++-- erpnext/hr/page/hr_home/hr_home.js | 130 ++++----- .../employee_birthday/employee_birthday.js | 10 +- .../employee_birthday/employee_birthday.py | 6 +- .../employee_leave_balance.js | 10 +- .../employee_leave_balance.py | 18 +- .../monthly_attendance_sheet.js | 14 +- .../monthly_attendance_sheet.py | 12 +- .../monthly_salary_register.js | 14 +- .../monthly_salary_register.py | 20 +- erpnext/hr/utils.py | 16 +- erpnext/manufacturing/doctype/bom/bom.js | 12 +- erpnext/manufacturing/doctype/bom/bom.py | 68 ++--- erpnext/manufacturing/doctype/bom/test_bom.py | 2 +- .../bom_explosion_item/bom_explosion_item.py | 2 +- .../doctype/bom_item/bom_item.py | 2 +- .../doctype/bom_operation/bom_operation.py | 2 +- .../bom_replace_tool/bom_replace_tool.py | 16 +- .../production_order/production_order.js | 26 +- .../production_order/production_order.py | 56 ++-- .../production_order/test_production_order.py | 24 +- .../production_plan_item.py | 2 +- .../production_plan_sales_order.py | 2 +- .../production_planning_tool.js | 4 +- .../production_planning_tool.py | 58 ++-- .../doctype/workstation/workstation.py | 16 +- .../manufacturing_home/manufacturing_home.js | 46 +-- erpnext/patches.txt | 28 +- erpnext/patches/1311/__init__.py | 0 erpnext/patches/1311/p01_cleanup.py | 24 -- .../1311/p01_make_gl_entries_for_si.py | 14 - erpnext/patches/1311/p02_index_singles.py | 11 - .../1311/p03_update_reqd_report_fields.py | 17 -- erpnext/patches/1311/p04_update_comments.py | 10 - ...p04_update_year_end_date_of_fiscal_year.py | 11 - .../patches/1311/p05_website_brand_html.py | 16 - .../patches/1311/p06_fix_report_columns.py | 34 --- .../1311/p07_scheduler_errors_digest.py | 32 -- .../1311/p08_email_digest_recipients.py | 11 - erpnext/patches/1312/__init__.py | 0 .../1312/p01_delete_old_stock_reports.py | 17 -- .../p02_update_item_details_in_item_price.py | 10 - erpnext/patches/1401/__init__.py | 0 erpnext/patches/1401/enable_all_price_list.py | 9 - erpnext/patches/1401/fix_planned_qty.py | 13 - .../fix_serial_no_status_and_warehouse.py | 19 -- ...ying_selling_as_check_box_in_price_list.py | 29 -- ...elated_property_setters_to_custom_field.py | 25 -- ...ate_billing_status_for_zero_value_order.py | 29 -- erpnext/patches/4_0/fields_to_be_renamed.py | 16 +- .../4_0/map_charge_to_taxes_and_charges.py | 8 +- .../move_warehouse_user_to_restrictions.py | 10 +- erpnext/patches/4_0/new_permissions.py | 10 +- .../4_0/reload_purchase_print_format.py | 8 +- .../patches/4_0/reload_sales_print_format.py | 28 +- ...to_sales_person_in_maintenance_schedule.py | 10 +- erpnext/patches/4_0/update_user_properties.py | 52 ++-- erpnext/patches/april_2013/__init__.py | 0 .../p01_update_serial_no_valuation_rate.py | 38 --- .../p02_add_country_and_currency.py | 23 -- .../p03_fixes_for_lead_in_quotation.py | 21 -- .../april_2013/p04_reverse_modules_list.py | 15 - .../april_2013/p04_update_role_in_pages.py | 15 - .../p05_fixes_in_reverse_modules.py | 13 - .../april_2013/p05_update_file_data.py | 76 ----- .../april_2013/p06_default_cost_center.py | 13 - .../april_2013/p06_update_file_size.py | 17 -- .../p07_rename_cost_center_other_charges.py | 12 - .../april_2013/p07_update_file_data_2.py | 22 -- .../april_2013/rebuild_sales_browser.py | 7 - erpnext/patches/august_2013/__init__.py | 0 .../patches/august_2013/fix_fiscal_year.py | 49 ---- .../p01_auto_accounting_for_stock_patch.py | 6 - .../patches/august_2013/p01_hr_settings.py | 20 -- .../august_2013/p02_rename_price_list.py | 41 --- ...03_pos_setting_replace_customer_account.py | 24 -- .../august_2013/p05_employee_birthdays.py | 14 - .../p05_update_serial_no_status.py | 5 - .../august_2013/p06_deprecate_is_cancelled.py | 11 - .../p06_fix_sle_against_stock_entry.py | 113 ------- erpnext/patches/december_2012/__init__.py | 0 .../patches/december_2012/address_title.py | 15 - .../delete_form16_print_format.py | 6 - .../deleted_contact_address_patch.py | 15 - .../patches/december_2012/deprecate_tds.py | 42 --- .../december_2012/expense_leave_reload.py | 29 -- .../patches/december_2012/file_list_rename.py | 13 - .../december_2012/fix_default_print_format.py | 7 - .../december_2012/move_recent_to_memcache.py | 12 - .../december_2012/production_cleanup.py | 53 ---- .../production_order_naming_series.py | 18 -- .../december_2012/rebuild_item_group_tree.py | 8 - .../remove_quotation_next_contact.py | 19 -- .../december_2012/replace_createlocal.py | 8 - .../december_2012/repost_ordered_qty.py | 11 - .../december_2012/repost_projected_qty.py | 8 - .../december_2012/stock_entry_cleanup.py | 78 ----- .../december_2012/update_print_width.py | 8 - .../december_2012/website_cache_refactor.py | 27 -- erpnext/patches/february_2013/__init__.py | 0 .../february_2013/account_negative_balance.py | 7 - .../patches/february_2013/fix_outstanding.py | 23 -- .../gle_floating_point_issue_revisited.py | 25 -- erpnext/patches/february_2013/p01_event.py | 17 -- .../patches/february_2013/p02_email_digest.py | 7 - .../february_2013/p03_material_request.py | 30 -- .../february_2013/p04_remove_old_doctypes.py | 13 - .../february_2013/p05_leave_application.py | 12 - .../february_2013/p08_todo_query_report.py | 11 - .../p09_remove_cancelled_warehouses.py | 12 - .../patches/february_2013/p09_timesheets.py | 58 ---- .../payment_reconciliation_reset_values.py | 10 - .../reload_bom_replace_tool_permission.py | 7 - .../remove_account_utils_folder.py | 11 - .../patches/february_2013/remove_gl_mapper.py | 10 - .../february_2013/repost_reserved_qty.py | 13 - .../update_company_in_leave_application.py | 15 - erpnext/patches/january_2013/__init__.py | 0 .../january_2013/change_patch_structure.py | 16 - .../patches/january_2013/enable_currencies.py | 19 -- .../january_2013/file_list_rename_returns.py | 66 ----- .../give_report_permission_on_read.py | 7 - .../january_2013/holiday_list_patch.py | 44 --- erpnext/patches/january_2013/rebuild_tree.py | 11 - .../january_2013/reload_print_format.py | 19 -- .../january_2013/remove_bad_permissions.py | 10 - .../january_2013/remove_landed_cost_master.py | 7 - .../remove_tds_entry_from_gl_mapper.py | 9 - .../remove_unwanted_permission.py | 16 - .../patches/january_2013/report_permission.py | 17 -- .../stock_reconciliation_patch.py | 73 ----- .../january_2013/tabsessions_to_myisam.py | 7 - .../patches/january_2013/update_closed_on.py | 35 --- .../january_2013/update_country_info.py | 30 -- .../january_2013/update_fraction_for_usd.py | 6 - .../january_2013/update_number_format.py | 21 -- erpnext/patches/july_2013/__init__.py | 0 .../july_2013/p01_remove_doctype_mappers.py | 11 - .../july_2013/p01_same_sales_rate_patch.py | 10 - .../july_2013/p02_copy_shipping_address.py | 8 - .../july_2013/p03_cost_center_company.py | 9 - .../july_2013/p04_merge_duplicate_leads.py | 16 - .../p05_custom_doctypes_in_list_view.py | 24 -- .../patches/july_2013/p06_same_sales_rate.py | 16 - .../p07_repost_billed_amt_in_sales_cycle.py | 12 - ...08_custom_print_format_net_total_export.py | 19 -- .../july_2013/p09_remove_website_pyc.py | 12 - ...p10_change_partner_user_to_website_user.py | 12 - .../p11_update_price_list_currency.py | 12 - .../patches/july_2013/restore_tree_roots.py | 6 - erpnext/patches/june_2013/__init__.py | 0 .../p01_update_bom_exploded_items.py | 16 - .../june_2013/p02_update_project_completed.py | 9 - .../p03_buying_selling_for_price_list.py | 14 - .../p04_fix_event_for_lead_oppty_project.py | 23 -- .../p05_remove_search_criteria_reports.py | 11 - .../june_2013/p05_remove_unused_doctypes.py | 90 ------ .../june_2013/p06_drop_unused_tables.py | 81 ----- .../p07_taxes_price_list_for_territory.py | 29 -- .../june_2013/p09_update_global_defaults.py | 44 --- erpnext/patches/june_2013/p10_lead_address.py | 55 ---- erpnext/patches/march_2013/__init__.py | 0 erpnext/patches/march_2013/p01_c_form.py | 9 - .../march_2013/p02_get_global_default.py | 14 - .../p03_rename_blog_to_blog_post.py | 12 - .../march_2013/p04_pos_update_stock_check.py | 21 -- .../march_2013/p05_payment_reconciliation.py | 32 -- .../p06_remove_sales_purchase_return_tool.py | 10 - .../p07_update_project_in_stock_ledger.py | 45 --- .../march_2013/p07_update_valuation_rate.py | 22 -- .../march_2013/p08_create_aii_accounts.py | 96 ------ .../p10_set_fiscal_year_for_stock.py | 21 -- .../p10_update_against_expense_account.py | 14 - .../march_2013/p11_update_attach_files.py | 19 -- .../p12_set_item_tax_rate_in_json.py | 22 -- .../march_2013/update_po_prevdoc_doctype.py | 9 - erpnext/patches/may_2013/__init__.py | 0 .../may_2013/p01_selling_net_total_export.py | 19 -- .../may_2013/p02_update_valuation_rate.py | 34 --- .../may_2013/p03_update_support_ticket.py | 14 - erpnext/patches/may_2013/p04_reorder_level.py | 10 - .../p05_update_cancelled_gl_entries.py | 15 - erpnext/patches/may_2013/p06_make_notes.py | 43 --- .../may_2013/p06_update_billed_amt_po_pr.py | 13 - .../may_2013/p07_move_update_stock_to_pos.py | 26 -- .../may_2013/p08_change_item_wise_tax.py | 31 -- .../repost_stock_for_no_posting_time.py | 21 -- erpnext/patches/november_2012/__init__.py | 0 .../add_employee_field_in_employee.py | 9 - .../november_2012/add_theme_to_profile.py | 17 -- .../november_2012/cancelled_bom_patch.py | 17 -- .../communication_sender_and_recipient.py | 11 - .../custom_field_insert_after.py | 15 - .../customer_issue_allocated_to_assigned.py | 22 -- .../disable_cancelled_profiles.py | 11 - .../november_2012/gle_floating_point_issue.py | 19 -- .../leave_application_cleanup.py | 13 - .../november_2012/production_order_patch.py | 15 - .../november_2012/report_permissions.py | 9 - .../reset_appraisal_permissions.py | 6 - ...upport_ticket_response_to_communication.py | 30 -- ...ate_delivered_billed_percentage_for_pos.py | 15 - erpnext/patches/october_2012/__init__.py | 0 .../company_fiscal_year_docstatus_patch.py | 10 - .../custom_script_delete_permission.py | 7 - .../october_2012/fix_cancelled_gl_entries.py | 19 -- .../october_2012/fix_wrong_vouchers.py | 86 ------ .../october_2012/update_account_property.py | 17 -- .../patches/october_2012/update_permission.py | 26 -- erpnext/patches/october_2013/__init__.py | 0 .../october_2013/fix_is_cancelled_in_sle.py | 13 - .../october_2013/p01_fix_serial_no_status.py | 20 -- .../p01_update_delivery_note_prevdocs.py | 13 - .../p02_set_communication_status.py | 11 - ...ice_list_and_item_details_in_item_price.py | 18 -- .../october_2013/p03_crm_update_status.py | 47 --- ...3_remove_sales_and_purchase_return_tool.py | 8 - .../p04_update_report_permission.py | 9 - .../october_2013/p04_wsgi_migration.py | 33 --- ...elete_gl_entries_for_cancelled_vouchers.py | 16 - .../p05_server_custom_script_to_file.py | 40 --- .../p06_rename_packing_list_doctype.py | 21 -- ...pdate_control_panel_and_global_defaults.py | 21 -- .../october_2013/p07_rename_for_territory.py | 24 -- ..._cleanup_after_item_price_module_change.py | 14 - .../p09_update_naming_series_settings.py | 19 -- .../october_2013/p10_plugins_refactor.py | 26 -- ...petual_inventory_stock_transfer_utility.py | 86 ------ .../october_2013/repost_ordered_qty.py | 6 - .../october_2013/repost_planned_qty.py | 11 - .../set_stock_value_diff_in_sle.py | 10 - erpnext/patches/patch_list.py | 276 ------------------ erpnext/patches/september_2012/__init__.py | 1 - .../add_stock_ledger_entry_index.py | 15 - .../september_2012/all_permissions_patch.py | 27 -- .../communication_delete_permission.py | 25 -- .../customer_permission_patch.py | 32 -- .../deprecate_account_balance.py | 12 - .../september_2012/event_permission.py | 19 -- erpnext/patches/september_2012/plot_patch.py | 49 ---- .../profile_delete_permission.py | 8 - .../patches/september_2012/rebuild_trees.py | 13 - .../patches/september_2012/repost_stock.py | 18 -- .../stock_report_permissions_for_accounts.py | 21 -- erpnext/patches/september_2013/__init__.py | 1 - .../p01_add_user_defaults_from_pos_setting.py | 13 - .../p01_fix_buying_amount_gl_entries.py | 66 ----- .../p01_update_communication.py | 21 -- .../p02_fix_serial_no_status.py | 30 -- ...modify_item_price_include_in_price_list.py | 20 -- .../p03_move_website_to_framework.py | 17 -- .../p03_update_stock_uom_in_sle.py | 9 - .../september_2013/p04_unsubmit_serial_nos.py | 7 - .../september_2013/p05_fix_customer_in_pos.py | 22 -- .../doctype/activity_type/activity_type.py | 2 +- erpnext/projects/doctype/project/project.js | 12 +- erpnext/projects/doctype/project/project.py | 14 +- .../project_milestone/project_milestone.py | 2 +- erpnext/projects/doctype/task/task.js | 6 +- erpnext/projects/doctype/task/task.py | 28 +- .../projects/doctype/task/task_calendar.js | 6 +- .../doctype/time_log/test_time_log.py | 4 +- erpnext/projects/doctype/time_log/time_log.js | 4 +- erpnext/projects/doctype/time_log/time_log.py | 24 +- .../doctype/time_log/time_log_calendar.js | 2 +- .../doctype/time_log/time_log_list.js | 18 +- .../time_log_batch/test_time_log_batch.py | 12 +- .../doctype/time_log_batch/time_log_batch.js | 14 +- .../doctype/time_log_batch/time_log_batch.py | 10 +- .../time_log_batch_detail.py | 2 +- .../page/projects_home/projects_home.js | 42 +-- .../daily_time_log_summary.js | 10 +- .../daily_time_log_summary.py | 12 +- .../project_wise_stock_tracking.py | 12 +- erpnext/projects/utils.py | 12 +- erpnext/public/js/account_tree_grid.js | 48 +-- erpnext/public/js/conf.js | 24 +- erpnext/public/js/controllers/accounts.js | 6 +- .../public/js/controllers/stock_controller.js | 18 +- erpnext/public/js/feature_setup.js | 2 +- erpnext/public/js/purchase_trends_filters.js | 12 +- erpnext/public/js/queries.js | 16 +- erpnext/public/js/sales_trends_filters.js | 12 +- erpnext/public/js/startup.js | 18 +- erpnext/public/js/stock_analytics.js | 40 +-- erpnext/public/js/stock_grid_report.js | 6 +- erpnext/public/js/toolbar.js | 14 +- erpnext/public/js/transaction.js | 98 +++---- erpnext/public/js/utils.js | 24 +- erpnext/public/js/utils/party.js | 8 +- erpnext/public/js/website_utils.js | 6 +- .../Quotation Classic/Quotation Classic.txt | 2 +- .../Quotation Modern/Quotation Modern.txt | 2 +- .../Quotation Spartan/Quotation Spartan.txt | 2 +- .../Sales Order Classic.txt | 2 +- .../Sales Order Modern/Sales Order Modern.txt | 2 +- .../Sales Order Spartan.txt | 2 +- erpnext/selling/doctype/campaign/campaign.py | 2 +- erpnext/selling/doctype/customer/customer.js | 20 +- erpnext/selling/doctype/customer/customer.py | 74 ++--- .../selling/doctype/customer/test_customer.py | 12 +- .../customer_discount/customer_discount.py | 2 +- .../doctype/industry_type/industry_type.py | 2 +- .../installation_note/installation_note.js | 14 +- .../installation_note/installation_note.py | 32 +- .../installation_note_item.py | 2 +- erpnext/selling/doctype/lead/get_leads.py | 20 +- erpnext/selling/doctype/lead/lead.js | 30 +- erpnext/selling/doctype/lead/lead.py | 40 +-- erpnext/selling/doctype/lead/test_lead.py | 4 +- .../doctype/opportunity/opportunity.js | 38 +-- .../doctype/opportunity/opportunity.py | 40 +-- .../opportunity_item/opportunity_item.py | 2 +- .../selling/doctype/quotation/quotation.js | 32 +- .../selling/doctype/quotation/quotation.py | 46 +-- .../doctype/quotation/test_quotation.py | 10 +- .../doctype/quotation_item/quotation_item.py | 2 +- .../selling/doctype/sales_bom/sales_bom.js | 6 +- .../selling/doctype/sales_bom/sales_bom.py | 10 +- .../doctype/sales_bom_item/sales_bom_item.py | 2 +- .../doctype/sales_order/sales_order.js | 52 ++-- .../doctype/sales_order/sales_order.py | 74 ++--- .../doctype/sales_order/test_sales_order.py | 68 ++--- .../sales_order_item/sales_order_item.py | 2 +- .../selling/doctype/sales_team/sales_team.py | 2 +- .../selling_settings/selling_settings.py | 4 +- .../selling/doctype/sms_center/sms_center.py | 20 +- .../page/sales_analytics/sales_analytics.js | 48 +-- .../page/sales_browser/sales_browser.js | 48 +-- .../page/sales_browser/sales_browser.py | 32 +- .../selling/page/sales_funnel/sales_funnel.js | 16 +- .../selling/page/sales_funnel/sales_funnel.py | 14 +- .../selling/page/selling_home/selling_home.js | 134 ++++----- .../available_stock_for_packing_items.py | 10 +- .../customer_acquisition_and_loyalty.js | 14 +- .../customer_acquisition_and_loyalty.py | 6 +- .../customers_not_buying_since_long_time.js | 4 +- .../customers_not_buying_since_long_time.py | 10 +- .../quotation_trends/quotation_trends.js | 4 +- .../quotation_trends/quotation_trends.py | 2 +- .../sales_order_trends/sales_order_trends.js | 4 +- .../sales_order_trends/sales_order_trends.py | 2 +- ..._person_target_variance_item_group_wise.js | 8 +- ..._person_target_variance_item_group_wise.py | 18 +- .../sales_person_wise_transaction_summary.js | 24 +- .../sales_person_wise_transaction_summary.py | 8 +- ...rritory_target_variance_item_group_wise.js | 8 +- ...rritory_target_variance_item_group_wise.py | 16 +- erpnext/selling/sales_common.js | 74 ++--- .../applicable_territory.py | 2 +- .../authorization_control.py | 44 +-- .../authorization_rule/authorization_rule.js | 4 +- .../authorization_rule/authorization_rule.py | 18 +- .../doctype/backup_manager/backup_dropbox.py | 56 ++-- .../backup_manager/backup_googledrive.py | 52 ++-- .../doctype/backup_manager/backup_manager.js | 20 +- .../doctype/backup_manager/backup_manager.py | 28 +- erpnext/setup/doctype/brand/brand.py | 2 +- .../company/charts/import_from_openerp.py | 4 +- erpnext/setup/doctype/company/company.js | 14 +- erpnext/setup/doctype/company/company.py | 84 +++--- .../contact_control/contact_control.js | 14 +- .../contact_control/contact_control.py | 2 +- erpnext/setup/doctype/country/country.py | 2 +- erpnext/setup/doctype/currency/currency.js | 2 +- erpnext/setup/doctype/currency/currency.py | 6 +- .../currency_exchange/currency_exchange.js | 4 +- .../currency_exchange/currency_exchange.py | 6 +- .../doctype/customer_group/customer_group.js | 2 +- .../doctype/customer_group/customer_group.py | 16 +- .../doctype/email_digest/email_digest.js | 20 +- .../doctype/email_digest/email_digest.py | 56 ++-- .../doctype/email_settings/email_settings.py | 18 +- .../doctype/features_setup/features_setup.py | 4 +- .../global_defaults/global_defaults.js | 4 +- .../global_defaults/global_defaults.py | 24 +- .../setup/doctype/item_group/item_group.js | 6 +- .../setup/doctype/item_group/item_group.py | 8 +- .../doctype/item_group/test_item_group.py | 64 ++-- .../jobs_email_settings.js | 4 +- .../jobs_email_settings.py | 8 +- .../doctype/naming_series/naming_series.py | 46 +-- .../notification_control.py | 8 +- .../doctype/print_heading/print_heading.py | 6 +- .../quotation_lost_reason.py | 2 +- .../sales_email_settings.js | 4 +- .../sales_email_settings.py | 8 +- .../doctype/sales_partner/sales_partner.js | 16 +- .../doctype/sales_partner/sales_partner.py | 6 +- .../doctype/sales_person/sales_person.js | 2 +- .../doctype/sales_person/sales_person.py | 16 +- .../doctype/sms_parameter/sms_parameter.py | 2 +- .../doctype/sms_settings/sms_settings.py | 2 +- .../doctype/supplier_type/supplier_type.js | 2 +- .../doctype/supplier_type/supplier_type.py | 2 +- .../doctype/target_detail/target_detail.py | 2 +- .../terms_and_conditions.py | 2 +- erpnext/setup/doctype/territory/territory.js | 2 +- erpnext/setup/doctype/territory/territory.py | 8 +- erpnext/setup/doctype/uom/uom.py | 2 +- .../website_item_group/website_item_group.py | 2 +- erpnext/setup/install.py | 22 +- .../setup/page/setup_wizard/setup_wizard.js | 128 ++++---- .../setup/page/setup_wizard/setup_wizard.py | 114 ++++---- .../page/setup_wizard/test_setup_wizard.py | 6 +- erpnext/setup/utils.py | 18 +- erpnext/startup/__init__.py | 6 +- erpnext/startup/boot.py | 34 +-- erpnext/startup/event_handlers.py | 12 +- erpnext/startup/notifications.py | 2 +- erpnext/startup/webutils.py | 2 +- .../Delivery Note Classic.txt | 2 +- .../Delivery Note Modern.txt | 2 +- .../Delivery Note Spartan.txt | 2 +- erpnext/stock/doctype/batch/batch.py | 2 +- erpnext/stock/doctype/bin/bin.py | 12 +- .../doctype/delivery_note/delivery_note.js | 30 +- .../doctype/delivery_note/delivery_note.py | 62 ++-- .../delivery_note/test_delivery_note.py | 60 ++-- .../delivery_note_item/delivery_note_item.py | 2 +- erpnext/stock/doctype/item/item.js | 18 +- erpnext/stock/doctype/item/item.py | 106 +++---- erpnext/stock/doctype/item/test_item.py | 6 +- .../item_customer_detail.py | 2 +- .../stock/doctype/item_price/item_price.py | 16 +- .../doctype/item_price/test_item_price.py | 4 +- .../item_quality_inspection_parameter.py | 2 +- .../doctype/item_reorder/item_reorder.py | 2 +- .../doctype/item_supplier/item_supplier.py | 2 +- erpnext/stock/doctype/item_tax/item_tax.py | 2 +- .../item_website_specification.py | 2 +- .../landed_cost_item/landed_cost_item.py | 2 +- .../landed_cost_purchase_receipt.py | 2 +- .../landed_cost_wizard/landed_cost_wizard.js | 10 +- .../landed_cost_wizard/landed_cost_wizard.py | 28 +- .../material_request/material_request.js | 54 ++-- .../material_request/material_request.py | 74 ++--- .../material_request/test_material_request.py | 78 ++--- .../material_request_item.py | 2 +- .../stock/doctype/packed_item/packed_item.py | 18 +- .../doctype/packing_slip/packing_slip.js | 16 +- .../doctype/packing_slip/packing_slip.py | 30 +- .../packing_slip_item/packing_slip_item.py | 2 +- .../stock/doctype/price_list/price_list.js | 4 +- .../stock/doctype/price_list/price_list.py | 24 +- .../doctype/price_list/test_price_list.py | 2 +- .../purchase_receipt/purchase_receipt.js | 42 +-- .../purchase_receipt/purchase_receipt.py | 50 ++-- .../purchase_receipt/test_purchase_receipt.py | 46 +-- .../purchase_receipt_item.py | 2 +- erpnext/stock/doctype/serial_no/serial_no.py | 84 +++--- .../stock/doctype/serial_no/test_serial_no.py | 4 +- .../stock/doctype/stock_entry/stock_entry.js | 38 +-- .../stock/doctype/stock_entry/stock_entry.py | 124 ++++---- .../doctype/stock_entry/test_stock_entry.py | 210 ++++++------- .../stock_entry_detail/stock_entry_detail.py | 2 +- .../doctype/stock_ledger/stock_ledger.py | 20 +- .../stock_ledger_entry/stock_ledger_entry.py | 44 +-- .../stock_reconciliation.js | 42 +-- .../stock_reconciliation.py | 36 +-- .../test_stock_reconciliation.py | 50 ++-- .../doctype/stock_settings/stock_settings.py | 8 +- .../stock_uom_replace_utility.py | 40 +-- .../uom_conversion_detail.py | 2 +- erpnext/stock/doctype/warehouse/warehouse.py | 60 ++-- .../doctype/warehouse_user/warehouse_user.py | 2 +- erpnext/stock/get_item_details.py | 62 ++-- .../stock/page/stock_ageing/stock_ageing.js | 40 +-- .../page/stock_analytics/stock_analytics.js | 8 +- .../stock/page/stock_balance/stock_balance.js | 56 ++-- erpnext/stock/page/stock_home/stock_home.js | 138 ++++----- .../stock/page/stock_ledger/stock_ledger.js | 54 ++-- erpnext/stock/page/stock_level/stock_level.js | 66 ++--- .../batch_wise_balance_history.js | 8 +- .../batch_wise_balance_history.py | 14 +- .../delivery_note_trends.js | 4 +- .../delivery_note_trends.py | 2 +- .../stock/report/item_prices/item_prices.py | 14 +- .../itemwise_recommended_reorder_level.js | 6 +- .../itemwise_recommended_reorder_level.py | 18 +- .../purchase_receipt_trends.js | 4 +- .../purchase_receipt_trends.py | 2 +- .../stock/report/stock_ageing/stock_ageing.js | 16 +- .../stock/report/stock_ageing/stock_ageing.py | 6 +- .../stock/report/stock_ledger/stock_ledger.js | 24 +- .../stock/report/stock_ledger/stock_ledger.py | 6 +- .../stock_projected_qty.js | 10 +- .../stock_projected_qty.py | 4 +- .../supplier_wise_sales_analytics.js | 12 +- .../supplier_wise_sales_analytics.py | 10 +- .../warehouse_wise_stock_balance.js | 8 +- .../warehouse_wise_stock_balance.py | 14 +- erpnext/stock/stock_ledger.py | 44 +-- erpnext/stock/utils.py | 80 ++--- .../doctype/customer_issue/customer_issue.js | 14 +- .../doctype/customer_issue/customer_issue.py | 20 +- .../maintenance_schedule.js | 24 +- .../maintenance_schedule.py | 44 +-- .../maintenance_schedule_detail.py | 2 +- .../maintenance_schedule_item.py | 2 +- .../maintenance_visit/maintenance_visit.js | 22 +- .../maintenance_visit/maintenance_visit.py | 22 +- .../maintenance_visit_purpose.py | 2 +- .../support/doctype/newsletter/newsletter.js | 10 +- .../support/doctype/newsletter/newsletter.py | 48 +-- .../doctype/newsletter/test_newsletter.py | 18 +- .../support_ticket/get_support_mails.py | 22 +- .../doctype/support_ticket/support_ticket.js | 12 +- .../doctype/support_ticket/support_ticket.py | 26 +- .../support_analytics/support_analytics.js | 30 +- .../support/page/support_home/support_home.js | 52 ++-- .../templates/includes/footer_extension.html | 2 +- erpnext/templates/utils.py | 6 +- erpnext/utilities/__init__.py | 6 +- erpnext/utilities/cleanup_data.py | 36 +-- erpnext/utilities/doctype/address/address.py | 16 +- erpnext/utilities/doctype/contact/contact.js | 4 +- erpnext/utilities/doctype/contact/contact.py | 22 +- erpnext/utilities/doctype/note/note.py | 14 +- .../utilities/doctype/note_user/note_user.py | 2 +- .../doctype/rename_tool/rename_tool.js | 6 +- .../doctype/rename_tool/rename_tool.py | 28 +- .../doctype/sms_control/sms_control.js | 2 +- .../doctype/sms_control/sms_control.py | 20 +- erpnext/utilities/doctype/sms_log/sms_log.py | 2 +- erpnext/utilities/repost_stock.py | 24 +- erpnext/utilities/transaction_base.py | 40 +-- install_erpnext.py | 8 +- setup.py | 2 +- 729 files changed, 5194 insertions(+), 9971 deletions(-) delete mode 100644 erpnext/home/page/latest_updates/README.md delete mode 100644 erpnext/home/page/latest_updates/__init__.py delete mode 100644 erpnext/home/page/latest_updates/latest_updates.js delete mode 100644 erpnext/home/page/latest_updates/latest_updates.py delete mode 100644 erpnext/home/page/latest_updates/latest_updates.txt delete mode 100644 erpnext/patches/1311/__init__.py delete mode 100644 erpnext/patches/1311/p01_cleanup.py delete mode 100644 erpnext/patches/1311/p01_make_gl_entries_for_si.py delete mode 100644 erpnext/patches/1311/p02_index_singles.py delete mode 100644 erpnext/patches/1311/p03_update_reqd_report_fields.py delete mode 100644 erpnext/patches/1311/p04_update_comments.py delete mode 100644 erpnext/patches/1311/p04_update_year_end_date_of_fiscal_year.py delete mode 100644 erpnext/patches/1311/p05_website_brand_html.py delete mode 100644 erpnext/patches/1311/p06_fix_report_columns.py delete mode 100644 erpnext/patches/1311/p07_scheduler_errors_digest.py delete mode 100644 erpnext/patches/1311/p08_email_digest_recipients.py delete mode 100644 erpnext/patches/1312/__init__.py delete mode 100644 erpnext/patches/1312/p01_delete_old_stock_reports.py delete mode 100644 erpnext/patches/1312/p02_update_item_details_in_item_price.py delete mode 100644 erpnext/patches/1401/__init__.py delete mode 100644 erpnext/patches/1401/enable_all_price_list.py delete mode 100644 erpnext/patches/1401/fix_planned_qty.py delete mode 100644 erpnext/patches/1401/fix_serial_no_status_and_warehouse.py delete mode 100644 erpnext/patches/1401/p01_make_buying_selling_as_check_box_in_price_list.py delete mode 100644 erpnext/patches/1401/p01_move_related_property_setters_to_custom_field.py delete mode 100644 erpnext/patches/1401/update_billing_status_for_zero_value_order.py delete mode 100644 erpnext/patches/april_2013/__init__.py delete mode 100644 erpnext/patches/april_2013/p01_update_serial_no_valuation_rate.py delete mode 100644 erpnext/patches/april_2013/p02_add_country_and_currency.py delete mode 100644 erpnext/patches/april_2013/p03_fixes_for_lead_in_quotation.py delete mode 100644 erpnext/patches/april_2013/p04_reverse_modules_list.py delete mode 100644 erpnext/patches/april_2013/p04_update_role_in_pages.py delete mode 100644 erpnext/patches/april_2013/p05_fixes_in_reverse_modules.py delete mode 100644 erpnext/patches/april_2013/p05_update_file_data.py delete mode 100644 erpnext/patches/april_2013/p06_default_cost_center.py delete mode 100644 erpnext/patches/april_2013/p06_update_file_size.py delete mode 100644 erpnext/patches/april_2013/p07_rename_cost_center_other_charges.py delete mode 100644 erpnext/patches/april_2013/p07_update_file_data_2.py delete mode 100644 erpnext/patches/april_2013/rebuild_sales_browser.py delete mode 100644 erpnext/patches/august_2013/__init__.py delete mode 100644 erpnext/patches/august_2013/fix_fiscal_year.py delete mode 100644 erpnext/patches/august_2013/p01_auto_accounting_for_stock_patch.py delete mode 100644 erpnext/patches/august_2013/p01_hr_settings.py delete mode 100644 erpnext/patches/august_2013/p02_rename_price_list.py delete mode 100644 erpnext/patches/august_2013/p03_pos_setting_replace_customer_account.py delete mode 100644 erpnext/patches/august_2013/p05_employee_birthdays.py delete mode 100644 erpnext/patches/august_2013/p05_update_serial_no_status.py delete mode 100644 erpnext/patches/august_2013/p06_deprecate_is_cancelled.py delete mode 100644 erpnext/patches/august_2013/p06_fix_sle_against_stock_entry.py delete mode 100644 erpnext/patches/december_2012/__init__.py delete mode 100644 erpnext/patches/december_2012/address_title.py delete mode 100644 erpnext/patches/december_2012/delete_form16_print_format.py delete mode 100644 erpnext/patches/december_2012/deleted_contact_address_patch.py delete mode 100644 erpnext/patches/december_2012/deprecate_tds.py delete mode 100644 erpnext/patches/december_2012/expense_leave_reload.py delete mode 100644 erpnext/patches/december_2012/file_list_rename.py delete mode 100644 erpnext/patches/december_2012/fix_default_print_format.py delete mode 100644 erpnext/patches/december_2012/move_recent_to_memcache.py delete mode 100644 erpnext/patches/december_2012/production_cleanup.py delete mode 100644 erpnext/patches/december_2012/production_order_naming_series.py delete mode 100644 erpnext/patches/december_2012/rebuild_item_group_tree.py delete mode 100644 erpnext/patches/december_2012/remove_quotation_next_contact.py delete mode 100644 erpnext/patches/december_2012/replace_createlocal.py delete mode 100644 erpnext/patches/december_2012/repost_ordered_qty.py delete mode 100644 erpnext/patches/december_2012/repost_projected_qty.py delete mode 100644 erpnext/patches/december_2012/stock_entry_cleanup.py delete mode 100644 erpnext/patches/december_2012/update_print_width.py delete mode 100644 erpnext/patches/december_2012/website_cache_refactor.py delete mode 100644 erpnext/patches/february_2013/__init__.py delete mode 100644 erpnext/patches/february_2013/account_negative_balance.py delete mode 100644 erpnext/patches/february_2013/fix_outstanding.py delete mode 100644 erpnext/patches/february_2013/gle_floating_point_issue_revisited.py delete mode 100644 erpnext/patches/february_2013/p01_event.py delete mode 100644 erpnext/patches/february_2013/p02_email_digest.py delete mode 100644 erpnext/patches/february_2013/p03_material_request.py delete mode 100644 erpnext/patches/february_2013/p04_remove_old_doctypes.py delete mode 100644 erpnext/patches/february_2013/p05_leave_application.py delete mode 100644 erpnext/patches/february_2013/p08_todo_query_report.py delete mode 100644 erpnext/patches/february_2013/p09_remove_cancelled_warehouses.py delete mode 100644 erpnext/patches/february_2013/p09_timesheets.py delete mode 100644 erpnext/patches/february_2013/payment_reconciliation_reset_values.py delete mode 100644 erpnext/patches/february_2013/reload_bom_replace_tool_permission.py delete mode 100644 erpnext/patches/february_2013/remove_account_utils_folder.py delete mode 100644 erpnext/patches/february_2013/remove_gl_mapper.py delete mode 100644 erpnext/patches/february_2013/repost_reserved_qty.py delete mode 100644 erpnext/patches/february_2013/update_company_in_leave_application.py delete mode 100644 erpnext/patches/january_2013/__init__.py delete mode 100644 erpnext/patches/january_2013/change_patch_structure.py delete mode 100644 erpnext/patches/january_2013/enable_currencies.py delete mode 100644 erpnext/patches/january_2013/file_list_rename_returns.py delete mode 100644 erpnext/patches/january_2013/give_report_permission_on_read.py delete mode 100644 erpnext/patches/january_2013/holiday_list_patch.py delete mode 100644 erpnext/patches/january_2013/rebuild_tree.py delete mode 100644 erpnext/patches/january_2013/reload_print_format.py delete mode 100644 erpnext/patches/january_2013/remove_bad_permissions.py delete mode 100644 erpnext/patches/january_2013/remove_landed_cost_master.py delete mode 100644 erpnext/patches/january_2013/remove_tds_entry_from_gl_mapper.py delete mode 100644 erpnext/patches/january_2013/remove_unwanted_permission.py delete mode 100644 erpnext/patches/january_2013/report_permission.py delete mode 100644 erpnext/patches/january_2013/stock_reconciliation_patch.py delete mode 100644 erpnext/patches/january_2013/tabsessions_to_myisam.py delete mode 100644 erpnext/patches/january_2013/update_closed_on.py delete mode 100644 erpnext/patches/january_2013/update_country_info.py delete mode 100644 erpnext/patches/january_2013/update_fraction_for_usd.py delete mode 100644 erpnext/patches/january_2013/update_number_format.py delete mode 100644 erpnext/patches/july_2013/__init__.py delete mode 100644 erpnext/patches/july_2013/p01_remove_doctype_mappers.py delete mode 100644 erpnext/patches/july_2013/p01_same_sales_rate_patch.py delete mode 100644 erpnext/patches/july_2013/p02_copy_shipping_address.py delete mode 100644 erpnext/patches/july_2013/p03_cost_center_company.py delete mode 100644 erpnext/patches/july_2013/p04_merge_duplicate_leads.py delete mode 100644 erpnext/patches/july_2013/p05_custom_doctypes_in_list_view.py delete mode 100644 erpnext/patches/july_2013/p06_same_sales_rate.py delete mode 100644 erpnext/patches/july_2013/p07_repost_billed_amt_in_sales_cycle.py delete mode 100644 erpnext/patches/july_2013/p08_custom_print_format_net_total_export.py delete mode 100644 erpnext/patches/july_2013/p09_remove_website_pyc.py delete mode 100644 erpnext/patches/july_2013/p10_change_partner_user_to_website_user.py delete mode 100644 erpnext/patches/july_2013/p11_update_price_list_currency.py delete mode 100644 erpnext/patches/july_2013/restore_tree_roots.py delete mode 100644 erpnext/patches/june_2013/__init__.py delete mode 100644 erpnext/patches/june_2013/p01_update_bom_exploded_items.py delete mode 100644 erpnext/patches/june_2013/p02_update_project_completed.py delete mode 100644 erpnext/patches/june_2013/p03_buying_selling_for_price_list.py delete mode 100644 erpnext/patches/june_2013/p04_fix_event_for_lead_oppty_project.py delete mode 100644 erpnext/patches/june_2013/p05_remove_search_criteria_reports.py delete mode 100644 erpnext/patches/june_2013/p05_remove_unused_doctypes.py delete mode 100644 erpnext/patches/june_2013/p06_drop_unused_tables.py delete mode 100644 erpnext/patches/june_2013/p07_taxes_price_list_for_territory.py delete mode 100644 erpnext/patches/june_2013/p09_update_global_defaults.py delete mode 100644 erpnext/patches/june_2013/p10_lead_address.py delete mode 100644 erpnext/patches/march_2013/__init__.py delete mode 100644 erpnext/patches/march_2013/p01_c_form.py delete mode 100644 erpnext/patches/march_2013/p02_get_global_default.py delete mode 100644 erpnext/patches/march_2013/p03_rename_blog_to_blog_post.py delete mode 100644 erpnext/patches/march_2013/p04_pos_update_stock_check.py delete mode 100644 erpnext/patches/march_2013/p05_payment_reconciliation.py delete mode 100644 erpnext/patches/march_2013/p06_remove_sales_purchase_return_tool.py delete mode 100644 erpnext/patches/march_2013/p07_update_project_in_stock_ledger.py delete mode 100644 erpnext/patches/march_2013/p07_update_valuation_rate.py delete mode 100644 erpnext/patches/march_2013/p08_create_aii_accounts.py delete mode 100644 erpnext/patches/march_2013/p10_set_fiscal_year_for_stock.py delete mode 100644 erpnext/patches/march_2013/p10_update_against_expense_account.py delete mode 100644 erpnext/patches/march_2013/p11_update_attach_files.py delete mode 100644 erpnext/patches/march_2013/p12_set_item_tax_rate_in_json.py delete mode 100644 erpnext/patches/march_2013/update_po_prevdoc_doctype.py delete mode 100644 erpnext/patches/may_2013/__init__.py delete mode 100644 erpnext/patches/may_2013/p01_selling_net_total_export.py delete mode 100644 erpnext/patches/may_2013/p02_update_valuation_rate.py delete mode 100644 erpnext/patches/may_2013/p03_update_support_ticket.py delete mode 100644 erpnext/patches/may_2013/p04_reorder_level.py delete mode 100644 erpnext/patches/may_2013/p05_update_cancelled_gl_entries.py delete mode 100644 erpnext/patches/may_2013/p06_make_notes.py delete mode 100644 erpnext/patches/may_2013/p06_update_billed_amt_po_pr.py delete mode 100644 erpnext/patches/may_2013/p07_move_update_stock_to_pos.py delete mode 100644 erpnext/patches/may_2013/p08_change_item_wise_tax.py delete mode 100644 erpnext/patches/may_2013/repost_stock_for_no_posting_time.py delete mode 100644 erpnext/patches/november_2012/__init__.py delete mode 100644 erpnext/patches/november_2012/add_employee_field_in_employee.py delete mode 100644 erpnext/patches/november_2012/add_theme_to_profile.py delete mode 100644 erpnext/patches/november_2012/cancelled_bom_patch.py delete mode 100644 erpnext/patches/november_2012/communication_sender_and_recipient.py delete mode 100644 erpnext/patches/november_2012/custom_field_insert_after.py delete mode 100644 erpnext/patches/november_2012/customer_issue_allocated_to_assigned.py delete mode 100644 erpnext/patches/november_2012/disable_cancelled_profiles.py delete mode 100644 erpnext/patches/november_2012/gle_floating_point_issue.py delete mode 100644 erpnext/patches/november_2012/leave_application_cleanup.py delete mode 100644 erpnext/patches/november_2012/production_order_patch.py delete mode 100644 erpnext/patches/november_2012/report_permissions.py delete mode 100644 erpnext/patches/november_2012/reset_appraisal_permissions.py delete mode 100644 erpnext/patches/november_2012/support_ticket_response_to_communication.py delete mode 100644 erpnext/patches/november_2012/update_delivered_billed_percentage_for_pos.py delete mode 100644 erpnext/patches/october_2012/__init__.py delete mode 100644 erpnext/patches/october_2012/company_fiscal_year_docstatus_patch.py delete mode 100644 erpnext/patches/october_2012/custom_script_delete_permission.py delete mode 100644 erpnext/patches/october_2012/fix_cancelled_gl_entries.py delete mode 100644 erpnext/patches/october_2012/fix_wrong_vouchers.py delete mode 100644 erpnext/patches/october_2012/update_account_property.py delete mode 100644 erpnext/patches/october_2012/update_permission.py delete mode 100644 erpnext/patches/october_2013/__init__.py delete mode 100644 erpnext/patches/october_2013/fix_is_cancelled_in_sle.py delete mode 100644 erpnext/patches/october_2013/p01_fix_serial_no_status.py delete mode 100644 erpnext/patches/october_2013/p01_update_delivery_note_prevdocs.py delete mode 100644 erpnext/patches/october_2013/p02_set_communication_status.py delete mode 100644 erpnext/patches/october_2013/p02_update_price_list_and_item_details_in_item_price.py delete mode 100644 erpnext/patches/october_2013/p03_crm_update_status.py delete mode 100644 erpnext/patches/october_2013/p03_remove_sales_and_purchase_return_tool.py delete mode 100644 erpnext/patches/october_2013/p04_update_report_permission.py delete mode 100644 erpnext/patches/october_2013/p04_wsgi_migration.py delete mode 100644 erpnext/patches/october_2013/p05_delete_gl_entries_for_cancelled_vouchers.py delete mode 100644 erpnext/patches/october_2013/p05_server_custom_script_to_file.py delete mode 100644 erpnext/patches/october_2013/p06_rename_packing_list_doctype.py delete mode 100644 erpnext/patches/october_2013/p06_update_control_panel_and_global_defaults.py delete mode 100644 erpnext/patches/october_2013/p07_rename_for_territory.py delete mode 100644 erpnext/patches/october_2013/p08_cleanup_after_item_price_module_change.py delete mode 100644 erpnext/patches/october_2013/p09_update_naming_series_settings.py delete mode 100644 erpnext/patches/october_2013/p10_plugins_refactor.py delete mode 100644 erpnext/patches/october_2013/perpetual_inventory_stock_transfer_utility.py delete mode 100644 erpnext/patches/october_2013/repost_ordered_qty.py delete mode 100644 erpnext/patches/october_2013/repost_planned_qty.py delete mode 100644 erpnext/patches/october_2013/set_stock_value_diff_in_sle.py delete mode 100644 erpnext/patches/patch_list.py delete mode 100644 erpnext/patches/september_2012/__init__.py delete mode 100644 erpnext/patches/september_2012/add_stock_ledger_entry_index.py delete mode 100644 erpnext/patches/september_2012/all_permissions_patch.py delete mode 100644 erpnext/patches/september_2012/communication_delete_permission.py delete mode 100644 erpnext/patches/september_2012/customer_permission_patch.py delete mode 100644 erpnext/patches/september_2012/deprecate_account_balance.py delete mode 100644 erpnext/patches/september_2012/event_permission.py delete mode 100644 erpnext/patches/september_2012/plot_patch.py delete mode 100644 erpnext/patches/september_2012/profile_delete_permission.py delete mode 100644 erpnext/patches/september_2012/rebuild_trees.py delete mode 100644 erpnext/patches/september_2012/repost_stock.py delete mode 100644 erpnext/patches/september_2012/stock_report_permissions_for_accounts.py delete mode 100644 erpnext/patches/september_2013/__init__.py delete mode 100644 erpnext/patches/september_2013/p01_add_user_defaults_from_pos_setting.py delete mode 100644 erpnext/patches/september_2013/p01_fix_buying_amount_gl_entries.py delete mode 100644 erpnext/patches/september_2013/p01_update_communication.py delete mode 100644 erpnext/patches/september_2013/p02_fix_serial_no_status.py delete mode 100644 erpnext/patches/september_2013/p03_modify_item_price_include_in_price_list.py delete mode 100644 erpnext/patches/september_2013/p03_move_website_to_framework.py delete mode 100644 erpnext/patches/september_2013/p03_update_stock_uom_in_sle.py delete mode 100644 erpnext/patches/september_2013/p04_unsubmit_serial_nos.py delete mode 100644 erpnext/patches/september_2013/p05_fix_customer_in_pos.py diff --git a/README.md b/README.md index 2b7119cfd96..749ddd82f16 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Includes Accounting, Inventory, CRM, Sales, Purchase, Projects, HRMS. Built on Python / MySQL. -ERPNext is built on [wnframework](https://github.com/webnotes/wnframework) +ERPNext is built on [frappe](https://github.com/frappe/frappe) - [User Guide](http://erpnext.org/user-guide.html) - [Getting Help](http://erpnext.org/getting-help.html) @@ -24,10 +24,10 @@ ERPNext is built on [wnframework](https://github.com/webnotes/wnframework) 1. Switch to root user using `sudo su` 1. create a folder where you want to install erpnext 1. go to the new folder -1. `wget https://raw.github.com/webnotes/erpnext/master/install_erpnext.py` +1. `wget https://raw.github.com/frappe/erpnext/master/install_erpnext.py` 1. `python install_erpnext.py` -[See installation notes](https://github.com/webnotes/erpnext/wiki/How-to-Install-ERPNext) +[See installation notes](https://github.com/frappe/erpnext/wiki/How-to-Install-ERPNext) ##### Patch and update diff --git a/erpnext/accounts/Print Format/POS Invoice/POS Invoice.txt b/erpnext/accounts/Print Format/POS Invoice/POS Invoice.txt index 761be67b0ca..4f20ac245b2 100644 --- a/erpnext/accounts/Print Format/POS Invoice/POS Invoice.txt +++ b/erpnext/accounts/Print Format/POS Invoice/POS Invoice.txt @@ -9,7 +9,7 @@ { "doc_type": "Sales Invoice", "doctype": "Print Format", - "html": "\n\t\n\n\t\t\n\t\t\n\n\t\t\n\t\t\n\t\n\n\t\n\t\t\n\t\t
\n\t\t
\n\t\t
\n\t\t
\n\t\t
\n\t\n", + "html": "\n\t\n\n\t\t\n\t\t\n\n\t\t\n\t\t\n\t\n\n\t\n\t\t\n\t\t
\n\t\t
\n\t\t
\n\t\t
\n\t\t
\n\t\n", "module": "Accounts", "name": "__common__", "print_format_type": "Client", diff --git a/erpnext/accounts/Print Format/Sales Invoice Classic/Sales Invoice Classic.txt b/erpnext/accounts/Print Format/Sales Invoice Classic/Sales Invoice Classic.txt index 3dcf7f27e14..5bf9bf32031 100644 --- a/erpnext/accounts/Print Format/Sales Invoice Classic/Sales Invoice Classic.txt +++ b/erpnext/accounts/Print Format/Sales Invoice Classic/Sales Invoice Classic.txt @@ -9,7 +9,7 @@ { "doc_type": "Sales Invoice", "doctype": "Print Format", - "html": "\n\n\n\n\n\n\n\n\n\n\n
\n\t\n\t\n\t\t\n\t\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\n\t\t\n\t

\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t
Name
Address
Contact
\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n \n \t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\t\n\t\t\t\t
Invoice Date
Due Date
\n
\n
\n\t\n\t\n
\n
\n\t\n\t\n\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\n\t\t\n\t\t\n\t\t\n\t
\n\t\t\t\t\tTerms, Conditions & Other Information:
\n\t\t\t\t\t\n\t\t\t\t		\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t
Net Total
Grand Total
Rounded Total
\n\t\t\t\t\t
In Words
\n\t\t\t\t\t\n\t\t\t\t
\n
", + "html": "\n\n\n\n\n\n\n\n\n\n\n
\n\t\n\t\n\t\t\n\t\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\n\t\t\n\t

\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t
Name
Address
Contact
\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n \n \t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\t\n\t\t\t\t
Invoice Date
Due Date
\n
\n
\n\t\n\t\n
\n
\n\t\n\t\n\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\n\t\t\n\t\t\n\t\t\n\t
\n\t\t\t\t\tTerms, Conditions & Other Information:
\n\t\t\t\t\t\n\t\t\t\t		\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t
Net Total
Grand Total
Rounded Total
\n\t\t\t\t\t
In Words
\n\t\t\t\t\t\n\t\t\t\t
\n
", "module": "Accounts", "name": "__common__", "print_format_type": "Client", diff --git a/erpnext/accounts/Print Format/Sales Invoice Modern/Sales Invoice Modern.txt b/erpnext/accounts/Print Format/Sales Invoice Modern/Sales Invoice Modern.txt index 4194acffc95..f36f4a588fc 100644 --- a/erpnext/accounts/Print Format/Sales Invoice Modern/Sales Invoice Modern.txt +++ b/erpnext/accounts/Print Format/Sales Invoice Modern/Sales Invoice Modern.txt @@ -9,7 +9,7 @@ { "doc_type": "Sales Invoice", "doctype": "Print Format", - "html": "\n\n\n\n\n\n\n\n\n\n\n
\n\t\n\t\n\t\t\n\t\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\n\t\t\n\t
\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t
Name
Address
Contact
\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n \n \t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\t\n\t\t\t\t
Invoice No.
Invoice Date
Due Date
\n
\n
\n\t\n\t\n
\n
\n\t\n\t\n\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\n\t
\n\t\t\t\t\tTerms, Conditions & Other Information:
\n\t\t\t\t\t\n\t\t\t\t		\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t
Net Total
Grand Total
Rounded Total
\n\t\t\t\t\t
In Words
\n\t\t\t\t\t\n\t\t\t\t
\n
", + "html": "\n\n\n\n\n\n\n\n\n\n\n
\n\t\n\t\n\t\t\n\t\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\n\t\t\n\t
\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t
Name
Address
Contact
\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n \n \t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\t\n\t\t\t\t
Invoice No.
Invoice Date
Due Date
\n
\n
\n\t\n\t\n
\n
\n\t\n\t\n\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\n\t
\n\t\t\t\t\tTerms, Conditions & Other Information:
\n\t\t\t\t\t\n\t\t\t\t		\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t
Net Total
Grand Total
Rounded Total
\n\t\t\t\t\t
In Words
\n\t\t\t\t\t\n\t\t\t\t
\n
", "module": "Accounts", "name": "__common__", "print_format_type": "Client", diff --git a/erpnext/accounts/Print Format/Sales Invoice Spartan/Sales Invoice Spartan.txt b/erpnext/accounts/Print Format/Sales Invoice Spartan/Sales Invoice Spartan.txt index 56a49012b71..e60f8a099b7 100644 --- a/erpnext/accounts/Print Format/Sales Invoice Spartan/Sales Invoice Spartan.txt +++ b/erpnext/accounts/Print Format/Sales Invoice Spartan/Sales Invoice Spartan.txt @@ -9,7 +9,7 @@ { "doc_type": "Sales Invoice", "doctype": "Print Format", - "html": "\n\n\n\n\n\n\n\n\n\n\n
\n\t\n\t\n\t\t\n\t\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\n\t\t\n\t

\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t
Name
Address
Contact
\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n \n \t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\t\n\t\t\t\t
Invoice Date
Due Date
\n
\n
\n\t\n\t\n
\n
\n\t\n\t\n\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\n\t\t\n\t\t\n\t\t\n\t
\n\t\t\t\t\tTerms, Conditions & Other Information:
\n\t\t\t\t\t\n\t\t\t\t		\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t
Net Total
Grand Total
Rounded Total
\n\t\t\t\t\t
In Words
\n\t\t\t\t\t\n\t\t\t\t
\n
", + "html": "\n\n\n\n\n\n\n\n\n\n\n
\n\t\n\t\n\t\t\n\t\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\n\t\t\n\t

\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t
Name
Address
Contact
\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n \n \t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\t\n\t\t\t\t
Invoice Date
Due Date
\n
\n
\n\t\n\t\n
\n
\n\t\n\t\n\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\n\t\t\n\t\t\n\t\t\n\t
\n\t\t\t\t\tTerms, Conditions & Other Information:
\n\t\t\t\t\t\n\t\t\t\t		\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t
Net Total
Grand Total
Rounded Total
\n\t\t\t\t\t
In Words
\n\t\t\t\t\t\n\t\t\t\t
\n
", "module": "Accounts", "name": "__common__", "print_format_type": "Client", diff --git a/erpnext/accounts/Print Format/SalesInvoice/SalesInvoice.html b/erpnext/accounts/Print Format/SalesInvoice/SalesInvoice.html index 9375b041a68..874d84ceb7c 100644 --- a/erpnext/accounts/Print Format/SalesInvoice/SalesInvoice.html +++ b/erpnext/accounts/Print Format/SalesInvoice/SalesInvoice.html @@ -1,5 +1,5 @@ {%- if doc.letter_head -%} - {{ webnotes.conn.get_value("Letter Head", doc.letter_head, "content") }} + {{ frappe.conn.get_value("Letter Head", doc.letter_head, "content") }} {%- endif -%}
diff --git a/erpnext/accounts/doctype/account/account.js b/erpnext/accounts/doctype/account/account.js index 407b2d452dc..f4ec79b2c57 100644 --- a/erpnext/accounts/doctype/account/account.js +++ b/erpnext/accounts/doctype/account/account.js @@ -11,7 +11,7 @@ cur_frm.cscript.onload = function(doc, cdt, cdn) { // ----------------------------------------- cur_frm.cscript.refresh = function(doc, cdt, cdn) { if(doc.__islocal) { - msgprint(wn._("Please create new account from Chart of Accounts.")); + msgprint(frappe._("Please create new account from Chart of Accounts.")); throw "cannot create"; } @@ -26,8 +26,8 @@ cur_frm.cscript.refresh = function(doc, cdt, cdn) { 'is_pl_account', 'company'], false); if(doc.group_or_ledger=='Ledger') { - wn.model.with_doc("Accounts Settings", "Accounts Settings", function (name) { - var accounts_settings = wn.model.get_doc("Accounts Settings", name); + frappe.model.with_doc("Accounts Settings", "Accounts Settings", function (name) { + var accounts_settings = frappe.model.get_doc("Accounts Settings", name); var display = accounts_settings["frozen_accounts_modifier"] && in_list(user_roles, accounts_settings["frozen_accounts_modifier"]); @@ -38,7 +38,7 @@ cur_frm.cscript.refresh = function(doc, cdt, cdn) { // read-only for root accounts if(!doc.parent_account) { cur_frm.set_read_only(); - cur_frm.set_intro(wn._("This is a root account and cannot be edited.")); + cur_frm.set_intro(frappe._("This is a root account and cannot be edited.")); } else { // credit days and type if customer or supplier cur_frm.set_intro(null); @@ -81,24 +81,24 @@ cur_frm.cscript.account_type = function(doc, cdt, cdn) { // Hide/unhide group or ledger // ----------------------------------------- cur_frm.cscript.add_toolbar_buttons = function(doc) { - cur_frm.appframe.add_button(wn._('Chart of Accounts'), - function() { wn.set_route("Accounts Browser", "Account"); }, 'icon-sitemap') + cur_frm.appframe.add_button(frappe._('Chart of Accounts'), + function() { frappe.set_route("Accounts Browser", "Account"); }, 'icon-sitemap') if (cstr(doc.group_or_ledger) == 'Group') { - cur_frm.add_custom_button(wn._('Convert to Ledger'), + cur_frm.add_custom_button(frappe._('Convert to Ledger'), function() { cur_frm.cscript.convert_to_ledger(); }, 'icon-retweet') } else if (cstr(doc.group_or_ledger) == 'Ledger') { - cur_frm.add_custom_button(wn._('Convert to Group'), + cur_frm.add_custom_button(frappe._('Convert to Group'), function() { cur_frm.cscript.convert_to_group(); }, 'icon-retweet') - cur_frm.appframe.add_button(wn._('View Ledger'), function() { - wn.route_options = { + cur_frm.appframe.add_button(frappe._('View Ledger'), function() { + frappe.route_options = { "account": doc.name, "from_date": sys_defaults.year_start_date, "to_date": sys_defaults.year_end_date, "company": doc.company }; - wn.set_route("query-report", "General Ledger"); + frappe.set_route("query-report", "General Ledger"); }, "icon-table"); } } diff --git a/erpnext/accounts/doctype/account/account.py b/erpnext/accounts/doctype/account/account.py index 64d2798623b..dcb12c12be2 100644 --- a/erpnext/accounts/doctype/account/account.py +++ b/erpnext/accounts/doctype/account/account.py @@ -2,12 +2,12 @@ # License: GNU General Public License v3. See license.txt from __future__ import unicode_literals -import webnotes +import frappe -from webnotes.utils import flt, fmt_money, cstr, cint -from webnotes import msgprint, throw, _ +from frappe.utils import flt, fmt_money, cstr, cint +from frappe import msgprint, throw, _ -get_value = webnotes.conn.get_value +get_value = frappe.conn.get_value class DocType: def __init__(self,d,dl): @@ -16,11 +16,11 @@ class DocType: def autoname(self): self.doc.name = self.doc.account_name.strip() + ' - ' + \ - webnotes.conn.get_value("Company", self.doc.company, "abbr") + frappe.conn.get_value("Company", self.doc.company, "abbr") def get_address(self): return { - 'address': webnotes.conn.get_value(self.doc.master_type, + 'address': frappe.conn.get_value(self.doc.master_type, self.doc.master_name, "address") } @@ -41,14 +41,14 @@ class DocType: if self.doc.master_type in ('Customer', 'Supplier') or self.doc.account_type == "Warehouse": if not self.doc.master_name: msgprint(_("Please enter Master Name once the account is created.")) - elif not webnotes.conn.exists(self.doc.master_type or self.doc.account_type, + elif not frappe.conn.exists(self.doc.master_type or self.doc.account_type, self.doc.master_name): throw(_("Invalid Master Name")) def validate_parent(self): """Fetch Parent Details and validation for account not to be created under ledger""" if self.doc.parent_account: - par = webnotes.conn.sql("""select name, group_or_ledger, is_pl_account, debit_or_credit + par = frappe.conn.sql("""select name, group_or_ledger, is_pl_account, debit_or_credit from tabAccount where name =%s""", self.doc.parent_account) if not par: throw(_("Parent account does not exists")) @@ -72,15 +72,15 @@ class DocType: def validate_max_root_accounts(self): """Raise exception if there are more than 4 root accounts""" - if webnotes.conn.sql("""select count(*) from tabAccount where + if frappe.conn.sql("""select count(*) from tabAccount where company=%s and ifnull(parent_account,'')='' and docstatus != 2""", self.doc.company)[0][0] > 4: throw(_("One company cannot have more than 4 root Accounts")) def validate_duplicate_account(self): if self.doc.fields.get('__islocal') or not self.doc.name: - company_abbr = webnotes.conn.get_value("Company", self.doc.company, "abbr") - if webnotes.conn.sql("""select name from tabAccount where name=%s""", + company_abbr = frappe.conn.get_value("Company", self.doc.company, "abbr") + if frappe.conn.sql("""select name from tabAccount where name=%s""", (self.doc.account_name + " - " + company_abbr)): throw("{name}: {acc_name} {exist}, {rename}".format(**{ "name": _("Account Name"), @@ -91,17 +91,17 @@ class DocType: def validate_root_details(self): #does not exists parent - if webnotes.conn.exists("Account", self.doc.name): - if not webnotes.conn.get_value("Account", self.doc.name, "parent_account"): + if frappe.conn.exists("Account", self.doc.name): + if not frappe.conn.get_value("Account", self.doc.name, "parent_account"): throw(_("Root cannot be edited.")) def validate_frozen_accounts_modifier(self): - old_value = webnotes.conn.get_value("Account", self.doc.name, "freeze_account") + old_value = frappe.conn.get_value("Account", self.doc.name, "freeze_account") if old_value and old_value != self.doc.freeze_account: - frozen_accounts_modifier = webnotes.conn.get_value( 'Accounts Settings', None, + frozen_accounts_modifier = frappe.conn.get_value( 'Accounts Settings', None, 'frozen_accounts_modifier') if not frozen_accounts_modifier or \ - frozen_accounts_modifier not in webnotes.user.get_roles(): + frozen_accounts_modifier not in frappe.user.get_roles(): throw(_("You are not authorized to set Frozen value")) def convert_group_to_ledger(self): @@ -131,10 +131,10 @@ class DocType: # Check if any previous balance exists def check_gle_exists(self): - return webnotes.conn.get_value("GL Entry", {"account": self.doc.name}) + return frappe.conn.get_value("GL Entry", {"account": self.doc.name}) def check_if_child_exists(self): - return webnotes.conn.sql("""select name from `tabAccount` where parent_account = %s + return frappe.conn.sql("""select name from `tabAccount` where parent_account = %s and docstatus != 2""", self.doc.name) def validate_mandatory(self): @@ -144,11 +144,11 @@ class DocType: throw(_("Is PL Account field is mandatory")) def validate_warehouse_account(self): - if not cint(webnotes.defaults.get_global_default("auto_accounting_for_stock")): + if not cint(frappe.defaults.get_global_default("auto_accounting_for_stock")): return if self.doc.account_type == "Warehouse": - old_warehouse = cstr(webnotes.conn.get_value("Account", self.doc.name, "master_name")) + old_warehouse = cstr(frappe.conn.get_value("Account", self.doc.name, "master_name")) if old_warehouse != cstr(self.doc.master_name): if old_warehouse: self.validate_warehouse(old_warehouse) @@ -158,15 +158,15 @@ class DocType: throw(_("Master Name is mandatory if account type is Warehouse")) def validate_warehouse(self, warehouse): - if webnotes.conn.get_value("Stock Ledger Entry", {"warehouse": warehouse}): + if frappe.conn.get_value("Stock Ledger Entry", {"warehouse": warehouse}): throw(_("Stock transactions exist against warehouse ") + warehouse + _(" .You can not assign / modify / remove Master Name")) def update_nsm_model(self): """update lft, rgt indices for nested set model""" - import webnotes - import webnotes.utils.nestedset - webnotes.utils.nestedset.update_nsm(self) + import frappe + import frappe.utils.nestedset + frappe.utils.nestedset.update_nsm(self) def on_update(self): self.validate_max_root_accounts() @@ -174,19 +174,19 @@ class DocType: def get_authorized_user(self): # Check logged-in user is authorized - if webnotes.conn.get_value('Accounts Settings', None, 'credit_controller') \ - in webnotes.user.get_roles(): + if frappe.conn.get_value('Accounts Settings', None, 'credit_controller') \ + in frappe.user.get_roles(): return 1 def check_credit_limit(self, total_outstanding): # Get credit limit credit_limit_from = 'Customer' - cr_limit = webnotes.conn.sql("""select t1.credit_limit from tabCustomer t1, `tabAccount` t2 + cr_limit = frappe.conn.sql("""select t1.credit_limit from tabCustomer t1, `tabAccount` t2 where t2.name=%s and t1.name = t2.master_name""", self.doc.name) credit_limit = cr_limit and flt(cr_limit[0][0]) or 0 if not credit_limit: - credit_limit = webnotes.conn.get_value('Company', self.doc.company, 'credit_limit') + credit_limit = frappe.conn.get_value('Company', self.doc.company, 'credit_limit') credit_limit_from = 'Company' # If outstanding greater than credit limit and not authorized person raise exception @@ -219,10 +219,10 @@ class DocType: # Validate properties before merging if merge: - if not webnotes.conn.exists("Account", new): + if not frappe.conn.exists("Account", new): throw(_("Account ") + new +_(" does not exists")) - val = list(webnotes.conn.get_value("Account", new_account, + val = list(frappe.conn.get_value("Account", new_account, ["group_or_ledger", "debit_or_credit", "is_pl_account", "company"])) if val != [self.doc.group_or_ledger, self.doc.debit_or_credit, self.doc.is_pl_account, self.doc.company]: @@ -234,22 +234,22 @@ class DocType: def after_rename(self, old, new, merge=False): if not merge: - webnotes.conn.set_value("Account", new, "account_name", + frappe.conn.set_value("Account", new, "account_name", " - ".join(new.split(" - ")[:-1])) else: - from webnotes.utils.nestedset import rebuild_tree + from frappe.utils.nestedset import rebuild_tree rebuild_tree("Account", "parent_account") def get_master_name(doctype, txt, searchfield, start, page_len, filters): conditions = (" and company='%s'"% filters["company"]) if doctype == "Warehouse" else "" - return webnotes.conn.sql("""select name from `tab%s` where %s like %s %s + return frappe.conn.sql("""select name from `tab%s` where %s like %s %s order by name limit %s, %s""" % (filters["master_type"], searchfield, "%s", conditions, "%s", "%s"), ("%%%s%%" % txt, start, page_len), as_list=1) def get_parent_account(doctype, txt, searchfield, start, page_len, filters): - return webnotes.conn.sql("""select name from tabAccount + return frappe.conn.sql("""select name from tabAccount where group_or_ledger = 'Group' and docstatus != 2 and company = %s and %s like %s order by name limit %s, %s""" % ("%s", searchfield, "%s", "%s", "%s"), diff --git a/erpnext/accounts/doctype/account/test_account.py b/erpnext/accounts/doctype/account/test_account.py index 3221901e24a..10883d9ddee 100644 --- a/erpnext/accounts/doctype/account/test_account.py +++ b/erpnext/accounts/doctype/account/test_account.py @@ -2,10 +2,10 @@ # License: GNU General Public License v3. See license.txt from __future__ import unicode_literals -import webnotes +import frappe def _make_test_records(verbose): - from webnotes.test_runner import make_test_objects + from frappe.test_runner import make_test_objects accounts = [ # [account_name, parent_account, group_or_ledger] diff --git a/erpnext/accounts/doctype/accounts_settings/accounts_settings.py b/erpnext/accounts/doctype/accounts_settings/accounts_settings.py index 2475fdaf662..ae4aa557987 100644 --- a/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +++ b/erpnext/accounts/doctype/accounts_settings/accounts_settings.py @@ -4,28 +4,28 @@ # For license information, please see license.txt from __future__ import unicode_literals -import webnotes -from webnotes import _ -from webnotes.utils import cint +import frappe +from frappe import _ +from frappe.utils import cint class DocType: def __init__(self, d, dl): self.doc, self.doclist = d, dl def on_update(self): - webnotes.conn.set_default("auto_accounting_for_stock", self.doc.auto_accounting_for_stock) + frappe.conn.set_default("auto_accounting_for_stock", self.doc.auto_accounting_for_stock) if cint(self.doc.auto_accounting_for_stock): # set default perpetual account in company - for company in webnotes.conn.sql("select name from tabCompany"): - webnotes.bean("Company", company[0]).save() + for company in frappe.conn.sql("select name from tabCompany"): + frappe.bean("Company", company[0]).save() # Create account head for warehouses - warehouse_list = webnotes.conn.sql("select name, company from tabWarehouse", as_dict=1) + warehouse_list = frappe.conn.sql("select name, company from tabWarehouse", as_dict=1) warehouse_with_no_company = [d.name for d in warehouse_list if not d.company] if warehouse_with_no_company: - webnotes.throw(_("Company is missing in following warehouses") + ": \n" + + frappe.throw(_("Company is missing in following warehouses") + ": \n" + "\n".join(warehouse_with_no_company)) for wh in warehouse_list: - wh_bean = webnotes.bean("Warehouse", wh.name) + wh_bean = frappe.bean("Warehouse", wh.name) wh_bean.save() \ No newline at end of file diff --git a/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.js b/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.js index 1edacd6d7b8..aea996aab6f 100644 --- a/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.js +++ b/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.js @@ -4,5 +4,5 @@ cur_frm.add_fetch("bank_account", "company", "company"); cur_frm.cscript.onload = function(doc, cdt, cdn){ cur_frm.set_intro(' ' + - wn._("Update clearance date of Journal Entries marked as 'Bank Vouchers'")) + frappe._("Update clearance date of Journal Entries marked as 'Bank Vouchers'")) } \ No newline at end of file diff --git a/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py b/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py index 68143337171..aa91e5c0271 100644 --- a/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +++ b/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py @@ -2,13 +2,13 @@ # License: GNU General Public License v3. See license.txt from __future__ import unicode_literals -import webnotes +import frappe -from webnotes.utils import cstr, flt, getdate, now, nowdate -from webnotes.model import db_exists -from webnotes.model.doc import addchild -from webnotes.model.bean import getlist, copy_doclist -from webnotes import msgprint +from frappe.utils import cstr, flt, getdate, now, nowdate +from frappe.model import db_exists +from frappe.model.doc import addchild +from frappe.model.bean import getlist, copy_doclist +from frappe import msgprint @@ -22,7 +22,7 @@ class DocType: msgprint("Bank Account, From Date and To Date are Mandatory") return - dl = webnotes.conn.sql("select t1.name, t1.cheque_no, t1.cheque_date, t2.debit, t2.credit, t1.posting_date, t2.against_account from `tabJournal Voucher` t1, `tabJournal Voucher Detail` t2 where t2.parent = t1.name and t2.account = %s and (clearance_date is null or clearance_date = '0000-00-00' or clearance_date = '') and t1.posting_date >= %s and t1.posting_date <= %s and t1.docstatus=1", (self.doc.bank_account, self.doc.from_date, self.doc.to_date)) + dl = frappe.conn.sql("select t1.name, t1.cheque_no, t1.cheque_date, t2.debit, t2.credit, t1.posting_date, t2.against_account from `tabJournal Voucher` t1, `tabJournal Voucher Detail` t2 where t2.parent = t1.name and t2.account = %s and (clearance_date is null or clearance_date = '0000-00-00' or clearance_date = '') and t1.posting_date >= %s and t1.posting_date <= %s and t1.docstatus=1", (self.doc.bank_account, self.doc.from_date, self.doc.to_date)) self.doclist = self.doc.clear_table(self.doclist, 'entries') self.doc.total_amount = 0.0 @@ -46,7 +46,7 @@ class DocType: msgprint("Clearance Date can not be before Cheque Date (Row #%s)" % d.idx, raise_exception=1) - webnotes.conn.sql("""update `tabJournal Voucher` + frappe.conn.sql("""update `tabJournal Voucher` set clearance_date = %s, modified = %s where name=%s""", (d.clearance_date, nowdate(), d.voucher_id)) vouchers.append(d.voucher_id) diff --git a/erpnext/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.py b/erpnext/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.py index cb6190f2985..26c87f1c04a 100644 --- a/erpnext/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.py +++ b/erpnext/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.py @@ -2,7 +2,7 @@ # License: GNU General Public License v3. See license.txt from __future__ import unicode_literals -import webnotes +import frappe class DocType: def __init__(self, d, dl): diff --git a/erpnext/accounts/doctype/budget_detail/budget_detail.py b/erpnext/accounts/doctype/budget_detail/budget_detail.py index cb6190f2985..26c87f1c04a 100644 --- a/erpnext/accounts/doctype/budget_detail/budget_detail.py +++ b/erpnext/accounts/doctype/budget_detail/budget_detail.py @@ -2,7 +2,7 @@ # License: GNU General Public License v3. See license.txt from __future__ import unicode_literals -import webnotes +import frappe class DocType: def __init__(self, d, dl): diff --git a/erpnext/accounts/doctype/budget_distribution/budget_distribution.js b/erpnext/accounts/doctype/budget_distribution/budget_distribution.js index ddaecddda85..c2563741a43 100644 --- a/erpnext/accounts/doctype/budget_distribution/budget_distribution.js +++ b/erpnext/accounts/doctype/budget_distribution/budget_distribution.js @@ -8,7 +8,7 @@ cur_frm.cscript.onload = function(doc,cdt,cdn){ } return $c('runserverobj',args={'method' : 'get_months', 'docs' : - wn.model.compress(make_doclist(doc.doctype, doc.name))},callback1); + frappe.model.compress(make_doclist(doc.doctype, doc.name))},callback1); } } diff --git a/erpnext/accounts/doctype/budget_distribution/budget_distribution.py b/erpnext/accounts/doctype/budget_distribution/budget_distribution.py index c1ac2f957b9..51730976668 100644 --- a/erpnext/accounts/doctype/budget_distribution/budget_distribution.py +++ b/erpnext/accounts/doctype/budget_distribution/budget_distribution.py @@ -2,12 +2,12 @@ # License: GNU General Public License v3. See license.txt from __future__ import unicode_literals -import webnotes +import frappe -from webnotes.utils import flt -from webnotes.model.doc import addchild -from webnotes.model.bean import getlist -from webnotes import msgprint, _ +from frappe.utils import flt +from frappe.model.doc import addchild +from frappe.model.bean import getlist +from frappe import msgprint, _ class DocType: def __init__(self,doc,doclist=[]): diff --git a/erpnext/accounts/doctype/budget_distribution_detail/budget_distribution_detail.py b/erpnext/accounts/doctype/budget_distribution_detail/budget_distribution_detail.py index cb6190f2985..26c87f1c04a 100644 --- a/erpnext/accounts/doctype/budget_distribution_detail/budget_distribution_detail.py +++ b/erpnext/accounts/doctype/budget_distribution_detail/budget_distribution_detail.py @@ -2,7 +2,7 @@ # License: GNU General Public License v3. See license.txt from __future__ import unicode_literals -import webnotes +import frappe class DocType: def __init__(self, d, dl): diff --git a/erpnext/accounts/doctype/c_form/c_form.py b/erpnext/accounts/doctype/c_form/c_form.py index 80a9f44b3cd..b60f3035b81 100644 --- a/erpnext/accounts/doctype/c_form/c_form.py +++ b/erpnext/accounts/doctype/c_form/c_form.py @@ -2,9 +2,9 @@ # License: GNU General Public License v3. See license.txt from __future__ import unicode_literals -import webnotes -from webnotes.utils import flt, getdate -from webnotes.model.bean import getlist +import frappe +from frappe.utils import flt, getdate +from frappe.model.bean import getlist class DocType: def __init__(self,d,dl): @@ -16,19 +16,19 @@ class DocType: for d in getlist(self.doclist, 'invoice_details'): if d.invoice_no: - inv = webnotes.conn.sql("""select c_form_applicable, c_form_no from + inv = frappe.conn.sql("""select c_form_applicable, c_form_no from `tabSales Invoice` where name = %s and docstatus = 1""", d.invoice_no) if not inv: - webnotes.msgprint("""Invoice: %s is not exists in the system or + frappe.msgprint("""Invoice: %s is not exists in the system or is not submitted, please check.""" % d.invoice_no, raise_exception=1) elif inv[0][0] != 'Yes': - webnotes.msgprint("C-form is not applicable for Invoice: %s" % + frappe.msgprint("C-form is not applicable for Invoice: %s" % d.invoice_no, raise_exception=1) elif inv[0][1] and inv[0][1] != self.doc.name: - webnotes.msgprint("""Invoice %s is tagged in another C-form: %s. + frappe.msgprint("""Invoice %s is tagged in another C-form: %s. If you want to change C-form no for this invoice, please remove invoice no from the previous c-form and then try again""" % (d.invoice_no, inv[0][1]), raise_exception=1) @@ -42,31 +42,31 @@ class DocType: def before_cancel(self): # remove cform reference - webnotes.conn.sql("""update `tabSales Invoice` set c_form_no=null + frappe.conn.sql("""update `tabSales Invoice` set c_form_no=null where c_form_no=%s""", self.doc.name) def set_cform_in_sales_invoices(self): inv = [d.invoice_no for d in getlist(self.doclist, 'invoice_details')] if inv: - webnotes.conn.sql("""update `tabSales Invoice` set c_form_no=%s, modified=%s + frappe.conn.sql("""update `tabSales Invoice` set c_form_no=%s, modified=%s where name in (%s)""" % ('%s', '%s', ', '.join(['%s'] * len(inv))), tuple([self.doc.name, self.doc.modified] + inv)) - webnotes.conn.sql("""update `tabSales Invoice` set c_form_no = null, modified = %s + frappe.conn.sql("""update `tabSales Invoice` set c_form_no = null, modified = %s where name not in (%s) and ifnull(c_form_no, '') = %s""" % ('%s', ', '.join(['%s']*len(inv)), '%s'), tuple([self.doc.modified] + inv + [self.doc.name])) else: - webnotes.msgprint("Please enter atleast 1 invoice in the table", raise_exception=1) + frappe.msgprint("Please enter atleast 1 invoice in the table", raise_exception=1) def set_total_invoiced_amount(self): total = sum([flt(d.grand_total) for d in getlist(self.doclist, 'invoice_details')]) - webnotes.conn.set(self.doc, 'total_invoiced_amount', total) + frappe.conn.set(self.doc, 'total_invoiced_amount', total) def get_invoice_details(self, invoice_no): """ Pull details from invoices for referrence """ - inv = webnotes.conn.sql("""select posting_date, territory, net_total, grand_total + inv = frappe.conn.sql("""select posting_date, territory, net_total, grand_total from `tabSales Invoice` where name = %s""", invoice_no) return { 'invoice_date' : inv and getdate(inv[0][0]).strftime('%Y-%m-%d') or '', @@ -79,7 +79,7 @@ def get_invoice_nos(doctype, txt, searchfield, start, page_len, filters): from erpnext.utilities import build_filter_conditions conditions, filter_values = build_filter_conditions(filters) - return webnotes.conn.sql("""select name from `tabSales Invoice` where docstatus = 1 + return frappe.conn.sql("""select name from `tabSales Invoice` where docstatus = 1 and c_form_applicable = 'Yes' and ifnull(c_form_no, '') = '' %s and %s like %s order by name limit %s, %s""" % (conditions, searchfield, "%s", "%s", "%s"), diff --git a/erpnext/accounts/doctype/c_form_invoice_detail/c_form_invoice_detail.py b/erpnext/accounts/doctype/c_form_invoice_detail/c_form_invoice_detail.py index cb6190f2985..26c87f1c04a 100644 --- a/erpnext/accounts/doctype/c_form_invoice_detail/c_form_invoice_detail.py +++ b/erpnext/accounts/doctype/c_form_invoice_detail/c_form_invoice_detail.py @@ -2,7 +2,7 @@ # License: GNU General Public License v3. See license.txt from __future__ import unicode_literals -import webnotes +import frappe class DocType: def __init__(self, d, dl): diff --git a/erpnext/accounts/doctype/cost_center/cost_center.js b/erpnext/accounts/doctype/cost_center/cost_center.js index a18efaaa327..7fb4afe2db4 100644 --- a/erpnext/accounts/doctype/cost_center/cost_center.js +++ b/erpnext/accounts/doctype/cost_center/cost_center.js @@ -1,8 +1,8 @@ // Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors // License: GNU General Public License v3. See license.txt -wn.provide("erpnext.accounts"); -erpnext.accounts.CostCenterController = wn.ui.form.Controller.extend({ +frappe.provide("erpnext.accounts"); +erpnext.accounts.CostCenterController = frappe.ui.form.Controller.extend({ onload: function() { this.setup_queries(); }, @@ -41,8 +41,8 @@ cur_frm.cscript.refresh = function(doc, cdt, cdn) { cur_frm.toggle_enable(['group_or_ledger', 'company'], doc.__islocal); if(!doc.__islocal && doc.group_or_ledger=='Group') { - intro_txt += '

'+wn._('Note:')+''+ wn._('This Cost Center is a')+ ''+wn._('Group')+', '+ - wn._('Accounting Entries are not allowed against groups.')+'

'; + intro_txt += '

'+frappe._('Note:')+''+ frappe._('This Cost Center is a')+ ''+frappe._('Group')+', '+ + frappe._('Accounting Entries are not allowed against groups.')+'

'; } cur_frm.cscript.hide_unhide_group_ledger(doc); @@ -50,22 +50,22 @@ cur_frm.cscript.refresh = function(doc, cdt, cdn) { cur_frm.toggle_display('sb1', doc.group_or_ledger=='Ledger') cur_frm.set_intro(intro_txt); - cur_frm.appframe.add_button(wn._('Chart of Cost Centers'), - function() { wn.set_route("Accounts Browser", "Cost Center"); }, 'icon-sitemap') + cur_frm.appframe.add_button(frappe._('Chart of Cost Centers'), + function() { frappe.set_route("Accounts Browser", "Cost Center"); }, 'icon-sitemap') } cur_frm.cscript.parent_cost_center = function(doc, cdt, cdn) { if(!doc.company){ - msgprint(wn._('Please enter company name first')); + msgprint(frappe._('Please enter company name first')); } } cur_frm.cscript.hide_unhide_group_ledger = function(doc) { if (cstr(doc.group_or_ledger) == 'Group') { - cur_frm.add_custom_button(wn._('Convert to Ledger'), + cur_frm.add_custom_button(frappe._('Convert to Ledger'), function() { cur_frm.cscript.convert_to_ledger(); }, 'icon-retweet') } else if (cstr(doc.group_or_ledger) == 'Ledger') { - cur_frm.add_custom_button(wn._('Convert to Group'), + cur_frm.add_custom_button(frappe._('Convert to Group'), function() { cur_frm.cscript.convert_to_group(); }, 'icon-retweet') } } diff --git a/erpnext/accounts/doctype/cost_center/cost_center.py b/erpnext/accounts/doctype/cost_center/cost_center.py index 0d38cc820c8..666503964ad 100644 --- a/erpnext/accounts/doctype/cost_center/cost_center.py +++ b/erpnext/accounts/doctype/cost_center/cost_center.py @@ -2,11 +2,11 @@ # License: GNU General Public License v3. See license.txt from __future__ import unicode_literals -import webnotes -from webnotes.model.bean import getlist -from webnotes import msgprint, _ +import frappe +from frappe.model.bean import getlist +from frappe import msgprint, _ -from webnotes.utils.nestedset import DocTypeNestedSet +from frappe.utils.nestedset import DocTypeNestedSet class DocType(DocTypeNestedSet): def __init__(self,d,dl): @@ -14,7 +14,7 @@ class DocType(DocTypeNestedSet): self.nsm_parent_field = 'parent_cost_center' def autoname(self): - company_abbr = webnotes.conn.sql("select abbr from tabCompany where name=%s", + company_abbr = frappe.conn.sql("select abbr from tabCompany where name=%s", self.doc.company)[0][0] self.doc.name = self.doc.cost_center_name.strip() + ' - ' + company_abbr @@ -46,10 +46,10 @@ class DocType(DocTypeNestedSet): return 1 def check_gle_exists(self): - return webnotes.conn.get_value("GL Entry", {"cost_center": self.doc.name}) + return frappe.conn.get_value("GL Entry", {"cost_center": self.doc.name}) def check_if_child_exists(self): - return webnotes.conn.sql("select name from `tabCost Center` where \ + return frappe.conn.sql("select name from `tabCost Center` where \ parent_cost_center = %s and docstatus != 2", self.doc.name) def validate_budget_details(self): @@ -67,7 +67,7 @@ class DocType(DocTypeNestedSet): """ Cost Center name must be unique """ - if (self.doc.fields.get("__islocal") or not self.doc.name) and webnotes.conn.sql("select name from `tabCost Center` where cost_center_name = %s and company=%s", (self.doc.cost_center_name, self.doc.company)): + if (self.doc.fields.get("__islocal") or not self.doc.name) and frappe.conn.sql("select name from `tabCost Center` where cost_center_name = %s and company=%s", (self.doc.cost_center_name, self.doc.company)): msgprint("Cost Center Name already exists, please rename", raise_exception=1) self.validate_mandatory() @@ -85,7 +85,7 @@ class DocType(DocTypeNestedSet): def after_rename(self, olddn, newdn, merge=False): if not merge: - webnotes.conn.set_value("Cost Center", newdn, "cost_center_name", + frappe.conn.set_value("Cost Center", newdn, "cost_center_name", " - ".join(newdn.split(" - ")[:-1])) else: super(DocType, self).after_rename(olddn, newdn, merge) diff --git a/erpnext/accounts/doctype/fiscal_year/fiscal_year.js b/erpnext/accounts/doctype/fiscal_year/fiscal_year.js index 6bf712937ac..6aa5ae8883f 100644 --- a/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +++ b/erpnext/accounts/doctype/fiscal_year/fiscal_year.js @@ -8,12 +8,12 @@ $.extend(cur_frm.cscript, { this.frm.toggle_enable('year_end_date', doc.__islocal) if (!doc.__islocal && (doc.name != sys_defaults.fiscal_year)) { - this.frm.add_custom_button(wn._("Set as Default"), this.frm.cscript.set_as_default); - this.frm.set_intro(wn._("To set this Fiscal Year as Default, click on 'Set as Default'")); + this.frm.add_custom_button(frappe._("Set as Default"), this.frm.cscript.set_as_default); + this.frm.set_intro(frappe._("To set this Fiscal Year as Default, click on 'Set as Default'")); } else this.frm.set_intro(""); }, set_as_default: function() { - return wn.call({ + return frappe.call({ doc: cur_frm.doc, method: "set_as_default" }); @@ -22,7 +22,7 @@ $.extend(cur_frm.cscript, { var me = this; year_end_date = - wn.datetime.add_days(wn.datetime.add_months(this.frm.doc.year_start_date, 12), -1); + frappe.datetime.add_days(frappe.datetime.add_months(this.frm.doc.year_start_date, 12), -1); this.frm.set_value("year_end_date", year_end_date); }, }); \ No newline at end of file diff --git a/erpnext/accounts/doctype/fiscal_year/fiscal_year.py b/erpnext/accounts/doctype/fiscal_year/fiscal_year.py index a09e9731bc2..381acf3d9a4 100644 --- a/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +++ b/erpnext/accounts/doctype/fiscal_year/fiscal_year.py @@ -2,44 +2,44 @@ # License: GNU General Public License v3. See license.txt from __future__ import unicode_literals -import webnotes -from webnotes import msgprint, _ -from webnotes.utils import getdate +import frappe +from frappe import msgprint, _ +from frappe.utils import getdate class DocType: def __init__(self, d, dl): self.doc, self.doclist = d, dl def set_as_default(self): - webnotes.conn.set_value("Global Defaults", None, "current_fiscal_year", self.doc.name) - webnotes.get_obj("Global Defaults").on_update() + frappe.conn.set_value("Global Defaults", None, "current_fiscal_year", self.doc.name) + frappe.get_obj("Global Defaults").on_update() # clear cache - webnotes.clear_cache() + frappe.clear_cache() msgprint(self.doc.name + _(""" is now the default Fiscal Year. \ Please refresh your browser for the change to take effect.""")) def validate(self): - year_start_end_dates = webnotes.conn.sql("""select year_start_date, year_end_date + year_start_end_dates = frappe.conn.sql("""select year_start_date, year_end_date from `tabFiscal Year` where name=%s""", (self.doc.name)) if year_start_end_dates: if getdate(self.doc.year_start_date) != year_start_end_dates[0][0] or getdate(self.doc.year_end_date) != year_start_end_dates[0][1]: - webnotes.throw(_("Cannot change Year Start Date and Year End Date once the Fiscal Year is saved.")) + frappe.throw(_("Cannot change Year Start Date and Year End Date once the Fiscal Year is saved.")) def on_update(self): # validate year start date and year end date if getdate(self.doc.year_start_date) > getdate(self.doc.year_end_date): - webnotes.throw(_("Year Start Date should not be greater than Year End Date")) + frappe.throw(_("Year Start Date should not be greater than Year End Date")) if (getdate(self.doc.year_end_date) - getdate(self.doc.year_start_date)).days > 366: - webnotes.throw(_("Year Start Date and Year End Date are not within Fiscal Year.")) + frappe.throw(_("Year Start Date and Year End Date are not within Fiscal Year.")) - year_start_end_dates = webnotes.conn.sql("""select name, year_start_date, year_end_date + year_start_end_dates = frappe.conn.sql("""select name, year_start_date, year_end_date from `tabFiscal Year` where name!=%s""", (self.doc.name)) for fiscal_year, ysd, yed in year_start_end_dates: if (getdate(self.doc.year_start_date) == ysd and getdate(self.doc.year_end_date) == yed) \ - and (not webnotes.flags.in_test): - webnotes.throw(_("Year Start Date and Year End Date are already set in Fiscal Year: ") + fiscal_year) \ No newline at end of file + and (not frappe.flags.in_test): + frappe.throw(_("Year Start Date and Year End Date are already set in Fiscal Year: ") + fiscal_year) \ No newline at end of file diff --git a/erpnext/accounts/doctype/gl_entry/gl_entry.py b/erpnext/accounts/doctype/gl_entry/gl_entry.py index 20cd8993bf6..e3eff9b0ccb 100644 --- a/erpnext/accounts/doctype/gl_entry/gl_entry.py +++ b/erpnext/accounts/doctype/gl_entry/gl_entry.py @@ -2,10 +2,10 @@ # License: GNU General Public License v3. See license.txt from __future__ import unicode_literals -import webnotes +import frappe -from webnotes.utils import flt, fmt_money, getdate -from webnotes import _ +from frappe.utils import flt, fmt_money, getdate +from frappe import _ class DocType: def __init__(self,d,dl): @@ -34,17 +34,17 @@ class DocType: mandatory = ['account','remarks','voucher_type','voucher_no','fiscal_year','company'] for k in mandatory: if not self.doc.fields.get(k): - webnotes.throw(k + _(" is mandatory for GL Entry")) + frappe.throw(k + _(" is mandatory for GL Entry")) # Zero value transaction is not allowed if not (flt(self.doc.debit) or flt(self.doc.credit)): - webnotes.throw(_("GL Entry: Debit or Credit amount is mandatory for ") + + frappe.throw(_("GL Entry: Debit or Credit amount is mandatory for ") + self.doc.account) def pl_must_have_cost_center(self): - if webnotes.conn.get_value("Account", self.doc.account, "is_pl_account") == "Yes": + if frappe.conn.get_value("Account", self.doc.account, "is_pl_account") == "Yes": if not self.doc.cost_center and self.doc.voucher_type != 'Period Closing Voucher': - webnotes.throw(_("Cost Center must be specified for PL Account: ") + + frappe.throw(_("Cost Center must be specified for PL Account: ") + self.doc.account) elif self.doc.cost_center: self.doc.cost_center = None @@ -55,23 +55,23 @@ class DocType: def check_pl_account(self): if self.doc.is_opening=='Yes' and \ - webnotes.conn.get_value("Account", self.doc.account, "is_pl_account") == "Yes": - webnotes.throw(_("For opening balance entry account can not be a PL account")) + frappe.conn.get_value("Account", self.doc.account, "is_pl_account") == "Yes": + frappe.throw(_("For opening balance entry account can not be a PL account")) def validate_account_details(self, adv_adj): """Account must be ledger, active and not freezed""" - ret = webnotes.conn.sql("""select group_or_ledger, docstatus, company + ret = frappe.conn.sql("""select group_or_ledger, docstatus, company from tabAccount where name=%s""", self.doc.account, as_dict=1)[0] if ret.group_or_ledger=='Group': - webnotes.throw(_("Account") + ": " + self.doc.account + _(" is not a ledger")) + frappe.throw(_("Account") + ": " + self.doc.account + _(" is not a ledger")) if ret.docstatus==2: - webnotes.throw(_("Account") + ": " + self.doc.account + _(" is not active")) + frappe.throw(_("Account") + ": " + self.doc.account + _(" is not active")) if ret.company != self.doc.company: - webnotes.throw(_("Account") + ": " + self.doc.account + + frappe.throw(_("Account") + ": " + self.doc.account + _(" does not belong to the company") + ": " + self.doc.company) def validate_cost_center(self): @@ -80,27 +80,27 @@ class DocType: def _get_cost_center_company(): if not self.cost_center_company.get(self.doc.cost_center): - self.cost_center_company[self.doc.cost_center] = webnotes.conn.get_value( + self.cost_center_company[self.doc.cost_center] = frappe.conn.get_value( "Cost Center", self.doc.cost_center, "company") return self.cost_center_company[self.doc.cost_center] if self.doc.cost_center and _get_cost_center_company() != self.doc.company: - webnotes.throw(_("Cost Center") + ": " + self.doc.cost_center + + frappe.throw(_("Cost Center") + ": " + self.doc.cost_center + _(" does not belong to the company") + ": " + self.doc.company) def check_negative_balance(account, adv_adj=False): if not adv_adj and account: - account_details = webnotes.conn.get_value("Account", account, + account_details = frappe.conn.get_value("Account", account, ["allow_negative_balance", "debit_or_credit"], as_dict=True) if not account_details["allow_negative_balance"]: - balance = webnotes.conn.sql("""select sum(debit) - sum(credit) from `tabGL Entry` + balance = frappe.conn.sql("""select sum(debit) - sum(credit) from `tabGL Entry` where account = %s""", account) balance = account_details["debit_or_credit"] == "Debit" and \ flt(balance[0][0]) or -1*flt(balance[0][0]) if flt(balance) < 0: - webnotes.throw(_("Negative balance is not allowed for account ") + account) + frappe.throw(_("Negative balance is not allowed for account ") + account) def check_freezing_date(posting_date, adv_adj=False): """ @@ -108,17 +108,17 @@ def check_freezing_date(posting_date, adv_adj=False): except authorized person """ if not adv_adj: - acc_frozen_upto = webnotes.conn.get_value('Accounts Settings', None, 'acc_frozen_upto') + acc_frozen_upto = frappe.conn.get_value('Accounts Settings', None, 'acc_frozen_upto') if acc_frozen_upto: - bde_auth_role = webnotes.conn.get_value( 'Accounts Settings', None,'bde_auth_role') + bde_auth_role = frappe.conn.get_value( 'Accounts Settings', None,'bde_auth_role') if getdate(posting_date) <= getdate(acc_frozen_upto) \ - and not bde_auth_role in webnotes.user.get_roles(): - webnotes.throw(_("You are not authorized to do/modify back dated entries before ") + and not bde_auth_role in frappe.user.get_roles(): + frappe.throw(_("You are not authorized to do/modify back dated entries before ") + getdate(acc_frozen_upto).strftime('%d-%m-%Y')) def update_outstanding_amt(account, against_voucher_type, against_voucher, on_cancel=False): # get final outstanding amt - bal = flt(webnotes.conn.sql("""select sum(ifnull(debit, 0)) - sum(ifnull(credit, 0)) + bal = flt(frappe.conn.sql("""select sum(ifnull(debit, 0)) - sum(ifnull(credit, 0)) from `tabGL Entry` where against_voucher_type=%s and against_voucher=%s and account = %s""", (against_voucher_type, against_voucher, account))[0][0] or 0.0) @@ -126,7 +126,7 @@ def update_outstanding_amt(account, against_voucher_type, against_voucher, on_ca if against_voucher_type == 'Purchase Invoice': bal = -bal elif against_voucher_type == "Journal Voucher": - against_voucher_amount = flt(webnotes.conn.sql(""" + against_voucher_amount = flt(frappe.conn.sql(""" select sum(ifnull(debit, 0)) - sum(ifnull(credit, 0)) from `tabGL Entry` where voucher_type = 'Journal Voucher' and voucher_no = %s and account = %s and ifnull(against_voucher, '') = ''""", @@ -137,23 +137,23 @@ def update_outstanding_amt(account, against_voucher_type, against_voucher, on_ca # Validation : Outstanding can not be negative if bal < 0 and not on_cancel: - webnotes.throw(_("Outstanding for Voucher ") + against_voucher + _(" will become ") + + frappe.throw(_("Outstanding for Voucher ") + against_voucher + _(" will become ") + fmt_money(bal) + _(". Outstanding cannot be less than zero. \ Please match exact outstanding.")) # Update outstanding amt on against voucher if against_voucher_type in ["Sales Invoice", "Purchase Invoice"]: - webnotes.conn.sql("update `tab%s` set outstanding_amount=%s where name='%s'" % + frappe.conn.sql("update `tab%s` set outstanding_amount=%s where name='%s'" % (against_voucher_type, bal, against_voucher)) def validate_frozen_account(account, adv_adj=None): - frozen_account = webnotes.conn.get_value("Account", account, "freeze_account") + frozen_account = frappe.conn.get_value("Account", account, "freeze_account") if frozen_account == 'Yes' and not adv_adj: - frozen_accounts_modifier = webnotes.conn.get_value( 'Accounts Settings', None, + frozen_accounts_modifier = frappe.conn.get_value( 'Accounts Settings', None, 'frozen_accounts_modifier') if not frozen_accounts_modifier: - webnotes.throw(account + _(" is a frozen account. Either make the account active or assign role in Accounts Settings who can create / modify entries against this account")) - elif frozen_accounts_modifier not in webnotes.user.get_roles(): - webnotes.throw(account + _(" is a frozen account. To create / edit transactions against this account, you need role") \ + frappe.throw(account + _(" is a frozen account. Either make the account active or assign role in Accounts Settings who can create / modify entries against this account")) + elif frozen_accounts_modifier not in frappe.user.get_roles(): + frappe.throw(account + _(" is a frozen account. To create / edit transactions against this account, you need role") \ + ": " + frozen_accounts_modifier) diff --git a/erpnext/accounts/doctype/journal_voucher/journal_voucher.js b/erpnext/accounts/doctype/journal_voucher/journal_voucher.js index 342fa23afad..1107ba4a6cb 100644 --- a/erpnext/accounts/doctype/journal_voucher/journal_voucher.js +++ b/erpnext/accounts/doctype/journal_voucher/journal_voucher.js @@ -1,9 +1,9 @@ // Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors // License: GNU General Public License v3. See license.txt -wn.provide("erpnext.accounts"); +frappe.provide("erpnext.accounts"); -erpnext.accounts.JournalVoucher = wn.ui.form.Controller.extend({ +erpnext.accounts.JournalVoucher = frappe.ui.form.Controller.extend({ onload: function() { this.load_defaults(); this.setup_queries(); @@ -11,10 +11,10 @@ erpnext.accounts.JournalVoucher = wn.ui.form.Controller.extend({ load_defaults: function() { if(this.frm.doc.__islocal && this.frm.doc.company) { - wn.model.set_default_values(this.frm.doc); - $.each(wn.model.get_doclist(this.frm.doc.doctype, + frappe.model.set_default_values(this.frm.doc); + $.each(frappe.model.get_doclist(this.frm.doc.doctype, this.frm.doc.name, {parentfield: "entries"}), function(i, jvd) { - wn.model.set_default_values(jvd); + frappe.model.set_default_values(jvd); } ); @@ -27,7 +27,7 @@ erpnext.accounts.JournalVoucher = wn.ui.form.Controller.extend({ $.each(["account", "cost_center"], function(i, fieldname) { me.frm.set_query(fieldname, "entries", function() { - wn.model.validate_missing(me.frm.doc, "company"); + frappe.model.validate_missing(me.frm.doc, "company"); return { filters: { company: me.frm.doc.company, @@ -40,8 +40,8 @@ erpnext.accounts.JournalVoucher = wn.ui.form.Controller.extend({ $.each([["against_voucher", "Purchase Invoice", "credit_to"], ["against_invoice", "Sales Invoice", "debit_to"]], function(i, opts) { me.frm.set_query(opts[0], "entries", function(doc, cdt, cdn) { - var jvd = wn.model.get_doc(cdt, cdn); - wn.model.validate_missing(jvd, "account"); + var jvd = frappe.model.get_doc(cdt, cdn); + frappe.model.validate_missing(jvd, "account"); return { filters: [ [opts[1], opts[2], "=", jvd.account], @@ -53,8 +53,8 @@ erpnext.accounts.JournalVoucher = wn.ui.form.Controller.extend({ }); this.frm.set_query("against_jv", "entries", function(doc, cdt, cdn) { - var jvd = wn.model.get_doc(cdt, cdn); - wn.model.validate_missing(jvd, "account"); + var jvd = frappe.model.get_doc(cdt, cdn); + frappe.model.validate_missing(jvd, "account"); return { query: "accounts.doctype.journal_voucher.journal_voucher.get_against_jv", @@ -64,7 +64,7 @@ erpnext.accounts.JournalVoucher = wn.ui.form.Controller.extend({ }, against_voucher: function(doc, cdt, cdn) { - var d = wn.model.get_doc(cdt, cdn); + var d = frappe.model.get_doc(cdt, cdn); if (d.against_voucher && !flt(d.debit)) { this.get_outstanding({ 'doctype': 'Purchase Invoice', @@ -74,7 +74,7 @@ erpnext.accounts.JournalVoucher = wn.ui.form.Controller.extend({ }, against_invoice: function(doc, cdt, cdn) { - var d = wn.model.get_doc(cdt, cdn); + var d = frappe.model.get_doc(cdt, cdn); if (d.against_invoice && !flt(d.credit)) { this.get_outstanding({ 'doctype': 'Sales Invoice', @@ -84,7 +84,7 @@ erpnext.accounts.JournalVoucher = wn.ui.form.Controller.extend({ }, against_jv: function(doc, cdt, cdn) { - var d = wn.model.get_doc(cdt, cdn); + var d = frappe.model.get_doc(cdt, cdn); if (d.against_jv && !flt(d.credit) && !flt(d.debit)) { this.get_outstanding({ 'doctype': 'Journal Voucher', @@ -115,15 +115,15 @@ cur_frm.cscript.refresh = function(doc) { erpnext.hide_naming_series(); cur_frm.cscript.voucher_type(doc); if(doc.docstatus==1) { - cur_frm.appframe.add_button(wn._('View Ledger'), function() { - wn.route_options = { + cur_frm.appframe.add_button(frappe._('View Ledger'), function() { + frappe.route_options = { "voucher_no": doc.name, "from_date": doc.posting_date, "to_date": doc.posting_date, "company": doc.company, group_by_voucher: 0 }; - wn.set_route("query-report", "General Ledger"); + frappe.set_route("query-report", "General Ledger"); }, "icon-table"); } } @@ -166,7 +166,7 @@ cur_frm.cscript.get_balance = function(doc,dt,dn) { cur_frm.cscript.account = function(doc,dt,dn) { var d = locals[dt][dn]; if(d.account) { - return wn.call({ + return frappe.call({ method: "erpnext.accounts.utils.get_balance_on", args: {account: d.account, date: doc.posting_date}, callback: function(r) { @@ -187,20 +187,20 @@ cur_frm.cscript.select_print_heading = function(doc,cdt,cdn){ cur_frm.pformat.print_heading = doc.select_print_heading; } else - cur_frm.pformat.print_heading = wn._("Journal Voucher"); + cur_frm.pformat.print_heading = frappe._("Journal Voucher"); } cur_frm.cscript.voucher_type = function(doc, cdt, cdn) { cur_frm.set_df_property("cheque_no", "reqd", doc.voucher_type=="Bank Voucher"); cur_frm.set_df_property("cheque_date", "reqd", doc.voucher_type=="Bank Voucher"); - if(wn.model.get("Journal Voucher Detail", {"parent":doc.name}).length!==0 // too late + if(frappe.model.get("Journal Voucher Detail", {"parent":doc.name}).length!==0 // too late || !doc.company) // too early return; var update_jv_details = function(doc, r) { $.each(r.message, function(i, d) { - var jvdetail = wn.model.add_child(doc, "Journal Voucher Detail", "entries"); + var jvdetail = frappe.model.add_child(doc, "Journal Voucher Detail", "entries"); jvdetail.account = d.account; jvdetail.balance = d.balance; }); @@ -208,7 +208,7 @@ cur_frm.cscript.voucher_type = function(doc, cdt, cdn) { } if(in_list(["Bank Voucher", "Cash Voucher"], doc.voucher_type)) { - return wn.call({ + return frappe.call({ type: "GET", method: "erpnext.accounts.doctype.journal_voucher.journal_voucher.get_default_bank_cash_account", args: { @@ -222,14 +222,14 @@ cur_frm.cscript.voucher_type = function(doc, cdt, cdn) { } }) } else if(doc.voucher_type=="Opening Entry") { - return wn.call({ + return frappe.call({ type:"GET", method: "erpnext.accounts.doctype.journal_voucher.journal_voucher.get_opening_accounts", args: { "company": doc.company }, callback: function(r) { - wn.model.clear_table("Journal Voucher Detail", "Journal Voucher", + frappe.model.clear_table("Journal Voucher Detail", "Journal Voucher", doc.name, "entries"); if(r.message) { update_jv_details(doc, r); diff --git a/erpnext/accounts/doctype/journal_voucher/journal_voucher.py b/erpnext/accounts/doctype/journal_voucher/journal_voucher.py index c9ca0c2e376..f02188baef9 100644 --- a/erpnext/accounts/doctype/journal_voucher/journal_voucher.py +++ b/erpnext/accounts/doctype/journal_voucher/journal_voucher.py @@ -2,12 +2,12 @@ # License: GNU General Public License v3. See license.txt from __future__ import unicode_literals -import webnotes +import frappe -from webnotes.utils import cint, cstr, flt, fmt_money, formatdate, getdate -from webnotes.model.doc import addchild -from webnotes.model.bean import getlist -from webnotes import msgprint, _ +from frappe.utils import cint, cstr, flt, fmt_money, formatdate, getdate +from frappe.model.doc import addchild +from frappe.model.bean import getlist +from frappe import msgprint, _ from erpnext.setup.utils import get_company_currency from erpnext.controllers.accounts_controller import AccountsController @@ -54,7 +54,7 @@ class DocType(AccountsController): def on_trash(self): pass #if self.doc.amended_from: - # webnotes.delete_doc("Journal Voucher", self.doc.amended_from) + # frappe.delete_doc("Journal Voucher", self.doc.amended_from) def validate_debit_credit(self): for d in getlist(self.doclist, 'entries'): @@ -75,7 +75,7 @@ class DocType(AccountsController): for d in getlist(self.doclist,'entries'): if not d.is_advance and not d.against_voucher and \ not d.against_invoice and not d.against_jv: - master_type = webnotes.conn.get_value("Account", d.account, "master_type") + master_type = frappe.conn.get_value("Account", d.account, "master_type") if (master_type == 'Customer' and flt(d.credit) > 0) or \ (master_type == 'Supplier' and flt(d.debit) > 0): msgprint("Message: Please check Is Advance as 'Yes' against \ @@ -87,7 +87,7 @@ class DocType(AccountsController): if d.against_jv == self.doc.name: msgprint("You can not enter current voucher in 'Against JV' column", raise_exception=1) - elif not webnotes.conn.sql("""select name from `tabJournal Voucher Detail` + elif not frappe.conn.sql("""select name from `tabJournal Voucher Detail` where account = '%s' and docstatus = 1 and parent = '%s'""" % (d.account, d.against_jv)): msgprint("Against JV: %s is not valid." % d.against_jv, raise_exception=1) @@ -125,12 +125,12 @@ class DocType(AccountsController): for d in getlist(self.doclist, 'entries'): if d.against_invoice and d.credit: - currency = webnotes.conn.get_value("Sales Invoice", d.against_invoice, "currency") + currency = frappe.conn.get_value("Sales Invoice", d.against_invoice, "currency") r.append('%s %s against Invoice: %s' % (cstr(currency), fmt_money(flt(d.credit)), d.against_invoice)) if d.against_voucher and d.debit: - bill_no = webnotes.conn.sql("""select bill_no, bill_date, currency + bill_no = frappe.conn.sql("""select bill_no, bill_date, currency from `tabPurchase Invoice` where name=%s""", d.against_voucher) if bill_no and bill_no[0][0] and bill_no[0][0].lower().strip() \ not in ['na', 'not applicable', 'none']: @@ -144,7 +144,7 @@ class DocType(AccountsController): if r: self.doc.remark = ("\n").join(r) else: - webnotes.msgprint("User Remarks is mandatory", raise_exception=1) + frappe.msgprint("User Remarks is mandatory", raise_exception=1) def set_aging_date(self): if self.doc.is_opening != 'Yes': @@ -153,7 +153,7 @@ class DocType(AccountsController): # check account type whether supplier or customer exists = False for d in getlist(self.doclist, 'entries'): - account_type = webnotes.conn.get_value("Account", d.account, "account_type") + account_type = frappe.conn.get_value("Account", d.account, "account_type") if account_type in ["Supplier", "Customer"]: exists = True break @@ -166,12 +166,12 @@ class DocType(AccountsController): def set_print_format_fields(self): for d in getlist(self.doclist, 'entries'): - account_type, master_type = webnotes.conn.get_value("Account", d.account, + account_type, master_type = frappe.conn.get_value("Account", d.account, ["account_type", "master_type"]) if master_type in ['Supplier', 'Customer']: if not self.doc.pay_to_recd_from: - self.doc.pay_to_recd_from = webnotes.conn.get_value(master_type, + self.doc.pay_to_recd_from = frappe.conn.get_value(master_type, ' - '.join(d.account.split(' - ')[:-1]), master_type == 'Customer' and 'customer_name' or 'supplier_name') @@ -179,7 +179,7 @@ class DocType(AccountsController): company_currency = get_company_currency(self.doc.company) amt = flt(d.debit) and d.debit or d.credit self.doc.total_amount = company_currency + ' ' + cstr(amt) - from webnotes.utils import money_in_words + from frappe.utils import money_in_words self.doc.total_amount_in_words = money_in_words(amt, company_currency) def check_credit_days(self): @@ -190,7 +190,7 @@ class DocType(AccountsController): if date_diff <= 0: return # Get List of Customer Account - acc_list = filter(lambda d: webnotes.conn.get_value("Account", d.account, + acc_list = filter(lambda d: frappe.conn.get_value("Account", d.account, "master_type")=='Customer', getlist(self.doclist,'entries')) for d in acc_list: @@ -202,11 +202,11 @@ class DocType(AccountsController): def get_credit_days_for(self, ac): if not self.credit_days_for.has_key(ac): - self.credit_days_for[ac] = cint(webnotes.conn.get_value("Account", ac, "credit_days")) + self.credit_days_for[ac] = cint(frappe.conn.get_value("Account", ac, "credit_days")) if not self.credit_days_for[ac]: if self.credit_days_global==-1: - self.credit_days_global = cint(webnotes.conn.get_value("Company", + self.credit_days_global = cint(frappe.conn.get_value("Company", self.doc.company, "credit_days")) return self.credit_days_global @@ -218,25 +218,25 @@ class DocType(AccountsController): self.is_approving_authority = 0 # Fetch credit controller role - approving_authority = webnotes.conn.get_value("Global Defaults", None, + approving_authority = frappe.conn.get_value("Global Defaults", None, "credit_controller") # Check logged-in user is authorized - if approving_authority in webnotes.user.get_roles(): + if approving_authority in frappe.user.get_roles(): self.is_approving_authority = 1 return self.is_approving_authority def check_account_against_entries(self): for d in self.doclist.get({"parentfield": "entries"}): - if d.against_invoice and webnotes.conn.get_value("Sales Invoice", + if d.against_invoice and frappe.conn.get_value("Sales Invoice", d.against_invoice, "debit_to") != d.account: - webnotes.throw(_("Row #") + cstr(d.idx) + ": " + + frappe.throw(_("Row #") + cstr(d.idx) + ": " + _("Account is not matching with Debit To account of Sales Invoice")) - if d.against_voucher and webnotes.conn.get_value("Purchase Invoice", + if d.against_voucher and frappe.conn.get_value("Purchase Invoice", d.against_voucher, "credit_to") != d.account: - webnotes.throw(_("Row #") + cstr(d.idx) + ": " + + frappe.throw(_("Row #") + cstr(d.idx) + ": " + _("Account is not matching with Credit To account of Purchase Invoice")) def make_gl_entries(self, cancel=0, adv_adj=0): @@ -267,7 +267,7 @@ class DocType(AccountsController): def check_credit_limit(self): for d in self.doclist.get({"parentfield": "entries"}): - master_type, master_name = webnotes.conn.get_value("Account", d.account, + master_type, master_name = frappe.conn.get_value("Account", d.account, ["master_type", "master_name"]) if master_type == "Customer" and master_name: super(DocType, self).check_credit_limit(d.account) @@ -328,18 +328,18 @@ class DocType(AccountsController): cond = (flt(self.doc.write_off_amount) > 0) and \ ' and outstanding_amount <= '+ self.doc.write_off_amount or '' if self.doc.write_off_based_on == 'Accounts Receivable': - return webnotes.conn.sql("""select name, debit_to, outstanding_amount + return frappe.conn.sql("""select name, debit_to, outstanding_amount from `tabSales Invoice` where docstatus = 1 and company = %s and outstanding_amount > 0 %s""" % ('%s', cond), self.doc.company) elif self.doc.write_off_based_on == 'Accounts Payable': - return webnotes.conn.sql("""select name, credit_to, outstanding_amount + return frappe.conn.sql("""select name, credit_to, outstanding_amount from `tabPurchase Invoice` where docstatus = 1 and company = %s and outstanding_amount > 0 %s""" % ('%s', cond), self.doc.company) -@webnotes.whitelist() +@frappe.whitelist() def get_default_bank_cash_account(company, voucher_type): from erpnext.accounts.utils import get_balance_on - account = webnotes.conn.get_value("Company", company, + account = frappe.conn.get_value("Company", company, voucher_type=="Bank Voucher" and "default_bank_account" or "default_cash_account") if account: return { @@ -347,10 +347,10 @@ def get_default_bank_cash_account(company, voucher_type): "balance": get_balance_on(account) } -@webnotes.whitelist() +@frappe.whitelist() def get_payment_entry_from_sales_invoice(sales_invoice): from erpnext.accounts.utils import get_balance_on - si = webnotes.bean("Sales Invoice", sales_invoice) + si = frappe.bean("Sales Invoice", sales_invoice) jv = get_payment_entry(si.doc) jv.doc.remark = 'Payment received against Sales Invoice %(name)s. %(remarks)s' % si.doc.fields @@ -365,10 +365,10 @@ def get_payment_entry_from_sales_invoice(sales_invoice): return [d.fields for d in jv.doclist] -@webnotes.whitelist() +@frappe.whitelist() def get_payment_entry_from_purchase_invoice(purchase_invoice): from erpnext.accounts.utils import get_balance_on - pi = webnotes.bean("Purchase Invoice", purchase_invoice) + pi = frappe.bean("Purchase Invoice", purchase_invoice) jv = get_payment_entry(pi.doc) jv.doc.remark = 'Payment against Purchase Invoice %(name)s. %(remarks)s' % pi.doc.fields @@ -386,7 +386,7 @@ def get_payment_entry_from_purchase_invoice(purchase_invoice): def get_payment_entry(doc): bank_account = get_default_bank_cash_account(doc.company, "Bank Voucher") - jv = webnotes.new_bean('Journal Voucher') + jv = frappe.new_bean('Journal Voucher') jv.doc.voucher_type = 'Bank Voucher' jv.doc.company = doc.company @@ -408,42 +408,42 @@ def get_payment_entry(doc): return jv -@webnotes.whitelist() +@frappe.whitelist() def get_opening_accounts(company): """get all balance sheet accounts for opening entry""" from erpnext.accounts.utils import get_balance_on - accounts = webnotes.conn.sql_list("""select name from tabAccount + accounts = frappe.conn.sql_list("""select name from tabAccount where group_or_ledger='Ledger' and is_pl_account='No' and company=%s""", company) return [{"account": a, "balance": get_balance_on(a)} for a in accounts] def get_against_purchase_invoice(doctype, txt, searchfield, start, page_len, filters): - return webnotes.conn.sql("""select name, credit_to, outstanding_amount, bill_no, bill_date + return frappe.conn.sql("""select name, credit_to, outstanding_amount, bill_no, bill_date from `tabPurchase Invoice` where credit_to = %s and docstatus = 1 and outstanding_amount > 0 and %s like %s order by name desc limit %s, %s""" % ("%s", searchfield, "%s", "%s", "%s"), (filters["account"], "%%%s%%" % txt, start, page_len)) def get_against_sales_invoice(doctype, txt, searchfield, start, page_len, filters): - return webnotes.conn.sql("""select name, debit_to, outstanding_amount + return frappe.conn.sql("""select name, debit_to, outstanding_amount from `tabSales Invoice` where debit_to = %s and docstatus = 1 and outstanding_amount > 0 and `%s` like %s order by name desc limit %s, %s""" % ("%s", searchfield, "%s", "%s", "%s"), (filters["account"], "%%%s%%" % txt, start, page_len)) def get_against_jv(doctype, txt, searchfield, start, page_len, filters): - return webnotes.conn.sql("""select jv.name, jv.posting_date, jv.user_remark + return frappe.conn.sql("""select jv.name, jv.posting_date, jv.user_remark from `tabJournal Voucher` jv, `tabJournal Voucher Detail` jv_detail where jv_detail.parent = jv.name and jv_detail.account = %s and jv.docstatus = 1 and jv.%s like %s order by jv.name desc limit %s, %s""" % ("%s", searchfield, "%s", "%s", "%s"), (filters["account"], "%%%s%%" % txt, start, page_len)) -@webnotes.whitelist() +@frappe.whitelist() def get_outstanding(args): args = eval(args) if args.get("doctype") == "Journal Voucher" and args.get("account"): - against_jv_amount = webnotes.conn.sql(""" + against_jv_amount = frappe.conn.sql(""" select sum(ifnull(debit, 0)) - sum(ifnull(credit, 0)) from `tabJournal Voucher Detail` where parent=%s and account=%s and ifnull(against_invoice, '')='' and ifnull(against_voucher, '')='' @@ -457,11 +457,11 @@ def get_outstanding(args): elif args.get("doctype") == "Sales Invoice": return { - "credit": flt(webnotes.conn.get_value("Sales Invoice", args["docname"], + "credit": flt(frappe.conn.get_value("Sales Invoice", args["docname"], "outstanding_amount")) } elif args.get("doctype") == "Purchase Invoice": return { - "debit": flt(webnotes.conn.get_value("Purchase Invoice", args["docname"], + "debit": flt(frappe.conn.get_value("Purchase Invoice", args["docname"], "outstanding_amount")) } diff --git a/erpnext/accounts/doctype/journal_voucher/test_journal_voucher.py b/erpnext/accounts/doctype/journal_voucher/test_journal_voucher.py index 587445f2ef4..4497726aeca 100644 --- a/erpnext/accounts/doctype/journal_voucher/test_journal_voucher.py +++ b/erpnext/accounts/doctype/journal_voucher/test_journal_voucher.py @@ -4,40 +4,40 @@ from __future__ import unicode_literals import unittest -import webnotes +import frappe class TestJournalVoucher(unittest.TestCase): def test_journal_voucher_with_against_jv(self): self.clear_account_balance() - jv_invoice = webnotes.bean(copy=test_records[2]) + jv_invoice = frappe.bean(copy=test_records[2]) jv_invoice.insert() jv_invoice.submit() - self.assertTrue(not webnotes.conn.sql("""select name from `tabJournal Voucher Detail` + self.assertTrue(not frappe.conn.sql("""select name from `tabJournal Voucher Detail` where against_jv=%s""", jv_invoice.doc.name)) - jv_payment = webnotes.bean(copy=test_records[0]) + jv_payment = frappe.bean(copy=test_records[0]) jv_payment.doclist[1].against_jv = jv_invoice.doc.name jv_payment.insert() jv_payment.submit() - self.assertTrue(webnotes.conn.sql("""select name from `tabJournal Voucher Detail` + self.assertTrue(frappe.conn.sql("""select name from `tabJournal Voucher Detail` where against_jv=%s""", jv_invoice.doc.name)) - self.assertTrue(webnotes.conn.sql("""select name from `tabJournal Voucher Detail` + self.assertTrue(frappe.conn.sql("""select name from `tabJournal Voucher Detail` where against_jv=%s and credit=400""", jv_invoice.doc.name)) # cancel jv_invoice jv_invoice.cancel() - self.assertTrue(not webnotes.conn.sql("""select name from `tabJournal Voucher Detail` + self.assertTrue(not frappe.conn.sql("""select name from `tabJournal Voucher Detail` where against_jv=%s""", jv_invoice.doc.name)) def test_jv_against_stock_account(self): from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import set_perpetual_inventory set_perpetual_inventory() - jv = webnotes.bean(copy=test_records[0]) + jv = frappe.bean(copy=test_records[0]) jv.doclist[1].account = "_Test Warehouse - _TC" jv.insert() @@ -47,25 +47,25 @@ class TestJournalVoucher(unittest.TestCase): set_perpetual_inventory(0) def test_monthly_budget_crossed_ignore(self): - webnotes.conn.set_value("Company", "_Test Company", "monthly_bgt_flag", "Ignore") + frappe.conn.set_value("Company", "_Test Company", "monthly_bgt_flag", "Ignore") self.clear_account_balance() - jv = webnotes.bean(copy=test_records[0]) + jv = frappe.bean(copy=test_records[0]) jv.doclist[2].account = "_Test Account Cost for Goods Sold - _TC" jv.doclist[2].cost_center = "_Test Cost Center - _TC" jv.doclist[2].debit = 20000.0 jv.doclist[1].credit = 20000.0 jv.insert() jv.submit() - self.assertTrue(webnotes.conn.get_value("GL Entry", + self.assertTrue(frappe.conn.get_value("GL Entry", {"voucher_type": "Journal Voucher", "voucher_no": jv.doc.name})) def test_monthly_budget_crossed_stop(self): from erpnext.accounts.utils import BudgetError - webnotes.conn.set_value("Company", "_Test Company", "monthly_bgt_flag", "Stop") + frappe.conn.set_value("Company", "_Test Company", "monthly_bgt_flag", "Stop") self.clear_account_balance() - jv = webnotes.bean(copy=test_records[0]) + jv = frappe.bean(copy=test_records[0]) jv.doclist[2].account = "_Test Account Cost for Goods Sold - _TC" jv.doclist[2].cost_center = "_Test Cost Center - _TC" jv.doclist[2].debit = 20000.0 @@ -74,16 +74,16 @@ class TestJournalVoucher(unittest.TestCase): self.assertRaises(BudgetError, jv.submit) - webnotes.conn.set_value("Company", "_Test Company", "monthly_bgt_flag", "Ignore") + frappe.conn.set_value("Company", "_Test Company", "monthly_bgt_flag", "Ignore") def test_yearly_budget_crossed_stop(self): from erpnext.accounts.utils import BudgetError self.clear_account_balance() self.test_monthly_budget_crossed_ignore() - webnotes.conn.set_value("Company", "_Test Company", "yearly_bgt_flag", "Stop") + frappe.conn.set_value("Company", "_Test Company", "yearly_bgt_flag", "Stop") - jv = webnotes.bean(copy=test_records[0]) + jv = frappe.bean(copy=test_records[0]) jv.doc.posting_date = "2013-08-12" jv.doclist[2].account = "_Test Account Cost for Goods Sold - _TC" jv.doclist[2].cost_center = "_Test Cost Center - _TC" @@ -93,39 +93,39 @@ class TestJournalVoucher(unittest.TestCase): self.assertRaises(BudgetError, jv.submit) - webnotes.conn.set_value("Company", "_Test Company", "yearly_bgt_flag", "Ignore") + frappe.conn.set_value("Company", "_Test Company", "yearly_bgt_flag", "Ignore") def test_monthly_budget_on_cancellation(self): from erpnext.accounts.utils import BudgetError - webnotes.conn.set_value("Company", "_Test Company", "monthly_bgt_flag", "Stop") + frappe.conn.set_value("Company", "_Test Company", "monthly_bgt_flag", "Stop") self.clear_account_balance() - jv = webnotes.bean(copy=test_records[0]) + jv = frappe.bean(copy=test_records[0]) jv.doclist[1].account = "_Test Account Cost for Goods Sold - _TC" jv.doclist[1].cost_center = "_Test Cost Center - _TC" jv.doclist[1].credit = 30000.0 jv.doclist[2].debit = 30000.0 jv.submit() - self.assertTrue(webnotes.conn.get_value("GL Entry", + self.assertTrue(frappe.conn.get_value("GL Entry", {"voucher_type": "Journal Voucher", "voucher_no": jv.doc.name})) - jv1 = webnotes.bean(copy=test_records[0]) + jv1 = frappe.bean(copy=test_records[0]) jv1.doclist[2].account = "_Test Account Cost for Goods Sold - _TC" jv1.doclist[2].cost_center = "_Test Cost Center - _TC" jv1.doclist[2].debit = 40000.0 jv1.doclist[1].credit = 40000.0 jv1.submit() - self.assertTrue(webnotes.conn.get_value("GL Entry", + self.assertTrue(frappe.conn.get_value("GL Entry", {"voucher_type": "Journal Voucher", "voucher_no": jv1.doc.name})) self.assertRaises(BudgetError, jv.cancel) - webnotes.conn.set_value("Company", "_Test Company", "monthly_bgt_flag", "Ignore") + frappe.conn.set_value("Company", "_Test Company", "monthly_bgt_flag", "Ignore") def clear_account_balance(self): - webnotes.conn.sql("""delete from `tabGL Entry`""") + frappe.conn.sql("""delete from `tabGL Entry`""") test_records = [ diff --git a/erpnext/accounts/doctype/journal_voucher_detail/journal_voucher_detail.py b/erpnext/accounts/doctype/journal_voucher_detail/journal_voucher_detail.py index cb6190f2985..26c87f1c04a 100644 --- a/erpnext/accounts/doctype/journal_voucher_detail/journal_voucher_detail.py +++ b/erpnext/accounts/doctype/journal_voucher_detail/journal_voucher_detail.py @@ -2,7 +2,7 @@ # License: GNU General Public License v3. See license.txt from __future__ import unicode_literals -import webnotes +import frappe class DocType: def __init__(self, d, dl): diff --git a/erpnext/accounts/doctype/mis_control/mis_control.py b/erpnext/accounts/doctype/mis_control/mis_control.py index d2c09613a9e..102fb017879 100644 --- a/erpnext/accounts/doctype/mis_control/mis_control.py +++ b/erpnext/accounts/doctype/mis_control/mis_control.py @@ -2,9 +2,9 @@ # License: GNU General Public License v3. See license.txt from __future__ import unicode_literals -import webnotes -from webnotes.utils import flt, get_first_day, get_last_day, has_common -import webnotes.defaults +import frappe +from frappe.utils import flt, get_first_day, get_last_day, has_common +import frappe.defaults from erpnext.accounts.utils import get_balance_on class DocType: @@ -33,7 +33,7 @@ class DocType: ret['company'] = get_companies() #--- to get fiscal year and start_date of that fiscal year ----- - res = webnotes.conn.sql("select name, year_start_date from `tabFiscal Year`") + res = frappe.conn.sql("select name, year_start_date from `tabFiscal Year`") ret['fiscal_year'] = [r[0] for r in res] ret['start_dates'] = {} for r in res: @@ -41,7 +41,7 @@ class DocType: #--- from month and to month (for MIS - Comparison Report) ------- month_list = ['Jan','Feb','Mar','Apr','May','Jun','Jul','Aug','Sep','Oct','Nov','Dec'] - fiscal_start_month = webnotes.conn.sql("select MONTH(year_start_date) from `tabFiscal Year` where name = %s",(webnotes.defaults.get_global_default("fiscal_year"))) + fiscal_start_month = frappe.conn.sql("select MONTH(year_start_date) from `tabFiscal Year` where name = %s",(frappe.defaults.get_global_default("fiscal_year"))) fiscal_start_month = fiscal_start_month and fiscal_start_month[0][0] or 1 mon = [''] for i in range(fiscal_start_month,13): mon.append(month_list[i-1]) @@ -49,7 +49,7 @@ class DocType: ret['month'] = mon # get MIS Type on basis of roles of session user - self.roles = webnotes.user.get_roles() + self.roles = frappe.user.get_roles() if has_common(self.roles, ['Sales Manager']): type.append('Sales') if has_common(self.roles, ['Purchase Manager']): @@ -76,7 +76,7 @@ class DocType: return self.return_data def get_children(self, parent_account, level, pl, company, fy): - cl = webnotes.conn.sql("select distinct account_name, name, debit_or_credit, lft, rgt from `tabAccount` where ifnull(parent_account, '') = %s and ifnull(is_pl_account, 'No')=%s and company=%s and docstatus != 2 order by name asc", (parent_account, pl, company)) + cl = frappe.conn.sql("select distinct account_name, name, debit_or_credit, lft, rgt from `tabAccount` where ifnull(parent_account, '') = %s and ifnull(is_pl_account, 'No')=%s and company=%s and docstatus != 2 order by name asc", (parent_account, pl, company)) level0_diff = [0 for p in self.period_list] if pl=='Yes' and level==0: # switch for income & expenses cl = [c for c in cl] @@ -123,7 +123,7 @@ class DocType: self.return_data.append([4, 'Total '+c[0]] + totals) def define_periods(self, year, period): - ysd = webnotes.conn.sql("select year_start_date from `tabFiscal Year` where name=%s", year) + ysd = frappe.conn.sql("select year_start_date from `tabFiscal Year` where name=%s", year) ysd = ysd and ysd[0][0] or '' self.ysd = ysd diff --git a/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py b/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py index cb6190f2985..26c87f1c04a 100644 --- a/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +++ b/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py @@ -2,7 +2,7 @@ # License: GNU General Public License v3. See license.txt from __future__ import unicode_literals -import webnotes +import frappe class DocType: def __init__(self, d, dl): diff --git a/erpnext/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.js b/erpnext/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.js index 6f7d5154498..48cb789bd88 100644 --- a/erpnext/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.js +++ b/erpnext/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.js @@ -13,15 +13,15 @@ cur_frm.cscript.onload_post_render = function(doc) { cur_frm.cscript.refresh = function(doc) { cur_frm.set_intro(""); if(!doc.voucher_no) { - cur_frm.set_intro(wn._("Select the Invoice against which you want to allocate payments.")); + cur_frm.set_intro(frappe._("Select the Invoice against which you want to allocate payments.")); } else { - cur_frm.set_intro(wn._("Set allocated amount against each Payment Entry and click 'Allocate'.")); + cur_frm.set_intro(frappe._("Set allocated amount against each Payment Entry and click 'Allocate'.")); } } cur_frm.fields_dict.voucher_no.get_query = function(doc) { // TO-do: check for pos, it should not come - if (!doc.account) msgprint(wn._("Please select Account first")); + if (!doc.account) msgprint(frappe._("Please select Account first")); else { return { doctype: doc.voucher_type, @@ -40,7 +40,7 @@ cur_frm.cscript.voucher_no =function(doc, cdt, cdn) { } cur_frm.cscript.account = function(doc, cdt, cdn) { - return wn.call({ + return frappe.call({ doc: this.frm.doc, method: "set_account_type", callback: function(r) { diff --git a/erpnext/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.py b/erpnext/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.py index 2904c7d6952..ceea672a57c 100644 --- a/erpnext/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.py +++ b/erpnext/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.py @@ -2,12 +2,12 @@ # License: GNU General Public License v3. See license.txt from __future__ import unicode_literals -import webnotes +import frappe -from webnotes.utils import flt -from webnotes.model.doc import addchild -from webnotes.model.bean import getlist -from webnotes import msgprint +from frappe.utils import flt +from frappe.model.doc import addchild +from frappe.model.bean import getlist +from frappe import msgprint class DocType: def __init__(self, doc, doclist): @@ -16,17 +16,17 @@ class DocType: def set_account_type(self): self.doc.account_type = self.doc.account and \ - webnotes.conn.get_value("Account", self.doc.account, "debit_or_credit").lower() or "" + frappe.conn.get_value("Account", self.doc.account, "debit_or_credit").lower() or "" def get_voucher_details(self): - total_amount = webnotes.conn.sql("""select sum(%s) from `tabGL Entry` + total_amount = frappe.conn.sql("""select sum(%s) from `tabGL Entry` where voucher_type = %s and voucher_no = %s and account = %s""" % (self.doc.account_type, '%s', '%s', '%s'), (self.doc.voucher_type, self.doc.voucher_no, self.doc.account)) total_amount = total_amount and flt(total_amount[0][0]) or 0 - reconciled_payment = webnotes.conn.sql(""" + reconciled_payment = frappe.conn.sql(""" select sum(ifnull(%s, 0)) - sum(ifnull(%s, 0)) from `tabGL Entry` where against_voucher = %s and voucher_no != %s and account = %s""" % @@ -63,7 +63,7 @@ class DocType: cond += self.doc.amt_less_than and \ ' and t2.' + dc+' <= ' + self.doc.amt_less_than or '' - gle = webnotes.conn.sql(""" + gle = frappe.conn.sql(""" select t1.name as voucher_no, t1.posting_date, t1.total_debit as total_amt, sum(ifnull(t2.credit, 0)) - sum(ifnull(t2.debit, 0)) as amt_due, t1.remark, t2.against_account, t2.name as voucher_detail_no @@ -99,7 +99,7 @@ class DocType: 2. split into multiple rows if partially adjusted, assign against voucher 3. submit payment voucher """ - if not self.doc.voucher_no or not webnotes.conn.sql("""select name from `tab%s` + if not self.doc.voucher_no or not frappe.conn.sql("""select name from `tab%s` where name = %s""" % (self.doc.voucher_type, '%s'), self.doc.voucher_no): msgprint("Please select valid Voucher No to proceed", raise_exception=1) @@ -130,7 +130,7 @@ class DocType: def gl_entry_details(doctype, txt, searchfield, start, page_len, filters): from erpnext.controllers.queries import get_match_cond - return webnotes.conn.sql("""select gle.voucher_no, gle.posting_date, + return frappe.conn.sql("""select gle.voucher_no, gle.posting_date, gle.%(account_type)s from `tabGL Entry` gle where gle.account = '%(acc)s' and gle.voucher_type = '%(dt)s' diff --git a/erpnext/accounts/doctype/payment_to_invoice_matching_tool/test_payment_to_invoice_matching_tool.py b/erpnext/accounts/doctype/payment_to_invoice_matching_tool/test_payment_to_invoice_matching_tool.py index 7cf8c06db4b..fed02523765 100644 --- a/erpnext/accounts/doctype/payment_to_invoice_matching_tool/test_payment_to_invoice_matching_tool.py +++ b/erpnext/accounts/doctype/payment_to_invoice_matching_tool/test_payment_to_invoice_matching_tool.py @@ -3,6 +3,6 @@ from __future__ import unicode_literals import unittest -import webnotes +import frappe test_records = [] \ No newline at end of file diff --git a/erpnext/accounts/doctype/payment_to_invoice_matching_tool_detail/payment_to_invoice_matching_tool_detail.py b/erpnext/accounts/doctype/payment_to_invoice_matching_tool_detail/payment_to_invoice_matching_tool_detail.py index cb6190f2985..26c87f1c04a 100644 --- a/erpnext/accounts/doctype/payment_to_invoice_matching_tool_detail/payment_to_invoice_matching_tool_detail.py +++ b/erpnext/accounts/doctype/payment_to_invoice_matching_tool_detail/payment_to_invoice_matching_tool_detail.py @@ -2,7 +2,7 @@ # License: GNU General Public License v3. See license.txt from __future__ import unicode_literals -import webnotes +import frappe class DocType: def __init__(self, d, dl): diff --git a/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py b/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py index 5a37d84cdce..753b7dbe078 100644 --- a/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +++ b/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py @@ -2,9 +2,9 @@ # License: GNU General Public License v3. See license.txt from __future__ import unicode_literals -import webnotes -from webnotes.utils import cstr, flt, getdate -from webnotes import msgprint, _ +import frappe +from frappe.utils import cstr, flt, getdate +from frappe import msgprint, _ from erpnext.controllers.accounts_controller import AccountsController class DocType(AccountsController): @@ -21,30 +21,30 @@ class DocType(AccountsController): self.make_gl_entries() def on_cancel(self): - webnotes.conn.sql("""delete from `tabGL Entry` + frappe.conn.sql("""delete from `tabGL Entry` where voucher_type = 'Period Closing Voucher' and voucher_no=%s""", self.doc.name) def validate_account_head(self): - debit_or_credit, is_pl_account = webnotes.conn.get_value("Account", + debit_or_credit, is_pl_account = frappe.conn.get_value("Account", self.doc.closing_account_head, ["debit_or_credit", "is_pl_account"]) if debit_or_credit != 'Credit' or is_pl_account != 'No': - webnotes.throw(_("Account") + ": " + self.doc.closing_account_head + + frappe.throw(_("Account") + ": " + self.doc.closing_account_head + _("must be a Liability account")) def validate_posting_date(self): from erpnext.accounts.utils import get_fiscal_year self.year_start_date = get_fiscal_year(self.doc.posting_date, self.doc.fiscal_year)[1] - pce = webnotes.conn.sql("""select name from `tabPeriod Closing Voucher` + pce = frappe.conn.sql("""select name from `tabPeriod Closing Voucher` where posting_date > %s and fiscal_year = %s and docstatus = 1""", (self.doc.posting_date, self.doc.fiscal_year)) if pce and pce[0][0]: - webnotes.throw(_("Another Period Closing Entry") + ": " + cstr(pce[0][0]) + + frappe.throw(_("Another Period Closing Entry") + ": " + cstr(pce[0][0]) + _("has been made after posting date") + ": " + self.doc.posting_date) def validate_pl_balances(self): - income_bal = webnotes.conn.sql(""" + income_bal = frappe.conn.sql(""" select sum(ifnull(t1.debit,0))-sum(ifnull(t1.credit,0)) from `tabGL Entry` t1, tabAccount t2 where t1.account = t2.name and t1.posting_date between %s and %s @@ -52,7 +52,7 @@ class DocType(AccountsController): and t2.docstatus < 2 and t2.company = %s""", (self.year_start_date, self.doc.posting_date, self.doc.company)) - expense_bal = webnotes.conn.sql(""" + expense_bal = frappe.conn.sql(""" select sum(ifnull(t1.debit,0))-sum(ifnull(t1.credit,0)) from `tabGL Entry` t1, tabAccount t2 where t1.account = t2.name and t1.posting_date between %s and %s @@ -64,11 +64,11 @@ class DocType(AccountsController): expense_bal = expense_bal and expense_bal[0][0] or 0 if not income_bal and not expense_bal: - webnotes.throw(_("Both Income and Expense balances are zero. No Need to make Period Closing Entry.")) + frappe.throw(_("Both Income and Expense balances are zero. No Need to make Period Closing Entry.")) def get_pl_balances(self): """Get balance for pl accounts""" - return webnotes.conn.sql(""" + return frappe.conn.sql(""" select t1.account, sum(ifnull(t1.debit,0))-sum(ifnull(t1.credit,0)) as balance from `tabGL Entry` t1, `tabAccount` t2 where t1.account = t2.name and ifnull(t2.is_pl_account, 'No') = 'Yes' diff --git a/erpnext/accounts/doctype/period_closing_voucher/test_period_closing_voucher.py b/erpnext/accounts/doctype/period_closing_voucher/test_period_closing_voucher.py index c779d9be86d..5039e884892 100644 --- a/erpnext/accounts/doctype/period_closing_voucher/test_period_closing_voucher.py +++ b/erpnext/accounts/doctype/period_closing_voucher/test_period_closing_voucher.py @@ -4,30 +4,30 @@ from __future__ import unicode_literals import unittest -import webnotes +import frappe class TestPeriodClosingVoucher(unittest.TestCase): def test_closing_entry(self): # clear GL Entries - webnotes.conn.sql("""delete from `tabGL Entry`""") + frappe.conn.sql("""delete from `tabGL Entry`""") from erpnext.accounts.doctype.journal_voucher.test_journal_voucher import test_records as jv_records - jv = webnotes.bean(copy=jv_records[2]) + jv = frappe.bean(copy=jv_records[2]) jv.insert() jv.submit() - jv1 = webnotes.bean(copy=jv_records[0]) + jv1 = frappe.bean(copy=jv_records[0]) jv1.doclist[2].account = "_Test Account Cost for Goods Sold - _TC" jv1.doclist[2].debit = 600.0 jv1.doclist[1].credit = 600.0 jv1.insert() jv1.submit() - pcv = webnotes.bean(copy=test_record) + pcv = frappe.bean(copy=test_record) pcv.insert() pcv.submit() - gl_entries = webnotes.conn.sql("""select account, debit, credit + gl_entries = frappe.conn.sql("""select account, debit, credit from `tabGL Entry` where voucher_type='Period Closing Voucher' and voucher_no=%s order by account asc, debit asc""", pcv.doc.name, as_dict=1) diff --git a/erpnext/accounts/doctype/pos_setting/pos_setting.js b/erpnext/accounts/doctype/pos_setting/pos_setting.js index 5c291b403a4..f7fcdfe162d 100755 --- a/erpnext/accounts/doctype/pos_setting/pos_setting.js +++ b/erpnext/accounts/doctype/pos_setting/pos_setting.js @@ -74,5 +74,5 @@ cur_frm.fields_dict['select_print_heading'].get_query = function(doc, cdt, cdn) cur_frm.fields_dict.user.get_query = function(doc,cdt,cdn) { - return{ query:"webnotes.core.doctype.profile.profile.profile_query"} + return{ query:"frappe.core.doctype.profile.profile.profile_query"} } diff --git a/erpnext/accounts/doctype/pos_setting/pos_setting.py b/erpnext/accounts/doctype/pos_setting/pos_setting.py index 31988599454..e743fb34c43 100755 --- a/erpnext/accounts/doctype/pos_setting/pos_setting.py +++ b/erpnext/accounts/doctype/pos_setting/pos_setting.py @@ -2,17 +2,17 @@ # License: GNU General Public License v3. See license.txt from __future__ import unicode_literals -import webnotes -from webnotes import msgprint, _ -from webnotes.utils import cint +import frappe +from frappe import msgprint, _ +from frappe.utils import cint class DocType: def __init__(self,doc,doclist): self.doc, self.doclist = doc,doclist def get_series(self): - import webnotes.model.doctype - docfield = webnotes.model.doctype.get('Sales Invoice') + import frappe.model.doctype + docfield = frappe.model.doctype.get('Sales Invoice') series = [d.options for d in docfield if d.doctype == 'DocField' and d.fieldname == 'naming_series'] return series and series[0] or '' @@ -23,7 +23,7 @@ class DocType: self.validate_all_link_fields() def check_for_duplicate(self): - res = webnotes.conn.sql("""select name, user from `tabPOS Setting` + res = frappe.conn.sql("""select name, user from `tabPOS Setting` where ifnull(user, '') = %s and name != %s and company = %s""", (self.doc.user, self.doc.name, self.doc.company)) if res: @@ -35,7 +35,7 @@ class DocType: (res[0][0], self.doc.company), raise_exception=1) def validate_expense_account(self): - if cint(webnotes.defaults.get_global_default("auto_accounting_for_stock")) \ + if cint(frappe.defaults.get_global_default("auto_accounting_for_stock")) \ and not self.doc.expense_account: msgprint(_("Expense Account is mandatory"), raise_exception=1) @@ -46,19 +46,19 @@ class DocType: for link_dt, dn_list in accounts.items(): for link_dn in dn_list: - if link_dn and not webnotes.conn.exists({"doctype": link_dt, + if link_dn and not frappe.conn.exists({"doctype": link_dt, "company": self.doc.company, "name": link_dn}): - webnotes.throw(link_dn +_(" does not belong to ") + self.doc.company) + frappe.throw(link_dn +_(" does not belong to ") + self.doc.company) def on_update(self): - webnotes.defaults.clear_default("is_pos") + frappe.defaults.clear_default("is_pos") - pos_view_users = webnotes.conn.sql_list("""select user from `tabPOS Setting`""") + pos_view_users = frappe.conn.sql_list("""select user from `tabPOS Setting`""") for user in pos_view_users: if user: - webnotes.defaults.set_user_default("is_pos", 1, user) + frappe.defaults.set_user_default("is_pos", 1, user) else: - webnotes.defaults.set_global_default("is_pos", 1) + frappe.defaults.set_global_default("is_pos", 1) def on_trash(self): self.on_update() \ No newline at end of file diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js index deece757e6a..202179d4d6d 100644 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js @@ -5,7 +5,7 @@ cur_frm.cscript.tname = "Purchase Invoice Item"; cur_frm.cscript.fname = "entries"; cur_frm.cscript.other_fname = "other_charges"; -wn.provide("erpnext.accounts"); +frappe.provide("erpnext.accounts"); {% include 'buying/doctype/purchase_common/purchase_common.js' %}; {% include 'accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.js' %} {% include 'accounts/doctype/sales_invoice/pos.js' %} @@ -27,25 +27,25 @@ erpnext.accounts.PurchaseInvoice = erpnext.buying.BuyingController.extend({ // Show / Hide button if(doc.docstatus==1 && doc.outstanding_amount > 0) - this.frm.add_custom_button(wn._('Make Payment Entry'), this.make_bank_voucher); + this.frm.add_custom_button(frappe._('Make Payment Entry'), this.make_bank_voucher); if(doc.docstatus==1) { - cur_frm.appframe.add_button(wn._('View Ledger'), function() { - wn.route_options = { + cur_frm.appframe.add_button(frappe._('View Ledger'), function() { + frappe.route_options = { "voucher_no": doc.name, "from_date": doc.posting_date, "to_date": doc.posting_date, "company": doc.company, group_by_voucher: 0 }; - wn.set_route("query-report", "General Ledger"); + frappe.set_route("query-report", "General Ledger"); }, "icon-table"); } if(doc.docstatus===0) { - cur_frm.add_custom_button(wn._('From Purchase Order'), + cur_frm.add_custom_button(frappe._('From Purchase Order'), function() { - wn.model.map_current_doc({ + frappe.model.map_current_doc({ method: "erpnext.buying.doctype.purchase_order.purchase_order.make_purchase_invoice", source_doctype: "Purchase Order", get_query_filters: { @@ -58,9 +58,9 @@ erpnext.accounts.PurchaseInvoice = erpnext.buying.BuyingController.extend({ }) }); - cur_frm.add_custom_button(wn._('From Purchase Receipt'), + cur_frm.add_custom_button(frappe._('From Purchase Receipt'), function() { - wn.model.map_current_doc({ + frappe.model.map_current_doc({ method: "erpnext.stock.doctype.purchase_receipt.purchase_receipt.make_purchase_invoice", source_doctype: "Purchase Receipt", get_query_filters: { @@ -108,7 +108,7 @@ erpnext.accounts.PurchaseInvoice = erpnext.buying.BuyingController.extend({ }, entries_add: function(doc, cdt, cdn) { - var row = wn.model.get_doc(cdt, cdn); + var row = frappe.model.get_doc(cdt, cdn); this.frm.script_manager.copy_from_first_row("entries", row, ["expense_account", "cost_center"]); } }); @@ -121,14 +121,14 @@ cur_frm.cscript.is_opening = function(doc, dt, dn) { } cur_frm.cscript.make_bank_voucher = function() { - return wn.call({ + return frappe.call({ method: "erpnext.accounts.doctype.journal_voucher.journal_voucher.get_payment_entry_from_purchase_invoice", args: { "purchase_invoice": cur_frm.doc.name, }, callback: function(r) { - var doclist = wn.model.sync(r.message); - wn.set_route("Form", doclist[0].doctype, doclist[0].name); + var doclist = frappe.model.sync(r.message); + frappe.set_route("Form", doclist[0].doctype, doclist[0].name); } }); } @@ -229,5 +229,5 @@ cur_frm.cscript.select_print_heading = function(doc,cdt,cdn){ cur_frm.pformat.print_heading = doc.select_print_heading; } else - cur_frm.pformat.print_heading = wn._("Purchase Invoice"); + cur_frm.pformat.print_heading = frappe._("Purchase Invoice"); } \ No newline at end of file diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py index ab7b5b10942..450fdc360c5 100644 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py @@ -2,15 +2,15 @@ # License: GNU General Public License v3. See license.txt from __future__ import unicode_literals -import webnotes +import frappe -from webnotes.utils import add_days, cint, cstr, flt, formatdate -from webnotes.model.bean import getlist -from webnotes.model.code import get_obj -from webnotes import msgprint, _ +from frappe.utils import add_days, cint, cstr, flt, formatdate +from frappe.model.bean import getlist +from frappe.model.code import get_obj +from frappe import msgprint, _ from erpnext.setup.utils import get_company_currency -import webnotes.defaults +import frappe.defaults from erpnext.controllers.buying_controller import BuyingController from erpnext.accounts.party import get_party_account, get_due_date @@ -73,7 +73,7 @@ class DocType(BuyingController): def check_active_purchase_items(self): for d in getlist(self.doclist, 'entries'): if d.item_code: # extra condn coz item_code is not mandatory in PV - valid_item = webnotes.conn.sql("select docstatus,is_purchase_item from tabItem where name = %s",d.item_code) + valid_item = frappe.conn.sql("select docstatus,is_purchase_item from tabItem where name = %s",d.item_code) if valid_item[0][0] == 2: msgprint("Item : '%s' is Inactive, you can restore it from Trash" %(d.item_code)) raise Exception @@ -93,7 +93,7 @@ class DocType(BuyingController): def validate_bill_no(self): if self.doc.bill_no and self.doc.bill_no.lower().strip() \ not in ['na', 'not applicable', 'none']: - b_no = webnotes.conn.sql("""select bill_no, name, ifnull(is_opening,'') from `tabPurchase Invoice` + b_no = frappe.conn.sql("""select bill_no, name, ifnull(is_opening,'') from `tabPurchase Invoice` where bill_no = %s and credit_to = %s and docstatus = 1 and name != %s""", (self.doc.bill_no, self.doc.credit_to, self.doc.name)) if b_no and cstr(b_no[0][2]) == cstr(self.doc.is_opening): @@ -109,7 +109,7 @@ class DocType(BuyingController): self.doc.remarks = "No Remarks" def validate_credit_acc(self): - acc = webnotes.conn.sql("select debit_or_credit, is_pl_account from tabAccount where name = %s", + acc = frappe.conn.sql("select debit_or_credit, is_pl_account from tabAccount where name = %s", self.doc.credit_to) if not acc: msgprint("Account: "+ self.doc.credit_to + "does not exist") @@ -125,7 +125,7 @@ class DocType(BuyingController): # ------------------------------------------------------------ def check_for_acc_head_of_supplier(self): if self.doc.supplier and self.doc.credit_to: - acc_head = webnotes.conn.sql("select master_name from `tabAccount` where name = %s", self.doc.credit_to) + acc_head = frappe.conn.sql("select master_name from `tabAccount` where name = %s", self.doc.credit_to) if (acc_head and cstr(acc_head[0][0]) != cstr(self.doc.supplier)) or (not acc_head and (self.doc.credit_to != cstr(self.doc.supplier) + " - " + self.company_abbr)): msgprint("Credit To: %s do not match with Supplier: %s for Company: %s.\n If both correctly entered, please select Master Type and Master Name in account master." %(self.doc.credit_to,self.doc.supplier,self.doc.company), raise_exception=1) @@ -137,7 +137,7 @@ class DocType(BuyingController): for d in getlist(self.doclist,'entries'): if d.purchase_order and not d.purchase_order in check_list and not d.purchase_receipt: check_list.append(d.purhcase_order) - stopped = webnotes.conn.sql("select name from `tabPurchase Order` where status = 'Stopped' and name = '%s'" % d.purchase_order) + stopped = frappe.conn.sql("select name from `tabPurchase Order` where status = 'Stopped' and name = '%s'" % d.purchase_order) if stopped: msgprint("One cannot do any transaction against 'Purchase Order' : %s, it's status is 'Stopped'" % (d.purhcase_order)) raise Exception @@ -165,7 +165,7 @@ class DocType(BuyingController): } }) - if cint(webnotes.defaults.get_global_default('maintain_same_rate')): + if cint(frappe.defaults.get_global_default('maintain_same_rate')): super(DocType, self).validate_with_previous_doc(self.tname, { "Purchase Order Item": { "ref_dn_field": "po_detail", @@ -189,7 +189,7 @@ class DocType(BuyingController): raise Exception def set_against_expense_account(self): - auto_accounting_for_stock = cint(webnotes.defaults.get_global_default("auto_accounting_for_stock")) + auto_accounting_for_stock = cint(frappe.defaults.get_global_default("auto_accounting_for_stock")) if auto_accounting_for_stock: stock_not_billed_account = self.get_company_default("stock_received_but_not_billed") @@ -218,14 +218,14 @@ class DocType(BuyingController): self.doc.against_expense_account = ",".join(against_accounts) def po_required(self): - if webnotes.conn.get_value("Buying Settings", None, "po_required") == 'Yes': + if frappe.conn.get_value("Buying Settings", None, "po_required") == 'Yes': for d in getlist(self.doclist,'entries'): if not d.purchase_order: msgprint("Purchse Order No. required against item %s"%d.item_code) raise Exception def pr_required(self): - if webnotes.conn.get_value("Buying Settings", None, "pr_required") == 'Yes': + if frappe.conn.get_value("Buying Settings", None, "pr_required") == 'Yes': for d in getlist(self.doclist,'entries'): if not d.purchase_receipt: msgprint("Purchase Receipt No. required against item %s"%d.item_code) @@ -238,13 +238,13 @@ class DocType(BuyingController): def check_prev_docstatus(self): for d in getlist(self.doclist,'entries'): if d.purchase_order: - submitted = webnotes.conn.sql("select name from `tabPurchase Order` where docstatus = 1 and name = '%s'" % d.purchase_order) + submitted = frappe.conn.sql("select name from `tabPurchase Order` where docstatus = 1 and name = '%s'" % d.purchase_order) if not submitted: - webnotes.throw("Purchase Order : "+ cstr(d.purchase_order) +" is not submitted") + frappe.throw("Purchase Order : "+ cstr(d.purchase_order) +" is not submitted") if d.purchase_receipt: - submitted = webnotes.conn.sql("select name from `tabPurchase Receipt` where docstatus = 1 and name = '%s'" % d.purchase_receipt) + submitted = frappe.conn.sql("select name from `tabPurchase Receipt` where docstatus = 1 and name = '%s'" % d.purchase_receipt) if not submitted: - webnotes.throw("Purchase Receipt : "+ cstr(d.purchase_receipt) +" is not submitted") + frappe.throw("Purchase Receipt : "+ cstr(d.purchase_receipt) +" is not submitted") def update_against_document_in_jv(self): @@ -289,7 +289,7 @@ class DocType(BuyingController): def make_gl_entries(self): auto_accounting_for_stock = \ - cint(webnotes.defaults.get_global_default("auto_accounting_for_stock")) + cint(frappe.defaults.get_global_default("auto_accounting_for_stock")) gl_entries = [] @@ -324,7 +324,7 @@ class DocType(BuyingController): # accumulate valuation tax if tax.category in ("Valuation", "Valuation and Total") and flt(tax.tax_amount): if auto_accounting_for_stock and not tax.cost_center: - webnotes.throw(_("Row %(row)s: Cost Center is mandatory \ + frappe.throw(_("Row %(row)s: Cost Center is mandatory \ if tax/charges category is Valuation or Valuation and Total" % {"row": tax.idx})) valuation_tax.setdefault(tax.cost_center, 0) @@ -414,25 +414,25 @@ class DocType(BuyingController): def update_raw_material_cost(self): if self.sub_contracted_items: for d in self.doclist.get({"parentfield": "entries"}): - rm_cost = webnotes.conn.sql("""select raw_material_cost / quantity + rm_cost = frappe.conn.sql("""select raw_material_cost / quantity from `tabBOM` where item = %s and is_default = 1 and docstatus = 1 and is_active = 1 """, (d.item_code,)) rm_cost = rm_cost and flt(rm_cost[0][0]) or 0 - d.conversion_factor = d.conversion_factor or flt(webnotes.conn.get_value( + d.conversion_factor = d.conversion_factor or flt(frappe.conn.get_value( "UOM Conversion Detail", {"parent": d.item_code, "uom": d.uom}, "conversion_factor")) or 1 d.rm_supp_cost = rm_cost * flt(d.qty) * flt(d.conversion_factor) -@webnotes.whitelist() +@frappe.whitelist() def get_expense_account(doctype, txt, searchfield, start, page_len, filters): from erpnext.controllers.queries import get_match_cond # expense account can be any Debit account, # but can also be a Liability account with account_type='Expense Account' in special circumstances. # Hence the first condition is an "OR" - return webnotes.conn.sql("""select tabAccount.name from `tabAccount` + return frappe.conn.sql("""select tabAccount.name from `tabAccount` where (tabAccount.debit_or_credit="Debit" or tabAccount.account_type = "Expense Account") and tabAccount.group_or_ledger="Ledger" diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js index 96bcbb47a73..61d2750c3e1 100644 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js @@ -2,7 +2,7 @@ // License: GNU General Public License v3. See license.txt // render -wn.listview_settings['Purchase Invoice'] = { +frappe.listview_settings['Purchase Invoice'] = { add_fields: ["`tabPurchase Invoice`.grand_total", "`tabPurchase Invoice`.outstanding_amount"], add_columns: [{"content":"paid_amount", width:"10%", type:"bar-graph", label: "Paid"}], prepare_data: function(data) { diff --git a/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py index 6cca6e47d9e..0398e4b3e60 100644 --- a/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py +++ b/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py @@ -4,11 +4,11 @@ from __future__ import unicode_literals import unittest -import webnotes -import webnotes.model +import frappe +import frappe.model import json -from webnotes.utils import cint -import webnotes.defaults +from frappe.utils import cint +import frappe.defaults from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import set_perpetual_inventory test_dependencies = ["Item", "Cost Center"] @@ -17,9 +17,9 @@ test_ignore = ["Serial No"] class TestPurchaseInvoice(unittest.TestCase): def test_gl_entries_without_auto_accounting_for_stock(self): set_perpetual_inventory(0) - self.assertTrue(not cint(webnotes.defaults.get_global_default("auto_accounting_for_stock"))) + self.assertTrue(not cint(frappe.defaults.get_global_default("auto_accounting_for_stock"))) - wrapper = webnotes.bean(copy=test_records[0]) + wrapper = frappe.bean(copy=test_records[0]) wrapper.run_method("calculate_taxes_and_totals") wrapper.insert() wrapper.submit() @@ -37,21 +37,21 @@ class TestPurchaseInvoice(unittest.TestCase): "_Test Account VAT - _TC": [156.25, 0], "_Test Account Discount - _TC": [0, 168.03], } - gl_entries = webnotes.conn.sql("""select account, debit, credit from `tabGL Entry` + gl_entries = frappe.conn.sql("""select account, debit, credit from `tabGL Entry` where voucher_type = 'Purchase Invoice' and voucher_no = %s""", dl[0].name, as_dict=1) for d in gl_entries: self.assertEqual([d.debit, d.credit], expected_gl_entries.get(d.account)) def test_gl_entries_with_auto_accounting_for_stock(self): set_perpetual_inventory(1) - self.assertEqual(cint(webnotes.defaults.get_global_default("auto_accounting_for_stock")), 1) + self.assertEqual(cint(frappe.defaults.get_global_default("auto_accounting_for_stock")), 1) - pi = webnotes.bean(copy=test_records[1]) + pi = frappe.bean(copy=test_records[1]) pi.run_method("calculate_taxes_and_totals") pi.insert() pi.submit() - gl_entries = webnotes.conn.sql("""select account, debit, credit + gl_entries = frappe.conn.sql("""select account, debit, credit from `tabGL Entry` where voucher_type='Purchase Invoice' and voucher_no=%s order by account asc""", pi.doc.name, as_dict=1) self.assertTrue(gl_entries) @@ -73,9 +73,9 @@ class TestPurchaseInvoice(unittest.TestCase): def test_gl_entries_with_aia_for_non_stock_items(self): set_perpetual_inventory() - self.assertEqual(cint(webnotes.defaults.get_global_default("auto_accounting_for_stock")), 1) + self.assertEqual(cint(frappe.defaults.get_global_default("auto_accounting_for_stock")), 1) - pi = webnotes.bean(copy=test_records[1]) + pi = frappe.bean(copy=test_records[1]) pi.doclist[1].item_code = "_Test Non Stock Item" pi.doclist[1].expense_account = "_Test Account Cost for Goods Sold - _TC" pi.doclist.pop(2) @@ -84,7 +84,7 @@ class TestPurchaseInvoice(unittest.TestCase): pi.insert() pi.submit() - gl_entries = webnotes.conn.sql("""select account, debit, credit + gl_entries = frappe.conn.sql("""select account, debit, credit from `tabGL Entry` where voucher_type='Purchase Invoice' and voucher_no=%s order by account asc""", pi.doc.name, as_dict=1) self.assertTrue(gl_entries) @@ -102,7 +102,7 @@ class TestPurchaseInvoice(unittest.TestCase): set_perpetual_inventory(0) def test_purchase_invoice_calculation(self): - wrapper = webnotes.bean(copy=test_records[0]) + wrapper = frappe.bean(copy=test_records[0]) wrapper.run_method("calculate_taxes_and_totals") wrapper.insert() wrapper.load_from_db() @@ -136,7 +136,7 @@ class TestPurchaseInvoice(unittest.TestCase): self.assertEqual(tax.total, expected_values[i][2]) def test_purchase_invoice_with_subcontracted_item(self): - wrapper = webnotes.bean(copy=test_records[0]) + wrapper = frappe.bean(copy=test_records[0]) wrapper.doclist[1].item_code = "_Test FG Item" wrapper.run_method("calculate_taxes_and_totals") wrapper.insert() @@ -174,11 +174,11 @@ class TestPurchaseInvoice(unittest.TestCase): from erpnext.accounts.doctype.journal_voucher.test_journal_voucher \ import test_records as jv_test_records - jv = webnotes.bean(copy=jv_test_records[1]) + jv = frappe.bean(copy=jv_test_records[1]) jv.insert() jv.submit() - pi = webnotes.bean(copy=test_records[0]) + pi = frappe.bean(copy=test_records[0]) pi.doclist.append({ "doctype": "Purchase Invoice Advance", "parentfield": "advance_allocation_details", @@ -193,17 +193,17 @@ class TestPurchaseInvoice(unittest.TestCase): pi.submit() pi.load_from_db() - self.assertTrue(webnotes.conn.sql("""select name from `tabJournal Voucher Detail` + self.assertTrue(frappe.conn.sql("""select name from `tabJournal Voucher Detail` where against_voucher=%s""", pi.doc.name)) - self.assertTrue(webnotes.conn.sql("""select name from `tabJournal Voucher Detail` + self.assertTrue(frappe.conn.sql("""select name from `tabJournal Voucher Detail` where against_voucher=%s and debit=300""", pi.doc.name)) self.assertEqual(pi.doc.outstanding_amount, 1212.30) pi.cancel() - self.assertTrue(not webnotes.conn.sql("""select name from `tabJournal Voucher Detail` + self.assertTrue(not frappe.conn.sql("""select name from `tabJournal Voucher Detail` where against_voucher=%s""", pi.doc.name)) test_records = [ diff --git a/erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.py b/erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.py index cb6190f2985..26c87f1c04a 100644 --- a/erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.py +++ b/erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.py @@ -2,7 +2,7 @@ # License: GNU General Public License v3. See license.txt from __future__ import unicode_literals -import webnotes +import frappe class DocType: def __init__(self, d, dl): diff --git a/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.py b/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.py index cb6190f2985..26c87f1c04a 100644 --- a/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.py +++ b/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.py @@ -2,7 +2,7 @@ # License: GNU General Public License v3. See license.txt from __future__ import unicode_literals -import webnotes +import frappe class DocType: def __init__(self, d, dl): diff --git a/erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.py b/erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.py index cb6190f2985..26c87f1c04a 100644 --- a/erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.py +++ b/erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.py @@ -2,7 +2,7 @@ # License: GNU General Public License v3. See license.txt from __future__ import unicode_literals -import webnotes +import frappe class DocType: def __init__(self, d, dl): diff --git a/erpnext/accounts/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 index 933382e5cd9..b87915ac9db 100644 --- a/erpnext/accounts/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 @@ -4,7 +4,7 @@ {% include "public/js/controllers/accounts.js" %} cur_frm.cscript.refresh = function(doc, cdt, cdn) { - cur_frm.set_footnote(wn.markdown(cur_frm.meta.description)); + cur_frm.set_footnote(frappe.markdown(cur_frm.meta.description)); } // For customizing print @@ -37,7 +37,7 @@ cur_frm.pformat.other_charges= function(doc) { } function print_hide(fieldname) { - var doc_field = wn.meta.get_docfield(doc.doctype, fieldname, doc.name); + var doc_field = frappe.meta.get_docfield(doc.doctype, fieldname, doc.name); return doc_field.print_hide; } @@ -78,11 +78,11 @@ cur_frm.cscript.add_deduct_tax = function(doc, cdt, cdn) { var d = locals[cdt][cdn]; if(!d.category && d.add_deduct_tax) { - msgprint(wn._("Please select Category first")); + msgprint(frappe._("Please select Category first")); d.add_deduct_tax = ''; } else if(d.category != 'Total' && d.add_deduct_tax == 'Deduct') { - msgprint(wn._("You cannot deduct when category is for 'Valuation' or 'Valuation and Total'")); + msgprint(frappe._("You cannot deduct when category is for 'Valuation' or 'Valuation and Total'")); d.add_deduct_tax = ''; } } @@ -91,15 +91,15 @@ cur_frm.cscript.charge_type = function(doc, cdt, cdn) { var d = locals[cdt][cdn]; if(!d.category && d.charge_type) { - msgprint(wn._("Please select Category first")); + msgprint(frappe._("Please select Category first")); d.charge_type = ''; } else if(d.idx == 1 && (d.charge_type == 'On Previous Row Amount' || d.charge_type == 'On Previous Row Total')) { - msgprint(wn._("You cannot select Charge Type as 'On Previous Row Amount' or 'On Previous Row Total' for first row")); + msgprint(frappe._("You cannot select Charge Type as 'On Previous Row Amount' or 'On Previous Row Total' for first row")); d.charge_type = ''; } else if((d.category == 'Valuation' || d.category == 'Valuation and Total') && (d.charge_type == 'On Previous Row Amount' || d.charge_type == 'On Previous Row Total')) { - msgprint(wn._("You cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for valuation. You can select only 'Total' option for previous row amount or previous row total")); + msgprint(frappe._("You cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for valuation. You can select only 'Total' option for previous row amount or previous row total")); d.charge_type = ''; } @@ -116,16 +116,16 @@ cur_frm.cscript.row_id = function(doc, cdt, cdn) { var d = locals[cdt][cdn]; if(!d.charge_type && d.row_id) { - msgprint(wn._("Please select Charge Type first")); + msgprint(frappe._("Please select Charge Type first")); d.row_id = ''; } else if((d.charge_type == 'Actual' || d.charge_type == 'On Net Total') && d.row_id) { - msgprint(wn._("You can Enter Row only if your Charge Type is 'On Previous Row Amount' or ' Previous Row Total'")); + msgprint(frappe._("You can Enter Row only if your Charge Type is 'On Previous Row Amount' or ' Previous Row Total'")); d.row_id = ''; } else if((d.charge_type == 'On Previous Row Amount' || d.charge_type == 'On Previous Row Total') && d.row_id) { if(d.row_id >= d.idx){ - msgprint(wn._("You cannot Enter Row no. greater than or equal to current row no. for this Charge type")); + msgprint(frappe._("You cannot Enter Row no. greater than or equal to current row no. for this Charge type")); d.row_id = ''; } } @@ -157,7 +157,7 @@ cur_frm.cscript.rate = function(doc, cdt, cdn) { var d = locals[cdt][cdn]; if(!d.charge_type && d.rate) { - msgprint(wn._("Please select Charge Type first")); + msgprint(frappe._("Please select Charge Type first")); d.rate = ''; } validated = false; @@ -168,11 +168,11 @@ cur_frm.cscript.tax_amount = function(doc, cdt, cdn) { var d = locals[cdt][cdn]; if(!d.charge_type && d.tax_amount) { - msgprint(wn._("Please select Charge Type first")); + msgprint(frappe._("Please select Charge Type first")); d.tax_amount = ''; } else if(d.charge_type && d.tax_amount) { - msgprint(wn._("You cannot directly enter Amount and if your Charge Type is Actual enter your amount in Rate")); + msgprint(frappe._("You cannot directly enter Amount and if your Charge Type is Actual enter your amount in Rate")); d.tax_amount = ''; } diff --git a/erpnext/accounts/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 index 09eb4d81493..eee6e9ac8c3 100644 --- a/erpnext/accounts/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 @@ -2,11 +2,11 @@ # License: GNU General Public License v3. See license.txt from __future__ import unicode_literals -import webnotes +import frappe -from webnotes.model import db_exists -from webnotes.model.bean import copy_doclist -from webnotes.model.code import get_obj +from frappe.model import db_exists +from frappe.model.bean import copy_doclist +from frappe.model.code import get_obj diff --git a/erpnext/accounts/doctype/sales_invoice/pos.js b/erpnext/accounts/doctype/sales_invoice/pos.js index 673b35b7893..480ce02626a 100644 --- a/erpnext/accounts/doctype/sales_invoice/pos.js +++ b/erpnext/accounts/doctype/sales_invoice/pos.js @@ -105,7 +105,7 @@ erpnext.POS = Class.extend({ }); this.wrapper.find('input.discount-amount').on("change", function() { - wn.model.set_value(me.frm.doctype, me.frm.docname, "discount_amount", this.value); + frappe.model.set_value(me.frm.doctype, me.frm.docname, "discount_amount", this.value); }); this.call_function("remove-items", function() {me.remove_selected_items();}); @@ -115,10 +115,10 @@ erpnext.POS = Class.extend({ var me = this; // Check whether the transaction is "Sales" or "Purchase" - if (wn.meta.has_field(cur_frm.doc.doctype, "customer")) { + if (frappe.meta.has_field(cur_frm.doc.doctype, "customer")) { this.set_transaction_defaults("Customer", "export"); } - else if (wn.meta.has_field(cur_frm.doc.doctype, "supplier")) { + else if (frappe.meta.has_field(cur_frm.doc.doctype, "supplier")) { this.set_transaction_defaults("Supplier", "import"); } }, @@ -146,7 +146,7 @@ erpnext.POS = Class.extend({ }, make_party: function() { var me = this; - this.party_field = wn.ui.form.make_control({ + this.party_field = frappe.ui.form.make_control({ df: { "fieldtype": "Link", "options": this.party, @@ -160,13 +160,13 @@ erpnext.POS = Class.extend({ this.party_field.make_input(); this.party_field.$input.on("change", function() { if(!me.party_field.autocomplete_open) - wn.model.set_value(me.frm.doctype, me.frm.docname, + frappe.model.set_value(me.frm.doctype, me.frm.docname, me.party.toLowerCase(), this.value); }); }, make_barcode: function() { var me = this; - this.barcode = wn.ui.form.make_control({ + this.barcode = frappe.ui.form.make_control({ df: { "fieldtype": "Data", "label": "Barcode", @@ -185,7 +185,7 @@ erpnext.POS = Class.extend({ }, make_search: function() { var me = this; - this.search = wn.ui.form.make_control({ + this.search = frappe.ui.form.make_control({ df: { "fieldtype": "Data", "label": "Item", @@ -205,7 +205,7 @@ erpnext.POS = Class.extend({ }, make_item_group: function() { var me = this; - this.item_group = wn.ui.form.make_control({ + this.item_group = frappe.ui.form.make_control({ df: { "fieldtype": "Link", "options": "Item Group", @@ -225,7 +225,7 @@ erpnext.POS = Class.extend({ make_item_list: function() { var me = this; me.item_timeout = null; - wn.call({ + frappe.call({ method: 'erpnext.accounts.doctype.sales_invoice.pos.get_items', args: { sales_or_purchase: this.sales_or_purchase, @@ -284,14 +284,14 @@ erpnext.POS = Class.extend({ // check whether the item is already added if (no_of_items != 0) { - $.each(wn.model.get_children(this.frm.doctype + " Item", this.frm.doc.name, + $.each(frappe.model.get_children(this.frm.doctype + " Item", this.frm.doc.name, this.frm.cscript.fname, this.frm.doctype), function(i, d) { if (d.item_code == item_code) { caught = true; if (serial_no) - wn.model.set_value(d.doctype, d.name, "serial_no", d.serial_no + '\n' + serial_no); + frappe.model.set_value(d.doctype, d.name, "serial_no", d.serial_no + '\n' + serial_no); else - wn.model.set_value(d.doctype, d.name, "qty", d.qty + 1); + frappe.model.set_value(d.doctype, d.name, "qty", d.qty + 1); } }); } @@ -306,7 +306,7 @@ erpnext.POS = Class.extend({ add_new_item_to_grid: function(item_code, serial_no) { var me = this; - var child = wn.model.add_child(me.frm.doc, this.frm.doctype + " Item", + var child = frappe.model.add_child(me.frm.doc, this.frm.doctype + " Item", this.frm.cscript.fname); child.item_code = item_code; @@ -326,14 +326,14 @@ erpnext.POS = Class.extend({ }, update_qty: function(item_code, qty) { var me = this; - $.each(wn.model.get_children(this.frm.doctype + " Item", this.frm.doc.name, + $.each(frappe.model.get_children(this.frm.doctype + " Item", this.frm.doc.name, this.frm.cscript.fname, this.frm.doctype), function(i, d) { if (d.item_code == item_code) { if (qty == 0) { - wn.model.clear_doc(d.doctype, d.name); + frappe.model.clear_doc(d.doctype, d.name); me.refresh_grid(); } else { - wn.model.set_value(d.doctype, d.name, "qty", qty); + frappe.model.set_value(d.doctype, d.name, "qty", qty); } } }); @@ -378,7 +378,7 @@ erpnext.POS = Class.extend({ var me = this; var $items = this.wrapper.find("#cart tbody").empty(); - $.each(wn.model.get_children(this.frm.doctype + " Item", this.frm.doc.name, + $.each(frappe.model.get_children(this.frm.doctype + " Item", this.frm.doc.name, this.frm.cscript.fname, this.frm.doctype), function(i, d) { $(repl('\ @@ -413,7 +413,7 @@ erpnext.POS = Class.extend({ }, show_taxes: function() { var me = this; - var taxes = wn.model.get_children(this.sales_or_purchase + " Taxes and Charges", + var taxes = frappe.model.get_children(this.sales_or_purchase + " Taxes and Charges", this.frm.doc.name, this.frm.cscript.other_fname, this.frm.doctype); $(this.wrapper).find(".tax-table") .toggle((taxes && taxes.length) ? true : false) @@ -510,7 +510,7 @@ erpnext.POS = Class.extend({ add_item_thru_barcode: function() { var me = this; me.barcode_timeout = null; - wn.call({ + frappe.call({ method: 'erpnext.accounts.doctype.sales_invoice.pos.get_item_code', args: {barcode_serial_no: this.barcode.$input.val()}, callback: function(r) { @@ -521,7 +521,7 @@ erpnext.POS = Class.extend({ me.add_to_cart(r.message[0][0].name); } else - msgprint(wn._("Invalid Barcode")); + msgprint(frappe._("Invalid Barcode")); me.refresh(); } @@ -538,13 +538,13 @@ erpnext.POS = Class.extend({ } } - var child = wn.model.get_children(this.frm.doctype + " Item", this.frm.doc.name, + var child = frappe.model.get_children(this.frm.doctype + " Item", this.frm.doc.name, this.frm.cscript.fname, this.frm.doctype); $.each(child, function(i, d) { for (var i in selected_items) { if (d.item_code == selected_items[i]) { - wn.model.clear_doc(d.doctype, d.name); + frappe.model.clear_doc(d.doctype, d.name); } } }); @@ -563,9 +563,9 @@ erpnext.POS = Class.extend({ var mode_of_payment = []; if (no_of_items == 0) - msgprint(wn._("Payment cannot be made for empty cart")); + msgprint(frappe._("Payment cannot be made for empty cart")); else { - wn.call({ + frappe.call({ method: 'erpnext.accounts.doctype.sales_invoice.pos.get_mode_of_payment', callback: function(r) { for (x=0; x<=r.message.length - 1; x++) { @@ -573,7 +573,7 @@ erpnext.POS = Class.extend({ } // show payment wizard - var dialog = new wn.ui.Dialog({ + var dialog = new frappe.ui.Dialog({ width: 400, title: 'Payment', fields: [ diff --git a/erpnext/accounts/doctype/sales_invoice/pos.py b/erpnext/accounts/doctype/sales_invoice/pos.py index aba7ad83154..593996b063c 100644 --- a/erpnext/accounts/doctype/sales_invoice/pos.py +++ b/erpnext/accounts/doctype/sales_invoice/pos.py @@ -2,9 +2,9 @@ # License: GNU General Public License v3. See license.txt from __future__ import unicode_literals -import webnotes +import frappe -@webnotes.whitelist() +@frappe.whitelist() def get_items(price_list, sales_or_purchase, item=None, item_group=None): condition = "" args = {"price_list": price_list} @@ -21,7 +21,7 @@ def get_items(price_list, sales_or_purchase, item=None, item_group=None): condition += " and CONCAT(i.name, i.item_name) like %(name)s" args["name"] = "%%%s%%" % item - return webnotes.conn.sql("""select i.name, i.item_name, i.image, + return frappe.conn.sql("""select i.name, i.item_name, i.image, item_det.price_list_rate, item_det.currency from `tabItem` i LEFT JOIN (select item_code, price_list_rate, currency from @@ -31,22 +31,22 @@ def get_items(price_list, sales_or_purchase, item=None, item_group=None): where %s""" % ('%(price_list)s', condition), args, as_dict=1) -@webnotes.whitelist() +@frappe.whitelist() def get_item_code(barcode_serial_no): input_via = "serial_no" - item_code = webnotes.conn.sql("""select name, item_code from `tabSerial No` where + item_code = frappe.conn.sql("""select name, item_code from `tabSerial No` where name=%s""", (barcode_serial_no), as_dict=1) if not item_code: input_via = "barcode" - item_code = webnotes.conn.sql("""select name from `tabItem` where barcode=%s""", + item_code = frappe.conn.sql("""select name from `tabItem` where barcode=%s""", (barcode_serial_no), as_dict=1) if item_code: return item_code, input_via else: - webnotes.throw("Invalid Barcode / Serial No") + frappe.throw("Invalid Barcode / Serial No") -@webnotes.whitelist() +@frappe.whitelist() def get_mode_of_payment(): - return webnotes.conn.sql("""select name from `tabMode of Payment`""", as_dict=1) \ No newline at end of file + return frappe.conn.sql("""select name from `tabMode of Payment`""", as_dict=1) \ No newline at end of file diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js index 2b33bf00336..ac9768b45ab 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js @@ -14,7 +14,7 @@ cur_frm.pformat.print_heading = 'Invoice'; {% include 'utilities/doctype/sms_control/sms_control.js' %} {% include 'accounts/doctype/sales_invoice/pos.js' %} -wn.provide("erpnext.accounts"); +frappe.provide("erpnext.accounts"); erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.extend({ onload: function() { this._super(); @@ -25,11 +25,11 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte } // toggle to pos view if is_pos is 1 in user_defaults - if ((cint(wn.defaults.get_user_defaults("is_pos"))===1 || this.frm.doc.is_pos)) { + if ((cint(frappe.defaults.get_user_defaults("is_pos"))===1 || this.frm.doc.is_pos)) { if(this.frm.doc.__islocal && !this.frm.doc.amended_from && !this.frm.doc.customer) { this.frm.set_value("is_pos", 1); this.is_pos(function() { - if (cint(wn.defaults.get_user_defaults("fs_pos_view"))===1) + if (cint(frappe.defaults.get_user_defaults("fs_pos_view"))===1) cur_frm.cscript.toggle_pos(true); }); } @@ -50,20 +50,20 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte if(doc.docstatus==1) { cur_frm.appframe.add_button('View Ledger', function() { - wn.route_options = { + frappe.route_options = { "voucher_no": doc.name, "from_date": doc.posting_date, "to_date": doc.posting_date, "company": doc.company, group_by_voucher: 0 }; - wn.set_route("query-report", "General Ledger"); + frappe.set_route("query-report", "General Ledger"); }, "icon-table"); var percent_paid = cint(flt(doc.grand_total - doc.outstanding_amount) / flt(doc.grand_total) * 100); cur_frm.dashboard.add_progress(percent_paid + "% Paid", percent_paid); - cur_frm.appframe.add_button(wn._('Send SMS'), cur_frm.cscript.send_sms, 'icon-mobile-phone'); + cur_frm.appframe.add_button(frappe._('Send SMS'), cur_frm.cscript.send_sms, 'icon-mobile-phone'); if(cint(doc.update_stock)!=1) { // show Make Delivery Note button only if Sales Invoice is not created from Delivery Note @@ -74,11 +74,11 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte }); if(!from_delivery_note) - cur_frm.appframe.add_primary_action(wn._('Make Delivery'), cur_frm.cscript['Make Delivery Note']) + cur_frm.appframe.add_primary_action(frappe._('Make Delivery'), cur_frm.cscript['Make Delivery Note']) } if(doc.outstanding_amount!=0) - cur_frm.appframe.add_primary_action(wn._('Make Payment Entry'), cur_frm.cscript.make_bank_voucher); + cur_frm.appframe.add_primary_action(frappe._('Make Payment Entry'), cur_frm.cscript.make_bank_voucher); } // Show buttons only when pos view is active @@ -89,9 +89,9 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte }, sales_order_btn: function() { - this.$sales_order_btn = cur_frm.appframe.add_primary_action(wn._('From Sales Order'), + this.$sales_order_btn = cur_frm.appframe.add_primary_action(frappe._('From Sales Order'), function() { - wn.model.map_current_doc({ + frappe.model.map_current_doc({ method: "erpnext.selling.doctype.sales_order.sales_order.make_sales_invoice", source_doctype: "Sales Order", get_query_filters: { @@ -106,9 +106,9 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte }, delivery_note_btn: function() { - this.$delivery_note_btn = cur_frm.appframe.add_primary_action(wn._('From Delivery Note'), + this.$delivery_note_btn = cur_frm.appframe.add_primary_action(frappe._('From Delivery Note'), function() { - wn.model.map_current_doc({ + frappe.model.map_current_doc({ method: "erpnext.stock.doctype.delivery_note.delivery_note.make_sales_invoice", source_doctype: "Delivery Note", get_query: function() { @@ -134,7 +134,7 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte if(cint(this.frm.doc.is_pos)) { if(!this.frm.doc.company) { this.frm.set_value("is_pos", 0); - msgprint(wn._("Please specify Company to proceed")); + msgprint(frappe._("Please specify Company to proceed")); } else { var me = this; return this.frm.call({ @@ -179,7 +179,7 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte write_off_outstanding_amount_automatically: function() { if(cint(this.frm.doc.write_off_outstanding_amount_automatically)) { - wn.model.round_floats_in(this.frm.doc, ["grand_total", "paid_amount"]); + frappe.model.round_floats_in(this.frm.doc, ["grand_total", "paid_amount"]); // this will make outstanding amount 0 this.frm.set_value("write_off_amount", flt(this.frm.doc.grand_total - this.frm.doc.paid_amount), precision("write_off_amount")); @@ -198,7 +198,7 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte }, entries_add: function(doc, cdt, cdn) { - var row = wn.model.get_doc(cdt, cdn); + var row = frappe.model.get_doc(cdt, cdn); this.frm.script_manager.copy_from_first_row("entries", row, ["income_account", "cost_center"]); }, @@ -233,7 +233,7 @@ cur_frm.cscript.hide_fields = function(doc) { } else { hide_field('payments_section'); for (i in par_flds) { - var docfield = wn.meta.docfield_map[doc.doctype][par_flds[i]]; + var docfield = frappe.meta.docfield_map[doc.doctype][par_flds[i]]; if(!docfield.hidden) unhide_field(par_flds[i]); } cur_frm.fields_dict['entries'].grid.set_column_disp(item_flds_normal, true); @@ -244,7 +244,7 @@ cur_frm.cscript.hide_fields = function(doc) { (cint(doc.update_stock)==1 ? true : false)); // India related fields - var cp = wn.control_panel; + var cp = frappe.control_panel; if (cp.country == 'India') unhide_field(['c_form_applicable', 'c_form_no']); else hide_field(['c_form_applicable', 'c_form_no']); @@ -269,21 +269,21 @@ cur_frm.cscript.is_opening = function(doc, dt, dn) { } cur_frm.cscript['Make Delivery Note'] = function() { - wn.model.open_mapped_doc({ + frappe.model.open_mapped_doc({ method: "erpnext.accounts.doctype.sales_invoice.sales_invoice.make_delivery_note", source_name: cur_frm.doc.name }) } cur_frm.cscript.make_bank_voucher = function() { - return wn.call({ + return frappe.call({ method: "erpnext.accounts.doctype.journal_voucher.journal_voucher.get_payment_entry_from_sales_invoice", args: { "sales_invoice": cur_frm.doc.name }, callback: function(r) { - var doclist = wn.model.sync(r.message); - wn.set_route("Form", doclist[0].doctype, doclist[0].name); + var doclist = frappe.model.sync(r.message); + frappe.set_route("Form", doclist[0].doctype, doclist[0].name); } }); } @@ -400,8 +400,8 @@ cur_frm.cscript.cost_center = function(doc, cdt, cdn) { } cur_frm.cscript.on_submit = function(doc, cdt, cdn) { - if(cint(wn.boot.notification_settings.sales_invoice)) { - cur_frm.email_doc(wn.boot.notification_settings.sales_invoice_message); + if(cint(frappe.boot.notification_settings.sales_invoice)) { + cur_frm.email_doc(frappe.boot.notification_settings.sales_invoice_message); } } @@ -409,12 +409,12 @@ cur_frm.cscript.convert_into_recurring_invoice = function(doc, dt, dn) { // set default values for recurring invoices if(doc.convert_into_recurring_invoice) { var owner_email = doc.owner=="Administrator" - ? wn.user_info("Administrator").email + ? frappe.user_info("Administrator").email : doc.owner; doc.notification_email_address = $.map([cstr(owner_email), cstr(doc.contact_email)], function(v) { return v || null; }).join(", "); - doc.repeat_on_day_of_month = wn.datetime.str_to_obj(doc.posting_date).getDate(); + doc.repeat_on_day_of_month = frappe.datetime.str_to_obj(doc.posting_date).getDate(); } refresh_many(["notification_email_address", "repeat_on_day_of_month"]); @@ -428,9 +428,9 @@ cur_frm.cscript.invoice_period_from_date = function(doc, dt, dn) { var months = recurring_type_map[doc.recurring_type]; if(months) { - var to_date = wn.datetime.add_months(doc.invoice_period_from_date, + var to_date = frappe.datetime.add_months(doc.invoice_period_from_date, months); - doc.invoice_period_to_date = wn.datetime.add_days(to_date, -1); + doc.invoice_period_to_date = frappe.datetime.add_days(to_date, -1); refresh_field('invoice_period_to_date'); } } diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py index 165d483f334..bd82a3cf18d 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py @@ -2,17 +2,17 @@ # License: GNU General Public License v3. See license.txt from __future__ import unicode_literals -import webnotes -import webnotes.defaults +import frappe +import frappe.defaults -from webnotes.utils import add_days, cint, cstr, date_diff, flt, getdate, nowdate, \ +from frappe.utils import add_days, cint, cstr, date_diff, flt, getdate, nowdate, \ get_first_day, get_last_day -from webnotes.utils import comma_and, get_url -from webnotes.model.doc import make_autoname -from webnotes.model.bean import getlist -from webnotes.model.code import get_obj -from webnotes import _, msgprint +from frappe.utils import comma_and, get_url +from frappe.model.doc import make_autoname +from frappe.model.bean import getlist +from frappe.model.code import get_obj +from frappe import _, msgprint from erpnext.accounts.party import get_party_account, get_due_date @@ -160,16 +160,16 @@ class DocType(SellingController): def update_time_log_batch(self, sales_invoice): for d in self.doclist.get({"doctype":"Sales Invoice Item"}): if d.time_log_batch: - tlb = webnotes.bean("Time Log Batch", d.time_log_batch) + tlb = frappe.bean("Time Log Batch", d.time_log_batch) tlb.doc.sales_invoice = sales_invoice tlb.update_after_submit() def validate_time_logs_are_submitted(self): for d in self.doclist.get({"doctype":"Sales Invoice Item"}): if d.time_log_batch: - status = webnotes.conn.get_value("Time Log Batch", d.time_log_batch, "status") + status = frappe.conn.get_value("Time Log Batch", d.time_log_batch, "status") if status!="Submitted": - webnotes.msgprint(_("Time Log Batch status must be 'Submitted'") + ":" + d.time_log_batch, + frappe.msgprint(_("Time Log Batch status must be 'Submitted'") + ":" + d.time_log_batch, raise_exception=True) def set_pos_fields(self, for_validate=False): @@ -202,7 +202,7 @@ class DocType(SellingController): # fetch terms if self.doc.tc_name and not self.doc.terms: - self.doc.terms = webnotes.conn.get_value("Terms and Conditions", self.doc.tc_name, "terms") + self.doc.terms = frappe.conn.get_value("Terms and Conditions", self.doc.tc_name, "terms") # fetch charges if self.doc.charge and not len(self.doclist.get({"parentfield": "other_charges"})): @@ -213,7 +213,7 @@ class DocType(SellingController): "Sales Invoice Advance", "advance_adjustment_details", "credit") def get_company_abbr(self): - return webnotes.conn.sql("select abbr from tabCompany where name=%s", self.doc.company)[0][0] + return frappe.conn.sql("select abbr from tabCompany where name=%s", self.doc.company)[0][0] def update_against_document_in_jv(self): """ @@ -246,7 +246,7 @@ class DocType(SellingController): def validate_customer_account(self): """Validates Debit To Account and Customer Matches""" if self.doc.customer and self.doc.debit_to and not cint(self.doc.is_pos): - acc_head = webnotes.conn.sql("select master_name from `tabAccount` where name = %s and docstatus != 2", self.doc.debit_to) + acc_head = frappe.conn.sql("select master_name from `tabAccount` where name = %s and docstatus != 2", self.doc.debit_to) if (acc_head and cstr(acc_head[0][0]) != cstr(self.doc.customer)) or \ (not acc_head and (self.doc.debit_to != cstr(self.doc.customer) + " - " + self.get_company_abbr())): @@ -255,7 +255,7 @@ class DocType(SellingController): def validate_debit_acc(self): - acc = webnotes.conn.sql("select debit_or_credit, is_pl_account from tabAccount where name = '%s' and docstatus != 2" % self.doc.debit_to) + acc = frappe.conn.sql("select debit_or_credit, is_pl_account from tabAccount where name = '%s' and docstatus != 2" % self.doc.debit_to) if not acc: msgprint("Account: "+ self.doc.debit_to + " does not exist") raise Exception @@ -270,8 +270,8 @@ class DocType(SellingController): def validate_fixed_asset_account(self): """Validate Fixed Asset Account and whether Income Account Entered Exists""" for d in getlist(self.doclist,'entries'): - item = webnotes.conn.sql("select name,is_asset_item,is_sales_item from `tabItem` where name = '%s' and (ifnull(end_of_life,'')='' or end_of_life = '0000-00-00' or end_of_life > now())"% d.item_code) - acc = webnotes.conn.sql("select account_type from `tabAccount` where name = '%s' and docstatus != 2" % d.income_account) + item = frappe.conn.sql("select name,is_asset_item,is_sales_item from `tabItem` where name = '%s' and (ifnull(end_of_life,'')='' or end_of_life = '0000-00-00' or end_of_life > now())"% d.item_code) + acc = frappe.conn.sql("select account_type from `tabAccount` where name = '%s' and docstatus != 2" % d.income_account) if not acc: msgprint("Account: "+d.income_account+" does not exist in the system", raise_exception=True) elif item and item[0][1] == 'Yes' and not acc[0][0] == 'Fixed Asset Account': @@ -291,7 +291,7 @@ class DocType(SellingController): }, }) - if cint(webnotes.defaults.get_global_default('maintain_same_sales_rate')): + if cint(frappe.defaults.get_global_default('maintain_same_sales_rate')): super(DocType, self).validate_with_previous_doc(self.tname, { "Sales Order Item": { "ref_dn_field": "so_detail", @@ -332,9 +332,9 @@ class DocType(SellingController): """check in manage account if sales order / delivery note required or not.""" dic = {'Sales Order':'so_required','Delivery Note':'dn_required'} for i in dic: - if webnotes.conn.get_value('Selling Settings', None, dic[i]) == 'Yes': + if frappe.conn.get_value('Selling Settings', None, dic[i]) == 'Yes': for d in getlist(self.doclist,'entries'): - if webnotes.conn.get_value('Item', d.item_code, 'is_stock_item') == 'Yes' \ + if frappe.conn.get_value('Item', d.item_code, 'is_stock_item') == 'Yes' \ and not d.fields[i.lower().replace(' ','_')]: msgprint("%s is mandatory for stock item which is not mentioed against item: %s"%(i,d.item_code), raise_exception=1) @@ -342,7 +342,7 @@ class DocType(SellingController): def validate_proj_cust(self): """check for does customer belong to same project as entered..""" if self.doc.project_name and self.doc.customer: - res = webnotes.conn.sql("select name from `tabProject` where name = '%s' and (customer = '%s' or ifnull(customer,'')='')"%(self.doc.project_name, self.doc.customer)) + res = frappe.conn.sql("select name from `tabProject` where name = '%s' and (customer = '%s' or ifnull(customer,'')='')"%(self.doc.project_name, self.doc.customer)) if not res: msgprint("Customer - %s does not belong to project - %s. \n\nIf you want to use project for multiple customers then please make customer details blank in that project."%(self.doc.customer,self.doc.project_name)) raise Exception @@ -353,7 +353,7 @@ class DocType(SellingController): raise Exception if flt(self.doc.paid_amount) + flt(self.doc.write_off_amount) \ - flt(self.doc.grand_total) > 1/(10**(self.precision("grand_total") + 1)): - webnotes.throw(_("""(Paid amount + Write Off Amount) can not be \ + frappe.throw(_("""(Paid amount + Write Off Amount) can not be \ greater than Grand Total""")) @@ -377,28 +377,28 @@ class DocType(SellingController): def validate_c_form(self): """ Blank C-form no if C-form applicable marked as 'No'""" if self.doc.amended_from and self.doc.c_form_applicable == 'No' and self.doc.c_form_no: - webnotes.conn.sql("""delete from `tabC-Form Invoice Detail` where invoice_no = %s + frappe.conn.sql("""delete from `tabC-Form Invoice Detail` where invoice_no = %s and parent = %s""", (self.doc.amended_from, self.doc.c_form_no)) - webnotes.conn.set(self.doc, 'c_form_no', '') + frappe.conn.set(self.doc, 'c_form_no', '') def update_current_stock(self): for d in getlist(self.doclist, 'entries'): if d.item_code and d.warehouse: - bin = webnotes.conn.sql("select actual_qty from `tabBin` where item_code = %s and warehouse = %s", (d.item_code, d.warehouse), as_dict = 1) + bin = frappe.conn.sql("select actual_qty from `tabBin` where item_code = %s and warehouse = %s", (d.item_code, d.warehouse), as_dict = 1) d.actual_qty = bin and flt(bin[0]['actual_qty']) or 0 for d in getlist(self.doclist, 'packing_details'): - bin = webnotes.conn.sql("select actual_qty, projected_qty from `tabBin` where item_code = %s and warehouse = %s", (d.item_code, d.warehouse), as_dict = 1) + bin = frappe.conn.sql("select actual_qty, projected_qty from `tabBin` where item_code = %s and warehouse = %s", (d.item_code, d.warehouse), as_dict = 1) d.actual_qty = bin and flt(bin[0]['actual_qty']) or 0 d.projected_qty = bin and flt(bin[0]['projected_qty']) or 0 def get_warehouse(self): - w = webnotes.conn.sql("select warehouse from `tabPOS Setting` where ifnull(user,'') = '%s' and company = '%s'" % (webnotes.session['user'], self.doc.company)) + w = frappe.conn.sql("select warehouse from `tabPOS Setting` where ifnull(user,'') = '%s' and company = '%s'" % (frappe.session['user'], self.doc.company)) w = w and w[0][0] or '' if not w: - ps = webnotes.conn.sql("select name, warehouse from `tabPOS Setting` where ifnull(user,'') = '' and company = '%s'" % self.doc.company) + ps = frappe.conn.sql("select name, warehouse from `tabPOS Setting` where ifnull(user,'') = '' and company = '%s'" % self.doc.company) if not ps: msgprint("To make POS entry, please create POS Setting from Accounts --> POS Setting page and refresh the system.", raise_exception=True) elif not ps[0][1]: @@ -425,25 +425,25 @@ class DocType(SellingController): if cint(self.doc.is_pos) == 1: if flt(self.doc.paid_amount) == 0: if self.doc.cash_bank_account: - webnotes.conn.set(self.doc, 'paid_amount', + frappe.conn.set(self.doc, 'paid_amount', (flt(self.doc.grand_total) - flt(self.doc.write_off_amount))) else: # show message that the amount is not paid - webnotes.conn.set(self.doc,'paid_amount',0) - webnotes.msgprint("Note: Payment Entry will not be created since 'Cash/Bank Account' was not specified.") + frappe.conn.set(self.doc,'paid_amount',0) + frappe.msgprint("Note: Payment Entry will not be created since 'Cash/Bank Account' was not specified.") else: - webnotes.conn.set(self.doc,'paid_amount',0) + frappe.conn.set(self.doc,'paid_amount',0) def check_prev_docstatus(self): for d in getlist(self.doclist,'entries'): if d.sales_order: - submitted = webnotes.conn.sql("select name from `tabSales Order` where docstatus = 1 and name = '%s'" % d.sales_order) + submitted = frappe.conn.sql("select name from `tabSales Order` where docstatus = 1 and name = '%s'" % d.sales_order) if not submitted: msgprint("Sales Order : "+ cstr(d.sales_order) +" is not submitted") raise Exception , "Validation Error." if d.delivery_note: - submitted = webnotes.conn.sql("select name from `tabDelivery Note` where docstatus = 1 and name = '%s'" % d.delivery_note) + submitted = frappe.conn.sql("select name from `tabDelivery Note` where docstatus = 1 and name = '%s'" % d.delivery_note) if not submitted: msgprint("Delivery Note : "+ cstr(d.delivery_note) +" is not submitted") raise Exception , "Validation Error." @@ -451,11 +451,11 @@ class DocType(SellingController): def update_stock_ledger(self): sl_entries = [] for d in self.get_item_list(): - if webnotes.conn.get_value("Item", d.item_code, "is_stock_item") == "Yes" \ + if frappe.conn.get_value("Item", d.item_code, "is_stock_item") == "Yes" \ and d.warehouse: sl_entries.append(self.get_sl_entries(d, { "actual_qty": -1*flt(d.qty), - "stock_uom": webnotes.conn.get_value("Item", d.item_code, "stock_uom") + "stock_uom": frappe.conn.get_value("Item", d.item_code, "stock_uom") })) self.make_sl_entries(sl_entries) @@ -472,7 +472,7 @@ class DocType(SellingController): update_outstanding=update_outstanding, merge_entries=False) if update_gl_entries_after and cint(self.doc.update_stock) \ - and cint(webnotes.defaults.get_global_default("auto_accounting_for_stock")): + and cint(frappe.defaults.get_global_default("auto_accounting_for_stock")): self.update_gl_entries_after() def get_gl_entries(self, warehouse_account=None): @@ -534,7 +534,7 @@ class DocType(SellingController): ) # expense account gl entries - if cint(webnotes.defaults.get_global_default("auto_accounting_for_stock")) \ + if cint(frappe.defaults.get_global_default("auto_accounting_for_stock")) \ and cint(self.doc.update_stock): gl_entries += super(DocType, self).get_gl_entries() @@ -584,7 +584,7 @@ class DocType(SellingController): def update_c_form(self): """Update amended id in C-form""" if self.doc.c_form_no and self.doc.amended_from: - webnotes.conn.sql("""update `tabC-Form Invoice Detail` set invoice_no = %s, + frappe.conn.sql("""update `tabC-Form Invoice Detail` set invoice_no = %s, invoice_date = %s, territory = %s, net_total = %s, grand_total = %s where invoice_no = %s and parent = %s""", (self.doc.name, self.doc.amended_from, self.doc.c_form_no)) @@ -592,7 +592,7 @@ class DocType(SellingController): @property def meta(self): if not hasattr(self, "_meta"): - self._meta = webnotes.get_doctype(self.doc.doctype) + self._meta = frappe.get_doctype(self.doc.doctype) return self._meta def validate_recurring_invoice(self): @@ -613,13 +613,13 @@ class DocType(SellingController): def convert_to_recurring(self): if self.doc.convert_into_recurring_invoice: if not self.doc.recurring_id: - webnotes.conn.set(self.doc, "recurring_id", + frappe.conn.set(self.doc, "recurring_id", make_autoname("RECINV/.#####")) self.set_next_date() elif self.doc.recurring_id: - webnotes.conn.sql("""update `tabSales Invoice` + frappe.conn.sql("""update `tabSales Invoice` set convert_into_recurring_invoice = 0 where recurring_id = %s""", (self.doc.recurring_id,)) @@ -628,7 +628,7 @@ class DocType(SellingController): email_list = filter(None, [cstr(email).strip() for email in self.doc.notification_email_address.replace("\n", "").split(",")]) - from webnotes.utils import validate_email_add + from frappe.utils import validate_email_add for email in email_list: if not validate_email_add(email): msgprint(self.meta.get_label("notification_email_address") \ @@ -649,7 +649,7 @@ class DocType(SellingController): next_date = get_next_date(self.doc.posting_date, month_map[self.doc.recurring_type], cint(self.doc.repeat_on_day_of_month)) - webnotes.conn.set(self.doc, 'next_date', next_date) + frappe.conn.set(self.doc, 'next_date', next_date) def get_next_date(dt, mcount, day=None): dt = getdate(dt) @@ -665,43 +665,43 @@ def manage_recurring_invoices(next_date=None, commit=True): and notify the concerned people """ next_date = next_date or nowdate() - recurring_invoices = webnotes.conn.sql("""select name, recurring_id + recurring_invoices = frappe.conn.sql("""select name, recurring_id from `tabSales Invoice` where ifnull(convert_into_recurring_invoice, 0)=1 and docstatus=1 and next_date=%s and next_date <= ifnull(end_date, '2199-12-31')""", next_date) exception_list = [] for ref_invoice, recurring_id in recurring_invoices: - if not webnotes.conn.sql("""select name from `tabSales Invoice` + if not frappe.conn.sql("""select name from `tabSales Invoice` where posting_date=%s and recurring_id=%s and docstatus=1""", (next_date, recurring_id)): try: - ref_wrapper = webnotes.bean('Sales Invoice', ref_invoice) + ref_wrapper = frappe.bean('Sales Invoice', ref_invoice) new_invoice_wrapper = make_new_invoice(ref_wrapper, next_date) send_notification(new_invoice_wrapper) if commit: - webnotes.conn.commit() + frappe.conn.commit() except: if commit: - webnotes.conn.rollback() + frappe.conn.rollback() - webnotes.conn.begin() - webnotes.conn.sql("update `tabSales Invoice` set \ + frappe.conn.begin() + frappe.conn.sql("update `tabSales Invoice` set \ convert_into_recurring_invoice = 0 where name = %s", ref_invoice) notify_errors(ref_invoice, ref_wrapper.doc.customer, ref_wrapper.doc.owner) - webnotes.conn.commit() + frappe.conn.commit() - exception_list.append(webnotes.get_traceback()) + exception_list.append(frappe.get_traceback()) finally: if commit: - webnotes.conn.begin() + frappe.conn.begin() if exception_list: exception_message = "\n\n".join([cstr(d) for d in exception_list]) raise Exception, exception_message def make_new_invoice(ref_wrapper, posting_date): - from webnotes.model.bean import clone + from frappe.model.bean import clone from erpnext.accounts.utils import get_fiscal_year new_invoice = clone(ref_wrapper) @@ -738,17 +738,17 @@ def make_new_invoice(ref_wrapper, posting_date): def send_notification(new_rv): """Notify concerned persons about recurring invoice generation""" - from webnotes.core.doctype.print_format.print_format import get_html - webnotes.sendmail(new_rv.doc.notification_email_address, + from frappe.core.doctype.print_format.print_format import get_html + frappe.sendmail(new_rv.doc.notification_email_address, subject="New Invoice : " + new_rv.doc.name, message = get_html(new_rv.doc, new_rv.doclist, "SalesInvoice")) def notify_errors(inv, customer, owner): - from webnotes.profile import get_system_managers + from frappe.profile import get_system_managers - webnotes.sendmail(recipients=get_system_managers() + [webnotes.conn.get_value("Profile", owner, "email")], + frappe.sendmail(recipients=get_system_managers() + [frappe.conn.get_value("Profile", owner, "email")], subject="[Urgent] Error while creating recurring invoice for %s" % inv, - message = webnotes.get_template("template/emails/recurring_invoice_failed.html").render({ + message = frappe.get_template("template/emails/recurring_invoice_failed.html").render({ "name": inv, "customer": customer })) @@ -757,7 +757,7 @@ def notify_errors(inv, customer, owner): def assign_task_to_owner(inv, msg, users): for d in users: - from webnotes.widgets.form import assign_to + from frappe.widgets.form import assign_to args = { 'assign_to' : d, 'doctype' : 'Sales Invoice', @@ -767,23 +767,23 @@ def assign_task_to_owner(inv, msg, users): } assign_to.add(args) -@webnotes.whitelist() +@frappe.whitelist() def get_bank_cash_account(mode_of_payment): - val = webnotes.conn.get_value("Mode of Payment", mode_of_payment, "default_account") + val = frappe.conn.get_value("Mode of Payment", mode_of_payment, "default_account") if not val: - webnotes.msgprint("Default Bank / Cash Account not set in Mode of Payment: %s. Please add a Default Account in Mode of Payment master." % mode_of_payment) + frappe.msgprint("Default Bank / Cash Account not set in Mode of Payment: %s. Please add a Default Account in Mode of Payment master." % mode_of_payment) return { "cash_bank_account": val } -@webnotes.whitelist() +@frappe.whitelist() def get_income_account(doctype, txt, searchfield, start, page_len, filters): from erpnext.controllers.queries import get_match_cond # income account can be any Credit account, # but can also be a Asset account with account_type='Income Account' in special circumstances. # Hence the first condition is an "OR" - return webnotes.conn.sql("""select tabAccount.name from `tabAccount` + return frappe.conn.sql("""select tabAccount.name from `tabAccount` where (tabAccount.debit_or_credit="Credit" or tabAccount.account_type = "Income Account") and tabAccount.group_or_ledger="Ledger" @@ -796,12 +796,12 @@ def get_income_account(doctype, txt, searchfield, start, page_len, filters): 'txt': "%%%s%%" % txt, 'mcond':get_match_cond(doctype, searchfield)}) -@webnotes.whitelist() +@frappe.whitelist() def make_delivery_note(source_name, target_doclist=None): - from webnotes.model.mapper import get_mapped_doclist + from frappe.model.mapper import get_mapped_doclist def set_missing_values(source, target): - bean = webnotes.bean(target) + bean = frappe.bean(target) bean.run_method("onload_post_render") def update_item(source_doc, target_doc, source_parent): diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js index 4f3261962f4..2f7727e90b1 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js @@ -2,7 +2,7 @@ // License: GNU General Public License v3. See license.txt // render -wn.listview_settings['Sales Invoice'] = { +frappe.listview_settings['Sales Invoice'] = { add_fields: ["`tabSales Invoice`.grand_total", "`tabSales Invoice`.outstanding_amount"], add_columns: [{"content":"Percent Paid", width:"10%", type:"bar-graph", label: "Payment Received"}], diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice_map.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice_map.js index 71bbdb61c61..79036f9747e 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice_map.js +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice_map.js @@ -1,7 +1,7 @@ // Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors // License: GNU General Public License v3. See license.txt -wn.model.map_info["Sales Invoice"] = { +frappe.model.map_info["Sales Invoice"] = { "Time Log Batch": { table_map: { "Sales Invoice Item": "Time Log Batch", diff --git a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py index d2aac03ea5f..f6a67f99d32 100644 --- a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py +++ b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py @@ -1,38 +1,38 @@ # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors # License: GNU General Public License v3. See license.txt -import webnotes +import frappe import unittest, json -from webnotes.utils import flt -from webnotes.model.bean import DocstatusTransitionError, TimestampMismatchError +from frappe.utils import flt +from frappe.model.bean import DocstatusTransitionError, TimestampMismatchError from erpnext.accounts.utils import get_stock_and_account_difference from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import set_perpetual_inventory class TestSalesInvoice(unittest.TestCase): def make(self): - w = webnotes.bean(copy=test_records[0]) + w = frappe.bean(copy=test_records[0]) w.doc.is_pos = 0 w.insert() w.submit() return w def test_double_submission(self): - w = webnotes.bean(copy=test_records[0]) + w = frappe.bean(copy=test_records[0]) w.doc.docstatus = '0' w.insert() w2 = [d for d in w.doclist] w.submit() - w = webnotes.bean(w2) + w = frappe.bean(w2) self.assertRaises(DocstatusTransitionError, w.submit) def test_timestamp_change(self): - w = webnotes.bean(copy=test_records[0]) + w = frappe.bean(copy=test_records[0]) w.doc.docstatus = '0' w.insert() - w2 = webnotes.bean([d.fields.copy() for d in w.doclist]) + w2 = frappe.bean([d.fields.copy() for d in w.doclist]) import time time.sleep(1) @@ -43,7 +43,7 @@ class TestSalesInvoice(unittest.TestCase): self.assertRaises(TimestampMismatchError, w2.save) def test_sales_invoice_calculation_base_currency(self): - si = webnotes.bean(copy=test_records[2]) + si = frappe.bean(copy=test_records[2]) si.insert() expected_values = { @@ -87,7 +87,7 @@ class TestSalesInvoice(unittest.TestCase): self.assertEquals(si.doc.grand_total_export, 1627.05) def test_sales_invoice_calculation_export_currency(self): - si = webnotes.bean(copy=test_records[2]) + si = frappe.bean(copy=test_records[2]) si.doc.currency = "USD" si.doc.conversion_rate = 50 si.doclist[1].rate = 1 @@ -137,7 +137,7 @@ class TestSalesInvoice(unittest.TestCase): self.assertEquals(si.doc.grand_total_export, 32.54) def test_sales_invoice_discount_amount(self): - si = webnotes.bean(copy=test_records[3]) + si = frappe.bean(copy=test_records[3]) si.doc.discount_amount = 104.95 si.doclist.append({ "doctype": "Sales Taxes and Charges", @@ -194,7 +194,7 @@ class TestSalesInvoice(unittest.TestCase): self.assertEquals(si.doc.grand_total_export, 1500) def test_discount_amount_gl_entry(self): - si = webnotes.bean(copy=test_records[3]) + si = frappe.bean(copy=test_records[3]) si.doc.discount_amount = 104.95 si.doclist.append({ "doctype": "Sales Taxes and Charges", @@ -210,7 +210,7 @@ class TestSalesInvoice(unittest.TestCase): si.insert() si.submit() - gl_entries = webnotes.conn.sql("""select account, debit, credit + gl_entries = frappe.conn.sql("""select account, debit, credit from `tabGL Entry` where voucher_type='Sales Invoice' and voucher_no=%s order by account asc""", si.doc.name, as_dict=1) @@ -238,13 +238,13 @@ class TestSalesInvoice(unittest.TestCase): # cancel si.cancel() - gle = webnotes.conn.sql("""select * from `tabGL Entry` + gle = frappe.conn.sql("""select * from `tabGL Entry` where voucher_type='Sales Invoice' and voucher_no=%s""", si.doc.name) self.assertFalse(gle) def test_inclusive_rate_validations(self): - si = webnotes.bean(copy=test_records[2]) + si = frappe.bean(copy=test_records[2]) for i, tax in enumerate(si.doclist.get({"parentfield": "other_charges"})): tax.idx = i+1 @@ -254,15 +254,15 @@ class TestSalesInvoice(unittest.TestCase): si.doclist[i].included_in_print_rate = 1 # tax type "Actual" cannot be inclusive - self.assertRaises(webnotes.ValidationError, si.insert) + self.assertRaises(frappe.ValidationError, si.insert) # taxes above included type 'On Previous Row Total' should also be included si.doclist[3].included_in_print_rate = 0 - self.assertRaises(webnotes.ValidationError, si.insert) + self.assertRaises(frappe.ValidationError, si.insert) def test_sales_invoice_calculation_base_currency_with_tax_inclusive_price(self): # prepare - si = webnotes.bean(copy=test_records[3]) + si = frappe.bean(copy=test_records[3]) si.insert() expected_values = { @@ -307,7 +307,7 @@ class TestSalesInvoice(unittest.TestCase): def test_sales_invoice_calculation_export_currency_with_tax_inclusive_price(self): # prepare - si = webnotes.bean(copy=test_records[3]) + si = frappe.bean(copy=test_records[3]) si.doc.currency = "USD" si.doc.conversion_rate = 50 si.doclist[1].price_list_rate = 55.56 @@ -363,55 +363,55 @@ class TestSalesInvoice(unittest.TestCase): self.assertEquals(w.doc.outstanding_amount, w.doc.grand_total) def test_payment(self): - webnotes.conn.sql("""delete from `tabGL Entry`""") + frappe.conn.sql("""delete from `tabGL Entry`""") w = self.make() from erpnext.accounts.doctype.journal_voucher.test_journal_voucher \ import test_records as jv_test_records - jv = webnotes.bean(webnotes.copy_doclist(jv_test_records[0])) + jv = frappe.bean(frappe.copy_doclist(jv_test_records[0])) jv.doclist[1].against_invoice = w.doc.name jv.insert() jv.submit() - self.assertEquals(webnotes.conn.get_value("Sales Invoice", w.doc.name, "outstanding_amount"), + self.assertEquals(frappe.conn.get_value("Sales Invoice", w.doc.name, "outstanding_amount"), 161.8) jv.cancel() - self.assertEquals(webnotes.conn.get_value("Sales Invoice", w.doc.name, "outstanding_amount"), + self.assertEquals(frappe.conn.get_value("Sales Invoice", w.doc.name, "outstanding_amount"), 561.8) def test_time_log_batch(self): - tlb = webnotes.bean("Time Log Batch", "_T-Time Log Batch-00001") + tlb = frappe.bean("Time Log Batch", "_T-Time Log Batch-00001") tlb.submit() - si = webnotes.bean(webnotes.copy_doclist(test_records[0])) + si = frappe.bean(frappe.copy_doclist(test_records[0])) si.doclist[1].time_log_batch = "_T-Time Log Batch-00001" si.insert() si.submit() - self.assertEquals(webnotes.conn.get_value("Time Log Batch", "_T-Time Log Batch-00001", + self.assertEquals(frappe.conn.get_value("Time Log Batch", "_T-Time Log Batch-00001", "status"), "Billed") - self.assertEquals(webnotes.conn.get_value("Time Log", "_T-Time Log-00001", "status"), + self.assertEquals(frappe.conn.get_value("Time Log", "_T-Time Log-00001", "status"), "Billed") si.cancel() - self.assertEquals(webnotes.conn.get_value("Time Log Batch", "_T-Time Log Batch-00001", + self.assertEquals(frappe.conn.get_value("Time Log Batch", "_T-Time Log Batch-00001", "status"), "Submitted") - self.assertEquals(webnotes.conn.get_value("Time Log", "_T-Time Log-00001", "status"), + self.assertEquals(frappe.conn.get_value("Time Log", "_T-Time Log-00001", "status"), "Batched for Billing") def test_sales_invoice_gl_entry_without_aii(self): self.clear_stock_account_balance() set_perpetual_inventory(0) - si = webnotes.bean(copy=test_records[1]) + si = frappe.bean(copy=test_records[1]) si.insert() si.submit() - gl_entries = webnotes.conn.sql("""select account, debit, credit + gl_entries = frappe.conn.sql("""select account, debit, credit from `tabGL Entry` where voucher_type='Sales Invoice' and voucher_no=%s order by account asc""", si.doc.name, as_dict=1) @@ -432,7 +432,7 @@ class TestSalesInvoice(unittest.TestCase): # cancel si.cancel() - gle = webnotes.conn.sql("""select * from `tabGL Entry` + gle = frappe.conn.sql("""select * from `tabGL Entry` where voucher_type='Sales Invoice' and voucher_no=%s""", si.doc.name) self.assertFalse(gle) @@ -444,19 +444,19 @@ class TestSalesInvoice(unittest.TestCase): self._insert_purchase_receipt() self._insert_pos_settings() - pos = webnotes.copy_doclist(test_records[1]) + pos = frappe.copy_doclist(test_records[1]) pos[0]["is_pos"] = 1 pos[0]["update_stock"] = 1 pos[0]["posting_time"] = "12:05" pos[0]["cash_bank_account"] = "_Test Account Bank Account - _TC" pos[0]["paid_amount"] = 600.0 - si = webnotes.bean(copy=pos) + si = frappe.bean(copy=pos) si.insert() si.submit() # check stock ledger entries - sle = webnotes.conn.sql("""select * from `tabStock Ledger Entry` + sle = frappe.conn.sql("""select * from `tabStock Ledger Entry` where voucher_type = 'Sales Invoice' and voucher_no = %s""", si.doc.name, as_dict=1)[0] self.assertTrue(sle) @@ -464,12 +464,12 @@ class TestSalesInvoice(unittest.TestCase): ["_Test Item", "_Test Warehouse - _TC", -1.0]) # check gl entries - gl_entries = webnotes.conn.sql("""select account, debit, credit + gl_entries = frappe.conn.sql("""select account, debit, credit from `tabGL Entry` where voucher_type='Sales Invoice' and voucher_no=%s order by account asc, debit asc""", si.doc.name, as_dict=1) self.assertTrue(gl_entries) - stock_in_hand = webnotes.conn.get_value("Account", {"master_name": "_Test Warehouse - _TC"}) + stock_in_hand = frappe.conn.get_value("Account", {"master_name": "_Test Warehouse - _TC"}) expected_gl_entries = sorted([ [si.doc.debit_to, 630.0, 0.0], @@ -487,7 +487,7 @@ class TestSalesInvoice(unittest.TestCase): self.assertEquals(expected_gl_entries[i][2], gle.credit) si.cancel() - gle = webnotes.conn.sql("""select * from `tabGL Entry` + gle = frappe.conn.sql("""select * from `tabGL Entry` where voucher_type='Sales Invoice' and voucher_no=%s""", si.doc.name) self.assertFalse(gle) @@ -499,28 +499,28 @@ class TestSalesInvoice(unittest.TestCase): def test_si_gl_entry_with_aii_and_update_stock_with_warehouse_but_no_account(self): self.clear_stock_account_balance() set_perpetual_inventory() - webnotes.delete_doc("Account", "_Test Warehouse No Account - _TC") + frappe.delete_doc("Account", "_Test Warehouse No Account - _TC") # insert purchase receipt from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import test_records \ as pr_test_records - pr = webnotes.bean(copy=pr_test_records[0]) + pr = frappe.bean(copy=pr_test_records[0]) pr.doc.naming_series = "_T-Purchase Receipt-" pr.doclist[1].warehouse = "_Test Warehouse No Account - _TC" pr.insert() pr.submit() - si_doclist = webnotes.copy_doclist(test_records[1]) + si_doclist = frappe.copy_doclist(test_records[1]) si_doclist[0]["update_stock"] = 1 si_doclist[0]["posting_time"] = "12:05" si_doclist[1]["warehouse"] = "_Test Warehouse No Account - _TC" - si = webnotes.bean(copy=si_doclist) + si = frappe.bean(copy=si_doclist) si.insert() si.submit() # check stock ledger entries - sle = webnotes.conn.sql("""select * from `tabStock Ledger Entry` + sle = frappe.conn.sql("""select * from `tabStock Ledger Entry` where voucher_type = 'Sales Invoice' and voucher_no = %s""", si.doc.name, as_dict=1)[0] self.assertTrue(sle) @@ -528,7 +528,7 @@ class TestSalesInvoice(unittest.TestCase): ["_Test Item", "_Test Warehouse No Account - _TC", -1.0]) # check gl entries - gl_entries = webnotes.conn.sql("""select account, debit, credit + gl_entries = frappe.conn.sql("""select account, debit, credit from `tabGL Entry` where voucher_type='Sales Invoice' and voucher_no=%s order by account asc, debit asc""", si.doc.name, as_dict=1) self.assertTrue(gl_entries) @@ -545,7 +545,7 @@ class TestSalesInvoice(unittest.TestCase): self.assertEquals(expected_gl_entries[i][2], gle.credit) si.cancel() - gle = webnotes.conn.sql("""select * from `tabGL Entry` + gle = frappe.conn.sql("""select * from `tabGL Entry` where voucher_type='Sales Invoice' and voucher_no=%s""", si.doc.name) self.assertFalse(gle) @@ -555,13 +555,13 @@ class TestSalesInvoice(unittest.TestCase): self.clear_stock_account_balance() set_perpetual_inventory() - si_copy = webnotes.copy_doclist(test_records[1]) + si_copy = frappe.copy_doclist(test_records[1]) si_copy[1]["item_code"] = None - si = webnotes.bean(si_copy) + si = frappe.bean(si_copy) si.insert() si.submit() - gl_entries = webnotes.conn.sql("""select account, debit, credit + gl_entries = frappe.conn.sql("""select account, debit, credit from `tabGL Entry` where voucher_type='Sales Invoice' and voucher_no=%s order by account asc""", si.doc.name, as_dict=1) self.assertTrue(gl_entries) @@ -582,13 +582,13 @@ class TestSalesInvoice(unittest.TestCase): def test_sales_invoice_gl_entry_with_aii_non_stock_item(self): self.clear_stock_account_balance() set_perpetual_inventory() - si_copy = webnotes.copy_doclist(test_records[1]) + si_copy = frappe.copy_doclist(test_records[1]) si_copy[1]["item_code"] = "_Test Non Stock Item" - si = webnotes.bean(si_copy) + si = frappe.bean(si_copy) si.insert() si.submit() - gl_entries = webnotes.conn.sql("""select account, debit, credit + gl_entries = frappe.conn.sql("""select account, debit, credit from `tabGL Entry` where voucher_type='Sales Invoice' and voucher_no=%s order by account asc""", si.doc.name, as_dict=1) self.assertTrue(gl_entries) @@ -609,7 +609,7 @@ class TestSalesInvoice(unittest.TestCase): def _insert_purchase_receipt(self): from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import test_records \ as pr_test_records - pr = webnotes.bean(copy=pr_test_records[0]) + pr = frappe.bean(copy=pr_test_records[0]) pr.doc.naming_series = "_T-Purchase Receipt-" pr.insert() pr.submit() @@ -617,7 +617,7 @@ class TestSalesInvoice(unittest.TestCase): def _insert_delivery_note(self): from erpnext.stock.doctype.delivery_note.test_delivery_note import test_records \ as dn_test_records - dn = webnotes.bean(copy=dn_test_records[0]) + dn = frappe.bean(copy=dn_test_records[0]) dn.doc.naming_series = "_T-Delivery Note-" dn.insert() dn.submit() @@ -626,20 +626,20 @@ class TestSalesInvoice(unittest.TestCase): def _insert_pos_settings(self): from erpnext.accounts.doctype.pos_setting.test_pos_setting \ import test_records as pos_setting_test_records - webnotes.conn.sql("""delete from `tabPOS Setting`""") + frappe.conn.sql("""delete from `tabPOS Setting`""") - ps = webnotes.bean(copy=pos_setting_test_records[0]) + ps = frappe.bean(copy=pos_setting_test_records[0]) ps.insert() def test_sales_invoice_with_advance(self): from erpnext.accounts.doctype.journal_voucher.test_journal_voucher \ import test_records as jv_test_records - jv = webnotes.bean(copy=jv_test_records[0]) + jv = frappe.bean(copy=jv_test_records[0]) jv.insert() jv.submit() - si = webnotes.bean(copy=test_records[0]) + si = frappe.bean(copy=test_records[0]) si.doclist.append({ "doctype": "Sales Invoice Advance", "parentfield": "advance_adjustment_details", @@ -653,24 +653,24 @@ class TestSalesInvoice(unittest.TestCase): si.submit() si.load_from_db() - self.assertTrue(webnotes.conn.sql("""select name from `tabJournal Voucher Detail` + self.assertTrue(frappe.conn.sql("""select name from `tabJournal Voucher Detail` where against_invoice=%s""", si.doc.name)) - self.assertTrue(webnotes.conn.sql("""select name from `tabJournal Voucher Detail` + self.assertTrue(frappe.conn.sql("""select name from `tabJournal Voucher Detail` where against_invoice=%s and credit=300""", si.doc.name)) self.assertEqual(si.doc.outstanding_amount, 261.8) si.cancel() - self.assertTrue(not webnotes.conn.sql("""select name from `tabJournal Voucher Detail` + self.assertTrue(not frappe.conn.sql("""select name from `tabJournal Voucher Detail` where against_invoice=%s""", si.doc.name)) def test_recurring_invoice(self): - from webnotes.utils import get_first_day, get_last_day, add_to_date, nowdate, getdate + from frappe.utils import get_first_day, get_last_day, add_to_date, nowdate, getdate from erpnext.accounts.utils import get_fiscal_year today = nowdate() - base_si = webnotes.bean(copy=test_records[0]) + base_si = frappe.bean(copy=test_records[0]) base_si.doc.fields.update({ "convert_into_recurring_invoice": 1, "recurring_type": "Monthly", @@ -683,13 +683,13 @@ class TestSalesInvoice(unittest.TestCase): }) # monthly - si1 = webnotes.bean(copy=base_si.doclist) + si1 = frappe.bean(copy=base_si.doclist) si1.insert() si1.submit() self._test_recurring_invoice(si1, True) # monthly without a first and last day period - si2 = webnotes.bean(copy=base_si.doclist) + si2 = frappe.bean(copy=base_si.doclist) si2.doc.fields.update({ "invoice_period_from_date": today, "invoice_period_to_date": add_to_date(today, days=30) @@ -699,7 +699,7 @@ class TestSalesInvoice(unittest.TestCase): self._test_recurring_invoice(si2, False) # quarterly - si3 = webnotes.bean(copy=base_si.doclist) + si3 = frappe.bean(copy=base_si.doclist) si3.doc.fields.update({ "recurring_type": "Quarterly", "invoice_period_from_date": get_first_day(today), @@ -710,7 +710,7 @@ class TestSalesInvoice(unittest.TestCase): self._test_recurring_invoice(si3, True) # quarterly without a first and last day period - si4 = webnotes.bean(copy=base_si.doclist) + si4 = frappe.bean(copy=base_si.doclist) si4.doc.fields.update({ "recurring_type": "Quarterly", "invoice_period_from_date": today, @@ -721,7 +721,7 @@ class TestSalesInvoice(unittest.TestCase): self._test_recurring_invoice(si4, False) # yearly - si5 = webnotes.bean(copy=base_si.doclist) + si5 = frappe.bean(copy=base_si.doclist) si5.doc.fields.update({ "recurring_type": "Yearly", "invoice_period_from_date": get_first_day(today), @@ -732,7 +732,7 @@ class TestSalesInvoice(unittest.TestCase): self._test_recurring_invoice(si5, True) # yearly without a first and last day period - si6 = webnotes.bean(copy=base_si.doclist) + si6 = frappe.bean(copy=base_si.doclist) si6.doc.fields.update({ "recurring_type": "Yearly", "invoice_period_from_date": today, @@ -743,7 +743,7 @@ class TestSalesInvoice(unittest.TestCase): self._test_recurring_invoice(si6, False) # change posting date but keep recuring day to be today - si7 = webnotes.bean(copy=base_si.doclist) + si7 = frappe.bean(copy=base_si.doclist) si7.doc.fields.update({ "posting_date": add_to_date(today, days=-1) }) @@ -755,14 +755,14 @@ class TestSalesInvoice(unittest.TestCase): self._test_recurring_invoice(si7, True) def _test_recurring_invoice(self, base_si, first_and_last_day): - from webnotes.utils import add_months, get_last_day + from frappe.utils import add_months, get_last_day from erpnext.accounts.doctype.sales_invoice.sales_invoice \ import manage_recurring_invoices, get_next_date no_of_months = ({"Monthly": 1, "Quarterly": 3, "Yearly": 12})[base_si.doc.recurring_type] def _test(i): - self.assertEquals(i+1, webnotes.conn.sql("""select count(*) from `tabSales Invoice` + self.assertEquals(i+1, frappe.conn.sql("""select count(*) from `tabSales Invoice` where recurring_id=%s and docstatus=1""", base_si.doc.recurring_id)[0][0]) next_date = get_next_date(base_si.doc.posting_date, no_of_months, @@ -770,13 +770,13 @@ class TestSalesInvoice(unittest.TestCase): manage_recurring_invoices(next_date=next_date, commit=False) - recurred_invoices = webnotes.conn.sql("""select name from `tabSales Invoice` + recurred_invoices = frappe.conn.sql("""select name from `tabSales Invoice` where recurring_id=%s and docstatus=1 order by name desc""", base_si.doc.recurring_id) self.assertEquals(i+2, len(recurred_invoices)) - new_si = webnotes.bean("Sales Invoice", recurred_invoices[0][0]) + new_si = frappe.bean("Sales Invoice", recurred_invoices[0][0]) for fieldname in ["convert_into_recurring_invoice", "recurring_type", "repeat_on_day_of_month", "notification_email_address"]: @@ -805,9 +805,9 @@ class TestSalesInvoice(unittest.TestCase): base_si = _test(i) def clear_stock_account_balance(self): - webnotes.conn.sql("delete from `tabStock Ledger Entry`") - webnotes.conn.sql("delete from tabBin") - webnotes.conn.sql("delete from `tabGL Entry`") + frappe.conn.sql("delete from `tabStock Ledger Entry`") + frappe.conn.sql("delete from tabBin") + frappe.conn.sql("delete from `tabGL Entry`") def test_serialized(self): from erpnext.stock.doctype.stock_entry.test_stock_entry import make_serialized_item @@ -816,7 +816,7 @@ class TestSalesInvoice(unittest.TestCase): se = make_serialized_item() serial_nos = get_serial_nos(se.doclist[1].serial_no) - si = webnotes.bean(copy=test_records[0]) + si = frappe.bean(copy=test_records[0]) si.doc.update_stock = 1 si.doclist[1].item_code = "_Test Serialized Item With Series" si.doclist[1].qty = 1 @@ -824,9 +824,9 @@ class TestSalesInvoice(unittest.TestCase): si.insert() si.submit() - self.assertEquals(webnotes.conn.get_value("Serial No", serial_nos[0], "status"), "Delivered") - self.assertFalse(webnotes.conn.get_value("Serial No", serial_nos[0], "warehouse")) - self.assertEquals(webnotes.conn.get_value("Serial No", serial_nos[0], + self.assertEquals(frappe.conn.get_value("Serial No", serial_nos[0], "status"), "Delivered") + self.assertFalse(frappe.conn.get_value("Serial No", serial_nos[0], "warehouse")) + self.assertEquals(frappe.conn.get_value("Serial No", serial_nos[0], "delivery_document_no"), si.doc.name) return si @@ -838,9 +838,9 @@ class TestSalesInvoice(unittest.TestCase): serial_nos = get_serial_nos(si.doclist[1].serial_no) - self.assertEquals(webnotes.conn.get_value("Serial No", serial_nos[0], "status"), "Available") - self.assertEquals(webnotes.conn.get_value("Serial No", serial_nos[0], "warehouse"), "_Test Warehouse - _TC") - self.assertFalse(webnotes.conn.get_value("Serial No", serial_nos[0], + self.assertEquals(frappe.conn.get_value("Serial No", serial_nos[0], "status"), "Available") + self.assertEquals(frappe.conn.get_value("Serial No", serial_nos[0], "warehouse"), "_Test Warehouse - _TC") + self.assertFalse(frappe.conn.get_value("Serial No", serial_nos[0], "delivery_document_no")) def test_serialize_status(self): @@ -850,11 +850,11 @@ class TestSalesInvoice(unittest.TestCase): se = make_serialized_item() serial_nos = get_serial_nos(se.doclist[1].serial_no) - sr = webnotes.bean("Serial No", serial_nos[0]) + sr = frappe.bean("Serial No", serial_nos[0]) sr.doc.status = "Not Available" sr.save() - si = webnotes.bean(copy=test_records[0]) + si = frappe.bean(copy=test_records[0]) si.doc.update_stock = 1 si.doclist[1].item_code = "_Test Serialized Item With Series" si.doclist[1].qty = 1 diff --git a/erpnext/accounts/doctype/sales_invoice_advance/sales_invoice_advance.py b/erpnext/accounts/doctype/sales_invoice_advance/sales_invoice_advance.py index cb6190f2985..26c87f1c04a 100644 --- a/erpnext/accounts/doctype/sales_invoice_advance/sales_invoice_advance.py +++ b/erpnext/accounts/doctype/sales_invoice_advance/sales_invoice_advance.py @@ -2,7 +2,7 @@ # License: GNU General Public License v3. See license.txt from __future__ import unicode_literals -import webnotes +import frappe class DocType: def __init__(self, d, dl): diff --git a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.py b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.py index cb6190f2985..26c87f1c04a 100644 --- a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.py +++ b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.py @@ -2,7 +2,7 @@ # License: GNU General Public License v3. See license.txt from __future__ import unicode_literals -import webnotes +import frappe class DocType: def __init__(self, d, dl): diff --git a/erpnext/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.py b/erpnext/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.py index cb6190f2985..26c87f1c04a 100644 --- a/erpnext/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.py +++ b/erpnext/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.py @@ -2,7 +2,7 @@ # License: GNU General Public License v3. See license.txt from __future__ import unicode_literals -import webnotes +import frappe class DocType: def __init__(self, d, dl): diff --git a/erpnext/accounts/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 index 62345635372..f33eb27da33 100644 --- a/erpnext/accounts/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 @@ -9,7 +9,7 @@ cur_frm.cscript.onload = function(doc, cdt, cdn) { } cur_frm.cscript.refresh = function(doc, cdt, cdn) { - cur_frm.set_footnote(wn.markdown(cur_frm.meta.description)); + cur_frm.set_footnote(frappe.markdown(cur_frm.meta.description)); } // For customizing print @@ -48,7 +48,7 @@ cur_frm.pformat.other_charges= function(doc){ } function print_hide(fieldname) { - var doc_field = wn.meta.get_docfield(doc.doctype, fieldname, doc.name); + var doc_field = frappe.meta.get_docfield(doc.doctype, fieldname, doc.name); return doc_field.print_hide; } @@ -100,7 +100,7 @@ cur_frm.pformat.other_charges= function(doc){ cur_frm.cscript.charge_type = function(doc, cdt, cdn) { var d = locals[cdt][cdn]; if(d.idx == 1 && (d.charge_type == 'On Previous Row Amount' || d.charge_type == 'On Previous Row Total')) { - msgprint(wn._("You cannot select Charge Type as 'On Previous Row Amount' or 'On Previous Row Total' for first row")); + msgprint(frappe._("You cannot select Charge Type as 'On Previous Row Amount' or 'On Previous Row Total' for first row")); d.charge_type = ''; } validated = false; @@ -113,16 +113,16 @@ cur_frm.cscript.charge_type = function(doc, cdt, cdn) { cur_frm.cscript.row_id = function(doc, cdt, cdn) { var d = locals[cdt][cdn]; if(!d.charge_type && d.row_id) { - msgprint(wn._("Please select Charge Type first")); + msgprint(frappe._("Please select Charge Type first")); d.row_id = ''; } else if((d.charge_type == 'Actual' || d.charge_type == 'On Net Total') && d.row_id) { - msgprint(wn._("You can Enter Row only if your Charge Type is 'On Previous Row Amount' or ' Previous Row Total'")); + msgprint(frappe._("You can Enter Row only if your Charge Type is 'On Previous Row Amount' or ' Previous Row Total'")); d.row_id = ''; } else if((d.charge_type == 'On Previous Row Amount' || d.charge_type == 'On Previous Row Total') && d.row_id) { if(d.row_id >= d.idx){ - msgprint(wn._("You cannot Enter Row no. greater than or equal to current row no. for this Charge type")); + msgprint(frappe._("You cannot Enter Row no. greater than or equal to current row no. for this Charge type")); d.row_id = ''; } } @@ -153,7 +153,7 @@ cur_frm.fields_dict['other_charges'].grid.get_field("cost_center").get_query = f cur_frm.cscript.rate = function(doc, cdt, cdn) { var d = locals[cdt][cdn]; if(!d.charge_type && d.rate) { - msgprint(wn._("Please select Charge Type first")); + msgprint(frappe._("Please select Charge Type first")); d.rate = ''; } validated = false; @@ -163,11 +163,11 @@ cur_frm.cscript.rate = function(doc, cdt, cdn) { cur_frm.cscript.tax_amount = function(doc, cdt, cdn) { var d = locals[cdt][cdn]; if(!d.charge_type && d.tax_amount) { - msgprint(wn._("Please select Charge Type first")); + msgprint(frappe._("Please select Charge Type first")); d.tax_amount = ''; } else if(d.charge_type && d.tax_amount) { - msgprint(wn._("You cannot directly enter Amount and if your Charge Type is Actual enter your amount in Rate")); + msgprint(frappe._("You cannot directly enter Amount and if your Charge Type is Actual enter your amount in Rate")); d.tax_amount = ''; } validated = false; diff --git a/erpnext/accounts/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 index 82412c66d07..6c1a877e9c6 100644 --- a/erpnext/accounts/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 @@ -2,14 +2,14 @@ # License: GNU General Public License v3. See license.txt from __future__ import unicode_literals -import webnotes -from webnotes.utils import cint -from webnotes.model.controller import DocListController +import frappe +from frappe.utils import cint +from frappe.model.controller import DocListController class DocType(DocListController): def validate(self): if self.doc.is_default == 1: - webnotes.conn.sql("""update `tabSales Taxes and Charges Master` set is_default = 0 + frappe.conn.sql("""update `tabSales Taxes and Charges Master` set is_default = 0 where ifnull(is_default,0) = 1 and name != %s and company = %s""", (self.doc.name, self.doc.company)) diff --git a/erpnext/accounts/doctype/shipping_rule/shipping_rule.py b/erpnext/accounts/doctype/shipping_rule/shipping_rule.py index 5c084f3c60d..fe5d7f9010e 100644 --- a/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +++ b/erpnext/accounts/doctype/shipping_rule/shipping_rule.py @@ -4,15 +4,15 @@ # For license information, please see license.txt from __future__ import unicode_literals -import webnotes -from webnotes import _, msgprint -from webnotes.utils import flt, fmt_money -from webnotes.model.controller import DocListController +import frappe +from frappe import _, msgprint +from frappe.utils import flt, fmt_money +from frappe.model.controller import DocListController from erpnext.setup.utils import get_company_currency -class OverlappingConditionError(webnotes.ValidationError): pass -class FromGreaterThanToError(webnotes.ValidationError): pass -class ManyBlankToValuesError(webnotes.ValidationError): pass +class OverlappingConditionError(frappe.ValidationError): pass +class FromGreaterThanToError(frappe.ValidationError): pass +class ManyBlankToValuesError(frappe.ValidationError): pass class DocType(DocListController): def __init__(self, d, dl): diff --git a/erpnext/accounts/doctype/shipping_rule/test_shipping_rule.py b/erpnext/accounts/doctype/shipping_rule/test_shipping_rule.py index ad99a516f34..40853471a7e 100644 --- a/erpnext/accounts/doctype/shipping_rule/test_shipping_rule.py +++ b/erpnext/accounts/doctype/shipping_rule/test_shipping_rule.py @@ -1,18 +1,18 @@ # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors # License: GNU General Public License v3. See license.txt -import webnotes +import frappe import unittest from erpnext.accounts.doctype.shipping_rule.shipping_rule import FromGreaterThanToError, ManyBlankToValuesError, OverlappingConditionError class TestShippingRule(unittest.TestCase): def test_from_greater_than_to(self): - shipping_rule = webnotes.bean(copy=test_records[0]) + shipping_rule = frappe.bean(copy=test_records[0]) shipping_rule.doclist[1].from_value = 101 self.assertRaises(FromGreaterThanToError, shipping_rule.insert) def test_many_zero_to_values(self): - shipping_rule = webnotes.bean(copy=test_records[0]) + shipping_rule = frappe.bean(copy=test_records[0]) shipping_rule.doclist[1].to_value = 0 self.assertRaises(ManyBlankToValuesError, shipping_rule.insert) @@ -24,7 +24,7 @@ class TestShippingRule(unittest.TestCase): ((50, 150), (25, 175)), ((50, 150), (50, 150)), ]: - shipping_rule = webnotes.bean(copy=test_records[0]) + shipping_rule = frappe.bean(copy=test_records[0]) shipping_rule.doclist[1].from_value = range_a[0] shipping_rule.doclist[1].to_value = range_a[1] shipping_rule.doclist[2].from_value = range_b[0] diff --git a/erpnext/accounts/doctype/shipping_rule_condition/shipping_rule_condition.py b/erpnext/accounts/doctype/shipping_rule_condition/shipping_rule_condition.py index e5468e553ef..968a25b6134 100644 --- a/erpnext/accounts/doctype/shipping_rule_condition/shipping_rule_condition.py +++ b/erpnext/accounts/doctype/shipping_rule_condition/shipping_rule_condition.py @@ -4,7 +4,7 @@ # For license information, please see license.txt from __future__ import unicode_literals -import webnotes +import frappe class DocType: def __init__(self, d, dl): diff --git a/erpnext/accounts/general_ledger.py b/erpnext/accounts/general_ledger.py index 5451642ff51..d0c8aaf1805 100644 --- a/erpnext/accounts/general_ledger.py +++ b/erpnext/accounts/general_ledger.py @@ -2,13 +2,13 @@ # License: GNU General Public License v3. See license.txt from __future__ import unicode_literals -import webnotes -from webnotes.utils import flt, cstr -from webnotes import _ +import frappe +from frappe.utils import flt, cstr +from frappe import _ from erpnext.accounts.utils import validate_expense_against_budget -class StockAccountInvalidTransaction(webnotes.ValidationError): pass +class StockAccountInvalidTransaction(frappe.ValidationError): pass def make_gl_entries(gl_map, cancel=False, adv_adj=False, merge_entries=True, update_outstanding='Yes'): @@ -77,7 +77,7 @@ def save_entries(gl_map, adv_adj, update_outstanding): def make_entry(args, adv_adj, update_outstanding): args.update({"doctype": "GL Entry"}) - gle = webnotes.bean([args]) + gle = frappe.bean([args]) gle.ignore_permissions = 1 gle.insert() gle.run_method("on_update_with_args", adv_adj, update_outstanding) @@ -85,17 +85,17 @@ def make_entry(args, adv_adj, update_outstanding): def validate_total_debit_credit(total_debit, total_credit): if abs(total_debit - total_credit) > 0.005: - webnotes.throw(_("Debit and Credit not equal for this voucher: Diff (Debit) is ") + + frappe.throw(_("Debit and Credit not equal for this voucher: Diff (Debit) is ") + cstr(total_debit - total_credit)) def validate_account_for_auto_accounting_for_stock(gl_map): if gl_map[0].voucher_type=="Journal Voucher": - aii_accounts = [d[0] for d in webnotes.conn.sql("""select name from tabAccount + aii_accounts = [d[0] for d in frappe.conn.sql("""select name from tabAccount where account_type = 'Warehouse' and ifnull(master_name, '')!=''""")] for entry in gl_map: if entry.account in aii_accounts: - webnotes.throw(_("Account") + ": " + entry.account + + frappe.throw(_("Account") + ": " + entry.account + _(" can only be debited/credited through Stock transactions"), StockAccountInvalidTransaction) @@ -107,12 +107,12 @@ def delete_gl_entries(gl_entries=None, voucher_type=None, voucher_no=None, check_freezing_date, update_outstanding_amt, validate_frozen_account if not gl_entries: - gl_entries = webnotes.conn.sql("""select * from `tabGL Entry` + gl_entries = frappe.conn.sql("""select * from `tabGL Entry` where voucher_type=%s and voucher_no=%s""", (voucher_type, voucher_no), as_dict=True) if gl_entries: check_freezing_date(gl_entries[0]["posting_date"], adv_adj) - webnotes.conn.sql("""delete from `tabGL Entry` where voucher_type=%s and voucher_no=%s""", + frappe.conn.sql("""delete from `tabGL Entry` where voucher_type=%s and voucher_no=%s""", (voucher_type or gl_entries[0]["voucher_type"], voucher_no or gl_entries[0]["voucher_no"])) for entry in gl_entries: diff --git a/erpnext/accounts/page/accounts_browser/accounts_browser.js b/erpnext/accounts/page/accounts_browser/accounts_browser.js index c4213325717..9500a70feb2 100644 --- a/erpnext/accounts/page/accounts_browser/accounts_browser.js +++ b/erpnext/accounts/page/accounts_browser/accounts_browser.js @@ -8,7 +8,7 @@ // see ledger pscript['onload_Accounts Browser'] = function(wrapper){ - wn.ui.make_app_page({ + frappe.ui.make_app_page({ parent: wrapper, single_column: true }) @@ -20,30 +20,30 @@ pscript['onload_Accounts Browser'] = function(wrapper){ .css({"margin-bottom": "15px", "min-height": "200px"}) .appendTo(main), help_area = $('
'+ - '

'+wn._('Quick Help')+'

'+ + '

'+frappe._('Quick Help')+'

'+ '
    '+ - '
  1. '+wn._('To add child nodes, explore tree and click on the node under which you want to add more nodes.')+'
    2. '+ + '
  2. '+frappe._('To add child nodes, explore tree and click on the node under which you want to add more nodes.')+'
    3. '+ '
  3. '+ - wn._('Accounting Entries can be made against leaf nodes, called')+ - '' +wn._('Ledgers')+'.'+ wn._('Entries against') + - '' +wn._('Groups') + ''+ wn._('are not allowed.')+ + frappe._('Accounting Entries can be made against leaf nodes, called')+ + '' +frappe._('Ledgers')+'.'+ frappe._('Entries against') + + '' +frappe._('Groups') + ''+ frappe._('are not allowed.')+ '
    4. '+ - '
  4. '+wn._('Please do NOT create Account (Ledgers) for Customers and Suppliers. They are created directly from the Customer / Supplier masters.')+'
    5. '+ + '
  5. '+frappe._('Please do NOT create Account (Ledgers) for Customers and Suppliers. They are created directly from the Customer / Supplier masters.')+'
    6. '+ '
  6. '+ - ''+wn._('To create a Bank Account:')+''+ - wn._('Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts)')+ - wn._('and create a new Account Ledger (by clicking on Add Child) of type "Bank or Cash"')+ + ''+frappe._('To create a Bank Account:')+''+ + frappe._('Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts)')+ + frappe._('and create a new Account Ledger (by clicking on Add Child) of type "Bank or Cash"')+ '
    7. '+ '
  7. '+ - ''+wn._('To create a Tax Account:')+''+ - wn._('Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties)')+ - wn._('and create a new Account Ledger (by clicking on Add Child) of type "Tax" and do mention the Tax rate.')+ + ''+frappe._('To create a Tax Account:')+''+ + frappe._('Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties)')+ + frappe._('and create a new Account Ledger (by clicking on Add Child) of type "Tax" and do mention the Tax rate.')+ '
    8. '+ '
'+ - '

'+wn._('Please setup your chart of accounts before you start Accounting Entries')+'

').appendTo(main); + '

'+frappe._('Please setup your chart of accounts before you start Accounting Entries')+'

').appendTo(main); - if (wn.boot.profile.can_create.indexOf("Company") !== -1) { - wrapper.appframe.add_button(wn._('New Company'), function() { newdoc('Company'); }, + if (frappe.boot.profile.can_create.indexOf("Company") !== -1) { + wrapper.appframe.add_button(frappe._('New Company'), function() { newdoc('Company'); }, 'icon-plus'); } @@ -54,21 +54,21 @@ pscript['onload_Accounts Browser'] = function(wrapper){ // company-select wrapper.$company_select = wrapper.appframe.add_select("Company", []) .change(function() { - var ctype = wn.get_route()[1] || 'Account'; + var ctype = frappe.get_route()[1] || 'Account'; erpnext.account_chart = new erpnext.AccountsChart(ctype, $(this).val(), chart_area.get(0)); pscript.set_title(wrapper, ctype, $(this).val()); }) // load up companies - return wn.call({ + return frappe.call({ method: 'erpnext.accounts.page.accounts_browser.accounts_browser.get_companies', callback: function(r) { wrapper.$company_select.empty(); $.each(r.message, function(i, v) { $('