diff --git a/foundation/www/docs/assets/img/accounts/opening-invoice-creation-tool.png b/foundation/www/docs/assets/img/accounts/opening-invoice-creation-tool.png new file mode 100644 index 00000000..638b9e6b Binary files /dev/null and b/foundation/www/docs/assets/img/accounts/opening-invoice-creation-tool.png differ diff --git a/foundation/www/docs/current/api/schools/_sidebar.json b/foundation/www/docs/assets/img/agriculture/_sidebar.json similarity index 100% rename from foundation/www/docs/current/api/schools/_sidebar.json rename to foundation/www/docs/assets/img/agriculture/_sidebar.json diff --git a/foundation/www/docs/assets/img/agriculture/agri_desk.png b/foundation/www/docs/assets/img/agriculture/agri_desk.png new file mode 100644 index 00000000..bc1a03bb Binary files /dev/null and b/foundation/www/docs/assets/img/agriculture/agri_desk.png differ diff --git a/foundation/www/docs/assets/img/agriculture/agri_doctypes.png b/foundation/www/docs/assets/img/agriculture/agri_doctypes.png new file mode 100644 index 00000000..75dea2fa Binary files /dev/null and b/foundation/www/docs/assets/img/agriculture/agri_doctypes.png differ diff --git a/foundation/www/docs/current/api/schools/web_form/_sidebar.json b/foundation/www/docs/assets/img/agriculture/crops_and_land/_sidebar.json similarity index 100% rename from foundation/www/docs/current/api/schools/web_form/_sidebar.json rename to foundation/www/docs/assets/img/agriculture/crops_and_land/_sidebar.json diff --git a/foundation/www/docs/assets/img/agriculture/crops_and_land/crop.png b/foundation/www/docs/assets/img/agriculture/crops_and_land/crop.png new file mode 100644 index 00000000..2b313178 Binary files /dev/null and b/foundation/www/docs/assets/img/agriculture/crops_and_land/crop.png differ diff --git a/foundation/www/docs/assets/img/agriculture/crops_and_land/crop_cycle.png b/foundation/www/docs/assets/img/agriculture/crops_and_land/crop_cycle.png new file mode 100644 index 00000000..27b612f6 Binary files /dev/null and b/foundation/www/docs/assets/img/agriculture/crops_and_land/crop_cycle.png differ diff --git a/foundation/www/docs/assets/img/agriculture/crops_and_land/land_unit.png b/foundation/www/docs/assets/img/agriculture/crops_and_land/land_unit.png new file mode 100644 index 00000000..500978e3 Binary files /dev/null and b/foundation/www/docs/assets/img/agriculture/crops_and_land/land_unit.png differ diff --git a/foundation/www/docs/assets/img/agriculture/crops_and_land/projects.png b/foundation/www/docs/assets/img/agriculture/crops_and_land/projects.png new file mode 100644 index 00000000..f55d3c72 Binary files /dev/null and b/foundation/www/docs/assets/img/agriculture/crops_and_land/projects.png differ diff --git a/foundation/www/docs/current/api/schools/web_form/discussion/_sidebar.json b/foundation/www/docs/assets/img/agriculture/diseases_and_fertilizer/_sidebar.json similarity index 100% rename from foundation/www/docs/current/api/schools/web_form/discussion/_sidebar.json rename to foundation/www/docs/assets/img/agriculture/diseases_and_fertilizer/_sidebar.json diff --git a/foundation/www/docs/assets/img/agriculture/diseases_and_fertilizer/disease.png b/foundation/www/docs/assets/img/agriculture/diseases_and_fertilizer/disease.png new file mode 100644 index 00000000..ad10e29e Binary files /dev/null and b/foundation/www/docs/assets/img/agriculture/diseases_and_fertilizer/disease.png differ diff --git a/foundation/www/docs/assets/img/agriculture/diseases_and_fertilizer/fertilizer.png b/foundation/www/docs/assets/img/agriculture/diseases_and_fertilizer/fertilizer.png new file mode 100644 index 00000000..640b1a98 Binary files /dev/null and b/foundation/www/docs/assets/img/agriculture/diseases_and_fertilizer/fertilizer.png differ diff --git a/foundation/www/docs/current/api/schools/web_form/student_applicant/_sidebar.json b/foundation/www/docs/assets/img/asset/_sidebar.json similarity index 100% rename from foundation/www/docs/current/api/schools/web_form/student_applicant/_sidebar.json rename to foundation/www/docs/assets/img/asset/_sidebar.json diff --git a/foundation/www/docs/assets/img/accounts/asset-category.png b/foundation/www/docs/assets/img/asset/asset-category.png similarity index 100% rename from foundation/www/docs/assets/img/accounts/asset-category.png rename to foundation/www/docs/assets/img/asset/asset-category.png diff --git a/foundation/www/docs/assets/img/accounts/asset-graph.png b/foundation/www/docs/assets/img/asset/asset-graph.png similarity index 100% rename from foundation/www/docs/assets/img/accounts/asset-graph.png rename to foundation/www/docs/assets/img/asset/asset-graph.png diff --git a/foundation/www/docs/assets/img/accounts/asset-item.png b/foundation/www/docs/assets/img/asset/asset-item.png similarity index 100% rename from foundation/www/docs/assets/img/accounts/asset-item.png rename to foundation/www/docs/assets/img/asset/asset-item.png diff --git a/foundation/www/docs/assets/img/accounts/asset-movement-using-button.png b/foundation/www/docs/assets/img/asset/asset-movement-using-button.png similarity index 100% rename from foundation/www/docs/assets/img/accounts/asset-movement-using-button.png rename to foundation/www/docs/assets/img/asset/asset-movement-using-button.png diff --git a/foundation/www/docs/assets/img/accounts/asset-movement.png b/foundation/www/docs/assets/img/asset/asset-movement.png similarity index 100% rename from foundation/www/docs/assets/img/accounts/asset-movement.png rename to foundation/www/docs/assets/img/asset/asset-movement.png diff --git a/foundation/www/docs/assets/img/accounts/asset-purchase-invoice.png b/foundation/www/docs/assets/img/asset/asset-purchase-invoice.png similarity index 100% rename from foundation/www/docs/assets/img/accounts/asset-purchase-invoice.png rename to foundation/www/docs/assets/img/asset/asset-purchase-invoice.png diff --git a/foundation/www/docs/assets/img/accounts/asset-sales.png b/foundation/www/docs/assets/img/asset/asset-sales.png similarity index 100% rename from foundation/www/docs/assets/img/accounts/asset-sales.png rename to foundation/www/docs/assets/img/asset/asset-sales.png diff --git a/foundation/www/docs/assets/img/accounts/asset.png b/foundation/www/docs/assets/img/asset/asset.png similarity index 100% rename from foundation/www/docs/assets/img/accounts/asset.png rename to foundation/www/docs/assets/img/asset/asset.png diff --git a/foundation/www/docs/assets/img/asset/asset_maintenance.png b/foundation/www/docs/assets/img/asset/asset_maintenance.png new file mode 100644 index 00000000..725cf628 Binary files /dev/null and b/foundation/www/docs/assets/img/asset/asset_maintenance.png differ diff --git a/foundation/www/docs/assets/img/asset/asset_maintenance_log.png b/foundation/www/docs/assets/img/asset/asset_maintenance_log.png new file mode 100644 index 00000000..8a51c2d5 Binary files /dev/null and b/foundation/www/docs/assets/img/asset/asset_maintenance_log.png differ diff --git a/foundation/www/docs/assets/img/asset/asset_maintenance_team.png b/foundation/www/docs/assets/img/asset/asset_maintenance_team.png new file mode 100644 index 00000000..c022249f Binary files /dev/null and b/foundation/www/docs/assets/img/asset/asset_maintenance_team.png differ diff --git a/foundation/www/docs/assets/img/asset/asset_repair.png b/foundation/www/docs/assets/img/asset/asset_repair.png new file mode 100644 index 00000000..ff3cd5f4 Binary files /dev/null and b/foundation/www/docs/assets/img/asset/asset_repair.png differ diff --git a/foundation/www/docs/assets/img/accounts/depreciation-entry.png b/foundation/www/docs/assets/img/asset/depreciation-entry.png similarity index 100% rename from foundation/www/docs/assets/img/accounts/depreciation-entry.png rename to foundation/www/docs/assets/img/asset/depreciation-entry.png diff --git a/foundation/www/docs/assets/img/accounts/depreciation-schedule.png b/foundation/www/docs/assets/img/asset/depreciation-schedule.png similarity index 100% rename from foundation/www/docs/assets/img/accounts/depreciation-schedule.png rename to foundation/www/docs/assets/img/asset/depreciation-schedule.png diff --git a/foundation/www/docs/assets/img/asset/maintenance_required.png b/foundation/www/docs/assets/img/asset/maintenance_required.png new file mode 100644 index 00000000..a4c853ad Binary files /dev/null and b/foundation/www/docs/assets/img/asset/maintenance_required.png differ diff --git a/foundation/www/docs/assets/img/accounts/scrap-journal-entry.png b/foundation/www/docs/assets/img/asset/scrap-journal-entry.png similarity index 100% rename from foundation/www/docs/assets/img/accounts/scrap-journal-entry.png rename to foundation/www/docs/assets/img/asset/scrap-journal-entry.png diff --git a/foundation/www/docs/assets/img/schools/__init__.py b/foundation/www/docs/assets/img/education/__init__.py similarity index 100% rename from foundation/www/docs/assets/img/schools/__init__.py rename to foundation/www/docs/assets/img/education/__init__.py diff --git a/foundation/www/docs/user/manual/en/subscription/_sidebar.json b/foundation/www/docs/assets/img/education/_sidebar.json similarity index 100% rename from foundation/www/docs/user/manual/en/subscription/_sidebar.json rename to foundation/www/docs/assets/img/education/_sidebar.json diff --git a/foundation/www/docs/assets/img/schools/admission/__init__.py b/foundation/www/docs/assets/img/education/admission/__init__.py similarity index 100% rename from foundation/www/docs/assets/img/schools/admission/__init__.py rename to foundation/www/docs/assets/img/education/admission/__init__.py diff --git a/foundation/www/docs/assets/img/education/admission/_sidebar.json b/foundation/www/docs/assets/img/education/admission/_sidebar.json new file mode 100644 index 00000000..88f5aab5 --- /dev/null +++ b/foundation/www/docs/assets/img/education/admission/_sidebar.json @@ -0,0 +1,22 @@ +[ + { + "route": "/docs", + "title": "Docs Home" + }, + { + "route": "/docs/user", + "title": "User Guide" + }, + { + "route": "/docs/current/api", + "title": "Server API" + }, + { + "route": "/docs/current/models", + "title": "Models (Reference)" + }, + { + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "title": "Improve Docs" + } +] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/schools/admission/program-enrollment-tool.gif b/foundation/www/docs/assets/img/education/admission/program-enrollment-tool.gif similarity index 100% rename from foundation/www/docs/assets/img/schools/admission/program-enrollment-tool.gif rename to foundation/www/docs/assets/img/education/admission/program-enrollment-tool.gif diff --git a/foundation/www/docs/assets/img/schools/admission/program-enrollment-tool01.gif b/foundation/www/docs/assets/img/education/admission/program-enrollment-tool01.gif similarity index 100% rename from foundation/www/docs/assets/img/schools/admission/program-enrollment-tool01.gif rename to foundation/www/docs/assets/img/education/admission/program-enrollment-tool01.gif diff --git a/foundation/www/docs/assets/img/schools/admission/program-enrollment.gif b/foundation/www/docs/assets/img/education/admission/program-enrollment.gif similarity index 100% rename from foundation/www/docs/assets/img/schools/admission/program-enrollment.gif rename to foundation/www/docs/assets/img/education/admission/program-enrollment.gif diff --git a/foundation/www/docs/assets/img/education/admission/student-admission.gif b/foundation/www/docs/assets/img/education/admission/student-admission.gif new file mode 100644 index 00000000..26caea9c Binary files /dev/null and b/foundation/www/docs/assets/img/education/admission/student-admission.gif differ diff --git a/foundation/www/docs/assets/img/schools/admission/student-applicant-enroll.png b/foundation/www/docs/assets/img/education/admission/student-applicant-enroll.png similarity index 100% rename from foundation/www/docs/assets/img/schools/admission/student-applicant-enroll.png rename to foundation/www/docs/assets/img/education/admission/student-applicant-enroll.png diff --git a/foundation/www/docs/assets/img/schools/admission/student-applicant.png b/foundation/www/docs/assets/img/education/admission/student-applicant.png similarity index 100% rename from foundation/www/docs/assets/img/schools/admission/student-applicant.png rename to foundation/www/docs/assets/img/education/admission/student-applicant.png diff --git a/foundation/www/docs/assets/img/schools/admission/student-application-actions.png b/foundation/www/docs/assets/img/education/admission/student-application-actions.png similarity index 100% rename from foundation/www/docs/assets/img/schools/admission/student-application-actions.png rename to foundation/www/docs/assets/img/education/admission/student-application-actions.png diff --git a/foundation/www/docs/assets/img/schools/assessment/__init__.py b/foundation/www/docs/assets/img/education/assessment/__init__.py similarity index 100% rename from foundation/www/docs/assets/img/schools/assessment/__init__.py rename to foundation/www/docs/assets/img/education/assessment/__init__.py diff --git a/foundation/www/docs/assets/img/education/assessment/_sidebar.json b/foundation/www/docs/assets/img/education/assessment/_sidebar.json new file mode 100644 index 00000000..88f5aab5 --- /dev/null +++ b/foundation/www/docs/assets/img/education/assessment/_sidebar.json @@ -0,0 +1,22 @@ +[ + { + "route": "/docs", + "title": "Docs Home" + }, + { + "route": "/docs/user", + "title": "User Guide" + }, + { + "route": "/docs/current/api", + "title": "Server API" + }, + { + "route": "/docs/current/models", + "title": "Models (Reference)" + }, + { + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "title": "Improve Docs" + } +] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/schools/assessment/assessment-criteria.png b/foundation/www/docs/assets/img/education/assessment/assessment-criteria.png similarity index 100% rename from foundation/www/docs/assets/img/schools/assessment/assessment-criteria.png rename to foundation/www/docs/assets/img/education/assessment/assessment-criteria.png diff --git a/foundation/www/docs/assets/img/schools/assessment/assessment-group-details.png b/foundation/www/docs/assets/img/education/assessment/assessment-group-details.png similarity index 100% rename from foundation/www/docs/assets/img/schools/assessment/assessment-group-details.png rename to foundation/www/docs/assets/img/education/assessment/assessment-group-details.png diff --git a/foundation/www/docs/assets/img/schools/assessment/assessment-group-term.png b/foundation/www/docs/assets/img/education/assessment/assessment-group-term.png similarity index 100% rename from foundation/www/docs/assets/img/schools/assessment/assessment-group-term.png rename to foundation/www/docs/assets/img/education/assessment/assessment-group-term.png diff --git a/foundation/www/docs/assets/img/schools/assessment/assessment-plan-criteria.png b/foundation/www/docs/assets/img/education/assessment/assessment-plan-criteria.png similarity index 100% rename from foundation/www/docs/assets/img/schools/assessment/assessment-plan-criteria.png rename to foundation/www/docs/assets/img/education/assessment/assessment-plan-criteria.png diff --git a/foundation/www/docs/assets/img/schools/assessment/assessment-plan-details.png b/foundation/www/docs/assets/img/education/assessment/assessment-plan-details.png similarity index 100% rename from foundation/www/docs/assets/img/schools/assessment/assessment-plan-details.png rename to foundation/www/docs/assets/img/education/assessment/assessment-plan-details.png diff --git a/foundation/www/docs/assets/img/schools/assessment/assessment-result-tool.png b/foundation/www/docs/assets/img/education/assessment/assessment-result-tool.png similarity index 100% rename from foundation/www/docs/assets/img/schools/assessment/assessment-result-tool.png rename to foundation/www/docs/assets/img/education/assessment/assessment-result-tool.png diff --git a/foundation/www/docs/assets/img/schools/assessment/assessment-result.png b/foundation/www/docs/assets/img/education/assessment/assessment-result.png similarity index 100% rename from foundation/www/docs/assets/img/schools/assessment/assessment-result.png rename to foundation/www/docs/assets/img/education/assessment/assessment-result.png diff --git a/foundation/www/docs/assets/img/schools/assessment/grading-scale.png b/foundation/www/docs/assets/img/education/assessment/grading-scale.png similarity index 100% rename from foundation/www/docs/assets/img/schools/assessment/grading-scale.png rename to foundation/www/docs/assets/img/education/assessment/grading-scale.png diff --git a/foundation/www/docs/assets/img/schools/fees/__init__.py b/foundation/www/docs/assets/img/education/fees/__init__.py similarity index 100% rename from foundation/www/docs/assets/img/schools/fees/__init__.py rename to foundation/www/docs/assets/img/education/fees/__init__.py diff --git a/foundation/www/docs/assets/img/education/fees/_sidebar.json b/foundation/www/docs/assets/img/education/fees/_sidebar.json new file mode 100644 index 00000000..88f5aab5 --- /dev/null +++ b/foundation/www/docs/assets/img/education/fees/_sidebar.json @@ -0,0 +1,22 @@ +[ + { + "route": "/docs", + "title": "Docs Home" + }, + { + "route": "/docs/user", + "title": "User Guide" + }, + { + "route": "/docs/current/api", + "title": "Server API" + }, + { + "route": "/docs/current/models", + "title": "Models (Reference)" + }, + { + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "title": "Improve Docs" + } +] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/schools/fees/fee-category.png b/foundation/www/docs/assets/img/education/fees/fee-category.png similarity index 100% rename from foundation/www/docs/assets/img/schools/fees/fee-category.png rename to foundation/www/docs/assets/img/education/fees/fee-category.png diff --git a/foundation/www/docs/assets/img/education/fees/fee-structure.png b/foundation/www/docs/assets/img/education/fees/fee-structure.png new file mode 100644 index 00000000..cd1edaf0 Binary files /dev/null and b/foundation/www/docs/assets/img/education/fees/fee-structure.png differ diff --git a/foundation/www/docs/assets/img/schools/fees/fees-section.png b/foundation/www/docs/assets/img/education/fees/fees-section.png similarity index 100% rename from foundation/www/docs/assets/img/schools/fees/fees-section.png rename to foundation/www/docs/assets/img/education/fees/fees-section.png diff --git a/foundation/www/docs/assets/img/schools/fees/fees.png b/foundation/www/docs/assets/img/education/fees/fees.png similarity index 100% rename from foundation/www/docs/assets/img/schools/fees/fees.png rename to foundation/www/docs/assets/img/education/fees/fees.png diff --git a/foundation/www/docs/assets/img/schools/home.png b/foundation/www/docs/assets/img/education/home.png similarity index 100% rename from foundation/www/docs/assets/img/schools/home.png rename to foundation/www/docs/assets/img/education/home.png diff --git a/foundation/www/docs/assets/img/schools/module.png b/foundation/www/docs/assets/img/education/module.png similarity index 100% rename from foundation/www/docs/assets/img/schools/module.png rename to foundation/www/docs/assets/img/education/module.png diff --git a/foundation/www/docs/assets/img/schools/schedule/__init__.py b/foundation/www/docs/assets/img/education/schedule/__init__.py similarity index 100% rename from foundation/www/docs/assets/img/schools/schedule/__init__.py rename to foundation/www/docs/assets/img/education/schedule/__init__.py diff --git a/foundation/www/docs/assets/img/education/schedule/_sidebar.json b/foundation/www/docs/assets/img/education/schedule/_sidebar.json new file mode 100644 index 00000000..88f5aab5 --- /dev/null +++ b/foundation/www/docs/assets/img/education/schedule/_sidebar.json @@ -0,0 +1,22 @@ +[ + { + "route": "/docs", + "title": "Docs Home" + }, + { + "route": "/docs/user", + "title": "User Guide" + }, + { + "route": "/docs/current/api", + "title": "Server API" + }, + { + "route": "/docs/current/models", + "title": "Models (Reference)" + }, + { + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "title": "Improve Docs" + } +] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/schools/schedule/course-schedule-att-1.png b/foundation/www/docs/assets/img/education/schedule/course-schedule-att-1.png similarity index 100% rename from foundation/www/docs/assets/img/schools/schedule/course-schedule-att-1.png rename to foundation/www/docs/assets/img/education/schedule/course-schedule-att-1.png diff --git a/foundation/www/docs/assets/img/schools/schedule/course-schedule-att.png b/foundation/www/docs/assets/img/education/schedule/course-schedule-att.png similarity index 100% rename from foundation/www/docs/assets/img/schools/schedule/course-schedule-att.png rename to foundation/www/docs/assets/img/education/schedule/course-schedule-att.png diff --git a/foundation/www/docs/assets/img/schools/schedule/course-schedule.png b/foundation/www/docs/assets/img/education/schedule/course-schedule.png similarity index 100% rename from foundation/www/docs/assets/img/schools/schedule/course-schedule.png rename to foundation/www/docs/assets/img/education/schedule/course-schedule.png diff --git a/foundation/www/docs/assets/img/schools/schedule/examination.png b/foundation/www/docs/assets/img/education/schedule/examination.png similarity index 100% rename from foundation/www/docs/assets/img/schools/schedule/examination.png rename to foundation/www/docs/assets/img/education/schedule/examination.png diff --git a/foundation/www/docs/assets/img/schools/schedule/schedule-section.png b/foundation/www/docs/assets/img/education/schedule/schedule-section.png similarity index 100% rename from foundation/www/docs/assets/img/schools/schedule/schedule-section.png rename to foundation/www/docs/assets/img/education/schedule/schedule-section.png diff --git a/foundation/www/docs/assets/img/schools/schedule/scheduling-tool.png b/foundation/www/docs/assets/img/education/schedule/scheduling-tool.png similarity index 100% rename from foundation/www/docs/assets/img/schools/schedule/scheduling-tool.png rename to foundation/www/docs/assets/img/education/schedule/scheduling-tool.png diff --git a/foundation/www/docs/assets/img/schools/schedule/student-attendance.gif b/foundation/www/docs/assets/img/education/schedule/student-attendance.gif similarity index 100% rename from foundation/www/docs/assets/img/schools/schedule/student-attendance.gif rename to foundation/www/docs/assets/img/education/schedule/student-attendance.gif diff --git a/foundation/www/docs/assets/img/schools/schedule/student-attendance.png b/foundation/www/docs/assets/img/education/schedule/student-attendance.png similarity index 100% rename from foundation/www/docs/assets/img/schools/schedule/student-attendance.png rename to foundation/www/docs/assets/img/education/schedule/student-attendance.png diff --git a/foundation/www/docs/assets/img/schools/schedule/student-leave-application.gif b/foundation/www/docs/assets/img/education/schedule/student-leave-application.gif similarity index 100% rename from foundation/www/docs/assets/img/schools/schedule/student-leave-application.gif rename to foundation/www/docs/assets/img/education/schedule/student-leave-application.gif diff --git a/foundation/www/docs/assets/img/schools/setup/Course-schedule-error.png b/foundation/www/docs/assets/img/education/setup/Course-schedule-error.png similarity index 100% rename from foundation/www/docs/assets/img/schools/setup/Course-schedule-error.png rename to foundation/www/docs/assets/img/education/setup/Course-schedule-error.png diff --git a/foundation/www/docs/assets/img/schools/setup/Room-Assesment-plan.png b/foundation/www/docs/assets/img/education/setup/Room-Assesment-plan.png similarity index 100% rename from foundation/www/docs/assets/img/schools/setup/Room-Assesment-plan.png rename to foundation/www/docs/assets/img/education/setup/Room-Assesment-plan.png diff --git a/foundation/www/docs/assets/img/schools/setup/__init__.py b/foundation/www/docs/assets/img/education/setup/__init__.py similarity index 100% rename from foundation/www/docs/assets/img/schools/setup/__init__.py rename to foundation/www/docs/assets/img/education/setup/__init__.py diff --git a/foundation/www/docs/assets/img/education/setup/_sidebar.json b/foundation/www/docs/assets/img/education/setup/_sidebar.json new file mode 100644 index 00000000..88f5aab5 --- /dev/null +++ b/foundation/www/docs/assets/img/education/setup/_sidebar.json @@ -0,0 +1,22 @@ +[ + { + "route": "/docs", + "title": "Docs Home" + }, + { + "route": "/docs/user", + "title": "User Guide" + }, + { + "route": "/docs/current/api", + "title": "Server API" + }, + { + "route": "/docs/current/models", + "title": "Models (Reference)" + }, + { + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "title": "Improve Docs" + } +] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/schools/setup/academic-term.png b/foundation/www/docs/assets/img/education/setup/academic-term.png similarity index 100% rename from foundation/www/docs/assets/img/schools/setup/academic-term.png rename to foundation/www/docs/assets/img/education/setup/academic-term.png diff --git a/foundation/www/docs/assets/img/schools/setup/academic-year.png b/foundation/www/docs/assets/img/education/setup/academic-year.png similarity index 100% rename from foundation/www/docs/assets/img/schools/setup/academic-year.png rename to foundation/www/docs/assets/img/education/setup/academic-year.png diff --git a/foundation/www/docs/assets/img/schools/setup/course-fee-program.png b/foundation/www/docs/assets/img/education/setup/course-fee-program.png similarity index 100% rename from foundation/www/docs/assets/img/schools/setup/course-fee-program.png rename to foundation/www/docs/assets/img/education/setup/course-fee-program.png diff --git a/foundation/www/docs/assets/img/schools/setup/course.png b/foundation/www/docs/assets/img/education/setup/course.png similarity index 100% rename from foundation/www/docs/assets/img/schools/setup/course.png rename to foundation/www/docs/assets/img/education/setup/course.png diff --git a/foundation/www/docs/assets/img/schools/setup/instructor.png b/foundation/www/docs/assets/img/education/setup/instructor.png similarity index 100% rename from foundation/www/docs/assets/img/schools/setup/instructor.png rename to foundation/www/docs/assets/img/education/setup/instructor.png diff --git a/foundation/www/docs/assets/img/schools/setup/program.png b/foundation/www/docs/assets/img/education/setup/program.png similarity index 100% rename from foundation/www/docs/assets/img/schools/setup/program.png rename to foundation/www/docs/assets/img/education/setup/program.png diff --git a/foundation/www/docs/assets/img/schools/setup/room.png b/foundation/www/docs/assets/img/education/setup/room.png similarity index 100% rename from foundation/www/docs/assets/img/schools/setup/room.png rename to foundation/www/docs/assets/img/education/setup/room.png diff --git a/foundation/www/docs/assets/img/schools/setup/student-attendance-tool.gif b/foundation/www/docs/assets/img/education/setup/student-attendance-tool.gif similarity index 100% rename from foundation/www/docs/assets/img/schools/setup/student-attendance-tool.gif rename to foundation/www/docs/assets/img/education/setup/student-attendance-tool.gif diff --git a/foundation/www/docs/assets/img/schools/setup/student-group-instructor.png b/foundation/www/docs/assets/img/education/setup/student-group-instructor.png similarity index 100% rename from foundation/www/docs/assets/img/schools/setup/student-group-instructor.png rename to foundation/www/docs/assets/img/education/setup/student-group-instructor.png diff --git a/foundation/www/docs/assets/img/schools/student/__init__.py b/foundation/www/docs/assets/img/education/student/__init__.py similarity index 100% rename from foundation/www/docs/assets/img/schools/student/__init__.py rename to foundation/www/docs/assets/img/education/student/__init__.py diff --git a/foundation/www/docs/assets/img/education/student/_sidebar.json b/foundation/www/docs/assets/img/education/student/_sidebar.json new file mode 100644 index 00000000..88f5aab5 --- /dev/null +++ b/foundation/www/docs/assets/img/education/student/_sidebar.json @@ -0,0 +1,22 @@ +[ + { + "route": "/docs", + "title": "Docs Home" + }, + { + "route": "/docs/user", + "title": "User Guide" + }, + { + "route": "/docs/current/api", + "title": "Server API" + }, + { + "route": "/docs/current/models", + "title": "Models (Reference)" + }, + { + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "title": "Improve Docs" + } +] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/schools/student/guardian.png b/foundation/www/docs/assets/img/education/student/guardian.png similarity index 100% rename from foundation/www/docs/assets/img/schools/student/guardian.png rename to foundation/www/docs/assets/img/education/student/guardian.png diff --git a/foundation/www/docs/assets/img/schools/student/schools-settings.png b/foundation/www/docs/assets/img/education/student/schools-settings.png similarity index 100% rename from foundation/www/docs/assets/img/schools/student/schools-settings.png rename to foundation/www/docs/assets/img/education/student/schools-settings.png diff --git a/foundation/www/docs/assets/img/schools/student/student group.gif b/foundation/www/docs/assets/img/education/student/student group.gif similarity index 100% rename from foundation/www/docs/assets/img/schools/student/student group.gif rename to foundation/www/docs/assets/img/education/student/student group.gif diff --git a/foundation/www/docs/assets/img/schools/student/student-admission.gif b/foundation/www/docs/assets/img/education/student/student-admission.gif similarity index 100% rename from foundation/www/docs/assets/img/schools/student/student-admission.gif rename to foundation/www/docs/assets/img/education/student/student-admission.gif diff --git a/foundation/www/docs/assets/img/schools/student/student-batch-validation.gif b/foundation/www/docs/assets/img/education/student/student-batch-validation.gif similarity index 100% rename from foundation/www/docs/assets/img/schools/student/student-batch-validation.gif rename to foundation/www/docs/assets/img/education/student/student-batch-validation.gif diff --git a/foundation/www/docs/assets/img/schools/student/student-batch.gif b/foundation/www/docs/assets/img/education/student/student-batch.gif similarity index 100% rename from foundation/www/docs/assets/img/schools/student/student-batch.gif rename to foundation/www/docs/assets/img/education/student/student-batch.gif diff --git a/foundation/www/docs/assets/img/schools/student/student-course-validation.gif b/foundation/www/docs/assets/img/education/student/student-course-validation.gif similarity index 100% rename from foundation/www/docs/assets/img/schools/student/student-course-validation.gif rename to foundation/www/docs/assets/img/education/student/student-course-validation.gif diff --git a/foundation/www/docs/assets/img/schools/student/student-group-attendance.gif b/foundation/www/docs/assets/img/education/student/student-group-attendance.gif similarity index 100% rename from foundation/www/docs/assets/img/schools/student/student-group-attendance.gif rename to foundation/www/docs/assets/img/education/student/student-group-attendance.gif diff --git a/foundation/www/docs/assets/img/schools/student/student-group-creation-tool.gif b/foundation/www/docs/assets/img/education/student/student-group-creation-tool.gif similarity index 100% rename from foundation/www/docs/assets/img/schools/student/student-group-creation-tool.gif rename to foundation/www/docs/assets/img/education/student/student-group-creation-tool.gif diff --git a/foundation/www/docs/assets/img/schools/student/student-log.png b/foundation/www/docs/assets/img/education/student/student-log.png similarity index 100% rename from foundation/www/docs/assets/img/schools/student/student-log.png rename to foundation/www/docs/assets/img/education/student/student-log.png diff --git a/foundation/www/docs/assets/img/schools/student/student.png b/foundation/www/docs/assets/img/education/student/student.png similarity index 100% rename from foundation/www/docs/assets/img/schools/student/student.png rename to foundation/www/docs/assets/img/education/student/student.png diff --git a/foundation/www/docs/assets/img/human-resources/employee_advance.png b/foundation/www/docs/assets/img/human-resources/employee_advance.png new file mode 100644 index 00000000..671c215f Binary files /dev/null and b/foundation/www/docs/assets/img/human-resources/employee_advance.png differ diff --git a/foundation/www/docs/assets/img/human-resources/employee_advance_journal_entry.png b/foundation/www/docs/assets/img/human-resources/employee_advance_journal_entry.png new file mode 100644 index 00000000..f9c25662 Binary files /dev/null and b/foundation/www/docs/assets/img/human-resources/employee_advance_journal_entry.png differ diff --git a/foundation/www/docs/assets/img/human-resources/employee_advance_payment_entry.png b/foundation/www/docs/assets/img/human-resources/employee_advance_payment_entry.png new file mode 100644 index 00000000..7cfc6ceb Binary files /dev/null and b/foundation/www/docs/assets/img/human-resources/employee_advance_payment_entry.png differ diff --git a/foundation/www/docs/assets/img/human-resources/expense_claim_advances.png b/foundation/www/docs/assets/img/human-resources/expense_claim_advances.png new file mode 100644 index 00000000..c6d7fe95 Binary files /dev/null and b/foundation/www/docs/assets/img/human-resources/expense_claim_advances.png differ diff --git a/foundation/www/docs/assets/img/human-resources/training_event.png b/foundation/www/docs/assets/img/human-resources/training_event.png index 04162eb1..bd1d6dc7 100644 Binary files a/foundation/www/docs/assets/img/human-resources/training_event.png and b/foundation/www/docs/assets/img/human-resources/training_event.png differ diff --git a/foundation/www/docs/assets/img/human-resources/training_program.png b/foundation/www/docs/assets/img/human-resources/training_program.png new file mode 100644 index 00000000..97bd2bf7 Binary files /dev/null and b/foundation/www/docs/assets/img/human-resources/training_program.png differ diff --git a/foundation/www/docs/user/manual/en/schools/Assessment/__init__.py b/foundation/www/docs/assets/img/non_profit/__init__.py similarity index 100% rename from foundation/www/docs/user/manual/en/schools/Assessment/__init__.py rename to foundation/www/docs/assets/img/non_profit/__init__.py diff --git a/foundation/www/docs/assets/img/non_profit/_sidebar.json b/foundation/www/docs/assets/img/non_profit/_sidebar.json new file mode 100644 index 00000000..88f5aab5 --- /dev/null +++ b/foundation/www/docs/assets/img/non_profit/_sidebar.json @@ -0,0 +1,22 @@ +[ + { + "route": "/docs", + "title": "Docs Home" + }, + { + "route": "/docs/user", + "title": "User Guide" + }, + { + "route": "/docs/current/api", + "title": "Server API" + }, + { + "route": "/docs/current/models", + "title": "Models (Reference)" + }, + { + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "title": "Improve Docs" + } +] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/non_profit/chapter/_sidebar.json b/foundation/www/docs/assets/img/non_profit/chapter/_sidebar.json new file mode 100644 index 00000000..88f5aab5 --- /dev/null +++ b/foundation/www/docs/assets/img/non_profit/chapter/_sidebar.json @@ -0,0 +1,22 @@ +[ + { + "route": "/docs", + "title": "Docs Home" + }, + { + "route": "/docs/user", + "title": "User Guide" + }, + { + "route": "/docs/current/api", + "title": "Server API" + }, + { + "route": "/docs/current/models", + "title": "Models (Reference)" + }, + { + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "title": "Improve Docs" + } +] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/non_profit/chapter/chapter.png b/foundation/www/docs/assets/img/non_profit/chapter/chapter.png new file mode 100644 index 00000000..794f808f Binary files /dev/null and b/foundation/www/docs/assets/img/non_profit/chapter/chapter.png differ diff --git a/foundation/www/docs/assets/img/non_profit/chapter/online_chapter.png b/foundation/www/docs/assets/img/non_profit/chapter/online_chapter.png new file mode 100644 index 00000000..95ebd817 Binary files /dev/null and b/foundation/www/docs/assets/img/non_profit/chapter/online_chapter.png differ diff --git a/foundation/www/docs/assets/img/non_profit/chapter/online_chapter_join.png b/foundation/www/docs/assets/img/non_profit/chapter/online_chapter_join.png new file mode 100644 index 00000000..7ea56ec1 Binary files /dev/null and b/foundation/www/docs/assets/img/non_profit/chapter/online_chapter_join.png differ diff --git a/foundation/www/docs/assets/img/non_profit/donor/_sidebar.json b/foundation/www/docs/assets/img/non_profit/donor/_sidebar.json new file mode 100644 index 00000000..88f5aab5 --- /dev/null +++ b/foundation/www/docs/assets/img/non_profit/donor/_sidebar.json @@ -0,0 +1,22 @@ +[ + { + "route": "/docs", + "title": "Docs Home" + }, + { + "route": "/docs/user", + "title": "User Guide" + }, + { + "route": "/docs/current/api", + "title": "Server API" + }, + { + "route": "/docs/current/models", + "title": "Models (Reference)" + }, + { + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "title": "Improve Docs" + } +] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/non_profit/donor/donor.png b/foundation/www/docs/assets/img/non_profit/donor/donor.png new file mode 100644 index 00000000..681dcc7f Binary files /dev/null and b/foundation/www/docs/assets/img/non_profit/donor/donor.png differ diff --git a/foundation/www/docs/assets/img/non_profit/donor/donor_type.png b/foundation/www/docs/assets/img/non_profit/donor/donor_type.png new file mode 100644 index 00000000..9fedb9b5 Binary files /dev/null and b/foundation/www/docs/assets/img/non_profit/donor/donor_type.png differ diff --git a/foundation/www/docs/assets/img/non_profit/grant_application/_sidebar.json b/foundation/www/docs/assets/img/non_profit/grant_application/_sidebar.json new file mode 100644 index 00000000..88f5aab5 --- /dev/null +++ b/foundation/www/docs/assets/img/non_profit/grant_application/_sidebar.json @@ -0,0 +1,22 @@ +[ + { + "route": "/docs", + "title": "Docs Home" + }, + { + "route": "/docs/user", + "title": "User Guide" + }, + { + "route": "/docs/current/api", + "title": "Server API" + }, + { + "route": "/docs/current/models", + "title": "Models (Reference)" + }, + { + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "title": "Improve Docs" + } +] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/non_profit/grant_application/grant_application.png b/foundation/www/docs/assets/img/non_profit/grant_application/grant_application.png new file mode 100644 index 00000000..f00ba32e Binary files /dev/null and b/foundation/www/docs/assets/img/non_profit/grant_application/grant_application.png differ diff --git a/foundation/www/docs/assets/img/non_profit/grant_application/grant_application_row.png b/foundation/www/docs/assets/img/non_profit/grant_application/grant_application_row.png new file mode 100644 index 00000000..81cf2c6f Binary files /dev/null and b/foundation/www/docs/assets/img/non_profit/grant_application/grant_application_row.png differ diff --git a/foundation/www/docs/assets/img/non_profit/grant_application/grant_portal.png b/foundation/www/docs/assets/img/non_profit/grant_application/grant_portal.png new file mode 100644 index 00000000..ef46bd44 Binary files /dev/null and b/foundation/www/docs/assets/img/non_profit/grant_application/grant_portal.png differ diff --git a/foundation/www/docs/assets/img/non_profit/grant_application/online_grant_application_1.png b/foundation/www/docs/assets/img/non_profit/grant_application/online_grant_application_1.png new file mode 100644 index 00000000..899c257a Binary files /dev/null and b/foundation/www/docs/assets/img/non_profit/grant_application/online_grant_application_1.png differ diff --git a/foundation/www/docs/assets/img/non_profit/membership/_sidebar.json b/foundation/www/docs/assets/img/non_profit/membership/_sidebar.json new file mode 100644 index 00000000..88f5aab5 --- /dev/null +++ b/foundation/www/docs/assets/img/non_profit/membership/_sidebar.json @@ -0,0 +1,22 @@ +[ + { + "route": "/docs", + "title": "Docs Home" + }, + { + "route": "/docs/user", + "title": "User Guide" + }, + { + "route": "/docs/current/api", + "title": "Server API" + }, + { + "route": "/docs/current/models", + "title": "Models (Reference)" + }, + { + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "title": "Improve Docs" + } +] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/non_profit/membership/member.png b/foundation/www/docs/assets/img/non_profit/membership/member.png new file mode 100644 index 00000000..d5518ffd Binary files /dev/null and b/foundation/www/docs/assets/img/non_profit/membership/member.png differ diff --git a/foundation/www/docs/assets/img/non_profit/membership/membership.png b/foundation/www/docs/assets/img/non_profit/membership/membership.png new file mode 100644 index 00000000..01c3ca45 Binary files /dev/null and b/foundation/www/docs/assets/img/non_profit/membership/membership.png differ diff --git a/foundation/www/docs/assets/img/non_profit/membership/membership_type.png b/foundation/www/docs/assets/img/non_profit/membership/membership_type.png new file mode 100644 index 00000000..6711d777 Binary files /dev/null and b/foundation/www/docs/assets/img/non_profit/membership/membership_type.png differ diff --git a/foundation/www/docs/assets/img/non_profit/module.png b/foundation/www/docs/assets/img/non_profit/module.png new file mode 100644 index 00000000..fa1d3e8a Binary files /dev/null and b/foundation/www/docs/assets/img/non_profit/module.png differ diff --git a/foundation/www/docs/assets/img/non_profit/non_profit_domain.png b/foundation/www/docs/assets/img/non_profit/non_profit_domain.png new file mode 100644 index 00000000..8c102e80 Binary files /dev/null and b/foundation/www/docs/assets/img/non_profit/non_profit_domain.png differ diff --git a/foundation/www/docs/assets/img/non_profit/volunteer/_sidebar.json b/foundation/www/docs/assets/img/non_profit/volunteer/_sidebar.json new file mode 100644 index 00000000..88f5aab5 --- /dev/null +++ b/foundation/www/docs/assets/img/non_profit/volunteer/_sidebar.json @@ -0,0 +1,22 @@ +[ + { + "route": "/docs", + "title": "Docs Home" + }, + { + "route": "/docs/user", + "title": "User Guide" + }, + { + "route": "/docs/current/api", + "title": "Server API" + }, + { + "route": "/docs/current/models", + "title": "Models (Reference)" + }, + { + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "title": "Improve Docs" + } +] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/non_profit/volunteer/volunteer.png b/foundation/www/docs/assets/img/non_profit/volunteer/volunteer.png new file mode 100644 index 00000000..0ada0957 Binary files /dev/null and b/foundation/www/docs/assets/img/non_profit/volunteer/volunteer.png differ diff --git a/foundation/www/docs/assets/img/non_profit/volunteer/volunteer_type.png b/foundation/www/docs/assets/img/non_profit/volunteer/volunteer_type.png new file mode 100644 index 00000000..729a0b78 Binary files /dev/null and b/foundation/www/docs/assets/img/non_profit/volunteer/volunteer_type.png differ diff --git a/foundation/www/docs/assets/img/project/project_costing.png b/foundation/www/docs/assets/img/project/project_costing.png index 997e6138..c55976d0 100644 Binary files a/foundation/www/docs/assets/img/project/project_costing.png and b/foundation/www/docs/assets/img/project/project_costing.png differ diff --git a/foundation/www/docs/user/manual/en/schools/Attendance/__init__.py b/foundation/www/docs/assets/img/regional/uae/__init__.py similarity index 100% rename from foundation/www/docs/user/manual/en/schools/Attendance/__init__.py rename to foundation/www/docs/assets/img/regional/uae/__init__.py diff --git a/foundation/www/docs/assets/img/regional/uae/_sidebar.json b/foundation/www/docs/assets/img/regional/uae/_sidebar.json new file mode 100644 index 00000000..88f5aab5 --- /dev/null +++ b/foundation/www/docs/assets/img/regional/uae/_sidebar.json @@ -0,0 +1,22 @@ +[ + { + "route": "/docs", + "title": "Docs Home" + }, + { + "route": "/docs/user", + "title": "User Guide" + }, + { + "route": "/docs/current/api", + "title": "Server API" + }, + { + "route": "/docs/current/models", + "title": "Models (Reference)" + }, + { + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "title": "Improve Docs" + } +] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/regional/uae/detailed-invoice.png b/foundation/www/docs/assets/img/regional/uae/detailed-invoice.png new file mode 100644 index 00000000..6cfcb041 Binary files /dev/null and b/foundation/www/docs/assets/img/regional/uae/detailed-invoice.png differ diff --git a/foundation/www/docs/assets/img/regional/uae/simplified-invoice.png b/foundation/www/docs/assets/img/regional/uae/simplified-invoice.png new file mode 100644 index 00000000..1678f9ea Binary files /dev/null and b/foundation/www/docs/assets/img/regional/uae/simplified-invoice.png differ diff --git a/foundation/www/docs/assets/img/regional/uae/tax-code-item.png b/foundation/www/docs/assets/img/regional/uae/tax-code-item.png new file mode 100644 index 00000000..2278bd97 Binary files /dev/null and b/foundation/www/docs/assets/img/regional/uae/tax-code-item.png differ diff --git a/foundation/www/docs/assets/img/regional/uae/tax-id-company.png b/foundation/www/docs/assets/img/regional/uae/tax-id-company.png new file mode 100644 index 00000000..56a2a7ba Binary files /dev/null and b/foundation/www/docs/assets/img/regional/uae/tax-id-company.png differ diff --git a/foundation/www/docs/assets/img/regional/uae/tax-id-customer.png b/foundation/www/docs/assets/img/regional/uae/tax-id-customer.png new file mode 100644 index 00000000..d7dfb3b0 Binary files /dev/null and b/foundation/www/docs/assets/img/regional/uae/tax-id-customer.png differ diff --git a/foundation/www/docs/assets/img/regional/uae/uae-tax-templates.png b/foundation/www/docs/assets/img/regional/uae/uae-tax-templates.png new file mode 100644 index 00000000..d2a2c262 Binary files /dev/null and b/foundation/www/docs/assets/img/regional/uae/uae-tax-templates.png differ diff --git a/foundation/www/docs/assets/img/regional/uae/vat-invoice.gif b/foundation/www/docs/assets/img/regional/uae/vat-invoice.gif new file mode 100644 index 00000000..227036dc Binary files /dev/null and b/foundation/www/docs/assets/img/regional/uae/vat-invoice.gif differ diff --git a/foundation/www/docs/assets/img/restaurant/_sidebar.json b/foundation/www/docs/assets/img/restaurant/_sidebar.json new file mode 100644 index 00000000..88f5aab5 --- /dev/null +++ b/foundation/www/docs/assets/img/restaurant/_sidebar.json @@ -0,0 +1,22 @@ +[ + { + "route": "/docs", + "title": "Docs Home" + }, + { + "route": "/docs/user", + "title": "User Guide" + }, + { + "route": "/docs/current/api", + "title": "Server API" + }, + { + "route": "/docs/current/models", + "title": "Models (Reference)" + }, + { + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "title": "Improve Docs" + } +] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/restaurant/order-entry-bill.png b/foundation/www/docs/assets/img/restaurant/order-entry-bill.png new file mode 100644 index 00000000..ba96bb3c Binary files /dev/null and b/foundation/www/docs/assets/img/restaurant/order-entry-bill.png differ diff --git a/foundation/www/docs/assets/img/restaurant/order-entry.png b/foundation/www/docs/assets/img/restaurant/order-entry.png new file mode 100644 index 00000000..2fc3e787 Binary files /dev/null and b/foundation/www/docs/assets/img/restaurant/order-entry.png differ diff --git a/foundation/www/docs/assets/img/restaurant/reservation-kanban.png b/foundation/www/docs/assets/img/restaurant/reservation-kanban.png new file mode 100644 index 00000000..df9517d9 Binary files /dev/null and b/foundation/www/docs/assets/img/restaurant/reservation-kanban.png differ diff --git a/foundation/www/docs/assets/img/restaurant/restaurant-invoice.png b/foundation/www/docs/assets/img/restaurant/restaurant-invoice.png new file mode 100644 index 00000000..9f01dfc5 Binary files /dev/null and b/foundation/www/docs/assets/img/restaurant/restaurant-invoice.png differ diff --git a/foundation/www/docs/assets/img/restaurant/restaurant-menu.png b/foundation/www/docs/assets/img/restaurant/restaurant-menu.png new file mode 100644 index 00000000..e1d85a93 Binary files /dev/null and b/foundation/www/docs/assets/img/restaurant/restaurant-menu.png differ diff --git a/foundation/www/docs/assets/img/restaurant/restaurant-reservation.png b/foundation/www/docs/assets/img/restaurant/restaurant-reservation.png new file mode 100644 index 00000000..3467bc04 Binary files /dev/null and b/foundation/www/docs/assets/img/restaurant/restaurant-reservation.png differ diff --git a/foundation/www/docs/assets/img/restaurant/restaurant-table.png b/foundation/www/docs/assets/img/restaurant/restaurant-table.png new file mode 100644 index 00000000..b7ec1d0e Binary files /dev/null and b/foundation/www/docs/assets/img/restaurant/restaurant-table.png differ diff --git a/foundation/www/docs/assets/img/restaurant/restaurant.png b/foundation/www/docs/assets/img/restaurant/restaurant.png new file mode 100644 index 00000000..1e4e47a1 Binary files /dev/null and b/foundation/www/docs/assets/img/restaurant/restaurant.png differ diff --git a/foundation/www/docs/assets/img/schools/fees/fee-structure.png b/foundation/www/docs/assets/img/schools/fees/fee-structure.png deleted file mode 100644 index 81f3e20e..00000000 Binary files a/foundation/www/docs/assets/img/schools/fees/fee-structure.png and /dev/null differ diff --git a/foundation/www/docs/assets/img/selling/shipping-rule.png b/foundation/www/docs/assets/img/selling/shipping-rule.png index 7cd9b46b..7f2a63de 100644 Binary files a/foundation/www/docs/assets/img/selling/shipping-rule.png and b/foundation/www/docs/assets/img/selling/shipping-rule.png differ diff --git a/foundation/www/docs/assets/img/setup/barcode-1.png b/foundation/www/docs/assets/img/setup/barcode-1.png deleted file mode 100644 index c200a13b..00000000 Binary files a/foundation/www/docs/assets/img/setup/barcode-1.png and /dev/null differ diff --git a/foundation/www/docs/assets/img/setup/barcode-2.png b/foundation/www/docs/assets/img/setup/barcode-2.png deleted file mode 100644 index 6ea45292..00000000 Binary files a/foundation/www/docs/assets/img/setup/barcode-2.png and /dev/null differ diff --git a/foundation/www/docs/assets/img/stock/delivery_stops.png b/foundation/www/docs/assets/img/stock/delivery_stops.png new file mode 100644 index 00000000..1811cf36 Binary files /dev/null and b/foundation/www/docs/assets/img/stock/delivery_stops.png differ diff --git a/foundation/www/docs/assets/img/stock/delivery_trip.png b/foundation/www/docs/assets/img/stock/delivery_trip.png new file mode 100644 index 00000000..6913542c Binary files /dev/null and b/foundation/www/docs/assets/img/stock/delivery_trip.png differ diff --git a/foundation/www/docs/assets/img/stock/material-receipt-sample.png b/foundation/www/docs/assets/img/stock/material-receipt-sample.png new file mode 100644 index 00000000..f8934241 Binary files /dev/null and b/foundation/www/docs/assets/img/stock/material-receipt-sample.png differ diff --git a/foundation/www/docs/assets/img/stock/material-transfer-sample.png b/foundation/www/docs/assets/img/stock/material-transfer-sample.png new file mode 100644 index 00000000..61911567 Binary files /dev/null and b/foundation/www/docs/assets/img/stock/material-transfer-sample.png differ diff --git a/foundation/www/docs/assets/img/stock/retain-sample.png b/foundation/www/docs/assets/img/stock/retain-sample.png new file mode 100644 index 00000000..675339fa Binary files /dev/null and b/foundation/www/docs/assets/img/stock/retain-sample.png differ diff --git a/foundation/www/docs/assets/img/stock/sample-warehouse.png b/foundation/www/docs/assets/img/stock/sample-warehouse.png new file mode 100644 index 00000000..fc6fee15 Binary files /dev/null and b/foundation/www/docs/assets/img/stock/sample-warehouse.png differ diff --git a/foundation/www/docs/current/api/accounts/erpnext.accounts.general_ledger.html b/foundation/www/docs/current/api/accounts/erpnext.accounts.general_ledger.html index 8aec4eda..9fdc9a33 100644 --- a/foundation/www/docs/current/api/accounts/erpnext.accounts.general_ledger.html +++ b/foundation/www/docs/current/api/accounts/erpnext.accounts.general_ledger.html @@ -3,7 +3,7 @@
- Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - - - erpnext.accounts.party.get_credit_days - (party_type, party, company) -

-

No docs

-
-
- - - - - - -

@@ -104,9 +88,35 @@ erpnext.accounts.party.get_due_date - (posting_date, party_type, party, company) + (posting_date, party_type, party)

-

Set Due Date = Posting Date + Credit Days

+

Get due date from Payment Terms Template

+
+
+ + + + + + + +

+ + + erpnext.accounts.party.get_due_date_from_template + (template_name, posting_date) +

+ 
Inspects all `Payment Term`s from the a `Payment Terms Template` and returns the due
+date after considering all the `Payment Term`s requirements.
+
+ +

Parameters:

+ +
    +

  • template_name - Name of the Payment Terms Template

    + +

    :return: String representing the calculated due date

    • +

@@ -203,6 +213,53 @@ +

+ + + erpnext.accounts.party.get_party_shipping_address + (doctype, name) +

+ 
Returns an Address name (best guess) for the given doctype and name for which `address_type == 'Shipping'` is true.
+and/or `is_shipping_address = 1`.
+
+It returns an empty string if there is no matching record.
+
+ +

Parameters:

+ +
    +
  • doctype - Party Doctype
    • +

  • name - Party name

    + +

    :return: String

    • +
+
+
+ + + + + + +

Public API +
/api/method/erpnext.accounts.party.get_pyt_term_template +

+

+ + + erpnext.accounts.party.get_pyt_term_template + (party_name, party_type) +

+

No docs

+
+
+ + + + + + +

@@ -321,7 +378,7 @@ erpnext.accounts.party.validate_due_date - (posting_date, due_date, party_type, party, company) + (posting_date, due_date, party_type, party)

No docs

diff --git a/foundation/www/docs/current/api/accounts/erpnext.accounts.utils.html b/foundation/www/docs/current/api/accounts/erpnext.accounts.utils.html index 1da343d9..12142ee3 100644 --- a/foundation/www/docs/current/api/accounts/erpnext.accounts.utils.html +++ b/foundation/www/docs/current/api/accounts/erpnext.accounts.utils.html @@ -3,7 +3,7 @@
- Version 8.11.4 + Version 10.0.2 erpnext.accounts.utils.get_children - () + (doctype, parent, company, is_root=False)

No docs

diff --git a/foundation/www/docs/current/api/accounts/index.html b/foundation/www/docs/current/api/accounts/index.html index f334ca94..afae9d50 100644 --- a/foundation/www/docs/current/api/accounts/index.html +++ b/foundation/www/docs/current/api/accounts/index.html @@ -7,7 +7,7 @@
- Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 +

erpnext.accounts.test

+
+ + + Version 10.0.2 + + + Source + +
+ + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/accounts/test/erpnext.accounts.test.test_utils.html b/foundation/www/docs/current/api/accounts/test/erpnext.accounts.test.test_utils.html new file mode 100644 index 00000000..aea0a93b --- /dev/null +++ b/foundation/www/docs/current/api/accounts/test/erpnext.accounts.test.test_utils.html @@ -0,0 +1,77 @@ + +

erpnext.accounts.test.test_utils

+
+ + + Version 10.0.2 + + + Source + +
+ + + + + + + +

Class TestUtils

+ +

Inherits from unittest.case.TestCase + +

+
+
+ + + + +

+ + + setUpClass + (cls) +

+

No docs

+
+
+ + + + + +

+ + + test_get_party_shipping_address + (self) +

+

No docs

+
+
+ + + + + +

+ + + test_get_party_shipping_address2 + (self) +

+

No docs

+
+
+ + +
+
+ + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/schools/index.html b/foundation/www/docs/current/api/accounts/test/index.html similarity index 79% rename from foundation/www/docs/current/api/schools/index.html rename to foundation/www/docs/current/api/accounts/test/index.html index a2a3c717..177a748f 100644 --- a/foundation/www/docs/current/api/schools/index.html +++ b/foundation/www/docs/current/api/accounts/test/index.html @@ -1,16 +1,16 @@ - + -

schools

+

test

- Version 8.11.4 + Version 10.0.2 - Source
diff --git a/foundation/www/docs/current/api/accounts/test/index.txt b/foundation/www/docs/current/api/accounts/test/index.txt new file mode 100644 index 00000000..481671f4 --- /dev/null +++ b/foundation/www/docs/current/api/accounts/test/index.txt @@ -0,0 +1,2 @@ +erpnext.accounts.test +erpnext.accounts.test.test_utils \ No newline at end of file diff --git a/foundation/www/docs/current/api/agriculture/_sidebar.json b/foundation/www/docs/current/api/agriculture/_sidebar.json new file mode 100644 index 00000000..88f5aab5 --- /dev/null +++ b/foundation/www/docs/current/api/agriculture/_sidebar.json @@ -0,0 +1,22 @@ +[ + { + "route": "/docs", + "title": "Docs Home" + }, + { + "route": "/docs/user", + "title": "User Guide" + }, + { + "route": "/docs/current/api", + "title": "Server API" + }, + { + "route": "/docs/current/models", + "title": "Models (Reference)" + }, + { + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "title": "Improve Docs" + } +] \ No newline at end of file diff --git a/foundation/www/docs/current/api/agriculture/erpnext.agriculture.html b/foundation/www/docs/current/api/agriculture/erpnext.agriculture.html new file mode 100644 index 00000000..a59166bb --- /dev/null +++ b/foundation/www/docs/current/api/agriculture/erpnext.agriculture.html @@ -0,0 +1,20 @@ + +

erpnext.agriculture

+
+ + + Version 10.0.2 + + + Source + +
+ + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/agriculture/erpnext.agriculture.setup.html b/foundation/www/docs/current/api/agriculture/erpnext.agriculture.setup.html new file mode 100644 index 00000000..082e9154 --- /dev/null +++ b/foundation/www/docs/current/api/agriculture/erpnext.agriculture.setup.html @@ -0,0 +1,52 @@ + +

erpnext.agriculture.setup

+
+ + + Version 10.0.2 + + + Source + +
+ + + + + + + + + +

+ + + erpnext.agriculture.setup.create_agriculture_data + () +

+

No docs

+
+
+ + + + + + + +

+ + + erpnext.agriculture.setup.setup_agriculture + () +

+

No docs

+
+
+ + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/agriculture/index.html b/foundation/www/docs/current/api/agriculture/index.html new file mode 100644 index 00000000..5b21ca27 --- /dev/null +++ b/foundation/www/docs/current/api/agriculture/index.html @@ -0,0 +1,22 @@ + + + + + +

agriculture

+
+ + + Version 10.0.2 + + + Source + +
+ +

Package Contents

+ +{index} + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/agriculture/index.txt b/foundation/www/docs/current/api/agriculture/index.txt new file mode 100644 index 00000000..714e070b --- /dev/null +++ b/foundation/www/docs/current/api/agriculture/index.txt @@ -0,0 +1,2 @@ +erpnext.agriculture +erpnext.agriculture.setup \ No newline at end of file diff --git a/foundation/www/docs/current/api/assets/_sidebar.json b/foundation/www/docs/current/api/assets/_sidebar.json new file mode 100644 index 00000000..88f5aab5 --- /dev/null +++ b/foundation/www/docs/current/api/assets/_sidebar.json @@ -0,0 +1,22 @@ +[ + { + "route": "/docs", + "title": "Docs Home" + }, + { + "route": "/docs/user", + "title": "User Guide" + }, + { + "route": "/docs/current/api", + "title": "Server API" + }, + { + "route": "/docs/current/models", + "title": "Models (Reference)" + }, + { + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "title": "Improve Docs" + } +] \ No newline at end of file diff --git a/foundation/www/docs/current/api/schools/erpnext.schools.html b/foundation/www/docs/current/api/assets/erpnext.assets.html similarity index 67% rename from foundation/www/docs/current/api/schools/erpnext.schools.html rename to foundation/www/docs/current/api/assets/erpnext.assets.html index e2cf9076..ceaf7065 100644 --- a/foundation/www/docs/current/api/schools/erpnext.schools.html +++ b/foundation/www/docs/current/api/assets/erpnext.assets.html @@ -1,12 +1,12 @@ - -

erpnext.schools

+ +

erpnext.assets

- Version 8.11.4 + Version 10.0.2 - Source
diff --git a/foundation/www/docs/current/api/schools/web_form/discussion/index.html b/foundation/www/docs/current/api/assets/index.html similarity index 78% rename from foundation/www/docs/current/api/schools/web_form/discussion/index.html rename to foundation/www/docs/current/api/assets/index.html index cabd737f..fbca7d51 100644 --- a/foundation/www/docs/current/api/schools/web_form/discussion/index.html +++ b/foundation/www/docs/current/api/assets/index.html @@ -1,16 +1,16 @@ - + -

discussion

+

assets

- Version 8.11.4 + Version 10.0.2 - Source
diff --git a/foundation/www/docs/current/api/assets/index.txt b/foundation/www/docs/current/api/assets/index.txt new file mode 100644 index 00000000..e7ba0299 --- /dev/null +++ b/foundation/www/docs/current/api/assets/index.txt @@ -0,0 +1 @@ +erpnext.assets \ No newline at end of file diff --git a/foundation/www/docs/current/api/buying/erpnext.buying.html b/foundation/www/docs/current/api/buying/erpnext.buying.html index 35e68025..dd952498 100644 --- a/foundation/www/docs/current/api/buying/erpnext.buying.html +++ b/foundation/www/docs/current/api/buying/erpnext.buying.html @@ -3,7 +3,7 @@
- Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 -

erpnext.setup.setup_wizard.industry_type

+ +

erpnext.config.agriculture

- Version 8.11.4 + Version 10.0.2 - Source
@@ -20,9 +20,9 @@

- + - erpnext.setup.setup_wizard.industry_type.get_industry_types + erpnext.config.agriculture.get_data ()

No docs

diff --git a/foundation/www/docs/current/api/config/erpnext.config.schools.html b/foundation/www/docs/current/api/config/erpnext.config.assets.html similarity index 64% rename from foundation/www/docs/current/api/config/erpnext.config.schools.html rename to foundation/www/docs/current/api/config/erpnext.config.assets.html index 01c4a52e..0ca4df19 100644 --- a/foundation/www/docs/current/api/config/erpnext.config.schools.html +++ b/foundation/www/docs/current/api/config/erpnext.config.assets.html @@ -1,12 +1,12 @@ - -

erpnext.config.schools

+ +

erpnext.config.assets

- Version 8.11.4 + Version 10.0.2 - Source
@@ -20,9 +20,9 @@

- + - erpnext.config.schools.get_data + erpnext.config.assets.get_data ()

No docs

diff --git a/foundation/www/docs/current/api/config/erpnext.config.buying.html b/foundation/www/docs/current/api/config/erpnext.config.buying.html index f4ff7fe3..938aa509 100644 --- a/foundation/www/docs/current/api/config/erpnext.config.buying.html +++ b/foundation/www/docs/current/api/config/erpnext.config.buying.html @@ -3,7 +3,7 @@
- Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 +

erpnext.config.education

+
+ + + Version 10.0.2 + + + Source + +
+ + + + + + + + + +

+ + + erpnext.config.education.get_data + () +

+

No docs

+
+
+ + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/config/erpnext.config.healthcare.html b/foundation/www/docs/current/api/config/erpnext.config.healthcare.html index 0f06d35a..d2a36124 100644 --- a/foundation/www/docs/current/api/config/erpnext.config.healthcare.html +++ b/foundation/www/docs/current/api/config/erpnext.config.healthcare.html @@ -3,7 +3,7 @@
- Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 +

erpnext.config.hub_node

+
+ + + Version 10.0.2 + + + Source + +
+ + + + + + + + + +

+ + + erpnext.config.hub_node.get_data + () +

+

No docs

+
+
+ + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/config/erpnext.config.learn.html b/foundation/www/docs/current/api/config/erpnext.config.learn.html index f06db42f..43975e07 100644 --- a/foundation/www/docs/current/api/config/erpnext.config.learn.html +++ b/foundation/www/docs/current/api/config/erpnext.config.learn.html @@ -3,7 +3,7 @@
- Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 +

erpnext.config.non_profit

+
+ + + Version 10.0.2 + + + Source + +
+ + + + + + + + + +

+ + + erpnext.config.non_profit.get_data + () +

+

No docs

+
+
+ + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/config/erpnext.config.projects.html b/foundation/www/docs/current/api/config/erpnext.config.projects.html index ca8dc583..14be82b5 100644 --- a/foundation/www/docs/current/api/config/erpnext.config.projects.html +++ b/foundation/www/docs/current/api/config/erpnext.config.projects.html @@ -3,7 +3,7 @@
- Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 __init__ - (self, arg1, arg2=None) + (self)

No docs

@@ -56,6 +56,20 @@ +

+ + + apply_shipping_rule + (self) +

+

No docs

+
+
+ + + + +

@@ -168,6 +182,20 @@ +

+ + + get_shipping_address + (self) +

+

Returns Address object from shipping address fields if present

+
+
+ + + + +

@@ -196,6 +224,20 @@ +

+ + + is_rounded_total_disabled + (self) +

+

No docs

+
+
+ + + + +

@@ -224,6 +266,20 @@ +

+ + + set_due_date + (self) +

+

No docs

+
+
+ + + + +

@@ -266,6 +322,20 @@ +

+ + + set_payment_schedule + (self) +

+

No docs

+
+
+ + + + +

@@ -368,6 +438,20 @@ +

+ + + validate_all_documents_schedule + (self) +

+

No docs

+
+
+ + + + +

@@ -438,6 +522,20 @@ +

+ + + validate_invoice_documents_schedule + (self) +

+

No docs

+
+
+ + + + +

@@ -452,6 +550,20 @@ +

+ + + validate_non_invoice_documents_schedule + (self) +

+

No docs

+
+
+ + + + +

@@ -477,6 +589,34 @@
+ + + +

+ + + validate_payment_schedule_amount + (self) +

+

No docs

+
+
+ + + + + +

+ + + validate_payment_schedule_dates + (self) +

+

No docs

+
+
+ +
@@ -524,7 +664,59 @@ erpnext.controllers.accounts_controller.get_default_taxes_and_charges - (master_doctype) + (master_doctype, company=None) +

+

No docs

+
+
+ + + + + + + +

+ + + erpnext.controllers.accounts_controller.get_due_date + (posting_date, term) +

+

No docs

+
+
+ + + + + + +

Public API +
/api/method/erpnext.controllers.accounts_controller.get_payment_term_details +

+

+ + + erpnext.controllers.accounts_controller.get_payment_term_details + (term, posting_date=None, grand_total=None) +

+

No docs

+
+
+ + + + + + +

Public API +
/api/method/erpnext.controllers.accounts_controller.get_payment_terms +

+

+ + + erpnext.controllers.accounts_controller.get_payment_terms + (terms_template, posting_date=None, grand_total=None)

No docs

diff --git a/foundation/www/docs/current/api/controllers/erpnext.controllers.buying_controller.html b/foundation/www/docs/current/api/controllers/erpnext.controllers.buying_controller.html index 4073793a..287f5ce3 100644 --- a/foundation/www/docs/current/api/controllers/erpnext.controllers.buying_controller.html +++ b/foundation/www/docs/current/api/controllers/erpnext.controllers.buying_controller.html @@ -3,7 +3,7 @@
- Version 8.11.4 + Version 10.0.2 + + + validate_schedule_date + (self) +

+

No docs

+
+
+ + + + +

diff --git a/foundation/www/docs/current/api/controllers/erpnext.controllers.html b/foundation/www/docs/current/api/controllers/erpnext.controllers.html index dc2b9049..e62d4ff8 100644 --- a/foundation/www/docs/current/api/controllers/erpnext.controllers.html +++ b/foundation/www/docs/current/api/controllers/erpnext.controllers.html @@ -3,7 +3,7 @@

- Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 + + + erpnext.controllers.item_variant.create_multiple_variants + (item, args) +

+

No docs

+
+
+ + + + + +

Public API
/api/method/erpnext.controllers.item_variant.create_variant

@@ -97,6 +113,42 @@ +

Public API +
/api/method/erpnext.controllers.item_variant.create_variant_doc_for_quick_entry +

+

+ + + erpnext.controllers.item_variant.create_variant_doc_for_quick_entry + (template, args) +

+

No docs

+
+
+ + + + + + +

Public API +
/api/method/erpnext.controllers.item_variant.enqueue_multiple_variant_creation +

+

+ + + erpnext.controllers.item_variant.enqueue_multiple_variant_creation + (item, args) +

+

No docs

+
+
+ + + + + +

@@ -114,11 +166,41 @@ +

+ + + erpnext.controllers.item_variant.generate_keyed_value_combinations + (args) +

+ 
From this:
+
+    args = {"attr1": ["a", "b", "c"], "attr2": ["1", "2"], "attr3": ["A"]}
+
+To this:
+
+    [
+        {u'attr1': u'a', u'attr2': u'1', u'attr3': u'A'},
+        {u'attr1': u'b', u'attr2': u'1', u'attr3': u'A'},
+        {u'attr1': u'c', u'attr2': u'1', u'attr3': u'A'},
+        {u'attr1': u'a', u'attr2': u'2', u'attr3': u'A'},
+        {u'attr1': u'b', u'attr2': u'2', u'attr3': u'A'},
+        {u'attr1': u'c', u'attr2': u'2', u'attr3': u'A'}
+    ]
+
+
+
+ + + + + + +

erpnext.controllers.item_variant.get_attribute_values - () + (item)

No docs

diff --git a/foundation/www/docs/current/api/controllers/erpnext.controllers.print_settings.html b/foundation/www/docs/current/api/controllers/erpnext.controllers.print_settings.html index d6356dc0..884b752f 100644 --- a/foundation/www/docs/current/api/controllers/erpnext.controllers.print_settings.html +++ b/foundation/www/docs/current/api/controllers/erpnext.controllers.print_settings.html @@ -3,7 +3,7 @@
- Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 Public API +
/api/method/erpnext.controllers.queries.get_batch_numbers +

+

+ + + erpnext.controllers.queries.get_batch_numbers + (doctype, txt, searchfield, start, page_len, filters) +

+

No docs

+
+
+ + + + + +

diff --git a/foundation/www/docs/current/api/controllers/erpnext.controllers.sales_and_purchase_return.html b/foundation/www/docs/current/api/controllers/erpnext.controllers.sales_and_purchase_return.html index 4c6296f6..42b34f5e 100644 --- a/foundation/www/docs/current/api/controllers/erpnext.controllers.sales_and_purchase_return.html +++ b/foundation/www/docs/current/api/controllers/erpnext.controllers.sales_and_purchase_return.html @@ -3,7 +3,7 @@

- Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - - - apply_shipping_rule - (self) -

-

No docs

-
-
- - - - -

diff --git a/foundation/www/docs/current/api/controllers/erpnext.controllers.status_updater.html b/foundation/www/docs/current/api/controllers/erpnext.controllers.status_updater.html index b83b68d1..94e88ed3 100644 --- a/foundation/www/docs/current/api/controllers/erpnext.controllers.status_updater.html +++ b/foundation/www/docs/current/api/controllers/erpnext.controllers.status_updater.html @@ -3,7 +3,7 @@

- Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 + + + erpnext.demo.setup.setup_data.setup_role_permissions + () +

+

No docs

+
+
+ + + + + + +

diff --git a/foundation/www/docs/current/api/demo/setup/index.html b/foundation/www/docs/current/api/demo/setup/index.html index 9dd1df33..8af3d0d0 100644 --- a/foundation/www/docs/current/api/demo/setup/index.html +++ b/foundation/www/docs/current/api/demo/setup/index.html @@ -7,7 +7,7 @@

- Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 -

erpnext.demo.user.schools

+ +

erpnext.demo.user.education

- Version 8.11.4 + Version 10.0.2 - Source
@@ -20,9 +20,9 @@

- + - erpnext.demo.user.schools.approve_random_student_applicant + erpnext.demo.user.education.approve_random_student_applicant ()

No docs

@@ -36,9 +36,9 @@

- + - erpnext.demo.user.schools.assign_student_group + erpnext.demo.user.education.assign_student_group (student, student_name, program, courses, batch)

No docs

@@ -52,9 +52,9 @@

- + - erpnext.demo.user.schools.enroll_random_student + erpnext.demo.user.education.enroll_random_student (current_date)

No docs

@@ -68,9 +68,9 @@

- + - erpnext.demo.user.schools.make_assessment_plan + erpnext.demo.user.education.make_assessment_plan (date)

No docs

@@ -84,9 +84,9 @@

- + - erpnext.demo.user.schools.make_course_schedule + erpnext.demo.user.education.make_course_schedule (start_date, end_date)

No docs

@@ -100,9 +100,9 @@

- + - erpnext.demo.user.schools.make_fees + erpnext.demo.user.education.make_fees ()

No docs

@@ -116,9 +116,9 @@

- + - erpnext.demo.user.schools.mark_student_attendance + erpnext.demo.user.education.mark_student_attendance (current_date)

No docs

@@ -132,9 +132,9 @@

- + - erpnext.demo.user.schools.weighted_choice + erpnext.demo.user.education.weighted_choice (weights)

No docs

@@ -148,9 +148,9 @@

- + - erpnext.demo.user.schools.work + erpnext.demo.user.education.work ()

No docs

diff --git a/foundation/www/docs/current/api/demo/user/erpnext.demo.user.fixed_asset.html b/foundation/www/docs/current/api/demo/user/erpnext.demo.user.fixed_asset.html index a30beab0..0cdc38af 100644 --- a/foundation/www/docs/current/api/demo/user/erpnext.demo.user.fixed_asset.html +++ b/foundation/www/docs/current/api/demo/user/erpnext.demo.user.fixed_asset.html @@ -3,7 +3,7 @@
- Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 -

erpnext.schools.web_form

+ +

erpnext.domains.agriculture

- Version 8.11.4 + Version 10.0.2 - Source
diff --git a/foundation/www/docs/current/api/domains/erpnext.domains.distribution.html b/foundation/www/docs/current/api/domains/erpnext.domains.distribution.html new file mode 100644 index 00000000..8382e280 --- /dev/null +++ b/foundation/www/docs/current/api/domains/erpnext.domains.distribution.html @@ -0,0 +1,20 @@ + +

erpnext.domains.distribution

+
+ + + Version 10.0.2 + + + Source + +
+ + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/domains/erpnext.domains.education.html b/foundation/www/docs/current/api/domains/erpnext.domains.education.html new file mode 100644 index 00000000..dfbf058b --- /dev/null +++ b/foundation/www/docs/current/api/domains/erpnext.domains.education.html @@ -0,0 +1,20 @@ + +

erpnext.domains.education

+
+ + + Version 10.0.2 + + + Source + +
+ + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/domains/erpnext.domains.healthcare.html b/foundation/www/docs/current/api/domains/erpnext.domains.healthcare.html new file mode 100644 index 00000000..a31b0622 --- /dev/null +++ b/foundation/www/docs/current/api/domains/erpnext.domains.healthcare.html @@ -0,0 +1,20 @@ + +

erpnext.domains.healthcare

+
+ + + Version 10.0.2 + + + Source + +
+ + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/domains/erpnext.domains.hospitality.html b/foundation/www/docs/current/api/domains/erpnext.domains.hospitality.html new file mode 100644 index 00000000..afb147f4 --- /dev/null +++ b/foundation/www/docs/current/api/domains/erpnext.domains.hospitality.html @@ -0,0 +1,20 @@ + +

erpnext.domains.hospitality

+
+ + + Version 10.0.2 + + + Source + +
+ + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/domains/erpnext.domains.html b/foundation/www/docs/current/api/domains/erpnext.domains.html new file mode 100644 index 00000000..d0c1a226 --- /dev/null +++ b/foundation/www/docs/current/api/domains/erpnext.domains.html @@ -0,0 +1,20 @@ + +

erpnext.domains

+
+ + + Version 10.0.2 + + + Source + +
+ + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/domains/erpnext.domains.manufacturing.html b/foundation/www/docs/current/api/domains/erpnext.domains.manufacturing.html new file mode 100644 index 00000000..8333ded2 --- /dev/null +++ b/foundation/www/docs/current/api/domains/erpnext.domains.manufacturing.html @@ -0,0 +1,20 @@ + +

erpnext.domains.manufacturing

+
+ + + Version 10.0.2 + + + Source + +
+ + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/domains/erpnext.domains.non_profit.html b/foundation/www/docs/current/api/domains/erpnext.domains.non_profit.html new file mode 100644 index 00000000..c5b5400b --- /dev/null +++ b/foundation/www/docs/current/api/domains/erpnext.domains.non_profit.html @@ -0,0 +1,20 @@ + +

erpnext.domains.non_profit

+
+ + + Version 10.0.2 + + + Source + +
+ + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/domains/erpnext.domains.retail.html b/foundation/www/docs/current/api/domains/erpnext.domains.retail.html new file mode 100644 index 00000000..379f5071 --- /dev/null +++ b/foundation/www/docs/current/api/domains/erpnext.domains.retail.html @@ -0,0 +1,20 @@ + +

erpnext.domains.retail

+
+ + + Version 10.0.2 + + + Source + +
+ + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/domains/erpnext.domains.services.html b/foundation/www/docs/current/api/domains/erpnext.domains.services.html new file mode 100644 index 00000000..4c097aee --- /dev/null +++ b/foundation/www/docs/current/api/domains/erpnext.domains.services.html @@ -0,0 +1,20 @@ + +

erpnext.domains.services

+
+ + + Version 10.0.2 + + + Source + +
+ + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/domains/index.html b/foundation/www/docs/current/api/domains/index.html new file mode 100644 index 00000000..b779d26f --- /dev/null +++ b/foundation/www/docs/current/api/domains/index.html @@ -0,0 +1,22 @@ + + + + + +

domains

+
+ + + Version 10.0.2 + + + Source + +
+ +

Package Contents

+ +{index} + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/domains/index.txt b/foundation/www/docs/current/api/domains/index.txt new file mode 100644 index 00000000..4ebb015f --- /dev/null +++ b/foundation/www/docs/current/api/domains/index.txt @@ -0,0 +1,10 @@ +erpnext.domains.education +erpnext.domains.non_profit +erpnext.domains.manufacturing +erpnext.domains.healthcare +erpnext.domains.distribution +erpnext.domains.retail +erpnext.domains +erpnext.domains.services +erpnext.domains.agriculture +erpnext.domains.hospitality \ No newline at end of file diff --git a/foundation/www/docs/current/api/education/_sidebar.json b/foundation/www/docs/current/api/education/_sidebar.json new file mode 100644 index 00000000..88f5aab5 --- /dev/null +++ b/foundation/www/docs/current/api/education/_sidebar.json @@ -0,0 +1,22 @@ +[ + { + "route": "/docs", + "title": "Docs Home" + }, + { + "route": "/docs/user", + "title": "User Guide" + }, + { + "route": "/docs/current/api", + "title": "Server API" + }, + { + "route": "/docs/current/models", + "title": "Models (Reference)" + }, + { + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "title": "Improve Docs" + } +] \ No newline at end of file diff --git a/foundation/www/docs/current/api/schools/erpnext.schools.api.html b/foundation/www/docs/current/api/education/erpnext.education.api.html similarity index 65% rename from foundation/www/docs/current/api/schools/erpnext.schools.api.html rename to foundation/www/docs/current/api/education/erpnext.education.api.html index bc1a0ab2..1af63a21 100644 --- a/foundation/www/docs/current/api/schools/erpnext.schools.api.html +++ b/foundation/www/docs/current/api/education/erpnext.education.api.html @@ -1,12 +1,12 @@ - -

erpnext.schools.api

+ +

erpnext.education.api

- Version 8.11.4 + Version 10.0.2 - Source
@@ -19,12 +19,12 @@

Public API -
/api/method/erpnext.schools.api.check_attendance_records_exist +
/api/method/erpnext.education.api.check_attendance_records_exist

- + - erpnext.schools.api.check_attendance_records_exist + erpnext.education.api.check_attendance_records_exist (course_schedule=None, student_group=None, date=None)

Check if Attendance Records are made against the specified Course Schedule or Student Group for given date.

@@ -45,12 +45,12 @@

Public API -
/api/method/erpnext.schools.api.collect_fees +
/api/method/erpnext.education.api.collect_fees

- + - erpnext.schools.api.collect_fees + erpnext.education.api.collect_fees (fees, amt)

No docs

@@ -63,12 +63,12 @@

Public API -
/api/method/erpnext.schools.api.enroll_student +
/api/method/erpnext.education.api.enroll_student

- + - erpnext.schools.api.enroll_student + erpnext.education.api.enroll_student (source_name)

Creates a Student Record and returns a Program Enrollment.

@@ -87,12 +87,12 @@

Public API -
/api/method/erpnext.schools.api.get_assessment_criteria +
/api/method/erpnext.education.api.get_assessment_criteria

- + - erpnext.schools.api.get_assessment_criteria + erpnext.education.api.get_assessment_criteria (course)

Returns Assessmemt Criteria and their Weightage from Course Master.

@@ -111,12 +111,12 @@

Public API -
/api/method/erpnext.schools.api.get_assessment_details +
/api/method/erpnext.education.api.get_assessment_details

- + - erpnext.schools.api.get_assessment_details + erpnext.education.api.get_assessment_details (assessment_plan)

Returns Assessment Criteria and Maximum Score from Assessment Plan Master.

@@ -136,9 +136,9 @@

- + - erpnext.schools.api.get_assessment_result_doc + erpnext.education.api.get_assessment_result_doc (student, assessment_plan)

No docs

@@ -151,12 +151,12 @@

Public API -
/api/method/erpnext.schools.api.get_assessment_students +
/api/method/erpnext.education.api.get_assessment_students

- + - erpnext.schools.api.get_assessment_students + erpnext.education.api.get_assessment_students (assessment_plan, student_group)

No docs

@@ -170,9 +170,9 @@

- + - erpnext.schools.api.get_course + erpnext.education.api.get_course (program)

Return list of courses for a particular program

@@ -191,12 +191,12 @@

Public API -
/api/method/erpnext.schools.api.get_course_schedule_events +
/api/method/erpnext.education.api.get_course_schedule_events

- + - erpnext.schools.api.get_course_schedule_events + erpnext.education.api.get_course_schedule_events (start, end, filters=None)

Returns events for Course Schedule Calendar view rendering.

@@ -217,12 +217,12 @@

Public API -
/api/method/erpnext.schools.api.get_current_enrollment +
/api/method/erpnext.education.api.get_current_enrollment

- + - erpnext.schools.api.get_current_enrollment + erpnext.education.api.get_current_enrollment (student, academic_year=None)

No docs

@@ -235,12 +235,12 @@

Public API -
/api/method/erpnext.schools.api.get_fee_components +
/api/method/erpnext.education.api.get_fee_components

- + - erpnext.schools.api.get_fee_components + erpnext.education.api.get_fee_components (fee_structure)

Returns Fee Components.

@@ -259,12 +259,12 @@

Public API -
/api/method/erpnext.schools.api.get_fee_schedule +
/api/method/erpnext.education.api.get_fee_schedule

- + - erpnext.schools.api.get_fee_schedule + erpnext.education.api.get_fee_schedule (program, student_category=None)

Returns Fee Schedule.

@@ -284,12 +284,12 @@

Public API -
/api/method/erpnext.schools.api.get_fee_structure +
/api/method/erpnext.education.api.get_fee_structure

- + - erpnext.schools.api.get_fee_structure + erpnext.education.api.get_fee_structure (program, academic_term=None)

Returns Fee Structure.

@@ -309,12 +309,12 @@

Public API -
/api/method/erpnext.schools.api.get_grade +
/api/method/erpnext.education.api.get_grade

- + - erpnext.schools.api.get_grade + erpnext.education.api.get_grade (grading_scale, percentage)

Returns Grade based on the Grading Scale and Score.

@@ -334,12 +334,12 @@

Public API -
/api/method/erpnext.schools.api.get_result +
/api/method/erpnext.education.api.get_result

- + - erpnext.schools.api.get_result + erpnext.education.api.get_result (student, assessment_plan)

Returns Submitted Result of given student for specified Assessment Plan

@@ -359,12 +359,12 @@

Public API -
/api/method/erpnext.schools.api.get_student_group_students +
/api/method/erpnext.education.api.get_student_group_students

- + - erpnext.schools.api.get_student_group_students + erpnext.education.api.get_student_group_students (student_group, include_inactive=0)

Returns List of student, student_name in Student Group.

@@ -383,12 +383,12 @@

Public API -
/api/method/erpnext.schools.api.get_student_guardians +
/api/method/erpnext.education.api.get_student_guardians

- + - erpnext.schools.api.get_student_guardians + erpnext.education.api.get_student_guardians (student)

Returns List of Guardians of a Student.

@@ -408,9 +408,9 @@

- + - erpnext.schools.api.make_attendance_records + erpnext.education.api.make_attendance_records (student, student_name, status, course_schedule=None, student_group=None, date=None)

Creates/Update Attendance Record.

@@ -432,12 +432,12 @@

Public API -
/api/method/erpnext.schools.api.mark_assessment_result +
/api/method/erpnext.education.api.mark_assessment_result

- + - erpnext.schools.api.mark_assessment_result + erpnext.education.api.mark_assessment_result (assessment_plan, scores)

No docs

@@ -450,12 +450,12 @@

Public API -
/api/method/erpnext.schools.api.mark_attendance +
/api/method/erpnext.education.api.mark_attendance

- + - erpnext.schools.api.mark_attendance + erpnext.education.api.mark_attendance (students_present, students_absent, course_schedule=None, student_group=None, date=None)

Creates Multiple Attendance Records.

@@ -478,12 +478,12 @@

Public API -
/api/method/erpnext.schools.api.submit_assessment_results +
/api/method/erpnext.education.api.submit_assessment_results

- + - erpnext.schools.api.submit_assessment_results + erpnext.education.api.submit_assessment_results (assessment_plan, student_group)

No docs

@@ -496,12 +496,12 @@

Public API -
/api/method/erpnext.schools.api.update_email_group +
/api/method/erpnext.education.api.update_email_group

- + - erpnext.schools.api.update_email_group + erpnext.education.api.update_email_group (doctype, name)

No docs

diff --git a/foundation/www/docs/current/api/education/erpnext.education.html b/foundation/www/docs/current/api/education/erpnext.education.html new file mode 100644 index 00000000..b320f677 --- /dev/null +++ b/foundation/www/docs/current/api/education/erpnext.education.html @@ -0,0 +1,20 @@ + +

erpnext.education

+
+ + + Version 10.0.2 + + + Source + +
+ + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/education/erpnext.education.setup.html b/foundation/www/docs/current/api/education/erpnext.education.setup.html new file mode 100644 index 00000000..239b48f3 --- /dev/null +++ b/foundation/www/docs/current/api/education/erpnext.education.setup.html @@ -0,0 +1,52 @@ + +

erpnext.education.setup

+
+ + + Version 10.0.2 + + + Source + +
+ + + + + + + + + +

+ + + erpnext.education.setup.create_academic_sessions + () +

+

No docs

+
+
+ + + + + + + +

+ + + erpnext.education.setup.setup_education + () +

+

No docs

+
+
+ + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/schools/erpnext.schools.utils.html b/foundation/www/docs/current/api/education/erpnext.education.utils.html similarity index 69% rename from foundation/www/docs/current/api/schools/erpnext.schools.utils.html rename to foundation/www/docs/current/api/education/erpnext.education.utils.html index fe3b0fe3..c4bbc956 100644 --- a/foundation/www/docs/current/api/schools/erpnext.schools.utils.html +++ b/foundation/www/docs/current/api/education/erpnext.education.utils.html @@ -1,12 +1,12 @@ - -

erpnext.schools.utils

+ +

erpnext.education.utils

- Version 8.11.4 + Version 10.0.2 - Source
@@ -35,9 +35,9 @@

- + - erpnext.schools.utils.get_overlap_for + erpnext.education.utils.get_overlap_for (doc, doctype, fieldname, value=None)

Returns overlaping document for specified field.

@@ -57,9 +57,9 @@

- + - erpnext.schools.utils.validate_duplicate_student + erpnext.education.utils.validate_duplicate_student (students)

No docs

@@ -73,9 +73,9 @@

- + - erpnext.schools.utils.validate_overlap_for + erpnext.education.utils.validate_overlap_for (doc, doctype, fieldname, value=None)

Checks overlap for specified field.

diff --git a/foundation/www/docs/current/api/education/index.html b/foundation/www/docs/current/api/education/index.html new file mode 100644 index 00000000..c6cedf1e --- /dev/null +++ b/foundation/www/docs/current/api/education/index.html @@ -0,0 +1,22 @@ + + + + + +

education

+
+ + + Version 10.0.2 + + + Source + +
+ +

Package Contents

+ +{index} + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/education/index.txt b/foundation/www/docs/current/api/education/index.txt new file mode 100644 index 00000000..78eceac3 --- /dev/null +++ b/foundation/www/docs/current/api/education/index.txt @@ -0,0 +1,4 @@ +erpnext.education +erpnext.education.utils +erpnext.education.setup +erpnext.education.api \ No newline at end of file diff --git a/foundation/www/docs/current/api/education/web_form/_sidebar.json b/foundation/www/docs/current/api/education/web_form/_sidebar.json new file mode 100644 index 00000000..88f5aab5 --- /dev/null +++ b/foundation/www/docs/current/api/education/web_form/_sidebar.json @@ -0,0 +1,22 @@ +[ + { + "route": "/docs", + "title": "Docs Home" + }, + { + "route": "/docs/user", + "title": "User Guide" + }, + { + "route": "/docs/current/api", + "title": "Server API" + }, + { + "route": "/docs/current/models", + "title": "Models (Reference)" + }, + { + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "title": "Improve Docs" + } +] \ No newline at end of file diff --git a/foundation/www/docs/current/api/education/web_form/erpnext.education.web_form.html b/foundation/www/docs/current/api/education/web_form/erpnext.education.web_form.html new file mode 100644 index 00000000..a8abbabc --- /dev/null +++ b/foundation/www/docs/current/api/education/web_form/erpnext.education.web_form.html @@ -0,0 +1,20 @@ + +

erpnext.education.web_form

+
+ + + Version 10.0.2 + + + Source + +
+ + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/schools/web_form/index.html b/foundation/www/docs/current/api/education/web_form/index.html similarity index 95% rename from foundation/www/docs/current/api/schools/web_form/index.html rename to foundation/www/docs/current/api/education/web_form/index.html index 1a7d1fa1..1b69e039 100644 --- a/foundation/www/docs/current/api/schools/web_form/index.html +++ b/foundation/www/docs/current/api/education/web_form/index.html @@ -7,7 +7,7 @@
- Version 8.11.4 + Version 10.0.2 -

erpnext.schools.web_form.student_applicant

+ +

erpnext.education.web_form.student_applicant

- Version 8.11.4 + Version 10.0.2 - Source
diff --git a/foundation/www/docs/current/api/schools/web_form/student_applicant/erpnext.schools.web_form.student_applicant.student_applicant.html b/foundation/www/docs/current/api/education/web_form/student_applicant/erpnext.education.web_form.student_applicant.student_applicant.html similarity index 50% rename from foundation/www/docs/current/api/schools/web_form/student_applicant/erpnext.schools.web_form.student_applicant.student_applicant.html rename to foundation/www/docs/current/api/education/web_form/student_applicant/erpnext.education.web_form.student_applicant.student_applicant.html index 5de186be..79acfa2e 100644 --- a/foundation/www/docs/current/api/schools/web_form/student_applicant/erpnext.schools.web_form.student_applicant.student_applicant.html +++ b/foundation/www/docs/current/api/education/web_form/student_applicant/erpnext.education.web_form.student_applicant.student_applicant.html @@ -1,12 +1,12 @@ - -

erpnext.schools.web_form.student_applicant.student_applicant

+ +

erpnext.education.web_form.student_applicant.student_applicant

- Version 8.11.4 + Version 10.0.2 - Source
@@ -20,9 +20,9 @@

- + - erpnext.schools.web_form.student_applicant.student_applicant.get_context + erpnext.education.web_form.student_applicant.student_applicant.get_context (context)

No docs

diff --git a/foundation/www/docs/current/api/schools/web_form/student_applicant/index.html b/foundation/www/docs/current/api/education/web_form/student_applicant/index.html similarity index 95% rename from foundation/www/docs/current/api/schools/web_form/student_applicant/index.html rename to foundation/www/docs/current/api/education/web_form/student_applicant/index.html index 37f60f6e..845ab157 100644 --- a/foundation/www/docs/current/api/schools/web_form/student_applicant/index.html +++ b/foundation/www/docs/current/api/education/web_form/student_applicant/index.html @@ -7,7 +7,7 @@
- Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 + + + erpnext.get_last_membership + () +

+

Returns last membership if exists

+
+
+ + + + + + +

@@ -140,6 +156,22 @@ def myfunction(): +

+ + + erpnext.is_member + () +

+

Returns true if the user is still a member

+
+
+ + + + + + +

diff --git a/foundation/www/docs/current/api/erpnext.exceptions.html b/foundation/www/docs/current/api/erpnext.exceptions.html index 48d91b06..e4f88619 100644 --- a/foundation/www/docs/current/api/erpnext.exceptions.html +++ b/foundation/www/docs/current/api/erpnext.exceptions.html @@ -3,7 +3,7 @@

- Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 +

erpnext.erpnext_integrations.connectors.github_connection

+
+ + + Version 10.0.2 + + + Source + +
+ + + + + + + +

Class GithubConnection

+ +

Inherits from frappe.data_migration.doctype.data_migration_connector.connectors.base.BaseConnection + +

+
+
+ + + + +

+ + + __init__ + (self, connector) +

+

No docs

+
+
+ + + + + +

+ + + delete + (self, doctype, migration_id) +

+

No docs

+
+
+ + + + + +

+ + + get + (self, remote_objectname, fields=None, filters=None, start=0, page_length=10) +

+

No docs

+
+
+ + + + + +

+ + + get_issues + (self, repo, start=0, page_length=10) +

+

No docs

+
+
+ + + + + +

+ + + get_milestones + (self, repo, start=0, page_length=10) +

+

No docs

+
+
+ + + + + +

+ + + insert + (self, doctype, doc) +

+

No docs

+
+
+ + + + + +

+ + + update + (self, doctype, doc, migration_id) +

+

No docs

+
+
+ + +
+
+ + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/erpnext_integrations/connectors/erpnext.erpnext_integrations.connectors.html b/foundation/www/docs/current/api/erpnext_integrations/connectors/erpnext.erpnext_integrations.connectors.html new file mode 100644 index 00000000..33abc16f --- /dev/null +++ b/foundation/www/docs/current/api/erpnext_integrations/connectors/erpnext.erpnext_integrations.connectors.html @@ -0,0 +1,20 @@ + +

erpnext.erpnext_integrations.connectors

+
+ + + Version 10.0.2 + + + Source + +
+ + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/erpnext_integrations/connectors/index.html b/foundation/www/docs/current/api/erpnext_integrations/connectors/index.html new file mode 100644 index 00000000..b1e41bd7 --- /dev/null +++ b/foundation/www/docs/current/api/erpnext_integrations/connectors/index.html @@ -0,0 +1,22 @@ + + + + + +

connectors

+
+ + + Version 10.0.2 + + + Source + +
+ +

Package Contents

+ +{index} + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/erpnext_integrations/connectors/index.txt b/foundation/www/docs/current/api/erpnext_integrations/connectors/index.txt new file mode 100644 index 00000000..8027daa6 --- /dev/null +++ b/foundation/www/docs/current/api/erpnext_integrations/connectors/index.txt @@ -0,0 +1,2 @@ +erpnext.erpnext_integrations.connectors +erpnext.erpnext_integrations.connectors.github_connection \ No newline at end of file diff --git a/foundation/www/docs/current/api/erpnext_integrations/data_migration_mapping/_sidebar.json b/foundation/www/docs/current/api/erpnext_integrations/data_migration_mapping/_sidebar.json new file mode 100644 index 00000000..88f5aab5 --- /dev/null +++ b/foundation/www/docs/current/api/erpnext_integrations/data_migration_mapping/_sidebar.json @@ -0,0 +1,22 @@ +[ + { + "route": "/docs", + "title": "Docs Home" + }, + { + "route": "/docs/user", + "title": "User Guide" + }, + { + "route": "/docs/current/api", + "title": "Server API" + }, + { + "route": "/docs/current/models", + "title": "Models (Reference)" + }, + { + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "title": "Improve Docs" + } +] \ No newline at end of file diff --git a/foundation/www/docs/current/api/erpnext_integrations/data_migration_mapping/erpnext.erpnext_integrations.data_migration_mapping.html b/foundation/www/docs/current/api/erpnext_integrations/data_migration_mapping/erpnext.erpnext_integrations.data_migration_mapping.html new file mode 100644 index 00000000..11801897 --- /dev/null +++ b/foundation/www/docs/current/api/erpnext_integrations/data_migration_mapping/erpnext.erpnext_integrations.data_migration_mapping.html @@ -0,0 +1,20 @@ + +

erpnext.erpnext_integrations.data_migration_mapping

+
+ + + Version 10.0.2 + + + Source + +
+ + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/erpnext_integrations/data_migration_mapping/index.html b/foundation/www/docs/current/api/erpnext_integrations/data_migration_mapping/index.html new file mode 100644 index 00000000..19c18b63 --- /dev/null +++ b/foundation/www/docs/current/api/erpnext_integrations/data_migration_mapping/index.html @@ -0,0 +1,22 @@ + + + + + +

data_migration_mapping

+
+ + + Version 10.0.2 + + + Source + +
+ +

Package Contents

+ +{index} + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/erpnext_integrations/data_migration_mapping/index.txt b/foundation/www/docs/current/api/erpnext_integrations/data_migration_mapping/index.txt new file mode 100644 index 00000000..8eae43a6 --- /dev/null +++ b/foundation/www/docs/current/api/erpnext_integrations/data_migration_mapping/index.txt @@ -0,0 +1 @@ +erpnext.erpnext_integrations.data_migration_mapping \ No newline at end of file diff --git a/foundation/www/docs/current/api/erpnext_integrations/data_migration_mapping/issue_to_task/_sidebar.json b/foundation/www/docs/current/api/erpnext_integrations/data_migration_mapping/issue_to_task/_sidebar.json new file mode 100644 index 00000000..88f5aab5 --- /dev/null +++ b/foundation/www/docs/current/api/erpnext_integrations/data_migration_mapping/issue_to_task/_sidebar.json @@ -0,0 +1,22 @@ +[ + { + "route": "/docs", + "title": "Docs Home" + }, + { + "route": "/docs/user", + "title": "User Guide" + }, + { + "route": "/docs/current/api", + "title": "Server API" + }, + { + "route": "/docs/current/models", + "title": "Models (Reference)" + }, + { + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "title": "Improve Docs" + } +] \ No newline at end of file diff --git a/foundation/www/docs/current/api/erpnext_integrations/data_migration_mapping/issue_to_task/erpnext.erpnext_integrations.data_migration_mapping.issue_to_task.html b/foundation/www/docs/current/api/erpnext_integrations/data_migration_mapping/issue_to_task/erpnext.erpnext_integrations.data_migration_mapping.issue_to_task.html new file mode 100644 index 00000000..fc3496cc --- /dev/null +++ b/foundation/www/docs/current/api/erpnext_integrations/data_migration_mapping/issue_to_task/erpnext.erpnext_integrations.data_migration_mapping.issue_to_task.html @@ -0,0 +1,36 @@ + +

erpnext.erpnext_integrations.data_migration_mapping.issue_to_task

+
+ + + Version 10.0.2 + + + Source + +
+ + + + + + + + + +

+ + + erpnext.erpnext_integrations.data_migration_mapping.issue_to_task.pre_process + (issue) +

+

No docs

+
+
+ + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/erpnext_integrations/data_migration_mapping/issue_to_task/index.html b/foundation/www/docs/current/api/erpnext_integrations/data_migration_mapping/issue_to_task/index.html new file mode 100644 index 00000000..7348e4e0 --- /dev/null +++ b/foundation/www/docs/current/api/erpnext_integrations/data_migration_mapping/issue_to_task/index.html @@ -0,0 +1,22 @@ + + + + + +

issue_to_task

+
+ + + Version 10.0.2 + + + Source + +
+ +

Package Contents

+ +{index} + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/erpnext_integrations/data_migration_mapping/issue_to_task/index.txt b/foundation/www/docs/current/api/erpnext_integrations/data_migration_mapping/issue_to_task/index.txt new file mode 100644 index 00000000..841601ca --- /dev/null +++ b/foundation/www/docs/current/api/erpnext_integrations/data_migration_mapping/issue_to_task/index.txt @@ -0,0 +1 @@ +erpnext.erpnext_integrations.data_migration_mapping.issue_to_task \ No newline at end of file diff --git a/foundation/www/docs/current/api/erpnext_integrations/data_migration_mapping/milestone_to_project/_sidebar.json b/foundation/www/docs/current/api/erpnext_integrations/data_migration_mapping/milestone_to_project/_sidebar.json new file mode 100644 index 00000000..88f5aab5 --- /dev/null +++ b/foundation/www/docs/current/api/erpnext_integrations/data_migration_mapping/milestone_to_project/_sidebar.json @@ -0,0 +1,22 @@ +[ + { + "route": "/docs", + "title": "Docs Home" + }, + { + "route": "/docs/user", + "title": "User Guide" + }, + { + "route": "/docs/current/api", + "title": "Server API" + }, + { + "route": "/docs/current/models", + "title": "Models (Reference)" + }, + { + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "title": "Improve Docs" + } +] \ No newline at end of file diff --git a/foundation/www/docs/current/api/erpnext_integrations/data_migration_mapping/milestone_to_project/erpnext.erpnext_integrations.data_migration_mapping.milestone_to_project.html b/foundation/www/docs/current/api/erpnext_integrations/data_migration_mapping/milestone_to_project/erpnext.erpnext_integrations.data_migration_mapping.milestone_to_project.html new file mode 100644 index 00000000..528a2621 --- /dev/null +++ b/foundation/www/docs/current/api/erpnext_integrations/data_migration_mapping/milestone_to_project/erpnext.erpnext_integrations.data_migration_mapping.milestone_to_project.html @@ -0,0 +1,36 @@ + +

erpnext.erpnext_integrations.data_migration_mapping.milestone_to_project

+
+ + + Version 10.0.2 + + + Source + +
+ + + + + + + + + +

+ + + erpnext.erpnext_integrations.data_migration_mapping.milestone_to_project.pre_process + (milestone) +

+

No docs

+
+
+ + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/erpnext_integrations/data_migration_mapping/milestone_to_project/index.html b/foundation/www/docs/current/api/erpnext_integrations/data_migration_mapping/milestone_to_project/index.html new file mode 100644 index 00000000..588239ac --- /dev/null +++ b/foundation/www/docs/current/api/erpnext_integrations/data_migration_mapping/milestone_to_project/index.html @@ -0,0 +1,22 @@ + + + + + +

milestone_to_project

+
+ + + Version 10.0.2 + + + Source + +
+ +

Package Contents

+ +{index} + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/erpnext_integrations/data_migration_mapping/milestone_to_project/index.txt b/foundation/www/docs/current/api/erpnext_integrations/data_migration_mapping/milestone_to_project/index.txt new file mode 100644 index 00000000..0a408809 --- /dev/null +++ b/foundation/www/docs/current/api/erpnext_integrations/data_migration_mapping/milestone_to_project/index.txt @@ -0,0 +1 @@ +erpnext.erpnext_integrations.data_migration_mapping.milestone_to_project \ No newline at end of file diff --git a/foundation/www/docs/current/api/erpnext_integrations/erpnext.erpnext_integrations.html b/foundation/www/docs/current/api/erpnext_integrations/erpnext.erpnext_integrations.html new file mode 100644 index 00000000..3bd3ed70 --- /dev/null +++ b/foundation/www/docs/current/api/erpnext_integrations/erpnext.erpnext_integrations.html @@ -0,0 +1,20 @@ + +

erpnext.erpnext_integrations

+
+ + + Version 10.0.2 + + + Source + +
+ + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/erpnext_integrations/index.html b/foundation/www/docs/current/api/erpnext_integrations/index.html new file mode 100644 index 00000000..1ac930d8 --- /dev/null +++ b/foundation/www/docs/current/api/erpnext_integrations/index.html @@ -0,0 +1,22 @@ + + + + + +

erpnext_integrations

+
+ + + Version 10.0.2 + + + Source + +
+ +

Package Contents

+ +{index} + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/erpnext_integrations/index.txt b/foundation/www/docs/current/api/erpnext_integrations/index.txt new file mode 100644 index 00000000..aa1f88f1 --- /dev/null +++ b/foundation/www/docs/current/api/erpnext_integrations/index.txt @@ -0,0 +1 @@ +erpnext.erpnext_integrations \ No newline at end of file diff --git a/foundation/www/docs/current/api/healthcare/erpnext.healthcare.html b/foundation/www/docs/current/api/healthcare/erpnext.healthcare.html index 83a0dfd5..e249a45d 100644 --- a/foundation/www/docs/current/api/healthcare/erpnext.healthcare.html +++ b/foundation/www/docs/current/api/healthcare/erpnext.healthcare.html @@ -3,7 +3,7 @@
- Version 8.11.4 + Version 10.0.2 +

erpnext.healthcare.setup

+
+ + + Version 10.0.2 + + + Source + +
+ + + + + + + + + +

+ + + erpnext.healthcare.setup.create_antibiotics + () +

+

No docs

+
+
+ + + + + + + +

+ + + erpnext.healthcare.setup.create_dosage + () +

+

No docs

+
+
+ + + + + + + +

+ + + erpnext.healthcare.setup.create_duration + () +

+

No docs

+
+
+ + + + + + + +

+ + + erpnext.healthcare.setup.create_healthcare_item_groups + () +

+

No docs

+
+
+ + + + + + + +

+ + + erpnext.healthcare.setup.create_lab_test_items + () +

+

No docs

+
+
+ + + + + + + +

+ + + erpnext.healthcare.setup.create_lab_test_template + () +

+

No docs

+
+
+ + + + + + + +

+ + + erpnext.healthcare.setup.create_medical_departments + () +

+

No docs

+
+
+ + + + + + + +

+ + + erpnext.healthcare.setup.create_sensitivity + () +

+

No docs

+
+
+ + + + + + + +

+ + + erpnext.healthcare.setup.create_test_uom + () +

+

No docs

+
+
+ + + + + + + +

+ + + erpnext.healthcare.setup.setup_healthcare + () +

+

No docs

+
+
+ + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/healthcare/index.html b/foundation/www/docs/current/api/healthcare/index.html index 3c62692f..36476f33 100644 --- a/foundation/www/docs/current/api/healthcare/index.html +++ b/foundation/www/docs/current/api/healthcare/index.html @@ -7,7 +7,7 @@
- Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 +

erpnext.hub

+
+ + + Version 10.0.2 + + + Source + +
+ + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/hub/index.html b/foundation/www/docs/current/api/hub/index.html new file mode 100644 index 00000000..947b8bf9 --- /dev/null +++ b/foundation/www/docs/current/api/hub/index.html @@ -0,0 +1,22 @@ + + + + + +

hub

+
+ + + Version 10.0.2 + + + Source + +
+ +

Package Contents

+ +{index} + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/hub/index.txt b/foundation/www/docs/current/api/hub/index.txt new file mode 100644 index 00000000..f80fab67 --- /dev/null +++ b/foundation/www/docs/current/api/hub/index.txt @@ -0,0 +1 @@ +erpnext.hub \ No newline at end of file diff --git a/foundation/www/docs/current/api/hub_node/data_migration_mapping/_sidebar.json b/foundation/www/docs/current/api/hub_node/data_migration_mapping/_sidebar.json new file mode 100644 index 00000000..88f5aab5 --- /dev/null +++ b/foundation/www/docs/current/api/hub_node/data_migration_mapping/_sidebar.json @@ -0,0 +1,22 @@ +[ + { + "route": "/docs", + "title": "Docs Home" + }, + { + "route": "/docs/user", + "title": "User Guide" + }, + { + "route": "/docs/current/api", + "title": "Server API" + }, + { + "route": "/docs/current/models", + "title": "Models (Reference)" + }, + { + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "title": "Improve Docs" + } +] \ No newline at end of file diff --git a/foundation/www/docs/current/api/hub_node/data_migration_mapping/company_to_hub_company/_sidebar.json b/foundation/www/docs/current/api/hub_node/data_migration_mapping/company_to_hub_company/_sidebar.json new file mode 100644 index 00000000..88f5aab5 --- /dev/null +++ b/foundation/www/docs/current/api/hub_node/data_migration_mapping/company_to_hub_company/_sidebar.json @@ -0,0 +1,22 @@ +[ + { + "route": "/docs", + "title": "Docs Home" + }, + { + "route": "/docs/user", + "title": "User Guide" + }, + { + "route": "/docs/current/api", + "title": "Server API" + }, + { + "route": "/docs/current/models", + "title": "Models (Reference)" + }, + { + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "title": "Improve Docs" + } +] \ No newline at end of file diff --git a/foundation/www/docs/current/api/hub_node/data_migration_mapping/company_to_hub_company/erpnext.hub_node.data_migration_mapping.company_to_hub_company.html b/foundation/www/docs/current/api/hub_node/data_migration_mapping/company_to_hub_company/erpnext.hub_node.data_migration_mapping.company_to_hub_company.html new file mode 100644 index 00000000..21de325c --- /dev/null +++ b/foundation/www/docs/current/api/hub_node/data_migration_mapping/company_to_hub_company/erpnext.hub_node.data_migration_mapping.company_to_hub_company.html @@ -0,0 +1,20 @@ + +

erpnext.hub_node.data_migration_mapping.company_to_hub_company

+
+ + + Version 10.0.2 + + + Source + +
+ + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/hub_node/data_migration_mapping/company_to_hub_company/index.html b/foundation/www/docs/current/api/hub_node/data_migration_mapping/company_to_hub_company/index.html new file mode 100644 index 00000000..aecb8694 --- /dev/null +++ b/foundation/www/docs/current/api/hub_node/data_migration_mapping/company_to_hub_company/index.html @@ -0,0 +1,22 @@ + + + + + +

company_to_hub_company

+
+ + + Version 10.0.2 + + + Source + +
+ +

Package Contents

+ +{index} + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/hub_node/data_migration_mapping/company_to_hub_company/index.txt b/foundation/www/docs/current/api/hub_node/data_migration_mapping/company_to_hub_company/index.txt new file mode 100644 index 00000000..b12be185 --- /dev/null +++ b/foundation/www/docs/current/api/hub_node/data_migration_mapping/company_to_hub_company/index.txt @@ -0,0 +1 @@ +erpnext.hub_node.data_migration_mapping.company_to_hub_company \ No newline at end of file diff --git a/foundation/www/docs/current/api/hub_node/data_migration_mapping/erpnext.hub_node.data_migration_mapping.html b/foundation/www/docs/current/api/hub_node/data_migration_mapping/erpnext.hub_node.data_migration_mapping.html new file mode 100644 index 00000000..61c83e04 --- /dev/null +++ b/foundation/www/docs/current/api/hub_node/data_migration_mapping/erpnext.hub_node.data_migration_mapping.html @@ -0,0 +1,20 @@ + +

erpnext.hub_node.data_migration_mapping

+
+ + + Version 10.0.2 + + + Source + +
+ + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/hub_node/data_migration_mapping/hub_message_to_lead/_sidebar.json b/foundation/www/docs/current/api/hub_node/data_migration_mapping/hub_message_to_lead/_sidebar.json new file mode 100644 index 00000000..88f5aab5 --- /dev/null +++ b/foundation/www/docs/current/api/hub_node/data_migration_mapping/hub_message_to_lead/_sidebar.json @@ -0,0 +1,22 @@ +[ + { + "route": "/docs", + "title": "Docs Home" + }, + { + "route": "/docs/user", + "title": "User Guide" + }, + { + "route": "/docs/current/api", + "title": "Server API" + }, + { + "route": "/docs/current/models", + "title": "Models (Reference)" + }, + { + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "title": "Improve Docs" + } +] \ No newline at end of file diff --git a/foundation/www/docs/current/api/hub_node/data_migration_mapping/hub_message_to_lead/erpnext.hub_node.data_migration_mapping.hub_message_to_lead.html b/foundation/www/docs/current/api/hub_node/data_migration_mapping/hub_message_to_lead/erpnext.hub_node.data_migration_mapping.hub_message_to_lead.html new file mode 100644 index 00000000..9c47188e --- /dev/null +++ b/foundation/www/docs/current/api/hub_node/data_migration_mapping/hub_message_to_lead/erpnext.hub_node.data_migration_mapping.hub_message_to_lead.html @@ -0,0 +1,52 @@ + +

erpnext.hub_node.data_migration_mapping.hub_message_to_lead

+
+ + + Version 10.0.2 + + + Source + +
+ + + + + + + + + +

+ + + erpnext.hub_node.data_migration_mapping.hub_message_to_lead.post_process + (remote_doc=None, local_doc=None) +

+

No docs

+
+
+ + + + + + + +

+ + + erpnext.hub_node.data_migration_mapping.hub_message_to_lead.pre_process + (doc) +

+

No docs

+
+
+ + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/hub_node/data_migration_mapping/hub_message_to_lead/index.html b/foundation/www/docs/current/api/hub_node/data_migration_mapping/hub_message_to_lead/index.html new file mode 100644 index 00000000..ea04b908 --- /dev/null +++ b/foundation/www/docs/current/api/hub_node/data_migration_mapping/hub_message_to_lead/index.html @@ -0,0 +1,22 @@ + + + + + +

hub_message_to_lead

+
+ + + Version 10.0.2 + + + Source + +
+ +

Package Contents

+ +{index} + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/hub_node/data_migration_mapping/hub_message_to_lead/index.txt b/foundation/www/docs/current/api/hub_node/data_migration_mapping/hub_message_to_lead/index.txt new file mode 100644 index 00000000..5acc147b --- /dev/null +++ b/foundation/www/docs/current/api/hub_node/data_migration_mapping/hub_message_to_lead/index.txt @@ -0,0 +1 @@ +erpnext.hub_node.data_migration_mapping.hub_message_to_lead \ No newline at end of file diff --git a/foundation/www/docs/current/api/hub_node/data_migration_mapping/index.html b/foundation/www/docs/current/api/hub_node/data_migration_mapping/index.html new file mode 100644 index 00000000..19c18b63 --- /dev/null +++ b/foundation/www/docs/current/api/hub_node/data_migration_mapping/index.html @@ -0,0 +1,22 @@ + + + + + +

data_migration_mapping

+
+ + + Version 10.0.2 + + + Source + +
+ +

Package Contents

+ +{index} + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/hub_node/data_migration_mapping/index.txt b/foundation/www/docs/current/api/hub_node/data_migration_mapping/index.txt new file mode 100644 index 00000000..95c3a05e --- /dev/null +++ b/foundation/www/docs/current/api/hub_node/data_migration_mapping/index.txt @@ -0,0 +1 @@ +erpnext.hub_node.data_migration_mapping \ No newline at end of file diff --git a/foundation/www/docs/current/api/hub_node/data_migration_mapping/item_to_hub_item/_sidebar.json b/foundation/www/docs/current/api/hub_node/data_migration_mapping/item_to_hub_item/_sidebar.json new file mode 100644 index 00000000..88f5aab5 --- /dev/null +++ b/foundation/www/docs/current/api/hub_node/data_migration_mapping/item_to_hub_item/_sidebar.json @@ -0,0 +1,22 @@ +[ + { + "route": "/docs", + "title": "Docs Home" + }, + { + "route": "/docs/user", + "title": "User Guide" + }, + { + "route": "/docs/current/api", + "title": "Server API" + }, + { + "route": "/docs/current/models", + "title": "Models (Reference)" + }, + { + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "title": "Improve Docs" + } +] \ No newline at end of file diff --git a/foundation/www/docs/current/api/hub_node/data_migration_mapping/item_to_hub_item/erpnext.hub_node.data_migration_mapping.item_to_hub_item.html b/foundation/www/docs/current/api/hub_node/data_migration_mapping/item_to_hub_item/erpnext.hub_node.data_migration_mapping.item_to_hub_item.html new file mode 100644 index 00000000..5801c294 --- /dev/null +++ b/foundation/www/docs/current/api/hub_node/data_migration_mapping/item_to_hub_item/erpnext.hub_node.data_migration_mapping.item_to_hub_item.html @@ -0,0 +1,20 @@ + +

erpnext.hub_node.data_migration_mapping.item_to_hub_item

+
+ + + Version 10.0.2 + + + Source + +
+ + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/hub_node/data_migration_mapping/item_to_hub_item/index.html b/foundation/www/docs/current/api/hub_node/data_migration_mapping/item_to_hub_item/index.html new file mode 100644 index 00000000..c24276b1 --- /dev/null +++ b/foundation/www/docs/current/api/hub_node/data_migration_mapping/item_to_hub_item/index.html @@ -0,0 +1,22 @@ + + + + + +

item_to_hub_item

+
+ + + Version 10.0.2 + + + Source + +
+ +

Package Contents

+ +{index} + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/hub_node/data_migration_mapping/item_to_hub_item/index.txt b/foundation/www/docs/current/api/hub_node/data_migration_mapping/item_to_hub_item/index.txt new file mode 100644 index 00000000..eb7378b7 --- /dev/null +++ b/foundation/www/docs/current/api/hub_node/data_migration_mapping/item_to_hub_item/index.txt @@ -0,0 +1 @@ +erpnext.hub_node.data_migration_mapping.item_to_hub_item \ No newline at end of file diff --git a/foundation/www/docs/current/api/hub_node/erpnext.hub_node.html b/foundation/www/docs/current/api/hub_node/erpnext.hub_node.html index ee73dc48..da85d869 100644 --- a/foundation/www/docs/current/api/hub_node/erpnext.hub_node.html +++ b/foundation/www/docs/current/api/hub_node/erpnext.hub_node.html @@ -3,7 +3,7 @@
- Version 8.11.4 + Version 10.0.2 Public API +
/api/method/erpnext.hub_node.enable_hub +

+

+ + + erpnext.hub_node.enable_hub + () +

+

No docs

+
+
+ + + + + + +

Public API +
/api/method/erpnext.hub_node.get_categories +

+

+ + + erpnext.hub_node.get_categories + () +

+

No docs

+
+
+ + + + + + + +

+ + + erpnext.hub_node.get_client_connection + () +

+

No docs

+
+
+ + + + + + +

Public API +
/api/method/erpnext.hub_node.get_company_details +

+

+ + + erpnext.hub_node.get_company_details + (hub_sync_id) +

+

No docs

+
+
+ + + + + + + +

+ + + erpnext.hub_node.get_hub_connection + () +

+

No docs

+
+
+ + + + + + +

Public API +
/api/method/erpnext.hub_node.get_item_details +

+

+ + + erpnext.hub_node.get_item_details + (hub_sync_id=None) +

+

No docs

+
+
+ + + + + +

Public API
/api/method/erpnext.hub_node.get_items

@@ -25,7 +129,121 @@ erpnext.hub_node.get_items - (text, start, limit) + (start=0, limit=20, category=None, order_by=None, company=None, text=None) +

+

No docs

+
+
+ + + + + + + +

+ + + erpnext.hub_node.make_contact + (supplier) +

+

No docs

+
+
+ + + + + + + +

+ + + erpnext.hub_node.make_item + (item) +

+

No docs

+
+
+ + + + + + + +

+ + + erpnext.hub_node.make_opportunity + (buyer_name, email_id) +

+

No docs

+
+
+ + + + + + + +

+ + + erpnext.hub_node.make_rfq + (item, supplier, contact) +

+

No docs

+
+
+ + + + + + +

Public API +
/api/method/erpnext.hub_node.make_rfq_and_send_opportunity +

+

+ + + erpnext.hub_node.make_rfq_and_send_opportunity + (item, supplier) +

+

No docs

+
+
+ + + + + + + +

+ + + erpnext.hub_node.make_supplier + (supplier) +

+

No docs

+
+
+ + + + + + + +

+ + + erpnext.hub_node.send_opportunity + (contact)

No docs

diff --git a/foundation/www/docs/current/api/hub_node/index.html b/foundation/www/docs/current/api/hub_node/index.html index e8cac514..e700807c 100644 --- a/foundation/www/docs/current/api/hub_node/index.html +++ b/foundation/www/docs/current/api/hub_node/index.html @@ -7,7 +7,7 @@
- Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 +

erpnext.non_profit

+
+ + + Version 10.0.2 + + + Source + +
+ + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/non_profit/index.html b/foundation/www/docs/current/api/non_profit/index.html new file mode 100644 index 00000000..429158dd --- /dev/null +++ b/foundation/www/docs/current/api/non_profit/index.html @@ -0,0 +1,22 @@ + + + + + +

non_profit

+
+ + + Version 10.0.2 + + + Source + +
+ +

Package Contents

+ +{index} + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/non_profit/index.txt b/foundation/www/docs/current/api/non_profit/index.txt new file mode 100644 index 00000000..9947957a --- /dev/null +++ b/foundation/www/docs/current/api/non_profit/index.txt @@ -0,0 +1 @@ +erpnext.non_profit \ No newline at end of file diff --git a/foundation/www/docs/current/api/non_profit/web_form/_sidebar.json b/foundation/www/docs/current/api/non_profit/web_form/_sidebar.json new file mode 100644 index 00000000..88f5aab5 --- /dev/null +++ b/foundation/www/docs/current/api/non_profit/web_form/_sidebar.json @@ -0,0 +1,22 @@ +[ + { + "route": "/docs", + "title": "Docs Home" + }, + { + "route": "/docs/user", + "title": "User Guide" + }, + { + "route": "/docs/current/api", + "title": "Server API" + }, + { + "route": "/docs/current/models", + "title": "Models (Reference)" + }, + { + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "title": "Improve Docs" + } +] \ No newline at end of file diff --git a/foundation/www/docs/current/api/non_profit/web_form/erpnext.non_profit.web_form.html b/foundation/www/docs/current/api/non_profit/web_form/erpnext.non_profit.web_form.html new file mode 100644 index 00000000..45530cb8 --- /dev/null +++ b/foundation/www/docs/current/api/non_profit/web_form/erpnext.non_profit.web_form.html @@ -0,0 +1,20 @@ + +

erpnext.non_profit.web_form

+
+ + + Version 10.0.2 + + + Source + +
+ + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/non_profit/web_form/grant_application/_sidebar.json b/foundation/www/docs/current/api/non_profit/web_form/grant_application/_sidebar.json new file mode 100644 index 00000000..88f5aab5 --- /dev/null +++ b/foundation/www/docs/current/api/non_profit/web_form/grant_application/_sidebar.json @@ -0,0 +1,22 @@ +[ + { + "route": "/docs", + "title": "Docs Home" + }, + { + "route": "/docs/user", + "title": "User Guide" + }, + { + "route": "/docs/current/api", + "title": "Server API" + }, + { + "route": "/docs/current/models", + "title": "Models (Reference)" + }, + { + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "title": "Improve Docs" + } +] \ No newline at end of file diff --git a/foundation/www/docs/current/api/non_profit/web_form/grant_application/erpnext.non_profit.web_form.grant_application.grant_application.html b/foundation/www/docs/current/api/non_profit/web_form/grant_application/erpnext.non_profit.web_form.grant_application.grant_application.html new file mode 100644 index 00000000..e3b338d2 --- /dev/null +++ b/foundation/www/docs/current/api/non_profit/web_form/grant_application/erpnext.non_profit.web_form.grant_application.grant_application.html @@ -0,0 +1,36 @@ + +

erpnext.non_profit.web_form.grant_application.grant_application

+
+ + + Version 10.0.2 + + + Source + +
+ + + + + + + + + +

+ + + erpnext.non_profit.web_form.grant_application.grant_application.get_context + (context) +

+

No docs

+
+
+ + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/non_profit/web_form/grant_application/erpnext.non_profit.web_form.grant_application.html b/foundation/www/docs/current/api/non_profit/web_form/grant_application/erpnext.non_profit.web_form.grant_application.html new file mode 100644 index 00000000..266cf213 --- /dev/null +++ b/foundation/www/docs/current/api/non_profit/web_form/grant_application/erpnext.non_profit.web_form.grant_application.html @@ -0,0 +1,20 @@ + +

erpnext.non_profit.web_form.grant_application

+
+ + + Version 10.0.2 + + + Source + +
+ + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/non_profit/web_form/grant_application/index.html b/foundation/www/docs/current/api/non_profit/web_form/grant_application/index.html new file mode 100644 index 00000000..4e049ed3 --- /dev/null +++ b/foundation/www/docs/current/api/non_profit/web_form/grant_application/index.html @@ -0,0 +1,22 @@ + + + + + +

grant_application

+
+ + + Version 10.0.2 + + + Source + +
+ +

Package Contents

+ +{index} + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/non_profit/web_form/grant_application/index.txt b/foundation/www/docs/current/api/non_profit/web_form/grant_application/index.txt new file mode 100644 index 00000000..d3bbb80e --- /dev/null +++ b/foundation/www/docs/current/api/non_profit/web_form/grant_application/index.txt @@ -0,0 +1,2 @@ +erpnext.non_profit.web_form.grant_application.grant_application +erpnext.non_profit.web_form.grant_application \ No newline at end of file diff --git a/foundation/www/docs/current/api/non_profit/web_form/index.html b/foundation/www/docs/current/api/non_profit/web_form/index.html new file mode 100644 index 00000000..1b69e039 --- /dev/null +++ b/foundation/www/docs/current/api/non_profit/web_form/index.html @@ -0,0 +1,22 @@ + + + + + +

web_form

+
+ + + Version 10.0.2 + + + Source + +
+ +

Package Contents

+ +{index} + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/non_profit/web_form/index.txt b/foundation/www/docs/current/api/non_profit/web_form/index.txt new file mode 100644 index 00000000..865be5cf --- /dev/null +++ b/foundation/www/docs/current/api/non_profit/web_form/index.txt @@ -0,0 +1 @@ +erpnext.non_profit.web_form \ No newline at end of file diff --git a/foundation/www/docs/current/api/portal/erpnext.portal.html b/foundation/www/docs/current/api/portal/erpnext.portal.html index 670f87be..b194ad43 100644 --- a/foundation/www/docs/current/api/portal/erpnext.portal.html +++ b/foundation/www/docs/current/api/portal/erpnext.portal.html @@ -3,7 +3,7 @@
- Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 set_default_role (doc, method)

-

Set customer, supplier, student based on email

+

Set customer, supplier, student, guardian based on email


diff --git a/foundation/www/docs/current/api/portal/index.html b/foundation/www/docs/current/api/portal/index.html index 80f57541..66cf19e9 100644 --- a/foundation/www/docs/current/api/portal/index.html +++ b/foundation/www/docs/current/api/portal/index.html @@ -7,7 +7,7 @@
- Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 +

erpnext.regional.print_format.detailed_tax_invoice

+
+ + + Version 10.0.2 + + + Source + +
+ + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/regional/print_format/detailed_tax_invoice/index.html b/foundation/www/docs/current/api/regional/print_format/detailed_tax_invoice/index.html new file mode 100644 index 00000000..b7bec599 --- /dev/null +++ b/foundation/www/docs/current/api/regional/print_format/detailed_tax_invoice/index.html @@ -0,0 +1,22 @@ + + + + + +

detailed_tax_invoice

+
+ + + Version 10.0.2 + + + Source + +
+ +

Package Contents

+ +{index} + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/regional/print_format/detailed_tax_invoice/index.txt b/foundation/www/docs/current/api/regional/print_format/detailed_tax_invoice/index.txt new file mode 100644 index 00000000..9345d271 --- /dev/null +++ b/foundation/www/docs/current/api/regional/print_format/detailed_tax_invoice/index.txt @@ -0,0 +1 @@ +erpnext.regional.print_format.detailed_tax_invoice \ No newline at end of file diff --git a/foundation/www/docs/current/api/regional/print_format/erpnext.regional.print_format.html b/foundation/www/docs/current/api/regional/print_format/erpnext.regional.print_format.html index 80321858..cba07aa3 100644 --- a/foundation/www/docs/current/api/regional/print_format/erpnext.regional.print_format.html +++ b/foundation/www/docs/current/api/regional/print_format/erpnext.regional.print_format.html @@ -3,7 +3,7 @@
- Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 +

erpnext.regional.print_format.simplified_tax_invoice

+
+ + + Version 10.0.2 + + + Source + +
+ + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/regional/print_format/simplified_tax_invoice/index.html b/foundation/www/docs/current/api/regional/print_format/simplified_tax_invoice/index.html new file mode 100644 index 00000000..6eaf63f8 --- /dev/null +++ b/foundation/www/docs/current/api/regional/print_format/simplified_tax_invoice/index.html @@ -0,0 +1,22 @@ + + + + + +

simplified_tax_invoice

+
+ + + Version 10.0.2 + + + Source + +
+ +

Package Contents

+ +{index} + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/regional/print_format/simplified_tax_invoice/index.txt b/foundation/www/docs/current/api/regional/print_format/simplified_tax_invoice/index.txt new file mode 100644 index 00000000..9f025659 --- /dev/null +++ b/foundation/www/docs/current/api/regional/print_format/simplified_tax_invoice/index.txt @@ -0,0 +1 @@ +erpnext.regional.print_format.simplified_tax_invoice \ No newline at end of file diff --git a/foundation/www/docs/current/api/regional/saudi_arabia/_sidebar.json b/foundation/www/docs/current/api/regional/saudi_arabia/_sidebar.json new file mode 100644 index 00000000..88f5aab5 --- /dev/null +++ b/foundation/www/docs/current/api/regional/saudi_arabia/_sidebar.json @@ -0,0 +1,22 @@ +[ + { + "route": "/docs", + "title": "Docs Home" + }, + { + "route": "/docs/user", + "title": "User Guide" + }, + { + "route": "/docs/current/api", + "title": "Server API" + }, + { + "route": "/docs/current/models", + "title": "Models (Reference)" + }, + { + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "title": "Improve Docs" + } +] \ No newline at end of file diff --git a/foundation/www/docs/current/api/regional/saudi_arabia/erpnext.regional.saudi_arabia.html b/foundation/www/docs/current/api/regional/saudi_arabia/erpnext.regional.saudi_arabia.html new file mode 100644 index 00000000..f5e4d327 --- /dev/null +++ b/foundation/www/docs/current/api/regional/saudi_arabia/erpnext.regional.saudi_arabia.html @@ -0,0 +1,20 @@ + +

erpnext.regional.saudi_arabia

+
+ + + Version 10.0.2 + + + Source + +
+ + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/regional/saudi_arabia/erpnext.regional.saudi_arabia.setup.html b/foundation/www/docs/current/api/regional/saudi_arabia/erpnext.regional.saudi_arabia.setup.html new file mode 100644 index 00000000..48ca03a4 --- /dev/null +++ b/foundation/www/docs/current/api/regional/saudi_arabia/erpnext.regional.saudi_arabia.setup.html @@ -0,0 +1,36 @@ + +

erpnext.regional.saudi_arabia.setup

+
+ + + Version 10.0.2 + + + Source + +
+ + + + + + + + + +

+ + + erpnext.regional.saudi_arabia.setup.setup + (company=None, patch=True) +

+

No docs

+
+
+ + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/regional/saudi_arabia/index.html b/foundation/www/docs/current/api/regional/saudi_arabia/index.html new file mode 100644 index 00000000..ce6fef5e --- /dev/null +++ b/foundation/www/docs/current/api/regional/saudi_arabia/index.html @@ -0,0 +1,22 @@ + + + + + +

saudi_arabia

+
+ + + Version 10.0.2 + + + Source + +
+ +

Package Contents

+ +{index} + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/regional/saudi_arabia/index.txt b/foundation/www/docs/current/api/regional/saudi_arabia/index.txt new file mode 100644 index 00000000..b8ab4575 --- /dev/null +++ b/foundation/www/docs/current/api/regional/saudi_arabia/index.txt @@ -0,0 +1,2 @@ +erpnext.regional.saudi_arabia.setup +erpnext.regional.saudi_arabia \ No newline at end of file diff --git a/foundation/www/docs/current/api/regional/united_arab_emirates/_sidebar.json b/foundation/www/docs/current/api/regional/united_arab_emirates/_sidebar.json new file mode 100644 index 00000000..88f5aab5 --- /dev/null +++ b/foundation/www/docs/current/api/regional/united_arab_emirates/_sidebar.json @@ -0,0 +1,22 @@ +[ + { + "route": "/docs", + "title": "Docs Home" + }, + { + "route": "/docs/user", + "title": "User Guide" + }, + { + "route": "/docs/current/api", + "title": "Server API" + }, + { + "route": "/docs/current/models", + "title": "Models (Reference)" + }, + { + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "title": "Improve Docs" + } +] \ No newline at end of file diff --git a/foundation/www/docs/current/api/schools/web_form/discussion/erpnext.schools.web_form.discussion.html b/foundation/www/docs/current/api/regional/united_arab_emirates/erpnext.regional.united_arab_emirates.html similarity index 59% rename from foundation/www/docs/current/api/schools/web_form/discussion/erpnext.schools.web_form.discussion.html rename to foundation/www/docs/current/api/regional/united_arab_emirates/erpnext.regional.united_arab_emirates.html index 32bf4244..f70975f9 100644 --- a/foundation/www/docs/current/api/schools/web_form/discussion/erpnext.schools.web_form.discussion.html +++ b/foundation/www/docs/current/api/regional/united_arab_emirates/erpnext.regional.united_arab_emirates.html @@ -1,12 +1,12 @@ - -

erpnext.schools.web_form.discussion

+ +

erpnext.regional.united_arab_emirates

- Version 8.11.4 + Version 10.0.2 - Source
diff --git a/foundation/www/docs/current/api/regional/united_arab_emirates/erpnext.regional.united_arab_emirates.setup.html b/foundation/www/docs/current/api/regional/united_arab_emirates/erpnext.regional.united_arab_emirates.setup.html new file mode 100644 index 00000000..21520e11 --- /dev/null +++ b/foundation/www/docs/current/api/regional/united_arab_emirates/erpnext.regional.united_arab_emirates.setup.html @@ -0,0 +1,68 @@ + +

erpnext.regional.united_arab_emirates.setup

+
+ + + Version 10.0.2 + + + Source + +
+ + + + + + + + + +

+ + + erpnext.regional.united_arab_emirates.setup.add_print_formats + () +

+

No docs

+
+
+ + + + + + + +

+ + + erpnext.regional.united_arab_emirates.setup.make_custom_fields + () +

+

No docs

+
+
+ + + + + + + +

+ + + erpnext.regional.united_arab_emirates.setup.setup + (company=None, patch=True) +

+

No docs

+
+
+ + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/regional/united_arab_emirates/index.html b/foundation/www/docs/current/api/regional/united_arab_emirates/index.html new file mode 100644 index 00000000..74c3d1a2 --- /dev/null +++ b/foundation/www/docs/current/api/regional/united_arab_emirates/index.html @@ -0,0 +1,22 @@ + + + + + +

united_arab_emirates

+
+ + + Version 10.0.2 + + + Source + +
+ +

Package Contents

+ +{index} + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/regional/united_arab_emirates/index.txt b/foundation/www/docs/current/api/regional/united_arab_emirates/index.txt new file mode 100644 index 00000000..9a8d50bb --- /dev/null +++ b/foundation/www/docs/current/api/regional/united_arab_emirates/index.txt @@ -0,0 +1,2 @@ +erpnext.regional.united_arab_emirates.setup +erpnext.regional.united_arab_emirates \ No newline at end of file diff --git a/foundation/www/docs/current/api/restaurant/_sidebar.json b/foundation/www/docs/current/api/restaurant/_sidebar.json new file mode 100644 index 00000000..88f5aab5 --- /dev/null +++ b/foundation/www/docs/current/api/restaurant/_sidebar.json @@ -0,0 +1,22 @@ +[ + { + "route": "/docs", + "title": "Docs Home" + }, + { + "route": "/docs/user", + "title": "User Guide" + }, + { + "route": "/docs/current/api", + "title": "Server API" + }, + { + "route": "/docs/current/models", + "title": "Models (Reference)" + }, + { + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "title": "Improve Docs" + } +] \ No newline at end of file diff --git a/foundation/www/docs/current/api/restaurant/erpnext.restaurant.html b/foundation/www/docs/current/api/restaurant/erpnext.restaurant.html new file mode 100644 index 00000000..8f2f3c0b --- /dev/null +++ b/foundation/www/docs/current/api/restaurant/erpnext.restaurant.html @@ -0,0 +1,20 @@ + +

erpnext.restaurant

+
+ + + Version 10.0.2 + + + Source + +
+ + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/restaurant/index.html b/foundation/www/docs/current/api/restaurant/index.html new file mode 100644 index 00000000..65c37669 --- /dev/null +++ b/foundation/www/docs/current/api/restaurant/index.html @@ -0,0 +1,22 @@ + + + + + +

restaurant

+
+ + + Version 10.0.2 + + + Source + +
+ +

Package Contents

+ +{index} + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/restaurant/index.txt b/foundation/www/docs/current/api/restaurant/index.txt new file mode 100644 index 00000000..544988bb --- /dev/null +++ b/foundation/www/docs/current/api/restaurant/index.txt @@ -0,0 +1 @@ +erpnext.restaurant \ No newline at end of file diff --git a/foundation/www/docs/current/api/schools/index.txt b/foundation/www/docs/current/api/schools/index.txt deleted file mode 100644 index 27ade03b..00000000 --- a/foundation/www/docs/current/api/schools/index.txt +++ /dev/null @@ -1,3 +0,0 @@ -erpnext.schools -erpnext.schools.api -erpnext.schools.utils \ No newline at end of file diff --git a/foundation/www/docs/current/api/schools/web_form/discussion/erpnext.schools.web_form.discussion.discussion.html b/foundation/www/docs/current/api/schools/web_form/discussion/erpnext.schools.web_form.discussion.discussion.html deleted file mode 100644 index 4b8f7e0d..00000000 --- a/foundation/www/docs/current/api/schools/web_form/discussion/erpnext.schools.web_form.discussion.discussion.html +++ /dev/null @@ -1,52 +0,0 @@ - -

erpnext.schools.web_form.discussion.discussion

-
- - - Version 8.11.4 - - - Source - -
- - - - - - - - - -

- - - erpnext.schools.web_form.discussion.discussion.get_context - (context=None) -

-

No docs

-
-
- - - - - - - -

- - - erpnext.schools.web_form.discussion.discussion.has_website_permission - (doc, ptype, user, verbose=False) -

-

No docs

-
-
- - - - - - \ No newline at end of file diff --git a/foundation/www/docs/current/api/schools/web_form/discussion/index.txt b/foundation/www/docs/current/api/schools/web_form/discussion/index.txt deleted file mode 100644 index 1f2a38bc..00000000 --- a/foundation/www/docs/current/api/schools/web_form/discussion/index.txt +++ /dev/null @@ -1,2 +0,0 @@ -erpnext.schools.web_form.discussion.discussion -erpnext.schools.web_form.discussion \ No newline at end of file diff --git a/foundation/www/docs/current/api/schools/web_form/index.txt b/foundation/www/docs/current/api/schools/web_form/index.txt deleted file mode 100644 index bb67e8d8..00000000 --- a/foundation/www/docs/current/api/schools/web_form/index.txt +++ /dev/null @@ -1 +0,0 @@ -erpnext.schools.web_form \ No newline at end of file diff --git a/foundation/www/docs/current/api/schools/web_form/student_applicant/index.txt b/foundation/www/docs/current/api/schools/web_form/student_applicant/index.txt deleted file mode 100644 index a2434bea..00000000 --- a/foundation/www/docs/current/api/schools/web_form/student_applicant/index.txt +++ /dev/null @@ -1,2 +0,0 @@ -erpnext.schools.web_form.student_applicant.student_applicant -erpnext.schools.web_form.student_applicant \ No newline at end of file diff --git a/foundation/www/docs/current/api/selling/erpnext.selling.html b/foundation/www/docs/current/api/selling/erpnext.selling.html index 69f8f47a..1100d3cc 100644 --- a/foundation/www/docs/current/api/selling/erpnext.selling.html +++ b/foundation/www/docs/current/api/selling/erpnext.selling.html @@ -3,7 +3,7 @@
- Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 + + + erpnext.setup.utils.insert_record + (records) +

+

No docs

+
+
+ + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/setup/index.html b/foundation/www/docs/current/api/setup/index.html index 9dd1df33..8af3d0d0 100644 --- a/foundation/www/docs/current/api/setup/index.html +++ b/foundation/www/docs/current/api/setup/index.html @@ -7,7 +7,7 @@
- Version 8.11.4 + Version 10.0.2 +

erpnext.setup.setup_wizard.data

+
+ + + Version 10.0.2 + + + Source + +
+ + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/setup/setup_wizard/data/erpnext.setup.setup_wizard.data.industry_type.html b/foundation/www/docs/current/api/setup/setup_wizard/data/erpnext.setup.setup_wizard.data.industry_type.html new file mode 100644 index 00000000..357e046d --- /dev/null +++ b/foundation/www/docs/current/api/setup/setup_wizard/data/erpnext.setup.setup_wizard.data.industry_type.html @@ -0,0 +1,36 @@ + +

erpnext.setup.setup_wizard.data.industry_type

+
+ + + Version 10.0.2 + + + Source + +
+ + + + + + + + + +

+ + + erpnext.setup.setup_wizard.data.industry_type.get_industry_types + () +

+

No docs

+
+
+ + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/setup/setup_wizard/data/index.html b/foundation/www/docs/current/api/setup/setup_wizard/data/index.html new file mode 100644 index 00000000..659972b4 --- /dev/null +++ b/foundation/www/docs/current/api/setup/setup_wizard/data/index.html @@ -0,0 +1,22 @@ + + + + + +

data

+
+ + + Version 10.0.2 + + + Source + +
+ +

Package Contents

+ +{index} + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/setup/setup_wizard/data/index.txt b/foundation/www/docs/current/api/setup/setup_wizard/data/index.txt new file mode 100644 index 00000000..0254b4b7 --- /dev/null +++ b/foundation/www/docs/current/api/setup/setup_wizard/data/index.txt @@ -0,0 +1,2 @@ +erpnext.setup.setup_wizard.data.industry_type +erpnext.setup.setup_wizard.data \ No newline at end of file diff --git a/foundation/www/docs/current/api/setup/setup_wizard/erpnext.setup.setup_wizard.domainify.html b/foundation/www/docs/current/api/setup/setup_wizard/erpnext.setup.setup_wizard.domainify.html deleted file mode 100644 index fc384272..00000000 --- a/foundation/www/docs/current/api/setup/setup_wizard/erpnext.setup.setup_wizard.domainify.html +++ /dev/null @@ -1,164 +0,0 @@ - -

erpnext.setup.setup_wizard.domainify

-
- - - Version 8.11.4 - - - Source - -
- - - - - - - - - -

- - - erpnext.setup.setup_wizard.domainify.get_domain - (domain) -

-

Written as a function to prevent data mutation effects

-
-
- - - - - - - -

- - - erpnext.setup.setup_wizard.domainify.reset - () -

-

No docs

-
-
- - - - - - - -

- - - erpnext.setup.setup_wizard.domainify.set_values - (data) -

-

set values based on data.set_value

-
-
- - - - - - - -

- - - erpnext.setup.setup_wizard.domainify.setup_desktop_icons - (data) -

-

set desktop icons form data.desktop_icons

-
-
- - - - - - - -

- - - erpnext.setup.setup_wizard.domainify.setup_domain - (domain) -

-

Setup roles, desktop icons, properties, values, portal sidebar menu based on domain

-
-
- - - - - - - -

- - - erpnext.setup.setup_wizard.domainify.setup_properties - (data) -

-

No docs

-
-
- - - - - - - -

- - - erpnext.setup.setup_wizard.domainify.setup_roles - (data) -

-

Add, remove roles from data.allow_roles or data.remove_roles

-
-
- - - - - - - -

- - - erpnext.setup.setup_wizard.domainify.setup_sidebar_items - (data) -

-

Enable / disable sidebar items

-
-
- - - - - - - -

- - - erpnext.setup.setup_wizard.domainify.update_module_def_restrict_to_domain - () -

-

set the restrict to domain for the module def

-
-
- - - - - - \ No newline at end of file diff --git a/foundation/www/docs/current/api/setup/setup_wizard/erpnext.setup.setup_wizard.healthcare.html b/foundation/www/docs/current/api/setup/setup_wizard/erpnext.setup.setup_wizard.healthcare.html deleted file mode 100644 index 9bc9ee94..00000000 --- a/foundation/www/docs/current/api/setup/setup_wizard/erpnext.setup.setup_wizard.healthcare.html +++ /dev/null @@ -1,212 +0,0 @@ - -

erpnext.setup.setup_wizard.healthcare

-
- - - Version 8.11.4 - - - Source - -
- - - - - - - - - -

- - - erpnext.setup.setup_wizard.healthcare.create_antibiotics - () -

-

No docs

-
-
- - - - - - - -

- - - erpnext.setup.setup_wizard.healthcare.create_dosage - () -

-

No docs

-
-
- - - - - - - -

- - - erpnext.setup.setup_wizard.healthcare.create_duration - () -

-

No docs

-
-
- - - - - - - -

- - - erpnext.setup.setup_wizard.healthcare.create_healthcare_item_groups - () -

-

No docs

-
-
- - - - - - - -

- - - erpnext.setup.setup_wizard.healthcare.create_lab_test_items - () -

-

No docs

-
-
- - - - - - - -

- - - erpnext.setup.setup_wizard.healthcare.create_lab_test_template - () -

-

No docs

-
-
- - - - - - - -

- - - erpnext.setup.setup_wizard.healthcare.create_medical_departments - () -

-

No docs

-
-
- - - - - - - -

- - - erpnext.setup.setup_wizard.healthcare.create_sensitivity - () -

-

No docs

-
-
- - - - - - - -

- - - erpnext.setup.setup_wizard.healthcare.create_test_uom - () -

-

No docs

-
-
- - - - - - - -

- - - erpnext.setup.setup_wizard.healthcare.insert_record - (records) -

-

No docs

-
-
- - - - - - - -

- - - erpnext.setup.setup_wizard.healthcare.make_custom_fields - () -

-

No docs

-
-
- - - - - - - -

- - - erpnext.setup.setup_wizard.healthcare.setup_healthcare - () -

-

No docs

-
-
- - - - - - \ No newline at end of file diff --git a/foundation/www/docs/current/api/setup/setup_wizard/erpnext.setup.setup_wizard.html b/foundation/www/docs/current/api/setup/setup_wizard/erpnext.setup.setup_wizard.html index 67e533db..0b8f83a1 100644 --- a/foundation/www/docs/current/api/setup/setup_wizard/erpnext.setup.setup_wizard.html +++ b/foundation/www/docs/current/api/setup/setup_wizard/erpnext.setup.setup_wizard.html @@ -3,7 +3,7 @@
- Version 8.11.4 + Version 10.0.2 -

erpnext.setup.setup_wizard.sample_data

-
- - - Version 8.11.4 - - - Source - -
- - - - - - - - - -

- - - erpnext.setup.setup_wizard.sample_data.import_email_alert - () -

-

Import email alert for task start

-
-
- - - - - - - -

- - - erpnext.setup.setup_wizard.sample_data.make_issue - () -

-

No docs

-
-
- - - - - - - -

- - - erpnext.setup.setup_wizard.sample_data.make_material_request - (items) -

-

No docs

-
-
- - - - - - - -

- - - erpnext.setup.setup_wizard.sample_data.make_opportunity - (items, customer) -

-

No docs

-
-
- - - - - - - -

- - - erpnext.setup.setup_wizard.sample_data.make_projects - (domain) -

-

No docs

-
-
- - - - - - - -

- - - erpnext.setup.setup_wizard.sample_data.make_quote - (items, customer) -

-

No docs

-
-
- - - - - - - -

- - - erpnext.setup.setup_wizard.sample_data.make_sample_data - (domain, make_dependent=False) -

-

Create a few opportunities, quotes, material requests, issues, todos, projects - to help the user get started

-
-
- - - - - - - -

- - - erpnext.setup.setup_wizard.sample_data.test_sample - () -

-

No docs

-
-
- - - - - - \ No newline at end of file diff --git a/foundation/www/docs/current/api/setup/setup_wizard/erpnext.setup.setup_wizard.setup_wizard.html b/foundation/www/docs/current/api/setup/setup_wizard/erpnext.setup.setup_wizard.setup_wizard.html index 3bf609e8..79153036 100644 --- a/foundation/www/docs/current/api/setup/setup_wizard/erpnext.setup.setup_wizard.setup_wizard.html +++ b/foundation/www/docs/current/api/setup/setup_wizard/erpnext.setup.setup_wizard.setup_wizard.html @@ -3,7 +3,7 @@
- Version 8.11.4 + Version 10.0.2 - + - erpnext.setup.setup_wizard.setup_wizard.create_academic_term - () -

-

No docs

-
-
- - - - - - - -

- - - erpnext.setup.setup_wizard.setup_wizard.create_academic_year - () -

-

No docs

-
-
- - - - - - - -

- - - erpnext.setup.setup_wizard.setup_wizard.create_bank_account + erpnext.setup.setup_wizard.setup_wizard.fin (args)

No docs

@@ -68,202 +36,10 @@

- + - erpnext.setup.setup_wizard.setup_wizard.create_email_digest - () -

-

No docs

-
-
- - - - - - - -

- - - erpnext.setup.setup_wizard.setup_wizard.create_employee_for_self - (args) -

-

No docs

-
-
- - - - - - - -

- - - erpnext.setup.setup_wizard.setup_wizard.create_feed_and_todo - () -

-

update Activity feed and create todo for creation of item, customer, vendor

-
-
- - - - - - - -

- - - erpnext.setup.setup_wizard.setup_wizard.create_fiscal_year_and_company - (args) -

-

No docs

-
-
- - - - - - - -

- - - erpnext.setup.setup_wizard.setup_wizard.create_letter_head - (args) -

-

No docs

-
-
- - - - - - - -

- - - erpnext.setup.setup_wizard.setup_wizard.create_logo - (args) -

-

No docs

-
-
- - - - - - - -

- - - erpnext.setup.setup_wizard.setup_wizard.create_price_lists - (args) -

-

No docs

-
-
- - - - - - - -

- - - erpnext.setup.setup_wizard.setup_wizard.create_sales_tax - (args) -

-

No docs

-
-
- - - - - - - -

- - - erpnext.setup.setup_wizard.setup_wizard.create_territories - () -

-

create two default territories, one for home country and one named Rest of the World

-
-
- - - - - - - -

- - - erpnext.setup.setup_wizard.setup_wizard.enable_shopping_cart - (args) -

-

No docs

-
-
- - - - - - - -

- - - erpnext.setup.setup_wizard.setup_wizard.get_country_wise_tax - (country) -

-

No docs

-
-
- - - - - - - -

- - - erpnext.setup.setup_wizard.setup_wizard.get_fy_details - (fy_start_date, fy_end_date) -

-

No docs

-
-
- - - - - - - -

- - - erpnext.setup.setup_wizard.setup_wizard.get_tax_account_group - (company) + erpnext.setup.setup_wizard.setup_wizard.get_setup_stages + (args=None)

No docs

@@ -292,10 +68,10 @@

- + - erpnext.setup.setup_wizard.setup_wizard.make_sales_and_purchase_tax_templates - (accounts, template_name=None) + erpnext.setup.setup_wizard.setup_wizard.make_sample_data + (domains)

No docs

@@ -308,41 +84,9 @@

- + - erpnext.setup.setup_wizard.setup_wizard.make_tax_account - (company, account_name, tax_rate) -

-

No docs

-
-
- - - - - - - -

- - - erpnext.setup.setup_wizard.setup_wizard.make_tax_account_and_template - (company, account_name, tax_rate, template_name=None) -

-

No docs

-
-
- - - - - - - -

- - - erpnext.setup.setup_wizard.setup_wizard.set_defaults + erpnext.setup.setup_wizard.setup_wizard.setup_company (args)

No docs

@@ -355,22 +99,6 @@ -

- - - erpnext.setup.setup_wizard.setup_wizard.set_no_copy_fields_in_variant_settings - () -

-

No docs

-
-
- - - - - - -

@@ -388,10 +116,58 @@

- + - erpnext.setup.setup_wizard.setup_wizard.setup_success - (args=None) + erpnext.setup.setup_wizard.setup_wizard.setup_taxes + (args) +

+

No docs

+
+
+ + + + + + + +

+ + + erpnext.setup.setup_wizard.setup_wizard.stage_fixtures + (args) +

+

No docs

+
+
+ + + + + + + +

+ + + erpnext.setup.setup_wizard.setup_wizard.stage_four + (args) +

+

No docs

+
+
+ + + + + + + +

+ + + erpnext.setup.setup_wizard.setup_wizard.stage_three + (args)

No docs

diff --git a/foundation/www/docs/current/api/setup/setup_wizard/erpnext.setup.setup_wizard.test_setup_wizard.html b/foundation/www/docs/current/api/setup/setup_wizard/erpnext.setup.setup_wizard.test_setup_wizard.html index 68f15132..c0128b11 100644 --- a/foundation/www/docs/current/api/setup/setup_wizard/erpnext.setup.setup_wizard.test_setup_wizard.html +++ b/foundation/www/docs/current/api/setup/setup_wizard/erpnext.setup.setup_wizard.test_setup_wizard.html @@ -3,7 +3,7 @@
- Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 +

erpnext.setup.setup_wizard.operations.company_setup

+
+ + + Version 10.0.2 + + + Source + +
+ + + + + + + + + +

+ + + erpnext.setup.setup_wizard.operations.company_setup.create_bank_account + (args) +

+

No docs

+
+
+ + + + + + + +

+ + + erpnext.setup.setup_wizard.operations.company_setup.create_email_digest + () +

+

No docs

+
+
+ + + + + + + +

+ + + erpnext.setup.setup_wizard.operations.company_setup.create_fiscal_year_and_company + (args) +

+

No docs

+
+
+ + + + + + + +

+ + + erpnext.setup.setup_wizard.operations.company_setup.create_logo + (args) +

+

No docs

+
+
+ + + + + + + +

+ + + erpnext.setup.setup_wizard.operations.company_setup.create_website + (args) +

+

No docs

+
+
+ + + + + + + +

+ + + erpnext.setup.setup_wizard.operations.company_setup.enable_shopping_cart + (args) +

+

No docs

+
+
+ + + + + + + +

+ + + erpnext.setup.setup_wizard.operations.company_setup.get_fy_details + (fy_start_date, fy_end_date) +

+

No docs

+
+
+ + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/setup/setup_wizard/erpnext.setup.setup_wizard.default_website.html b/foundation/www/docs/current/api/setup/setup_wizard/operations/erpnext.setup.setup_wizard.operations.default_website.html similarity index 82% rename from foundation/www/docs/current/api/setup/setup_wizard/erpnext.setup.setup_wizard.default_website.html rename to foundation/www/docs/current/api/setup/setup_wizard/operations/erpnext.setup.setup_wizard.operations.default_website.html index 293e17d6..0e9ffe71 100644 --- a/foundation/www/docs/current/api/setup/setup_wizard/erpnext.setup.setup_wizard.default_website.html +++ b/foundation/www/docs/current/api/setup/setup_wizard/operations/erpnext.setup.setup_wizard.operations.default_website.html @@ -1,12 +1,12 @@ - -

erpnext.setup.setup_wizard.default_website

+ +

erpnext.setup.setup_wizard.operations.default_website

- Version 8.11.4 + Version 10.0.2 - Source
@@ -20,9 +20,9 @@

- + - erpnext.setup.setup_wizard.default_website.test + erpnext.setup.setup_wizard.operations.default_website.test ()

No docs

diff --git a/foundation/www/docs/current/api/setup/setup_wizard/operations/erpnext.setup.setup_wizard.operations.defaults_setup.html b/foundation/www/docs/current/api/setup/setup_wizard/operations/erpnext.setup.setup_wizard.operations.defaults_setup.html new file mode 100644 index 00000000..3b7693a1 --- /dev/null +++ b/foundation/www/docs/current/api/setup/setup_wizard/operations/erpnext.setup.setup_wizard.operations.defaults_setup.html @@ -0,0 +1,132 @@ + +

erpnext.setup.setup_wizard.operations.defaults_setup

+
+ + + Version 10.0.2 + + + Source + +
+ + + + + + + + + +

+ + + erpnext.setup.setup_wizard.operations.defaults_setup.create_employee_for_self + (args) +

+

No docs

+
+
+ + + + + + + +

+ + + erpnext.setup.setup_wizard.operations.defaults_setup.create_feed_and_todo + () +

+

update Activity feed and create todo for creation of item, customer, vendor

+
+
+ + + + + + + +

+ + + erpnext.setup.setup_wizard.operations.defaults_setup.create_price_lists + (args) +

+

No docs

+
+
+ + + + + + + +

+ + + erpnext.setup.setup_wizard.operations.defaults_setup.create_territories + () +

+

create two default territories, one for home country and one named Rest of the World

+
+
+ + + + + + + +

+ + + erpnext.setup.setup_wizard.operations.defaults_setup.get_fy_details + (fy_start_date, fy_end_date) +

+

No docs

+
+
+ + + + + + + +

+ + + erpnext.setup.setup_wizard.operations.defaults_setup.set_default_settings + (args) +

+

No docs

+
+
+ + + + + + + +

+ + + erpnext.setup.setup_wizard.operations.defaults_setup.set_no_copy_fields_in_variant_settings + () +

+

No docs

+
+
+ + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/setup/setup_wizard/operations/erpnext.setup.setup_wizard.operations.html b/foundation/www/docs/current/api/setup/setup_wizard/operations/erpnext.setup.setup_wizard.operations.html new file mode 100644 index 00000000..f016e38b --- /dev/null +++ b/foundation/www/docs/current/api/setup/setup_wizard/operations/erpnext.setup.setup_wizard.operations.html @@ -0,0 +1,20 @@ + +

erpnext.setup.setup_wizard.operations

+
+ + + Version 10.0.2 + + + Source + +
+ + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/setup/setup_wizard/erpnext.setup.setup_wizard.install_fixtures.html b/foundation/www/docs/current/api/setup/setup_wizard/operations/erpnext.setup.setup_wizard.operations.install_fixtures.html similarity index 53% rename from foundation/www/docs/current/api/setup/setup_wizard/erpnext.setup.setup_wizard.install_fixtures.html rename to foundation/www/docs/current/api/setup/setup_wizard/operations/erpnext.setup.setup_wizard.operations.install_fixtures.html index df6f7d82..898d3b82 100644 --- a/foundation/www/docs/current/api/setup/setup_wizard/erpnext.setup.setup_wizard.install_fixtures.html +++ b/foundation/www/docs/current/api/setup/setup_wizard/operations/erpnext.setup.setup_wizard.operations.install_fixtures.html @@ -1,12 +1,12 @@ - -

erpnext.setup.setup_wizard.install_fixtures

+ +

erpnext.setup.setup_wizard.operations.install_fixtures

- Version 8.11.4 + Version 10.0.2 - Source
@@ -20,9 +20,9 @@

- + - erpnext.setup.setup_wizard.install_fixtures.install + erpnext.setup.setup_wizard.operations.install_fixtures.install (country=None)

No docs

diff --git a/foundation/www/docs/current/api/setup/setup_wizard/operations/erpnext.setup.setup_wizard.operations.sample_data.html b/foundation/www/docs/current/api/setup/setup_wizard/operations/erpnext.setup.setup_wizard.operations.sample_data.html new file mode 100644 index 00000000..b0c1be03 --- /dev/null +++ b/foundation/www/docs/current/api/setup/setup_wizard/operations/erpnext.setup.setup_wizard.operations.sample_data.html @@ -0,0 +1,149 @@ + +

erpnext.setup.setup_wizard.operations.sample_data

+
+ + + Version 10.0.2 + + + Source + +
+ + + + + + + + + +

+ + + erpnext.setup.setup_wizard.operations.sample_data.import_email_alert + () +

+

Import email alert for task start

+
+
+ + + + + + + +

+ + + erpnext.setup.setup_wizard.operations.sample_data.make_issue + () +

+

No docs

+
+
+ + + + + + + +

+ + + erpnext.setup.setup_wizard.operations.sample_data.make_material_request + (items) +

+

No docs

+
+
+ + + + + + + +

+ + + erpnext.setup.setup_wizard.operations.sample_data.make_opportunity + (items, customer) +

+

No docs

+
+
+ + + + + + + +

+ + + erpnext.setup.setup_wizard.operations.sample_data.make_projects + (domains) +

+

No docs

+
+
+ + + + + + + +

+ + + erpnext.setup.setup_wizard.operations.sample_data.make_quote + (items, customer) +

+

No docs

+
+
+ + + + + + + +

+ + + erpnext.setup.setup_wizard.operations.sample_data.make_sample_data + (domains, make_dependent=False) +

+

Create a few opportunities, quotes, material requests, issues, todos, projects + to help the user get started

+
+
+ + + + + + + +

+ + + erpnext.setup.setup_wizard.operations.sample_data.test_sample + () +

+

No docs

+
+
+ + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/setup/setup_wizard/operations/erpnext.setup.setup_wizard.operations.taxes_setup.html b/foundation/www/docs/current/api/setup/setup_wizard/operations/erpnext.setup.setup_wizard.operations.taxes_setup.html new file mode 100644 index 00000000..6713e026 --- /dev/null +++ b/foundation/www/docs/current/api/setup/setup_wizard/operations/erpnext.setup.setup_wizard.operations.taxes_setup.html @@ -0,0 +1,116 @@ + +

erpnext.setup.setup_wizard.operations.taxes_setup

+
+ + + Version 10.0.2 + + + Source + +
+ + + + + + + + + +

+ + + erpnext.setup.setup_wizard.operations.taxes_setup.create_sales_tax + (args) +

+

No docs

+
+
+ + + + + + + +

+ + + erpnext.setup.setup_wizard.operations.taxes_setup.get_country_wise_tax + (country) +

+

No docs

+
+
+ + + + + + + +

+ + + erpnext.setup.setup_wizard.operations.taxes_setup.get_tax_account_group + (company) +

+

No docs

+
+
+ + + + + + + +

+ + + erpnext.setup.setup_wizard.operations.taxes_setup.make_sales_and_purchase_tax_templates + (accounts, template_name=None) +

+

No docs

+
+
+ + + + + + + +

+ + + erpnext.setup.setup_wizard.operations.taxes_setup.make_tax_account + (company, account_name, tax_rate) +

+

No docs

+
+
+ + + + + + + +

+ + + erpnext.setup.setup_wizard.operations.taxes_setup.make_tax_account_and_template + (company, account_name, tax_rate, template_name=None) +

+

No docs

+
+
+ + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/setup/setup_wizard/operations/index.html b/foundation/www/docs/current/api/setup/setup_wizard/operations/index.html new file mode 100644 index 00000000..d142f630 --- /dev/null +++ b/foundation/www/docs/current/api/setup/setup_wizard/operations/index.html @@ -0,0 +1,22 @@ + + + + + +

operations

+
+ + + Version 10.0.2 + + + Source + +
+ +

Package Contents

+ +{index} + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/setup/setup_wizard/operations/index.txt b/foundation/www/docs/current/api/setup/setup_wizard/operations/index.txt new file mode 100644 index 00000000..bc79b0f6 --- /dev/null +++ b/foundation/www/docs/current/api/setup/setup_wizard/operations/index.txt @@ -0,0 +1,7 @@ +erpnext.setup.setup_wizard.operations.default_website +erpnext.setup.setup_wizard.operations.defaults_setup +erpnext.setup.setup_wizard.operations.sample_data +erpnext.setup.setup_wizard.operations.company_setup +erpnext.setup.setup_wizard.operations.taxes_setup +erpnext.setup.setup_wizard.operations.install_fixtures +erpnext.setup.setup_wizard.operations \ No newline at end of file diff --git a/foundation/www/docs/current/api/shopping_cart/erpnext.shopping_cart.cart.html b/foundation/www/docs/current/api/shopping_cart/erpnext.shopping_cart.cart.html index 9b0db2d8..543f6ada 100644 --- a/foundation/www/docs/current/api/shopping_cart/erpnext.shopping_cart.cart.html +++ b/foundation/www/docs/current/api/shopping_cart/erpnext.shopping_cart.cart.html @@ -3,7 +3,7 @@
- Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 -

erpnext.shopping_cart.product

-
- - - Version 8.11.4 - - - Source - -
- - - - - - - - - -

- - - erpnext.shopping_cart.product.get_price - (item_code, template_item_code, price_list, qty=1) -

-

No docs

-
-
- - - - - - -

Public API -
/api/method/erpnext.shopping_cart.product.get_product_info -

-

- - - erpnext.shopping_cart.product.get_product_info - (item_code) -

-

get product price / stock info

-
-
- - - - - - - -

- - - erpnext.shopping_cart.product.get_qty_in_stock - (item_code, template_item_code) -

-

No docs

-
-
- - - - - - \ No newline at end of file diff --git a/foundation/www/docs/current/api/shopping_cart/erpnext.shopping_cart.product_info.html b/foundation/www/docs/current/api/shopping_cart/erpnext.shopping_cart.product_info.html new file mode 100644 index 00000000..6a697066 --- /dev/null +++ b/foundation/www/docs/current/api/shopping_cart/erpnext.shopping_cart.product_info.html @@ -0,0 +1,38 @@ + +

erpnext.shopping_cart.product_info

+
+ + + Version 10.0.2 + + + Source + +
+ + + + + + + + +

Public API +
/api/method/erpnext.shopping_cart.product_info.get_product_info_for_website +

+

+ + + erpnext.shopping_cart.product_info.get_product_info_for_website + (item_code) +

+

get product price / stock info for website

+
+
+ + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/shopping_cart/erpnext.shopping_cart.test_shopping_cart.html b/foundation/www/docs/current/api/shopping_cart/erpnext.shopping_cart.test_shopping_cart.html index ed9d6aa4..6a1553c7 100644 --- a/foundation/www/docs/current/api/shopping_cart/erpnext.shopping_cart.test_shopping_cart.html +++ b/foundation/www/docs/current/api/shopping_cart/erpnext.shopping_cart.test_shopping_cart.html @@ -3,7 +3,7 @@
- Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 get_basic_details (args, item)

-

No docs

+

Parameters:

+ +
    +

  • args - {

    + +
        "item_code": "",
+    "warehouse": None,
+    "customer": "",
+    "conversion_rate": 1.0,
+    "selling_price_list": None,
+    "price_list_currency": None,
+    "price_list_uom_dependant": None,
+    "plc_conversion_rate": 1.0,
+    "doctype": "",
+    "name": "",
+    "supplier": None,
+    "transaction_date": None,
+    "conversion_rate": 1.0,
+    "buying_price_list": None,
+    "is_subcontracted": "Yes" / "No",
+    "ignore_pricing_rule": 0/1
+    "project": "",
+    barcode: "",
+    serial_no: "",
+    warehouse: "",
+    currency: "",
+    update_stock: "",
+    price_list: "",
+    company: "",
+    order_type: "",
+    is_pos: "",
+    ignore_pricing_rule: "",
+    project: "",
+    qty: "",
+    stock_qty: "",
+    conversion_factor: ""
+}
+
    • +
+ +

Parameters:

+ +
    +

  • item - item_code of Item object

    + +

    :return: frappe._dict

    • +

@@ -325,7 +372,7 @@ erpnext.stock.get_item_details.get_pos_profile - (company) + (company, pos_profile=None, user=None)

No docs

@@ -416,6 +463,22 @@ + +

+ + + erpnext.stock.get_item_details.get_price_list_uom_dependant + (price_list) +

+

No docs

+
+
+ + + + + +

Public API
/api/method/erpnext.stock.get_item_details.get_projected_qty

diff --git a/foundation/www/docs/current/api/stock/erpnext.stock.html b/foundation/www/docs/current/api/stock/erpnext.stock.html index fa64ee10..9e1bcd27 100644 --- a/foundation/www/docs/current/api/stock/erpnext.stock.html +++ b/foundation/www/docs/current/api/stock/erpnext.stock.html @@ -3,7 +3,7 @@
- Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 +

erpnext.utilities.product

+
+ + + Version 10.0.2 + + + Source + +
+ + + + + + + + + +

+ + + erpnext.utilities.product.get_price + (item_code, price_list, customer_group, company, qty=1) +

+

No docs

+
+
+ + + + + + + +

+ + + erpnext.utilities.product.get_qty_in_stock + (item_code, item_warehouse_field) +

+

No docs

+
+
+ + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/utilities/erpnext.utilities.transaction_base.html b/foundation/www/docs/current/api/utilities/erpnext.utilities.transaction_base.html index eca7e454..7079fe25 100644 --- a/foundation/www/docs/current/api/utilities/erpnext.utilities.transaction_base.html +++ b/foundation/www/docs/current/api/utilities/erpnext.utilities.transaction_base.html @@ -3,7 +3,7 @@
- Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 Public API +
/api/method/erpnext.utilities.user_progress_utils.create_letterhead +

+

+ + + erpnext.utilities.user_progress_utils.create_letterhead + (args_data) +

+

No docs

+
+
+ + + + + +

Public API
/api/method/erpnext.utilities.user_progress_utils.create_program

diff --git a/foundation/www/docs/current/api/utilities/index.html b/foundation/www/docs/current/api/utilities/index.html index bf61121e..da85a583 100644 --- a/foundation/www/docs/current/api/utilities/index.html +++ b/foundation/www/docs/current/api/utilities/index.html @@ -7,7 +7,7 @@
- Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - 8.11.4 + 10.0.2 diff --git a/foundation/www/docs/current/models/accounts/account.html b/foundation/www/docs/current/models/accounts/account.html index 60743a51..45383ee7 100644 --- a/foundation/www/docs/current/models/accounts/account.html +++ b/foundation/www/docs/current/models/accounts/account.html @@ -9,7 +9,7 @@
- Version 8.11.4 + Version 10.0.2 4 + account_number + + Data + + Account Number + + + + + + + 5 is_group Check @@ -89,7 +101,7 @@ Heads (or groups) against which Accounting Entries are made and balances are mai - 5 + 6 company Link @@ -110,7 +122,7 @@ Heads (or groups) against which Accounting Entries are made and balances are mai - 6 + 7 root_type Select @@ -129,7 +141,7 @@ Equity - 7 + 8 report_type Select @@ -145,7 +157,7 @@ Profit and Loss - 8 + 9 account_currency Link @@ -166,7 +178,7 @@ Profit and Loss - 9 + 10 column_break1 Column Break @@ -178,7 +190,7 @@ Profit and Loss - 10 + 11 parent_account Link @@ -199,7 +211,7 @@ Profit and Loss - 11 + 12 account_type Select @@ -233,7 +245,7 @@ Temporary - 12 + 13 tax_rate Float @@ -246,7 +258,7 @@ Temporary - 13 + 14 freeze_account Select @@ -262,7 +274,7 @@ Yes - 14 + 15 balance_must_be Select @@ -278,7 +290,7 @@ Credit - 15 + 16 lft Int @@ -290,7 +302,7 @@ Credit - 16 + 17 rgt Int @@ -302,7 +314,7 @@ Credit - 17 + 18 old_parent Data @@ -329,7 +341,7 @@ Credit

Class Account

-

Inherits from frappe.model.document.Document +

Inherits from frappe.utils.nestedset.NestedSet

@@ -450,20 +462,6 @@ Credit -

- - - on_update - (self) -

-

No docs

-
-
- - - - -

@@ -492,20 +490,6 @@ Credit -

- - - update_nsm_model - (self) -

-

update lft, rgt indices for nested set model

-
-
- - - - -

@@ -615,20 +599,6 @@ Credit
- - - -

- - - validate_trash - (self) -

-

checks gl entries and if child exists

-
-
- -
@@ -668,6 +638,22 @@ Credit +

+ + + erpnext.accounts.doctype.account.account.get_account_autoname + (account_number, account_name, company) +

+

No docs

+
+
+ + + + + + +

@@ -684,6 +670,22 @@ Credit +

+ + + erpnext.accounts.doctype.account.account.get_name_with_number + (new_account, account_number) +

+

No docs

+
+
+ + + + + + +

@@ -696,6 +698,40 @@ Credit + + + +

Public API +
/api/method/erpnext.accounts.doctype.account.account.update_account_number +

+

+ + + erpnext.accounts.doctype.account.account.update_account_number + (name, account_number) +

+

No docs

+
+
+ + + + + + + +

+ + + erpnext.accounts.doctype.account.account.validate_account_number + (name, account_number, company) +

+

No docs

+
+
+ + + @@ -715,7 +751,7 @@ Credit
  • -Asset Category Account +Asset Category Account
    • @@ -766,6 +802,15 @@ Credit +
  • + + +Employee Advance + +
    • + + +
  • @@ -793,6 +838,15 @@ Credit +
  • + + +Expense Claim Advance + +
    • + + +
  • @@ -805,7 +859,7 @@ Credit
  • -Fee Schedule +Fee Schedule
    • @@ -814,7 +868,7 @@ Credit
  • -Fee Structure +Fee Structure
    • @@ -823,7 +877,7 @@ Credit
  • -Fees +Fees
    • @@ -883,6 +937,15 @@ Credit +
  • + + +Opening Invoice Creation Tool Item + +
    • + + +
  • @@ -928,6 +991,15 @@ Credit +
  • + + +Payroll Entry + +
    • + + +
  • @@ -946,15 +1018,6 @@ Credit -
  • - - -Process Payroll - -
    • - - -
  • @@ -991,6 +1054,15 @@ Credit +
  • + + +Salary Slip Loan + +
    • + + +
  • diff --git a/foundation/www/docs/current/models/accounts/accounts_settings.html b/foundation/www/docs/current/models/accounts/accounts_settings.html index 8344cca7..866163d4 100644 --- a/foundation/www/docs/current/models/accounts/accounts_settings.html +++ b/foundation/www/docs/current/models/accounts/accounts_settings.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 - + 10 + show_payment_schedule_in_print + + Check + + Show Payment Schedule in Print + + + + + + + 11 currency_exchange_section Section Break @@ -181,7 +193,7 @@ Settings for Accounts - 11 + 12 allow_stale Check @@ -193,7 +205,7 @@ Settings for Accounts - 12 + 13 stale_days Int @@ -229,6 +241,20 @@ Settings for Accounts +

    + + + enable_payment_schedule_in_print + (self) +

    +

    No docs

    +
    +
    + + + + +

    diff --git a/foundation/www/docs/current/models/accounts/bank_guarantee.html b/foundation/www/docs/current/models/accounts/bank_guarantee.html index 9c035d33..1555ca11 100644 --- a/foundation/www/docs/current/models/accounts/bank_guarantee.html +++ b/foundation/www/docs/current/models/accounts/bank_guarantee.html @@ -9,7 +9,7 @@

    - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 1 - column_break0 - - Column Break - - - - - - - - - 2 naming_series Select @@ -67,7 +55,7 @@ - 3 + 2 c_form_no Data @@ -79,7 +67,7 @@ - 4 + 3 received_date Date @@ -91,7 +79,7 @@ - 5 + 4 customer Link @@ -112,7 +100,7 @@ - 6 + 5 column_break1 Column Break @@ -124,7 +112,7 @@ - 7 + 6 company Link @@ -145,7 +133,7 @@ - 8 + 7 quarter Select @@ -163,7 +151,7 @@ IV - 9 + 8 total_amount Currency @@ -177,7 +165,7 @@ IV - 10 + 9 state Data @@ -189,7 +177,7 @@ IV - 11 + 10 section_break0 Section Break @@ -201,7 +189,7 @@ IV - 12 + 11 invoices Table @@ -222,7 +210,7 @@ IV - 13 + 12 total_invoiced_amount Currency @@ -236,7 +224,7 @@ IV - 14 + 13 amended_from Link diff --git a/foundation/www/docs/current/models/accounts/c_form_invoice_detail.html b/foundation/www/docs/current/models/accounts/c_form_invoice_detail.html index 6e3bb072..4d9d92a2 100644 --- a/foundation/www/docs/current/models/accounts/c_form_invoice_detail.html +++ b/foundation/www/docs/current/models/accounts/c_form_invoice_detail.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 -Fee Schedule +Fee Schedule
    • @@ -392,7 +392,7 @@ Track separate Income and Expense for product verticals or divisions.
  • -Fee Structure +Fee Structure
    • @@ -401,7 +401,7 @@ Track separate Income and Expense for product verticals or divisions.
  • -Fees +Fees
    • @@ -464,7 +464,7 @@ Track separate Income and Expense for product verticals or divisions.
  • -POS Profile +Payroll Entry
    • @@ -473,7 +473,7 @@ Track separate Income and Expense for product verticals or divisions.
  • -Process Payroll +POS Profile
    • diff --git a/foundation/www/docs/current/models/accounts/fiscal_year.html b/foundation/www/docs/current/models/accounts/fiscal_year.html index 2df4779e..071c3fe5 100644 --- a/foundation/www/docs/current/models/accounts/fiscal_year.html +++ b/foundation/www/docs/current/models/accounts/fiscal_year.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 __init__ - (self, arg1, arg2=None) + (self)

    No docs

    @@ -1439,7 +1439,7 @@ Yes
  • -Asset +Asset
    • @@ -1448,7 +1448,7 @@ Yes
  • -Depreciation Schedule +Depreciation Schedule
    • diff --git a/foundation/www/docs/current/models/accounts/journal_entry_account.html b/foundation/www/docs/current/models/accounts/journal_entry_account.html index f2642b73..5cf226c1 100644 --- a/foundation/www/docs/current/models/accounts/journal_entry_account.html +++ b/foundation/www/docs/current/models/accounts/journal_entry_account.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 +Employee Loan +Payroll Entry +Employee Advance diff --git a/foundation/www/docs/current/models/accounts/mode_of_payment.html b/foundation/www/docs/current/models/accounts/mode_of_payment.html index ec662776..12cdacb4 100644 --- a/foundation/www/docs/current/models/accounts/mode_of_payment.html +++ b/foundation/www/docs/current/models/accounts/mode_of_payment.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2
  • +Employee Advance + +
    • + + + +
  • + + Employee Loan
    • diff --git a/foundation/www/docs/current/models/accounts/mode_of_payment_account.html b/foundation/www/docs/current/models/accounts/mode_of_payment_account.html index 631a6b50..7af5b3b9 100644 --- a/foundation/www/docs/current/models/accounts/mode_of_payment_account.html +++ b/foundation/www/docs/current/models/accounts/mode_of_payment_account.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 + + + + + + +

    Opening Invoice Creation Tool

    +
    + + + Version 10.0.2 + + + Source + +
    + +Single + + + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1company + Link + Company + + + + + + +Company + + + +
    2invoice_type + Select + Invoice Type + + + 
    Sales
+Purchase
    +
    3section_break_4 + Section Break + Invoices + +
    4invoices + Table + + + + + + + +Opening Invoice Creation Tool Item + + + +
    + + +
    +

    Controller

    +

    erpnext.accounts.doctype.opening_invoice_creation_tool.opening_invoice_creation_tool

    + + + + + + + +

    Class OpeningInvoiceCreationTool

    + +

    Inherits from frappe.model.document.Document + +

    +
    +
    + + + + +

    + + + get_invoice_dict + (self, row=None) +

    +

    No docs

    +
    +
    + + + + + +

    + + + get_opening_invoice_summary + (self) +

    +

    No docs

    +
    +
    + + + + + +

    + + + make_invoices + (self) +

    +

    No docs

    +
    +
    + + + + + +

    + + + onload + (self) +

    +

    Load the Opening Invoice summary

    +
    +
    + + +
    +
    + + + + + + +

    Public API +
    /api/method/erpnext.accounts.doctype.opening_invoice_creation_tool.opening_invoice_creation_tool.get_temporary_opening_account +

    +

    + + + erpnext.accounts.doctype.opening_invoice_creation_tool.opening_invoice_creation_tool.get_temporary_opening_account + (company=None) +

    +

    No docs

    +
    +
    + + + + + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/accounts/opening_invoice_creation_tool_item.html b/foundation/www/docs/current/models/accounts/opening_invoice_creation_tool_item.html new file mode 100644 index 00000000..da603406 --- /dev/null +++ b/foundation/www/docs/current/models/accounts/opening_invoice_creation_tool_item.html @@ -0,0 +1,217 @@ + + + + + + + +

    Opening Invoice Creation Tool Item

    +
    + + + Version 10.0.2 + + + Source + +
    + + +Child Table + + +

    Table Name: tabOpening Invoice Creation Tool Item

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1party_type + Link + Party Type + + + + + + +DocType + + + +
    2party + Dynamic Link + Party + + + 
    party_type
    +
    3temporary_opening_account + Link + Temporary Opening Account + + + + + + +Account + + + +
    4column_break_3 + Column Break + + +
    5posting_date + Date + Posting Date + +
    6due_date + Date + Due Date + +
    7section_break_5 + Section Break + + +
    8item_name + Data + Item Name + +
    9outstanding_amount + Currency + Outstanding Amount + +
    10column_break_4 + Column Break + + +
    11qty + Data + Quantity + +
    + + + + +

    Child Table Of

    + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/accounts/party_account.html b/foundation/www/docs/current/models/accounts/party_account.html index 0bc5f18a..fe5d9ea7 100644 --- a/foundation/www/docs/current/models/accounts/party_account.html +++ b/foundation/www/docs/current/models/accounts/party_account.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 erpnext.accounts.doctype.payment_entry.payment_entry.get_negative_outstanding_invoices - (party_type, party, party_account, total_field) + (party_type, party, party_account, party_account_currency, company_currency)

    No docs

    @@ -1481,6 +1481,22 @@ Internal Transfer + +

    + + + erpnext.accounts.doctype.payment_entry.payment_entry.get_paid_amount + (dt, dn, party_type, party, account, due_date) +

    +

    No docs

    +
    +
    + + + + + +

    Public API
    /api/method/erpnext.accounts.doctype.payment_entry.payment_entry.get_party_details

    diff --git a/foundation/www/docs/current/models/accounts/payment_entry_deduction.html b/foundation/www/docs/current/models/accounts/payment_entry_deduction.html index 3322d822..82c8efcf 100644 --- a/foundation/www/docs/current/models/accounts/payment_entry_deduction.html +++ b/foundation/www/docs/current/models/accounts/payment_entry_deduction.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 + + + + + + +

    Payment Schedule

    +
    + + + Version 10.0.2 + + + Source + +
    + + +Child Table + + +

    Table Name: tabPayment Schedule

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1payment_term + Link + Payment Term + + + + + + +Payment Term + + + +
    2description + Small Text + Description + + + 
    payment_term.description
    +
    3due_date + Date + Due Date + +
    4invoice_portion + Percent + Invoice Portion + + + 
    payment_term.invoice_portion
    +
    5payment_amount + Currency + Payment Amount + + + 
    currency
    +
    + + + + +

    Child Table Of

    + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/accounts/payment_term.html b/foundation/www/docs/current/models/accounts/payment_term.html new file mode 100644 index 00000000..35d009bd --- /dev/null +++ b/foundation/www/docs/current/models/accounts/payment_term.html @@ -0,0 +1,200 @@ + + + + + + + +

    Payment Term

    +
    + + + Version 10.0.2 + + + Source + +
    + + + + + +

    Table Name: tabPayment Term

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1payment_term_name + Data + Payment Term Name + +
    2invoice_portion + Float + Invoice Portion + +
    3column_break_3 + Column Break + + +
    4due_date_based_on + Select + Due Date Based On + + + 
    Day(s) after invoice date
+Day(s) after the end of the invoice month
+Month(s) after the end of the invoice month
    +
    5credit_days + Int + Credit Days + +
    6credit_months + Int + Credit Months + +
    7section_break_6 + Section Break + + +
    8description + Small Text + Description + +
    + + +
    +

    Controller

    +

    erpnext.accounts.doctype.payment_term.payment_term

    + + + + + + + +

    Class PaymentTerm

    + +

    Inherits from frappe.model.document.Document + +

    +
    +
    + +
    +
    + + + + + + +

    Linked In:

    + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/accounts/payment_terms_template.html b/foundation/www/docs/current/models/accounts/payment_terms_template.html new file mode 100644 index 00000000..8ce248be --- /dev/null +++ b/foundation/www/docs/current/models/accounts/payment_terms_template.html @@ -0,0 +1,243 @@ + + + + + + + +

    Payment Terms Template

    +
    + + + Version 10.0.2 + + + Source + +
    + + + + + +

    Table Name: tabPayment Terms Template

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1template_name + Data + Template Name + +
    2terms + Table + Payment Terms + + + + + + +Payment Terms Template Detail + + + +
    + + +
    +

    Controller

    +

    erpnext.accounts.doctype.payment_terms_template.payment_terms_template

    + + + + + + + +

    Class PaymentTermsTemplate

    + +

    Inherits from frappe.model.document.Document + +

    +
    +
    + + + + +

    + + + check_duplicate_terms + (self) +

    +

    No docs

    +
    +
    + + + + + +

    + + + validate + (self) +

    +

    No docs

    +
    +
    + + + + + +

    + + + validate_credit_days + (self) +

    +

    No docs

    +
    +
    + + + + + +

    + + + validate_invoice_portion + (self) +

    +

    No docs

    +
    +
    + + +
    +
    + + + + + + +

    Linked In:

    + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/accounts/payment_terms_template_detail.html b/foundation/www/docs/current/models/accounts/payment_terms_template_detail.html new file mode 100644 index 00000000..5857d06a --- /dev/null +++ b/foundation/www/docs/current/models/accounts/payment_terms_template_detail.html @@ -0,0 +1,150 @@ + + + + + + + +

    Payment Terms Template Detail

    +
    + + + Version 10.0.2 + + + Source + +
    + + +Child Table + + +

    Table Name: tabPayment Terms Template Detail

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1payment_term + Link + Payment Term + + + + + + +Payment Term + + + +
    2description + Small Text + Description + +
    3invoice_portion + Percent + Invoice Portion + +
    4due_date_based_on + Select + Due Date Based On + + + 
    Day(s) after invoice date
+Day(s) after the end of the invoice month
+Month(s) after the end of the invoice month
    +
    5credit_days + Int + Credit Days + +
    6credit_months + Int + Credit Months + +
    + + + + +

    Child Table Of

    + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/accounts/period_closing_voucher.html b/foundation/www/docs/current/models/accounts/period_closing_voucher.html index a276c588..5959a1f8 100644 --- a/foundation/www/docs/current/models/accounts/period_closing_voucher.html +++ b/foundation/www/docs/current/models/accounts/period_closing_voucher.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 1 - column_break0 - - Column Break - - - - - - - - - 2 transaction_date Date @@ -65,7 +53,7 @@ - 3 + 2 posting_date Date @@ -77,7 +65,7 @@ - 4 + 3 fiscal_year Link @@ -98,7 +86,7 @@ - 5 + 4 amended_from Link @@ -119,7 +107,7 @@ - 6 + 5 company Link @@ -140,7 +128,7 @@ - 7 + 6 column_break1 Column Break @@ -152,7 +140,7 @@ - 8 + 7 closing_account_head Link @@ -174,7 +162,7 @@ - 9 + 8 remarks Small Text diff --git a/foundation/www/docs/current/models/accounts/pos_customer_group.html b/foundation/www/docs/current/models/accounts/pos_customer_group.html index faa6e0d7..58f43660 100644 --- a/foundation/www/docs/current/models/accounts/pos_customer_group.html +++ b/foundation/www/docs/current/models/accounts/pos_customer_group.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 1 - user + disabled - Link + Check - Applicable for User + Disabled - + + + + + 2 + section_break_2 + + Section Break + - - -User - - - + - 2 + 3 + pos_profile_name + + Data + + POS Profile Name + + + + + + + 4 naming_series Select @@ -76,7 +91,7 @@ - 3 + 5 update_stock Check @@ -87,50 +102,56 @@ - - 4 - warehouse - - Link - - Warehouse - - - - - - - -Warehouse - - - - - - - - 5 - campaign - - Link - - Campaign - - - - - - - -Campaign - - - - - - 6 + ignore_pricing_rule + + Check + + Ignore Pricing Rule + + + + + + + 7 + allow_delete + + Check + + Allow Delete + + + + + + + 8 + allow_user_to_edit_rate + + Check + + Allow user to edit Rate + + + + + + + 9 + allow_print_before_pay + + Check + + Allow Print Before Pay + + + + + + + 10 column_break_4 Column Break @@ -142,7 +163,7 @@ - 7 + 11 customer Link @@ -163,7 +184,7 @@ - 8 + 12 company Link @@ -184,7 +205,7 @@ - 9 + 13 country Read Only @@ -198,12 +219,12 @@ - 10 - currency + 14 + warehouse Link - Currency + Warehouse @@ -211,7 +232,7 @@ -Currency +Warehouse @@ -219,43 +240,61 @@ - 11 - ignore_pricing_rule + 15 + campaign - Check + Link - Ignore Pricing Rule + Campaign - - - - - 12 - allow_delete - - Check - - Allow Delete + + + + + +Campaign + + - - - - - 13 - allow_user_to_edit_rate - - Check - - Allow user to edit Rate - - - - 14 + 16 + section_break_15 + + Section Break + + Applicable for Users + + + + + + + 17 + applicable_for_users + + Table + + Applicable for Users + + + + + + + +POS Profile User + + + + + + + + 18 section_break_11 Section Break @@ -267,7 +306,7 @@ - 15 + 19 payments Table @@ -288,7 +327,7 @@ - 16 + 20 section_break_14 Section Break @@ -300,7 +339,7 @@ - 17 + 21 item_groups Table @@ -321,7 +360,7 @@ - 18 + 22 column_break_16 Column Break @@ -333,7 +372,7 @@ - 19 + 23 customer_groups Table @@ -354,7 +393,7 @@ - 20 + 24 section_break_16 Section Break @@ -366,7 +405,7 @@ - 21 + 25 print_format_for_online Link @@ -387,7 +426,7 @@ - 22 + 26 letter_head Link @@ -408,7 +447,7 @@ - 23 + 27 select_print_heading Link @@ -429,7 +468,7 @@ - 24 + 28 column_break0 Column Break @@ -441,7 +480,7 @@ - 25 + 29 selling_price_list Link @@ -462,7 +501,7 @@ - 26 + 30 tc_name Link @@ -483,7 +522,7 @@ - 27 + 31 apply_discount Check @@ -495,7 +534,7 @@ - 28 + 32 apply_discount_on Select @@ -510,7 +549,7 @@ Net Total - 29 + 33 offline_pos_section Section Break @@ -522,7 +561,7 @@ Net Total - 30 + 34 territory Link @@ -543,7 +582,7 @@ Net Total - 31 + 35 column_break_31 Column Break @@ -555,7 +594,7 @@ Net Total - 32 + 36 print_format Link @@ -576,7 +615,7 @@ Net Total - 33 + 37 customer_group Link @@ -597,19 +636,40 @@ Net Total - 34 + 38 section_break_19 Section Break - + Accounting - 35 + 39 + currency + + Link + + Currency + + + + + + + +Currency + + + + + + + + 40 write_off_account Link @@ -630,7 +690,7 @@ Net Total - 36 + 41 write_off_cost_center Link @@ -651,7 +711,7 @@ Net Total - 37 + 42 account_for_change_amount Link @@ -672,28 +732,7 @@ Net Total - 38 - taxes_and_charges - - Link - - Taxes and Charges - - - - - - - -Sales Taxes and Charges Template - - - - - - - - 39 + 43 column_break_23 Column Break @@ -705,7 +744,7 @@ Net Total - 40 + 44 income_account Link @@ -726,7 +765,7 @@ Net Total - 41 + 45 expense_account Link @@ -747,7 +786,7 @@ Net Total - 42 + 46 cost_center Link @@ -764,6 +803,27 @@ Net Total + + + + + 47 + taxes_and_charges + + Link + + Taxes and Charges + + + + + + + +Sales Taxes and Charges Template + + + @@ -820,20 +880,6 @@ Net Total -

    - - - check_for_duplicate - (self) -

    -

    No docs

    -
    -
    - - - - -

    @@ -918,6 +964,20 @@ Net Total +

    + + + validate_default_profile + (self) +

    +

    No docs

    +
    +
    + + + + +

    @@ -937,6 +997,22 @@ Net Total + +

    + + + erpnext.accounts.doctype.pos_profile.pos_profile.get_item_groups + (pos_profile) +

    +

    No docs

    +
    +
    + + + + + +

    Public API
    /api/method/erpnext.accounts.doctype.pos_profile.pos_profile.get_series

    @@ -952,6 +1028,40 @@ Net Total + + + + +

    + + + erpnext.accounts.doctype.pos_profile.pos_profile.pos_profile_query + (doctype, txt, searchfield, start, page_len, filters) +

    +

    No docs

    +
    +
    + + + + + + +

    Public API +
    /api/method/erpnext.accounts.doctype.pos_profile.pos_profile.set_default_profile +

    +

    + + + erpnext.accounts.doctype.pos_profile.pos_profile.set_default_profile + (pos_profile, company) +

    +

    No docs

    +
    +
    + + + diff --git a/foundation/www/docs/current/models/accounts/pos_profile_user.html b/foundation/www/docs/current/models/accounts/pos_profile_user.html new file mode 100644 index 00000000..a9820e8b --- /dev/null +++ b/foundation/www/docs/current/models/accounts/pos_profile_user.html @@ -0,0 +1,110 @@ + + + + + + + +

    POS Profile User

    +
    + + + Version 10.0.2 + + + Source + +
    + + + + + +

    Table Name: tabPOS Profile User

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1default + Check + Default + +
    2user + Link + User + + + + + + +User + + + +
    + + +
    +

    Controller

    +

    erpnext.accounts.doctype.pos_profile_user.pos_profile_user

    + + + + + + + +

    Class POSProfileUser

    + +

    Inherits from frappe.model.document.Document + +

    +
    +
    + +
    +
    + + + + + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/accounts/pos_settings.html b/foundation/www/docs/current/models/accounts/pos_settings.html index afd523eb..540669fe 100644 --- a/foundation/www/docs/current/models/accounts/pos_settings.html +++ b/foundation/www/docs/current/models/accounts/pos_settings.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2
    + + + +

    + + + set_link_for_pos + (self) +

    +

    No docs

    +
    +
    + + + + + +

    + + + validate + (self) +

    +

    No docs

    +
    +
    + +
    diff --git a/foundation/www/docs/current/models/accounts/pricing_rule.html b/foundation/www/docs/current/models/accounts/pricing_rule.html index 86b76b53..9b8485cd 100644 --- a/foundation/www/docs/current/models/accounts/pricing_rule.html +++ b/foundation/www/docs/current/models/accounts/pricing_rule.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 Supplier Name - + + 
    supplier.supplier_name
    + 5 + tax_id + + Read Only + + Tax Id + + + + 
    supplier.tax_id
    + + + + + 6 due_date Date @@ -113,7 +129,7 @@ PINV-RET- - 6 + 7 is_paid Check @@ -125,7 +141,7 @@ PINV-RET- - 7 + 8 column_break1 Column Break @@ -137,7 +153,7 @@ PINV-RET- - 8 + 9 company Link @@ -158,7 +174,7 @@ PINV-RET- - 9 + 10 posting_date Date @@ -170,7 +186,7 @@ PINV-RET- - 10 + 11 posting_time Time @@ -182,7 +198,7 @@ PINV-RET- - 11 + 12 set_posting_time Check @@ -194,7 +210,7 @@ PINV-RET- - 12 + 13 amended_from Link @@ -215,7 +231,7 @@ PINV-RET- - 13 + 14 supplier_invoice_details Section Break @@ -227,7 +243,7 @@ PINV-RET- - 14 + 15 bill_no Data @@ -239,7 +255,7 @@ PINV-RET- - 15 + 16 column_break_15 Column Break @@ -251,7 +267,7 @@ PINV-RET- - 16 + 17 bill_date Date @@ -263,7 +279,7 @@ PINV-RET- - 17 + 18 returns Section Break @@ -275,7 +291,7 @@ PINV-RET- - 18 + 19 is_return Check @@ -287,7 +303,7 @@ PINV-RET- - 19 + 20 return_against Link @@ -308,7 +324,7 @@ PINV-RET- - 20 + 21 section_addresses Section Break @@ -320,7 +336,7 @@ PINV-RET- - 21 + 22 supplier_address Link @@ -341,7 +357,7 @@ PINV-RET- - 22 + 23 address_display Small Text @@ -353,7 +369,7 @@ PINV-RET- - 23 + 24 contact_person Link @@ -374,7 +390,7 @@ PINV-RET- - 24 + 25 contact_display Small Text @@ -386,7 +402,7 @@ PINV-RET- - 25 + 26 contact_mobile Small Text @@ -398,7 +414,7 @@ PINV-RET- - 26 + 27 contact_email Small Text @@ -410,7 +426,7 @@ PINV-RET- - 27 + 28 col_break_address Column Break @@ -422,7 +438,7 @@ PINV-RET- - 28 + 29 shipping_address Link @@ -443,7 +459,7 @@ PINV-RET- - 29 + 30 shipping_address_display Small Text @@ -455,7 +471,7 @@ PINV-RET- - 30 + 31 currency_and_price_list Section Break @@ -469,7 +485,7 @@ PINV-RET- - 31 + 32 currency Link @@ -490,7 +506,7 @@ PINV-RET- - 32 + 33 conversion_rate Float @@ -502,7 +518,7 @@ PINV-RET- - 33 + 34 column_break2 Column Break @@ -514,7 +530,7 @@ PINV-RET- - 34 + 35 buying_price_list Link @@ -535,7 +551,7 @@ PINV-RET- - 35 + 36 price_list_currency Link @@ -556,7 +572,7 @@ PINV-RET- - 36 + 37 plc_conversion_rate Float @@ -568,7 +584,7 @@ PINV-RET- - 37 + 38 ignore_pricing_rule Check @@ -580,7 +596,7 @@ PINV-RET- - 38 + 39 items_section Section Break @@ -594,7 +610,7 @@ PINV-RET- - 39 + 40 update_stock Check @@ -606,7 +622,7 @@ PINV-RET- - 40 + 41 items Table @@ -627,7 +643,7 @@ PINV-RET- - 41 + 42 section_break_26 Section Break @@ -639,7 +655,7 @@ PINV-RET- - 42 + 43 base_total Currency @@ -653,7 +669,7 @@ PINV-RET- - 43 + 44 base_net_total Currency @@ -667,7 +683,7 @@ PINV-RET- - 44 + 45 column_break_28 Column Break @@ -679,7 +695,7 @@ PINV-RET- - 45 + 46 total Currency @@ -693,7 +709,7 @@ PINV-RET- - 46 + 47 net_total Currency @@ -706,8 +722,20 @@ PINV-RET- + + 48 + total_net_weight + + Float + + Total Net Weight + + + + + - 47 + 49 taxes_section Section Break @@ -721,7 +749,7 @@ PINV-RET- - 48 + 50 taxes_and_charges Link @@ -742,7 +770,52 @@ PINV-RET- - 49 + 51 + column_break_49 + + Column Break + + + + + + + + + 52 + shipping_rule + + Link + + Shipping Rule + + + + + + + +    Shipping Rule + + + + + + + + 53 + section_break_51 + + Section Break + + + + + + + + + 54 taxes Table @@ -763,7 +836,7 @@ PINV-RET- - 50 + 55 sec_tax_breakup Section Break @@ -775,7 +848,7 @@ PINV-RET- - 51 + 56 other_charges_calculation Text @@ -787,7 +860,7 @@ PINV-RET- - 52 + 57 totals Section Break @@ -801,7 +874,7 @@ PINV-RET- - 53 + 58 base_taxes_and_charges_added Currency @@ -815,7 +888,7 @@ PINV-RET- - 54 + 59 base_taxes_and_charges_deducted Currency @@ -829,7 +902,7 @@ PINV-RET- - 55 + 60 base_total_taxes_and_charges Currency @@ -843,7 +916,7 @@ PINV-RET- - 56 + 61 column_break_40 Column Break @@ -855,7 +928,7 @@ PINV-RET- - 57 + 62 taxes_and_charges_added Currency @@ -869,7 +942,7 @@ PINV-RET- - 58 + 63 taxes_and_charges_deducted Currency @@ -883,7 +956,7 @@ PINV-RET- - 59 + 64 total_taxes_and_charges Currency @@ -897,7 +970,7 @@ PINV-RET- - 60 + 65 section_break_44 Section Break @@ -909,7 +982,7 @@ PINV-RET- - 61 + 66 apply_discount_on Select @@ -925,7 +998,7 @@ Net Total - 62 + 67 base_discount_amount Currency @@ -939,7 +1012,7 @@ Net Total - 63 + 68 column_break_46 Column Break @@ -951,7 +1024,7 @@ Net Total - 64 + 69 additional_discount_percentage Float @@ -963,7 +1036,7 @@ Net Total - 65 + 70 discount_amount Currency @@ -977,7 +1050,7 @@ Net Total - 66 + 71 section_break_49 Section Break @@ -989,7 +1062,7 @@ Net Total - 67 + 72 base_grand_total Currency @@ -1003,7 +1076,7 @@ Net Total - 68 + 73 base_rounding_adjustment Currency @@ -1017,7 +1090,21 @@ Net Total - 69 + 74 + base_rounded_total + + Currency + + Rounded Total (Company Currency) + + + + 
    Company:company:default_currency
    + + + + + 75 base_in_words Data @@ -1029,7 +1116,7 @@ Net Total - 70 + 76 column_break8 Column Break @@ -1041,7 +1128,7 @@ Net Total - 71 + 77 grand_total Currency @@ -1055,7 +1142,7 @@ Net Total - 72 + 78 rounding_adjustment Currency @@ -1069,7 +1156,21 @@ Net Total - 73 + 79 + rounded_total + + Currency + + Rounded Total + + + + 
    currency
    + + + + + 80 in_words Data @@ -1081,7 +1182,7 @@ Net Total - 74 + 81 total_advance Currency @@ -1095,7 +1196,7 @@ Net Total - 75 + 82 outstanding_amount Currency @@ -1108,8 +1209,20 @@ Net Total + + 83 + disable_rounded_total + + Check + + Disable Rounded Total + + + + + - 76 + 84 payments_section Section Break @@ -1121,7 +1234,7 @@ Net Total - 77 + 85 mode_of_payment Link @@ -1142,7 +1255,7 @@ Net Total - 78 + 86 cash_bank_account Link @@ -1163,7 +1276,7 @@ Net Total - 79 + 87 col_br_payments Column Break @@ -1175,7 +1288,7 @@ Net Total - 80 + 88 paid_amount Currency @@ -1189,7 +1302,7 @@ Net Total - 81 + 89 base_paid_amount Currency @@ -1203,7 +1316,7 @@ Net Total - 82 + 90 write_off Section Break @@ -1215,7 +1328,7 @@ Net Total - 83 + 91 write_off_amount Currency @@ -1229,7 +1342,7 @@ Net Total - 84 + 92 base_write_off_amount Currency @@ -1243,7 +1356,7 @@ Net Total - 85 + 93 column_break_61 Column Break @@ -1255,7 +1368,7 @@ Net Total - 86 + 94 write_off_account Link @@ -1276,7 +1389,7 @@ Net Total - 87 + 95 write_off_cost_center Link @@ -1297,7 +1410,7 @@ Net Total - 88 + 96 advances_section Section Break @@ -1311,7 +1424,7 @@ Net Total - 89 + 97 get_advances Button @@ -1323,7 +1436,7 @@ Net Total - 90 + 98 advances Table @@ -1344,7 +1457,61 @@ Net Total - 91 + 99 + payment_schedule_section + + Section Break + + Payment Terms + + + + + + + 100 + payment_terms_template + + Link + + Payment Terms Template + + + + + + + +Payment Terms Template + + + + + + + + 101 + payment_schedule + + Table + + Payment Schedule + + + + + + + +Payment Schedule + + + + + + + + 102 terms_section_break Section Break @@ -1358,7 +1525,7 @@ Net Total - 92 + 103 tc_name Link @@ -1379,7 +1546,7 @@ Net Total - 93 + 104 terms Text Editor @@ -1391,7 +1558,7 @@ Net Total - 94 + 105 raw_materials_supplied Section Break @@ -1403,7 +1570,7 @@ Net Total - 95 + 106 is_subcontracted Select @@ -1418,7 +1585,7 @@ Yes - 96 + 107 supplier_warehouse Link @@ -1439,7 +1606,7 @@ Yes - 97 + 108 supplied_items Table @@ -1460,7 +1627,7 @@ Yes - 98 + 109 printing_settings Section Break @@ -1472,7 +1639,7 @@ Yes - 99 + 110 letter_head Link @@ -1493,7 +1660,7 @@ Yes - 100 + 111 select_print_heading Link @@ -1514,7 +1681,7 @@ Yes - 101 + 112 language Data @@ -1526,7 +1693,7 @@ Yes - 102 + 113 more_info Section Break @@ -1540,7 +1707,7 @@ Yes - 103 + 114 credit_to Link @@ -1561,7 +1728,7 @@ Yes - 104 + 115 party_account_currency Link @@ -1582,7 +1749,7 @@ Yes - 105 + 116 is_opening Select @@ -1597,7 +1764,7 @@ Yes - 106 + 117 against_expense_account Small Text @@ -1609,7 +1776,7 @@ Yes - 107 + 118 column_break_63 Column Break @@ -1621,7 +1788,7 @@ Yes - 108 + 119 status Select @@ -1643,7 +1810,7 @@ Cancelled - 109 + 120 remarks Small Text @@ -1655,7 +1822,7 @@ Cancelled - 110 + 121 rejected_warehouse Link @@ -1677,7 +1844,7 @@ Cancelled - 111 + 122 subscription_section Section Break @@ -1689,7 +1856,45 @@ Cancelled - 112 + 123 + from_date + + Date + + From Date +

    + Start date of current invoice's period

    + + + + + + 124 + to_date + + Date + + To Date +

    + End date of current invoice's period

    + + + + + + 125 + column_break_114 + + Column Break + + + + + + + + + 126 subscription Link @@ -1706,198 +1911,6 @@ Cancelled - - - - - 113 - recurring_invoice - - Section Break - - Recurring Invoice - - - - 
    fa fa-time
    - - - - - 114 - is_recurring - - Check - - Is Recurring - - - - - - - 115 - recurring_type - - Select - - Recurring Type -

    - Select the period when the invoice will be generated automatically

    - - - 
    Monthly
-Quarterly
-Half-yearly
-Yearly
    - - - - - 116 - from_date - - Date - - From Date -

    - Start date of current invoice's period

    - - - - - - 117 - to_date - - Date - - To Date -

    - End date of current invoice's period

    - - - - - - 118 - submit_on_creation - - Check - - Submit on creation - - - - - - - 119 - notify_by_email - - Check - - Notify by email - - - - - - - 120 - repeat_on_day_of_month - - Int - - Repeat on Day of Month -

    - The day of the month on which auto invoice will be generated e.g. 05, 28 etc

    - - - - - - 121 - end_date - - Date - - End Date -

    - The date on which recurring invoice will be stop

    - - - - - - 122 - column_break_82 - - Column Break - - - - - - - - - 123 - next_date - - Date - - Next Date -

    - The date on which next invoice will be generated. It is generated on submit.

    - - - - - - 124 - recurring_id - - Data - - Recurring Id -

    - The unique id for tracking all recurring invoices. It is generated on submit.

    - - - - - - 125 - notification_email_address - - Small Text - - Notification Email Address -

    - Enter Email Address separated by commas, invoice will be mailed automatically on particular date

    - - - - - - 126 - recurring_print_format - - Link - - Recurring Print Format - - - - - - - -Print Format - - - @@ -1930,7 +1943,7 @@ Yearly __init__ - (self, arg1, arg2=None) + (self)

    No docs

    @@ -2454,6 +2467,24 @@ Yearly + + + +

    Public API +
    /api/method/erpnext.accounts.doctype.purchase_invoice.purchase_invoice.make_stock_entry +

    +

    + + + erpnext.accounts.doctype.purchase_invoice.purchase_invoice.make_stock_entry + (source_name, target_doc=None) +

    +

    No docs

    +
    +
    + + + @@ -2464,7 +2495,7 @@ Yearly
  • -Asset +Asset
    • diff --git a/foundation/www/docs/current/models/accounts/purchase_invoice_advance.html b/foundation/www/docs/current/models/accounts/purchase_invoice_advance.html index 657a5797..de7a365d 100644 --- a/foundation/www/docs/current/models/accounts/purchase_invoice_advance.html +++ b/foundation/www/docs/current/models/accounts/purchase_invoice_advance.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 14 - uom + uom Link @@ -239,11 +239,11 @@ 15 - conversion_factor + conversion_factor Float - Conversion Factor + UOM Conversion Factor @@ -251,7 +251,7 @@ 16 - stock_qty + stock_qty Float @@ -508,6 +508,75 @@ 35 + item_weight_details + + Section Break + + Item Weight Details + + + + + + + 36 + weight_per_unit + + Float + + Weight Per Unit + + + + + + + 37 + total_weight + + Float + + Total Weight + + + + + + + 38 + column_break_38 + + Column Break + + + + + + + + + 39 + weight_uom + + Link + + Weight UOM + + + + + + + +UOM + + + + + + + + 40 warehouse_section Section Break @@ -519,7 +588,7 @@ - 36 + 41 warehouse Link @@ -540,7 +609,7 @@ - 37 + 42 rejected_warehouse Link @@ -561,7 +630,7 @@ - 38 + 43 quality_inspection Link @@ -582,7 +651,7 @@ - 39 + 44 batch_no Link @@ -603,7 +672,7 @@ - 40 + 45 col_br_wh Column Break @@ -615,7 +684,7 @@ - 41 + 46 serial_no Text @@ -627,7 +696,7 @@ - 42 + 47 rejected_serial_no Text @@ -639,7 +708,7 @@ - 43 + 48 accounting Section Break @@ -651,7 +720,7 @@ - 44 + 49 expense_account Link @@ -672,7 +741,7 @@ - 45 + 50 col_break5 Column Break @@ -684,7 +753,7 @@ - 46 + 51 project Link @@ -705,7 +774,7 @@ - 47 + 52 cost_center Link @@ -726,7 +795,7 @@ - 48 + 53 reference Section Break @@ -738,7 +807,7 @@ - 49 + 54 allow_zero_valuation_rate Check @@ -750,7 +819,7 @@ - 50 + 55 brand Data @@ -762,7 +831,7 @@ - 51 + 56 item_group Link @@ -783,7 +852,7 @@ - 52 + 57 item_tax_rate Code @@ -797,7 +866,7 @@ Used for Taxes and Charges

    - 53 + 58 item_tax_amount Currency @@ -811,7 +880,7 @@ Used for Taxes and Charges

    - 54 + 59 purchase_order Link @@ -832,7 +901,7 @@ Used for Taxes and Charges

    - 55 + 60 bom Link @@ -853,7 +922,7 @@ Used for Taxes and Charges

    - 56 + 61 col_break6 Column Break @@ -865,7 +934,7 @@ Used for Taxes and Charges

    - 57 + 62 is_fixed_asset Check @@ -877,7 +946,7 @@ Used for Taxes and Charges

    - 58 + 63 asset Link @@ -890,7 +959,7 @@ Used for Taxes and Charges

    -Asset +Asset @@ -898,7 +967,7 @@ Used for Taxes and Charges

    - 59 + 64 po_detail Data @@ -910,7 +979,7 @@ Used for Taxes and Charges

    - 60 + 65 purchase_receipt Link @@ -931,7 +1000,7 @@ Used for Taxes and Charges

    - 61 + 66 page_break Check @@ -943,7 +1012,7 @@ Used for Taxes and Charges

    - 62 + 67 pr_detail Data @@ -955,7 +1024,7 @@ Used for Taxes and Charges

    - 63 + 68 valuation_rate Currency @@ -969,7 +1038,7 @@ Used for Taxes and Charges

    - 64 + 69 rm_supp_cost Currency @@ -983,7 +1052,7 @@ Used for Taxes and Charges

    - 65 + 70 landed_cost_voucher_amount Currency diff --git a/foundation/www/docs/current/models/accounts/purchase_taxes_and_charges.html b/foundation/www/docs/current/models/accounts/purchase_taxes_and_charges.html index 058b9134..887d32b7 100644 --- a/foundation/www/docs/current/models/accounts/purchase_taxes_and_charges.html +++ b/foundation/www/docs/current/models/accounts/purchase_taxes_and_charges.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 9 description - Text Editor + Small Text Description diff --git a/foundation/www/docs/current/models/accounts/purchase_taxes_and_charges_template.html b/foundation/www/docs/current/models/accounts/purchase_taxes_and_charges_template.html index 0fa1c79c..1f482f3b 100644 --- a/foundation/www/docs/current/models/accounts/purchase_taxes_and_charges_template.html +++ b/foundation/www/docs/current/models/accounts/purchase_taxes_and_charges_template.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 Customer Name - + + 
    customer.customer_name
    + @@ -161,22 +163,10 @@ SINV-RET- 9 - offline_pos_name - - Data - - Offline POS Name - - - - - - - 10 pos_profile Link - + POS Profile @@ -192,6 +182,18 @@ SINV-RET- + + 10 + offline_pos_name + + Data + + Offline POS Name + + + + + 11 column_break1 @@ -886,8 +888,20 @@ SINV-RET- - + 57 + total_net_weight + + Float + + Total Net Weight + + + + + + + 58 taxes_section Section Break @@ -901,7 +915,7 @@ SINV-RET- - 58 + 59 taxes_and_charges Link @@ -922,7 +936,7 @@ SINV-RET- - 59 + 60 column_break_38 Column Break @@ -934,7 +948,7 @@ SINV-RET- - 60 + 61 shipping_rule Link @@ -955,7 +969,7 @@ SINV-RET- - 61 + 62 section_break_40 Section Break @@ -967,7 +981,7 @@ SINV-RET- - 62 + 63 taxes Table @@ -988,7 +1002,7 @@ SINV-RET- - 63 + 64 sec_tax_breakup Section Break @@ -1000,7 +1014,7 @@ SINV-RET- - 64 + 65 other_charges_calculation Text @@ -1012,7 +1026,7 @@ SINV-RET- - 65 + 66 section_break_43 Section Break @@ -1024,7 +1038,7 @@ SINV-RET- - 66 + 67 base_total_taxes_and_charges Currency @@ -1038,7 +1052,7 @@ SINV-RET- - 67 + 68 column_break_47 Column Break @@ -1050,7 +1064,7 @@ SINV-RET- - 68 + 69 total_taxes_and_charges Currency @@ -1064,7 +1078,7 @@ SINV-RET- - 69 + 70 section_break_49 Section Break @@ -1076,7 +1090,7 @@ SINV-RET- - 70 + 71 apply_discount_on Select @@ -1092,7 +1106,7 @@ Net Total - 71 + 72 base_discount_amount Currency @@ -1106,7 +1120,7 @@ Net Total - 72 + 73 column_break_51 Column Break @@ -1118,7 +1132,7 @@ Net Total - 73 + 74 additional_discount_percentage Float @@ -1130,7 +1144,7 @@ Net Total - 74 + 75 discount_amount Currency @@ -1144,7 +1158,7 @@ Net Total - 75 + 76 totals Section Break @@ -1158,7 +1172,7 @@ Net Total - 76 + 77 base_grand_total Currency @@ -1172,7 +1186,7 @@ Net Total - 77 + 78 base_rounding_adjustment Currency @@ -1186,7 +1200,7 @@ Net Total - 78 + 79 base_rounded_total Currency @@ -1200,7 +1214,7 @@ Net Total - 79 + 80 base_in_words Data @@ -1213,7 +1227,7 @@ Net Total - 80 + 81 column_break5 Column Break @@ -1225,7 +1239,7 @@ Net Total - 81 + 82 grand_total Currency @@ -1239,7 +1253,7 @@ Net Total - 82 + 83 rounding_adjustment Currency @@ -1253,7 +1267,7 @@ Net Total - 83 + 84 rounded_total Currency @@ -1267,7 +1281,7 @@ Net Total - 84 + 85 in_words Data @@ -1279,7 +1293,7 @@ Net Total - 85 + 86 total_advance Currency @@ -1293,7 +1307,7 @@ Net Total - 86 + 87 outstanding_amount Currency @@ -1307,7 +1321,7 @@ Net Total - 87 + 88 advances_section Section Break @@ -1321,7 +1335,7 @@ Net Total - 88 + 89 get_advances Button @@ -1333,7 +1347,7 @@ Net Total - 89 + 90 advances Table @@ -1354,7 +1368,61 @@ Net Total - 90 + 91 + payment_schedule_section + + Section Break + + Payment Terms + + + + + + + 92 + payment_terms_template + + Link + + Payment Terms Template + + + + + + + +    Payment Terms Template + + + + + + + + 93 + payment_schedule + + Table + + Payment Schedule + + + + + + + +Payment Schedule + + + + + + + + 94 payments_section Section Break @@ -1368,7 +1436,7 @@ Net Total - 91 + 95 cash_bank_account Link @@ -1389,7 +1457,7 @@ Net Total - 92 + 96 payments Table @@ -1410,7 +1478,7 @@ Net Total - 93 + 97 section_break_84 Section Break @@ -1422,7 +1490,7 @@ Net Total - 94 + 98 base_paid_amount Currency @@ -1436,7 +1504,7 @@ Net Total - 95 + 99 column_break_86 Column Break @@ -1448,7 +1516,7 @@ Net Total - 96 + 100 paid_amount Currency @@ -1462,7 +1530,7 @@ Net Total - 97 + 101 section_break_88 Section Break @@ -1474,7 +1542,7 @@ Net Total - 98 + 102 base_change_amount Currency @@ -1488,7 +1556,7 @@ Net Total - 99 + 103 column_break_90 Column Break @@ -1500,7 +1568,7 @@ Net Total - 100 + 104 change_amount Currency @@ -1514,7 +1582,7 @@ Net Total - 101 + 105 account_for_change_amount Link @@ -1535,7 +1603,7 @@ Net Total - 102 + 106 column_break4 Section Break @@ -1547,7 +1615,7 @@ Net Total - 103 + 107 write_off_amount Currency @@ -1561,7 +1629,7 @@ Net Total - 104 + 108 base_write_off_amount Currency @@ -1575,7 +1643,7 @@ Net Total - 105 + 109 write_off_outstanding_amount_automatically Check @@ -1587,7 +1655,7 @@ Net Total - 106 + 110 column_break_74 Column Break @@ -1599,7 +1667,7 @@ Net Total - 107 + 111 write_off_account Link @@ -1620,7 +1688,7 @@ Net Total - 108 + 112 write_off_cost_center Link @@ -1641,7 +1709,7 @@ Net Total - 109 + 113 terms_section_break Section Break @@ -1653,7 +1721,7 @@ Net Total - 110 + 114 tc_name Link @@ -1674,7 +1742,7 @@ Net Total - 111 + 115 terms Text Editor @@ -1686,7 +1754,7 @@ Net Total - 112 + 116 edit_printing_settings Section Break @@ -1698,7 +1766,7 @@ Net Total - 113 + 117 letter_head Link @@ -1719,7 +1787,7 @@ Net Total - 114 + 118 language Data @@ -1731,7 +1799,7 @@ Net Total - 115 + 119 column_break_84 Column Break @@ -1743,7 +1811,7 @@ Net Total - 116 + 120 select_print_heading Link @@ -1764,7 +1832,7 @@ Net Total - 117 + 121 more_information Section Break @@ -1776,7 +1844,7 @@ Net Total - 118 + 122 customer_group Link @@ -1797,7 +1865,7 @@ Net Total - 119 + 123 campaign Link @@ -1818,7 +1886,7 @@ Net Total - 120 + 124 col_break23 Column Break @@ -1830,7 +1898,7 @@ Net Total - 121 + 125 status Select @@ -1852,7 +1920,7 @@ Cancelled - 122 + 126 source Link @@ -1873,7 +1941,7 @@ Cancelled - 123 + 127 more_info Section Break @@ -1887,7 +1955,7 @@ Cancelled - 124 + 128 debit_to Link @@ -1908,7 +1976,7 @@ Cancelled - 125 + 129 party_account_currency Link @@ -1929,7 +1997,7 @@ Cancelled - 126 + 130 is_opening Select @@ -1944,7 +2012,7 @@ Yes - 127 + 131 c_form_applicable Select @@ -1959,7 +2027,7 @@ Yes - 128 + 132 c_form_no Link @@ -1980,7 +2048,7 @@ Yes - 129 + 133 column_break8 Column Break @@ -1992,7 +2060,7 @@ Yes - 130 + 134 remarks Small Text @@ -2004,7 +2072,7 @@ Yes - 131 + 135 sales_team_section_break Section Break @@ -2018,7 +2086,7 @@ Yes - 132 + 136 sales_partner Link @@ -2039,7 +2107,7 @@ Yes - 133 + 137 column_break10 Column Break @@ -2051,7 +2119,7 @@ Yes - 134 + 138 commission_rate Float @@ -2063,7 +2131,7 @@ Yes - 135 + 139 total_commission Currency @@ -2077,7 +2145,7 @@ Yes - 136 + 140 section_break2 Section Break @@ -2089,7 +2157,7 @@ Yes - 137 + 141 sales_team Table @@ -2110,7 +2178,7 @@ Yes - 138 + 142 subscription_section Section Break @@ -2122,7 +2190,43 @@ Yes - 139 + 143 + from_date + + Date + + From Date + + + + + + + 144 + to_date + + Date + + To Date + + + + + + + 145 + column_break_140 + + Column Break + + + + + + + + + 146 subscription Link @@ -2142,216 +2246,8 @@ Yes - - 140 - recurring_invoice - - Section Break - - Recurring Invoice - - - - 
    fa fa-time
    - - - - - 141 - column_break11 - - Column Break - - Settings - - - - - - - 142 - is_recurring - - Check - - Is Recurring - - - - - - - 143 - recurring_id - - Link - - Reference Document - - - - - - - -Sales Invoice - - - - - - - - 144 - recurring_type - - Select - - Frequency - - - - 
    -Monthly
-Quarterly
-Half-yearly
-Yearly
    - - - - - 145 - repeat_on_day_of_month - - Int - - Repeat on Day of Month - - - - - - - 146 - end_date - - Date - - End Date - - - - - 147 - submit_on_creation - - Check - - Submit on creation - - - - - - - 148 - notify_by_email - - Check - - Notify by email - - - - - - - 149 - notification_email_address - - Code - - Notification Email Address - - - - 
    Email
    - - - - - 150 - recurring_print_format - - Link - - Recurring Print Format - - - - - - - -Print Format - - - - - - - - 151 - column_break12 - - Column Break - - This Document - - - - - - - 152 - from_date - - Date - - From Date - - - - - - - 153 - to_date - - Date - - To Date - - - - - - - 154 - next_date - - Date - - Next Date - - - - - - - 155 against_income_account Small Text @@ -2391,7 +2287,7 @@ Yearly __init__ - (self, arg1, arg2=None) + (self)

    No docs

    @@ -2905,6 +2801,20 @@ Yearly +

    + + + update_project + (self) +

    +

    No docs

    +
    +
    + + + + +

    @@ -3402,6 +3312,15 @@ Yearly +

  • + + +Restaurant Order Entry + +
    • + + +
  • diff --git a/foundation/www/docs/current/models/accounts/sales_invoice_advance.html b/foundation/www/docs/current/models/accounts/sales_invoice_advance.html index 57726d54..984cffd5 100644 --- a/foundation/www/docs/current/models/accounts/sales_invoice_advance.html +++ b/foundation/www/docs/current/models/accounts/sales_invoice_advance.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 Rate With Margin - + + 
    currency
    + @@ -389,8 +391,22 @@ Amount - + 27 + base_rate_with_margin + + Currency + + Rate With Margin (Company Currency) + + + + 
    Company:company:default_currency
    + + + + + 28 section_break1 Section Break @@ -402,7 +418,7 @@ Amount - 28 + 29 rate Currency @@ -416,7 +432,7 @@ Amount - 29 + 30 amount Currency @@ -430,7 +446,7 @@ Amount - 30 + 31 col_break3 Column Break @@ -442,7 +458,7 @@ Amount - 31 + 32 base_rate Currency @@ -456,7 +472,7 @@ Amount - 32 + 33 base_amount Currency @@ -470,7 +486,7 @@ Amount - 33 + 34 pricing_rule Link @@ -491,7 +507,7 @@ Amount - 34 + 35 section_break_21 Section Break @@ -503,7 +519,7 @@ Amount - 35 + 36 net_rate Currency @@ -517,7 +533,7 @@ Amount - 36 + 37 net_amount Currency @@ -531,7 +547,7 @@ Amount - 37 + 38 column_break_24 Column Break @@ -543,7 +559,7 @@ Amount - 38 + 39 base_net_rate Currency @@ -557,7 +573,7 @@ Amount - 39 + 40 base_net_amount Currency @@ -571,7 +587,7 @@ Amount - 40 + 41 drop_ship Section Break @@ -583,7 +599,7 @@ Amount - 41 + 42 delivered_by_supplier Check @@ -595,7 +611,7 @@ Amount - 42 + 43 accounting Section Break @@ -607,7 +623,7 @@ Amount - 43 + 44 income_account Link @@ -628,7 +644,7 @@ Amount - 44 + 45 expense_account Link @@ -649,7 +665,7 @@ Amount - 45 + 46 col_break4 Column Break @@ -661,7 +677,7 @@ Amount - 46 + 47 cost_center Link @@ -682,7 +698,76 @@ Amount - 47 + 48 + section_break_18 + + Section Break + + Item Weight Details + + + + + + + 49 + weight_per_unit + + Float + + Weight Per Unit + + + + + + + 50 + total_weight + + Float + + Total Weight + + + + + + + 51 + column_break_21 + + Column Break + + + + + + + + + 52 + weight_uom + + Link + + Weight UOM + + + + + + + +    UOM + + + + + + + + 53 warehouse_and_reference Section Break @@ -694,7 +779,7 @@ Amount - 48 + 54 warehouse Link @@ -715,7 +800,7 @@ Amount - 49 + 55 target_warehouse Link @@ -736,7 +821,7 @@ Amount - 50 + 56 quality_inspection Link @@ -757,7 +842,7 @@ Amount - 51 + 57 batch_no Link @@ -778,7 +863,7 @@ Amount - 52 + 58 col_break5 Column Break @@ -790,7 +875,7 @@ Amount - 53 + 59 allow_zero_valuation_rate Check @@ -802,7 +887,7 @@ Amount - 54 + 60 serial_no Small Text @@ -814,7 +899,7 @@ Amount - 55 + 61 item_group Link @@ -835,7 +920,7 @@ Amount - 56 + 62 brand Data @@ -847,7 +932,7 @@ Amount - 57 + 63 item_tax_rate Small Text @@ -859,7 +944,7 @@ Amount - 58 + 64 actual_batch_qty Float @@ -871,7 +956,7 @@ Amount - 59 + 65 actual_qty Float @@ -883,7 +968,7 @@ Amount - 60 + 66 edit_references Section Break @@ -895,7 +980,7 @@ Amount - 61 + 67 sales_order Link @@ -916,7 +1001,7 @@ Amount - 62 + 68 so_detail Data @@ -928,7 +1013,7 @@ Amount - 63 + 69 column_break_50 Column Break @@ -940,7 +1025,7 @@ Amount - 64 + 70 delivery_note Link @@ -961,7 +1046,7 @@ Amount - 65 + 71 dn_detail Data @@ -973,7 +1058,7 @@ Amount - 66 + 72 delivered_qty Float @@ -985,7 +1070,7 @@ Amount - 67 + 73 is_fixed_asset Check @@ -997,7 +1082,7 @@ Amount - 68 + 74 asset Link @@ -1010,7 +1095,7 @@ Amount -Asset +Asset @@ -1018,7 +1103,7 @@ Amount - 69 + 75 section_break_54 Section Break @@ -1030,7 +1115,7 @@ Amount - 70 + 76 page_break Check diff --git a/foundation/www/docs/current/models/accounts/sales_invoice_payment.html b/foundation/www/docs/current/models/accounts/sales_invoice_payment.html index 6ea70287..62d7a01b 100644 --- a/foundation/www/docs/current/models/accounts/sales_invoice_payment.html +++ b/foundation/www/docs/current/models/accounts/sales_invoice_payment.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 6 description - Text Editor + Small Text Description diff --git a/foundation/www/docs/current/models/accounts/sales_taxes_and_charges_template.html b/foundation/www/docs/current/models/accounts/sales_taxes_and_charges_template.html index 06c09d64..fc1fc528 100644 --- a/foundation/www/docs/current/models/accounts/sales_taxes_and_charges_template.html +++ b/foundation/www/docs/current/models/accounts/sales_taxes_and_charges_template.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 + + +Restaurant + +
    • + + +
  • diff --git a/foundation/www/docs/current/models/accounts/shipping_rule.html b/foundation/www/docs/current/models/accounts/shipping_rule.html index ce1c7cf6..8e5f4f42 100644 --- a/foundation/www/docs/current/models/accounts/shipping_rule.html +++ b/foundation/www/docs/current/models/accounts/shipping_rule.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 3 - calculate_based_on + column_break_4 + + Column Break + + + + + + + + + 4 + shipping_rule_type Select - - Calculate Based On + + Shipping Rule Type - 
    Net Total
-Net Weight
    + 
    Selling
+Buying
    - 4 - rule_conditions_section - - Section Break - - Shipping Rule Conditions - - - - - - 5 - conditions - - Table - - Shipping Rule Conditions - - - - - - - -    Shipping Rule Condition - - - - - - - - 6 - section_break_6 - - Section Break - - Valid for Countries - - - - - - - 7 - worldwide_shipping - - Check - - Worldwide Shipping - - - - - - - 8 - countries - - Table - - Valid for Countries - - - - - - - -Shipping Rule Country - - - - - - - - 9 section_break_10 Section Break - + Accounting - 10 + 6 company Link @@ -192,7 +126,7 @@ Net Weight - 11 + 7 column_break_12 Column Break @@ -204,7 +138,7 @@ Net Weight - 12 + 8 account Link @@ -225,7 +159,7 @@ Net Weight - 13 + 9 cost_center Link @@ -242,6 +176,124 @@ Net Weight + + + + + 10 + shipping_amount_section + + Section Break + + + + + + + + + 11 + calculate_based_on + + Select + + Calculate Based On + + + + 
    Fixed
+Net Total
+Net Weight
    + + + + + 12 + column_break_8 + + Column Break + + + + + + + + + 13 + shipping_amount + + Currency + + Shipping Amount + + + + + + + 14 + rule_conditions_section + + Section Break + + Shipping Rule Conditions + + + + + + + 15 + conditions + + Table + + Shipping Rule Conditions + + + + + + + +Shipping Rule Condition + + + + + + + + 16 + section_break_6 + + Section Break + + Restrict to Countries + + + + + + + 17 + countries + + Table + + Valid for Countries + + + + + + + +Shipping Rule Country + + + @@ -315,6 +367,48 @@ Net Weight +

    + + + add_shipping_rule_to_tax_table + (self, doc, shipping_amount) +

    +

    No docs

    +
    +
    + + + + + +

    + + + apply + (self, doc) +

    +

    Apply shipping rule on given doc. Called from accounts controller

    +
    +
    + + + + + +

    + + + get_shipping_amount_from_rules + (self, value) +

    +

    No docs

    +
    +
    + + + + +

    @@ -343,6 +437,20 @@ Net Weight +

    + + + validate_countries + (self, doc) +

    +

    No docs

    +
    +
    + + + + +

    @@ -389,6 +497,33 @@ Net Weight +

  • + + +Purchase Invoice + +
    • + + + +
  • + + +Purchase Order + +
    • + + + +
  • + + +Purchase Receipt + +
    • + + +
  • @@ -415,6 +550,15 @@ Net Weight
    • + +
  • + + +Supplier Quotation + +
    • + + diff --git a/foundation/www/docs/current/models/accounts/shipping_rule_condition.html b/foundation/www/docs/current/models/accounts/shipping_rule_condition.html index 96bb41bf..8e1a7e46 100644 --- a/foundation/www/docs/current/models/accounts/shipping_rule_condition.html +++ b/foundation/www/docs/current/models/accounts/shipping_rule_condition.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 5 - disabled - - Check - - Disabled - - - - - - - 6 - submit_on_creation - - Check - - Submit on Creation - - - - - - - 7 column_break_5 Column Break @@ -138,7 +114,7 @@ - 8 + 6 start_date Date @@ -150,7 +126,7 @@ - 9 + 7 end_date Date @@ -162,20 +138,32 @@ - 10 - next_schedule_date + 8 + submit_on_creation - Date + Check - Next Schedule Date + Submit on Creation + + + + + + + 9 + disabled + + Check + + Disabled - 11 - frequency_detail + 10 + section_break_10 Section Break @@ -186,7 +174,7 @@ - 12 + 11 frequency Select @@ -206,8 +194,8 @@ Yearly - 13 - column_break_12 + 12 + column_break_13 Column Break @@ -218,7 +206,7 @@ Yearly - 14 + 13 repeat_on_day Int @@ -229,6 +217,18 @@ Yearly + + 14 + next_schedule_date + + Date + + Next Schedule Date + + + + + 15 notification @@ -255,6 +255,21 @@ Yearly 17 + subject + + Data + + Subject +

    + To add dynamic subject, use jinja tags like + +

    New {{ doc.doctype }} #{{ doc.name }}

    + + + + + + 18 column_break_17 Column Break @@ -266,7 +281,7 @@ Yearly - 18 + 19 recipients Small Text @@ -278,7 +293,7 @@ Yearly - 19 + 20 print_format Link @@ -299,7 +314,31 @@ Yearly - 20 + 21 + section_break_20 + + Section Break + + Message + + + + + + + 22 + message + + Text + + Message + + + + + + + 23 section_break_16 Section Break @@ -311,7 +350,7 @@ Yearly - 21 + 24 status Select @@ -330,7 +369,7 @@ Completed - 22 + 25 amended_from Link @@ -375,6 +414,20 @@ Completed +

    + + + before_cancel + (self) +

    +

    No docs

    +
    +
    + + + + +

    @@ -431,6 +484,20 @@ Completed +

    + + + unlink_subscription_id + (self) +

    +

    No docs

    +
    +
    + + + + +

    @@ -512,6 +579,20 @@ Completed
    + + + +

    + + + validate_reference_doctype + (self) +

    +

    No docs

    +
    +
    + +
    @@ -554,9 +635,9 @@ Completed

    - + - erpnext.accounts.doctype.subscription.subscription.disabled_subscription + erpnext.accounts.doctype.subscription.subscription.disable_subscription (data)

    No docs

    @@ -703,7 +784,7 @@ Completed erpnext.accounts.doctype.subscription.subscription.send_notification - (new_rv, print_format=Standard, recipients=None) + (new_rv, subscription_doc, print_format=Standard)

    Notify concerned persons about recurring document generation

    @@ -714,6 +795,22 @@ Completed + +

    + + + erpnext.accounts.doctype.subscription.subscription.set_subscription_period + (args, mcount, new_document) +

    +

    No docs

    +
    +
    + + + + + +

    Public API
    /api/method/erpnext.accounts.doctype.subscription.subscription.stop_resume_subscription

    @@ -733,6 +830,22 @@ Completed +

    + + + erpnext.accounts.doctype.subscription.subscription.subscription_doctype_query + (doctype, txt, searchfield, start, page_len, filters) +

    +

    No docs

    +
    +
    + + + + + + +

    diff --git a/foundation/www/docs/current/models/accounts/tax_rule.html b/foundation/www/docs/current/models/accounts/tax_rule.html index f9d968f4..7a01a859 100644 --- a/foundation/www/docs/current/models/accounts/tax_rule.html +++ b/foundation/www/docs/current/models/accounts/tax_rule.html @@ -9,7 +9,7 @@

    - Version 8.11.4 + Version 10.0.2 + + + + + + +

    Agriculture Analysis Criteria

    +
    + + + Version 10.0.2 + + + Source + +
    + + + + + +

    Table Name: tabAgriculture Analysis Criteria

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1title + Data + Title + +
    2standard + Check + Standard + +
    3linked_doctype + Select + Linked Doctype + + + 
    +Water Analysis
+Soil Analysis
+Plant Analysis
+Fertilizer
+Soil Texture
+Weather
    +
    + + +
    +

    Controller

    +

    erpnext.agriculture.doctype.agriculture_analysis_criteria.agriculture_analysis_criteria

    + + + + + + + +

    Class AgricultureAnalysisCriteria

    + +

    Inherits from frappe.model.document.Document + +

    +
    +
    + +
    +
    + + + + + + +

    Linked In:

    + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/agriculture/agriculture_task.html b/foundation/www/docs/current/models/agriculture/agriculture_task.html new file mode 100644 index 00000000..04bc7173 --- /dev/null +++ b/foundation/www/docs/current/models/agriculture/agriculture_task.html @@ -0,0 +1,141 @@ + + + + + + + +

    Agriculture Task

    +
    + + + Version 10.0.2 + + + Source + +
    + + +Child Table + + +

    Table Name: tabAgriculture Task

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1task_name + Data + Task Name + +
    2start_day + Int + Start Day + +
    3end_day + Int + End Day + +
    4holiday_management + Select + Holiday Management + + + 
    Ignore holidays
+Previous Business Day
+Next Business Day
    +
    5priority + Select + Priority + + + 
    Low
+Medium
+High
+Urgent
    +
    + + + + +

    Child Table Of

    + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/agriculture/crop.html b/foundation/www/docs/current/models/agriculture/crop.html new file mode 100644 index 00000000..387508a7 --- /dev/null +++ b/foundation/www/docs/current/models/agriculture/crop.html @@ -0,0 +1,602 @@ + + + + + + + +

    Crop

    +
    + + + Version 10.0.2 + + + Source + +
    + + + + + +

    Table Name: tabCrop

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1title + Data + Title + +
    2section_break_2 + Section Break + + +
    3crop_name + Data + Crop Name + +
    4column_break_4 + Column Break + + +
    5scientific_name + Data + Scientific Name + +
    6section_break_20 + Section Break + Tasks +

    + You can define all the tasks which need to carried out for this crop here. The day field is used to mention the day on which the task needs to be carried out, 1 being the 1st day, etc..

    +
    7agriculture_task + Table + Agriculture Task + + + + + + +Agriculture Task + + + +
    8period + Int + Period + +
    9section_break_9 + Section Break + + +
    10crop_spacing + Float + Crop Spacing + +
    11crop_spacing_uom + Link + Crop Spacing UOM + + + + + + +UOM + + + +
    12column_break_12 + Column Break + + +
    13row_spacing + Float + Row Spacing + +
    14row_spacing_uom + Link + Row Spacing UOM + + + + + + +UOM + + + +
    15section_break_4 + Section Break + + +
    16type + Select + Type + + + 
    Annual
+Perennial
+Biennial
    +
    17column_break_6 + Column Break + + +
    18category + Data + Category + +
    19section_break_8 + Section Break + + +
    20target_warehouse + Link + Target Warehouse + + + + + + +Warehouse + + + +
    21section_break_12 + Section Break + + +
    22planting_uom + Link + Planting UOM + + + + + + +UOM + + + +
    23planting_area + Data + Planting Area + +
    24column_break_14 + Column Break + + +
    25yield_uom + Link + Yield UOM + + + + + + +UOM + + + +
    26section_break_16 + Section Break + + +
    27section_break_17 + Section Break + Materials Required + +
    28materials_required + Table + Materials Required + + + + + + +BOM Item + + + +
    29section_break_19 + Section Break + Produced Items + +
    30produce + Table + Produce + + + + + + +BOM Item + + + +
    31section_break_18 + Section Break + Byproducts + +
    32byproducts + Table + Byproducts + + + + + + +BOM Item + + + +
    + + +
    +

    Controller

    +

    erpnext.agriculture.doctype.crop.crop

    + + + + + + + +

    Class Crop

    + +

    Inherits from frappe.model.document.Document + +

    +
    +
    + + + + +

    + + + validate + (self) +

    +

    No docs

    +
    +
    + + +
    +
    + + + + + + +

    Public API +
    /api/method/erpnext.agriculture.doctype.crop.crop.get_item_details +

    +

    + + + erpnext.agriculture.doctype.crop.crop.get_item_details + (item_code) +

    +

    No docs

    +
    +
    + + + + + + +

    Linked In:

    + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/agriculture/crop_cycle.html b/foundation/www/docs/current/models/agriculture/crop_cycle.html new file mode 100644 index 00000000..fd9be4dc --- /dev/null +++ b/foundation/www/docs/current/models/agriculture/crop_cycle.html @@ -0,0 +1,612 @@ + + + + + + + +

    Crop Cycle

    +
    + + + Version 10.0.2 + + + Source + +
    + + + + + +

    Table Name: tabCrop Cycle

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1title + Data + Title + +
    2crop + Link + Crop + + + + + + +Crop + + + +
    3column_break_3 + Column Break + Linked Land Unit + +
    4linked_land_unit + Table + Linked Land Unit +

    + A link to all the Land Units in which the Crop is growing

    +     		+ + + + +Linked Land Unit + + + +
    5section_break_3 + Section Break + + +
    6project + Link + Project + + + + + + +Project + + + +
    7column_break_12 + Column Break + + +
    8start_date + Date + Start Date +

    + This will be day 1 of the crop cycle

    +
    9end_date + Data + End Date + + + 
    project.expected_end_date
    +
    10section_break_7 + Section Break + + +
    11iso_8016_standard + Check + ISO 8016 standard + +
    12column_break_5 + Column Break + + +
    13cycle_type + Select + Cycle Type + + + 
    Yearly
+Less than a year
    +
    14section_break_12 + Section Break + + +
    15crop_spacing + Float + Crop Spacing +

    + The minimum length between each plant in the field for optimum growth

    +     		+ 
    crop.crop_spacing
    +
    16crop_spacing_uom + Link + Crop Spacing UOM + + + + + + +UOM + + + +
    17column_break_11 + Column Break + + +
    18row_spacing + Float + Row Spacing +

    + The minimum distance between rows of plants for optimum growth

    +     		+ 
    crop.row_spacing
    +
    19row_spacing_uom + Link + Row Spacing UOM + + + + + + +UOM + + + +
    20section_break_14 + Section Break + Detected Diseases +

    + List of diseases detected on the field. When selected it'll automatically add a list of tasks to deal with the disease

    +
    21detected_disease + Table + Detected Disease + + + + + + +Detected Disease + + + +
    22section_break_22 + Section Break + LInked Analysis + +
    23soil_texture + Table + Soil Texture + + + + + + +Linked Soil Texture + + + +
    24soil_analysis + Table + Soil Analysis + + + + + + +Linked Soil Analysis + + + +
    25plant_analysis + Table + Plant Analysis + + + + + + +Linked Plant Analysis + + + +
    + + +
    +

    Controller

    +

    erpnext.agriculture.doctype.crop_cycle.crop_cycle

    + + + + + + + +

    Class CropCycle

    + +

    Inherits from frappe.model.document.Document + +

    +
    +
    + + + + +

    + + + append_to_child + (self, obj_to_append) +

    +

    No docs

    +
    +
    + + + + + +

    + + + create_project + (self, period, crop_tasks) +

    +

    No docs

    +
    +
    + + + + + +

    + + + create_task + (self, crop_tasks, project_name, start_date) +

    +

    No docs

    +
    +
    + + + + + +

    + + + get_coordinates + (self, doc) +

    +

    No docs

    +
    +
    + + + + + +

    + + + get_geometry_type + (self, doc) +

    +

    No docs

    +
    +
    + + + + + +

    + + + import_disease_tasks + (self, disease, start_date) +

    +

    No docs

    +
    +
    + + + + + +

    + + + is_in_land_unit + (self, point, vs) +

    +

    No docs

    +
    +
    + + + + + +

    + + + reload_linked_analysis + (self) +

    +

    No docs

    +
    +
    + + + + + +

    + + + update_disease + (self, disease_hashes) +

    +

    No docs

    +
    +
    + + + + + +

    + + + validate + (self) +

    +

    No docs

    +
    +
    + + +
    +
    + + + + + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/agriculture/detected_disease.html b/foundation/www/docs/current/models/agriculture/detected_disease.html new file mode 100644 index 00000000..b642ef98 --- /dev/null +++ b/foundation/www/docs/current/models/agriculture/detected_disease.html @@ -0,0 +1,98 @@ + + + + + + + +

    Detected Disease

    +
    + + + Version 10.0.2 + + + Source + +
    + + +Child Table + + +

    Table Name: tabDetected Disease

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1disease + Link + Disease + + + + + + +Disease + + + +
    2start_date + Date + Start Date + +
    + + + + +

    Child Table Of

    + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/agriculture/disease.html b/foundation/www/docs/current/models/agriculture/disease.html new file mode 100644 index 00000000..faf66796 --- /dev/null +++ b/foundation/www/docs/current/models/agriculture/disease.html @@ -0,0 +1,198 @@ + + + + + + + +

    Disease

    +
    + + + Version 10.0.2 + + + Source + +
    + + + + + +

    Table Name: tabDisease

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1common_name + Data + Common Name + +
    2scientific_name + Data + Scientific Name + +
    3section_break_3 + Section Break + + +
    4treatment_task + Table + Treatment Task + + + + + + +Agriculture Task + + + +
    5treatment_period + Int + Treatment Period + +
    6section_break_2 + Section Break + Treatment Task + +
    7description + Long Text + Description + +
    + + +
    +

    Controller

    +

    erpnext.agriculture.doctype.disease.disease

    + + + + + + + +

    Class Disease

    + +

    Inherits from frappe.model.document.Document + +

    +
    +
    + + + + +

    + + + validate + (self) +

    +

    No docs

    +
    +
    + + +
    +
    + + + + + + +

    Linked In:

    + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/agriculture/fertilizer.html b/foundation/www/docs/current/models/agriculture/fertilizer.html new file mode 100644 index 00000000..f04fb809 --- /dev/null +++ b/foundation/www/docs/current/models/agriculture/fertilizer.html @@ -0,0 +1,193 @@ + + + + + + + +

    Fertilizer

    +
    + + + Version 10.0.2 + + + Source + +
    + + + + + +

    Table Name: tabFertilizer

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1fertilizer_name + Data + Fertilizer Name + +
    2item + Link + Item + + + + + + +Item + + + +
    3section_break_2 + Section Break + + +
    4density + Data + Density (if liquid) + +
    5section_break_4 + Section Break + + +
    6section_break_28 + Section Break + Fertilizer Contents + +
    7fertilizer_contents + Table + + + + + + + +Fertilizer Content + + + +
    + + +
    +

    Controller

    +

    erpnext.agriculture.doctype.fertilizer.fertilizer

    + + + + + + + +

    Class Fertilizer

    + +

    Inherits from frappe.model.document.Document + +

    +
    +
    + + + + +

    + + + load_contents + (self) +

    +

    No docs

    +
    +
    + + +
    +
    + + + + + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/agriculture/fertilizer_content.html b/foundation/www/docs/current/models/agriculture/fertilizer_content.html new file mode 100644 index 00000000..f1504366 --- /dev/null +++ b/foundation/www/docs/current/models/agriculture/fertilizer_content.html @@ -0,0 +1,98 @@ + + + + + + + +

    Fertilizer Content

    +
    + + + Version 10.0.2 + + + Source + +
    + + +Child Table + + +

    Table Name: tabFertilizer Content

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1title + Link + Title + + + + + + +Agriculture Analysis Criteria + + + +
    2value + Data + Value + +
    + + + + +

    Child Table Of

    + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/agriculture/index.html b/foundation/www/docs/current/models/agriculture/index.html new file mode 100644 index 00000000..a51db77f --- /dev/null +++ b/foundation/www/docs/current/models/agriculture/index.html @@ -0,0 +1,22 @@ + + + + + +

    Module agriculture

    +
    + + + Version 10.0.2 + + + Source + +
    + +

    DocTypes for agriculture

    + +{index} + + \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/subscription/index.txt b/foundation/www/docs/current/models/agriculture/index.txt similarity index 100% rename from foundation/www/docs/user/manual/en/subscription/index.txt rename to foundation/www/docs/current/models/agriculture/index.txt diff --git a/foundation/www/docs/current/models/agriculture/land_unit.html b/foundation/www/docs/current/models/agriculture/land_unit.html new file mode 100644 index 00000000..a9875cb8 --- /dev/null +++ b/foundation/www/docs/current/models/agriculture/land_unit.html @@ -0,0 +1,552 @@ + + + + + + + +

    Land Unit

    +
    + + + Version 10.0.2 + + + Source + +
    + + + + + +

    Table Name: tabLand Unit

    + + +Land Unit describing various land assets + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1land_unit_name + Data + Land Unit Name + +
    2parent_land_unit + Link + Parent Land Unit + + + + + + +Land Unit + + + +
    3column_break_2 + Column Break + + +
    4is_container + Check + Is Container +

    + Check if it is a hydroponic unit

    +
    5is_group + Check + Is Group + +
    6tree_details + Section Break + Tree Details + +
    7lft + Int + lft + +
    8rgt + Int + rgt + +
    9old_parent + Link + old_parent + + + + + + +Land Unit + + + +
    10land_unit_details + Section Break + Land Unit Details + +
    11latitude + Float + Latitude + +
    12longitude + Float + Longitude + +
    13latlong + Column Break + + +
    14area + Float + Area + +
    15section_break_13 + Section Break + + +
    16location + Geolocation + Location + +
    17section_break_17 + Section Break + Linked Analysis + +
    18linked_soil_texture + Table + Linked Soil Texture + + + + + + +Linked Soil Texture + + + +
    19linked_soil_analysis + Table + Linked Soil Analysis + + + + + + +Linked Soil Analysis + + + +
    20linked_plant_analysis + Table + Linked Plant Analysis + + + + + + +Linked Plant Analysis + + + +
    + + +
    +

    Controller

    +

    erpnext.agriculture.doctype.land_unit.land_unit

    + + + + + + + +

    Class LandUnit

    + +

    Inherits from frappe.utils.nestedset.NestedSet + +

    +
    +
    + + + + +

    + + + add_child_property + (self) +

    +

    No docs

    +
    +
    + + + + + +

    + + + feature_seperator + (self, child_feature=None) +

    +

    No docs

    +
    +
    + + + + + +

    + + + on_trash + (self) +

    +

    No docs

    +
    +
    + + + + + +

    + + + on_update + (self) +

    +

    No docs

    +
    +
    + + + + + +

    + + + set_location_value + (self, features) +

    +

    No docs

    +
    +
    + + + + + +

    + + + validate + (self) +

    +

    No docs

    +
    +
    + + +
    +
    + + + + + + + +

    + + + erpnext.agriculture.doctype.land_unit.land_unit.compute_area + (features) +

    +

    No docs

    +
    +
    + + + + + + +

    Public API +
    /api/method/erpnext.agriculture.doctype.land_unit.land_unit.get_children +

    +

    + + + erpnext.agriculture.doctype.land_unit.land_unit.get_children + (doctype, parent, is_root=False) +

    +

    No docs

    +
    +
    + + + + + + + +

    + + + erpnext.agriculture.doctype.land_unit.land_unit.polygon_area + (coords) +

    +

    No docs

    +
    +
    + + + + + + + +

    + + + erpnext.agriculture.doctype.land_unit.land_unit.rad + (angle_in_degrees) +

    +

    No docs

    +
    +
    + + + + + + + +

    + + + erpnext.agriculture.doctype.land_unit.land_unit.ring_area + (coords) +

    +

    No docs

    +
    +
    + + + + + + +

    Linked In:

    + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/agriculture/linked_land_unit.html b/foundation/www/docs/current/models/agriculture/linked_land_unit.html new file mode 100644 index 00000000..4e3cfe0c --- /dev/null +++ b/foundation/www/docs/current/models/agriculture/linked_land_unit.html @@ -0,0 +1,86 @@ + + + + + + + +

    Linked Land Unit

    +
    + + + Version 10.0.2 + + + Source + +
    + + +Child Table + + +

    Table Name: tabLinked Land Unit

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1land_unit + Link + Land Unit + + + + + + +Land Unit + + + +
    + + + + +

    Child Table Of

    + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/agriculture/linked_plant_analysis.html b/foundation/www/docs/current/models/agriculture/linked_plant_analysis.html new file mode 100644 index 00000000..b3814d86 --- /dev/null +++ b/foundation/www/docs/current/models/agriculture/linked_plant_analysis.html @@ -0,0 +1,93 @@ + + + + + + + +

    Linked Plant Analysis

    +
    + + + Version 10.0.2 + + + Source + +
    + + +Child Table + + +

    Table Name: tabLinked Plant Analysis

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1plant_analysis + Link + Plant Analysis + + + + + + +Plant Analysis + + + +
    + + + + +

    Child Table Of

    + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/agriculture/linked_soil_analysis.html b/foundation/www/docs/current/models/agriculture/linked_soil_analysis.html new file mode 100644 index 00000000..b572c3bb --- /dev/null +++ b/foundation/www/docs/current/models/agriculture/linked_soil_analysis.html @@ -0,0 +1,93 @@ + + + + + + + +

    Linked Soil Analysis

    +
    + + + Version 10.0.2 + + + Source + +
    + + +Child Table + + +

    Table Name: tabLinked Soil Analysis

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1soil_analysis + Link + Soil Analysis + + + + + + +Soil Analysis + + + +
    + + + + +

    Child Table Of

    + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/agriculture/linked_soil_texture.html b/foundation/www/docs/current/models/agriculture/linked_soil_texture.html new file mode 100644 index 00000000..cc49acc4 --- /dev/null +++ b/foundation/www/docs/current/models/agriculture/linked_soil_texture.html @@ -0,0 +1,93 @@ + + + + + + + +

    Linked Soil Texture

    +
    + + + Version 10.0.2 + + + Source + +
    + + +Child Table + + +

    Table Name: tabLinked Soil Texture

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1soil_texture + Link + Soil Texture + + + + + + +Soil Texture + + + +
    + + + + +

    Child Table Of

    + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/agriculture/plant_analysis.html b/foundation/www/docs/current/models/agriculture/plant_analysis.html new file mode 100644 index 00000000..9c589834 --- /dev/null +++ b/foundation/www/docs/current/models/agriculture/plant_analysis.html @@ -0,0 +1,231 @@ + + + + + + + +

    Plant Analysis

    +
    + + + Version 10.0.2 + + + Source + +
    + + + + + +

    Table Name: tabPlant Analysis

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1crop + Link + Crop + + + + + + +Crop + + + +
    2section_break_1 + Section Break + + +
    3location + Geolocation + Location + +
    4column_break_2 + Column Break + + +
    5collection_datetime + Datetime + Collection Datetime + +
    6laboratory_testing_datetime + Datetime + Laboratory Testing Datetime + +
    7result_datetime + Datetime + Result Datetime + +
    8section_break_2 + Section Break + Plant Analysis Criterias + +
    9plant_analysis_criteria + Table + + + + + + + +Plant Analysis Criteria + + + +
    + + +
    +

    Controller

    +

    erpnext.agriculture.doctype.plant_analysis.plant_analysis

    + + + + + + + +

    Class PlantAnalysis

    + +

    Inherits from frappe.model.document.Document + +

    +
    +
    + + + + +

    + + + load_contents + (self) +

    +

    No docs

    +
    +
    + + +
    +
    + + + + + + +

    Linked In:

    + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/agriculture/plant_analysis_criteria.html b/foundation/www/docs/current/models/agriculture/plant_analysis_criteria.html new file mode 100644 index 00000000..961fe738 --- /dev/null +++ b/foundation/www/docs/current/models/agriculture/plant_analysis_criteria.html @@ -0,0 +1,122 @@ + + + + + + + +

    Plant Analysis Criteria

    +
    + + + Version 10.0.2 + + + Source + +
    + + +Child Table + + +

    Table Name: tabPlant Analysis Criteria

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1title + Link + Title + + + + + + +Agriculture Analysis Criteria + + + +
    2value + Data + Value + +
    3minimum_permissible_value + Data + Minimum Permissible Value + +
    4maximum_permissible_value + Data + Maximum Permissible Value + +
    + + + + +

    Child Table Of

    + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/agriculture/soil_analysis.html b/foundation/www/docs/current/models/agriculture/soil_analysis.html new file mode 100644 index 00000000..ca35692e --- /dev/null +++ b/foundation/www/docs/current/models/agriculture/soil_analysis.html @@ -0,0 +1,306 @@ + + + + + + + +

    Soil Analysis

    +
    + + + Version 10.0.2 + + + Source + +
    + + + + + +

    Table Name: tabSoil Analysis

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1location + Geolocation + Location + +
    2column_break_2 + Column Break + + +
    3collection_datetime + Datetime + Collection Datetime + +
    4laboratory_testing_datetime + Datetime + Laboratory Testing Datetime + +
    5result_datetime + Datetime + Result Datetime + +
    6section_break_3 + Section Break + + +
    7ca_per_k + Data + Ca/K + +
    8ca_per_mg + Data + Ca/Mg + +
    9mg_per_k + Data + Mg/K + +
    10column_break_31 + Column Break + + +
    11ca_mg_per_k + Data + (Ca+Mg)/K + +
    12ca_per_k_ca_mg + Data + Ca/(K+Ca+Mg) + +
    13section_break_28 + Section Break + + +
    14invoice_number + Data + Invoice Number + +
    15soil_analysis_criterias + Section Break + Soil Analysis Criterias + +
    16soil_analysis_criteria + Table + + + + + + + +Soil Analysis Criteria + + + +
    + + +
    +

    Controller

    +

    erpnext.agriculture.doctype.soil_analysis.soil_analysis

    + + + + + + + +

    Class SoilAnalysis

    + +

    Inherits from frappe.model.document.Document + +

    +
    +
    + + + + +

    + + + load_contents + (self) +

    +

    No docs

    +
    +
    + + +
    +
    + + + + + + +

    Linked In:

    + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/agriculture/soil_analysis_criteria.html b/foundation/www/docs/current/models/agriculture/soil_analysis_criteria.html new file mode 100644 index 00000000..714082a1 --- /dev/null +++ b/foundation/www/docs/current/models/agriculture/soil_analysis_criteria.html @@ -0,0 +1,122 @@ + + + + + + + +

    Soil Analysis Criteria

    +
    + + + Version 10.0.2 + + + Source + +
    + + +Child Table + + +

    Table Name: tabSoil Analysis Criteria

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1title + Link + Title + + + + + + +Agriculture Analysis Criteria + + + +
    2value + Data + Value + +
    3minimum_permissible_value + Data + Minimum Permissible Value + +
    4maximum_permissible_value + Data + Maximum Permissible Value + +
    + + + + +

    Child Table Of

    + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/agriculture/soil_texture.html b/foundation/www/docs/current/models/agriculture/soil_texture.html new file mode 100644 index 00000000..013f41af --- /dev/null +++ b/foundation/www/docs/current/models/agriculture/soil_texture.html @@ -0,0 +1,338 @@ + + + + + + + +

    Soil Texture

    +
    + + + Version 10.0.2 + + + Source + +
    + + + + + +

    Table Name: tabSoil Texture

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1location + Geolocation + Location + +
    2column_break_2 + Column Break + + +
    3collection_datetime + Datetime + Collection Datetime + +
    4laboratory_testing_datetime + Datetime + Laboratory Testing Datetime + +
    5result_datetime + Datetime + Result Datetime + +
    6section_break_4 + Section Break + + +
    7soil_type + Select + Soil Type + + + 
    Select
+Sand
+Loamy Sand
+Sandy Loam
+Loam
+Silt Loam
+Silt
+Sandy Clay Loam
+Clay Loam
+Silty Clay Loam
+Sandy Clay
+Silty Clay
+Clay
    +
    8clay_composition + Percent + Clay Composition (%) + +
    9sand_composition + Percent + Sand Composition (%) + +
    10silt_composition + Percent + Silt Composition (%) + +
    11column_break_6 + Column Break + + +
    12ternary_plot + HTML + Ternary Plot + +
    13section_break_15 + Section Break + Soil Texture Criteria + +
    14soil_texture_criteria + Table + + + + + + + +Soil Texture Criteria + + + +
    + + +
    +

    Controller

    +

    erpnext.agriculture.doctype.soil_texture.soil_texture

    + + + + + + + +

    Class SoilTexture

    + +

    Inherits from frappe.model.document.Document + +

    +
    +
    + + + + +

    + + + get_soil_type + (self) +

    +

    No docs

    +
    +
    + + + + + +

    + + + load_contents + (self) +

    +

    No docs

    +
    +
    + + + + + +

    + + + update_soil_edit + (self, soil_type) +

    +

    No docs

    +
    +
    + + + + + +

    + + + validate + (self) +

    +

    No docs

    +
    +
    + + +
    +
    + + + + + + +

    Linked In:

    + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/agriculture/soil_texture_criteria.html b/foundation/www/docs/current/models/agriculture/soil_texture_criteria.html new file mode 100644 index 00000000..eca36c1f --- /dev/null +++ b/foundation/www/docs/current/models/agriculture/soil_texture_criteria.html @@ -0,0 +1,122 @@ + + + + + + + +

    Soil Texture Criteria

    +
    + + + Version 10.0.2 + + + Source + +
    + + +Child Table + + +

    Table Name: tabSoil Texture Criteria

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1title + Link + Title + + + + + + +Agriculture Analysis Criteria + + + +
    2value + Data + Value + +
    3minimum_permissible_value + Data + Minimum Permissible Value + +
    4maximum_permissible_value + Data + Maximum Permissible Value + +
    + + + + +

    Child Table Of

    + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/agriculture/water_analysis.html b/foundation/www/docs/current/models/agriculture/water_analysis.html new file mode 100644 index 00000000..7e953eb9 --- /dev/null +++ b/foundation/www/docs/current/models/agriculture/water_analysis.html @@ -0,0 +1,320 @@ + + + + + + + +

    Water Analysis

    +
    + + + Version 10.0.2 + + + Source + +
    + + + + + +

    Table Name: tabWater Analysis

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1location + Geolocation + Location + +
    2column_break_2 + Column Break + + +
    3collection_datetime + Datetime + Collection Datetime + +
    4laboratory_testing_datetime + Datetime + Laboratory Testing Datetime + +
    5result_datetime + Datetime + Result Datetime + +
    6section_break_4 + Section Break + + +
    7type_of_sample + Data + Type of Sample + +
    8container + Data + Container + +
    9origin + Data + Origin + +
    10column_break_8 + Column Break + + +
    11collection_temperature + Data + Collection Temperature + +
    12storage_temperature + Data + Storage Temperature + +
    13appearance + Data + Appearance + +
    14person_responsible + Data + Person Responsible + +
    15column_break_29 + Section Break + Water Analysis Criteria + +
    16water_analysis_criteria + Table + + + + + + + +Water Analysis Criteria + + + +
    + + +
    +

    Controller

    +

    erpnext.agriculture.doctype.water_analysis.water_analysis

    + + + + + + + +

    Class WaterAnalysis

    + +

    Inherits from frappe.model.document.Document + +

    +
    +
    + + + + +

    + + + load_contents + (self) +

    +

    No docs

    +
    +
    + + + + + +

    + + + update_lab_result_date + (self) +

    +

    No docs

    +
    +
    + + + + + +

    + + + validate + (self) +

    +

    No docs

    +
    +
    + + +
    +
    + + + + + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/agriculture/water_analysis_criteria.html b/foundation/www/docs/current/models/agriculture/water_analysis_criteria.html new file mode 100644 index 00000000..7868749e --- /dev/null +++ b/foundation/www/docs/current/models/agriculture/water_analysis_criteria.html @@ -0,0 +1,122 @@ + + + + + + + +

    Water Analysis Criteria

    +
    + + + Version 10.0.2 + + + Source + +
    + + +Child Table + + +

    Table Name: tabWater Analysis Criteria

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1title + Link + Title + + + + + + +Agriculture Analysis Criteria + + + +
    2value + Data + Value + +
    3minimum_permissible_value + Data + Minimum Permissible Value + +
    4maximum_permissible_value + Data + Maximum Permissible Value + +
    + + + + +

    Child Table Of

    + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/agriculture/weather.html b/foundation/www/docs/current/models/agriculture/weather.html new file mode 100644 index 00000000..e0f85bfa --- /dev/null +++ b/foundation/www/docs/current/models/agriculture/weather.html @@ -0,0 +1,172 @@ + + + + + + + +

    Weather

    +
    + + + Version 10.0.2 + + + Source + +
    + + + + + +

    Table Name: tabWeather

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1source + Data + Source + +
    2column_break_2 + Column Break + + +
    3date + Date + Date + +
    4section_break_3 + Section Break + + +
    5section_break_9 + Section Break + Weather Parameter + +
    6weather_parameter + Table + + + + + + + +Weather Parameter + + + +
    + + +
    +

    Controller

    +

    erpnext.agriculture.doctype.weather.weather

    + + + + + + + +

    Class Weather

    + +

    Inherits from frappe.model.document.Document + +

    +
    +
    + + + + +

    + + + load_contents + (self) +

    +

    No docs

    +
    +
    + + +
    +
    + + + + + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/agriculture/weather_parameter.html b/foundation/www/docs/current/models/agriculture/weather_parameter.html new file mode 100644 index 00000000..be38349f --- /dev/null +++ b/foundation/www/docs/current/models/agriculture/weather_parameter.html @@ -0,0 +1,122 @@ + + + + + + + +

    Weather Parameter

    +
    + + + Version 10.0.2 + + + Source + +
    + + +Child Table + + +

    Table Name: tabWeather Parameter

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1title + Link + Title + + + + + + +Agriculture Analysis Criteria + + + +
    2value + Data + Value + +
    3minimum_permissible_value + Data + Minimum Permissible Value + +
    4maximum_permissible_value + Data + Maximum Permissible Value + +
    + + + + +

    Child Table Of

    + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/assets/_sidebar.json b/foundation/www/docs/current/models/assets/_sidebar.json new file mode 100644 index 00000000..88f5aab5 --- /dev/null +++ b/foundation/www/docs/current/models/assets/_sidebar.json @@ -0,0 +1,22 @@ +[ + { + "route": "/docs", + "title": "Docs Home" + }, + { + "route": "/docs/user", + "title": "User Guide" + }, + { + "route": "/docs/current/api", + "title": "Server API" + }, + { + "route": "/docs/current/models", + "title": "Models (Reference)" + }, + { + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "title": "Improve Docs" + } +] \ No newline at end of file diff --git a/foundation/www/docs/current/models/accounts/asset.html b/foundation/www/docs/current/models/assets/asset.html similarity index 73% rename from foundation/www/docs/current/models/accounts/asset.html rename to foundation/www/docs/current/models/assets/asset.html index dc442eaf..8aa8bb7a 100644 --- a/foundation/www/docs/current/models/accounts/asset.html +++ b/foundation/www/docs/current/models/assets/asset.html @@ -9,10 +9,10 @@
    - Version 8.11.4 + Version 10.0.2 - Source
    @@ -101,7 +101,7 @@ -Asset Category +Asset Category @@ -123,41 +123,36 @@ Submitted Partially Depreciated Fully Depreciated Sold -Scrapped +Scrapped +In Maintenance +Out of Order 6 - image + asset_owner - Attach Image - - Image + Select + + Asset Owner - + + 
    +Company
+Supplier
+Customer
    + 7 - column_break_3 - - Column Break - - - - - - - - - 8 - company + asset_owner_company Link - Company + Asset Owner Company @@ -173,52 +168,7 @@ Scrapped - 9 - warehouse - - Link - - Warehouse - - - - - - - -Warehouse - - - - - - - - 10 - is_existing_asset - - Check - - Is Existing Asset - - - - - - - 11 - purchase_date - - Date - - Purchase Date - - - - - - - 12 + 8 supplier Link @@ -235,11 +185,131 @@ Scrapped + + + + + 9 + customer + + Link + + Customer + + + + + + + +Customer + + + + + + + + 10 + image + + Attach Image + + Image + + + + + + + 11 + column_break_3 + + Column Break + + + + + + + + + 12 + company + + Link + + Company + + + + + + + +Company + + + 13 + warehouse + + Link + + Warehouse + + + + + + + +Warehouse + + + + + + + + 14 + department + + Link + + Department + + + + + + + +Department + + + + + + + + 15 + purchase_date + + Date + + Purchase Date + + + + + + + 16 purchase_invoice Link @@ -260,7 +330,19 @@ Scrapped - 14 + 17 + is_existing_asset + + Check + + Is Existing Asset + + + + + + + 18 disposal_date Date @@ -272,7 +354,7 @@ Scrapped - 15 + 19 journal_entry_for_scrap Link @@ -293,7 +375,7 @@ Scrapped - 16 + 20 section_break_5 Section Break @@ -305,7 +387,7 @@ Scrapped - 17 + 21 gross_purchase_amount Currency @@ -319,7 +401,19 @@ Scrapped - 18 + 22 + column_break_18 + + Column Break + + + + + + + + + 23 expected_value_after_useful_life Currency @@ -333,7 +427,7 @@ Scrapped - 19 + 24 opening_accumulated_depreciation Currency @@ -346,25 +440,11 @@ Scrapped - - 20 - value_after_depreciation + + 25 + section_break_20 - Currency - - Value After Depreciation - - - - 
    Company:company:default_currency
    - - - - - 21 - column_break_11 - - Column Break + Section Break @@ -373,7 +453,31 @@ Scrapped - 22 + 26 + calculate_depreciation + + Check + + Calculate Depreciation + + + + + + + 27 + section_break_23 + + Section Break + + Depreciation + + + + + + + 28 depreciation_method Select @@ -390,7 +494,21 @@ Manual - 23 + 29 + value_after_depreciation + + Currency + + Value After Depreciation + + + + 
    Company:company:default_currency
    + + + + + 30 total_number_of_depreciations Int @@ -402,7 +520,19 @@ Manual - 24 + 31 + column_break_24 + + Column Break + + + + + + + + + 32 number_of_depreciations_booked Int @@ -414,7 +544,7 @@ Manual - 25 + 33 frequency_of_depreciation Int @@ -426,7 +556,7 @@ Manual - 26 + 34 next_depreciation_date Date @@ -438,7 +568,7 @@ Manual - 27 + 35 section_break_14 Section Break @@ -450,7 +580,7 @@ Manual - 28 + 36 schedules Table @@ -463,15 +593,40 @@ Manual -Depreciation Schedule +Depreciation Schedule + + 37 + section_break_31 + + Section Break + + Maintenance + + + + + - 29 + 38 + maintenance_required + + Check + + Maintenance Required +

    + Check if Asset requires Preventive Maintenance or Calibration

    + + + + + + 39 amended_from Link @@ -484,7 +639,7 @@ Manual -Asset +Asset @@ -497,7 +652,7 @@ Manual

    Controller

    -

    erpnext.accounts.doctype.asset.asset

    +

    erpnext.assets.doctype.asset.asset

    @@ -718,12 +873,30 @@ Manual

    Public API -
    /api/method/erpnext.accounts.doctype.asset.asset.get_item_details +
    /api/method/erpnext.assets.doctype.asset.asset.create_asset_maintenance

    - + - erpnext.accounts.doctype.asset.asset.get_item_details + erpnext.assets.doctype.asset.asset.create_asset_maintenance + (asset, item_code, item_name, asset_category, company) +

    +

    No docs

    +
    +
    + + + + + + +

    Public API +
    /api/method/erpnext.assets.doctype.asset.asset.get_item_details +

    +

    + + + erpnext.assets.doctype.asset.asset.get_item_details (item_code)

    No docs

    @@ -736,12 +909,12 @@ Manual

    Public API -
    /api/method/erpnext.accounts.doctype.asset.asset.make_purchase_invoice +
    /api/method/erpnext.assets.doctype.asset.asset.make_purchase_invoice

    - + - erpnext.accounts.doctype.asset.asset.make_purchase_invoice + erpnext.assets.doctype.asset.asset.make_purchase_invoice (asset, item_code, gross_purchase_amount, company, posting_date)

    No docs

    @@ -754,12 +927,12 @@ Manual

    Public API -
    /api/method/erpnext.accounts.doctype.asset.asset.make_sales_invoice +
    /api/method/erpnext.assets.doctype.asset.asset.make_sales_invoice

    - + - erpnext.accounts.doctype.asset.asset.make_sales_invoice + erpnext.assets.doctype.asset.asset.make_sales_invoice (asset, item_code, company)

    No docs

    @@ -772,12 +945,12 @@ Manual

    Public API -
    /api/method/erpnext.accounts.doctype.asset.asset.transfer_asset +
    /api/method/erpnext.assets.doctype.asset.asset.transfer_asset

    - + - erpnext.accounts.doctype.asset.asset.transfer_asset + erpnext.assets.doctype.asset.asset.transfer_asset (args)

    No docs

    @@ -786,6 +959,22 @@ Manual + + + + +

    + + + erpnext.assets.doctype.asset.asset.update_maintenance_status + () +

    +

    No docs

    +
    +
    + + + @@ -796,7 +985,7 @@ Manual
  • -Asset +Asset
    • @@ -805,7 +994,25 @@ Manual
  • -Asset Movement +Asset Maintenance + +
    • + + + +
  • + + +Asset Movement + +
    • + + + +
  • + + +Asset Repair
    • diff --git a/foundation/www/docs/current/models/accounts/asset_category.html b/foundation/www/docs/current/models/assets/asset_category.html similarity index 92% rename from foundation/www/docs/current/models/accounts/asset_category.html rename to foundation/www/docs/current/models/assets/asset_category.html index 6b8b1d4c..1f820241 100644 --- a/foundation/www/docs/current/models/accounts/asset_category.html +++ b/foundation/www/docs/current/models/assets/asset_category.html @@ -9,10 +9,10 @@
    - Version 8.11.4 + Version 10.0.2 - Source
    @@ -64,7 +64,8 @@ 
     Straight Line
-Double Declining Balance
    +Double Declining Balance +Manual @@ -130,7 +131,7 @@ Double Declining Balance -Asset Category Account +Asset Category Account @@ -143,7 +144,7 @@ Double Declining Balance

    Controller

    -

    erpnext.accounts.doctype.asset_category.asset_category

    +

    erpnext.assets.doctype.asset_category.asset_category

    @@ -188,7 +189,7 @@ Double Declining Balance
  • -Asset +Asset
    • diff --git a/foundation/www/docs/current/models/accounts/asset_category_account.html b/foundation/www/docs/current/models/assets/asset_category_account.html similarity index 94% rename from foundation/www/docs/current/models/accounts/asset_category_account.html rename to foundation/www/docs/current/models/assets/asset_category_account.html index d516f813..b349d47f 100644 --- a/foundation/www/docs/current/models/accounts/asset_category_account.html +++ b/foundation/www/docs/current/models/assets/asset_category_account.html @@ -9,10 +9,10 @@
    - Version 8.11.4 + Version 10.0.2 - Source
    @@ -136,7 +136,7 @@
  • -Asset Category +Asset Category
    • diff --git a/foundation/www/docs/current/models/assets/asset_maintenance.html b/foundation/www/docs/current/models/assets/asset_maintenance.html new file mode 100644 index 00000000..2684a89c --- /dev/null +++ b/foundation/www/docs/current/models/assets/asset_maintenance.html @@ -0,0 +1,423 @@ + + + + + + + +

    Asset Maintenance

    +
    + + + Version 10.0.2 + + + Source + +
    + + + + + +

    Table Name: tabAsset Maintenance

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1asset_name + Link + Asset Name + + + + + + +Asset + + + +
    2asset_category + Read Only + Asset Category + + + 
    asset_name.asset_category
    +
    3item_code + Read Only + Item Code + + + 
    asset_name.item_code
    +
    4item_name + Read Only + Item Name + + + 
    asset_name.item_name
    +
    5column_break_3 + Column Break + + +
    6company + Link + Company + + + + + + +Company + + + +
    7section_break_6 + Section Break + + +
    8maintenance_team + Link + Maintenance Team + + + + + + +Asset Maintenance Team + + + +
    9column_break_9 + Column Break + + +
    10maintenance_manager + Data + Maintenance Manager + + + 
    maintenance_team.maintenance_manager
    +
    11maintenance_manager_name + Read Only + Maintenance Manager Name + + + 
    maintenance_team.maintenance_manager_name
    +
    12section_break_8 + Section Break + Tasks + +
    13asset_maintenance_tasks + Table + Maintenance Tasks + + + + + + +Asset Maintenance Task + + + +
    + + +
    +

    Controller

    +

    erpnext.assets.doctype.asset_maintenance.asset_maintenance

    + + + + + + + +

    Class AssetMaintenance

    + +

    Inherits from frappe.model.document.Document + +

    +
    +
    + + + + +

    + + + on_update + (self) +

    +

    No docs

    +
    +
    + + + + + +

    + + + sync_maintenance_tasks + (self) +

    +

    No docs

    +
    +
    + + + + + +

    + + + validate + (self) +

    +

    No docs

    +
    +
    + + +
    +
    + + + + + + +

    Public API +
    /api/method/erpnext.assets.doctype.asset_maintenance.asset_maintenance.assign_tasks +

    +

    + + + erpnext.assets.doctype.asset_maintenance.asset_maintenance.assign_tasks + (asset_maintenance_name, assign_to_member, maintenance_task, next_due_date) +

    +

    No docs

    +
    +
    + + + + + + +

    Public API +
    /api/method/erpnext.assets.doctype.asset_maintenance.asset_maintenance.calculate_next_due_date +

    +

    + + + erpnext.assets.doctype.asset_maintenance.asset_maintenance.calculate_next_due_date + (periodicity, start_date=None, end_date=None, last_completion_date=None, next_due_date=None) +

    +

    No docs

    +
    +
    + + + + + + +

    Public API +
    /api/method/erpnext.assets.doctype.asset_maintenance.asset_maintenance.get_maintenance_log +

    +

    + + + erpnext.assets.doctype.asset_maintenance.asset_maintenance.get_maintenance_log + (asset_name) +

    +

    No docs

    +
    +
    + + + + + + +

    Public API +
    /api/method/erpnext.assets.doctype.asset_maintenance.asset_maintenance.get_team_members +

    +

    + + + erpnext.assets.doctype.asset_maintenance.asset_maintenance.get_team_members + (doctype, txt, searchfield, start, page_len, filters) +

    +

    No docs

    +
    +
    + + + + + + + +

    + + + erpnext.assets.doctype.asset_maintenance.asset_maintenance.update_maintenance_log + (asset_maintenance, item_code, item_name, task) +

    +

    No docs

    +
    +
    + + + + + + +

    Linked In:

    + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/assets/asset_maintenance_log.html b/foundation/www/docs/current/models/assets/asset_maintenance_log.html new file mode 100644 index 00000000..c04f1f45 --- /dev/null +++ b/foundation/www/docs/current/models/assets/asset_maintenance_log.html @@ -0,0 +1,479 @@ + + + + + + + +

    Asset Maintenance Log

    +
    + + + Version 10.0.2 + + + Source + +
    + + + + + +

    Table Name: tabAsset Maintenance Log

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1asset_maintenance + Link + Asset Maintenance + + + + + + +Asset Maintenance + + + +
    2naming_series + Select + Series + + + 
    AML-
    +
    3asset_name + Read Only + Asset Name + + + 
    asset_maintenance.asset_name
    +
    4column_break_2 + Column Break + + +
    5item_code + Read Only + Item Code + + + 
    asset_maintenance.item_code
    +
    6item_name + Read Only + Item Name + + + 
    asset_maintenance.item_name
    +
    7section_break_5 + Section Break + + +
    8task + Link + Task + + + + + + +Asset Maintenance Task + + + +
    9maintenance_type + Read Only + Maintenance Type + + + 
    task.maintenance_type
    +
    10periodicity + Data + Periodicity + + + 
    task.periodicity
    +
    11assign_to_name + Read Only + Assign To + + + 
    task.assign_to_name
    +
    12column_break_6 + Column Break + + +
    13due_date + Date + Due Date + + + 
    task.next_due_date
    +
    14completion_date + Date + Completion Date + +
    15maintenance_status + Select + Maintenance Status + + + 
    Planned
+Completed
+Cancelled
+Overdue
    +
    16section_break_12 + Section Break + + +
    17has_certificate + Check + Has Certificate + + + 
    task.has_certificate
    +
    18certificate_attachement + Attach + Certificate + +
    19section_break_6 + Column Break + + +
    20description + Read Only + Description + + + 
    task.description
    +
    21column_break_9 + Section Break + + +
    22actions_performed + Text Editor + Actions performed + +
    23amended_from + Link + Amended From + + + + + + +Asset Maintenance Log + + + +
    + + +
    +

    Controller

    +

    erpnext.assets.doctype.asset_maintenance_log.asset_maintenance_log

    + + + + + + + +

    Class AssetMaintenanceLog

    + +

    Inherits from frappe.model.document.Document + +

    +
    +
    + + + + +

    + + + on_submit + (self) +

    +

    No docs

    +
    +
    + + + + + +

    + + + update_maintenance_task + (self) +

    +

    No docs

    +
    +
    + + + + + +

    + + + validate + (self) +

    +

    No docs

    +
    +
    + + +
    +
    + + + + + + +

    Public API +
    /api/method/erpnext.assets.doctype.asset_maintenance_log.asset_maintenance_log.get_maintenance_tasks +

    +

    + + + erpnext.assets.doctype.asset_maintenance_log.asset_maintenance_log.get_maintenance_tasks + (doctype, txt, searchfield, start, page_len, filters) +

    +

    No docs

    +
    +
    + + + + + + +

    Linked In:

    + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/assets/asset_maintenance_task.html b/foundation/www/docs/current/models/assets/asset_maintenance_task.html new file mode 100644 index 00000000..aba42316 --- /dev/null +++ b/foundation/www/docs/current/models/assets/asset_maintenance_task.html @@ -0,0 +1,331 @@ + + + + + + + +

    Asset Maintenance Task

    +
    + + + Version 10.0.2 + + + Source + +
    + + +Child Table + + +

    Table Name: tabAsset Maintenance Task

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1maintenance_task + Data + Maintenance Task + +
    2maintenance_type + Select + Maintenance Type + + + 
    Preventive Maintenance
+Calibration
    +
    3column_break_2 + Column Break + + +
    4maintenance_status + Select + Maintenance Status + + + 
    Planned
+Overdue
+Cancelled
    +
    5section_break_2 + Section Break + + +
    6start_date + Date + Start Date + +
    7periodicity + Select + Periodicity + + + 
    +Daily
+Weekly
+Monthly
+Quarterly
+Yearly
+2 Yearly
    +
    8column_break_4 + Column Break + + +
    9end_date + Date + End Date + +
    10certificate_required + Check + Certificate Required + +
    11section_break_9 + Section Break + + +
    12assign_to + Link + Assign To + + + + + + +User + + + +
    13column_break_10 + Column Break + + +
    14assign_to_name + Read Only + Assign to Name + + + 
    assign_to.full_name
    +
    15section_break_10 + Section Break + + +
    16next_due_date + Date + Next Due Date + +
    17column_break_14 + Column Break + + +
    18last_completion_date + Date + Last Completion Date + +
    19section_break_7 + Section Break + + +
    20description + Text Editor + Description + +
    + + + + +

    Child Table Of

    + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/assets/asset_maintenance_team.html b/foundation/www/docs/current/models/assets/asset_maintenance_team.html new file mode 100644 index 00000000..4e350a0f --- /dev/null +++ b/foundation/www/docs/current/models/assets/asset_maintenance_team.html @@ -0,0 +1,204 @@ + + + + + + + +

    Asset Maintenance Team

    +
    + + + Version 10.0.2 + + + Source + +
    + + + + + +

    Table Name: tabAsset Maintenance Team

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1maintenance_team_name + Data + Maintenance Team Name + +
    2maintenance_manager + Link + Maintenance Manager + + + + + + +User + + + +
    3maintenance_manager_name + Read Only + Maintenance Manager Name + + + 
    maintenance_manager.full_name
    +
    4column_break_2 + Column Break + + +
    5company + Link + Company + + + + + + +Company + + + +
    6section_break_2 + Section Break + + +
    7maintenance_team_members + Table + Maintenance Team Members + + + + + + +Maintenance Team Member + + + +
    + + +
    +

    Controller

    +

    erpnext.assets.doctype.asset_maintenance_team.asset_maintenance_team

    + + + + + + + +

    Class AssetMaintenanceTeam

    + +

    Inherits from frappe.model.document.Document + +

    +
    +
    + +
    +
    + + + + + + +

    Linked In:

    + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/accounts/asset_movement.html b/foundation/www/docs/current/models/assets/asset_movement.html similarity index 94% rename from foundation/www/docs/current/models/accounts/asset_movement.html rename to foundation/www/docs/current/models/assets/asset_movement.html index a9e47aa7..70128e8c 100644 --- a/foundation/www/docs/current/models/accounts/asset_movement.html +++ b/foundation/www/docs/current/models/assets/asset_movement.html @@ -9,10 +9,10 @@
    - Version 8.11.4 + Version 10.0.2 - Source
    @@ -54,7 +54,7 @@ -Asset +Asset @@ -162,7 +162,7 @@ -Asset Movement +Asset Movement @@ -175,7 +175,7 @@

    Controller

    -

    erpnext.accounts.doctype.asset_movement.asset_movement

    +

    erpnext.assets.doctype.asset_movement.asset_movement

    @@ -290,7 +290,7 @@
  • -Asset Movement +Asset Movement
    • diff --git a/foundation/www/docs/current/models/assets/asset_repair.html b/foundation/www/docs/current/models/assets/asset_repair.html new file mode 100644 index 00000000..63579460 --- /dev/null +++ b/foundation/www/docs/current/models/assets/asset_repair.html @@ -0,0 +1,414 @@ + + + + + + + +

    Asset Repair

    +
    + + + Version 10.0.2 + + + Source + +
    + + + + + +

    Table Name: tabAsset Repair

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1asset_name + Link + Asset Name + + + + + + +Asset + + + +
    2naming_series + Select + Series + + + 
    ARLOG-
    +
    3column_break_2 + Column Break + + +
    4item_code + Read Only + Item Code + + + 
    asset_name.item_code
    +
    5item_name + Read Only + Item Name + + + 
    asset_name.item_name
    +
    6section_break_5 + Section Break + + +
    7failure_date + Datetime + Failure Date + +
    8assign_to + Link + Assign To + + + + + + +User + + + +
    9assign_to_name + Read Only + Assign To Name + + + 
    assign_to.full_name
    +
    10column_break_6 + Column Break + + +
    11completion_date + Datetime + Completion Date + +
    12repair_status + Select + Repair Status + + + 
    Pending
+Completed
+Cancelled
    +
    13section_break_9 + Section Break + + +
    14description + Long Text + Error Description + +
    15column_break_9 + Column Break + + +
    16actions_performed + Long Text + Actions performed + +
    17section_break_17 + Section Break + + +
    18downtime + Data + Downtime + +
    19column_break_19 + Column Break + + +
    20repair_cost + Currency + Repair Cost + +
    21amended_from + Link + Amended From + + + + + + +Asset Repair + + + +
    + + +
    +

    Controller

    +

    erpnext.assets.doctype.asset_repair.asset_repair

    + + + + + + + +

    Class AssetRepair

    + +

    Inherits from frappe.model.document.Document + +

    +
    +
    + + + + +

    + + + validate + (self) +

    +

    No docs

    +
    +
    + + +
    +
    + + + + + + +

    Public API +
    /api/method/erpnext.assets.doctype.asset_repair.asset_repair.get_downtime +

    +

    + + + erpnext.assets.doctype.asset_repair.asset_repair.get_downtime + (failure_date, completion_date) +

    +

    No docs

    +
    +
    + + + + + + +

    Linked In:

    + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/accounts/depreciation_schedule.html b/foundation/www/docs/current/models/assets/depreciation_schedule.html similarity index 95% rename from foundation/www/docs/current/models/accounts/depreciation_schedule.html rename to foundation/www/docs/current/models/assets/depreciation_schedule.html index 960ded71..491cd3ca 100644 --- a/foundation/www/docs/current/models/accounts/depreciation_schedule.html +++ b/foundation/www/docs/current/models/assets/depreciation_schedule.html @@ -9,10 +9,10 @@
    - Version 8.11.4 + Version 10.0.2 - Source
    @@ -137,7 +137,7 @@
  • -Asset +Asset
    • diff --git a/foundation/www/docs/current/models/assets/index.html b/foundation/www/docs/current/models/assets/index.html new file mode 100644 index 00000000..ca2f33f8 --- /dev/null +++ b/foundation/www/docs/current/models/assets/index.html @@ -0,0 +1,22 @@ + + + + + +

    Module assets

    +
    + + + Version 10.0.2 + + + Source + +
    + +

    DocTypes for assets

    + +{index} + + \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/schools/__init__.py b/foundation/www/docs/current/models/assets/index.txt similarity index 100% rename from foundation/www/docs/user/manual/en/schools/__init__.py rename to foundation/www/docs/current/models/assets/index.txt diff --git a/foundation/www/docs/current/models/assets/maintenance_team_member.html b/foundation/www/docs/current/models/assets/maintenance_team_member.html new file mode 100644 index 00000000..fb4d9373 --- /dev/null +++ b/foundation/www/docs/current/models/assets/maintenance_team_member.html @@ -0,0 +1,121 @@ + + + + + + + +

    Maintenance Team Member

    +
    + + + Version 10.0.2 + + + Source + +
    + + +Child Table + + +

    Table Name: tabMaintenance Team Member

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1team_member + Link + Team Member + + + + + + +User + + + +
    2full_name + Data + Full Name + + + 
    team_member.full_name
    +
    3maintenance_role + Link + Maintenance Role + + + + + + +Role + + + +
    + + + + +

    Child Table Of

    + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/buying/buying_settings.html b/foundation/www/docs/current/models/buying/buying_settings.html index 1d67d6fb..33265710 100644 --- a/foundation/www/docs/current/models/buying/buying_settings.html +++ b/foundation/www/docs/current/models/buying/buying_settings.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 Supplier Name - + + 
    supplier.supplier_name
    + @@ -166,6 +168,18 @@ Yes 10 + schedule_date + + Date + + Reqd By Date + + + + + + + 11 amended_from Link @@ -186,7 +200,7 @@ Yes - 11 + 12 company Link @@ -207,7 +221,7 @@ Yes - 12 + 13 drop_ship Section Break @@ -219,7 +233,7 @@ Yes - 13 + 14 customer Link @@ -240,7 +254,7 @@ Yes - 14 + 15 customer_name Data @@ -252,7 +266,7 @@ Yes - 15 + 16 column_break_19 Column Break @@ -264,7 +278,7 @@ Yes - 16 + 17 customer_contact_person Link @@ -285,7 +299,7 @@ Yes - 17 + 18 customer_contact_display Small Text @@ -297,7 +311,7 @@ Yes - 18 + 19 customer_contact_mobile Small Text @@ -309,7 +323,7 @@ Yes - 19 + 20 customer_contact_email Code @@ -323,7 +337,7 @@ Yes - 20 + 21 section_addresses Section Break @@ -335,7 +349,7 @@ Yes - 21 + 22 supplier_address Link @@ -356,7 +370,7 @@ Yes - 22 + 23 contact_person Link @@ -377,7 +391,7 @@ Yes - 23 + 24 address_display Small Text @@ -389,7 +403,7 @@ Yes - 24 + 25 contact_display Small Text @@ -401,7 +415,7 @@ Yes - 25 + 26 contact_mobile Small Text @@ -413,7 +427,7 @@ Yes - 26 + 27 contact_email Small Text @@ -425,7 +439,7 @@ Yes - 27 + 28 col_break_address Column Break @@ -437,7 +451,7 @@ Yes - 28 + 29 shipping_address Link @@ -458,7 +472,7 @@ Yes - 29 + 30 shipping_address_display Small Text @@ -470,7 +484,7 @@ Yes - 30 + 31 currency_and_price_list Section Break @@ -484,7 +498,7 @@ Yes - 31 + 32 currency Link @@ -505,7 +519,7 @@ Yes - 32 + 33 conversion_rate Float @@ -517,7 +531,7 @@ Yes - 33 + 34 cb_price_list Column Break @@ -529,7 +543,7 @@ Yes - 34 + 35 buying_price_list Link @@ -550,7 +564,7 @@ Yes - 35 + 36 price_list_currency Link @@ -571,7 +585,7 @@ Yes - 36 + 37 plc_conversion_rate Float @@ -583,7 +597,7 @@ Yes - 37 + 38 ignore_pricing_rule Check @@ -595,7 +609,7 @@ Yes - 38 + 39 items_section Section Break @@ -609,7 +623,7 @@ Yes - 39 + 40 items Table @@ -629,18 +643,6 @@ Yes - - 40 - get_last_purchase_rate - - Button - - Get last purchase rate - - - - - 41 link_to_mrs @@ -733,8 +735,20 @@ Yes - + 48 + total_net_weight + + Float + + Total Net Weight + + + + + + + 49 taxes_section Section Break @@ -748,7 +762,7 @@ Yes - 49 + 50 taxes_and_charges Link @@ -769,7 +783,52 @@ Yes - 50 + 51 + column_break_50 + + Column Break + + + + + + + + + 52 + shipping_rule + + Link + + Shipping Rule + + + + + + + +    Shipping Rule + + + + + + + + 53 + section_break_52 + + Section Break + + + + + + + + + 54 taxes Table @@ -790,7 +849,7 @@ Yes - 51 + 55 sec_tax_breakup Section Break @@ -802,7 +861,7 @@ Yes - 52 + 56 other_charges_calculation Text @@ -814,7 +873,7 @@ Yes - 53 + 57 totals Section Break @@ -828,7 +887,7 @@ Yes - 54 + 58 base_taxes_and_charges_added Currency @@ -842,7 +901,7 @@ Yes - 55 + 59 base_taxes_and_charges_deducted Currency @@ -856,7 +915,7 @@ Yes - 56 + 60 base_total_taxes_and_charges Currency @@ -870,7 +929,7 @@ Yes - 57 + 61 column_break_39 Column Break @@ -882,7 +941,7 @@ Yes - 58 + 62 taxes_and_charges_added Currency @@ -896,7 +955,7 @@ Yes - 59 + 63 taxes_and_charges_deducted Currency @@ -910,7 +969,7 @@ Yes - 60 + 64 total_taxes_and_charges Currency @@ -924,7 +983,7 @@ Yes - 61 + 65 discount_section Section Break @@ -936,7 +995,7 @@ Yes - 62 + 66 apply_discount_on Select @@ -952,7 +1011,7 @@ Net Total - 63 + 67 base_discount_amount Currency @@ -966,7 +1025,7 @@ Net Total - 64 + 68 column_break_45 Column Break @@ -978,7 +1037,7 @@ Net Total - 65 + 69 additional_discount_percentage Float @@ -990,7 +1049,7 @@ Net Total - 66 + 70 discount_amount Currency @@ -1004,7 +1063,7 @@ Net Total - 67 + 71 totals_section Section Break @@ -1016,7 +1075,7 @@ Net Total - 68 + 72 base_grand_total Currency @@ -1030,7 +1089,7 @@ Net Total - 69 + 73 base_rounding_adjustment Currency @@ -1044,7 +1103,7 @@ Net Total - 70 + 74 base_in_words Data @@ -1057,7 +1116,7 @@ Net Total - 71 + 75 base_rounded_total Currency @@ -1071,7 +1130,7 @@ Net Total - 72 + 76 column_break4 Column Break @@ -1083,7 +1142,7 @@ Net Total - 73 + 77 grand_total Currency @@ -1097,7 +1156,7 @@ Net Total - 74 + 78 rounding_adjustment Currency @@ -1111,7 +1170,7 @@ Net Total - 75 + 79 in_words Data @@ -1123,7 +1182,7 @@ Net Total - 76 + 80 advance_paid Currency @@ -1137,7 +1196,61 @@ Net Total - 77 + 81 + payment_schedule_section + + Section Break + + Payment Terms + + + + + + + 82 + payment_terms_template + + Link + + Payment Terms Template + + + + + + + +Payment Terms Template + + + + + + + + 83 + payment_schedule + + Table + + Payment Schedule + + + + + + + +Payment Schedule + + + + + + + + 84 terms_section_break Section Break @@ -1151,7 +1264,7 @@ Net Total - 78 + 85 tc_name Link @@ -1172,7 +1285,7 @@ Net Total - 79 + 86 terms Text Editor @@ -1184,7 +1297,7 @@ Net Total - 80 + 87 more_info Section Break @@ -1196,7 +1309,7 @@ Net Total - 81 + 88 status Select @@ -1218,7 +1331,7 @@ Delivered - 82 + 89 ref_sq Data @@ -1230,7 +1343,7 @@ Delivered - 83 + 90 party_account_currency Link @@ -1251,7 +1364,7 @@ Delivered - 84 + 91 column_break_74 Column Break @@ -1263,7 +1376,7 @@ Delivered - 85 + 92 per_received Percent @@ -1275,7 +1388,7 @@ Delivered - 86 + 93 per_billed Percent @@ -1287,7 +1400,7 @@ Delivered - 87 + 94 column_break5 Section Break @@ -1299,7 +1412,7 @@ Delivered - 88 + 95 letter_head Link @@ -1320,7 +1433,7 @@ Delivered - 89 + 96 select_print_heading Link @@ -1341,7 +1454,7 @@ Delivered - 90 + 97 column_break_86 Column Break @@ -1353,7 +1466,7 @@ Delivered - 91 + 98 group_same_items Check @@ -1365,7 +1478,7 @@ Delivered - 92 + 99 language Data @@ -1376,22 +1489,8 @@ Delivered - - 93 - raw_material_details - - Section Break - - Raw Materials Supplied - - - - 
    fa fa-truck
    - - - - 94 + 100 supplied_items Table @@ -1412,7 +1511,7 @@ Delivered - 95 + 101 subscription_section Section Break @@ -1424,7 +1523,43 @@ Delivered - 96 + 102 + from_date + + Date + + From Date + + + + + + + 103 + to_date + + Date + + To Date + + + + + + + 104 + column_break_97 + + Column Break + + + + + + + + + 105 subscription Link @@ -1444,213 +1579,6 @@ Delivered - - 97 - recurring_order - - Section Break - - Recurring Order - - - - 
    fa fa-time
    - - - - - 98 - column_break - - Column Break - - Settings - - - - - - - 99 - is_recurring - - Check - - Is Recurring - - - - - - - 100 - recurring_id - - Link - - Reference Document - - - - - - - -Purchase Order - - - - - - - - 101 - recurring_type - - Select - - Frequency - - - - 
    Monthly
-Quarterly
-Half-yearly
-Yearly
    - - - - - 102 - repeat_on_day_of_month - - Int - - Repeat on Day of Month - - - - - - - 103 - end_date - - Date - - End Date - - - - - - - 104 - submit_on_creation - - Check - - Submit on creation - - - - - - - 105 - notify_by_email - - Check - - Notify by email - - - - - - - 106 - notification_email_address - - Code - - Notification Email Address - - - - 
    Email
    - - - - - 107 - recurring_print_format - - Link - - Recurring Print Format - - - - - - - -Print Format - - - - - - - - 108 - column_break83 - - Column Break - - This Document - - - - - - - 109 - from_date - - Date - - From Date - - - - - - - 110 - to_date - - Date - - To Date - - - - - - - 111 - next_date - - Date - - Next Date - - - - - @@ -1680,7 +1608,7 @@ Yearly __init__ - (self, arg1, arg2=None) + (self)

    No docs

    @@ -1914,6 +1842,20 @@ Yearly +

    + + + validate_bom_for_subcontracting_items + (self) +

    +

    No docs

    +
    +
    + + + + +

    diff --git a/foundation/www/docs/current/models/buying/purchase_order_item.html b/foundation/www/docs/current/models/buying/purchase_order_item.html index 10a64463..d48c53fb 100644 --- a/foundation/www/docs/current/models/buying/purchase_order_item.html +++ b/foundation/www/docs/current/models/buying/purchase_order_item.html @@ -9,7 +9,7 @@

    - Version 8.11.4 + Version 10.0.2 22 + last_purchase_rate + + Currency + + Last Purchase Rate + + + + 
    currency
    + + + + + 23 base_price_list_rate Currency @@ -338,7 +352,7 @@ - 23 + 24 sec_break2 Section Break @@ -350,7 +364,7 @@ - 24 + 25 rate Currency @@ -364,7 +378,7 @@ - 25 + 26 amount Currency @@ -378,7 +392,7 @@ - 26 + 27 col_break4 Column Break @@ -390,7 +404,7 @@ - 27 + 28 base_rate Currency @@ -404,7 +418,7 @@ - 28 + 29 base_amount Currency @@ -418,7 +432,7 @@ - 29 + 30 pricing_rule Link @@ -439,7 +453,7 @@ - 30 + 31 section_break_29 Section Break @@ -451,7 +465,7 @@ - 31 + 32 net_rate Currency @@ -465,7 +479,7 @@ - 32 + 33 net_amount Currency @@ -479,7 +493,7 @@ - 33 + 34 column_break_32 Column Break @@ -491,7 +505,7 @@ - 34 + 35 base_net_rate Currency @@ -505,7 +519,7 @@ - 35 + 36 base_net_amount Currency @@ -519,7 +533,76 @@ - 36 + 37 + item_weight_details + + Section Break + + Item Weight Details + + + + + + + 38 + weight_per_unit + + Float + + Weight Per Unit + + + + + + + 39 + total_weight + + Float + + Total Weight + + + + + + + 40 + column_break_40 + + Column Break + + + + + + + + + 41 + weight_uom + + Link + + Weight UOM + + + + + + + +    UOM + + + + + + + + 42 warehouse_and_reference Section Break @@ -531,7 +614,7 @@ - 37 + 43 warehouse Link @@ -552,7 +635,7 @@ - 38 + 44 project Link @@ -573,7 +656,7 @@ - 39 + 45 material_request Link @@ -594,7 +677,7 @@ - 40 + 46 material_request_item Data @@ -606,7 +689,7 @@ - 41 + 47 sales_order Link @@ -627,7 +710,7 @@ - 42 + 48 sales_order_item Data @@ -639,7 +722,7 @@ - 43 + 49 supplier_quotation Link @@ -660,7 +743,7 @@ - 44 + 50 supplier_quotation_item Link @@ -681,7 +764,7 @@ - 45 + 51 delivered_by_supplier Check @@ -693,7 +776,7 @@ - 46 + 52 col_break5 Column Break @@ -705,7 +788,7 @@ - 47 + 53 item_group Link @@ -726,7 +809,7 @@ - 48 + 54 brand Link @@ -747,7 +830,7 @@ - 49 + 55 bom Link @@ -768,7 +851,7 @@ - 50 + 56 stock_qty Float @@ -780,7 +863,7 @@ - 51 + 57 received_qty Float @@ -792,7 +875,7 @@ - 52 + 58 returned_qty Float @@ -804,7 +887,7 @@ - 53 + 59 billed_amt Currency @@ -818,7 +901,7 @@ - 54 + 60 item_tax_rate Code @@ -832,7 +915,7 @@ Used for Taxes and Charges

    - 55 + 61 page_break Check diff --git a/foundation/www/docs/current/models/buying/purchase_order_item_supplied.html b/foundation/www/docs/current/models/buying/purchase_order_item_supplied.html index 48cf8942..e7bad534 100644 --- a/foundation/www/docs/current/models/buying/purchase_order_item_supplied.html +++ b/foundation/www/docs/current/models/buying/purchase_order_item_supplied.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 20 - credit_days_based_on + payment_terms - Select + Link - Credit Days Based On + Default Payment Terms Template - 
    -Fixed Days
-Last Day of the Next Month
    - - - - - 21 - credit_days - - Int - - Credit Days + + + + +    Payment Terms Template + + - - 22 + 21 address_contacts Section Break @@ -360,7 +353,7 @@ Last Day of the Next Month - 23 + 22 address_html HTML @@ -372,7 +365,7 @@ Last Day of the Next Month - 24 + 23 column_break1 Column Break @@ -384,7 +377,7 @@ Last Day of the Next Month - 25 + 24 contact_html HTML @@ -396,7 +389,7 @@ Last Day of the Next Month - 26 + 25 default_payable_accounts Section Break @@ -408,7 +401,7 @@ Last Day of the Next Month - 27 + 26 accounts Table @@ -430,7 +423,7 @@ Last Day of the Next Month - 28 + 27 column_break2 Section Break @@ -442,7 +435,7 @@ Last Day of the Next Month - 29 + 28 website Data @@ -454,7 +447,7 @@ Last Day of the Next Month - 30 + 29 supplier_details Text @@ -467,7 +460,7 @@ Last Day of the Next Month - 31 + 30 is_frozen Check @@ -627,7 +620,7 @@ Last Day of the Next Month
  • -Asset +Asset
    • @@ -804,6 +797,15 @@ Last Day of the Next Month +
  • + + +Training Program + +
    • + + +
  • diff --git a/foundation/www/docs/current/models/buying/supplier_quotation.html b/foundation/www/docs/current/models/buying/supplier_quotation.html index 7fb8a813..9315dade 100644 --- a/foundation/www/docs/current/models/buying/supplier_quotation.html +++ b/foundation/www/docs/current/models/buying/supplier_quotation.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 - + + 
    supplier.supplier_name
    + @@ -535,8 +537,20 @@ - + 34 + total_net_weight + + Float + + Total Net Weight + + + + + + + 35 taxes_section Section Break @@ -550,7 +564,7 @@ - 35 + 36 taxes_and_charges Link @@ -571,7 +585,52 @@ - 36 + 37 + column_break_36 + + Column Break + + + + + + + + + 38 + shipping_rule + + Link + + Shipping Rule + + + + + + + +    Shipping Rule + + + + + + + + 39 + section_break_38 + + Section Break + + + + + + + + + 40 taxes Table @@ -592,7 +651,7 @@ - 37 + 41 tax_breakup Section Break @@ -604,7 +663,7 @@ - 38 + 42 other_charges_calculation Text @@ -616,7 +675,7 @@ - 39 + 43 totals Section Break @@ -630,7 +689,7 @@ - 40 + 44 base_taxes_and_charges_added Currency @@ -644,7 +703,7 @@ - 41 + 45 base_taxes_and_charges_deducted Currency @@ -658,7 +717,7 @@ - 42 + 46 base_total_taxes_and_charges Currency @@ -672,7 +731,7 @@ - 43 + 47 column_break_37 Column Break @@ -684,7 +743,7 @@ - 44 + 48 taxes_and_charges_added Currency @@ -698,7 +757,7 @@ - 45 + 49 taxes_and_charges_deducted Currency @@ -712,7 +771,7 @@ - 46 + 50 total_taxes_and_charges Currency @@ -726,7 +785,7 @@ - 47 + 51 section_break_41 Section Break @@ -738,7 +797,7 @@ - 48 + 52 apply_discount_on Select @@ -754,7 +813,7 @@ Net Total - 49 + 53 base_discount_amount Currency @@ -768,7 +827,7 @@ Net Total - 50 + 54 column_break_43 Column Break @@ -780,7 +839,7 @@ Net Total - 51 + 55 additional_discount_percentage Float @@ -792,7 +851,7 @@ Net Total - 52 + 56 discount_amount Currency @@ -806,7 +865,7 @@ Net Total - 53 + 57 section_break_46 Section Break @@ -818,7 +877,7 @@ Net Total - 54 + 58 base_grand_total Currency @@ -832,7 +891,7 @@ Net Total - 55 + 59 base_rounding_adjustment Currency @@ -846,7 +905,7 @@ Net Total - 56 + 60 base_in_words Data @@ -858,7 +917,7 @@ Net Total - 57 + 61 base_rounded_total Currency @@ -872,7 +931,7 @@ Net Total - 58 + 62 column_break4 Column Break @@ -884,7 +943,7 @@ Net Total - 59 + 63 grand_total Currency @@ -898,7 +957,7 @@ Net Total - 60 + 64 rounding_adjustment Currency @@ -912,7 +971,7 @@ Net Total - 61 + 65 in_words Data @@ -924,7 +983,7 @@ Net Total - 62 + 66 terms_section_break Section Break @@ -938,7 +997,7 @@ Net Total - 63 + 67 tc_name Link @@ -959,7 +1018,7 @@ Net Total - 64 + 68 terms Text Editor @@ -971,7 +1030,7 @@ Net Total - 65 + 69 printing_settings Section Break @@ -983,7 +1042,7 @@ Net Total - 66 + 70 select_print_heading Link @@ -1004,7 +1063,7 @@ Net Total - 67 + 71 letter_head Link @@ -1025,7 +1084,7 @@ Net Total - 68 + 72 language Data @@ -1037,7 +1096,7 @@ Net Total - 69 + 73 subscription_section Section Break @@ -1049,7 +1108,7 @@ Net Total - 70 + 74 subscription Link @@ -1070,7 +1129,7 @@ Net Total - 71 + 75 more_info Section Break @@ -1084,7 +1143,7 @@ Net Total - 72 + 76 status Select @@ -1102,7 +1161,7 @@ Cancelled - 73 + 77 column_break_57 Column Break @@ -1114,7 +1173,7 @@ Cancelled - 74 + 78 is_subcontracted Select @@ -1130,7 +1189,7 @@ No - 75 + 79 reference Section Break @@ -1142,7 +1201,7 @@ No - 76 + 80 opportunity Link diff --git a/foundation/www/docs/current/models/buying/supplier_quotation_item.html b/foundation/www/docs/current/models/buying/supplier_quotation_item.html index 99efa669..cfd1f1ca 100644 --- a/foundation/www/docs/current/models/buying/supplier_quotation_item.html +++ b/foundation/www/docs/current/models/buying/supplier_quotation_item.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 19 + stock_qty + + Float + + Qty as per Stock UOM + + + + + + + 20 base_price_list_rate Currency @@ -302,7 +314,7 @@ - 20 + 21 sec_break1 Section Break @@ -314,7 +326,7 @@ - 21 + 22 rate Currency @@ -328,7 +340,7 @@ - 22 + 23 amount Currency @@ -342,7 +354,7 @@ - 23 + 24 col_break3 Column Break @@ -354,7 +366,7 @@ - 24 + 25 base_rate Currency @@ -368,7 +380,7 @@ - 25 + 26 base_amount Currency @@ -382,7 +394,7 @@ - 26 + 27 pricing_rule Link @@ -403,7 +415,7 @@ - 27 + 28 section_break_24 Section Break @@ -415,7 +427,7 @@ - 28 + 29 net_rate Currency @@ -427,7 +439,7 @@ - 29 + 30 net_amount Currency @@ -441,7 +453,7 @@ - 30 + 31 column_break_27 Column Break @@ -453,7 +465,7 @@ - 31 + 32 base_net_rate Currency @@ -467,7 +479,7 @@ - 32 + 33 base_net_amount Currency @@ -481,7 +493,76 @@ - 33 + 34 + item_weight_details + + Section Break + + Item Weight Details + + + + + + + 35 + weight_per_unit + + Float + + Weight Per Unit + + + + + + + 36 + total_weight + + Float + + Total Weight + + + + + + + 37 + column_break_23 + + Column Break + + + + + + + + + 38 + weight_uom + + Link + + Weight UOM + + + + + + + +UOM + + + + + + + + 39 warehouse_and_reference Section Break @@ -493,7 +574,7 @@ - 34 + 40 warehouse Link @@ -514,7 +595,7 @@ - 35 + 41 project Link @@ -535,7 +616,7 @@ - 36 + 42 prevdoc_doctype Data @@ -547,7 +628,7 @@ - 37 + 43 material_request Link @@ -568,7 +649,7 @@ - 38 + 44 request_for_quotation Link @@ -589,7 +670,7 @@ - 39 + 45 col_break4 Column Break @@ -601,7 +682,7 @@ - 40 + 46 material_request_item Data @@ -613,7 +694,7 @@ - 41 + 47 request_for_quotation_item Data @@ -625,7 +706,7 @@ - 42 + 48 brand Link @@ -646,7 +727,7 @@ - 43 + 49 item_group Link @@ -667,7 +748,7 @@ - 44 + 50 item_tax_rate Code @@ -681,7 +762,7 @@ Used for Taxes and Charges

    - 45 + 51 section_break_44 Section Break @@ -693,19 +774,7 @@ Used for Taxes and Charges

    - 46 - stock_qty - - Float - - Qty as per Stock UOM - - - - - - - 47 + 52 page_break Check diff --git a/foundation/www/docs/current/models/buying/supplier_scorecard.html b/foundation/www/docs/current/models/buying/supplier_scorecard.html index 5eeed219..39b5243f 100644 --- a/foundation/www/docs/current/models/buying/supplier_scorecard.html +++ b/foundation/www/docs/current/models/buying/supplier_scorecard.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - + 1 + organization_lead + + Check + + Lead is an Organization + + + + + + + 2 lead_details Section Break @@ -55,7 +67,7 @@ - 2 + 3 naming_series Select @@ -69,7 +81,7 @@ - 3 + 4 lead_name Data @@ -81,7 +93,7 @@ - 4 + 5 company_name Data @@ -93,7 +105,7 @@ - 5 + 6 email_id Data @@ -107,7 +119,7 @@ - 6 + 7 col_break123 Column Break @@ -119,7 +131,7 @@ - 7 + 8 status Select @@ -141,7 +153,7 @@ Do Not Contact - 8 + 9 gender Link @@ -162,7 +174,7 @@ Do Not Contact - 9 + 10 source Link @@ -183,7 +195,7 @@ Do Not Contact - 10 + 11 customer Link @@ -204,7 +216,7 @@ Do Not Contact - 11 + 12 campaign_name Link @@ -225,7 +237,7 @@ Do Not Contact - 12 + 13 image Attach Image @@ -237,7 +249,7 @@ Do Not Contact - 13 + 14 section_break_12 Section Break @@ -249,7 +261,7 @@ Do Not Contact - 14 + 15 lead_owner Link @@ -270,7 +282,7 @@ Do Not Contact - 15 + 16 column_break_14 Column Break @@ -282,7 +294,7 @@ Do Not Contact - 16 + 17 contact_date Datetime @@ -294,7 +306,7 @@ Do Not Contact - 17 + 18 contact_by Link @@ -315,7 +327,7 @@ Do Not Contact - 18 + 19 contact_info Section Break @@ -329,7 +341,7 @@ Do Not Contact - 19 + 20 address_desc HTML @@ -341,7 +353,7 @@ Do Not Contact - 20 + 21 address_html HTML @@ -353,7 +365,7 @@ Do Not Contact - 21 + 22 column_break2 Column Break @@ -365,7 +377,19 @@ Do Not Contact - 22 + 23 + contact_html + + HTML + + Contact HTML + + + + + + + 24 phone Data @@ -377,7 +401,7 @@ Do Not Contact - 23 + 25 salutation Link @@ -398,7 +422,7 @@ Do Not Contact - 24 + 26 mobile_no Data @@ -410,7 +434,7 @@ Do Not Contact - 25 + 27 fax Data @@ -422,7 +446,7 @@ Do Not Contact - 26 + 28 website Data @@ -434,7 +458,7 @@ Do Not Contact - 27 + 29 territory Link @@ -455,7 +479,7 @@ Do Not Contact - 28 + 30 more_info Section Break @@ -469,7 +493,7 @@ Do Not Contact - 29 + 31 type Select @@ -486,7 +510,7 @@ Consultant - 30 + 32 market_segment Select @@ -503,7 +527,7 @@ Upper Income - 31 + 33 industry Link @@ -524,7 +548,7 @@ Upper Income - 32 + 34 request_type Select @@ -542,7 +566,7 @@ Other - 33 + 35 column_break3 Column Break @@ -554,7 +578,7 @@ Other - 34 + 36 company Link @@ -575,7 +599,7 @@ Other - 35 + 37 unsubscribed Check @@ -587,7 +611,7 @@ Other - 36 + 38 blog_subscriber Check @@ -763,6 +787,20 @@ Other +

    + + + set_lead_name + (self) +

    +

    No docs

    +
    +
    + + + + +

    diff --git a/foundation/www/docs/current/models/crm/opportunity.html b/foundation/www/docs/current/models/crm/opportunity.html index b56ab23e..1383933f 100644 --- a/foundation/www/docs/current/models/crm/opportunity.html +++ b/foundation/www/docs/current/models/crm/opportunity.html @@ -9,7 +9,7 @@

    - Version 8.11.4 + Version 10.0.2 9 - enquiry_type + opportunity_type - Select + Link Opportunity Type - 
    Sales
-Maintenance
    + + + + +    Opportunity Type + + + diff --git a/foundation/www/docs/current/models/crm/opportunity_item.html b/foundation/www/docs/current/models/crm/opportunity_item.html index a17604ae..6402265d 100644 --- a/foundation/www/docs/current/models/crm/opportunity_item.html +++ b/foundation/www/docs/current/models/crm/opportunity_item.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 + + + + + + +

    Opportunity Type

    +
    + + + Version 10.0.2 + + + Source + +
    + + + + + +

    Table Name: tabOpportunity Type

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1description + Small Text + Description + +
    + + +
    +

    Controller

    +

    erpnext.crm.doctype.opportunity_type.opportunity_type

    + + + + + + + +

    Class OpportunityType

    + +

    Inherits from frappe.model.document.Document + +

    +
    +
    + +
    +
    + + + + + + +

    Linked In:

    + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/education/_sidebar.json b/foundation/www/docs/current/models/education/_sidebar.json new file mode 100644 index 00000000..88f5aab5 --- /dev/null +++ b/foundation/www/docs/current/models/education/_sidebar.json @@ -0,0 +1,22 @@ +[ + { + "route": "/docs", + "title": "Docs Home" + }, + { + "route": "/docs/user", + "title": "User Guide" + }, + { + "route": "/docs/current/api", + "title": "Server API" + }, + { + "route": "/docs/current/models", + "title": "Models (Reference)" + }, + { + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "title": "Improve Docs" + } +] \ No newline at end of file diff --git a/foundation/www/docs/current/models/schools/academic_term.html b/foundation/www/docs/current/models/education/academic_term.html similarity index 75% rename from foundation/www/docs/current/models/schools/academic_term.html rename to foundation/www/docs/current/models/education/academic_term.html index 610d3350..402f71d8 100644 --- a/foundation/www/docs/current/models/schools/academic_term.html +++ b/foundation/www/docs/current/models/education/academic_term.html @@ -9,10 +9,10 @@
    - Version 8.11.4 + Version 10.0.2 - Source
    @@ -54,7 +54,7 @@ -Academic Year +Academic Year @@ -115,7 +115,7 @@

    Controller

    -

    erpnext.schools.doctype.academic_term.academic_term

    +

    erpnext.education.doctype.academic_term.academic_term

    @@ -169,9 +169,9 @@

    - + - erpnext.schools.doctype.academic_term.academic_term.validate_duplication + erpnext.education.doctype.academic_term.academic_term.validate_duplication (self)

    No docs

    @@ -190,7 +190,7 @@
  • -Course Scheduling Tool +Course Scheduling Tool
    • @@ -199,7 +199,7 @@
  • -Fee Schedule +Education Settings
    • @@ -208,7 +208,7 @@
  • -Fee Structure +Fee Schedule
    • @@ -217,7 +217,7 @@
  • -Fees +Fee Structure
    • @@ -226,7 +226,7 @@
  • -Program Enrollment +Fees
    • @@ -235,7 +235,7 @@
  • -Program Enrollment Fee +Program Enrollment
    • @@ -244,7 +244,7 @@
  • -Program Fee +Program Enrollment Fee
    • @@ -253,7 +253,7 @@
  • -School Settings +Program Fee
    • @@ -262,7 +262,7 @@
  • -Student Group +Student Group
    • @@ -271,7 +271,7 @@
  • -Student Group Creation Tool +Student Group Creation Tool
    • @@ -280,7 +280,7 @@
  • -Student Log +Student Log
    • diff --git a/foundation/www/docs/current/models/schools/academic_year.html b/foundation/www/docs/current/models/education/academic_year.html similarity index 72% rename from foundation/www/docs/current/models/schools/academic_year.html rename to foundation/www/docs/current/models/education/academic_year.html index 9e3ea4be..8e885542 100644 --- a/foundation/www/docs/current/models/schools/academic_year.html +++ b/foundation/www/docs/current/models/education/academic_year.html @@ -9,10 +9,10 @@
    - Version 8.11.4 + Version 10.0.2 - Source
    @@ -82,7 +82,7 @@

    Controller

    -

    erpnext.schools.doctype.academic_year.academic_year

    +

    erpnext.education.doctype.academic_year.academic_year

    @@ -127,7 +127,7 @@
  • -Academic Term +Academic Term
    • @@ -136,7 +136,7 @@
  • -Course Scheduling Tool +Course Scheduling Tool
    • @@ -145,7 +145,7 @@
  • -Fee Schedule +Education Settings
    • @@ -154,7 +154,7 @@
  • -Fee Structure +Fee Schedule
    • @@ -163,7 +163,7 @@
  • -Fees +Fee Structure
    • @@ -172,7 +172,7 @@
  • -Program Enrollment +Fees
    • @@ -181,7 +181,7 @@
  • -Program Enrollment Tool +Program Enrollment
    • @@ -190,7 +190,7 @@
  • -School Settings +Program Enrollment Tool
    • @@ -199,7 +199,7 @@
  • -Student Admission +Student Admission
    • @@ -208,7 +208,7 @@
  • -Student Applicant +Student Applicant
    • @@ -217,7 +217,7 @@
  • -Student Group +Student Group
    • @@ -226,7 +226,7 @@
  • -Student Group Creation Tool +Student Group Creation Tool
    • @@ -235,7 +235,7 @@
  • -Student Log +Student Log
    • diff --git a/foundation/www/docs/current/models/schools/assessment_criteria.html b/foundation/www/docs/current/models/education/assessment_criteria.html similarity index 79% rename from foundation/www/docs/current/models/schools/assessment_criteria.html rename to foundation/www/docs/current/models/education/assessment_criteria.html index 58cc1552..065c9b0f 100644 --- a/foundation/www/docs/current/models/schools/assessment_criteria.html +++ b/foundation/www/docs/current/models/education/assessment_criteria.html @@ -9,10 +9,10 @@
    - Version 8.11.4 + Version 10.0.2 - Source
    @@ -66,7 +66,7 @@ -Assessment Criteria Group +Assessment Criteria Group @@ -79,7 +79,7 @@

    Controller

    -

    erpnext.schools.doctype.assessment_criteria.assessment_criteria

    +

    erpnext.education.doctype.assessment_criteria.assessment_criteria

    @@ -110,7 +110,7 @@
  • -Assessment Plan Criteria +Assessment Plan Criteria
    • @@ -119,7 +119,7 @@
  • -Assessment Result Detail +Assessment Result Detail
    • @@ -128,7 +128,7 @@
  • -Course Assessment Criteria +Course Assessment Criteria
    • diff --git a/foundation/www/docs/current/models/schools/assessment_criteria_group.html b/foundation/www/docs/current/models/education/assessment_criteria_group.html similarity index 86% rename from foundation/www/docs/current/models/schools/assessment_criteria_group.html rename to foundation/www/docs/current/models/education/assessment_criteria_group.html index 30d46477..0f4f9f10 100644 --- a/foundation/www/docs/current/models/schools/assessment_criteria_group.html +++ b/foundation/www/docs/current/models/education/assessment_criteria_group.html @@ -9,10 +9,10 @@
    - Version 8.11.4 + Version 10.0.2 - Source
    @@ -58,7 +58,7 @@

    Controller

    -

    erpnext.schools.doctype.assessment_criteria_group.assessment_criteria_group

    +

    erpnext.education.doctype.assessment_criteria_group.assessment_criteria_group

    @@ -89,7 +89,7 @@
  • -Assessment Criteria +Assessment Criteria
    • diff --git a/foundation/www/docs/current/models/schools/assessment_group.html b/foundation/www/docs/current/models/education/assessment_group.html similarity index 87% rename from foundation/www/docs/current/models/schools/assessment_group.html rename to foundation/www/docs/current/models/education/assessment_group.html index 061dcd90..c7c6c316 100644 --- a/foundation/www/docs/current/models/schools/assessment_group.html +++ b/foundation/www/docs/current/models/education/assessment_group.html @@ -9,10 +9,10 @@
    - Version 8.11.4 + Version 10.0.2 - Source
    @@ -90,7 +90,7 @@ -Assessment Group +Assessment Group @@ -135,7 +135,7 @@ -Assessment Group +Assessment Group @@ -148,7 +148,7 @@

    Controller

    -

    erpnext.schools.doctype.assessment_group.assessment_group

    +

    erpnext.education.doctype.assessment_group.assessment_group

    @@ -179,7 +179,7 @@
  • -Assessment Group +Assessment Group
    • @@ -188,7 +188,7 @@
  • -Assessment Plan +Assessment Plan
    • diff --git a/foundation/www/docs/current/models/schools/assessment_plan.html b/foundation/www/docs/current/models/education/assessment_plan.html similarity index 89% rename from foundation/www/docs/current/models/schools/assessment_plan.html rename to foundation/www/docs/current/models/education/assessment_plan.html index 0554a339..bd3fd141 100644 --- a/foundation/www/docs/current/models/schools/assessment_plan.html +++ b/foundation/www/docs/current/models/education/assessment_plan.html @@ -9,10 +9,10 @@
    - Version 8.11.4 + Version 10.0.2 - Source
    @@ -66,7 +66,7 @@ -Student Group +Student Group @@ -87,7 +87,7 @@ -Course +Course @@ -120,7 +120,7 @@ -Assessment Group +Assessment Group @@ -153,7 +153,7 @@ -Grading Scale +Grading Scale @@ -198,7 +198,7 @@ -Room +Room @@ -219,7 +219,7 @@ -Instructor +Instructor @@ -288,7 +288,7 @@ -Instructor +Instructor @@ -333,7 +333,7 @@ -Assessment Plan Criteria +Assessment Plan Criteria @@ -354,7 +354,7 @@ -Assessment Plan +Assessment Plan @@ -367,7 +367,7 @@

    Controller

    -

    erpnext.schools.doctype.assessment_plan.assessment_plan

    +

    erpnext.education.doctype.assessment_plan.assessment_plan

    @@ -454,7 +454,7 @@
  • -Assessment Plan +Assessment Plan
    • @@ -463,7 +463,7 @@
  • -Assessment Result +Assessment Result
    • @@ -472,7 +472,7 @@
  • -Assessment Result Tool +Assessment Result Tool
    • diff --git a/foundation/www/docs/current/models/schools/assessment_plan_criteria.html b/foundation/www/docs/current/models/education/assessment_plan_criteria.html similarity index 88% rename from foundation/www/docs/current/models/schools/assessment_plan_criteria.html rename to foundation/www/docs/current/models/education/assessment_plan_criteria.html index 7865cbd9..a6bf6b09 100644 --- a/foundation/www/docs/current/models/schools/assessment_plan_criteria.html +++ b/foundation/www/docs/current/models/education/assessment_plan_criteria.html @@ -9,10 +9,10 @@
    - Version 8.11.4 + Version 10.0.2 - Source
    @@ -54,7 +54,7 @@ -Assessment Criteria +Assessment Criteria @@ -97,7 +97,7 @@
  • -Assessment Plan +Assessment Plan
    • diff --git a/foundation/www/docs/current/models/schools/assessment_result.html b/foundation/www/docs/current/models/education/assessment_result.html similarity index 91% rename from foundation/www/docs/current/models/schools/assessment_result.html rename to foundation/www/docs/current/models/education/assessment_result.html index 81bc360f..ee377458 100644 --- a/foundation/www/docs/current/models/schools/assessment_result.html +++ b/foundation/www/docs/current/models/education/assessment_result.html @@ -9,10 +9,10 @@
    - Version 8.11.4 + Version 10.0.2 - Source
    @@ -54,7 +54,7 @@ -Student +Student @@ -99,7 +99,7 @@ -Assessment Plan +Assessment Plan @@ -120,7 +120,7 @@ -Grading Scale +Grading Scale @@ -153,7 +153,7 @@ -Assessment Result Detail +Assessment Result Detail @@ -258,7 +258,7 @@ -Assessment Result +Assessment Result @@ -271,7 +271,7 @@

    Controller

    -

    erpnext.schools.doctype.assessment_result.assessment_result

    +

    erpnext.education.doctype.assessment_result.assessment_result

    @@ -358,7 +358,7 @@
  • -Assessment Result +Assessment Result
    • diff --git a/foundation/www/docs/current/models/schools/assessment_result_detail.html b/foundation/www/docs/current/models/education/assessment_result_detail.html similarity index 90% rename from foundation/www/docs/current/models/schools/assessment_result_detail.html rename to foundation/www/docs/current/models/education/assessment_result_detail.html index a470ec73..84539ded 100644 --- a/foundation/www/docs/current/models/schools/assessment_result_detail.html +++ b/foundation/www/docs/current/models/education/assessment_result_detail.html @@ -9,10 +9,10 @@
    - Version 8.11.4 + Version 10.0.2 - Source
    @@ -54,7 +54,7 @@ -Assessment Criteria +Assessment Criteria @@ -121,7 +121,7 @@
  • -Assessment Result +Assessment Result
    • diff --git a/foundation/www/docs/current/models/schools/assessment_result_tool.html b/foundation/www/docs/current/models/education/assessment_result_tool.html similarity index 89% rename from foundation/www/docs/current/models/schools/assessment_result_tool.html rename to foundation/www/docs/current/models/education/assessment_result_tool.html index 079f2450..203c3c08 100644 --- a/foundation/www/docs/current/models/schools/assessment_result_tool.html +++ b/foundation/www/docs/current/models/education/assessment_result_tool.html @@ -9,10 +9,10 @@
    - Version 8.11.4 + Version 10.0.2 - Source
    @@ -52,7 +52,7 @@ -Assessment Plan +Assessment Plan @@ -85,7 +85,7 @@ -Student Group +Student Group @@ -122,7 +122,7 @@

    Controller

    -

    erpnext.schools.doctype.assessment_result_tool.assessment_result_tool

    +

    erpnext.education.doctype.assessment_result_tool.assessment_result_tool

    diff --git a/foundation/www/docs/current/models/schools/course.html b/foundation/www/docs/current/models/education/course.html similarity index 86% rename from foundation/www/docs/current/models/schools/course.html rename to foundation/www/docs/current/models/education/course.html index 4dc1ab0b..60b6396d 100644 --- a/foundation/www/docs/current/models/schools/course.html +++ b/foundation/www/docs/current/models/education/course.html @@ -9,10 +9,10 @@
    - Version 8.11.4 + Version 10.0.2 - Source
    @@ -171,7 +171,7 @@ -Grading Scale +Grading Scale @@ -192,7 +192,7 @@ -Course Assessment Criteria +Course Assessment Criteria @@ -205,7 +205,7 @@

    Controller

    -

    erpnext.schools.doctype.course.course

    +

    erpnext.education.doctype.course.course

    @@ -264,7 +264,7 @@
  • -Assessment Plan +Assessment Plan
    • @@ -273,7 +273,7 @@
  • -Course Schedule +Course Schedule
    • @@ -282,7 +282,7 @@
  • -Course Scheduling Tool +Course Scheduling Tool
    • @@ -291,7 +291,7 @@
  • -Program Course +Program Course
    • @@ -300,7 +300,7 @@
  • -Program Enrollment Course +Program Enrollment Course
    • @@ -309,7 +309,7 @@
  • -Student Group +Student Group
    • @@ -318,7 +318,7 @@
  • -Student Group Creation Tool Course +Student Group Creation Tool Course
    • diff --git a/foundation/www/docs/current/models/schools/course_assessment_criteria.html b/foundation/www/docs/current/models/education/course_assessment_criteria.html similarity index 89% rename from foundation/www/docs/current/models/schools/course_assessment_criteria.html rename to foundation/www/docs/current/models/education/course_assessment_criteria.html index 3667cc7e..f876c52d 100644 --- a/foundation/www/docs/current/models/schools/course_assessment_criteria.html +++ b/foundation/www/docs/current/models/education/course_assessment_criteria.html @@ -9,10 +9,10 @@
    - Version 8.11.4 + Version 10.0.2 - Source
    @@ -54,7 +54,7 @@ -Assessment Criteria +Assessment Criteria @@ -97,7 +97,7 @@
  • -Course +Course
    • diff --git a/foundation/www/docs/current/models/schools/course_schedule.html b/foundation/www/docs/current/models/education/course_schedule.html similarity index 92% rename from foundation/www/docs/current/models/schools/course_schedule.html rename to foundation/www/docs/current/models/education/course_schedule.html index 111cce05..69aa8adb 100644 --- a/foundation/www/docs/current/models/schools/course_schedule.html +++ b/foundation/www/docs/current/models/education/course_schedule.html @@ -9,10 +9,10 @@
    - Version 8.11.4 + Version 10.0.2 - Source
    @@ -54,7 +54,7 @@ -Student Group +Student Group @@ -75,7 +75,7 @@ -Instructor +Instructor @@ -136,7 +136,7 @@ -Course +Course @@ -181,7 +181,7 @@ -Room +Room @@ -242,7 +242,7 @@

    Controller

    -

    erpnext.schools.doctype.course_schedule.course_schedule

    +

    erpnext.education.doctype.course_schedule.course_schedule

    @@ -343,7 +343,7 @@
  • -Student Attendance +Student Attendance
    • @@ -352,7 +352,7 @@
  • -Student Attendance Tool +Student Attendance Tool
    • diff --git a/foundation/www/docs/current/models/schools/course_scheduling_tool.html b/foundation/www/docs/current/models/education/course_scheduling_tool.html similarity index 92% rename from foundation/www/docs/current/models/schools/course_scheduling_tool.html rename to foundation/www/docs/current/models/education/course_scheduling_tool.html index dc3f219a..57772d36 100644 --- a/foundation/www/docs/current/models/schools/course_scheduling_tool.html +++ b/foundation/www/docs/current/models/education/course_scheduling_tool.html @@ -9,10 +9,10 @@
    - Version 8.11.4 + Version 10.0.2 - Source
    @@ -52,7 +52,7 @@ -Student Group +Student Group @@ -73,7 +73,7 @@ -Course +Course @@ -94,7 +94,7 @@ -Program +Program @@ -127,7 +127,7 @@ -Academic Year +Academic Year @@ -148,7 +148,7 @@ -Academic Term +Academic Term @@ -181,7 +181,7 @@ -Instructor +Instructor @@ -228,7 +228,7 @@ -Room +Room @@ -294,11 +294,11 @@ Sunday 16 - rechedule + reschedule Check - Rechedule + Reschedule @@ -346,7 +346,7 @@ Sunday

    Controller

    -

    erpnext.schools.doctype.course_scheduling_tool.course_scheduling_tool

    +

    erpnext.education.doctype.course_scheduling_tool.course_scheduling_tool

    @@ -405,7 +405,7 @@ Sunday schedule_course (self)

    -

    Creates course schedules as per specified parametes

    +

    Creates course schedules as per specified parameters


    diff --git a/foundation/www/docs/current/models/schools/school_settings.html b/foundation/www/docs/current/models/education/education_settings.html similarity index 91% rename from foundation/www/docs/current/models/schools/school_settings.html rename to foundation/www/docs/current/models/education/education_settings.html index f4d79689..efcb1d76 100644 --- a/foundation/www/docs/current/models/schools/school_settings.html +++ b/foundation/www/docs/current/models/education/education_settings.html @@ -1,18 +1,18 @@ - + -

    School Settings

    +

    Education Settings

    - Version 8.11.4 + Version 10.0.2 - Source
    @@ -52,7 +52,7 @@ -Academic Year +Academic Year @@ -73,7 +73,7 @@ -Academic Term +Academic Term @@ -164,7 +164,7 @@ Employee Number

    Controller

    -

    erpnext.schools.doctype.school_settings.school_settings

    +

    erpnext.education.doctype.education_settings.education_settings

    @@ -172,7 +172,7 @@ Employee Number -

    Class SchoolSettings

    +

    Class EducationSettings

    Inherits from frappe.model.document.Document diff --git a/foundation/www/docs/current/models/schools/fee_category.html b/foundation/www/docs/current/models/education/fee_category.html similarity index 89% rename from foundation/www/docs/current/models/schools/fee_category.html rename to foundation/www/docs/current/models/education/fee_category.html index 10093e95..239b0529 100644 --- a/foundation/www/docs/current/models/schools/fee_category.html +++ b/foundation/www/docs/current/models/education/fee_category.html @@ -9,10 +9,10 @@

    - Version 8.11.4 + Version 10.0.2 - Source
    @@ -70,7 +70,7 @@

    Controller

    -

    erpnext.schools.doctype.fee_category.fee_category

    +

    erpnext.education.doctype.fee_category.fee_category

    @@ -101,7 +101,7 @@
  • -Fee Component +Fee Component
    • diff --git a/foundation/www/docs/current/models/schools/fee_component.html b/foundation/www/docs/current/models/education/fee_component.html similarity index 86% rename from foundation/www/docs/current/models/schools/fee_component.html rename to foundation/www/docs/current/models/education/fee_component.html index b521a890..8ad6461b 100644 --- a/foundation/www/docs/current/models/schools/fee_component.html +++ b/foundation/www/docs/current/models/education/fee_component.html @@ -9,10 +9,10 @@
    - Version 8.11.4 + Version 10.0.2 - Source
    @@ -54,7 +54,7 @@ -Fee Category +Fee Category @@ -109,21 +109,21 @@
  • -Fee Schedule +Fee Schedule
  • -Fee Structure +Fee Structure
  • -Fees +Fees
    • diff --git a/foundation/www/docs/current/models/schools/fee_schedule.html b/foundation/www/docs/current/models/education/fee_schedule.html similarity index 87% rename from foundation/www/docs/current/models/schools/fee_schedule.html rename to foundation/www/docs/current/models/education/fee_schedule.html index 524ce6c5..ec575dcd 100644 --- a/foundation/www/docs/current/models/schools/fee_schedule.html +++ b/foundation/www/docs/current/models/education/fee_schedule.html @@ -9,10 +9,10 @@
    - Version 8.11.4 + Version 10.0.2 - Source
    @@ -54,7 +54,7 @@ -Fee Structure +Fee Structure @@ -142,7 +142,7 @@ Successful -Student Category +Student Category @@ -163,7 +163,7 @@ Successful -Program +Program @@ -172,7 +172,7 @@ Successful 9 - academic_year + academic_year Link @@ -184,7 +184,7 @@ Successful -Academic Year +Academic Year @@ -205,7 +205,7 @@ Successful -Academic Term +Academic Term @@ -259,7 +259,7 @@ Successful -Fee Schedule Student Group +Fee Schedule Student Group @@ -292,7 +292,7 @@ Successful -Fee Component +Fee Component @@ -547,7 +547,7 @@ Successful -Fee Schedule +Fee Schedule @@ -584,7 +584,7 @@ Successful

    Controller

    -

    erpnext.schools.doctype.fee_schedule.fee_schedule

    +

    erpnext.education.doctype.fee_schedule.fee_schedule

    @@ -604,9 +604,9 @@ Successful

    - + - calculate_total + calculate_total_and_program (self)

    No docs

    @@ -680,9 +680,9 @@ Successful

    - + - erpnext.schools.doctype.fee_schedule.fee_schedule.generate_fee + erpnext.education.doctype.fee_schedule.fee_schedule.generate_fee (fee_schedule)

    No docs

    @@ -695,12 +695,12 @@ Successful

    Public API -
    /api/method/erpnext.schools.doctype.fee_schedule.fee_schedule.get_fee_structure +
    /api/method/erpnext.education.doctype.fee_schedule.fee_schedule.get_fee_structure

    - + - erpnext.schools.doctype.fee_schedule.fee_schedule.get_fee_structure + erpnext.education.doctype.fee_schedule.fee_schedule.get_fee_structure (source_name, target_doc=None)

    No docs

    @@ -713,12 +713,12 @@ Successful

    Public API -
    /api/method/erpnext.schools.doctype.fee_schedule.fee_schedule.get_total_students +
    /api/method/erpnext.education.doctype.fee_schedule.fee_schedule.get_total_students

    - + - erpnext.schools.doctype.fee_schedule.fee_schedule.get_total_students + erpnext.education.doctype.fee_schedule.fee_schedule.get_total_students (student_group, academic_year, academic_term=None, student_category=None)

    No docs

    @@ -737,7 +737,7 @@ Successful
  • -Fee Schedule +Fee Schedule
    • @@ -746,7 +746,7 @@ Successful
  • -Fees +Fees
    • diff --git a/foundation/www/docs/current/models/schools/fee_schedule_program.html b/foundation/www/docs/current/models/education/fee_schedule_program.html similarity index 89% rename from foundation/www/docs/current/models/schools/fee_schedule_program.html rename to foundation/www/docs/current/models/education/fee_schedule_program.html index c630f6b1..cc0af21f 100644 --- a/foundation/www/docs/current/models/schools/fee_schedule_program.html +++ b/foundation/www/docs/current/models/education/fee_schedule_program.html @@ -9,10 +9,10 @@
    - Version 8.11.4 + Version 10.0.2 - Source
    @@ -54,7 +54,7 @@ -Program +Program @@ -75,7 +75,7 @@ -Student Batch Name +Student Batch Name diff --git a/foundation/www/docs/current/models/schools/fee_schedule_student_group.html b/foundation/www/docs/current/models/education/fee_schedule_student_group.html similarity index 87% rename from foundation/www/docs/current/models/schools/fee_schedule_student_group.html rename to foundation/www/docs/current/models/education/fee_schedule_student_group.html index 31df44ee..b22bd391 100644 --- a/foundation/www/docs/current/models/schools/fee_schedule_student_group.html +++ b/foundation/www/docs/current/models/education/fee_schedule_student_group.html @@ -9,10 +9,10 @@
    - Version 8.11.4 + Version 10.0.2 - Source
    @@ -54,7 +54,7 @@ -Student Group +Student Group @@ -85,7 +85,7 @@
  • -Fee Schedule +Fee Schedule
    • diff --git a/foundation/www/docs/current/models/schools/fee_structure.html b/foundation/www/docs/current/models/education/fee_structure.html similarity index 85% rename from foundation/www/docs/current/models/schools/fee_structure.html rename to foundation/www/docs/current/models/education/fee_structure.html index 1a6c15e3..c2a5deb1 100644 --- a/foundation/www/docs/current/models/schools/fee_structure.html +++ b/foundation/www/docs/current/models/education/fee_structure.html @@ -9,10 +9,10 @@
    - Version 8.11.4 + Version 10.0.2 - Source
    @@ -56,27 +56,6 @@ 2 - student_category - - Link - - Student Category - - - - - - - -Student Category - - - - - - - - 3 program Link @@ -89,7 +68,28 @@ -Program +Program + + + + + + + + 3 + student_category + + Link + + Student Category + + + + + + + +Student Category @@ -110,7 +110,7 @@ 5 - academic_term + academic_term Link @@ -122,7 +122,7 @@ -Academic Term +Academic Term @@ -143,7 +143,7 @@ -Academic Year +Academic Year @@ -176,7 +176,7 @@ -Fee Component +Fee Component @@ -341,7 +341,7 @@ -Fee Structure +Fee Structure @@ -354,7 +354,7 @@

    Controller

    -

    erpnext.schools.doctype.fee_structure.fee_structure

    +

    erpnext.education.doctype.fee_structure.fee_structure

    @@ -407,12 +407,12 @@

    Public API -
    /api/method/erpnext.schools.doctype.fee_structure.fee_structure.make_fee_schedule +
    /api/method/erpnext.education.doctype.fee_structure.fee_structure.make_fee_schedule

    - + - erpnext.schools.doctype.fee_structure.fee_structure.make_fee_schedule + erpnext.education.doctype.fee_structure.fee_structure.make_fee_schedule (source_name, target_doc=None)

    No docs

    @@ -431,7 +431,7 @@
  • -Fee Schedule +Fee Schedule
    • @@ -440,7 +440,7 @@
  • -Fee Structure +Fee Structure
    • @@ -449,7 +449,7 @@
  • -Fees +Fees
    • @@ -458,7 +458,7 @@
  • -Program Enrollment Fee +Program Enrollment Fee
    • @@ -467,7 +467,7 @@
  • -Program Fee +Program Fee
    • diff --git a/foundation/www/docs/current/models/schools/fees.html b/foundation/www/docs/current/models/education/fees.html similarity index 92% rename from foundation/www/docs/current/models/schools/fees.html rename to foundation/www/docs/current/models/education/fees.html index a0cb7368..fc16d6c4 100644 --- a/foundation/www/docs/current/models/schools/fees.html +++ b/foundation/www/docs/current/models/education/fees.html @@ -9,10 +9,10 @@
    - Version 8.11.4 + Version 10.0.2 - Source
    @@ -68,7 +68,7 @@ -Student +Student @@ -103,7 +103,7 @@ -Fee Schedule +Fee Schedule @@ -241,7 +241,7 @@ -Program Enrollment +Program Enrollment @@ -262,7 +262,7 @@ -Program +Program @@ -283,7 +283,7 @@ -Student Batch Name +Student Batch Name @@ -330,7 +330,7 @@ -Student Category +Student Category @@ -351,7 +351,7 @@ -Academic Term +Academic Term @@ -372,7 +372,7 @@ -Academic Year +Academic Year @@ -426,7 +426,7 @@ -Fee Structure +Fee Structure @@ -447,7 +447,7 @@ -Fee Component +Fee Component @@ -480,7 +480,7 @@ -Fees +Fees @@ -706,7 +706,7 @@

    Controller

    -

    erpnext.schools.doctype.fees.fees

    +

    erpnext.education.doctype.fees.fees

    @@ -844,9 +844,9 @@

    - + - erpnext.schools.doctype.fees.fees.get_fee_list + erpnext.education.doctype.fees.fees.get_fee_list (doctype, txt, filters, limit_start, limit_page_length=20, order_by=modified)

    No docs

    @@ -860,9 +860,9 @@

    - + - erpnext.schools.doctype.fees.fees.get_list_context + erpnext.education.doctype.fees.fees.get_list_context (context=None)

    No docs

    @@ -881,7 +881,7 @@
  • -Fees +Fees
    • diff --git a/foundation/www/docs/current/models/schools/grading_scale.html b/foundation/www/docs/current/models/education/grading_scale.html similarity index 84% rename from foundation/www/docs/current/models/schools/grading_scale.html rename to foundation/www/docs/current/models/education/grading_scale.html index 7e09c0be..aaca2d7f 100644 --- a/foundation/www/docs/current/models/schools/grading_scale.html +++ b/foundation/www/docs/current/models/education/grading_scale.html @@ -9,10 +9,10 @@
    - Version 8.11.4 + Version 10.0.2 - Source
    @@ -90,7 +90,7 @@ -Grading Scale Interval +Grading Scale Interval @@ -111,7 +111,7 @@ -Grading Scale +Grading Scale @@ -124,7 +124,7 @@

    Controller

    -

    erpnext.schools.doctype.grading_scale.grading_scale

    +

    erpnext.education.doctype.grading_scale.grading_scale

    @@ -169,7 +169,7 @@
  • -Assessment Plan +Assessment Plan
    • @@ -178,7 +178,7 @@
  • -Assessment Result +Assessment Result
    • @@ -187,7 +187,7 @@
  • -Course +Course
    • @@ -196,7 +196,7 @@
  • -Grading Scale +Grading Scale
    • diff --git a/foundation/www/docs/current/models/schools/grading_scale_interval.html b/foundation/www/docs/current/models/education/grading_scale_interval.html similarity index 91% rename from foundation/www/docs/current/models/schools/grading_scale_interval.html rename to foundation/www/docs/current/models/education/grading_scale_interval.html index 9e86d86a..d2051c5c 100644 --- a/foundation/www/docs/current/models/schools/grading_scale_interval.html +++ b/foundation/www/docs/current/models/education/grading_scale_interval.html @@ -9,10 +9,10 @@
    - Version 8.11.4 + Version 10.0.2 - Source
    @@ -88,7 +88,7 @@
  • -Grading Scale +Grading Scale
    • diff --git a/foundation/www/docs/current/models/schools/guardian.html b/foundation/www/docs/current/models/education/guardian.html similarity index 83% rename from foundation/www/docs/current/models/schools/guardian.html rename to foundation/www/docs/current/models/education/guardian.html index 16ceb4d8..7080df57 100644 --- a/foundation/www/docs/current/models/schools/guardian.html +++ b/foundation/www/docs/current/models/education/guardian.html @@ -9,10 +9,10 @@
    - Version 8.11.4 + Version 10.0.2 - Source
    @@ -102,6 +102,27 @@ 6 + user + + Link + + User Id + + + + + + + +User + + + + + + + + 7 column_break_3 Column Break @@ -113,7 +134,7 @@ - 7 + 8 education Data @@ -125,7 +146,7 @@ - 8 + 9 occupation Data @@ -137,7 +158,7 @@ - 9 + 10 designation Data @@ -149,7 +170,7 @@ - 10 + 11 work_address Text @@ -161,7 +182,7 @@ - 11 + 12 image Attach Image @@ -173,7 +194,7 @@ - 12 + 13 section_break_13 Section Break @@ -185,7 +206,7 @@ - 13 + 14 students Table @@ -198,7 +219,7 @@ -Guardian Student +Guardian Student @@ -206,7 +227,7 @@ - 14 + 15 section_break_8 Section Break @@ -218,7 +239,7 @@ - 15 + 16 interests Table @@ -231,7 +252,7 @@ -Guardian Interest +Guardian Interest @@ -244,7 +265,7 @@

    Controller

    -

    erpnext.schools.doctype.guardian.guardian

    +

    erpnext.education.doctype.guardian.guardian

    @@ -321,6 +342,24 @@ + + + +

    Public API +
    /api/method/erpnext.education.doctype.guardian.guardian.invite_guardian +

    +

    + + + erpnext.education.doctype.guardian.guardian.invite_guardian + (guardian) +

    +

    No docs

    +
    +
    + + + @@ -331,7 +370,7 @@
  • -Student Guardian +Student Guardian
    • diff --git a/foundation/www/docs/current/models/schools/guardian_interest.html b/foundation/www/docs/current/models/education/guardian_interest.html similarity index 90% rename from foundation/www/docs/current/models/schools/guardian_interest.html rename to foundation/www/docs/current/models/education/guardian_interest.html index 738c3f4f..07420174 100644 --- a/foundation/www/docs/current/models/schools/guardian_interest.html +++ b/foundation/www/docs/current/models/education/guardian_interest.html @@ -9,10 +9,10 @@
    - Version 8.11.4 + Version 10.0.2 - Source
    @@ -73,7 +73,7 @@
  • -Guardian +Guardian
    • diff --git a/foundation/www/docs/current/models/schools/guardian_student.html b/foundation/www/docs/current/models/education/guardian_student.html similarity index 89% rename from foundation/www/docs/current/models/schools/guardian_student.html rename to foundation/www/docs/current/models/education/guardian_student.html index 19697f21..9f3622ff 100644 --- a/foundation/www/docs/current/models/schools/guardian_student.html +++ b/foundation/www/docs/current/models/education/guardian_student.html @@ -9,10 +9,10 @@
    - Version 8.11.4 + Version 10.0.2 - Source
    @@ -54,7 +54,7 @@ -Student +Student @@ -97,7 +97,7 @@
  • -Guardian +Guardian
    • diff --git a/foundation/www/docs/current/models/education/index.html b/foundation/www/docs/current/models/education/index.html new file mode 100644 index 00000000..3d594f4c --- /dev/null +++ b/foundation/www/docs/current/models/education/index.html @@ -0,0 +1,22 @@ + + + + + +

    Module education

    +
    + + + Version 10.0.2 + + + Source + +
    + +

    DocTypes for education

    + +{index} + + \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/schools/admission/__init__.py b/foundation/www/docs/current/models/education/index.txt similarity index 100% rename from foundation/www/docs/user/manual/en/schools/admission/__init__.py rename to foundation/www/docs/current/models/education/index.txt diff --git a/foundation/www/docs/current/models/schools/instructor.html b/foundation/www/docs/current/models/education/instructor.html similarity index 88% rename from foundation/www/docs/current/models/schools/instructor.html rename to foundation/www/docs/current/models/education/instructor.html index 3ed56bb3..37c0123f 100644 --- a/foundation/www/docs/current/models/schools/instructor.html +++ b/foundation/www/docs/current/models/education/instructor.html @@ -9,10 +9,10 @@
    - Version 8.11.4 + Version 10.0.2 - Source
    @@ -138,7 +138,7 @@

    Controller

    -

    erpnext.schools.doctype.instructor.instructor

    +

    erpnext.education.doctype.instructor.instructor

    @@ -183,7 +183,7 @@
  • -Assessment Plan +Assessment Plan
    • @@ -192,7 +192,7 @@
  • -Course Schedule +Course Schedule
    • @@ -201,7 +201,7 @@
  • -Course Scheduling Tool +Course Scheduling Tool
    • @@ -210,7 +210,7 @@
  • -Student Group Instructor +Student Group Instructor
    • diff --git a/foundation/www/docs/current/models/schools/program.html b/foundation/www/docs/current/models/education/program.html similarity index 68% rename from foundation/www/docs/current/models/schools/program.html rename to foundation/www/docs/current/models/education/program.html index faf1b7ba..cbf331ea 100644 --- a/foundation/www/docs/current/models/schools/program.html +++ b/foundation/www/docs/current/models/education/program.html @@ -9,10 +9,10 @@
    - Version 8.11.4 + Version 10.0.2 - Source
    @@ -135,40 +135,7 @@ -Program Course - - - - - - - - 8 - fee_schedule - - Section Break - - Fee Schedule - - - - - - - 9 - fees - - Table - - Fees - - - - - - - -Program Fee +Program Course @@ -181,7 +148,7 @@

    Controller

    -

    erpnext.schools.doctype.program.program

    +

    erpnext.education.doctype.program.program

    @@ -212,7 +179,7 @@
  • -Course Scheduling Tool +Course Scheduling Tool
    • @@ -221,7 +188,7 @@
  • -Fee Schedule +Fee Schedule
    • @@ -230,7 +197,7 @@
  • -Fee Schedule Program +Fee Schedule Program
    • @@ -239,7 +206,7 @@
  • -Fee Structure +Fee Structure
    • @@ -248,7 +215,7 @@
  • -Fees +Fees
    • @@ -257,7 +224,7 @@
  • -Program Enrollment +Program Enrollment
    • @@ -266,7 +233,7 @@
  • -Program Enrollment Tool +Program Enrollment Tool
    • @@ -275,7 +242,7 @@
  • -Student Admission +Student Admission Program
    • @@ -284,7 +251,7 @@
  • -Student Applicant +Student Applicant
    • @@ -293,7 +260,7 @@
  • -Student Group +Student Group
    • @@ -302,7 +269,7 @@
  • -Student Group Creation Tool +Student Group Creation Tool
    • @@ -311,7 +278,7 @@
  • -Student Log +Student Log
    • diff --git a/foundation/www/docs/current/models/schools/program_course.html b/foundation/www/docs/current/models/education/program_course.html similarity index 91% rename from foundation/www/docs/current/models/schools/program_course.html rename to foundation/www/docs/current/models/education/program_course.html index 97fabe7b..f68e89ad 100644 --- a/foundation/www/docs/current/models/schools/program_course.html +++ b/foundation/www/docs/current/models/education/program_course.html @@ -9,10 +9,10 @@
    - Version 8.11.4 + Version 10.0.2 - Source
    @@ -54,7 +54,7 @@ -Course +Course @@ -111,7 +111,7 @@
  • -Program +Program
    • diff --git a/foundation/www/docs/current/models/schools/program_enrollment.html b/foundation/www/docs/current/models/education/program_enrollment.html similarity index 85% rename from foundation/www/docs/current/models/schools/program_enrollment.html rename to foundation/www/docs/current/models/education/program_enrollment.html index 8ba939f2..ffa265df 100644 --- a/foundation/www/docs/current/models/schools/program_enrollment.html +++ b/foundation/www/docs/current/models/education/program_enrollment.html @@ -9,10 +9,10 @@
    - Version 8.11.4 + Version 10.0.2 - Source
    @@ -54,7 +54,7 @@ -Student +Student @@ -89,7 +89,7 @@ -Student Category +Student Category @@ -110,7 +110,7 @@ -School House +School House @@ -156,7 +156,7 @@ -Program +Program @@ -177,7 +177,7 @@ -Student Batch Name +Student Batch Name @@ -198,7 +198,7 @@ -Academic Year +Academic Year @@ -219,7 +219,7 @@ -Academic Term +Academic Term @@ -262,7 +262,7 @@ 
     Walking
-School Bus
+Institute's Bus
 Public Transport
 Self-Driving Vehicle
 Pick/Drop by Guardian
    @@ -319,7 +319,7 @@ Pick/Drop by Guardian -Program Enrollment Course +Program Enrollment Course @@ -352,7 +352,7 @@ Pick/Drop by Guardian -Program Fee +Program Fee @@ -373,7 +373,7 @@ Pick/Drop by Guardian -Program Enrollment +Program Enrollment @@ -398,7 +398,7 @@ Pick/Drop by Guardian

    Controller

    -

    erpnext.schools.doctype.program_enrollment.program_enrollment

    +

    erpnext.education.doctype.program_enrollment.program_enrollment

    @@ -507,12 +507,12 @@ Pick/Drop by Guardian

    Public API -
    /api/method/erpnext.schools.doctype.program_enrollment.program_enrollment.get_program_courses +
    /api/method/erpnext.education.doctype.program_enrollment.program_enrollment.get_program_courses

    - + - erpnext.schools.doctype.program_enrollment.program_enrollment.get_program_courses + erpnext.education.doctype.program_enrollment.program_enrollment.get_program_courses (doctype, txt, searchfield, start, page_len, filters)

    No docs

    @@ -525,12 +525,12 @@ Pick/Drop by Guardian

    Public API -
    /api/method/erpnext.schools.doctype.program_enrollment.program_enrollment.get_students +
    /api/method/erpnext.education.doctype.program_enrollment.program_enrollment.get_students

    - + - erpnext.schools.doctype.program_enrollment.program_enrollment.get_students + erpnext.education.doctype.program_enrollment.program_enrollment.get_students (doctype, txt, searchfield, start, page_len, filters)

    No docs

    @@ -549,7 +549,7 @@ Pick/Drop by Guardian
  • -Fees +Fees
    • @@ -558,7 +558,7 @@ Pick/Drop by Guardian
  • -Program Enrollment +Program Enrollment
    • diff --git a/foundation/www/docs/current/models/schools/program_enrollment_course.html b/foundation/www/docs/current/models/education/program_enrollment_course.html similarity index 87% rename from foundation/www/docs/current/models/schools/program_enrollment_course.html rename to foundation/www/docs/current/models/education/program_enrollment_course.html index 176a1324..eeb01de1 100644 --- a/foundation/www/docs/current/models/schools/program_enrollment_course.html +++ b/foundation/www/docs/current/models/education/program_enrollment_course.html @@ -9,10 +9,10 @@
    - Version 8.11.4 + Version 10.0.2 - Source
    @@ -54,7 +54,7 @@ -Course +Course @@ -87,7 +87,7 @@
  • -Program Enrollment +Program Enrollment
    • diff --git a/foundation/www/docs/current/models/schools/program_enrollment_fee.html b/foundation/www/docs/current/models/education/program_enrollment_fee.html similarity index 90% rename from foundation/www/docs/current/models/schools/program_enrollment_fee.html rename to foundation/www/docs/current/models/education/program_enrollment_fee.html index 4ab31f23..dae74828 100644 --- a/foundation/www/docs/current/models/schools/program_enrollment_fee.html +++ b/foundation/www/docs/current/models/education/program_enrollment_fee.html @@ -9,10 +9,10 @@
    - Version 8.11.4 + Version 10.0.2 - Source
    @@ -54,7 +54,7 @@ -Academic Term +Academic Term @@ -75,7 +75,7 @@ -Fee Structure +Fee Structure diff --git a/foundation/www/docs/current/models/schools/program_enrollment_tool.html b/foundation/www/docs/current/models/education/program_enrollment_tool.html similarity index 90% rename from foundation/www/docs/current/models/schools/program_enrollment_tool.html rename to foundation/www/docs/current/models/education/program_enrollment_tool.html index 9ecb461b..6eb9851f 100644 --- a/foundation/www/docs/current/models/schools/program_enrollment_tool.html +++ b/foundation/www/docs/current/models/education/program_enrollment_tool.html @@ -9,10 +9,10 @@
    - Version 8.11.4 + Version 10.0.2 - Source
    @@ -68,7 +68,7 @@ Program Enrollments -Program +Program @@ -89,7 +89,7 @@ Program Enrollments -Academic Year +Academic Year @@ -134,7 +134,7 @@ Program Enrollments -Program Enrollment Tool Student +Program Enrollment Tool Student @@ -167,7 +167,7 @@ Program Enrollments -Program +Program @@ -188,7 +188,7 @@ Program Enrollments -Academic Year +Academic Year @@ -213,7 +213,7 @@ Program Enrollments

    Controller

    -

    erpnext.schools.doctype.program_enrollment_tool.program_enrollment_tool

    +

    erpnext.education.doctype.program_enrollment_tool.program_enrollment_tool

    diff --git a/foundation/www/docs/current/models/schools/program_enrollment_tool_student.html b/foundation/www/docs/current/models/education/program_enrollment_tool_student.html similarity index 86% rename from foundation/www/docs/current/models/schools/program_enrollment_tool_student.html rename to foundation/www/docs/current/models/education/program_enrollment_tool_student.html index 575865ce..ad1adc42 100644 --- a/foundation/www/docs/current/models/schools/program_enrollment_tool_student.html +++ b/foundation/www/docs/current/models/education/program_enrollment_tool_student.html @@ -9,10 +9,10 @@
    - Version 8.11.4 + Version 10.0.2 - Source
    @@ -54,7 +54,7 @@ -Student Applicant +Student Applicant @@ -75,7 +75,7 @@ -Student +Student @@ -118,7 +118,7 @@
  • -Program Enrollment Tool +Program Enrollment Tool
    • diff --git a/foundation/www/docs/current/models/schools/program_fee.html b/foundation/www/docs/current/models/education/program_fee.html similarity index 85% rename from foundation/www/docs/current/models/schools/program_fee.html rename to foundation/www/docs/current/models/education/program_fee.html index 6efe954d..cd9aba20 100644 --- a/foundation/www/docs/current/models/schools/program_fee.html +++ b/foundation/www/docs/current/models/education/program_fee.html @@ -9,10 +9,10 @@
    - Version 8.11.4 + Version 10.0.2 - Source
    @@ -54,7 +54,7 @@ -Academic Term +Academic Term @@ -75,7 +75,7 @@ -Fee Structure +Fee Structure @@ -96,7 +96,7 @@ -Student Category +Student Category @@ -151,14 +151,7 @@
  • -Program - -
    • - -
  • - - -Program Enrollment +Program Enrollment
    • diff --git a/foundation/www/docs/current/models/schools/room.html b/foundation/www/docs/current/models/education/room.html similarity index 85% rename from foundation/www/docs/current/models/schools/room.html rename to foundation/www/docs/current/models/education/room.html index 32326c0e..dd682bad 100644 --- a/foundation/www/docs/current/models/schools/room.html +++ b/foundation/www/docs/current/models/education/room.html @@ -9,10 +9,10 @@
    - Version 8.11.4 + Version 10.0.2 - Source
    @@ -82,7 +82,7 @@

    Controller

    -

    erpnext.schools.doctype.room.room

    +

    erpnext.education.doctype.room.room

    @@ -113,7 +113,7 @@
  • -Assessment Plan +Assessment Plan
    • @@ -122,7 +122,7 @@
  • -Course Schedule +Course Schedule
    • @@ -131,7 +131,7 @@
  • -Course Scheduling Tool +Course Scheduling Tool
    • diff --git a/foundation/www/docs/current/models/schools/school_house.html b/foundation/www/docs/current/models/education/school_house.html similarity index 87% rename from foundation/www/docs/current/models/schools/school_house.html rename to foundation/www/docs/current/models/education/school_house.html index 3e57dfcf..edc9fe3b 100644 --- a/foundation/www/docs/current/models/schools/school_house.html +++ b/foundation/www/docs/current/models/education/school_house.html @@ -9,10 +9,10 @@
    - Version 8.11.4 + Version 10.0.2 - Source
    @@ -58,7 +58,7 @@

    Controller

    -

    erpnext.schools.doctype.school_house.school_house

    +

    erpnext.education.doctype.school_house.school_house

    @@ -89,7 +89,7 @@
  • -Program Enrollment +Program Enrollment
    • diff --git a/foundation/www/docs/current/models/schools/student.html b/foundation/www/docs/current/models/education/student.html similarity index 90% rename from foundation/www/docs/current/models/schools/student.html rename to foundation/www/docs/current/models/education/student.html index aeb37dc8..675a36d5 100644 --- a/foundation/www/docs/current/models/schools/student.html +++ b/foundation/www/docs/current/models/education/student.html @@ -9,10 +9,10 @@
    - Version 8.11.4 + Version 10.0.2 - Source
    @@ -287,7 +287,7 @@ Other -Student Applicant +Student Applicant @@ -404,7 +404,7 @@ Other -Student Guardian +Student Guardian @@ -439,7 +439,7 @@ Other -Student Sibling +Student Sibling @@ -524,7 +524,7 @@ Other

    Controller

    -

    erpnext.schools.doctype.student.student

    +

    erpnext.education.doctype.student.student

    @@ -606,9 +606,9 @@ Other

    - + - erpnext.schools.doctype.student.student.get_timeline_data + erpnext.education.doctype.student.student.get_timeline_data (doctype, name)

    Return timeline for attendance

    @@ -627,7 +627,7 @@ Other
  • -Assessment Result +Assessment Result
    • @@ -636,7 +636,7 @@ Other
  • -Fees +Fees
    • @@ -645,7 +645,7 @@ Other
  • -Guardian Student +Guardian Student
    • @@ -654,7 +654,7 @@ Other
  • -Program Enrollment +Program Enrollment
    • @@ -663,7 +663,7 @@ Other
  • -Program Enrollment Tool Student +Program Enrollment Tool Student
    • @@ -672,7 +672,7 @@ Other
  • -Student Attendance +Student Attendance
    • @@ -681,7 +681,7 @@ Other
  • -Student Group Student +Student Group Student
    • @@ -690,7 +690,7 @@ Other
  • -Student Leave Application +Student Leave Application
    • @@ -699,7 +699,7 @@ Other
  • -Student Log +Student Log
    • @@ -708,7 +708,7 @@ Other
  • -Student Sibling +Student Sibling
    • diff --git a/foundation/www/docs/current/models/schools/student_admission.html b/foundation/www/docs/current/models/education/student_admission.html similarity index 71% rename from foundation/www/docs/current/models/schools/student_admission.html rename to foundation/www/docs/current/models/education/student_admission.html index ce70330f..a88dee62 100644 --- a/foundation/www/docs/current/models/schools/student_admission.html +++ b/foundation/www/docs/current/models/education/student_admission.html @@ -9,10 +9,10 @@
    - Version 8.11.4 + Version 10.0.2 - Source
    @@ -42,6 +42,54 @@ 1 + title + + Data + + Title + + + + + + + 2 + route + + Data + + Route + + + + + + + 3 + application_form_route + + Data + + Application Form Route + + + + + + + 4 + column_break_3 + + Column Break + + + + + + + + + 5 academic_year Link @@ -54,7 +102,7 @@ -Academic Year +Academic Year @@ -62,7 +110,7 @@ - 2 + 6 admission_start_date Date @@ -74,7 +122,7 @@ - 3 + 7 admission_end_date Date @@ -86,32 +134,8 @@ - 4 - title - - Data - - Title - - - - - - - 5 - naming_series_for_student_applicant - - Data - - Naming Series (for Student Applicant) - - - - - - - 6 - publish + 8 + published Check @@ -121,60 +145,25 @@ - - 7 - column_break_3 - - Column Break + + 9 + section_break_5 - + Section Break + + Eligibility and Details - - 8 - program - - Link - - Program - - - - - - - -Program - - - - - - - - 9 - application_fee - - Currency - - Application Fee - - - - 
    currency
    - - - 10 - currency + program_details - Link + Table - Currency + Eligibility and Details @@ -182,7 +171,7 @@ -Currency +Student Admission Program @@ -191,42 +180,6 @@ 11 - route - - Data - - Route - - - - - - - 12 - application_form_route - - Data - - Application Form Route - - - - - - - 13 - section_break_5 - - Section Break - - - - - - - - - 14 introduction Text Editor @@ -237,25 +190,13 @@ - - 15 - eligibility - - Text Editor - - Eligibility - - - - -

    Controller

    -

    erpnext.schools.doctype.student_admission.student_admission

    +

    erpnext.education.doctype.student_admission.student_admission

    @@ -313,6 +254,20 @@
    + + + +

    + + + validate + (self) +

    +

    No docs

    +
    +
    + +
    @@ -323,10 +278,26 @@

    - + - erpnext.schools.doctype.student_admission.student_admission.get_list_context - (context) + erpnext.education.doctype.student_admission.student_admission.get_admission_list + (doctype, txt, filters, limit_start, limit_page_length=20, order_by=modified) +

    +

    No docs

    +
    +
    + + + + + + + +

    + + + erpnext.education.doctype.student_admission.student_admission.get_list_context + (context=None)

    No docs

    @@ -344,7 +315,7 @@
  • -Student Applicant +Student Applicant
    • diff --git a/foundation/www/docs/current/models/education/student_admission_program.html b/foundation/www/docs/current/models/education/student_admission_program.html new file mode 100644 index 00000000..3ce7714c --- /dev/null +++ b/foundation/www/docs/current/models/education/student_admission_program.html @@ -0,0 +1,146 @@ + + + + + + + +

    Student Admission Program

    +
    + + + Version 10.0.2 + + + Source + +
    + + +Child Table + + +

    Table Name: tabStudent Admission Program

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1program + Link + Program + + + + + + +Program + + + +
    2minimum_age + Date + Minimum Age + +
    3maximum_age + Date + Maximum Age + +
    4column_break_4 + Column Break + + +
    5application_fee + Currency + Application Fee + +
    6applicant_naming_series + Data + Naming Series (for Student Applicant) + +
    + + + + +

    Child Table Of

    + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/schools/student_applicant.html b/foundation/www/docs/current/models/education/student_applicant.html similarity index 84% rename from foundation/www/docs/current/models/schools/student_applicant.html rename to foundation/www/docs/current/models/education/student_applicant.html index 1a916b66..7ac1fb56 100644 --- a/foundation/www/docs/current/models/schools/student_applicant.html +++ b/foundation/www/docs/current/models/education/student_applicant.html @@ -9,10 +9,10 @@
    - Version 8.11.4 + Version 10.0.2 - Source
    @@ -90,7 +90,7 @@ -Program +Program @@ -178,7 +178,7 @@ Admitted -Academic Year +Academic Year @@ -199,7 +199,7 @@ Admitted -Student Admission +Student Admission @@ -438,7 +438,7 @@ AB- -Student Guardian +Student Guardian @@ -471,7 +471,7 @@ AB- -Student Sibling +Student Sibling @@ -516,7 +516,7 @@ AB- -Student Applicant +Student Applicant @@ -529,7 +529,7 @@ AB-

    Controller

    -

    erpnext.schools.doctype.student_applicant.student_applicant

    +

    erpnext.education.doctype.student_applicant.student_applicant

    @@ -576,6 +576,20 @@ AB- +

    + + + on_submit + (self) +

    +

    No docs

    +
    +
    + + + + +

    @@ -601,11 +615,41 @@ AB-
    + + + +

    + + + validation_from_student_admission + (self) +

    +

    No docs

    +
    +
    + +
    + + + + +

    + + + erpnext.education.doctype.student_applicant.student_applicant.get_student_admission_data + (student_admission, program) +

    +

    No docs

    +
    +
    + + + @@ -616,7 +660,7 @@ AB-
  • -Program Enrollment Tool Student +Program Enrollment Tool Student
    • @@ -625,7 +669,7 @@ AB-
  • -Student +Student
    • @@ -634,7 +678,7 @@ AB-
  • -Student Applicant +Student Applicant
    • diff --git a/foundation/www/docs/current/models/schools/student_attendance.html b/foundation/www/docs/current/models/education/student_attendance.html similarity index 93% rename from foundation/www/docs/current/models/schools/student_attendance.html rename to foundation/www/docs/current/models/education/student_attendance.html index a10e1606..fe3fad30 100644 --- a/foundation/www/docs/current/models/schools/student_attendance.html +++ b/foundation/www/docs/current/models/education/student_attendance.html @@ -9,10 +9,10 @@
    - Version 8.11.4 + Version 10.0.2 - Source
    @@ -54,7 +54,7 @@ -Student +Student @@ -75,7 +75,7 @@ -Course Schedule +Course Schedule @@ -134,7 +134,7 @@ -Student Group +Student Group @@ -162,7 +162,7 @@ Absent

    Controller

    -

    erpnext.schools.doctype.student_attendance.student_attendance

    +

    erpnext.education.doctype.student_attendance.student_attendance

    diff --git a/foundation/www/docs/current/models/schools/student_attendance_tool.html b/foundation/www/docs/current/models/education/student_attendance_tool.html similarity index 82% rename from foundation/www/docs/current/models/schools/student_attendance_tool.html rename to foundation/www/docs/current/models/education/student_attendance_tool.html index 9dcba18a..7d2eeec6 100644 --- a/foundation/www/docs/current/models/schools/student_attendance_tool.html +++ b/foundation/www/docs/current/models/education/student_attendance_tool.html @@ -9,10 +9,10 @@
    - Version 8.11.4 + Version 10.0.2 - Source
    @@ -95,7 +95,7 @@ Activity -Student Group +Student Group @@ -116,7 +116,7 @@ Activity -Course Schedule +Course Schedule @@ -165,7 +165,7 @@ Activity

    Controller

    -

    erpnext.schools.doctype.student_attendance_tool.student_attendance_tool

    +

    erpnext.education.doctype.student_attendance_tool.student_attendance_tool

    @@ -190,12 +190,12 @@ Activity

    Public API -
    /api/method/erpnext.schools.doctype.student_attendance_tool.student_attendance_tool.get_student_attendance_records +
    /api/method/erpnext.education.doctype.student_attendance_tool.student_attendance_tool.get_student_attendance_records

    - + - erpnext.schools.doctype.student_attendance_tool.student_attendance_tool.get_student_attendance_records + erpnext.education.doctype.student_attendance_tool.student_attendance_tool.get_student_attendance_records (based_on, date=None, student_group=None, course_schedule=None)

    No docs

    diff --git a/foundation/www/docs/current/models/schools/student_batch_name.html b/foundation/www/docs/current/models/education/student_batch_name.html similarity index 74% rename from foundation/www/docs/current/models/schools/student_batch_name.html rename to foundation/www/docs/current/models/education/student_batch_name.html index 4042e3a9..326716a7 100644 --- a/foundation/www/docs/current/models/schools/student_batch_name.html +++ b/foundation/www/docs/current/models/education/student_batch_name.html @@ -9,10 +9,10 @@
    - Version 8.11.4 + Version 10.0.2 - Source
    @@ -58,7 +58,7 @@

    Controller

    -

    erpnext.schools.doctype.student_batch_name.student_batch_name

    +

    erpnext.education.doctype.student_batch_name.student_batch_name

    @@ -89,7 +89,7 @@
  • -Fee Schedule Program +Fee Schedule Program
    • @@ -98,7 +98,7 @@
  • -Fees +Fees
    • @@ -107,7 +107,7 @@
  • -Program Enrollment +Program Enrollment
    • @@ -116,7 +116,7 @@
  • -Student Group +Student Group
    • @@ -125,7 +125,7 @@
  • -Student Group Creation Tool Course +Student Group Creation Tool Course
    • @@ -134,7 +134,7 @@
  • -Student Log +Student Log
    • diff --git a/foundation/www/docs/current/models/schools/student_category.html b/foundation/www/docs/current/models/education/student_category.html similarity index 78% rename from foundation/www/docs/current/models/schools/student_category.html rename to foundation/www/docs/current/models/education/student_category.html index ac30435b..6701d20e 100644 --- a/foundation/www/docs/current/models/schools/student_category.html +++ b/foundation/www/docs/current/models/education/student_category.html @@ -9,10 +9,10 @@
    - Version 8.11.4 + Version 10.0.2 - Source
    @@ -58,7 +58,7 @@

    Controller

    -

    erpnext.schools.doctype.student_category.student_category

    +

    erpnext.education.doctype.student_category.student_category

    @@ -89,7 +89,7 @@
  • -Fee Schedule +Fee Schedule
    • @@ -98,7 +98,7 @@
  • -Fee Structure +Fee Structure
    • @@ -107,7 +107,7 @@
  • -Fees +Fees
    • @@ -116,7 +116,7 @@
  • -Program Enrollment +Program Enrollment
    • @@ -125,7 +125,7 @@
  • -Program Fee +Program Fee
    • diff --git a/foundation/www/docs/current/models/schools/student_group.html b/foundation/www/docs/current/models/education/student_group.html similarity index 79% rename from foundation/www/docs/current/models/schools/student_group.html rename to foundation/www/docs/current/models/education/student_group.html index 28156211..ecdb36c3 100644 --- a/foundation/www/docs/current/models/schools/student_group.html +++ b/foundation/www/docs/current/models/education/student_group.html @@ -9,10 +9,10 @@
    - Version 8.11.4 + Version 10.0.2 - Source
    @@ -54,7 +54,7 @@ -Academic Year +Academic Year @@ -129,7 +129,7 @@ Activity -Academic Term +Academic Term @@ -150,7 +150,7 @@ Activity -Program +Program @@ -171,7 +171,7 @@ Activity -Student Batch Name +Student Batch Name @@ -192,7 +192,7 @@ Activity -Course +Course @@ -237,7 +237,7 @@ Activity -Student Group Student +Student Group Student @@ -270,7 +270,7 @@ Activity -Student Group Instructor +Student Group Instructor @@ -283,7 +283,7 @@ Activity

    Controller

    -

    erpnext.schools.doctype.student_group.student_group

    +

    erpnext.education.doctype.student_group.student_group

    @@ -378,12 +378,12 @@ Activity

    Public API -
    /api/method/erpnext.schools.doctype.student_group.student_group.fetch_students +
    /api/method/erpnext.education.doctype.student_group.student_group.fetch_students

    - + - erpnext.schools.doctype.student_group.student_group.fetch_students + erpnext.education.doctype.student_group.student_group.fetch_students (doctype, txt, searchfield, start, page_len, filters)

    No docs

    @@ -397,9 +397,9 @@ Activity

    - + - erpnext.schools.doctype.student_group.student_group.get_program_enrollment + erpnext.education.doctype.student_group.student_group.get_program_enrollment (academic_year, academic_term=None, program=None, batch=None, course=None)

    No docs

    @@ -412,12 +412,12 @@ Activity

    Public API -
    /api/method/erpnext.schools.doctype.student_group.student_group.get_students +
    /api/method/erpnext.education.doctype.student_group.student_group.get_students

    - + - erpnext.schools.doctype.student_group.student_group.get_students + erpnext.education.doctype.student_group.student_group.get_students (academic_year, group_based_on, academic_term=None, program=None, batch=None, course=None)

    No docs

    @@ -436,7 +436,7 @@ Activity
  • -Assessment Plan +Assessment Plan
    • @@ -445,7 +445,7 @@ Activity
  • -Assessment Result Tool +Assessment Result Tool
    • @@ -454,7 +454,7 @@ Activity
  • -Course Schedule +Course Schedule
    • @@ -463,7 +463,7 @@ Activity
  • -Course Scheduling Tool +Course Scheduling Tool
    • @@ -472,7 +472,7 @@ Activity
  • -Fee Schedule Student Group +Fee Schedule Student Group
    • @@ -481,7 +481,7 @@ Activity
  • -Student Attendance +Student Attendance
    • @@ -490,7 +490,7 @@ Activity
  • -Student Attendance Tool +Student Attendance Tool
    • diff --git a/foundation/www/docs/current/models/schools/student_group_creation_tool.html b/foundation/www/docs/current/models/education/student_group_creation_tool.html similarity index 90% rename from foundation/www/docs/current/models/schools/student_group_creation_tool.html rename to foundation/www/docs/current/models/education/student_group_creation_tool.html index d536e81d..f03d7428 100644 --- a/foundation/www/docs/current/models/schools/student_group_creation_tool.html +++ b/foundation/www/docs/current/models/education/student_group_creation_tool.html @@ -9,10 +9,10 @@
    - Version 8.11.4 + Version 10.0.2 - Source
    @@ -52,7 +52,7 @@ -Academic Year +Academic Year @@ -74,7 +74,7 @@ -Academic Term +Academic Term @@ -119,7 +119,7 @@ -Program +Program @@ -165,7 +165,7 @@ -Student Group Creation Tool Course +Student Group Creation Tool Course @@ -178,7 +178,7 @@

    Controller

    -

    erpnext.schools.doctype.student_group_creation_tool.student_group_creation_tool

    +

    erpnext.education.doctype.student_group_creation_tool.student_group_creation_tool

    diff --git a/foundation/www/docs/current/models/schools/student_group_creation_tool_course.html b/foundation/www/docs/current/models/education/student_group_creation_tool_course.html similarity index 90% rename from foundation/www/docs/current/models/schools/student_group_creation_tool_course.html rename to foundation/www/docs/current/models/education/student_group_creation_tool_course.html index 7a0e7db7..c82b3782 100644 --- a/foundation/www/docs/current/models/schools/student_group_creation_tool_course.html +++ b/foundation/www/docs/current/models/education/student_group_creation_tool_course.html @@ -9,10 +9,10 @@
    - Version 8.11.4 + Version 10.0.2 - Source
    @@ -70,7 +70,7 @@ Course -Course +Course @@ -91,7 +91,7 @@ Course -Student Batch Name +Student Batch Name @@ -160,7 +160,7 @@ Course
  • -Student Group Creation Tool +Student Group Creation Tool
    • diff --git a/foundation/www/docs/current/models/schools/student_group_instructor.html b/foundation/www/docs/current/models/education/student_group_instructor.html similarity index 89% rename from foundation/www/docs/current/models/schools/student_group_instructor.html rename to foundation/www/docs/current/models/education/student_group_instructor.html index 23a7507d..18a1b5dd 100644 --- a/foundation/www/docs/current/models/schools/student_group_instructor.html +++ b/foundation/www/docs/current/models/education/student_group_instructor.html @@ -9,10 +9,10 @@
    - Version 8.11.4 + Version 10.0.2 - Source
    @@ -54,7 +54,7 @@ -Instructor +Instructor @@ -99,7 +99,7 @@
  • -Student Group +Student Group
    • diff --git a/foundation/www/docs/current/models/schools/student_group_student.html b/foundation/www/docs/current/models/education/student_group_student.html similarity index 91% rename from foundation/www/docs/current/models/schools/student_group_student.html rename to foundation/www/docs/current/models/education/student_group_student.html index 73b06129..1e63d4e5 100644 --- a/foundation/www/docs/current/models/schools/student_group_student.html +++ b/foundation/www/docs/current/models/education/student_group_student.html @@ -9,10 +9,10 @@
    - Version 8.11.4 + Version 10.0.2 - Source
    @@ -54,7 +54,7 @@ -Student +Student @@ -121,7 +121,7 @@
  • -Student Group +Student Group
    • diff --git a/foundation/www/docs/current/models/schools/student_guardian.html b/foundation/www/docs/current/models/education/student_guardian.html similarity index 87% rename from foundation/www/docs/current/models/schools/student_guardian.html rename to foundation/www/docs/current/models/education/student_guardian.html index b63435d9..c7153936 100644 --- a/foundation/www/docs/current/models/schools/student_guardian.html +++ b/foundation/www/docs/current/models/education/student_guardian.html @@ -9,10 +9,10 @@
    - Version 8.11.4 + Version 10.0.2 - Source
    @@ -54,7 +54,7 @@ -Guardian +Guardian @@ -102,14 +102,14 @@ Others
  • -Student +Student
  • -Student Applicant +Student Applicant
    • diff --git a/foundation/www/docs/current/models/schools/student_language.html b/foundation/www/docs/current/models/education/student_language.html similarity index 90% rename from foundation/www/docs/current/models/schools/student_language.html rename to foundation/www/docs/current/models/education/student_language.html index 2842a153..b7dd0c2b 100644 --- a/foundation/www/docs/current/models/schools/student_language.html +++ b/foundation/www/docs/current/models/education/student_language.html @@ -9,10 +9,10 @@
    - Version 8.11.4 + Version 10.0.2 - Source
    @@ -58,7 +58,7 @@

    Controller

    -

    erpnext.schools.doctype.student_language.student_language

    +

    erpnext.education.doctype.student_language.student_language

    diff --git a/foundation/www/docs/current/models/schools/student_leave_application.html b/foundation/www/docs/current/models/education/student_leave_application.html similarity index 90% rename from foundation/www/docs/current/models/schools/student_leave_application.html rename to foundation/www/docs/current/models/education/student_leave_application.html index a992c0a5..25357c58 100644 --- a/foundation/www/docs/current/models/schools/student_leave_application.html +++ b/foundation/www/docs/current/models/education/student_leave_application.html @@ -9,10 +9,10 @@
    - Version 8.11.4 + Version 10.0.2 - Source
    @@ -54,7 +54,7 @@ -Student +Student @@ -162,7 +162,7 @@ -Student Leave Application +Student Leave Application @@ -175,7 +175,7 @@

    Controller

    -

    erpnext.schools.doctype.student_leave_application.student_leave_application

    +

    erpnext.education.doctype.student_leave_application.student_leave_application

    @@ -206,7 +206,7 @@
  • -Student Leave Application +Student Leave Application
    • diff --git a/foundation/www/docs/current/models/schools/student_log.html b/foundation/www/docs/current/models/education/student_log.html similarity index 90% rename from foundation/www/docs/current/models/schools/student_log.html rename to foundation/www/docs/current/models/education/student_log.html index bd1ffc66..38d35016 100644 --- a/foundation/www/docs/current/models/schools/student_log.html +++ b/foundation/www/docs/current/models/education/student_log.html @@ -9,10 +9,10 @@
    - Version 8.11.4 + Version 10.0.2 - Source
    @@ -54,7 +54,7 @@ -Student +Student @@ -130,7 +130,7 @@ Achievement -Academic Year +Academic Year @@ -151,7 +151,7 @@ Achievement -Academic Term +Academic Term @@ -172,7 +172,7 @@ Achievement -Program +Program @@ -193,7 +193,7 @@ Achievement -Student Batch Name +Student Batch Name @@ -230,7 +230,7 @@ Achievement

    Controller

    -

    erpnext.schools.doctype.student_log.student_log

    +

    erpnext.education.doctype.student_log.student_log

    diff --git a/foundation/www/docs/current/models/schools/student_sibling.html b/foundation/www/docs/current/models/education/student_sibling.html similarity index 91% rename from foundation/www/docs/current/models/schools/student_sibling.html rename to foundation/www/docs/current/models/education/student_sibling.html index 79dd31c3..7b830c89 100644 --- a/foundation/www/docs/current/models/schools/student_sibling.html +++ b/foundation/www/docs/current/models/education/student_sibling.html @@ -9,10 +9,10 @@
    - Version 8.11.4 + Version 10.0.2 - Source
    @@ -109,7 +109,7 @@ Female -Student +Student @@ -164,14 +164,14 @@ Female
  • -Student +Student
  • -Student Applicant +Student Applicant
    • diff --git a/foundation/www/docs/current/models/schools/student_siblings.html b/foundation/www/docs/current/models/education/student_siblings.html similarity index 95% rename from foundation/www/docs/current/models/schools/student_siblings.html rename to foundation/www/docs/current/models/education/student_siblings.html index e2c784ed..b2e67601 100644 --- a/foundation/www/docs/current/models/schools/student_siblings.html +++ b/foundation/www/docs/current/models/education/student_siblings.html @@ -9,10 +9,10 @@
    - Version 8.11.4 + Version 10.0.2 - Source
    diff --git a/foundation/www/docs/current/models/fleet_management/index.html b/foundation/www/docs/current/models/fleet_management/index.html index 21645e69..39005541 100644 --- a/foundation/www/docs/current/models/fleet_management/index.html +++ b/foundation/www/docs/current/models/fleet_management/index.html @@ -7,7 +7,7 @@
    - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 
     Male
-Female
    +Female +Other @@ -586,6 +587,20 @@ Female +

    + + + on_cancel + (self) +

    +

    No docs

    +
    +
    + + + + +

    @@ -688,6 +703,22 @@ Female +

    + + + erpnext.healthcare.doctype.consultation.consultation.delete_medical_record + (consultation) +

    +

    No docs

    +
    +
    + + + + + + +

    diff --git a/foundation/www/docs/current/models/healthcare/diagnosis.html b/foundation/www/docs/current/models/healthcare/diagnosis.html index a2697355..699f8242 100644 --- a/foundation/www/docs/current/models/healthcare/diagnosis.html +++ b/foundation/www/docs/current/models/healthcare/diagnosis.html @@ -9,7 +9,7 @@

    - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 patient_name Data - + Patient Name @@ -134,7 +134,8 @@ 
     Male
-Female
    +Female +Other diff --git a/foundation/www/docs/current/models/healthcare/lab_test_groups.html b/foundation/www/docs/current/models/healthcare/lab_test_groups.html index daf43c87..d1d70aa8 100644 --- a/foundation/www/docs/current/models/healthcare/lab_test_groups.html +++ b/foundation/www/docs/current/models/healthcare/lab_test_groups.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 
     Male
-Female
    +Female +Other @@ -124,7 +125,7 @@ O Negative Date - DOB + Date of birth @@ -205,27 +206,6 @@ Open 12 - company - - Link - - Company - - - - - - - -    Company - - - - - - - - 13 report_preference Select @@ -241,7 +221,7 @@ Print - 14 + 13 mobile Data @@ -253,7 +233,7 @@ Print - 15 + 14 email Data @@ -267,7 +247,7 @@ Print - 16 + 15 phone Data @@ -279,7 +259,7 @@ Print - 17 + 16 disabled Check @@ -291,7 +271,7 @@ Print - 18 + 17 sb_relation Section Break @@ -303,7 +283,7 @@ Print - 19 + 18 patient_relation Table @@ -324,7 +304,7 @@ Print - 20 + 19 allergy_medical_and_surgical_history Section Break @@ -336,7 +316,7 @@ Print - 21 + 20 allergies Small Text @@ -348,7 +328,7 @@ Print - 22 + 21 medication Small Text @@ -360,7 +340,7 @@ Print - 23 + 22 column_break_20 Column Break @@ -372,7 +352,7 @@ Print - 24 + 23 medical_history Small Text @@ -384,7 +364,7 @@ Print - 25 + 24 surgical_history Small Text @@ -396,7 +376,7 @@ Print - 26 + 25 personal_and_social_history Section Break @@ -408,7 +388,7 @@ Print - 27 + 26 occupation Data @@ -420,7 +400,7 @@ Print - 28 + 27 column_break_25 Column Break @@ -432,7 +412,7 @@ Print - 29 + 28 marital_status Select @@ -441,7 +421,8 @@ Print - 
    Single
+                
    +Single
 Married
 Divorced
 Widow
    
@@ -449,7 +430,7 @@ Widow
    - 30 + 29 risk_factors Section Break @@ -461,7 +442,7 @@ Widow - 31 + 30 tobacco_past_use Data @@ -473,7 +454,7 @@ Widow - 32 + 31 tobacco_current_use Data @@ -485,7 +466,7 @@ Widow - 33 + 32 alcohol_past_use Data @@ -497,7 +478,7 @@ Widow - 34 + 33 alcohol_current_use Data @@ -509,7 +490,7 @@ Widow - 35 + 34 column_break_32 Column Break @@ -521,7 +502,7 @@ Widow - 36 + 35 surrounding_factors Small Text @@ -533,7 +514,7 @@ Widow - 37 + 36 other_risk_factors Small Text @@ -545,7 +526,7 @@ Widow - 38 + 37 more_info Section Break @@ -559,7 +540,7 @@ Widow - 39 + 38 patient_details Text @@ -572,7 +553,7 @@ Widow - 40 + 39 ac_sb Section Break @@ -584,7 +565,7 @@ Widow - 41 + 40 default_currency Link @@ -755,7 +736,7 @@ Widow erpnext.healthcare.doctype.patient.patient.get_patient_detail - (patient, company=None) + (patient)

    No docs

    diff --git a/foundation/www/docs/current/models/healthcare/patient_appointment.html b/foundation/www/docs/current/models/healthcare/patient_appointment.html index 71599d5c..e8d49c3b 100644 --- a/foundation/www/docs/current/models/healthcare/patient_appointment.html +++ b/foundation/www/docs/current/models/healthcare/patient_appointment.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 6 + patient_name + + Data + + Patient Name + + + + 
    patient.patient_name
    + + + + + 7 + patient_sex + + Data + + Gender + + + + 
    patient.sex
    + + + + + 8 + patient_age + + Data + + Patient Age + + + + + + + 9 status Select @@ -138,7 +178,7 @@ Cancelled - 7 + 10 appointment_type Link @@ -159,7 +199,7 @@ Cancelled - 8 + 11 section_break_1 Section Break @@ -171,7 +211,7 @@ Cancelled - 9 + 12 appointment_time Time @@ -183,7 +223,7 @@ Cancelled - 10 + 13 duration Int @@ -196,7 +236,7 @@ Cancelled - 11 + 14 appointment_datetime Datetime @@ -208,7 +248,7 @@ Cancelled - 12 + 15 column_break_2 Column Break @@ -220,7 +260,7 @@ Cancelled - 13 + 16 department Link @@ -241,7 +281,7 @@ Cancelled - 14 + 17 sales_invoice Link @@ -261,70 +301,8 @@ Cancelled - - 15 - section_break_2 - - Section Break - - - - - - - - - 16 - patient_details - - Section Break - - Patient Details - - - - - - - 17 - patient_name - - Data - - Patient Name - - - - - 18 - patient_sex - - Data - - Gender - - - - 
    patient.sex
    - - - - - 19 - patient_age - - Data - - Patient Age - - - - - - - 20 company Link @@ -345,7 +323,7 @@ Cancelled - 21 + 19 section_break_3 Section Break @@ -357,7 +335,7 @@ Cancelled - 22 + 20 notes Small Text @@ -369,7 +347,7 @@ Cancelled - 23 + 21 referring_physician Link @@ -390,7 +368,7 @@ Cancelled - 24 + 22 reminded Check @@ -451,6 +429,20 @@ Cancelled
    + + + +

    + + + save + (self) +

    +

    No docs

    +
    +
    + +
    @@ -464,7 +456,7 @@ Cancelled erpnext.healthcare.doctype.patient_appointment.patient_appointment.appointment_cancel - (appointmentId) + (appointment_id)

    No docs

    @@ -568,7 +560,17 @@ Cancelled erpnext.healthcare.doctype.patient_appointment.patient_appointment.get_availability_data (date, physician)

    -

    No docs

    + 
    Get availability data of 'physician' on 'date'
+
    + +

    Parameters:

    + +
      +
    • date - Date to check in schedule
      • +

    • physician - Name of the physician

      + +

      :return: dict containing a list of available slots, list of appointments and time of appointments

      • +

    @@ -710,7 +712,7 @@ Cancelled erpnext.healthcare.doctype.patient_appointment.patient_appointment.update_status - (appointmentId, status) + (appointment_id, status)

    No docs

    diff --git a/foundation/www/docs/current/models/healthcare/patient_medical_record.html b/foundation/www/docs/current/models/healthcare/patient_medical_record.html index 7d456f82..bf7092b4 100644 --- a/foundation/www/docs/current/models/healthcare/patient_medical_record.html +++ b/foundation/www/docs/current/models/healthcare/patient_medical_record.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 Time per Appointment - +

    + In minutes

    @@ -537,6 +538,20 @@
    + + + +

    + + + validate_schedule_and_time + (self) +

    +

    No docs

    +
    +
    + +
    diff --git a/foundation/www/docs/current/models/healthcare/physician_schedule.html b/foundation/www/docs/current/models/healthcare/physician_schedule.html index 97d855c2..44f3d40f 100644 --- a/foundation/www/docs/current/models/healthcare/physician_schedule.html +++ b/foundation/www/docs/current/models/healthcare/physician_schedule.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2
    + + + +

    + + + autoname + (self) +

    +

    No docs

    +
    +
    + +
    diff --git a/foundation/www/docs/current/models/healthcare/physician_schedule_time_slot.html b/foundation/www/docs/current/models/healthcare/physician_schedule_time_slot.html index c1a8f4f6..d2159098 100644 --- a/foundation/www/docs/current/models/healthcare/physician_schedule_time_slot.html +++ b/foundation/www/docs/current/models/healthcare/physician_schedule_time_slot.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 2 + patient_name + + Data + + Patient Name + + + + 
    patient.patient_name
    + + + + + 3 appointment Link @@ -83,7 +97,7 @@ - 3 + 4 consultation Link @@ -104,7 +118,7 @@ - 4 + 5 column_break_2 Column Break @@ -116,7 +130,7 @@ - 5 + 6 signs_date Date @@ -128,7 +142,7 @@ - 6 + 7 column_break_4 Column Break @@ -140,7 +154,7 @@ - 7 + 8 signs_time Time @@ -152,7 +166,7 @@ - 8 + 9 sb_vs Section Break @@ -164,7 +178,7 @@ - 9 + 10 temperature Data @@ -177,7 +191,7 @@ - 10 + 11 pulse Data @@ -190,7 +204,7 @@ - 11 + 12 respiratory_rate Data @@ -203,7 +217,7 @@ - 12 + 13 column_break_8 Column Break @@ -215,7 +229,7 @@ - 13 + 14 bp_systolic Data @@ -227,7 +241,7 @@ - 14 + 15 bp_diastolic Data @@ -239,7 +253,7 @@ - 15 + 16 bp Data @@ -252,7 +266,7 @@ - 16 + 17 vital_signs_note Small Text @@ -264,7 +278,7 @@ - 17 + 18 sb_nutrition_values Section Break @@ -276,7 +290,7 @@ - 18 + 19 height Float @@ -288,7 +302,7 @@ - 19 + 20 weight Float @@ -300,7 +314,7 @@ - 20 + 21 bmi Float @@ -312,7 +326,7 @@ - 21 + 22 column_break_14 Column Break @@ -324,7 +338,7 @@ - 22 + 23 nutrition_note Small Text @@ -336,7 +350,7 @@ - 23 + 24 company Link @@ -357,7 +371,7 @@ - 24 + 25 amended_from Link diff --git a/foundation/www/docs/current/models/hr/appraisal.html b/foundation/www/docs/current/models/hr/appraisal.html index 34d744bd..314f3bfe 100644 --- a/foundation/www/docs/current/models/hr/appraisal.html +++ b/foundation/www/docs/current/models/hr/appraisal.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 -Process Payroll +Payroll Entry diff --git a/foundation/www/docs/current/models/hr/daily_work_summary.html b/foundation/www/docs/current/models/hr/daily_work_summary.html index 28545bb8..665ebb20 100644 --- a/foundation/www/docs/current/models/hr/daily_work_summary.html +++ b/foundation/www/docs/current/models/hr/daily_work_summary.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 -Course +Asset + + + + + +
  • + + +Course
    • @@ -147,7 +156,7 @@
  • -Instructor +Instructor
    • @@ -165,7 +174,7 @@
  • -Process Payroll +Payroll Entry
    • @@ -174,7 +183,7 @@
  • -Program +Program
    • diff --git a/foundation/www/docs/current/models/hr/designation.html b/foundation/www/docs/current/models/hr/designation.html index 95984734..14c72e25 100644 --- a/foundation/www/docs/current/models/hr/designation.html +++ b/foundation/www/docs/current/models/hr/designation.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 -Physician +Payroll Entry @@ -155,7 +155,7 @@
  • -Process Payroll +Physician
    • diff --git a/foundation/www/docs/current/models/hr/driver.html b/foundation/www/docs/current/models/hr/driver.html new file mode 100644 index 00000000..87d787ff --- /dev/null +++ b/foundation/www/docs/current/models/hr/driver.html @@ -0,0 +1,283 @@ + + + + + + + +

    Driver

    +
    + + + Version 10.0.2 + + + Source + +
    + + + + + +

    Table Name: tabDriver

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1naming_series + Select + Series + + + 
    DRIVER-.#####
    +
    2full_name + Data + Full Name + +
    3status + Select + Status + + + 
    Active
+Suspended
+Left
    +
    4column_break_2 + Column Break + + +
    5employee + Link + Employee + + + + + + +Employee + + + +
    6cell_number + Data + Cellphone Number + +
    7license_details + Section Break + License Details + +
    8license_number + Data + License Number + +
    9column_break_8 + Column Break + + +
    10issuing_date + Date + Issuing Date + +
    11column_break_10 + Column Break + + +
    12expiry_date + Date + Expiry Date + +
    13driving_license_categories + Section Break + Driving License Categories + +
    14driving_license_category + Table + Driving License Category + + + + + + +Driving License Category + + + +
    + + +
    +

    Controller

    +

    erpnext.hr.doctype.driver.driver

    + + + + + + + +

    Class Driver

    + +

    Inherits from frappe.model.document.Document + +

    +
    +
    + +
    +
    + + + + + + +

    Linked In:

    + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/hr/driving_license_category.html b/foundation/www/docs/current/models/hr/driving_license_category.html new file mode 100644 index 00000000..65f3347a --- /dev/null +++ b/foundation/www/docs/current/models/hr/driving_license_category.html @@ -0,0 +1,113 @@ + + + + + + + +

    Driving License Category

    +
    + + + Version 10.0.2 + + + Source + +
    + + +Child Table + + +

    Table Name: tabDriving License Category

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1class + Data + Class + +
    2description + Data + Description + +
    3issuing_date + Date + Issuing Date + +
    4expiry_date + Date + Expiry Date + +
    + + + + +

    Child Table Of

    + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/hr/employee.html b/foundation/www/docs/current/models/hr/employee.html index 4ed60441..d0cd11af 100644 --- a/foundation/www/docs/current/models/hr/employee.html +++ b/foundation/www/docs/current/models/hr/employee.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 + + 80 + lft + + Int + + lft + + + + + + + 81 + rgt + + Int + + rgt + + + + + + + 82 + old_parent + + Data + + Old Parent + + + + + @@ -1196,7 +1232,7 @@ Health Concerns

    Class Employee

    -

    Inherits from frappe.model.document.Document +

    Inherits from frappe.utils.nestedset.NestedSet

    @@ -1247,6 +1283,20 @@ Health Concerns +

    + + + update_nsm_model + (self) +

    +

    No docs

    +
    +
    + + + + +

    @@ -1457,6 +1507,24 @@ Health Concerns +

    Public API +
    /api/method/erpnext.hr.doctype.employee.employee.get_children +

    +

    + + + erpnext.hr.doctype.employee.employee.get_children + (doctype, parent=None, company=None, is_root=False, is_tree=False) +

    +

    No docs

    +
    +
    + + + + + +

    @@ -1650,6 +1718,15 @@ Health Concerns +

  • + + +Driver + +
    • + + +
  • @@ -1659,6 +1736,15 @@ Health Concerns +
  • + + +Employee Advance + +
    • + + +
  • @@ -1689,7 +1775,7 @@ Health Concerns
  • -Instructor +Instructor
    • @@ -1722,6 +1808,15 @@ Health Concerns +
  • + + +Payroll Employee Detail + +
    • + + +
  • diff --git a/foundation/www/docs/current/models/hr/employee_advance.html b/foundation/www/docs/current/models/hr/employee_advance.html new file mode 100644 index 00000000..1dd8ccd2 --- /dev/null +++ b/foundation/www/docs/current/models/hr/employee_advance.html @@ -0,0 +1,494 @@ + + + + + + + +

    Employee Advance

    +
    + + + Version 10.0.2 + + + Source + +
    + + + + + +

    Table Name: tabEmployee Advance

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1naming_series + Select + Series + + + 
    EA-
    +
    2employee + Link + Employee + + + + + + +Employee + + + +
    3employee_name + Read Only + Employee Name + + + 
    employee.employee_name
    +
    4column_break_4 + Column Break + + +
    5posting_date + Date + Posting Date + +
    6section_break_8 + Section Break + + +
    7purpose + Small Text + Purpose + +
    8column_break_11 + Column Break + + +
    9advance_amount + Currency + Advance Amount + + + 
    Company:company:default_currency
    +
    10paid_amount + Currency + Paid Amount + + + 
    Company:company:default_currency
    +
    11claimed_amount + Currency + Claimed Amount + + + 
    Company:company:default_currency
    +
    12section_break_7 + Section Break + + +
    13status + Select + Status + + + 
    Draft
+Paid
+Unpaid
+Claimed
+Cancelled
    +
    14company + Link + Company + + + + + + +Company + + + +
    15amended_from + Link + Amended From + + + + + + +Employee Advance + + + +
    16column_break_18 + Column Break + + +
    17advance_account + Link + Advance Account + + + + + + +Account + + + +
    18mode_of_payment + Link + Mode of Payment + + + + + + +Mode of Payment + + + +
    + + +
    +

    Controller

    +

    erpnext.hr.doctype.employee_advance.employee_advance

    + + + + + + + +

    Class EmployeeAdvance

    + +

    Inherits from frappe.model.document.Document + +

    +
    +
    + + + + +

    + + + on_cancel + (self) +

    +

    No docs

    +
    +
    + + + + + +

    + + + onload + (self) +

    +

    No docs

    +
    +
    + + + + + +

    + + + set_status + (self) +

    +

    No docs

    +
    +
    + + + + + +

    + + + set_total_advance_paid + (self) +

    +

    No docs

    +
    +
    + + + + + +

    + + + update_claimed_amount + (self) +

    +

    No docs

    +
    +
    + + + + + +

    + + + validate + (self) +

    +

    No docs

    +
    +
    + + +
    +
    + + + + + +

    Class EmployeeAdvanceOverPayment

    + +

    Inherits from frappe.exceptions.ValidationError + +

    +
    +
    + +
    +
    + + + + + + +

    Public API +
    /api/method/erpnext.hr.doctype.employee_advance.employee_advance.make_bank_entry +

    +

    + + + erpnext.hr.doctype.employee_advance.employee_advance.make_bank_entry + (dt, dn) +

    +

    No docs

    +
    +
    + + + + + + +

    Linked In:

    + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/hr/employee_attendance_tool.html b/foundation/www/docs/current/models/hr/employee_attendance_tool.html index 73ee4c79..81f12bfb 100644 --- a/foundation/www/docs/current/models/hr/employee_attendance_tool.html +++ b/foundation/www/docs/current/models/hr/employee_attendance_tool.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2
    • + +
  • + + +Salary Slip Loan + +
    • + + diff --git a/foundation/www/docs/current/models/hr/employee_loan_application.html b/foundation/www/docs/current/models/hr/employee_loan_application.html index fd74c1ce..232157c1 100644 --- a/foundation/www/docs/current/models/hr/employee_loan_application.html +++ b/foundation/www/docs/current/models/hr/employee_loan_application.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 2 - is_paid - - Check - - Is Paid - - - - - - - 3 approval_status Select @@ -83,7 +71,7 @@ Rejected - 4 + 3 exp_approver Link @@ -105,7 +93,7 @@ Rejected - 5 + 4 column_break0 Column Break @@ -117,7 +105,7 @@ Rejected - 6 + 5 total_claimed_amount Currency @@ -131,7 +119,7 @@ Rejected - 7 + 6 total_sanctioned_amount Currency @@ -144,6 +132,18 @@ Rejected + + 7 + is_paid + + Check + + Is Paid + + + + + 8 expense_details @@ -233,7 +233,9 @@ Rejected Employee Name - + + 
    employee.employee_name
    + @@ -521,6 +523,53 @@ Cancelled + + 31 + advance_payments + + Section Break + + Advance Payments + + + + + + + 32 + advances + + Table + + Advances + + + + + + + +    Expense Claim Advance + + + + + + + + 33 + total_advance_amount + + Currency + + Total Advance Amount + + + + 
    Company:company:default_currency
    + + + @@ -700,6 +749,20 @@ Cancelled +

    + + + update_claimed_amount_in_employee_advance + (self) +

    +

    No docs

    +
    +
    + + + + +

    @@ -756,6 +819,20 @@ Cancelled +

    + + + validate_advances + (self) +

    +

    No docs

    +
    +
    + + + + +

    @@ -804,6 +881,24 @@ Cancelled +

    Public API +
    /api/method/erpnext.hr.doctype.expense_claim.expense_claim.get_advances +

    +

    + + + erpnext.hr.doctype.expense_claim.expense_claim.get_advances + (employee, advance_id=None) +

    +

    No docs

    +
    +
    + + + + + +

    Public API
    /api/method/erpnext.hr.doctype.expense_claim.expense_claim.get_expense_approver

    diff --git a/foundation/www/docs/current/models/hr/expense_claim_account.html b/foundation/www/docs/current/models/hr/expense_claim_account.html index cb7b1481..56e071b4 100644 --- a/foundation/www/docs/current/models/hr/expense_claim_account.html +++ b/foundation/www/docs/current/models/hr/expense_claim_account.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 + + + + + + +

    Expense Claim Advance

    +
    + + + Version 10.0.2 + + + Source + +
    + + +Child Table + + +

    Table Name: tabExpense Claim Advance

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1employee_advance + Link + Employee Advance + + + + + + +Employee Advance + + + +
    2posting_date + Date + Posting Date + +
    3advance_paid + Currency + Advance Paid + + + 
    Company:company.default_currency
    +
    4unclaimed_amount + Currency + Unclaimed amount + + + 
    Company:company.default_currency
    +
    5allocated_amount + Currency + Allocated amount + + + 
    Company:company.default_currency
    +
    6advance_account + Link + Advance Account + + + + + + +Account + + + +
    + + + + +

    Child Table Of

    + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/hr/expense_claim_detail.html b/foundation/www/docs/current/models/hr/expense_claim_detail.html index 6e24d5ab..18c5775c 100644 --- a/foundation/www/docs/current/models/hr/expense_claim_detail.html +++ b/foundation/www/docs/current/models/hr/expense_claim_detail.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 - + + 
    expense_type.description
    + diff --git a/foundation/www/docs/current/models/hr/expense_claim_type.html b/foundation/www/docs/current/models/hr/expense_claim_type.html index 8af3e192..2f8f6450 100644 --- a/foundation/www/docs/current/models/hr/expense_claim_type.html +++ b/foundation/www/docs/current/models/hr/expense_claim_type.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 -Guardian Interest +Guardian Interest diff --git a/foundation/www/docs/current/models/hr/job_applicant.html b/foundation/www/docs/current/models/hr/job_applicant.html index cd933f2d..129ae51a 100644 --- a/foundation/www/docs/current/models/hr/job_applicant.html +++ b/foundation/www/docs/current/models/hr/job_applicant.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 1 - column_break0 - - Column Break - - - - - - - - - 2 naming_series Select @@ -67,7 +55,7 @@ - 3 + 2 employee Link @@ -88,7 +76,7 @@ - 4 + 3 employee_name Data @@ -100,7 +88,7 @@ - 5 + 4 column_break1 Column Break @@ -112,7 +100,7 @@ - 6 + 5 description Small Text @@ -124,7 +112,7 @@ - 7 + 6 section_break_6 Section Break @@ -136,7 +124,7 @@ - 8 + 7 leave_type Link @@ -157,7 +145,7 @@ - 9 + 8 from_date Date @@ -169,7 +157,7 @@ - 10 + 9 to_date Date @@ -181,7 +169,7 @@ - 11 + 10 column_break_10 Column Break @@ -193,7 +181,7 @@ - 12 + 11 new_leaves_allocated Float @@ -205,7 +193,7 @@ - 13 + 12 carry_forward Check @@ -217,7 +205,7 @@ - 14 + 13 carry_forwarded_leaves Float @@ -229,7 +217,7 @@ - 15 + 14 total_leaves_allocated Float @@ -241,7 +229,7 @@ - 16 + 15 amended_from Link diff --git a/foundation/www/docs/current/models/hr/leave_application.html b/foundation/www/docs/current/models/hr/leave_application.html index 8945cc8a..cdd19298 100644 --- a/foundation/www/docs/current/models/hr/leave_application.html +++ b/foundation/www/docs/current/models/hr/leave_application.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 1 - column_break0 - - Column Break - - - - - - - - - 2 company Link @@ -72,7 +60,7 @@ - 3 + 2 employment_type Link @@ -94,7 +82,7 @@ - 4 + 3 branch Link @@ -116,7 +104,7 @@ - 5 + 4 department Link @@ -138,7 +126,7 @@ - 6 + 5 designation Link @@ -160,7 +148,7 @@ - 7 + 6 column_break1 Column Break @@ -172,7 +160,7 @@ - 8 + 7 from_date Date @@ -184,7 +172,7 @@ - 9 + 8 to_date Date @@ -196,7 +184,7 @@ - 10 + 9 leave_type Link @@ -217,7 +205,7 @@ - 11 + 10 carry_forward Check @@ -230,7 +218,7 @@ - 12 + 11 no_of_days Float @@ -242,7 +230,7 @@ - 13 + 12 allocate Button diff --git a/foundation/www/docs/current/models/hr/leave_type.html b/foundation/www/docs/current/models/hr/leave_type.html index cd968082..ef720d8e 100644 --- a/foundation/www/docs/current/models/hr/leave_type.html +++ b/foundation/www/docs/current/models/hr/leave_type.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 + + + + + + +

    Payroll Employee Detail

    +
    + + + Version 10.0.2 + + + Source + +
    + + +Child Table + + +

    Table Name: tabPayroll Employee Detail

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1employee + Link + Employee + + + + + + +Employee + + + +
    2employee_name + Data + Employee Name + + + 
    employee.employee_name
    +
    3column_break_3 + Column Break + + +
    4department + Data + Department + + + 
    employee.department
    +
    5designation + Data + Designation + + + 
    employee.designation
    +
    + + + + +

    Child Table Of

    + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/hr/process_payroll.html b/foundation/www/docs/current/models/hr/payroll_entry.html similarity index 71% rename from foundation/www/docs/current/models/hr/process_payroll.html rename to foundation/www/docs/current/models/hr/payroll_entry.html index c93c844a..e1cb7d16 100644 --- a/foundation/www/docs/current/models/hr/process_payroll.html +++ b/foundation/www/docs/current/models/hr/payroll_entry.html @@ -1,27 +1,29 @@ - + -

    Process Payroll

    +

    Payroll Entry

    - Version 8.11.4 + Version 10.0.2 - Source
    -Single +

    Table Name: tabPayroll Entry

    + +

    Fields

    @@ -203,6 +205,51 @@ Daily 11 + get_employee_details + + Button + + Get Employee Details + + + + + + + 12 + employees + + Table + + Employees + + + + + + + +Payroll Employee Detail + + + + + + + + 13 + section_break_12 + + Section Break + + + + + + + + + 14 salary_slip_based_on_timesheet Check @@ -214,7 +261,7 @@ Daily - 12 + 15 select_payroll_period Section Break @@ -226,8 +273,8 @@ Daily - 13 - start_date + 16 + start_date Date @@ -238,7 +285,7 @@ Daily - 14 + 17 column_break_11 Column Break @@ -250,8 +297,8 @@ Daily - 15 - end_date + 18 + end_date Date @@ -262,7 +309,7 @@ Daily - 16 + 19 section_break_16 Section Break @@ -274,7 +321,7 @@ Daily - 17 + 20 cost_center Link @@ -295,7 +342,7 @@ Daily - 18 + 21 column_break_18 Column Break @@ -307,7 +354,7 @@ Daily - 19 + 22 project Link @@ -327,20 +374,8 @@ Daily - - 20 - process_payroll - - Section Break - - Process Payroll - - - - - - 21 + 23 column_break2 Column Break @@ -351,46 +386,8 @@ Daily - - 22 - create_salary_slip - - Button - - Create Salary Slip -

    - Creates salary slip for above mentioned criteria.

    - - - - - - 23 - column_break3 - - Column Break - - - - - - - - - 24 - submit_salary_slip - - Button - - Submit Salary Slip -

    - Submit all salary slips for the above selected criteria

    - - - - - 25 + 24 account Section Break @@ -402,7 +399,7 @@ Daily - 26 + 25 payment_account Link @@ -423,21 +420,8 @@ Daily - - 27 - make_bank_entry - - Button - - Make Bank Entry -

    - Create Bank Entry for the total salary paid for the above selected criteria

    - - - - - 28 + 26 section_break2 Section Break @@ -449,7 +433,7 @@ Daily - 29 + 27 activity_log HTML @@ -460,13 +444,34 @@ Daily + + 28 + amended_from + + Link + + Amended From + + + + + + + +Payroll Entry + + + + + +

    Controller

    -

    erpnext.hr.doctype.process_payroll.process_payroll

    +

    erpnext.hr.doctype.payroll_entry.payroll_entry

    @@ -474,7 +479,7 @@ Daily -

    Class ProcessPayroll

    +

    Class PayrollEntry

    Inherits from frappe.model.document.Document @@ -499,20 +504,6 @@ Daily -

    - - - create_log - (self, ss_list) -

    -

    No docs

    -
    -
    - - - - -

    @@ -529,24 +520,10 @@ Daily

    - + - create_submit_log - (self, submitted_ss, not_submitted_ss, jv_name) -

    -

    No docs

    -
    -
    - - - - - -

    - - - format_as_links - (self, salary_slip) + fill_employee_details + (self)

    No docs

    @@ -629,12 +606,13 @@ Daily

    - + - get_loan_accounts + get_loan_details (self)

    -

    No docs

    + 
            Get loan details from submitted salary slip based on selected criteria
+

    @@ -700,12 +678,12 @@ Daily

    - + - get_total_salary_and_loan_amounts + get_total_salary_amount (self)

    - 
            Get total loan principal, loan interest and salary amount from submitted salary slip based on selected criteria
+	
            Get total salary amount from submitted salary slip based on selected criteria
 
    
 
    
 	
    
@@ -742,6 +720,20 @@ Daily
    +

    + + + on_submit + (self) +

    +

    No docs

    +
    +
    + + + + +

    @@ -791,12 +783,62 @@ Daily

    Public API -
    /api/method/erpnext.hr.doctype.process_payroll.process_payroll.get_end_date +
    /api/method/erpnext.hr.doctype.payroll_entry.payroll_entry.create_log

    - + - erpnext.hr.doctype.process_payroll.process_payroll.get_end_date + erpnext.hr.doctype.payroll_entry.payroll_entry.create_log + (ss_list) +

    +

    No docs

    +
    +
    + + + + + + + +

    + + + erpnext.hr.doctype.payroll_entry.payroll_entry.create_submit_log + (submitted_ss, not_submitted_ss, jv_name) +

    +

    No docs

    +
    +
    + + + + + + + +

    + + + erpnext.hr.doctype.payroll_entry.payroll_entry.format_as_links + (salary_slip) +

    +

    No docs

    +
    +
    + + + + + + +

    Public API +
    /api/method/erpnext.hr.doctype.payroll_entry.payroll_entry.get_end_date +

    +

    + + + erpnext.hr.doctype.payroll_entry.payroll_entry.get_end_date (start_date, frequency)

    No docs

    @@ -810,9 +852,9 @@ Daily

    - + - erpnext.hr.doctype.process_payroll.process_payroll.get_frequency_kwargs + erpnext.hr.doctype.payroll_entry.payroll_entry.get_frequency_kwargs (frequency_name)

    No docs

    @@ -826,9 +868,9 @@ Daily

    - + - erpnext.hr.doctype.process_payroll.process_payroll.get_month_details + erpnext.hr.doctype.payroll_entry.payroll_entry.get_month_details (year, month)

    No docs

    @@ -840,13 +882,45 @@ Daily + +

    + + + erpnext.hr.doctype.payroll_entry.payroll_entry.get_payroll_entry_bank_entries + (payroll_entry_name) +

    +

    No docs

    +
    +
    + + + + + + + +

    + + + erpnext.hr.doctype.payroll_entry.payroll_entry.get_salary_slip_list + (name, docstatus, as_dict=0) +

    +

    No docs

    +
    +
    + + + + + +

    Public API -
    /api/method/erpnext.hr.doctype.process_payroll.process_payroll.get_start_end_dates +
    /api/method/erpnext.hr.doctype.payroll_entry.payroll_entry.get_start_end_dates

    - + - erpnext.hr.doctype.process_payroll.process_payroll.get_start_end_dates + erpnext.hr.doctype.payroll_entry.payroll_entry.get_start_end_dates (payroll_frequency, start_date=None, company=None)

    Returns dict of start and end dates for given payroll frequency based on start_date

    @@ -855,9 +929,59 @@ Daily + + + +

    Public API +
    /api/method/erpnext.hr.doctype.payroll_entry.payroll_entry.payroll_entry_has_bank_entries +

    +

    + + + erpnext.hr.doctype.payroll_entry.payroll_entry.payroll_entry_has_bank_entries + (name) +

    +

    No docs

    +
    +
    + + + + + + +

    Public API +
    /api/method/erpnext.hr.doctype.payroll_entry.payroll_entry.payroll_entry_has_created_slips +

    +

    + + + erpnext.hr.doctype.payroll_entry.payroll_entry.payroll_entry_has_created_slips + (name) +

    +

    No docs

    +
    +
    + + + +

    Linked In:

    + + diff --git a/foundation/www/docs/current/models/hr/repayment_schedule.html b/foundation/www/docs/current/models/hr/repayment_schedule.html index 535140c4..54710151 100644 --- a/foundation/www/docs/current/models/hr/repayment_schedule.html +++ b/foundation/www/docs/current/models/hr/repayment_schedule.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 11 + do_not_include_in_total + + Check + + Do not include in total + + + + + + + 12 default_amount Currency @@ -189,7 +201,7 @@ - 12 + 13 section_break_11 Column Break @@ -201,7 +213,7 @@ - 13 + 14 condition_and_formula_help HTML diff --git a/foundation/www/docs/current/models/hr/salary_slip.html b/foundation/www/docs/current/models/hr/salary_slip.html index 3a7186af..9830ae34 100644 --- a/foundation/www/docs/current/models/hr/salary_slip.html +++ b/foundation/www/docs/current/models/hr/salary_slip.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 1 - column_break0 - - Column Break - - - - - - - - - 2 posting_date Date @@ -65,7 +53,7 @@ - 3 + 2 employee Link @@ -86,7 +74,7 @@ - 4 + 3 employee_name Read Only @@ -100,7 +88,7 @@ - 5 + 4 department Read Only @@ -114,7 +102,7 @@ - 6 + 5 designation Read Only @@ -128,7 +116,7 @@ - 7 + 6 branch Read Only @@ -142,7 +130,7 @@ - 8 + 7 column_break1 Column Break @@ -154,7 +142,7 @@ - 9 + 8 status Select @@ -170,7 +158,7 @@ Cancelled - 10 + 9 journal_entry Link @@ -191,7 +179,7 @@ Cancelled - 11 + 10 company Link @@ -212,7 +200,7 @@ Cancelled - 12 + 11 letter_head Link @@ -233,7 +221,7 @@ Cancelled - 13 + 12 section_break_10 Section Break @@ -245,7 +233,7 @@ Cancelled - 14 + 13 salary_slip_based_on_timesheet Check @@ -257,7 +245,7 @@ Cancelled - 15 + 14 start_date Date @@ -269,7 +257,7 @@ Cancelled - 16 + 15 end_date Date @@ -281,7 +269,7 @@ Cancelled - 17 + 16 column_break_15 Column Break @@ -293,7 +281,7 @@ Cancelled - 18 + 17 salary_structure Link @@ -314,7 +302,7 @@ Cancelled - 19 + 18 payroll_frequency Select @@ -333,7 +321,7 @@ Daily - 20 + 19 total_working_days Float @@ -345,7 +333,7 @@ Daily - 21 + 20 leave_without_pay Float @@ -357,7 +345,7 @@ Daily - 22 + 21 payment_days Float @@ -369,7 +357,7 @@ Daily - 23 + 22 hourly_wages Section Break @@ -381,7 +369,7 @@ Daily - 24 + 23 timesheets Table @@ -402,7 +390,7 @@ Daily - 25 + 24 column_break_20 Column Break @@ -414,7 +402,7 @@ Daily - 26 + 25 total_working_hours Float @@ -426,7 +414,7 @@ Daily - 27 + 26 hour_rate Currency @@ -440,7 +428,7 @@ Daily - 28 + 27 section_break_26 Section Break @@ -452,7 +440,7 @@ Daily - 29 + 28 bank_name Data @@ -464,7 +452,7 @@ Daily - 30 + 29 bank_account_no Data @@ -476,7 +464,7 @@ Daily - 31 + 30 column_break_01 Column Break @@ -488,7 +476,7 @@ Daily - 32 + 31 amended_from Link @@ -509,7 +497,7 @@ Daily - 33 + 32 earning_deduction Section Break @@ -521,7 +509,7 @@ Daily - 34 + 33 earning Column Break @@ -533,7 +521,7 @@ Daily - 35 + 34 earnings Table @@ -554,7 +542,7 @@ Daily - 36 + 35 deduction Column Break @@ -566,7 +554,7 @@ Daily - 37 + 36 deductions Table @@ -587,7 +575,7 @@ Daily - 38 + 37 totals Section Break @@ -599,7 +587,7 @@ Daily - 39 + 38 gross_pay Currency @@ -613,7 +601,7 @@ Daily - 40 + 39 column_break_25 Column Break @@ -625,7 +613,7 @@ Daily - 41 + 40 total_deduction Currency @@ -639,7 +627,7 @@ Daily - 42 + 41 loan_repayment Section Break @@ -651,26 +639,45 @@ Daily - 43 - principal_amount + 42 + loans - Currency + Table - Principal Amount + Employee Loan - 
    Company:company:default_currency
    + + + + +    Salary Slip Loan + + + + + 43 + section_break_43 + + Section Break + + + + + + + 44 - interest_amount + total_principal_amount Currency - Interest Amount + Total Principal Amount @@ -680,7 +687,21 @@ Daily 45 - column_break_48 + total_interest_amount + + Currency + + Total Interest Amount + + + + 
    Company:company:default_currency
    + + + + + 46 + column_break_45 Column Break @@ -691,7 +712,7 @@ Daily - 46 + 47 total_loan_repayment Currency @@ -705,7 +726,7 @@ Daily - 47 + 48 net_pay_info Section Break @@ -717,7 +738,7 @@ Daily - 48 + 49 net_pay Currency @@ -732,7 +753,7 @@ Daily - 49 + 50 column_break_53 Column Break @@ -744,7 +765,7 @@ Daily - 50 + 51 rounded_total Currency @@ -758,7 +779,7 @@ Daily - 51 + 52 section_break_55 Section Break @@ -770,7 +791,7 @@ Daily - 52 + 53 total_in_words Data @@ -975,6 +996,20 @@ Daily +

    + + + get_employee_loan_details + (self) +

    +

    No docs

    +
    +
    + + + + +

    diff --git a/foundation/www/docs/current/models/hr/salary_slip_loan.html b/foundation/www/docs/current/models/hr/salary_slip_loan.html new file mode 100644 index 00000000..1002fb75 --- /dev/null +++ b/foundation/www/docs/current/models/hr/salary_slip_loan.html @@ -0,0 +1,176 @@ + + + + + + + +

    Salary Slip Loan

    +
    + + + Version 10.0.2 + + + Source + +
    + + +Child Table + + +

    Table Name: tabSalary Slip Loan

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1employee_loan + Link + Employee Loan + + + + + + +Employee Loan + + + +
    2employee_loan_account + Link + Employee Loan Account + + + + + + +Account + + + +
    3interest_income_account + Link + Interest Income Account + + + + + + +Account + + + +
    4column_break_4 + Column Break + + +
    5principal_amount + Currency + Principal Amount + +
    6interest_amount + Currency + Interest Amount + +
    7total_payment + Currency + Total Payment + +
    + + + + +

    Child Table Of

    + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/hr/salary_slip_timesheet.html b/foundation/www/docs/current/models/hr/salary_slip_timesheet.html index ad51880f..568c2572 100644 --- a/foundation/www/docs/current/models/hr/salary_slip_timesheet.html +++ b/foundation/www/docs/current/models/hr/salary_slip_timesheet.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 1 - column_break0 - - Column Break - - - - - - - - - 2 company Link @@ -74,7 +62,7 @@ - 3 + 2 letter_head Link @@ -95,7 +83,7 @@ - 4 + 3 column_break1 Column Break @@ -107,7 +95,7 @@ - 5 + 4 is_active Select @@ -123,7 +111,7 @@ No - 6 + 5 payroll_frequency Select @@ -142,7 +130,7 @@ Daily - 7 + 6 is_default Select @@ -157,7 +145,7 @@ No - 8 + 7 employee_break Section Break @@ -169,7 +157,7 @@ No - 9 + 8 employees Table @@ -191,7 +179,7 @@ No - 10 + 9 time_sheet_earning_detail Section Break @@ -203,7 +191,7 @@ No - 11 + 10 salary_slip_based_on_timesheet Check @@ -215,7 +203,7 @@ No - 12 + 11 column_break_17 Column Break @@ -227,7 +215,7 @@ No - 13 + 12 salary_component Link @@ -249,7 +237,7 @@ No - 14 + 13 hour_rate Currency @@ -263,7 +251,7 @@ No - 15 + 14 earning_deduction Section Break @@ -276,7 +264,7 @@ No - 16 + 15 earning Section Break @@ -288,7 +276,7 @@ No - 17 + 16 earnings Table @@ -309,7 +297,7 @@ No - 18 + 17 deduction Section Break @@ -321,7 +309,7 @@ No - 19 + 18 deductions Table @@ -342,7 +330,7 @@ No - 20 + 19 net_pay_detail Section Break @@ -356,7 +344,7 @@ No - 21 + 20 column_break2 Column Break @@ -368,7 +356,7 @@ No - 22 + 21 total_earning Currency @@ -382,7 +370,7 @@ No - 23 + 22 total_deduction Currency @@ -396,7 +384,7 @@ No - 24 + 23 net_pay Currency @@ -410,7 +398,7 @@ No - 25 + 24 account Section Break @@ -422,7 +410,7 @@ No - 26 + 25 mode_of_payment Link @@ -443,7 +431,7 @@ No - 27 + 26 column_break_28 Column Break @@ -455,7 +443,7 @@ No - 28 + 27 payment_account Link diff --git a/foundation/www/docs/current/models/hr/salary_structure_employee.html b/foundation/www/docs/current/models/hr/salary_structure_employee.html index de0d3730..d55a1ddf 100644 --- a/foundation/www/docs/current/models/hr/salary_structure_employee.html +++ b/foundation/www/docs/current/models/hr/salary_structure_employee.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 2 + training_program + + Link + + Training Program + + + + + + + +Training Program + + + + + + + + 3 event_status Select @@ -69,7 +90,19 @@ Cancelled - 3 + 4 + has_certificate + + Check + + Has Certificate + + + + + + + 5 column_break_2 Column Break @@ -81,7 +114,7 @@ Cancelled - 4 + 6 type Select @@ -100,8 +133,46 @@ Self-Study + + 7 + level + + Select + + Level + + + + 
    +Beginner
+Expert
+Advance
    + + + + + 8 + company + + Link + + Company + + + + + + + +Company + + + + + + - 5 + 9 section_break_4 Section Break @@ -113,7 +184,7 @@ Self-Study - 6 + 10 trainer_name Data @@ -125,7 +196,7 @@ Self-Study - 7 + 11 trainer_email Data @@ -137,7 +208,7 @@ Self-Study - 8 + 12 column_break_7 Column Break @@ -149,7 +220,7 @@ Self-Study - 9 + 13 supplier Link @@ -170,7 +241,7 @@ Self-Study - 10 + 14 contact_number Data @@ -182,7 +253,7 @@ Self-Study - 11 + 15 section_break_9 Section Break @@ -194,7 +265,7 @@ Self-Study - 12 + 16 course Link @@ -207,7 +278,7 @@ Self-Study -Course +Course @@ -215,7 +286,7 @@ Self-Study - 13 + 17 location Data @@ -227,7 +298,7 @@ Self-Study - 14 + 18 column_break_12 Column Break @@ -239,7 +310,7 @@ Self-Study - 15 + 19 start_time Datetime @@ -251,7 +322,7 @@ Self-Study - 16 + 20 end_time Datetime @@ -263,7 +334,7 @@ Self-Study - 17 + 21 section_break_15 Section Break @@ -275,7 +346,7 @@ Self-Study - 18 + 22 introduction Text Editor @@ -287,7 +358,7 @@ Self-Study - 19 + 23 section_break_18 Section Break @@ -299,7 +370,7 @@ Self-Study - 20 + 24 employees Table @@ -320,7 +391,7 @@ Self-Study - 21 + 25 amended_from Link @@ -341,7 +412,7 @@ Self-Study - 22 + 26 employee_emails Small Text diff --git a/foundation/www/docs/current/models/hr/training_event_employee.html b/foundation/www/docs/current/models/hr/training_event_employee.html index f51436f6..76147238 100644 --- a/foundation/www/docs/current/models/hr/training_event_employee.html +++ b/foundation/www/docs/current/models/hr/training_event_employee.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 Course +Course diff --git a/foundation/www/docs/current/models/hr/training_program.html b/foundation/www/docs/current/models/hr/training_program.html new file mode 100644 index 00000000..4e56d805 --- /dev/null +++ b/foundation/www/docs/current/models/hr/training_program.html @@ -0,0 +1,287 @@ + + + + + + + +

    Training Program

    +
    + + + Version 10.0.2 + + + Source + +
    + + + + + +

    Table Name: tabTraining Program

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1training_program + Data + Training Program + +
    2status + Select + Status + + + 
    Scheduled
+Completed
+Cancelled
    +
    3column_break_3 + Column Break + + +
    4company + Link + Company + + + + + + +Company + + + +
    5section_break_5 + Section Break + + +
    6trainer_name + Data + Trainer Name + +
    7trainer_email + Data + Trainer Email + +
    8column_break_8 + Column Break + + +
    9supplier + Link + Supplier + + + + + + +Supplier + + + +
    10contact_number + Data + Contact Number + +
    11section_break_11 + Section Break + + +
    12description + Text Editor + Description + +
    13amended_from + Link + Amended From + + + + + + +Training Program + + + +
    + + +
    +

    Controller

    +

    erpnext.hr.doctype.training_program.training_program

    + + + + + + + +

    Class TrainingProgram

    + +

    Inherits from frappe.model.document.Document + +

    +
    +
    + +
    +
    + + + + + + +

    Linked In:

    + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/hr/training_result.html b/foundation/www/docs/current/models/hr/training_result.html index 5c76d170..7e5a841a 100644 --- a/foundation/www/docs/current/models/hr/training_result.html +++ b/foundation/www/docs/current/models/hr/training_result.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 Download Template -

    - Download the Template, fill appropriate data and attach the modified file. -All dates and employee combination in the selected period will come in the template, with existing attendance records

    + diff --git a/foundation/www/docs/current/models/hr/vehicle.html b/foundation/www/docs/current/models/hr/vehicle.html index 19e5b928..f4eb4470 100644 --- a/foundation/www/docs/current/models/hr/vehicle.html +++ b/foundation/www/docs/current/models/hr/vehicle.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2
  • +Delivery Trip + +
    • + + + +
  • + + Vehicle
    • diff --git a/foundation/www/docs/current/models/hr/vehicle_log.html b/foundation/www/docs/current/models/hr/vehicle_log.html index 17f2c5b8..16c3aa2e 100644 --- a/foundation/www/docs/current/models/hr/vehicle_log.html +++ b/foundation/www/docs/current/models/hr/vehicle_log.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 + + + + + + +

    Hub Category

    +
    + + + Version 10.0.2 + + + Source + +
    + + + + + +

    Table Name: tabHub Category

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1hub_category_name + Data + Category Name + +
    2parent_hub_category + Link + Parent Category + + + + + + +Hub Category + + + +
    3is_group + Check + Is Group + +
    4description + Text Editor + Description + +
    5lft + Int + Left + +
    6rgt + Int + Right + +
    7old_parent + Data + Old Parent + +
    + + +
    +

    Controller

    +

    erpnext.hub_node.doctype.hub_category.hub_category

    + + + + + + + +

    Class HubCategory

    + +

    Inherits from frappe.utils.nestedset.NestedSet + +

    +
    +
    + +
    +
    + + + + + + +

    Linked In:

    + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/hub_node/hub_settings.html b/foundation/www/docs/current/models/hub_node/hub_settings.html index 32537da8..5a875554 100644 --- a/foundation/www/docs/current/models/hub_node/hub_settings.html +++ b/foundation/www/docs/current/models/hub_node/hub_settings.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 1 - publish + enabled Check - - Publish Items to Hub + + Enabled - + 2 - section_break_2 + suspended - Section Break - - + Check + + Suspended @@ -64,23 +64,32 @@ 3 - publish_pricing + user - Check + Link - Publish Pricing + User + + + + + + + +User + + - - + 4 - publish_availability + seller_profile_section - Check + Section Break - Publish Availability + Company and Seller Profile @@ -88,61 +97,32 @@ 5 - column_break_5 - - Column Break + company - + Link + + Company + + + + + + + +Company + + - 6 - sync_now - - Button - - Sync Now - - - - 
    sync
    - - - - - 7 - section_break_6 - - Section Break - - - - - - - - - 8 - seller_name - - Data - - Seller Name - - - - - - - 9 - seller_country + country Link - Seller Country + Country @@ -158,38 +138,81 @@ - 10 - seller_email + 7 + seller_description - Data + Text Editor - Seller Email + Description - - 
    Email
    - + - - 11 - column_break_10 - - Column Break + + 8 + publish_section - + Section Break + + Publish + + 9 + publish + + Check + + Publish Items to Hub + + + + + + + 10 + publish_pricing + + Check + + Publish Pricing + + + + + + + 11 + selling_price_list + + Link + + Selling Price List + + + + + + + +Price List + + + + + + 12 - seller_city + publish_availability - Data + Check - Seller City + Publish Availability @@ -197,11 +220,11 @@ 13 - seller_website + last_sync_datetime - Data + Datetime - Seller Website + Last Sync On @@ -209,11 +232,11 @@ 14 - section_break_13 + unregister_section Section Break - + Unregister @@ -221,35 +244,11 @@ 15 - seller_description + unregister_from_hub - Text Editor + Button - Seller Description - - - - - - - 16 - name_token - - Data - - Name Token - - - - - - - 17 - access_token - - Data - - Access Token + Unregister from Hub @@ -281,10 +280,10 @@

    - + - get_args - (self) + create_hub_connector + (self, message)

    No docs

    @@ -295,12 +294,12 @@

    - + - publish_selling_items + get_hub_url (self)

    -

    Set publish_in_hub=1 for all Sales Items

    +

    No docs


    @@ -314,7 +313,7 @@ register (self)

    -

    Register at hub.erpnext.com, save name_token and access_token

    +

    Create a User on hub.erpnext.org and return username/password


    @@ -326,9 +325,9 @@ sync - (self, verbose=True) + (self)

    -

    Sync items with hub.erpnext.com

    +

    Create and execute Data Migration Run for Hub Sync plan


    @@ -337,26 +336,12 @@

    - + - unpublish + unregister (self)

    -

    Unpublish from hub.erpnext.com

    -
    -
    - - - - - -

    - - - update_seller_details - (self) -

    -

    Update details at hub.erpnext.com

    +

    Disable the User on hub.erpnext.org


    @@ -380,6 +365,71 @@ + + +

    Class HubSetupError

    + +

    Inherits from frappe.exceptions.ValidationError + +

    +
    +
    + +
    +
    + + + + + + + +

    + + + erpnext.hub_node.doctype.hub_settings.hub_settings.reset_hub_publishing_settings + (last_sync_datetime=) +

    +

    No docs

    +
    +
    + + + + + + + +

    + + + erpnext.hub_node.doctype.hub_settings.hub_settings.reset_hub_settings + (last_sync_datetime=) +

    +

    No docs

    +
    +
    + + + + + + +

    Public API +
    /api/method/erpnext.hub_node.doctype.hub_settings.hub_settings.sync +

    +

    + + + erpnext.hub_node.doctype.hub_settings.hub_settings.sync + () +

    +

    No docs

    +
    +
    + + + diff --git a/foundation/www/docs/current/models/hub_node/index.html b/foundation/www/docs/current/models/hub_node/index.html index 7f8367b8..208c6467 100644 --- a/foundation/www/docs/current/models/hub_node/index.html +++ b/foundation/www/docs/current/models/hub_node/index.html @@ -7,7 +7,7 @@
    - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 3 - customer + customer Link @@ -340,7 +340,7 @@ Cancelled 21 - territory + territory Link @@ -361,7 +361,7 @@ Cancelled 22 - customer_group + customer_group Link diff --git a/foundation/www/docs/current/models/maintenance/maintenance_schedule_detail.html b/foundation/www/docs/current/models/maintenance/maintenance_schedule_detail.html index 6116c0c6..933f2117 100644 --- a/foundation/www/docs/current/models/maintenance/maintenance_schedule_detail.html +++ b/foundation/www/docs/current/models/maintenance/maintenance_schedule_detail.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - + + 
    item_code.item_name
    + @@ -82,7 +84,9 @@ Description - + + 
    item_code.description
    + @@ -143,7 +147,7 @@ Random 8 - no_of_visits + no_of_visits Int @@ -155,7 +159,7 @@ Random 9 - sales_person + sales_person Link diff --git a/foundation/www/docs/current/models/maintenance/maintenance_visit.html b/foundation/www/docs/current/models/maintenance/maintenance_visit.html index 178ff06d..9426f372 100644 --- a/foundation/www/docs/current/models/maintenance/maintenance_visit.html +++ b/foundation/www/docs/current/models/maintenance/maintenance_visit.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 12 - currency + company Link - Currency + Company @@ -211,7 +211,7 @@ Price List -Currency +Company @@ -232,6 +232,27 @@ Price List 14 + currency + + Link + + Currency + + + + + + + +Currency + + + + + + + + 15 conversion_rate Float @@ -243,7 +264,7 @@ Price List - 15 + 16 operations_section Section Break @@ -256,7 +277,7 @@ Price List - 16 + 17 operations Table @@ -277,7 +298,7 @@ Price List - 17 + 18 materials_section Section Break @@ -289,7 +310,7 @@ Price List - 18 + 19 items Table @@ -310,7 +331,7 @@ Price List - 19 + 20 scrap_section Section Break @@ -322,7 +343,7 @@ Price List - 20 + 21 scrap_items Table @@ -343,7 +364,7 @@ Price List - 21 + 22 costing Section Break @@ -355,7 +376,7 @@ Price List - 22 + 23 operating_cost Currency @@ -369,7 +390,7 @@ Price List - 23 + 24 raw_material_cost Currency @@ -383,7 +404,7 @@ Price List - 24 + 25 scrap_material_cost Currency @@ -397,7 +418,7 @@ Price List - 25 + 26 cb1 Column Break @@ -409,7 +430,7 @@ Price List - 26 + 27 base_operating_cost Currency @@ -423,7 +444,7 @@ Price List - 27 + 28 base_raw_material_cost Currency @@ -437,7 +458,7 @@ Price List - 28 + 29 base_scrap_material_cost Data @@ -451,7 +472,7 @@ Price List - 29 + 30 total_cost_of_bom Section Break @@ -463,7 +484,7 @@ Price List - 30 + 31 total_cost Currency @@ -477,7 +498,7 @@ Price List - 31 + 32 column_break_26 Column Break @@ -489,7 +510,7 @@ Price List - 32 + 33 base_total_cost Currency @@ -503,7 +524,7 @@ Price List - 33 + 34 more_info_section Section Break @@ -515,7 +536,7 @@ Price List - 34 + 35 project Link @@ -532,27 +553,6 @@ Price List - - - - - 35 - company - - Link - - Company - - - - - - - -Company - - - @@ -1449,7 +1449,7 @@ Price List erpnext.manufacturing.doctype.bom.bom.get_children - () + (doctype, parent=None, is_tree=False)

    No docs

    diff --git a/foundation/www/docs/current/models/manufacturing/bom_explosion_item.html b/foundation/www/docs/current/models/manufacturing/bom_explosion_item.html index 0542c7ad..9899fc48 100644 --- a/foundation/www/docs/current/models/manufacturing/bom_explosion_item.html +++ b/foundation/www/docs/current/models/manufacturing/bom_explosion_item.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 BOM + + +
  • + + +Crop +
    • diff --git a/foundation/www/docs/current/models/manufacturing/bom_operation.html b/foundation/www/docs/current/models/manufacturing/bom_operation.html index bb2f9d53..8ebb8b1a 100644 --- a/foundation/www/docs/current/models/manufacturing/bom_operation.html +++ b/foundation/www/docs/current/models/manufacturing/bom_operation.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 43 + sales_order_item + + Data + + Sales Order Item + + + + + + + 44 amended_from Link @@ -987,6 +999,20 @@ Cancelled +

    + + + set_default_warehouse + (self) +

    +

    No docs

    +
    +
    + + + + +

    @@ -1005,7 +1031,7 @@ Cancelled set_required_items - (self) + (self, reset_only_qty=False)

    set required_items for production to keep track of reserved qty

    @@ -1332,32 +1358,6 @@ Cancelled -

    Public API -
    /api/method/erpnext.manufacturing.doctype.production_order.production_order.get_events -

    -

    - - - erpnext.manufacturing.doctype.production_order.production_order.get_events - (start, end, filters=None) -

    -

    Returns events for Gantt / Calendar view rendering.

    - -

    Parameters:

    - -
      -
    • start - Start date-time.
      • -
    • end - End date-time.
      • -
    • filters - Filters (JSON).
      • -
    -
    -
    - - - - - -

    Public API
    /api/method/erpnext.manufacturing.doctype.production_order.production_order.get_item_details

    @@ -1430,6 +1430,24 @@ Cancelled +

    Public API +
    /api/method/erpnext.manufacturing.doctype.production_order.production_order.query_sales_order +

    +

    + + + erpnext.manufacturing.doctype.production_order.production_order.query_sales_order + (production_item) +

    +

    No docs

    +
    +
    + + + + + +

    Public API
    /api/method/erpnext.manufacturing.doctype.production_order.production_order.set_production_order_ops

    diff --git a/foundation/www/docs/current/models/manufacturing/production_order_item.html b/foundation/www/docs/current/models/manufacturing/production_order_item.html index 6633915d..eb8840ee 100644 --- a/foundation/www/docs/current/models/manufacturing/production_order_item.html +++ b/foundation/www/docs/current/models/manufacturing/production_order_item.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 -

    - - - __init__ - (self, arg1, arg2=None) -

    -

    No docs

    -
    -
    - - - - -

    diff --git a/foundation/www/docs/current/models/manufacturing/workstation.html b/foundation/www/docs/current/models/manufacturing/workstation.html index 272c4420..e0660a4c 100644 --- a/foundation/www/docs/current/models/manufacturing/workstation.html +++ b/foundation/www/docs/current/models/manufacturing/workstation.html @@ -9,7 +9,7 @@

    - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 + + + + + + +

    Chapter

    +
    + + + Version 0.0.1 + + + Source + +
    + + + + + +

    Table Name: tabChapter

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1title + Data + Title + +
    2chapter_head + Link + Chapter Head + + + + + + +User + + + +
    3introduction + Text Editor + Introduction + +
    4meetup_embed_html + Code + Meetup Embed HTML + +
    5published + Check + Published + +
    6route + Data + Route + +
    7region + Data + Region + +
    8address + Text + Address + +
    9members + Table + Members + + + + + + +Chapter Member + + + +
    + + +
    +

    Controller

    +

    foundation.erpnext_foundation.doctype.chapter.chapter

    + + + + + + + +

    Class Chapter

    + +

    Inherits from frappe.website.website_generator.WebsiteGenerator + +

    +
    +
    + + + + +

    + + + enable + (self) +

    +

    No docs

    +
    +
    + + + + + +

    + + + get_context + (self, context) +

    +

    No docs

    +
    +
    + + + + + +

    + + + validate + (self) +

    +

    No docs

    +
    +
    + + +
    +
    + + + + + + + +

    + + + foundation.erpnext_foundation.doctype.chapter.chapter.get_list_context + (context) +

    +

    No docs

    +
    +
    + + + + + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/non_profit/chapter_member.html b/foundation/www/docs/current/models/non_profit/chapter_member.html new file mode 100644 index 00000000..3ac829eb --- /dev/null +++ b/foundation/www/docs/current/models/non_profit/chapter_member.html @@ -0,0 +1,122 @@ + + + + + + + +

    Chapter Member

    +
    + + + Version 0.0.1 + + + Source + +
    + + +Child Table + + +

    Table Name: tabChapter Member

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1user + Link + User + + + + + + +User + + + +
    2introduction + Data + Introduction + +
    3website_url + Data + Website URL + +
    4enabled + Check + Enabled + +
    + + + + +

    Child Table Of

    + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/non_profit/donor.html b/foundation/www/docs/current/models/non_profit/donor.html new file mode 100644 index 00000000..552f340d --- /dev/null +++ b/foundation/www/docs/current/models/non_profit/donor.html @@ -0,0 +1,210 @@ + + + + + + + +

    Donor

    +
    + + + Version 10.0.2 + + + Source + +
    + + + + + +

    Table Name: tabDonor

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1donor_name + Data + Donor Name + +
    2column_break_5 + Column Break + + +
    3donor_type + Link + Donor Type + + + + + + +Donor Type + + + +
    4email + Data + Email + +
    5image + Attach Image + Image + +
    6address_contacts + Section Break + Address and Contact + + + 
    fa fa-map-marker
    +
    7address_html + HTML + Address HTML + +
    8column_break_9 + Column Break + + +
    9contact_html + HTML + Contact HTML + +
    + + +
    +

    Controller

    +

    erpnext.non_profit.doctype.donor.donor

    + + + + + + + +

    Class Donor

    + +

    Inherits from frappe.model.document.Document + +

    +
    +
    + + + + +

    + + + onload + (self) +

    +

    Load address and contacts in __onload

    +
    +
    + + +
    +
    + + + + + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/non_profit/donor_type.html b/foundation/www/docs/current/models/non_profit/donor_type.html new file mode 100644 index 00000000..b1ccb823 --- /dev/null +++ b/foundation/www/docs/current/models/non_profit/donor_type.html @@ -0,0 +1,103 @@ + + + + + + + +

    Donor Type

    +
    + + + Version 10.0.2 + + + Source + +
    + + + + + +

    Table Name: tabDonor Type

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1donor_type + Data + Donor Type + +
    + + +
    +

    Controller

    +

    erpnext.non_profit.doctype.donor_type.donor_type

    + + + + + + + +

    Class DonorType

    + +

    Inherits from frappe.model.document.Document + +

    +
    +
    + +
    +
    + + + + + + +

    Linked In:

    +
      + + +
    • + + +Donor + +
      • + + +
    + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/non_profit/grant_application.html b/foundation/www/docs/current/models/non_profit/grant_application.html new file mode 100644 index 00000000..aa15ca8a --- /dev/null +++ b/foundation/www/docs/current/models/non_profit/grant_application.html @@ -0,0 +1,496 @@ + + + + + + + +

    Grant Application

    +
    + + + Version 10.0.2 + + + Source + +
    + + + + + +

    Table Name: tabGrant Application

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1applicant_type + Select + Applicant Type + + + 
    Individual
+Organization
    +
    2applicant_name + Data + Name + +
    3contact_person + Data + Contact Person + +
    4email + Data + Email + +
    5column_break_5 + Column Break + + +
    6status + Select + Status + + + 
    Open
+Received
+In Progress
+Approved
+Rejected
+Expired
+Withdrawn
    +
    7website_url + Data + Website URL + +
    8company + Link + Company + + + + + + +Company + + + +
    9address_contacts + Section Break + Address and Contact + + + 
    fa fa-map-marker
    +
    10address_html + HTML + Address HTML + +
    11column_break_9 + Column Break + + +
    12contact_html + HTML + Contact HTML + +
    13grant_application_details + Section Break + Grant Application Details + +
    14grant_description + Long Text + Grant Description + +
    15section_break_15 + Section Break + + +
    16amount + Currency + Requested Amount + +
    17has_any_past_grant_record + Check + Has any past Grant Record + +
    18column_break_17 + Column Break + + +
    19route + Data + Route + +
    20published + Check + Show on Website + +
    21assessment_result + Section Break + Assessment Result + +
    22assessment_mark + Float + Assessment Mark (Out of 10) + +
    23note + Small Text + Note + +
    24column_break_24 + Column Break + + +
    25assessment_manager + Link + Assessment Manager + + + + + + +User + + + +
    26email_notification_sent + Check + Email Notification Sent + +
    + + +
    +

    Controller

    +

    erpnext.non_profit.doctype.grant_application.grant_application

    + + + + + + + +

    Class GrantApplication

    + +

    Inherits from frappe.website.website_generator.WebsiteGenerator + +

    +
    +
    + + + + +

    + + + get_context + (self, context) +

    +

    No docs

    +
    +
    + + + + + +

    + + + onload + (self) +

    +

    Load address and contacts in __onload

    +
    +
    + + + + + +

    + + + validate + (self) +

    +

    No docs

    +
    +
    + + +
    +
    + + + + + + + +

    + + + erpnext.non_profit.doctype.grant_application.grant_application.get_list_context + (context) +

    +

    No docs

    +
    +
    + + + + + + +

    Public API +
    /api/method/erpnext.non_profit.doctype.grant_application.grant_application.send_grant_review_emails +

    +

    + + + erpnext.non_profit.doctype.grant_application.grant_application.send_grant_review_emails + (grant_application) +

    +

    No docs

    +
    +
    + + + + + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/non_profit/index.html b/foundation/www/docs/current/models/non_profit/index.html new file mode 100644 index 00000000..5b00b8fe --- /dev/null +++ b/foundation/www/docs/current/models/non_profit/index.html @@ -0,0 +1,22 @@ + + + + + +

    Module non_profit

    +
    + + + Version 10.0.2 + + + Source + +
    + +

    DocTypes for non_profit

    + +{index} + + \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/schools/fees/__init__.py b/foundation/www/docs/current/models/non_profit/index.txt similarity index 100% rename from foundation/www/docs/user/manual/en/schools/fees/__init__.py rename to foundation/www/docs/current/models/non_profit/index.txt diff --git a/foundation/www/docs/current/models/non_profit/member.html b/foundation/www/docs/current/models/non_profit/member.html new file mode 100644 index 00000000..c9922468 --- /dev/null +++ b/foundation/www/docs/current/models/non_profit/member.html @@ -0,0 +1,162 @@ + + + + + + + +

    Member

    +
    + + + Version 0.0.1 + + + Source + +
    + + + + + +

    Table Name: tabMember

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1member_name + Data + Member Name + +
    2membership_type + Select + Membership Type + + + 
    Gold
+Silver
+Individual
    +
    3email + Data + Email + +
    4image + Attach Image + Image + +
    5address + Small Text + Address + +
    6expires_on + Date + Expires On + +
    + + +
    +

    Controller

    +

    foundation.erpnext_foundation.doctype.member.member

    + + + + + + + +

    Class Member

    + +

    Inherits from frappe.model.document.Document + +

    +
    +
    + +
    +
    + + + + + + +

    Linked In:

    +
      + + + + + +
    + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/non_profit/membership.html b/foundation/www/docs/current/models/non_profit/membership.html new file mode 100644 index 00000000..5a54420b --- /dev/null +++ b/foundation/www/docs/current/models/non_profit/membership.html @@ -0,0 +1,233 @@ + + + + + + + +

    Membership

    +
    + + + Version 0.0.1 + + + Source + +
    + + + + + +

    Table Name: tabMembership

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1member + Link + Member + + + + + + +Member + + + +
    2membership_type + Select + Membership Type + + + 
    Gold
+Silver
+Individual
    +
    3from_date + Date + From + +
    4to_date + Date + To + +
    5paid + Check + Paid + +
    6currency + Select + Currency + + + 
    USD
+INR
    +
    7amount + Float + Amount + +
    + + +
    +

    Controller

    +

    foundation.erpnext_foundation.doctype.membership.membership

    + + + + + + + +

    Class Membership

    + +

    Inherits from frappe.model.document.Document + +

    +
    +
    + + + + +

    + + + link_member_with_service_provider + (self) +

    +

    No docs

    +
    +
    + + + + + +

    + + + on_payment_authorized + (self, status_changed_to=None) +

    +

    No docs

    +
    +
    + + + + + +

    + + + validate + (self) +

    +

    No docs

    +
    +
    + + + + + +

    + + + validate_payment + (self) +

    +

    No docs

    +
    +
    + + +
    +
    + + + + + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/non_profit/membership_type.html b/foundation/www/docs/current/models/non_profit/membership_type.html new file mode 100644 index 00000000..5bcd6ea6 --- /dev/null +++ b/foundation/www/docs/current/models/non_profit/membership_type.html @@ -0,0 +1,101 @@ + + + + + + + +

    Membership Type

    +
    + + + Version 10.0.2 + + + Source + +
    + + + + + +

    Table Name: tabMembership Type

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1membership_type + Data + Membership Type + +
    2amount + Float + Amount + +
    + + +
    +

    Controller

    +

    erpnext.non_profit.doctype.membership_type.membership_type

    + + + + + + + +

    Class MembershipType

    + +

    Inherits from frappe.model.document.Document + +

    +
    +
    + +
    +
    + + + + + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/non_profit/volunteer.html b/foundation/www/docs/current/models/non_profit/volunteer.html new file mode 100644 index 00000000..36977a4f --- /dev/null +++ b/foundation/www/docs/current/models/non_profit/volunteer.html @@ -0,0 +1,314 @@ + + + + + + + +

    Volunteer

    +
    + + + Version 10.0.2 + + + Source + +
    + + + + + +

    Table Name: tabVolunteer

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1volunteer_name + Data + Volunteer Name + +
    2column_break_5 + Column Break + + +
    3volunteer_type + Link + Volunteer Type + + + + + + +Volunteer Type + + + +
    4email + Data + Email + +
    5image + Attach Image + Image + +
    6address_contacts + Section Break + Address and Contact + + + 
    fa fa-map-marker
    +
    7address_html + HTML + Address HTML + +
    8column_break_9 + Column Break + + +
    9contact_html + HTML + Contact HTML + +
    10volunteer_availability_and_skills_details + Section Break + Availability and Skills + +
    11availability + Select + Availability + + + 
    +Weekly
+Weekdays
+Weekends
    +
    12availability_timeslot + Select + Availability Timeslot + + + 
    +Morning
+Afternoon
+Evening
+Anytime
    +
    13column_break_12 + Column Break + + +
    14volunteer_skills + Table + Volunteer Skills + + + + + + +Volunteer Skill + + + +
    15section_break_15 + Section Break + + +
    16note + Long Text + Note + +
    + + +
    +

    Controller

    +

    erpnext.non_profit.doctype.volunteer.volunteer

    + + + + + + + +

    Class Volunteer

    + +

    Inherits from frappe.model.document.Document + +

    +
    +
    + + + + +

    + + + onload + (self) +

    +

    Load address and contacts in __onload

    +
    +
    + + +
    +
    + + + + + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/non_profit/volunteer_skill.html b/foundation/www/docs/current/models/non_profit/volunteer_skill.html new file mode 100644 index 00000000..3cc33327 --- /dev/null +++ b/foundation/www/docs/current/models/non_profit/volunteer_skill.html @@ -0,0 +1,77 @@ + + + + + + + +

    Volunteer Skill

    +
    + + + Version 10.0.2 + + + Source + +
    + + +Child Table + + +

    Table Name: tabVolunteer Skill

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1volunteer_skill + Data + Volunteer Skill + +
    + + + + +

    Child Table Of

    + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/non_profit/volunteer_type.html b/foundation/www/docs/current/models/non_profit/volunteer_type.html new file mode 100644 index 00000000..c97a7034 --- /dev/null +++ b/foundation/www/docs/current/models/non_profit/volunteer_type.html @@ -0,0 +1,103 @@ + + + + + + + +

    Volunteer Type

    +
    + + + Version 10.0.2 + + + Source + +
    + + + + + +

    Table Name: tabVolunteer Type

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1amount + Float + Amount + +
    + + +
    +

    Controller

    +

    erpnext.non_profit.doctype.volunteer_type.volunteer_type

    + + + + + + + +

    Class VolunteerType

    + +

    Inherits from frappe.model.document.Document + +

    +
    +
    + +
    +
    + + + + + + +

    Linked In:

    + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/portal/homepage.html b/foundation/www/docs/current/models/portal/homepage.html index e8d3709f..857e2f7d 100644 --- a/foundation/www/docs/current/models/portal/homepage.html +++ b/foundation/www/docs/current/models/portal/homepage.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 + + 3 + products_per_page + + Int + + Products per Page + + + + + diff --git a/foundation/www/docs/current/models/projects/activity_cost.html b/foundation/www/docs/current/models/projects/activity_cost.html index cd54b59f..3e0091fe 100644 --- a/foundation/www/docs/current/models/projects/activity_cost.html +++ b/foundation/www/docs/current/models/projects/activity_cost.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 Currency - Total Costing Amount (via Time Logs) + Total Costing Amount (via Timesheets) @@ -473,6 +473,18 @@ High 31 + total_purchase_cost + + Currency + + Total Purchase Cost (via Purchase Invoice) + + + + + + + 32 company Link @@ -493,7 +505,55 @@ High - 32 + 33 + column_break_28 + + Column Break + + + + + + + + + 34 + total_sales_amount + + Currency + + Total Sales Amount (via Sales Order) + + + + + + + 35 + total_billable_amount + + Currency + + Total Billable Amount (via Timesheets) + + + + + + + 36 + total_billed_amount + + Currency + + Total Billed Amount (via Sales Invoices) + + + + + + + 37 cost_center Link @@ -513,56 +573,8 @@ High - - 33 - column_break_28 - - Column Break - - - - - - - - - 34 - total_billing_amount - - Currency - - Total Billing Amount (via Time Logs) - - - - - - - 35 - total_purchase_cost - - Currency - - Total Purchase Cost (via Purchase Invoice) - - - - - - - 36 - total_sales_cost - - Currency - - Total Sales Cost (via Sales Order) - - - - - - 37 + 38 margin Section Break @@ -574,7 +586,7 @@ High - 38 + 39 gross_margin Currency @@ -588,7 +600,7 @@ High - 39 + 40 column_break_37 Column Break @@ -600,7 +612,7 @@ High - 40 + 41 per_gross_margin Percent @@ -776,6 +788,20 @@ High +

    + + + update_billed_amount + (self) +

    +

    No docs

    +
    +
    + + + + +

    @@ -847,9 +873,9 @@ High

    - + - update_sales_costing + update_sales_amount (self)

    No docs

    @@ -888,6 +914,20 @@ High +

    + + + validate_project_name + (self) +

    +

    No docs

    +
    +
    + + + + +

    @@ -1020,6 +1060,15 @@ High +

  • + + +Crop Cycle + +
    • + + +
  • @@ -1086,7 +1135,7 @@ High
  • -Process Payroll +Payroll Entry
    • diff --git a/foundation/www/docs/current/models/projects/project_task.html b/foundation/www/docs/current/models/projects/project_task.html index 0e456734..59ce460d 100644 --- a/foundation/www/docs/current/models/projects/project_task.html +++ b/foundation/www/docs/current/models/projects/project_task.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 4 - column_break_3 + edit_timesheet + + Button + + View Timesheet + + + + + + + 5 + make_timesheet + + Button + + Make Timesheet + + + + + + + 6 + column_break_6 Column Break @@ -95,7 +119,7 @@ Cancelled - 5 + 7 start_date Date @@ -107,7 +131,7 @@ Cancelled - 6 + 8 end_date Date @@ -119,7 +143,7 @@ Cancelled - 7 + 9 task_weight Float @@ -131,7 +155,7 @@ Cancelled - 8 + 10 section_break_6 Section Break @@ -143,7 +167,7 @@ Cancelled - 9 + 11 description Text Editor @@ -155,7 +179,7 @@ Cancelled - 10 + 12 task_id Link diff --git a/foundation/www/docs/current/models/projects/project_type.html b/foundation/www/docs/current/models/projects/project_type.html index d6b7503c..62be54bb 100644 --- a/foundation/www/docs/current/models/projects/project_type.html +++ b/foundation/www/docs/current/models/projects/project_type.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 3 + is_group + + Check + + Is Group + + + + + + + 4 column_break0 Column Break @@ -86,7 +98,7 @@ - 4 + 5 status Select @@ -105,7 +117,7 @@ Cancelled - 5 + 6 priority Select @@ -121,8 +133,29 @@ Urgent + + 7 + parent_task + + Link + + Parent Task + + + + + + + +Task + + + + + + - 6 + 8 section_break_10 Section Break @@ -134,7 +167,7 @@ Urgent - 7 + 9 exp_start_date Date @@ -146,7 +179,7 @@ Urgent - 8 + 10 expected_time Float @@ -158,7 +191,7 @@ Urgent - 9 + 11 task_weight Float @@ -170,7 +203,7 @@ Urgent - 10 + 12 column_break_11 Column Break @@ -182,7 +215,7 @@ Urgent - 11 + 13 exp_end_date Date @@ -194,7 +227,7 @@ Urgent - 12 + 14 progress Percent @@ -206,7 +239,7 @@ Urgent - 13 + 15 is_milestone Check @@ -218,7 +251,7 @@ Urgent - 14 + 16 section_break0 Section Break @@ -232,7 +265,7 @@ Urgent - 15 + 17 description Text Editor @@ -244,7 +277,7 @@ Urgent - 16 + 18 section_break Section Break @@ -256,7 +289,7 @@ Urgent - 17 + 19 depends_on Table @@ -277,7 +310,7 @@ Urgent - 18 + 20 depends_on_tasks Data @@ -289,7 +322,7 @@ Urgent - 19 + 21 actual Section Break @@ -301,7 +334,7 @@ Urgent - 20 + 22 act_start_date Date @@ -313,7 +346,7 @@ Urgent - 21 + 23 actual_time Float @@ -325,7 +358,7 @@ Urgent - 22 + 24 column_break_15 Column Break @@ -337,7 +370,7 @@ Urgent - 23 + 25 act_end_date Date @@ -349,7 +382,7 @@ Urgent - 24 + 26 section_break_17 Section Break @@ -361,7 +394,7 @@ Urgent - 25 + 27 total_costing_amount Currency @@ -375,7 +408,7 @@ Urgent - 26 + 28 total_expense_claim Currency @@ -389,7 +422,7 @@ Urgent - 27 + 29 column_break_20 Column Break @@ -401,7 +434,7 @@ Urgent - 28 + 30 total_billing_amount Currency @@ -413,7 +446,7 @@ Urgent - 29 + 31 more_details Section Break @@ -425,7 +458,7 @@ Urgent - 30 + 32 review_date Date @@ -437,7 +470,7 @@ Urgent - 31 + 33 closing_date Date @@ -449,7 +482,7 @@ Urgent - 32 + 34 column_break_22 Column Break @@ -461,7 +494,7 @@ Urgent - 33 + 35 company Link @@ -481,6 +514,42 @@ Urgent + + 36 + lft + + Int + + lft + + + + + + + 37 + rgt + + Int + + rgt + + + + + + + 38 + old_parent + + Data + + Old Parent + + + + + @@ -512,7 +581,7 @@ Urgent

    Class Task

    -

    Inherits from frappe.model.document.Document +

    Inherits from frappe.utils.nestedset.NestedSet

    @@ -591,6 +660,20 @@ Urgent +

    + + + on_trash + (self) +

    +

    No docs

    +
    +
    + + + + +

    @@ -619,6 +702,20 @@ Urgent +

    + + + unassign_todo + (self) +

    +

    No docs

    +
    +
    + + + + +

    @@ -633,6 +730,20 @@ Urgent +

    + + + update_nsm_model + (self) +

    +

    No docs

    +
    +
    + + + + +

    @@ -737,23 +848,69 @@ Urgent

    Public API -
    /api/method/erpnext.projects.doctype.task.task.get_events +
    /api/method/erpnext.projects.doctype.task.task.add_multiple_tasks

    - + - erpnext.projects.doctype.task.task.get_events - (start, end, filters=None) + erpnext.projects.doctype.task.task.add_multiple_tasks + (data, parent)

    -

    Returns events for Gantt / Calendar view rendering.

    +

    No docs

    +
    +
    -

    Parameters:

    + -
      -
    • start - Start date-time.
      • -
    • end - End date-time.
      • -
    • filters - Filters (JSON).
      • -
    + + + +

    Public API +
    /api/method/erpnext.projects.doctype.task.task.add_node +

    +

    + + + erpnext.projects.doctype.task.task.add_node + () +

    +

    No docs

    +
    +
    + + + + + + +

    Public API +
    /api/method/erpnext.projects.doctype.task.task.check_if_child_exists +

    +

    + + + erpnext.projects.doctype.task.task.check_if_child_exists + (name) +

    +

    No docs

    +
    +
    + + + + + + +

    Public API +
    /api/method/erpnext.projects.doctype.task.task.get_children +

    +

    + + + erpnext.projects.doctype.task.task.get_children + (doctype, parent, task=None, project=None, is_root=False) +

    +

    No docs


    @@ -843,6 +1000,15 @@ Urgent +
  • + + +Task + +
    • + + +
  • diff --git a/foundation/www/docs/current/models/projects/task_depends_on.html b/foundation/www/docs/current/models/projects/task_depends_on.html index 1c2a1811..de82d087 100644 --- a/foundation/www/docs/current/models/projects/task_depends_on.html +++ b/foundation/www/docs/current/models/projects/task_depends_on.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 + + + + +

    Module restaurant

    +
    + + + Version 10.0.2 + + + Source + +
    + +

    DocTypes for restaurant

    + +{index} + + \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/schools/schedule/__init__.py b/foundation/www/docs/current/models/restaurant/index.txt similarity index 100% rename from foundation/www/docs/user/manual/en/schools/schedule/__init__.py rename to foundation/www/docs/current/models/restaurant/index.txt diff --git a/foundation/www/docs/current/models/restaurant/restaurant.html b/foundation/www/docs/current/models/restaurant/restaurant.html new file mode 100644 index 00000000..bbb5e61a --- /dev/null +++ b/foundation/www/docs/current/models/restaurant/restaurant.html @@ -0,0 +1,250 @@ + + + + + + + +

    Restaurant

    +
    + + + Version 10.0.2 + + + Source + +
    + + + + + +

    Table Name: tabRestaurant

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1image + Attach Image + Image + +
    2company + Link + Company + + + + + + +Company + + + +
    3default_customer + Link + Default Customer + + + + + + +Customer + + + +
    4invoice_series_prefix + Data + Invoice Series Prefix + +
    5column_break_4 + Column Break + + +
    6active_menu + Link + Active Menu + + + + + + +Restaurant Menu + + + +
    7default_tax_template + Link + Default Tax Template + + + + + + +Sales Taxes and Charges Template + + + +
    8address + Link + Address + + + + + + +Address + + + +
    + + +
    +

    Controller

    +

    erpnext.restaurant.doctype.restaurant.restaurant

    + + + + + + + +

    Class Restaurant

    + +

    Inherits from frappe.model.document.Document + +

    +
    +
    + +
    +
    + + + + + + +

    Linked In:

    + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/restaurant/restaurant_menu.html b/foundation/www/docs/current/models/restaurant/restaurant_menu.html new file mode 100644 index 00000000..26a8a075 --- /dev/null +++ b/foundation/www/docs/current/models/restaurant/restaurant_menu.html @@ -0,0 +1,274 @@ + + + + + + + +

    Restaurant Menu

    +
    + + + Version 10.0.2 + + + Source + +
    + + + + + +

    Table Name: tabRestaurant Menu

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1restaurant + Link + Restaurant + + + + + + +Restaurant + + + +
    2enabled + Check + Enabled + +
    3column_break_3 + Column Break + + +
    4price_list + Link + Price List (Auto created) + + + + + + +Price List + + + +
    5items_section + Section Break + Items + +
    6items + Table + Items + + + + + + +Restaurant Menu Item + + + +
    + + +
    +

    Controller

    +

    erpnext.restaurant.doctype.restaurant_menu.restaurant_menu

    + + + + + + + +

    Class RestaurantMenu

    + +

    Inherits from frappe.model.document.Document + +

    +
    +
    + + + + +

    + + + clear_item_price + (self, price_list=None) +

    +

    clear all item prices for this menu

    +
    +
    + + + + + +

    + + + get_price_list + (self) +

    +

    Create price list for menu if missing

    +
    +
    + + + + + +

    + + + make_price_list + (self) +

    +

    No docs

    +
    +
    + + + + + +

    + + + on_trash + (self) +

    +

    clear prices

    +
    +
    + + + + + +

    + + + on_update + (self) +

    +

    Sync Price List

    +
    +
    + + + + + +

    + + + validate + (self) +

    +

    No docs

    +
    +
    + + +
    +
    + + + + + + +

    Linked In:

    + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/restaurant/restaurant_menu_item.html b/foundation/www/docs/current/models/restaurant/restaurant_menu_item.html new file mode 100644 index 00000000..e931db60 --- /dev/null +++ b/foundation/www/docs/current/models/restaurant/restaurant_menu_item.html @@ -0,0 +1,98 @@ + + + + + + + +

    Restaurant Menu Item

    +
    + + + Version 10.0.2 + + + Source + +
    + + +Child Table + + +

    Table Name: tabRestaurant Menu Item

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1item + Link + Item + + + + + + +Item + + + +
    2rate + Currency + Rate + +
    + + + + +

    Child Table Of

    + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/restaurant/restaurant_order_entry.html b/foundation/www/docs/current/models/restaurant/restaurant_order_entry.html new file mode 100644 index 00000000..dcdc2d9e --- /dev/null +++ b/foundation/www/docs/current/models/restaurant/restaurant_order_entry.html @@ -0,0 +1,282 @@ + + + + + + + +

    Restaurant Order Entry

    +
    + + + Version 10.0.2 + + + Source + +
    + +Single + + + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1restaurant_table + Link + Restaurant Table + + + + + + +Restaurant Table + + + +
    2add_item + Link + Add Item +

    + Click Enter To Add

    +     		+ + + + +Item + + + +
    3column_break_3 + Column Break + + +
    4grand_total + Currency + Grand Total + +
    5last_sales_invoice + Link + Last Sales Invoice + + + + + + +Sales Invoice + + + +
    6current_order + Section Break + Current Order + +
    7items + Table + Items + + + + + + +Restaurant Order Entry Item + + + +
    + + +
    +

    Controller

    +

    erpnext.restaurant.doctype.restaurant_order_entry.restaurant_order_entry

    + + + + + + + +

    Class RestaurantOrderEntry

    + +

    Inherits from frappe.model.document.Document + +

    +
    +
    + +
    +
    + + + + + + +

    Public API +
    /api/method/erpnext.restaurant.doctype.restaurant_order_entry.restaurant_order_entry.get_invoice +

    +

    + + + erpnext.restaurant.doctype.restaurant_order_entry.restaurant_order_entry.get_invoice + (table) +

    +

    returns the active invoice linked to the given table

    +
    +
    + + + + + + + +

    + + + erpnext.restaurant.doctype.restaurant_order_entry.restaurant_order_entry.get_restaurant_and_menu_name + (table) +

    +

    No docs

    +
    +
    + + + + + + + +

    + + + erpnext.restaurant.doctype.restaurant_order_entry.restaurant_order_entry.item_query_restaurant + (doctype=Item, txt=, searchfield=name, start=0, page_len=20, filters=None, as_dict=False) +

    +

    Return items that are selected in active menu of the restaurant

    +
    +
    + + + + + + +

    Public API +
    /api/method/erpnext.restaurant.doctype.restaurant_order_entry.restaurant_order_entry.make_invoice +

    +

    + + + erpnext.restaurant.doctype.restaurant_order_entry.restaurant_order_entry.make_invoice + (table, customer, mode_of_payment) +

    +

    Make table based on Sales Order

    +
    +
    + + + + + + +

    Public API +
    /api/method/erpnext.restaurant.doctype.restaurant_order_entry.restaurant_order_entry.sync +

    +

    + + + erpnext.restaurant.doctype.restaurant_order_entry.restaurant_order_entry.sync + (table, items) +

    +

    Sync the sales order related to the table

    +
    +
    + + + + + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/restaurant/restaurant_order_entry_item.html b/foundation/www/docs/current/models/restaurant/restaurant_order_entry_item.html new file mode 100644 index 00000000..7409376a --- /dev/null +++ b/foundation/www/docs/current/models/restaurant/restaurant_order_entry_item.html @@ -0,0 +1,122 @@ + + + + + + + +

    Restaurant Order Entry Item

    +
    + + + Version 10.0.2 + + + Source + +
    + + +Child Table + + +

    Table Name: tabRestaurant Order Entry Item

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1item + Link + Item + + + + + + +Item + + + +
    2qty + Int + Qty + +
    3served + Int + Served + +
    4rate + Currency + Rate + +
    + + + + +

    Child Table Of

    + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/restaurant/restaurant_reservation.html b/foundation/www/docs/current/models/restaurant/restaurant_reservation.html new file mode 100644 index 00000000..25597ecd --- /dev/null +++ b/foundation/www/docs/current/models/restaurant/restaurant_reservation.html @@ -0,0 +1,223 @@ + + + + + + + +

    Restaurant Reservation

    +
    + + + Version 10.0.2 + + + Source + +
    + + + + + +

    Table Name: tabRestaurant Reservation

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1status + Select + Status + + + 
    Open
+Waitlisted
+Cancelled
+No Show
+Success
    +
    2restaurant + Link + Restaurant + + + + + + +Restaurant + + + +
    3no_of_people + Int + No of People + +
    4reservation_time + Datetime + Reservation Time + +
    5reservation_end_time + Datetime + Reservation End Time + +
    6column_break_4 + Column Break + + +
    7customer + Link + Customer + + + + + + +Customer + + + +
    8customer_name + Data + Customer Name + +
    9contact_number + Data + Contact Number + +
    + + +
    +

    Controller

    +

    erpnext.restaurant.doctype.restaurant_reservation.restaurant_reservation

    + + + + + + + +

    Class RestaurantReservation

    + +

    Inherits from frappe.model.document.Document + +

    +
    +
    + + + + +

    + + + validate + (self) +

    +

    No docs

    +
    +
    + + +
    +
    + + + + + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/restaurant/restaurant_table.html b/foundation/www/docs/current/models/restaurant/restaurant_table.html new file mode 100644 index 00000000..54e14267 --- /dev/null +++ b/foundation/www/docs/current/models/restaurant/restaurant_table.html @@ -0,0 +1,150 @@ + + + + + + + +

    Restaurant Table

    +
    + + + Version 10.0.2 + + + Source + +
    + + + + + +

    Table Name: tabRestaurant Table

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1restaurant + Link + Restaurant + + + + + + +Restaurant + + + +
    2no_of_seats + Int + No of Seats + +
    3minimum_seating + Int + Minimum Seating + +
    + + +
    +

    Controller

    +

    erpnext.restaurant.doctype.restaurant_table.restaurant_table

    + + + + + + + +

    Class RestaurantTable

    + +

    Inherits from frappe.model.document.Document + +

    +
    +
    + + + + +

    + + + autoname + (self) +

    +

    No docs

    +
    +
    + + +
    +
    + + + + + + +

    Linked In:

    + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/schools/index.html b/foundation/www/docs/current/models/schools/index.html index 7ffe5c0f..8e15de40 100644 --- a/foundation/www/docs/current/models/schools/index.html +++ b/foundation/www/docs/current/models/schools/index.html @@ -7,7 +7,7 @@
    - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 24 + primary_contact_detail + + Section Break + + Primary Contact Detail + + + + + + + 25 + customer_primary_contact + + Link + + Customer Primary Contact + + + + + + + +Contact + + + + + + + + 26 + column_break_26 + + Column Break + + + + + + + + + 27 + mobile_no + + Read Only + + Mobile Number + + + + 
    customer_primary_contact.mobile_no
    + + + + + 28 + email_id + + Read Only + + Email Id + + + + 
    customer_primary_contact.email_id
    + + + + + 29 default_receivable_accounts Section Break @@ -410,7 +483,7 @@ Individual - 25 + 30 accounts Table @@ -432,47 +505,19 @@ Individual - 26 + 31 credit_limit_section Section Break - Credit Limit + Credit Limit and Payment Terms - 27 - credit_days_based_on - - Select - - Credit Days Based On - - - - 
    -Fixed Days
-Last Day of the Next Month
    - - - - - 28 - credit_days - - Int - - Credit Days - - - - - - - 29 + 32 credit_limit Currency @@ -483,8 +528,41 @@ Last Day of the Next Month + + 33 + payment_terms + + Link + + Default Payment Terms Template + + + + + + + +Payment Terms Template + + + + + + + + 34 + bypass_credit_limit_check_at_sales_order + + Check + + Bypass credit limit check at Sales Order + + + + + - 30 + 35 more_info Section Break @@ -498,7 +576,7 @@ Last Day of the Next Month - 31 + 36 customer_details Text @@ -511,7 +589,7 @@ Last Day of the Next Month - 32 + 37 is_frozen Check @@ -523,7 +601,7 @@ Last Day of the Next Month - 33 + 38 sales_team_section_break Section Break @@ -537,7 +615,7 @@ Last Day of the Next Month - 34 + 39 default_sales_partner Link @@ -558,7 +636,7 @@ Last Day of the Next Month - 35 + 40 default_commission_rate Float @@ -570,7 +648,7 @@ Last Day of the Next Month - 36 + 41 sales_team_section Section Break @@ -582,7 +660,7 @@ Last Day of the Next Month - 37 + 42 sales_team Table @@ -603,7 +681,7 @@ Last Day of the Next Month - 38 + 43 customer_pos_id Data @@ -695,6 +773,34 @@ Last Day of the Next Month +

    + + + create_primary_address + (self) +

    +

    No docs

    +
    +
    + + + + + +

    + + + create_primary_contact + (self) +

    +

    No docs

    +
    +
    + + + + +

    @@ -894,7 +1000,55 @@ Last Day of the Next Month erpnext.selling.doctype.customer.customer.get_customer_outstanding - (customer, company) + (customer, company, ignore_outstanding_sales_order=False) +

    +

    No docs

    +
    +
    + + + + + + + +

    + + + erpnext.selling.doctype.customer.customer.get_customer_primary_contact + (doctype, txt, searchfield, start, page_len, filters) +

    +

    No docs

    +
    +
    + + + + + + + +

    + + + erpnext.selling.doctype.customer.customer.make_address + (args, is_primary_address=1) +

    +

    No docs

    +
    +
    + + + + + + + +

    + + + erpnext.selling.doctype.customer.customer.make_contact + (args, is_primary_contact=1)

    No docs

    @@ -912,6 +1066,15 @@ Last Day of the Next Month
  • +Asset + +
    • + + + +
  • + + Bank Guarantee
    • @@ -936,6 +1099,15 @@ Last Day of the Next Month +
  • + + +Delivery Stop + +
    • + + +
  • @@ -1071,6 +1243,24 @@ Last Day of the Next Month +
  • + + +Restaurant + +
    • + + + +
  • + + +Restaurant Reservation + +
    • + + +
  • diff --git a/foundation/www/docs/current/models/selling/index.html b/foundation/www/docs/current/models/selling/index.html index 5500d8d2..208d4512 100644 --- a/foundation/www/docs/current/models/selling/index.html +++ b/foundation/www/docs/current/models/selling/index.html @@ -7,7 +7,7 @@
    - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 __init__ - (self, arg1, arg2=None) + (self)

    No docs

    diff --git a/foundation/www/docs/current/models/selling/installation_note_item.html b/foundation/www/docs/current/models/selling/installation_note_item.html index 911a772d..699910c9 100644 --- a/foundation/www/docs/current/models/selling/installation_note_item.html +++ b/foundation/www/docs/current/models/selling/installation_note_item.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - + 3 + description + + Data + + Description + + + + + + + 4 item_section Section Break @@ -93,7 +105,7 @@ Note: BOM = Bill of Materials - 4 + 5 items Table @@ -114,7 +126,7 @@ Note: BOM = Bill of Materials - 5 + 6 section_break_4 Section Break @@ -126,7 +138,7 @@ Note: BOM = Bill of Materials - 6 + 7 about HTML diff --git a/foundation/www/docs/current/models/selling/product_bundle_item.html b/foundation/www/docs/current/models/selling/product_bundle_item.html index 8513db73..b3f6e1db 100644 --- a/foundation/www/docs/current/models/selling/product_bundle_item.html +++ b/foundation/www/docs/current/models/selling/product_bundle_item.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 Customer Name - + + 
    customer.customer_name
    + @@ -680,8 +682,20 @@ Shopping Cart - + 42 + total_net_weight + + Float + + Total Net Weight + + + + + + + 43 taxes_section Section Break @@ -695,7 +709,7 @@ Shopping Cart - 43 + 44 taxes_and_charges Link @@ -716,7 +730,7 @@ Shopping Cart - 44 + 45 column_break_34 Column Break @@ -728,7 +742,7 @@ Shopping Cart - 45 + 46 shipping_rule Link @@ -749,7 +763,7 @@ Shopping Cart - 46 + 47 section_break_36 Section Break @@ -761,7 +775,7 @@ Shopping Cart - 47 + 48 taxes Table @@ -782,7 +796,7 @@ Shopping Cart - 48 + 49 sec_tax_breakup Section Break @@ -794,7 +808,7 @@ Shopping Cart - 49 + 50 other_charges_calculation Text @@ -806,7 +820,7 @@ Shopping Cart - 50 + 51 section_break_39 Section Break @@ -818,7 +832,7 @@ Shopping Cart - 51 + 52 base_total_taxes_and_charges Currency @@ -832,7 +846,7 @@ Shopping Cart - 52 + 53 column_break_42 Column Break @@ -844,7 +858,7 @@ Shopping Cart - 53 + 54 total_taxes_and_charges Currency @@ -858,7 +872,7 @@ Shopping Cart - 54 + 55 section_break_44 Section Break @@ -870,7 +884,7 @@ Shopping Cart - 55 + 56 apply_discount_on Select @@ -886,7 +900,7 @@ Net Total - 56 + 57 base_discount_amount Currency @@ -900,7 +914,7 @@ Net Total - 57 + 58 column_break_46 Column Break @@ -912,7 +926,7 @@ Net Total - 58 + 59 additional_discount_percentage Float @@ -924,7 +938,7 @@ Net Total - 59 + 60 discount_amount Currency @@ -938,7 +952,7 @@ Net Total - 60 + 61 totals Section Break @@ -952,7 +966,7 @@ Net Total - 61 + 62 base_grand_total Currency @@ -966,7 +980,7 @@ Net Total - 62 + 63 base_rounding_adjustment Currency @@ -980,7 +994,7 @@ Net Total - 63 + 64 base_in_words Data @@ -993,7 +1007,7 @@ Net Total - 64 + 65 base_rounded_total Currency @@ -1007,7 +1021,7 @@ Net Total - 65 + 66 column_break3 Column Break @@ -1019,7 +1033,7 @@ Net Total - 66 + 67 grand_total Currency @@ -1033,7 +1047,7 @@ Net Total - 67 + 68 rounding_adjustment Currency @@ -1047,7 +1061,7 @@ Net Total - 68 + 69 rounded_total Currency @@ -1061,7 +1075,7 @@ Net Total - 69 + 70 in_words Data @@ -1073,7 +1087,61 @@ Net Total - 70 + 71 + payment_schedule_section + + Section Break + + Payment Terms + + + + + + + 72 + payment_terms_template + + Link + + Payment Terms Template + + + + + + + +    Payment Terms Template + + + + + + + + 73 + payment_schedule + + Table + + Payment Schedule + + + + + + + +Payment Schedule + + + + + + + + 74 terms_section_break Section Break @@ -1087,7 +1155,7 @@ Net Total - 71 + 75 tc_name Link @@ -1108,7 +1176,7 @@ Net Total - 72 + 76 terms Text Editor @@ -1120,7 +1188,7 @@ Net Total - 73 + 77 print_settings Section Break @@ -1132,7 +1200,7 @@ Net Total - 74 + 78 letter_head Link @@ -1153,7 +1221,7 @@ Net Total - 75 + 79 select_print_heading Link @@ -1174,7 +1242,7 @@ Net Total - 76 + 80 column_break_73 Column Break @@ -1186,7 +1254,7 @@ Net Total - 77 + 81 language Data @@ -1198,7 +1266,7 @@ Net Total - 78 + 82 subscription_section Section Break @@ -1210,7 +1278,7 @@ Net Total - 79 + 83 subscription Link @@ -1231,7 +1299,7 @@ Net Total - 80 + 84 more_info Section Break @@ -1245,7 +1313,7 @@ Net Total - 81 + 85 campaign Link @@ -1266,7 +1334,7 @@ Net Total - 82 + 86 source Link @@ -1287,7 +1355,7 @@ Net Total - 83 + 87 order_lost_reason Small Text @@ -1299,7 +1367,7 @@ Net Total - 84 + 88 column_break4 Column Break @@ -1311,7 +1379,7 @@ Net Total - 85 + 89 status Select @@ -1331,7 +1399,7 @@ Replied - 86 + 90 enq_det Text @@ -1343,7 +1411,7 @@ Replied - 87 + 91 supplier_quotation Link @@ -1364,7 +1432,7 @@ Replied - 88 + 92 opportunity Link @@ -1409,20 +1477,6 @@ Replied -

    - - - check_item_table - (self) -

    -

    No docs

    -
    -
    - - - - -

    @@ -1641,6 +1695,22 @@ Replied +

    + + + erpnext.selling.doctype.quotation.quotation._make_sales_invoice + (source_name, target_doc=None, ignore_permissions=False) +

    +

    No docs

    +
    +
    + + + + + + +

    @@ -1672,6 +1742,24 @@ Replied +

    Public API +
    /api/method/erpnext.selling.doctype.quotation.quotation.make_sales_invoice +

    +

    + + + erpnext.selling.doctype.quotation.quotation.make_sales_invoice + (source_name, target_doc=None) +

    +

    No docs

    +
    +
    + + + + + +

    Public API
    /api/method/erpnext.selling.doctype.quotation.quotation.make_sales_order

    diff --git a/foundation/www/docs/current/models/selling/quotation_item.html b/foundation/www/docs/current/models/selling/quotation_item.html index c35b67a5..cc7a9c87 100644 --- a/foundation/www/docs/current/models/selling/quotation_item.html +++ b/foundation/www/docs/current/models/selling/quotation_item.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 Rate With Margin - + + 
    currency
    + @@ -377,8 +379,22 @@ Amount - + 26 + base_rate_with_margin + + Currency + + Rate With Margin (Company Currency) + + + + 
    Company:company:default_currency
    + + + + + 27 section_break1 Section Break @@ -390,7 +406,7 @@ Amount - 27 + 28 rate Currency @@ -404,7 +420,7 @@ Amount - 28 + 29 net_rate Currency @@ -416,7 +432,7 @@ Amount - 29 + 30 amount Currency @@ -430,7 +446,7 @@ Amount - 30 + 31 net_amount Currency @@ -444,7 +460,7 @@ Amount - 31 + 32 col_break3 Column Break @@ -456,7 +472,7 @@ Amount - 32 + 33 base_rate Currency @@ -470,7 +486,7 @@ Amount - 33 + 34 base_net_rate Currency @@ -482,7 +498,7 @@ Amount - 34 + 35 base_amount Currency @@ -496,7 +512,7 @@ Amount - 35 + 36 base_net_amount Currency @@ -510,7 +526,7 @@ Amount - 36 + 37 pricing_rule Link @@ -531,7 +547,76 @@ Amount - 37 + 38 + item_weight_details + + Section Break + + Item Weight Details + + + + + + + 39 + weight_per_unit + + Float + + Weight Per Unit + + + + + + + 40 + total_weight + + Float + + Total Weight + + + + + + + 41 + column_break_20 + + Column Break + + + + + + + + + 42 + weight_uom + + Link + + Weight UOM + + + + + + + +    UOM + + + + + + + + 43 item_balance Section Break @@ -543,7 +628,7 @@ Amount - 38 + 44 warehouse Link @@ -564,7 +649,7 @@ Amount - 39 + 45 column_break_30 Column Break @@ -576,7 +661,7 @@ Amount - 40 + 46 projected_qty Float @@ -588,7 +673,7 @@ Amount - 41 + 47 actual_qty Float @@ -600,7 +685,7 @@ Amount - 42 + 48 stock_balance Button @@ -612,7 +697,7 @@ Amount - 43 + 49 reference Section Break @@ -624,7 +709,7 @@ Amount - 44 + 50 prevdoc_doctype Link @@ -645,7 +730,7 @@ Amount - 45 + 51 prevdoc_docname Dynamic Link @@ -659,7 +744,7 @@ Amount - 46 + 52 item_tax_rate Code @@ -671,7 +756,7 @@ Amount - 47 + 53 col_break4 Column Break @@ -683,7 +768,7 @@ Amount - 48 + 54 page_break Check @@ -695,7 +780,7 @@ Amount - 49 + 55 item_group Link @@ -716,7 +801,7 @@ Amount - 50 + 56 brand Link diff --git a/foundation/www/docs/current/models/selling/sales_order.html b/foundation/www/docs/current/models/selling/sales_order.html index 89c1b661..6e25e6e5 100644 --- a/foundation/www/docs/current/models/selling/sales_order.html +++ b/foundation/www/docs/current/models/selling/sales_order.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 - + + 
    customer.customer_name
    + @@ -703,8 +705,20 @@ Shopping Cart - + 45 + total_net_weight + + Float + + Total Net Weight + + + + + + + 46 taxes_section Section Break @@ -718,7 +732,7 @@ Shopping Cart - 46 + 47 taxes_and_charges Link @@ -739,7 +753,7 @@ Shopping Cart - 47 + 48 column_break_38 Column Break @@ -751,7 +765,7 @@ Shopping Cart - 48 + 49 shipping_rule Link @@ -772,7 +786,7 @@ Shopping Cart - 49 + 50 section_break_40 Section Break @@ -784,7 +798,7 @@ Shopping Cart - 50 + 51 taxes Table @@ -805,7 +819,7 @@ Shopping Cart - 51 + 52 sec_tax_breakup Section Break @@ -817,7 +831,7 @@ Shopping Cart - 52 + 53 other_charges_calculation Text @@ -829,7 +843,7 @@ Shopping Cart - 53 + 54 section_break_43 Section Break @@ -841,7 +855,7 @@ Shopping Cart - 54 + 55 base_total_taxes_and_charges Currency @@ -855,7 +869,7 @@ Shopping Cart - 55 + 56 column_break_46 Column Break @@ -867,7 +881,7 @@ Shopping Cart - 56 + 57 total_taxes_and_charges Currency @@ -881,7 +895,7 @@ Shopping Cart - 57 + 58 section_break_48 Section Break @@ -893,7 +907,7 @@ Shopping Cart - 58 + 59 apply_discount_on Select @@ -909,7 +923,7 @@ Net Total - 59 + 60 base_discount_amount Currency @@ -923,7 +937,7 @@ Net Total - 60 + 61 column_break_50 Column Break @@ -935,7 +949,7 @@ Net Total - 61 + 62 additional_discount_percentage Float @@ -947,7 +961,7 @@ Net Total - 62 + 63 discount_amount Currency @@ -961,7 +975,7 @@ Net Total - 63 + 64 totals Section Break @@ -975,7 +989,7 @@ Net Total - 64 + 65 base_grand_total Currency @@ -989,7 +1003,7 @@ Net Total - 65 + 66 base_rounding_adjustment Currency @@ -1003,7 +1017,7 @@ Net Total - 66 + 67 base_rounded_total Currency @@ -1017,7 +1031,7 @@ Net Total - 67 + 68 base_in_words Data @@ -1030,7 +1044,7 @@ Net Total - 68 + 69 column_break3 Column Break @@ -1042,7 +1056,7 @@ Net Total - 69 + 70 grand_total Currency @@ -1056,7 +1070,7 @@ Net Total - 70 + 71 rounding_adjustment Currency @@ -1070,7 +1084,7 @@ Net Total - 71 + 72 rounded_total Currency @@ -1084,7 +1098,7 @@ Net Total - 72 + 73 in_words Data @@ -1096,7 +1110,7 @@ Net Total - 73 + 74 advance_paid Currency @@ -1110,7 +1124,7 @@ Net Total - 74 + 75 packing_list Section Break @@ -1124,7 +1138,7 @@ Net Total - 75 + 76 packed_items Table @@ -1145,7 +1159,61 @@ Net Total - 76 + 77 + payment_schedule_section + + Section Break + + Payment Terms + + + + + + + 78 + payment_terms_template + + Link + + Payment Terms Template + + + + + + + +    Payment Terms Template + + + + + + + + 79 + payment_schedule + + Table + + Payment Schedule + + + + + + + +Payment Schedule + + + + + + + + 80 terms_section_break Section Break @@ -1159,7 +1227,7 @@ Net Total - 77 + 81 tc_name Link @@ -1180,7 +1248,7 @@ Net Total - 78 + 82 terms Text Editor @@ -1192,7 +1260,7 @@ Net Total - 79 + 83 more_info Section Break @@ -1206,7 +1274,7 @@ Net Total - 80 + 84 project Link @@ -1228,7 +1296,7 @@ Net Total - 81 + 85 party_account_currency Link @@ -1249,7 +1317,7 @@ Net Total - 82 + 86 column_break_77 Column Break @@ -1261,7 +1329,7 @@ Net Total - 83 + 87 source Link @@ -1282,7 +1350,7 @@ Net Total - 84 + 88 campaign Link @@ -1303,7 +1371,7 @@ Net Total - 85 + 89 printing_details Section Break @@ -1315,7 +1383,7 @@ Net Total - 86 + 90 language Data @@ -1327,7 +1395,7 @@ Net Total - 87 + 91 letter_head Link @@ -1348,7 +1416,7 @@ Net Total - 88 + 92 column_break4 Column Break @@ -1360,7 +1428,7 @@ Net Total - 89 + 93 select_print_heading Link @@ -1381,7 +1449,7 @@ Net Total - 90 + 94 group_same_items Check @@ -1393,7 +1461,7 @@ Net Total - 91 + 95 section_break_78 Section Break @@ -1405,7 +1473,7 @@ Net Total - 92 + 96 status Select @@ -1426,7 +1494,7 @@ Closed - 93 + 97 delivery_status Select @@ -1444,7 +1512,7 @@ Not Applicable - 94 + 98 per_delivered Percent @@ -1457,7 +1525,7 @@ Not Applicable - 95 + 99 column_break_81 Column Break @@ -1469,7 +1537,7 @@ Not Applicable - 96 + 100 per_billed Percent @@ -1482,7 +1550,7 @@ Not Applicable - 97 + 101 billing_status Select @@ -1499,7 +1567,7 @@ Closed - 98 + 102 sales_team_section_break Section Break @@ -1513,7 +1581,7 @@ Closed - 99 + 103 sales_partner Link @@ -1534,7 +1602,7 @@ Closed - 100 + 104 column_break7 Column Break @@ -1546,7 +1614,7 @@ Closed - 101 + 105 commission_rate Float @@ -1558,7 +1626,7 @@ Closed - 102 + 106 total_commission Currency @@ -1572,7 +1640,7 @@ Closed - 103 + 107 section_break1 Section Break @@ -1584,7 +1652,7 @@ Closed - 104 + 108 sales_team Table @@ -1605,7 +1673,7 @@ Closed - 105 + 109 subscription_section Section Break @@ -1617,7 +1685,43 @@ Closed - 106 + 110 + from_date + + Date + + From Date + + + + + + + 111 + to_date + + Date + + To Date + + + + + + + 112 + column_break_108 + + Column Break + + + + + + + + + 113 subscription Link @@ -1637,214 +1741,6 @@ Closed - - 107 - recurring_order - - Section Break - - Recurring Order - - - - 
    fa fa-time
    - - - - - 108 - settings - - Column Break - - Settings - - - - - - - 109 - is_recurring - - Check - - Is Recurring - - - - - - - 110 - recurring_id - - Link - - Reference Document - - - - - - - -Sales Order - - - - - - - - 111 - recurring_type - - Select - - Frequency - - - - 
    -Monthly
-Quarterly
-Half-yearly
-Yearly
    - - - - - 112 - repeat_on_day_of_month - - Int - - Repeat on Day of Month - - - - - - - 113 - end_date - - Date - - Recurring Upto - - - - - - - 114 - submit_on_creation - - Check - - Submit on creation - - - - - - - 115 - notify_by_email - - Check - - Notify by email - - - - - - - 116 - notification_email_address - - Code - - Notification Email Address - - - - 
    Email
    - - - - - 117 - recurring_print_format - - Link - - Recurring Print Format - - - - - - - -Print Format - - - - - - - - 118 - column_break83 - - Column Break - - This Document - - - - - - - 119 - from_date - - Date - - From Date - - - - - - - 120 - to_date - - Date - - To Date - - - - - - - 121 - next_date - - Date - - Next Date - - - - - @@ -1874,7 +1770,7 @@ Yearly __init__ - (self, arg1, arg2=None) + (self)

    No docs

    diff --git a/foundation/www/docs/current/models/selling/sales_order_item.html b/foundation/www/docs/current/models/selling/sales_order_item.html index 7990d21f..9efead7b 100644 --- a/foundation/www/docs/current/models/selling/sales_order_item.html +++ b/foundation/www/docs/current/models/selling/sales_order_item.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 Rate With Margin - + + 
    currency
    + @@ -389,8 +391,22 @@ Amount - + 27 + base_rate_with_margin + + Currency + + Rate With Margin (Company Currency) + + + + 
    Company:company:default_currency
    + + + + + 28 section_break_simple1 Section Break @@ -402,7 +418,7 @@ Amount - 28 + 29 rate Currency @@ -416,7 +432,7 @@ Amount - 29 + 30 amount Currency @@ -430,7 +446,7 @@ Amount - 30 + 31 col_break3 Column Break @@ -442,7 +458,7 @@ Amount - 31 + 32 base_rate Currency @@ -456,7 +472,7 @@ Amount - 32 + 33 base_amount Currency @@ -470,7 +486,7 @@ Amount - 33 + 34 pricing_rule Link @@ -491,7 +507,7 @@ Amount - 34 + 35 section_break_24 Section Break @@ -503,7 +519,7 @@ Amount - 35 + 36 net_rate Currency @@ -517,7 +533,7 @@ Amount - 36 + 37 net_amount Currency @@ -531,7 +547,7 @@ Amount - 37 + 38 column_break_27 Column Break @@ -543,7 +559,7 @@ Amount - 38 + 39 base_net_rate Currency @@ -557,7 +573,7 @@ Amount - 39 + 40 base_net_amount Currency @@ -571,7 +587,7 @@ Amount - 40 + 41 drop_ship_section Section Break @@ -583,7 +599,7 @@ Amount - 41 + 42 delivered_by_supplier Check @@ -595,7 +611,7 @@ Amount - 42 + 43 supplier Link @@ -616,7 +632,76 @@ Amount - 43 + 44 + item_weight_details + + Section Break + + Item Weight Details + + + + + + + 45 + weight_per_unit + + Float + + Weight Per Unit + + + + + + + 46 + total_weight + + Float + + Total Weight + + + + + + + 47 + column_break_21 + + Column Break + + + + + + + + + 48 + weight_uom + + Link + + Weight UOM + + + + + + + +    UOM + + + + + + + + 49 warehouse_and_reference Section Break @@ -628,7 +713,7 @@ Amount - 44 + 50 warehouse Link @@ -649,7 +734,7 @@ Amount - 45 + 51 target_warehouse Link @@ -670,7 +755,7 @@ Amount - 46 + 52 prevdoc_docname Link @@ -691,7 +776,7 @@ Amount - 47 + 53 brand Link @@ -712,7 +797,7 @@ Amount - 48 + 54 item_group Link @@ -733,7 +818,7 @@ Amount - 49 + 55 page_break Check @@ -745,7 +830,7 @@ Amount - 50 + 56 col_break4 Column Break @@ -757,7 +842,7 @@ Amount - 51 + 57 projected_qty Float @@ -769,7 +854,7 @@ Amount - 52 + 58 actual_qty Float @@ -781,7 +866,7 @@ Amount - 53 + 59 ordered_qty Float @@ -793,7 +878,7 @@ Amount - 54 + 60 delivered_qty Float @@ -805,7 +890,7 @@ Amount - 55 + 61 returned_qty Float @@ -817,7 +902,7 @@ Amount - 56 + 62 billed_amt Currency @@ -831,7 +916,7 @@ Amount - 57 + 63 valuation_rate Currency @@ -845,7 +930,7 @@ Amount - 58 + 64 gross_profit Currency @@ -859,7 +944,7 @@ Amount - 59 + 65 planned_qty Float @@ -872,7 +957,7 @@ Amount - 60 + 66 produced_qty Float @@ -885,7 +970,7 @@ Amount - 61 + 67 item_tax_rate Code @@ -897,7 +982,7 @@ Amount - 62 + 68 transaction_date Date diff --git a/foundation/www/docs/current/models/selling/sales_team.html b/foundation/www/docs/current/models/selling/sales_team.html index f52106fa..a2d73978 100644 --- a/foundation/www/docs/current/models/selling/sales_team.html +++ b/foundation/www/docs/current/models/selling/sales_team.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 1 - column_break1 - - Column Break - - - - - - - - - 2 send_to Select @@ -72,7 +60,7 @@ All Sales Person - 3 + 2 customer Link @@ -93,7 +81,7 @@ All Sales Person - 4 + 3 supplier Link @@ -114,7 +102,7 @@ All Sales Person - 5 + 4 sales_partner Link @@ -135,7 +123,7 @@ All Sales Person - 6 + 5 department Link @@ -156,7 +144,7 @@ All Sales Person - 7 + 6 branch Link @@ -177,7 +165,7 @@ All Sales Person - 8 + 7 create_receiver_list Button @@ -191,7 +179,7 @@ All Sales Person - 9 + 8 receiver_list Code @@ -203,7 +191,7 @@ All Sales Person - 10 + 9 column_break9 Column Break @@ -215,7 +203,7 @@ All Sales Person - 11 + 10 message Text @@ -228,7 +216,7 @@ All Sales Person - 12 + 11 total_characters Int @@ -240,7 +228,7 @@ All Sales Person - 13 + 12 total_messages Int @@ -252,7 +240,7 @@ All Sales Person - 14 + 13 send_sms Button diff --git a/foundation/www/docs/current/models/setup/authorization_control.html b/foundation/www/docs/current/models/setup/authorization_control.html index 38d64a1d..24f120e1 100644 --- a/foundation/www/docs/current/models/setup/authorization_control.html +++ b/foundation/www/docs/current/models/setup/authorization_control.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 6 domain - Select + Link Domain - 
    Distribution
-Manufacturing
-Retail
-Services
-Education
-Other
    + + + + +    Domain + + + @@ -361,8 +363,20 @@ Existing Company - + 22 + tax_id + + Data + + Tax ID + + + + + + + 23 default_settings Section Break @@ -374,7 +388,7 @@ Existing Company - 23 + 24 default_bank_account Link @@ -395,7 +409,7 @@ Existing Company - 24 + 25 default_cash_account Link @@ -416,7 +430,7 @@ Existing Company - 25 + 26 default_receivable_account Link @@ -437,7 +451,7 @@ Existing Company - 26 + 27 round_off_account Link @@ -458,7 +472,7 @@ Existing Company - 27 + 28 write_off_account Link @@ -479,7 +493,7 @@ Existing Company - 28 + 29 exchange_gain_loss_account Link @@ -500,7 +514,7 @@ Existing Company - 29 + 30 column_break0 Column Break @@ -512,7 +526,7 @@ Existing Company - 30 + 31 default_payable_account Link @@ -533,7 +547,28 @@ Existing Company - 31 + 32 + default_employee_advance_account + + Link + + Default Employee Advance Account + + + + + + + +Account + + + + + + + + 33 default_expense_account Link @@ -554,7 +589,7 @@ Existing Company - 32 + 34 default_income_account Link @@ -575,7 +610,7 @@ Existing Company - 33 + 35 default_payroll_payable_account Link @@ -596,7 +631,7 @@ Existing Company - 34 + 36 round_off_cost_center Link @@ -617,7 +652,7 @@ Existing Company - 35 + 37 section_break_22 Section Break @@ -629,7 +664,7 @@ Existing Company - 36 + 38 cost_center Link @@ -650,7 +685,7 @@ Existing Company - 37 + 39 credit_limit Currency @@ -664,7 +699,7 @@ Existing Company - 38 + 40 column_break_26 Column Break @@ -676,7 +711,7 @@ Existing Company - 39 + 41 credit_days_based_on Select @@ -692,7 +727,7 @@ Last Day of the Next Month - 40 + 42 credit_days Int @@ -704,7 +739,7 @@ Last Day of the Next Month - 41 + 43 auto_accounting_for_stock_settings Section Break @@ -716,7 +751,7 @@ Last Day of the Next Month - 42 + 44 enable_perpetual_inventory Check @@ -728,7 +763,7 @@ Last Day of the Next Month - 43 + 45 default_inventory_account Link @@ -749,7 +784,7 @@ Last Day of the Next Month - 44 + 46 stock_adjustment_account Link @@ -770,7 +805,7 @@ Last Day of the Next Month - 45 + 47 column_break_32 Column Break @@ -782,7 +817,7 @@ Last Day of the Next Month - 46 + 48 stock_received_but_not_billed Link @@ -803,7 +838,7 @@ Last Day of the Next Month - 47 + 49 expenses_included_in_valuation Link @@ -824,7 +859,7 @@ Last Day of the Next Month - 48 + 50 fixed_asset_depreciation_settings Section Break @@ -836,7 +871,7 @@ Last Day of the Next Month - 49 + 51 accumulated_depreciation_account Link @@ -857,7 +892,7 @@ Last Day of the Next Month - 50 + 52 depreciation_expense_account Link @@ -878,7 +913,7 @@ Last Day of the Next Month - 51 + 53 series_for_depreciation_entry Data @@ -890,7 +925,7 @@ Last Day of the Next Month - 52 + 54 column_break_40 Column Break @@ -902,7 +937,7 @@ Last Day of the Next Month - 53 + 55 disposal_account Link @@ -923,7 +958,7 @@ Last Day of the Next Month - 54 + 56 depreciation_cost_center Link @@ -944,7 +979,7 @@ Last Day of the Next Month - 55 + 57 company_info Section Break @@ -957,7 +992,7 @@ Last Day of the Next Month - 56 + 58 address_html HTML @@ -969,7 +1004,7 @@ Last Day of the Next Month - 57 + 59 column_break1 Column Break @@ -981,7 +1016,7 @@ Last Day of the Next Month - 58 + 60 phone_no Data @@ -995,7 +1030,7 @@ Last Day of the Next Month - 59 + 61 fax Data @@ -1009,7 +1044,7 @@ Last Day of the Next Month - 60 + 62 email Data @@ -1023,7 +1058,7 @@ Last Day of the Next Month - 61 + 63 website Data @@ -1035,7 +1070,7 @@ Last Day of the Next Month - 62 + 64 registration_info Section Break @@ -1047,7 +1082,7 @@ Last Day of the Next Month - 63 + 65 registration_details Code @@ -1060,7 +1095,7 @@ Last Day of the Next Month - 64 + 66 delete_company_transactions Button @@ -1384,6 +1419,24 @@ Last Day of the Next Month +

    Public API +
    /api/method/erpnext.setup.doctype.company.company.enqueue_replace_abbr +

    +

    + + + erpnext.setup.doctype.company.company.enqueue_replace_abbr + (company, old, new) +

    +

    No docs

    +
    +
    + + + + + +

    @@ -1491,7 +1544,7 @@ Last Day of the Next Month

  • -Asset +Asset
    • @@ -1500,7 +1553,7 @@ Last Day of the Next Month
  • -Asset Category Account +Asset Category Account
    • @@ -1509,7 +1562,25 @@ Last Day of the Next Month
  • -Asset Movement +Asset Maintenance + +
    • + + + +
  • + + +Asset Maintenance Team + +
    • + + + +
  • + + +Asset Movement
    • @@ -1614,6 +1685,15 @@ Last Day of the Next Month +
  • + + +Delivery Trip + +
    • + + +
  • @@ -1632,6 +1712,15 @@ Last Day of the Next Month +
  • + + +Employee Advance + +
    • + + +
  • @@ -1680,7 +1769,7 @@ Last Day of the Next Month
  • -Fee Schedule +Fee Schedule
    • @@ -1689,7 +1778,7 @@ Last Day of the Next Month
  • -Fee Structure +Fee Structure
    • @@ -1698,7 +1787,7 @@ Last Day of the Next Month
  • -Fees +Fees
    • @@ -1731,6 +1820,15 @@ Last Day of the Next Month +
  • + + +Grant Application + +
    • + + +
  • @@ -1740,6 +1838,15 @@ Last Day of the Next Month +
  • + + +Hub Settings + +
    • + + +
  • @@ -1866,6 +1973,15 @@ Last Day of the Next Month +
  • + + +Opening Invoice Creation Tool + +
    • + + +
  • @@ -1884,15 +2000,6 @@ Last Day of the Next Month -
  • - - -Patient - -
    • - - -
  • @@ -1920,6 +2027,15 @@ Last Day of the Next Month +
  • + + +Payroll Entry + +
    • + + +
  • @@ -1947,15 +2063,6 @@ Last Day of the Next Month -
  • - - -Process Payroll - -
    • - - -
  • @@ -2037,6 +2144,15 @@ Last Day of the Next Month +
  • + + +Restaurant + +
    • + + +
  • @@ -2190,6 +2306,24 @@ Last Day of the Next Month +
  • + + +Training Event + +
    • + + + +
  • + + +Training Program + +
    • + + +
  • diff --git a/foundation/www/docs/current/models/setup/currency_exchange.html b/foundation/www/docs/current/models/setup/currency_exchange.html index f9396482..84c0f548 100644 --- a/foundation/www/docs/current/models/setup/currency_exchange.html +++ b/foundation/www/docs/current/models/setup/currency_exchange.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 __init__ - (self, arg1, arg2=None) + (self)

    No docs

    diff --git a/foundation/www/docs/current/models/setup/global_defaults.html b/foundation/www/docs/current/models/setup/global_defaults.html index 737062a7..b12fc846 100644 --- a/foundation/www/docs/current/models/setup/global_defaults.html +++ b/foundation/www/docs/current/models/setup/global_defaults.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - - - after_rename - (self, olddn, newdn, merge=False) -

    -

    No docs

    -
    -
    - - - - -

    diff --git a/foundation/www/docs/current/models/setup/naming_series.html b/foundation/www/docs/current/models/setup/naming_series.html index 8bce2b82..b17de449 100644 --- a/foundation/www/docs/current/models/setup/naming_series.html +++ b/foundation/www/docs/current/models/setup/naming_series.html @@ -9,7 +9,7 @@

    - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 -Fee Schedule +Fee Schedule
    • @@ -119,7 +119,7 @@
  • -Fees +Fees
    • diff --git a/foundation/www/docs/current/models/setup/quotation_lost_reason.html b/foundation/www/docs/current/models/setup/quotation_lost_reason.html index 214205a8..3193fc58 100644 --- a/foundation/www/docs/current/models/setup/quotation_lost_reason.html +++ b/foundation/www/docs/current/models/setup/quotation_lost_reason.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 3 - credit_days_based_on + payment_terms - Select + Link - Credit Days Based On + Default Payment Terms Template - 
    -Fixed Days
-Last Day of the Next Month
    - - - - - 4 - credit_days - - Int - - Credit Days + + + + +    Payment Terms Template + + - - 5 + 4 default_payable_account Section Break @@ -105,7 +98,7 @@ Last Day of the Next Month - 6 + 5 accounts Table diff --git a/foundation/www/docs/current/models/setup/target_detail.html b/foundation/www/docs/current/models/setup/target_detail.html index 73cf91ba..d8ffbac6 100644 --- a/foundation/www/docs/current/models/setup/target_detail.html +++ b/foundation/www/docs/current/models/setup/target_detail.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 + + +Crop + + + + + +
  • + + +Crop Cycle + +
    • + + +
  • diff --git a/foundation/www/docs/current/models/setup/website_item_group.html b/foundation/www/docs/current/models/setup/website_item_group.html index 8f480b97..50120367 100644 --- a/foundation/www/docs/current/models/setup/website_item_group.html +++ b/foundation/www/docs/current/models/setup/website_item_group.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 Public API +
    /api/method/erpnext.stock.doctype.batch.batch.get_batch_no +

    erpnext.stock.doctype.batch.batch.get_batch_no - (item_code, warehouse, qty, throw=False) + (item_code, warehouse, qty=1, throw=False)

    -

    get the smallest batch with for the given item_code, warehouse and qty

    + 
    Get batch number using First Expiring First Out method.
+
    + +

    Parameters:

    + +
      +
    • item_code - item_code of Item Document
      • +
    • warehouse - name of Warehouse to check
      • +

    • qty - quantity of Items

      + +

      :return: String represent batch number of batch with sufficient quantity else an empty String

      • +

    @@ -381,6 +394,22 @@ + +

    + + + erpnext.stock.doctype.batch.batch.get_batches + (item_code, warehouse, qty=1, throw=False) +

    +

    No docs

    +
    +
    + + + + + +

    Public API
    /api/method/erpnext.stock.doctype.batch.batch.get_batches_by_oldest

    diff --git a/foundation/www/docs/current/models/stock/bin.html b/foundation/www/docs/current/models/stock/bin.html index 4cdb486b..02c52691 100644 --- a/foundation/www/docs/current/models/stock/bin.html +++ b/foundation/www/docs/current/models/stock/bin.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 Customer Name - + + 
    customer.customer_name
    + @@ -758,8 +760,20 @@ DN-RET- - + 49 + total_net_weight + + Float + + Total Net Weight + + + + + + + 50 taxes_section Section Break @@ -773,7 +787,7 @@ DN-RET- - 50 + 51 taxes_and_charges Link @@ -795,7 +809,7 @@ DN-RET- - 51 + 52 column_break_39 Column Break @@ -807,7 +821,7 @@ DN-RET- - 52 + 53 shipping_rule Link @@ -828,7 +842,7 @@ DN-RET- - 53 + 54 section_break_41 Section Break @@ -840,7 +854,7 @@ DN-RET- - 54 + 55 taxes Table @@ -861,7 +875,7 @@ DN-RET- - 55 + 56 sec_tax_breakup Section Break @@ -873,7 +887,7 @@ DN-RET- - 56 + 57 other_charges_calculation Text @@ -885,7 +899,7 @@ DN-RET- - 57 + 58 section_break_44 Section Break @@ -897,7 +911,7 @@ DN-RET- - 58 + 59 base_total_taxes_and_charges Currency @@ -911,7 +925,7 @@ DN-RET- - 59 + 60 column_break_47 Column Break @@ -923,7 +937,7 @@ DN-RET- - 60 + 61 total_taxes_and_charges Currency @@ -937,7 +951,7 @@ DN-RET- - 61 + 62 section_break_49 Section Break @@ -949,7 +963,7 @@ DN-RET- - 62 + 63 apply_discount_on Select @@ -965,7 +979,7 @@ Net Total - 63 + 64 base_discount_amount Currency @@ -979,7 +993,7 @@ Net Total - 64 + 65 column_break_51 Column Break @@ -991,7 +1005,7 @@ Net Total - 65 + 66 additional_discount_percentage Float @@ -1003,7 +1017,7 @@ Net Total - 66 + 67 discount_amount Currency @@ -1017,7 +1031,7 @@ Net Total - 67 + 68 totals Section Break @@ -1031,7 +1045,7 @@ Net Total - 68 + 69 base_grand_total Currency @@ -1045,7 +1059,7 @@ Net Total - 69 + 70 base_rounding_adjustment Currency @@ -1059,7 +1073,7 @@ Net Total - 70 + 71 base_rounded_total Currency @@ -1073,7 +1087,7 @@ Net Total - 71 + 72 base_in_words Data @@ -1086,7 +1100,7 @@ Net Total - 72 + 73 column_break3 Column Break @@ -1098,7 +1112,7 @@ Net Total - 73 + 74 grand_total Currency @@ -1112,7 +1126,7 @@ Net Total - 74 + 75 rounding_adjustment Currency @@ -1126,7 +1140,7 @@ Net Total - 75 + 76 rounded_total Currency @@ -1140,7 +1154,7 @@ Net Total - 76 + 77 in_words Data @@ -1153,7 +1167,7 @@ Net Total - 77 + 78 terms_section_break Section Break @@ -1167,7 +1181,7 @@ Net Total - 78 + 79 tc_name Link @@ -1188,7 +1202,7 @@ Net Total - 79 + 80 terms Text Editor @@ -1200,7 +1214,7 @@ Net Total - 80 + 81 transporter_info Section Break @@ -1214,7 +1228,7 @@ Net Total - 81 + 82 transporter_name Data @@ -1226,7 +1240,7 @@ Net Total - 82 + 83 col_break34 Column Break @@ -1238,7 +1252,7 @@ Net Total - 83 + 84 lr_no Data @@ -1250,7 +1264,7 @@ Net Total - 84 + 85 lr_date Date @@ -1262,7 +1276,7 @@ Net Total - 85 + 86 more_info Section Break @@ -1276,7 +1290,7 @@ Net Total - 86 + 87 project Link @@ -1298,7 +1312,7 @@ Net Total - 87 + 88 campaign Link @@ -1319,7 +1333,7 @@ Net Total - 88 + 89 source Link @@ -1340,7 +1354,7 @@ Net Total - 89 + 90 column_break5 Column Break @@ -1352,7 +1366,7 @@ Net Total - 90 + 91 per_billed Percent @@ -1364,7 +1378,7 @@ Net Total - 91 + 92 customer_group Link @@ -1385,7 +1399,7 @@ Net Total - 92 + 93 territory Link @@ -1406,7 +1420,7 @@ Net Total - 93 + 94 printing_details Section Break @@ -1418,7 +1432,7 @@ Net Total - 94 + 95 letter_head Link @@ -1439,7 +1453,7 @@ Net Total - 95 + 96 select_print_heading Link @@ -1460,7 +1474,7 @@ Net Total - 96 + 97 language Data @@ -1472,7 +1486,7 @@ Net Total - 97 + 98 column_break_88 Column Break @@ -1484,7 +1498,7 @@ Net Total - 98 + 99 print_without_amount Check @@ -1496,7 +1510,7 @@ Net Total - 99 + 100 section_break_83 Section Break @@ -1508,7 +1522,7 @@ Net Total - 100 + 101 status Select @@ -1527,7 +1541,7 @@ Closed - 101 + 102 per_installed Percent @@ -1540,7 +1554,7 @@ Closed - 102 + 103 installation_status Select @@ -1552,7 +1566,7 @@ Closed - 103 + 104 column_break_89 Column Break @@ -1564,7 +1578,7 @@ Closed - 104 + 105 to_warehouse Link @@ -1586,7 +1600,7 @@ Closed - 105 + 106 excise_page Data @@ -1598,7 +1612,7 @@ Closed - 106 + 107 instructions Text @@ -1610,7 +1624,7 @@ Closed - 107 + 108 subscription_section Section Break @@ -1622,7 +1636,7 @@ Closed - 108 + 109 subscription Link @@ -1643,7 +1657,7 @@ Closed - 109 + 110 sales_team_section_break Section Break @@ -1657,7 +1671,7 @@ Closed - 110 + 111 sales_partner Link @@ -1678,7 +1692,7 @@ Closed - 111 + 112 column_break7 Column Break @@ -1690,7 +1704,7 @@ Closed - 112 + 113 commission_rate Float @@ -1702,7 +1716,7 @@ Closed - 113 + 114 total_commission Currency @@ -1716,7 +1730,7 @@ Closed - 114 + 115 section_break1 Section Break @@ -1728,7 +1742,7 @@ Closed - 115 + 116 sales_team Table @@ -1777,7 +1791,7 @@ Closed     __init__ - (self, arg1, arg2=None) + (self)

    No docs

    diff --git a/foundation/www/docs/current/models/stock/delivery_note_item.html b/foundation/www/docs/current/models/stock/delivery_note_item.html index af750ebf..7ef5c61b 100644 --- a/foundation/www/docs/current/models/stock/delivery_note_item.html +++ b/foundation/www/docs/current/models/stock/delivery_note_item.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 Rate With Margin - + + 
    currency
    + @@ -389,8 +391,22 @@ Amount - + 27 + base_rate_with_margin + + Currency + + Rate With Margin (Company Currency) + + + + 
    Company:company:default_currency
    + + + + + 28 section_break_1 Section Break @@ -402,7 +418,7 @@ Amount - 28 + 29 rate Currency @@ -416,7 +432,7 @@ Amount - 29 + 30 amount Currency @@ -430,7 +446,7 @@ Amount - 30 + 31 col_break3 Column Break @@ -442,7 +458,7 @@ Amount - 31 + 32 base_rate Currency @@ -456,7 +472,7 @@ Amount - 32 + 33 base_amount Currency @@ -470,7 +486,7 @@ Amount - 33 + 34 pricing_rule Link @@ -491,7 +507,7 @@ Amount - 34 + 35 section_break_25 Section Break @@ -503,7 +519,7 @@ Amount - 35 + 36 net_rate Currency @@ -517,7 +533,7 @@ Amount - 36 + 37 net_amount Currency @@ -531,7 +547,7 @@ Amount - 37 + 38 column_break_28 Column Break @@ -543,7 +559,7 @@ Amount - 38 + 39 base_net_rate Currency @@ -557,7 +573,7 @@ Amount - 39 + 40 base_net_amount Currency @@ -571,7 +587,76 @@ Amount - 40 + 41 + item_weight_details + + Section Break + + Item Weight Details + + + + + + + 42 + weight_per_unit + + Float + + Weight Per Unit + + + + + + + 43 + total_weight + + Float + + Total Weight + + + + + + + 44 + column_break_21 + + Column Break + + + + + + + + + 45 + weight_uom + + Link + + Weight UOM + + + + + + + +    UOM + + + + + + + + 46 warehouse_and_reference Section Break @@ -583,7 +668,7 @@ Amount - 41 + 47 warehouse Link @@ -604,7 +689,7 @@ Amount - 42 + 48 target_warehouse Link @@ -625,7 +710,7 @@ Amount - 43 + 49 quality_inspection Link @@ -646,7 +731,7 @@ Amount - 44 + 50 section_break_40 Section Break @@ -658,7 +743,7 @@ Amount - 45 + 51 serial_no Text @@ -670,7 +755,7 @@ Amount - 46 + 52 batch_no Link @@ -691,7 +776,7 @@ Amount - 47 + 53 actual_qty Float @@ -703,7 +788,7 @@ Amount - 48 + 54 actual_batch_qty Float @@ -715,7 +800,7 @@ Amount - 49 + 55 item_group Link @@ -736,7 +821,7 @@ Amount - 50 + 56 brand Link @@ -757,7 +842,7 @@ Amount - 51 + 57 item_tax_rate Small Text @@ -769,7 +854,7 @@ Amount - 52 + 58 col_break4 Column Break @@ -781,7 +866,7 @@ Amount - 53 + 59 expense_account Link @@ -802,7 +887,7 @@ Amount - 54 + 60 cost_center Link @@ -823,7 +908,7 @@ Amount - 55 + 61 allow_zero_valuation_rate Check @@ -835,7 +920,7 @@ Amount - 56 + 62 against_sales_order Link @@ -856,7 +941,7 @@ Amount - 57 + 63 against_sales_invoice Link @@ -877,7 +962,7 @@ Amount - 58 + 64 so_detail Data @@ -889,7 +974,7 @@ Amount - 59 + 65 si_detail Data @@ -901,7 +986,7 @@ Amount - 60 + 66 installed_qty Float @@ -913,7 +998,7 @@ Amount - 61 + 67 billed_amt Currency @@ -927,7 +1012,7 @@ Amount - 62 + 68 page_break Check diff --git a/foundation/www/docs/current/models/stock/delivery_stop.html b/foundation/www/docs/current/models/stock/delivery_stop.html new file mode 100644 index 00000000..2c692c9e --- /dev/null +++ b/foundation/www/docs/current/models/stock/delivery_stop.html @@ -0,0 +1,320 @@ + + + + + + + +

    Delivery Stop

    +
    + + + Version 10.0.2 + + + Source + +
    + + +Child Table + + +

    Table Name: tabDelivery Stop

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1customer + Link + Customer + + + + + + +Customer + + + +
    2address + Link + Address Name + + + + + + +Address + + + +
    3column_break_6 + Column Break + + +
    4customer_address + Small Text + Customer Address + +
    5section_break_7 + Section Break + + +
    6contact + Link + Contact Name + + + + + + +Contact + + + +
    7column_break_7 + Column Break + + +
    8customer_contact + Small Text + Customer Contact + +
    9section_break_9 + Section Break + + +
    10estimated_arrival + Time + Estimated Arrival + +
    11details + Text Editor + Details + +
    12section_break_12 + Section Break + + +
    13select_delivery_notes + Button + Select/Unselect Delivery Notes + +
    14column_break_14 + Column Break + + +
    15delivery_notes + Text + Delivery Notes + +
    16section_break_14 + Section Break + + +
    17notified_by_email + Check + Notified by Email + +
    18column_break_18 + Column Break + + +
    19email_sent_to + Data + Email sent to + +
    + + + + +

    Child Table Of

    + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/stock/delivery_trip.html b/foundation/www/docs/current/models/stock/delivery_trip.html new file mode 100644 index 00000000..d7aa4bb6 --- /dev/null +++ b/foundation/www/docs/current/models/stock/delivery_trip.html @@ -0,0 +1,475 @@ + + + + + + + +

    Delivery Trip

    +
    + + + Version 10.0.2 + + + Source + +
    + + + + + +

    Table Name: tabDelivery Trip

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1naming_series + Select + Series + + + 
    TOUR-.#####
    +
    2company + Link + Company + + + + + + +Company + + + +
    3column_break_2 + Column Break + + +
    4email_notification_sent + Check + Initial Email Notification Sent + +
    5section_break_3 + Section Break + + +
    6date + Date + Date + +
    7departure_time + Time + Departure Time + +
    8column_break_4 + Column Break + + +
    9driver + Link + Driver + + + + + + +Driver + + + +
    10driver_name + Data + Driver Name + + + 
    driver.full_name
    +
    11vehicle + Link + Vehicle + + + + + + +Vehicle + + + +
    12delivery_service_stops + Section Break + Delivery Stops + +
    13delivery_stops + Table + Delivery Stop + + + + + + +Delivery Stop + + + +
    14calculate_arrival_time + Button + Calculate Estimated Arrival Times + +
    15section_break_13 + Section Break + + +
    16delivery_notification + Link + Delivery Notification + + + + + + +Standard Reply + + + +
    17amended_from + Link + Amended From + + + + + + +Delivery Trip + + + +
    + + +
    +

    Controller

    +

    erpnext.stock.doctype.delivery_trip.delivery_trip

    + + + + + + + +

    Class DeliveryTrip

    + +

    Inherits from frappe.model.document.Document + +

    +
    +
    + +
    +
    + + + + + + +

    Public API +
    /api/method/erpnext.stock.doctype.delivery_trip.delivery_trip.calculate_time_matrix +

    +

    + + + erpnext.stock.doctype.delivery_trip.delivery_trip.calculate_time_matrix + (name) +

    +

    Calucation and round in closest 15 minutes, delivery stops

    +
    +
    + + + + + + +

    Public API +
    /api/method/erpnext.stock.doctype.delivery_trip.delivery_trip.get_contact_and_address +

    +

    + + + erpnext.stock.doctype.delivery_trip.delivery_trip.get_contact_and_address + (name) +

    +

    No docs

    +
    +
    + + + + + + +

    Public API +
    /api/method/erpnext.stock.doctype.delivery_trip.delivery_trip.get_contact_display +

    +

    + + + erpnext.stock.doctype.delivery_trip.delivery_trip.get_contact_display + (contact) +

    +

    No docs

    +
    +
    + + + + + + + +

    + + + erpnext.stock.doctype.delivery_trip.delivery_trip.get_default_address + (out, name) +

    +

    No docs

    +
    +
    + + + + + + + +

    + + + erpnext.stock.doctype.delivery_trip.delivery_trip.get_default_contact + (out, name) +

    +

    No docs

    +
    +
    + + + + + + +

    Public API +
    /api/method/erpnext.stock.doctype.delivery_trip.delivery_trip.get_delivery_notes +

    +

    + + + erpnext.stock.doctype.delivery_trip.delivery_trip.get_delivery_notes + (customer) +

    +

    No docs

    +
    +
    + + + + + + +

    Public API +
    /api/method/erpnext.stock.doctype.delivery_trip.delivery_trip.notify_customers +

    +

    + + + erpnext.stock.doctype.delivery_trip.delivery_trip.notify_customers + (docname, date, driver, vehicle, sender_email, delivery_notification) +

    +

    No docs

    +
    +
    + + + + + + +

    Linked In:

    + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/stock/index.html b/foundation/www/docs/current/models/stock/index.html index f83c8710..cb841c22 100644 --- a/foundation/www/docs/current/models/stock/index.html +++ b/foundation/www/docs/current/models/stock/index.html @@ -7,7 +7,7 @@
    - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 8 + is_item_from_hub + + Check + + Is Item from Hub + + + + + + + 9 stock_uom Link @@ -169,7 +181,7 @@ A Product or a Service that is bought, sold or kept in stock. - 9 + 10 column_break0 Column Break @@ -181,7 +193,7 @@ A Product or a Service that is bought, sold or kept in stock. - 10 + 11 disabled Check @@ -193,8 +205,8 @@ A Product or a Service that is bought, sold or kept in stock. - 11 - is_stock_item + 12 + is_stock_item Check @@ -205,7 +217,7 @@ A Product or a Service that is bought, sold or kept in stock. - 12 + 13 opening_stock Float @@ -217,7 +229,7 @@ A Product or a Service that is bought, sold or kept in stock. - 13 + 14 valuation_rate Currency @@ -229,7 +241,7 @@ A Product or a Service that is bought, sold or kept in stock. - 14 + 15 standard_rate Currency @@ -241,7 +253,7 @@ A Product or a Service that is bought, sold or kept in stock. - 15 + 16 is_fixed_asset Check @@ -253,7 +265,7 @@ A Product or a Service that is bought, sold or kept in stock. - 16 + 17 asset_category Link @@ -266,7 +278,7 @@ A Product or a Service that is bought, sold or kept in stock. -Asset Category +Asset Category @@ -274,7 +286,7 @@ A Product or a Service that is bought, sold or kept in stock. - 17 + 18 tolerance Float @@ -286,7 +298,7 @@ A Product or a Service that is bought, sold or kept in stock. - 18 + 19 image Attach Image @@ -300,7 +312,7 @@ A Product or a Service that is bought, sold or kept in stock. - 19 + 20 section_break_11 Section Break @@ -312,7 +324,7 @@ A Product or a Service that is bought, sold or kept in stock. - 20 + 21 brand Link @@ -333,7 +345,7 @@ A Product or a Service that is bought, sold or kept in stock. - 21 + 22 description Text Editor @@ -345,7 +357,7 @@ A Product or a Service that is bought, sold or kept in stock. - 22 + 23 inventory Section Break @@ -359,7 +371,7 @@ A Product or a Service that is bought, sold or kept in stock. - 23 + 24 default_warehouse Link @@ -380,7 +392,7 @@ A Product or a Service that is bought, sold or kept in stock. - 24 + 25 end_of_life Date @@ -392,7 +404,7 @@ A Product or a Service that is bought, sold or kept in stock. - 25 + 26 default_material_request_type Select @@ -409,7 +421,7 @@ Manufacture - 26 + 27 column_break1 Column Break @@ -421,7 +433,7 @@ Manufacture - 27 + 28 valuation_method Select @@ -437,7 +449,7 @@ Moving Average - 28 + 29 warranty_period Data @@ -449,19 +461,19 @@ Moving Average - 29 - net_weight + 30 + weight_per_unit Float - Net Weight + Weight Per Unit - 30 + 31 weight_uom Link @@ -482,7 +494,7 @@ Moving Average - 31 + 32 reorder_section Section Break @@ -496,7 +508,7 @@ Moving Average - 32 + 33 reorder_levels Table @@ -518,7 +530,7 @@ Moving Average - 33 + 34 unit_of_measure_conversion Section Break @@ -530,7 +542,7 @@ Moving Average - 34 + 35 uoms Table @@ -552,7 +564,7 @@ Moving Average - 35 + 36 serial_nos_and_batches Section Break @@ -564,7 +576,7 @@ Moving Average - 36 + 37 has_batch_no Check @@ -576,7 +588,7 @@ Moving Average - 37 + 38 create_new_batch Check @@ -588,7 +600,44 @@ Moving Average - 38 + 39 + has_expiry_date + + Check + + Has Expiry Date + + + + + + + 40 + retain_sample + + Check + + Retain Sample + + + + + + + 41 + sample_quantity + + Int + + Max Sample Quantity +

    + Maximum sample quantity that can be retained

    + + + + + + 42 column_break_37 Column Break @@ -600,7 +649,7 @@ Moving Average - 39 + 43 has_serial_no Check @@ -612,7 +661,7 @@ Moving Average - 40 + 44 serial_no_series Data @@ -626,7 +675,7 @@ If series is set and Serial No is not mentioned in transactions, then automatic - 41 + 45 variants_section Section Break @@ -638,7 +687,7 @@ If series is set and Serial No is not mentioned in transactions, then automatic - 42 + 46 has_variants Check @@ -651,7 +700,7 @@ If series is set and Serial No is not mentioned in transactions, then automatic - 43 + 47 variant_based_on Select @@ -666,7 +715,7 @@ Manufacturer - 44 + 48 attributes Table @@ -687,7 +736,7 @@ Manufacturer - 45 + 49 purchase_details Section Break @@ -701,7 +750,7 @@ Manufacturer - 46 + 50 is_purchase_item Check @@ -713,7 +762,28 @@ Manufacturer - 47 + 51 + purchase_uom + + Link + + Default Purchase Unit of Measure + + + + + + + +UOM + + + + + + + + 52 min_order_qty Float @@ -725,7 +795,7 @@ Manufacturer - 48 + 53 safety_stock Float @@ -737,7 +807,19 @@ Manufacturer - 49 + 54 + purchase_details_cb + + Column Break + + + + + + + + + 55 lead_time_days Int @@ -750,7 +832,7 @@ Manufacturer - 50 + 56 buying_cost_center Link @@ -771,7 +853,7 @@ Manufacturer - 51 + 57 expense_account Link @@ -792,7 +874,7 @@ Manufacturer - 52 + 58 last_purchase_rate Float @@ -804,7 +886,7 @@ Manufacturer - 53 + 59 supplier_details Section Break @@ -816,7 +898,7 @@ Manufacturer - 54 + 60 default_supplier Link @@ -837,7 +919,7 @@ Manufacturer - 55 + 61 delivered_by_supplier Check @@ -849,7 +931,7 @@ Manufacturer - 56 + 62 manufacturer Link @@ -870,7 +952,7 @@ Manufacturer - 57 + 63 manufacturer_part_no Data @@ -882,7 +964,7 @@ Manufacturer - 58 + 64 column_break2 Column Break @@ -894,7 +976,7 @@ Manufacturer - 59 + 65 supplier_items Table @@ -915,7 +997,7 @@ Manufacturer - 60 + 66 foreign_trade_details Section Break @@ -927,7 +1009,7 @@ Manufacturer - 61 + 67 country_of_origin Link @@ -948,7 +1030,7 @@ Manufacturer - 62 + 68 column_break_59 Column Break @@ -960,7 +1042,7 @@ Manufacturer - 63 + 69 customs_tariff_number Link @@ -981,7 +1063,7 @@ Manufacturer - 64 + 70 sales_details Section Break @@ -995,7 +1077,7 @@ Manufacturer - 65 + 71 is_sales_item Check @@ -1007,32 +1089,28 @@ Manufacturer - 66 - publish_in_hub + 72 + sales_uom - Check - - Publish in Hub -

    - Publish Item to hub.erpnext.com

    - - - - - - 67 - synced_with_hub + Link - Check - - Synced With Hub + Default Sales Unit of Measure + + + + + + + +UOM + + - - 68 + 73 income_account Link @@ -1053,7 +1131,7 @@ Manufacturer - 69 + 74 selling_cost_center Link @@ -1074,7 +1152,7 @@ Manufacturer - 70 + 75 column_break3 Column Break @@ -1086,7 +1164,7 @@ Manufacturer - 71 + 76 customer_items Table @@ -1107,7 +1185,7 @@ Manufacturer - 72 + 77 max_discount Float @@ -1119,7 +1197,7 @@ Manufacturer - 73 + 78 item_tax_section_break Section Break @@ -1133,7 +1211,7 @@ Manufacturer - 74 + 79 taxes Table @@ -1155,7 +1233,7 @@ Manufacturer - 75 + 80 inspection_criteria Section Break @@ -1169,7 +1247,7 @@ Manufacturer - 76 + 81 inspection_required_before_purchase Check @@ -1181,7 +1259,7 @@ Manufacturer - 77 + 82 inspection_required_before_delivery Check @@ -1193,7 +1271,7 @@ Manufacturer - 78 + 83 quality_parameters Table @@ -1215,7 +1293,7 @@ Manufacturer - 79 + 84 manufacturing Section Break @@ -1229,7 +1307,7 @@ Manufacturer - 80 + 85 default_bom Link @@ -1250,7 +1328,7 @@ Manufacturer - 81 + 86 is_sub_contracted_item Check @@ -1263,7 +1341,7 @@ Manufacturer - 82 + 87 column_break_74 Column Break @@ -1275,7 +1353,7 @@ Manufacturer - 83 + 88 customer_code Data @@ -1287,7 +1365,7 @@ Manufacturer - 84 + 89 website_section Section Break @@ -1301,7 +1379,7 @@ Manufacturer - 85 + 90 show_in_website Check @@ -1313,7 +1391,7 @@ Manufacturer - 86 + 91 show_variant_in_website Check @@ -1325,7 +1403,7 @@ Manufacturer - 87 + 92 route Small Text @@ -1337,7 +1415,7 @@ Manufacturer - 88 + 93 weightage Int @@ -1350,7 +1428,7 @@ Manufacturer - 89 + 94 slideshow Link @@ -1372,7 +1450,7 @@ Manufacturer - 90 + 95 website_image Attach @@ -1385,7 +1463,7 @@ Manufacturer - 91 + 96 thumbnail Data @@ -1397,7 +1475,7 @@ Manufacturer - 92 + 97 cb72 Column Break @@ -1409,7 +1487,7 @@ Manufacturer - 93 + 98 website_warehouse Link @@ -1431,7 +1509,7 @@ Manufacturer - 94 + 99 website_item_groups Table @@ -1453,7 +1531,7 @@ Manufacturer - 95 + 100 sb72 Section Break @@ -1465,7 +1543,7 @@ Manufacturer - 96 + 101 copy_from_item_group Button @@ -1477,7 +1555,7 @@ Manufacturer - 97 + 102 website_specifications Table @@ -1498,7 +1576,7 @@ Manufacturer - 98 + 103 web_long_description Text Editor @@ -1510,7 +1588,7 @@ Manufacturer - 99 + 104 total_projected_qty Float @@ -1521,6 +1599,86 @@ Manufacturer + + 105 + hub_publishing_sb + + Section Break + + Hub Publishing Details + + + + + + + 106 + publish_in_hub + + Check + + Publish in Hub +

    + Publish Item to hub.erpnext.com

    + + + + + + 107 + hub_category_to_publish + + Link + + Hub Category to Publish + + + + + + + +Hub Category + + + + + + + + 108 + hub_warehouse + + Link + + Hub Warehouse +

    + Publish "In Stock" or "Not in Stock" on Hub based on stock available in this warehouse.

    + + + + + + +Warehouse + + + + + + + + 109 + synced_with_hub + + Check + + Synced With Hub + + + + + @@ -1659,20 +1817,6 @@ Manufacturer -

    - - - cant_change - (self) -

    -

    No docs

    -
    -
    - - - - -

    @@ -1687,34 +1831,6 @@ Manufacturer -

    - - - check_if_linked_document_exists - (self, key) -

    -

    No docs

    -
    -
    - - - - - -

    - - - check_if_sle_exists - (self) -

    -

    No docs

    -
    -
    - - - - -

    @@ -1926,9 +2042,23 @@ Manufacturer

    - + - update_item_desc + stock_ledger_created + (self) +

    +

    No docs

    +
    +
    + + + + + +

    + + + update_bom_item_desc (self)

    No docs

    @@ -2051,6 +2181,20 @@ Manufacturer +

    + + + validate_description + (self) +

    +

    Clean HTML description if set

    +
    +
    + + + + +

    @@ -2107,6 +2251,34 @@ Manufacturer +

    + + + validate_retain_sample + (self) +

    +

    No docs

    +
    +
    + + + + + +

    + + + validate_stock_exists_for_template_item + (self) +

    +

    No docs

    +
    +
    + + + + +

    @@ -2141,7 +2313,7 @@ Manufacturer validate_warehouse_for_reorder (self)

    -

    No docs

    +

    Validate Reorder level table for duplicate and conditional mandatory


    @@ -2167,6 +2339,21 @@ Manufacturer +

    Class StockExistsForTemplate

    + +

    Inherits from frappe.exceptions.ValidationError + +

    +
    +
    + +
    +
    + + + + +

    @@ -2303,7 +2490,7 @@ Manufacturer

  • -Asset +Asset
    • @@ -2390,6 +2577,15 @@ Manufacturer +
  • + + +Fertilizer + +
    • + + +
  • @@ -2624,6 +2820,33 @@ Manufacturer +
  • + + +Restaurant Menu Item + +
    • + + + +
  • + + +Restaurant Order Entry + +
    • + + + +
  • + + +Restaurant Order Entry Item + +
    • + + +
  • diff --git a/foundation/www/docs/current/models/stock/item_attribute.html b/foundation/www/docs/current/models/stock/item_attribute.html index 848a7f82..5450b52c 100644 --- a/foundation/www/docs/current/models/stock/item_attribute.html +++ b/foundation/www/docs/current/models/stock/item_attribute.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 1 + section_break_3 + + Section Break + + + + + + + + + 2 + do_not_update_variants + + Check + + Do not update variants on save +

    + Fields will be copied over only at time of creation.

    + + + + + + 3 copy_fields_to_variant Section Break @@ -51,7 +76,7 @@ - 2 + 4 fields Table diff --git a/foundation/www/docs/current/models/stock/item_website_specification.html b/foundation/www/docs/current/models/stock/item_website_specification.html index 80ec2dbb..a5af10dc 100644 --- a/foundation/www/docs/current/models/stock/item_website_specification.html +++ b/foundation/www/docs/current/models/stock/item_website_specification.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 1 description - Text Editor + Small Text Description diff --git a/foundation/www/docs/current/models/stock/landed_cost_voucher.html b/foundation/www/docs/current/models/stock/landed_cost_voucher.html index d03d50f4..ace06ff8 100644 --- a/foundation/www/docs/current/models/stock/landed_cost_voucher.html +++ b/foundation/www/docs/current/models/stock/landed_cost_voucher.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 2 + naming_series + + Select + + Series + + + + 
    MREQ-
    + + + + + 3 title Data @@ -67,7 +81,7 @@ - 3 + 4 material_request_type Select @@ -84,7 +98,7 @@ Manufacture - 4 + 5 column_break_2 Column Break @@ -95,39 +109,16 @@ Manufacture - - 5 - naming_series - - Select - - Series - - - - 
    MREQ-
    - - - 6 - amended_from + schedule_date - Link + Date - Amended From - - - - - - - -    Material Request - - + Required Date + @@ -151,8 +142,29 @@ Manufacture - + 8 + amended_from + + Link + + Amended From + + + + + + + +Material Request + + + + + + + + 9 items_section Section Break @@ -166,7 +178,7 @@ Manufacture - 9 + 10 items Table @@ -187,7 +199,7 @@ Manufacture - 10 + 11 more_info Section Break @@ -201,7 +213,7 @@ Manufacture - 11 + 12 requested_by Data @@ -213,7 +225,7 @@ Manufacture - 12 + 13 transaction_date Date @@ -225,7 +237,7 @@ Manufacture - 13 + 14 column_break2 Column Break @@ -237,7 +249,7 @@ Manufacture - 14 + 15 status Select @@ -260,7 +272,7 @@ Transferred - 15 + 16 per_ordered Percent @@ -272,7 +284,7 @@ Transferred - 16 + 17 printing_details Section Break @@ -284,7 +296,7 @@ Transferred - 17 + 18 letter_head Link @@ -305,7 +317,7 @@ Transferred - 18 + 19 select_print_heading Link @@ -326,7 +338,7 @@ Transferred - 19 + 20 terms_section_break Section Break @@ -340,7 +352,7 @@ Transferred - 20 + 21 tc_name Link @@ -361,7 +373,7 @@ Transferred - 21 + 22 terms Text Editor @@ -606,20 +618,6 @@ Transferred
    - - - -

    - - - validate_schedule_date - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/stock/material_request_item.html b/foundation/www/docs/current/models/stock/material_request_item.html index 5fa0e9bb..fec67e0d 100644 --- a/foundation/www/docs/current/models/stock/material_request_item.html +++ b/foundation/www/docs/current/models/stock/material_request_item.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 10 - uom + stock_uom Link @@ -201,6 +201,18 @@ 12 + schedule_date + + Date + + Required Date + + + + + + + 13 col_break2 Column Break @@ -212,19 +224,52 @@ - 13 - schedule_date + 14 + uom - Date + Link - Required Date + UOM + + + + + + + +UOM + + + + + + + + 15 + conversion_factor + + Float + + UOM Conversion Factor + + + + + + + 16 + stock_qty + + Float + + Stock Qty - 14 + 17 more_info Section Break @@ -236,7 +281,7 @@ - 15 + 18 item_group Link @@ -257,7 +302,7 @@ - 16 + 19 brand Link @@ -278,7 +323,7 @@ - 17 + 20 lead_time_date Date @@ -290,7 +335,7 @@ - 18 + 21 sales_order Link @@ -311,7 +356,7 @@ - 19 + 22 project Link @@ -332,7 +377,7 @@ - 20 + 23 col_break3 Column Break @@ -344,7 +389,7 @@ - 21 + 24 min_order_qty Float @@ -356,7 +401,7 @@ - 22 + 25 projected_qty Float @@ -368,7 +413,7 @@ - 23 + 26 actual_qty Float @@ -380,7 +425,7 @@ - 24 + 27 ordered_qty Float @@ -392,7 +437,7 @@ - 25 + 28 page_break Check diff --git a/foundation/www/docs/current/models/stock/packed_item.html b/foundation/www/docs/current/models/stock/packed_item.html index e795321e..4ee427d9 100644 --- a/foundation/www/docs/current/models/stock/packed_item.html +++ b/foundation/www/docs/current/models/stock/packed_item.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 7 + price_not_uom_dependant + + Check + + Price Not UOM Dependant + + + + + + + 8 column_break_3 Column Break @@ -134,7 +146,7 @@ Price List Master - 8 + 9 countries Table @@ -303,6 +315,15 @@ Price List Master +
  • + + +Hub Settings + +
    • + + +
  • @@ -366,6 +387,15 @@ Price List Master +
  • + + +Restaurant Menu + +
    • + + +
  • diff --git a/foundation/www/docs/current/models/stock/price_list_country.html b/foundation/www/docs/current/models/stock/price_list_country.html index d31d1e13..ea6d59bb 100644 --- a/foundation/www/docs/current/models/stock/price_list_country.html +++ b/foundation/www/docs/current/models/stock/price_list_country.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 Supplier Name - + + 
    supplier.supplier_name
    + @@ -643,9 +645,21 @@ PREC-RET- - + 42 - taxes_section + total_net_weight + + Float + + Total Net Weight + + + + + + + 43 + taxes_charges_section Section Break @@ -659,7 +673,7 @@ PREC-RET- - 43 + 44 taxes_and_charges Link @@ -680,7 +694,52 @@ PREC-RET- - 44 + 45 + shipping_col + + Column Break + + + + + + + + + 46 + shipping_rule + + Link + + Shipping Rule + + + + + + + +    Shipping Rule + + + + + + + + 47 + taxes_section + + Section Break + + + + + + + + + 48 taxes Table @@ -701,7 +760,7 @@ PREC-RET- - 45 + 49 sec_tax_breakup Section Break @@ -713,7 +772,7 @@ PREC-RET- - 46 + 50 other_charges_calculation Text @@ -725,7 +784,7 @@ PREC-RET- - 47 + 51 totals Section Break @@ -739,7 +798,7 @@ PREC-RET- - 48 + 52 base_taxes_and_charges_added Currency @@ -753,7 +812,7 @@ PREC-RET- - 49 + 53 base_taxes_and_charges_deducted Currency @@ -767,7 +826,7 @@ PREC-RET- - 50 + 54 base_total_taxes_and_charges Currency @@ -781,7 +840,7 @@ PREC-RET- - 51 + 55 column_break3 Column Break @@ -793,7 +852,7 @@ PREC-RET- - 52 + 56 taxes_and_charges_added Currency @@ -807,7 +866,7 @@ PREC-RET- - 53 + 57 taxes_and_charges_deducted Currency @@ -821,7 +880,7 @@ PREC-RET- - 54 + 58 total_taxes_and_charges Currency @@ -835,7 +894,7 @@ PREC-RET- - 55 + 59 section_break_42 Section Break @@ -847,7 +906,7 @@ PREC-RET- - 56 + 60 apply_discount_on Select @@ -863,7 +922,7 @@ Net Total - 57 + 61 base_discount_amount Currency @@ -877,7 +936,7 @@ Net Total - 58 + 62 column_break_44 Column Break @@ -889,7 +948,7 @@ Net Total - 59 + 63 additional_discount_percentage Float @@ -901,7 +960,7 @@ Net Total - 60 + 64 discount_amount Currency @@ -915,7 +974,7 @@ Net Total - 61 + 65 section_break_46 Section Break @@ -927,7 +986,7 @@ Net Total - 62 + 66 base_grand_total Currency @@ -941,7 +1000,7 @@ Net Total - 63 + 67 base_rounding_adjustment Currency @@ -955,7 +1014,7 @@ Net Total - 64 + 68 base_in_words Data @@ -967,7 +1026,7 @@ Net Total - 65 + 69 base_rounded_total Currency @@ -981,7 +1040,7 @@ Net Total - 66 + 70 column_break_50 Column Break @@ -993,7 +1052,7 @@ Net Total - 67 + 71 grand_total Currency @@ -1007,7 +1066,7 @@ Net Total - 68 + 72 rounding_adjustment Currency @@ -1021,7 +1080,7 @@ Net Total - 69 + 73 in_words Data @@ -1033,7 +1092,7 @@ Net Total - 70 + 74 terms_section_break Section Break @@ -1047,7 +1106,7 @@ Net Total - 71 + 75 tc_name Link @@ -1068,7 +1127,7 @@ Net Total - 72 + 76 terms Text Editor @@ -1080,7 +1139,7 @@ Net Total - 73 + 77 raw_material_details Section Break @@ -1094,7 +1153,7 @@ Net Total - 74 + 78 is_subcontracted Select @@ -1109,7 +1168,7 @@ Yes - 75 + 79 supplier_warehouse Link @@ -1130,7 +1189,7 @@ Yes - 76 + 80 supplied_items Table @@ -1151,7 +1210,7 @@ Yes - 77 + 81 bill_no Data @@ -1163,7 +1222,7 @@ Yes - 78 + 82 bill_date Date @@ -1175,7 +1234,7 @@ Yes - 79 + 83 more_info Section Break @@ -1189,7 +1248,7 @@ Yes - 80 + 84 status Select @@ -1208,7 +1267,7 @@ Closed - 81 + 85 rejected_warehouse Link @@ -1230,7 +1289,7 @@ Closed - 82 + 86 amended_from Link @@ -1251,7 +1310,7 @@ Closed - 83 + 87 range Data @@ -1263,7 +1322,7 @@ Closed - 84 + 88 column_break4 Column Break @@ -1275,7 +1334,7 @@ Closed - 85 + 89 per_billed Percent @@ -1287,7 +1346,7 @@ Closed - 86 + 90 subscription_detail Section Break @@ -1299,7 +1358,7 @@ Closed - 87 + 91 subscription Link @@ -1320,7 +1379,7 @@ Closed - 88 + 92 printing_settings Section Break @@ -1332,7 +1391,7 @@ Closed - 89 + 93 letter_head Link @@ -1353,7 +1412,7 @@ Closed - 90 + 94 select_print_heading Link @@ -1374,7 +1433,7 @@ Closed - 91 + 95 language Data @@ -1386,7 +1445,7 @@ Closed - 92 + 96 other_details HTML @@ -1398,7 +1457,7 @@ Closed - 93 + 97 instructions Small Text @@ -1410,7 +1469,7 @@ Closed - 94 + 98 remarks Small Text @@ -1422,7 +1481,7 @@ Closed - 95 + 99 transporter_info Section Break @@ -1436,7 +1495,7 @@ Closed - 96 + 100 transporter_name Data @@ -1448,7 +1507,7 @@ Closed - 97 + 101 column_break5 Column Break @@ -1460,7 +1519,7 @@ Closed - 98 + 102 lr_no Data @@ -1472,7 +1531,7 @@ Closed - 99 + 103 lr_date Date @@ -1512,7 +1571,7 @@ Closed __init__ - (self, arg1, arg2=None) + (self)

    No docs

    diff --git a/foundation/www/docs/current/models/stock/purchase_receipt_item.html b/foundation/www/docs/current/models/stock/purchase_receipt_item.html index edf046b9..4e4b4294 100644 --- a/foundation/www/docs/current/models/stock/purchase_receipt_item.html +++ b/foundation/www/docs/current/models/stock/purchase_receipt_item.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 - + 20 + retain_sample + + Check + + Retain Sample + + + + 
    item_code.retain_sample
    + + + + + 21 + sample_quantity + + Int + + Sample Quantity + + + + 
    item_code.sample_quantity
    + + + + + 22 rate_and_amount Section Break @@ -310,7 +338,7 @@ - 21 + 23 price_list_rate Currency @@ -324,7 +352,7 @@ - 22 + 24 discount_percentage Percent @@ -336,7 +364,7 @@ - 23 + 25 col_break3 Column Break @@ -348,7 +376,7 @@ - 24 + 26 base_price_list_rate Currency @@ -362,7 +390,7 @@ - 25 + 27 sec_break1 Section Break @@ -374,7 +402,7 @@ - 26 + 28 rate Currency @@ -388,7 +416,7 @@ - 27 + 29 amount Currency @@ -402,7 +430,7 @@ - 28 + 30 col_break4 Column Break @@ -414,7 +442,7 @@ - 29 + 31 base_rate Currency @@ -428,7 +456,7 @@ - 30 + 32 base_amount Currency @@ -442,7 +470,7 @@ - 31 + 33 pricing_rule Link @@ -463,7 +491,7 @@ - 32 + 34 section_break_29 Section Break @@ -475,7 +503,7 @@ - 33 + 35 net_rate Currency @@ -489,7 +517,7 @@ - 34 + 36 net_amount Currency @@ -503,7 +531,7 @@ - 35 + 37 column_break_32 Column Break @@ -515,7 +543,7 @@ - 36 + 38 base_net_rate Currency @@ -529,7 +557,7 @@ - 37 + 39 base_net_amount Currency @@ -543,7 +571,76 @@ - 38 + 40 + item_weight_details + + Section Break + + Item Weight Details + + + + + + + 41 + weight_per_unit + + Float + + Weight Per Unit + + + + + + + 42 + total_weight + + Float + + Total Weight + + + + + + + 43 + column_break_41 + + Column Break + + + + + + + + + 44 + weight_uom + + Link + + Weight UOM + + + + + + + +    UOM + + + + + + + + 45 warehouse_and_reference Section Break @@ -555,7 +652,7 @@ - 39 + 46 warehouse Link @@ -576,7 +673,7 @@ - 40 + 47 rejected_warehouse Link @@ -597,7 +694,7 @@ - 41 + 48 quality_inspection Link @@ -618,7 +715,7 @@ - 42 + 49 column_break_40 Column Break @@ -630,7 +727,7 @@ - 43 + 50 purchase_order Link @@ -651,7 +748,7 @@ - 44 + 51 schedule_date Date @@ -663,7 +760,7 @@ - 45 + 52 stock_qty Float @@ -675,7 +772,7 @@ - 46 + 53 section_break_45 Section Break @@ -687,7 +784,7 @@ - 47 + 54 serial_no Small Text @@ -699,7 +796,7 @@ - 48 + 55 batch_no Link @@ -720,7 +817,7 @@ - 49 + 56 column_break_48 Column Break @@ -732,7 +829,7 @@ - 50 + 57 rejected_serial_no Small Text @@ -744,7 +841,7 @@ - 51 + 58 section_break_50 Section Break @@ -756,7 +853,7 @@ - 52 + 59 project Link @@ -777,7 +874,7 @@ - 53 + 60 cost_center Link @@ -798,7 +895,7 @@ - 54 + 61 purchase_order_item Data @@ -810,7 +907,7 @@ - 55 + 62 col_break5 Column Break @@ -822,7 +919,7 @@ - 56 + 63 allow_zero_valuation_rate Check @@ -834,7 +931,7 @@ - 57 + 64 bom Link @@ -855,7 +952,7 @@ - 58 + 65 billed_amt Currency @@ -867,7 +964,7 @@ - 59 + 66 landed_cost_voucher_amount Currency @@ -879,7 +976,7 @@ - 60 + 67 brand Link @@ -900,7 +997,7 @@ - 61 + 68 item_group Link @@ -921,7 +1018,7 @@ - 62 + 69 rm_supp_cost Currency @@ -935,7 +1032,7 @@ - 63 + 70 item_tax_amount Currency @@ -949,7 +1046,7 @@ - 64 + 71 valuation_rate Currency @@ -963,7 +1060,7 @@ - 65 + 72 item_tax_rate Code @@ -977,7 +1074,7 @@ Used for Taxes and Charges

    - 66 + 73 page_break Check diff --git a/foundation/www/docs/current/models/stock/quality_inspection.html b/foundation/www/docs/current/models/stock/quality_inspection.html index 55545e94..0272d36d 100644 --- a/foundation/www/docs/current/models/stock/quality_inspection.html +++ b/foundation/www/docs/current/models/stock/quality_inspection.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 __init__ - (self, arg1, arg2=None) + (self)

    No docs

    diff --git a/foundation/www/docs/current/models/stock/stock_entry.html b/foundation/www/docs/current/models/stock/stock_entry.html index 6fc06551..be00ca71 100644 --- a/foundation/www/docs/current/models/stock/stock_entry.html +++ b/foundation/www/docs/current/models/stock/stock_entry.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 +

    Class MaxSampleAlreadyRetainedError

    + +

    Inherits from frappe.exceptions.ValidationError + +

    +
    +
    + +
    +
    + + + + +

    Class OperationsNotCompleteError

    Inherits from frappe.exceptions.ValidationError @@ -1037,6 +1052,20 @@ Subcontract +

    + + + get_args_for_incoming_rate + (self, item) +

    +

    No docs

    +
    +
    + + + + +

    @@ -1277,6 +1306,20 @@ Subcontract +

    + + + set_incoming_rate + (self) +

    +

    No docs

    +
    +
    + + + + +

    @@ -1624,6 +1667,42 @@ Subcontract + + + +

    Public API +
    /api/method/erpnext.stock.doctype.stock_entry.stock_entry.move_sample_to_retention_warehouse +

    +

    + + + erpnext.stock.doctype.stock_entry.stock_entry.move_sample_to_retention_warehouse + (company, items) +

    +

    No docs

    +
    +
    + + + + + + +

    Public API +
    /api/method/erpnext.stock.doctype.stock_entry.stock_entry.validate_sample_quantity +

    +

    + + + erpnext.stock.doctype.stock_entry.stock_entry.validate_sample_quantity + (item_code, sample_quantity, qty, batch_no=None) +

    +

    No docs

    +
    +
    + + + diff --git a/foundation/www/docs/current/models/stock/stock_entry_detail.html b/foundation/www/docs/current/models/stock/stock_entry_detail.html index 9c647569..9f976bef 100644 --- a/foundation/www/docs/current/models/stock/stock_entry_detail.html +++ b/foundation/www/docs/current/models/stock/stock_entry_detail.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 - + 27 + retain_sample + + Check + + Retain Sample + + + + 
    item_code.retain_sample
    + + + + + 28 + sample_quantity + + Int + + Sample Quantity + + + + + + + 29 serial_no_batch Section Break @@ -422,7 +448,7 @@ - 28 + 30 serial_no Small Text @@ -434,7 +460,7 @@ - 29 + 31 col_break4 Column Break @@ -446,7 +472,7 @@ - 30 + 32 batch_no Link @@ -467,7 +493,7 @@ - 31 + 33 accounting Section Break @@ -479,7 +505,7 @@ - 32 + 34 expense_account Link @@ -500,7 +526,7 @@ - 33 + 35 col_break5 Column Break @@ -512,7 +538,7 @@ - 34 + 36 cost_center Link @@ -533,7 +559,7 @@ - 35 + 37 more_info Section Break @@ -545,7 +571,7 @@ - 36 + 38 allow_zero_valuation_rate Check @@ -557,7 +583,7 @@ - 37 + 39 actual_qty Float @@ -569,7 +595,7 @@ - 38 + 40 bom_no Link @@ -591,7 +617,7 @@ - 39 + 41 col_break6 Column Break @@ -603,7 +629,7 @@ - 40 + 42 material_request Link @@ -625,7 +651,7 @@ - 41 + 43 material_request_item Link diff --git a/foundation/www/docs/current/models/stock/stock_ledger_entry.html b/foundation/www/docs/current/models/stock/stock_ledger_entry.html index 939b7f35..eeb1ee34 100644 --- a/foundation/www/docs/current/models/stock/stock_ledger_entry.html +++ b/foundation/www/docs/current/models/stock/stock_ledger_entry.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 __init__ - (self, arg1, arg2=None) + (self)

    No docs

    diff --git a/foundation/www/docs/current/models/stock/stock_reconciliation_item.html b/foundation/www/docs/current/models/stock/stock_reconciliation_item.html index 6b0288a9..9c73ecca 100644 --- a/foundation/www/docs/current/models/stock/stock_reconciliation_item.html +++ b/foundation/www/docs/current/models/stock/stock_reconciliation_item.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 5 + sample_retention_warehouse + + Link + + Sample Retention Warehouse + + + + + + + +Warehouse + + + + + + + + 6 column_break_4 Column Break @@ -129,7 +150,7 @@ Naming Series - 6 + 7 valuation_method Select @@ -144,7 +165,7 @@ Moving Average - 7 + 8 tolerance Float @@ -157,7 +178,7 @@ Moving Average - 8 + 9 show_barcode_field Check @@ -168,8 +189,20 @@ Moving Average + + 10 + clean_description_html + + Check + + Convert Item Description to Clean HTML + + + + + - 9 + 11 section_break_7 Section Break @@ -181,7 +214,7 @@ Moving Average - 10 + 12 auto_insert_price_list_rate_if_missing Check @@ -193,7 +226,7 @@ Moving Average - 11 + 13 allow_negative_stock Check @@ -205,7 +238,7 @@ Moving Average - 12 + 14 column_break_10 Column Break @@ -217,7 +250,7 @@ Moving Average - 13 + 15 automatically_set_serial_nos_based_on_fifo Check @@ -229,7 +262,7 @@ Moving Average - 14 + 16 auto_material_request Section Break @@ -241,7 +274,7 @@ Moving Average - 15 + 17 auto_indent Check @@ -253,7 +286,7 @@ Moving Average - 16 + 18 reorder_email_notify Check @@ -265,7 +298,7 @@ Moving Average - 17 + 19 freeze_stock_entries Section Break @@ -277,7 +310,7 @@ Moving Average - 18 + 20 stock_frozen_upto Date @@ -289,7 +322,7 @@ Moving Average - 19 + 21 stock_frozen_upto_days Int @@ -301,7 +334,7 @@ Moving Average - 20 + 22 stock_auth_role Link @@ -371,11 +404,41 @@ Moving Average
    + + + +

    + + + validate_clean_description_html + (self) +

    +

    No docs

    +
    +
    + +
    + + + + +

    + + + erpnext.stock.doctype.stock_settings.stock_settings.clean_all_descriptions + () +

    +

    No docs

    +
    +
    + + + diff --git a/foundation/www/docs/current/models/stock/uom_conversion_detail.html b/foundation/www/docs/current/models/stock/uom_conversion_detail.html index 38e4e71b..792c12d9 100644 --- a/foundation/www/docs/current/models/stock/uom_conversion_detail.html +++ b/foundation/www/docs/current/models/stock/uom_conversion_detail.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 erpnext.stock.doctype.warehouse.warehouse.get_children - () + (doctype, parent=None, company=None, is_root=False)

    No docs

    @@ -645,7 +645,7 @@ A logical Warehouse against which stock entries are made.
  • -Asset +Asset
    • @@ -654,7 +654,7 @@ A logical Warehouse against which stock entries are made.
  • -Asset Movement +Asset Movement
    • @@ -687,6 +687,15 @@ A logical Warehouse against which stock entries are made. +
  • + + +Crop + +
    • + + +
  • diff --git a/foundation/www/docs/current/models/subscription/index.html b/foundation/www/docs/current/models/subscription/index.html index c451f6ca..f8bbdbff 100644 --- a/foundation/www/docs/current/models/subscription/index.html +++ b/foundation/www/docs/current/models/subscription/index.html @@ -7,7 +7,7 @@
    - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 4 - mins_to_first_response + issue_type - Float + Link - Mins to First Response + Issue Type + + + + + + + +Issue Type + + - @@ -180,13 +189,13 @@ Closed - + 11 - column_break_9 - - Column Break + response - + Section Break + + Response @@ -194,11 +203,11 @@ Closed 12 - resolution_date + mins_to_first_response - Datetime + Float - Resolution Date + Mins to First Response @@ -222,7 +231,7 @@ Closed Section Break - Contact + Reference @@ -317,68 +326,8 @@ Closed - + 20 - section_break_19 - - Section Break - - Resolution - - - - - - - 21 - resolution_details - - Text Editor - - Resolution Details - - - - - - - 22 - column_break1 - - Column Break - - - - - - - - - 23 - opening_date - - Date - - Opening Date - - - - - - - 24 - opening_time - - Time - - Opening Time - - - - - - - 25 company Link @@ -398,8 +347,80 @@ Closed + + 21 + section_break_19 + + Section Break + + Resolution + + + + + + + 22 + resolution_details + + Small Text + + Resolution Details + + + + + + + 23 + column_break1 + + Column Break + + + + + + + + + 24 + opening_date + + Date + + Opening Date + + + + + + + 25 + opening_time + + Time + + Opening Time + + + + + 26 + resolution_date + + Datetime + + Resolution Date + + + + + + + 27 content_type Data @@ -411,7 +432,7 @@ Closed - 27 + 28 attachment Attach diff --git a/foundation/www/docs/current/models/support/issue_type.html b/foundation/www/docs/current/models/support/issue_type.html new file mode 100644 index 00000000..268eceb2 --- /dev/null +++ b/foundation/www/docs/current/models/support/issue_type.html @@ -0,0 +1,103 @@ + + + + + + + +

    Issue Type

    +
    + + + Version 10.0.2 + + + Source + +
    + + + + + +

    Table Name: tabIssue Type

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1description + Small Text + Description + +
    + + +
    +

    Controller

    +

    erpnext.support.doctype.issue_type.issue_type

    + + + + + + + +

    Class IssueType

    + +

    Inherits from frappe.model.document.Document + +

    +
    +
    + +
    +
    + + + + + + +

    Linked In:

    +
      + + +
    • + + +Issue + +
      • + + +
    + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/support/support_settings.html b/foundation/www/docs/current/models/support/support_settings.html index a806e59b..d5a579ff 100644 --- a/foundation/www/docs/current/models/support/support_settings.html +++ b/foundation/www/docs/current/models/support/support_settings.html @@ -9,7 +9,7 @@
    - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 - Version 8.11.4 + Version 10.0.2 -# Barcode -Beigetragen von CWT Connector & Wire Technology GmbH - -Ein Barcode ist ein maschinenlesbarer Code und besteht aus Nummern und Mustern von parallelen Linien mit unterschiedlicher Breite, die auf eine Ware aufgedruckt werden. Barcodes werden speziell zur Lagerverwaltung verwendet. - -Wenn Sie einen Artikel bei einem beliebigen Geschäft kaufen, dann werden Sie einen Aufkleber mit dünnen Linien erkennen, versehen mit einer Kombination von verschiedenen Zahlen. Dieser Aufkleber wird dann vom Kassierer eingescannt und die Beschreibung und der Preis werden automatisch übernommen. Diese Anordnung von Linien und Zahlen bezeichnet man als Barcode. - -Ein Barcode-Lesegerät liest die Nummer des Aufklebers eines Artikels ein. Um mit ERPNext Barcodes zu nutzen, verbinden Sie den Barcodeleser mit Ihrer Hardware. Gehen Sie dann zu den ERPNext-Einstellungen und aktivieren Sie "Barcode" indem Sie zu den Werkzeugen gehen und auf die Funktion "verbergen / anzeigen" klicken. Kreuzen Sie dann das Feld "Artikel-Barcode" an. - -> Einstellungen > Anpassen > Funktionen einstellen > Artikelbarcode - -### Abbildung 1: Markieren Sie das Feld "Artikelbarcode" - -Barcode - -Wenn Sie einen Barcode einlesen wollen, gehen Sie zu: - -> Rechnungswesen > Dokumente > Eingangsrechnung - -Klicken Sie unter dem Artikel auf "Neue Zeile einfügen". Die Artikelzeile erweitert sich um neue Felder anzuzeigen. Positionieren Sie Ihre Schreibmarke im Barcodefeld und beginnen Sie mit dem Einlesen. Der Barcode wird im entsprechenden Feld aktualisiert. Nachdem der Barcode eingelesen wurd, holt das System automatisch alle Artikeldetails aus dem System. - -Aktivieren Sie der Einfachheit halber die POS-Ansicht in ERPNext. Der Aktivierungsprozess ist der selbe wie bei der Barcodeaktivierung. Gehen Sie in die Einstellungen und klicken Sie auf "Funktionen einstellen". Aktivieren Sie dann das Feld "Ist POS". - -Gehen Sie dann zu "Rechnungswesen" und klicken Sie auf Ausgangsrechnung. Aktivieren Sie das Feld "Ist POS". - -### Abbildung 2: Aktivieren Sie das Feld "Ist POS" - -Barcode - -Gehen Sie zu "Artikel" und klicken Sie auf "Neue Zeile einfügen". - -Die Schreibmarke wird automatisch im Barcodefeld positioniert. So können Sie sofort den Barcode einlesen und mit Ihren Arbeiten fortfahren. - -{next} diff --git a/foundation/www/docs/user/manual/de/setting-up/index.txt b/foundation/www/docs/user/manual/de/setting-up/index.txt index a607ca23..fff1665e 100644 --- a/foundation/www/docs/user/manual/de/setting-up/index.txt +++ b/foundation/www/docs/user/manual/de/setting-up/index.txt @@ -13,7 +13,6 @@ stock-reconciliation-for-non-serialized-item territory third-party-backups workflows -bar-code company-setup setting-company-sales-goal calculate-incentive-for-sales-team diff --git a/foundation/www/docs/user/manual/en/CRM/index.md b/foundation/www/docs/user/manual/en/CRM/index.md index eebce5ef..817f4cb6 100644 --- a/foundation/www/docs/user/manual/en/CRM/index.md +++ b/foundation/www/docs/user/manual/en/CRM/index.md @@ -4,6 +4,6 @@ ERPNext helps you track business **Opportunities** from **Leads** and **Customers**, send them **Quotations** and make confirmed **Sales Orders**. -The CRM Module helps maintain Leads, Opportunities and Customers. +The CRM Module helps maintain Leads, Oppurtunities and Customers. {index} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/CRM/lead.md b/foundation/www/docs/user/manual/en/CRM/lead.md index eb6965d7..47bf792f 100644 --- a/foundation/www/docs/user/manual/en/CRM/lead.md +++ b/foundation/www/docs/user/manual/en/CRM/lead.md @@ -44,6 +44,9 @@ A Lead is a potential Customer, someone who can give you business. A Customer is organization or individual who has given you business before (and has an Account in your system). A Contact is a person who belongs to the Customer. +A Lead can sometimes be an organization you are trying to make a deal with. In this case you can select "Lead is an Organization" and add as many contacts within this organization as you want. +It is useful if you are establishing a relationship with several people within the same organization. + A Lead can be converted to a Customer by selecting “Customer” from the **Make** dropdown. Once the Customer is created, the Lead becomes “Converted” and any further Opportunities from the same source can be created against this diff --git a/foundation/www/docs/user/manual/en/CRM/newsletter.md b/foundation/www/docs/user/manual/en/CRM/newsletter.md index 558bca55..f953a7da 100644 --- a/foundation/www/docs/user/manual/en/CRM/newsletter.md +++ b/foundation/www/docs/user/manual/en/CRM/newsletter.md @@ -11,9 +11,9 @@ very simple and easy. Select the list that you want to send the email to. Fill in your content in the message box, and send your newsletter.If you wish to test your email, to -see how it looks to the recipient, you can use the test function. Save the +see how it looks to the recepient, you can use the test function. Save the document before testing. A test email will be sent to your Email Address. You can -send the email to all the intended recipients by clicking on the send button. +send the email to all the intended receipients by clicking on the send button. Newsletter - New diff --git a/foundation/www/docs/user/manual/en/accounts/articles/changing-parent-account.md b/foundation/www/docs/user/manual/en/accounts/articles/changing-parent-account.md index 6235c0d6..82af8df9 100644 --- a/foundation/www/docs/user/manual/en/accounts/articles/changing-parent-account.md +++ b/foundation/www/docs/user/manual/en/accounts/articles/changing-parent-account.md @@ -3,7 +3,7 @@ Chart of Account has hierarchical structure. Each account has a parent it is listed under. -There are some accounts which are auto-created. For example, Account for Warehouse is auto-created when new Warehouse is added in the system. These accounts are added under pre-defined account ledger. Warehouse Account is always added under Stock Assets, under Current Assets. +There are some accounts which are auto-created. For example, Account for Warehouse is auto-created when new Wareouse is added in the system. These accounts are added under pre-defined account ledger. Warehouse Account is always added under Stock Assets, under Current Assets. If you wish to place specific Account into another parent Account, you can achieve the same as below. diff --git a/foundation/www/docs/user/manual/en/accounts/articles/difference-entry-button.md b/foundation/www/docs/user/manual/en/accounts/articles/difference-entry-button.md index f0bbd0e5..f290c8b2 100644 --- a/foundation/www/docs/user/manual/en/accounts/articles/difference-entry-button.md +++ b/foundation/www/docs/user/manual/en/accounts/articles/difference-entry-button.md @@ -11,6 +11,6 @@ On clicking 'Make Difference Entry' button, new Row will be added under Journal Debit Credit Not Equal -On selecting account under new row, debit and credit an entry will be tallying, and you should be able to submit Journal Entry correctly. +On selecting account under new row, debit and credit an entry will be tallying, and you should be able to submit Journal Entri correctly. \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/accounts/articles/fiscal-year-creation.md b/foundation/www/docs/user/manual/en/accounts/articles/fiscal-year-creation.md index e12aded0..7c3eb9da 100644 --- a/foundation/www/docs/user/manual/en/accounts/articles/fiscal-year-creation.md +++ b/foundation/www/docs/user/manual/en/accounts/articles/fiscal-year-creation.md @@ -1,6 +1,6 @@ # Fiscal Year Creation -New Fiscal Year should be created each year, at the end of the current fiscal year. Creation of new Fiscal Year before its beginning has been automated in ERPNext. +New Fiscal Year should be created each year, at the end of the current fiscal year. Creation of new Fiscal Year before its begining has been automated in ERPNext. Three days prior to the end of the current Fiscal Year, system checks if new Fiscal Year for the incoming year is already created. If not, then system auto-creates new Fiscal Year. \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/accounts/articles/manage-foreign-exchange-difference.md b/foundation/www/docs/user/manual/en/accounts/articles/manage-foreign-exchange-difference.md index eee105e0..e43ef7a6 100644 --- a/foundation/www/docs/user/manual/en/accounts/articles/manage-foreign-exchange-difference.md +++ b/foundation/www/docs/user/manual/en/accounts/articles/manage-foreign-exchange-difference.md @@ -1,7 +1,7 @@ # Manage Foreign Exchange Difference -In ERPNext, you can create transactions in the foreign currency as well. When creating transaction in the foreign currency, system updates current exchange rate with respect to customer/supplier's currency and base currency on your Company. Since Exchange Rate is always fluctuating, on might receive payment from the client on exchange rate different from one mentioned in the Sales/Purchase Invoice. Following is the instruction on how to manage different amount avail in payment entry due to exchange rate change. +In ERPNext, you can create transactions in the foriegn currency as well. When creating transaction in the foreign currency, system updates current exchanage rate with respect to customer/supplier's currency and base currency on your Company. Since Exchange Rate is always flucuating, on might receive payment from the client on exchange rate different from one mentioned in the Sales/Purchase Invoice. Following is the intruction on how to manage different amount avail in payment entry due to exchange rate change. #### Add Expense Account @@ -15,10 +15,10 @@ In the payment voucher, update invoice amount against Customer or Supplier accou In the below scenario, Sales Invoice was made EUR, at the exchange rate of 1.090. As per this rate, Sales Invoice amount in USD (base currency) was $1000. -One receipt of payment, exchange rate changed. As per the new exchange rate, payment received in the base currency was $1080. This means gain of $80 due to change in exchange rate. Following is how Foreign Exchange Gain will be booked in this scenario. +One receipt of payment, exchange rate changed. As per the new exchange rate, payment received in the base currency was $1080. This means gain of $80 due to change in exchange rate. Following is how Foreign Exchange Gain will be booked in this scenerio. Accounts Frozen Date -In case you incur loss due to change foriegn exchange rate, then different amount about be updated in the debit of Foreign Exchange Gain/Loss account. Also you can add another row to update another expenses like bank charges, remittance charges etc. +In case you incur loss due to change foriegn exchnage rate, then different amount about be updated in the debit of Foreign Exchange Gain/Loss account. Also you can add another row to update another expenses like bank charges, remittance charges etc. diff --git a/foundation/www/docs/user/manual/en/accounts/articles/tracking-project-profitability-using-cost-center.md b/foundation/www/docs/user/manual/en/accounts/articles/tracking-project-profitability-using-cost-center.md index 783ff92f..23a0911d 100644 --- a/foundation/www/docs/user/manual/en/accounts/articles/tracking-project-profitability-using-cost-center.md +++ b/foundation/www/docs/user/manual/en/accounts/articles/tracking-project-profitability-using-cost-center.md @@ -1,7 +1,7 @@ -#Tracking Project Profitability using Cost Center +#Tracking Project Profibitability using Cost Center -To track expenses and profitability for a project, you can use Cost Centers. You should create separate Cost Center for each Project. This will allow you to. +To track expenses and profibility for a project, you can use Cost Centers. You should create separate Cost Center for each Project. This will allow you to. - Allocating budget on expense for Projects. - Tracking Profitability of Project. diff --git a/foundation/www/docs/user/manual/en/accounts/articles/what-is-the-differences-of-total-and-valuation-in-tax-and-charges.md b/foundation/www/docs/user/manual/en/accounts/articles/what-is-the-differences-of-total-and-valuation-in-tax-and-charges.md index c08076a9..79de7fb2 100644 --- a/foundation/www/docs/user/manual/en/accounts/articles/what-is-the-differences-of-total-and-valuation-in-tax-and-charges.md +++ b/foundation/www/docs/user/manual/en/accounts/articles/what-is-the-differences-of-total-and-valuation-in-tax-and-charges.md @@ -31,4 +31,4 @@ Check [here](/docs/user/manual/en/stock/accounting-of-inventory-stock/perpetual- Tax or Charge categorized as for **Total and Valuation** will be added in the valuation of item, as well as in the totals of purchase transactions. -Let's assume that transportation is arranged by our supplier, but we need to pay transportation charges to them. In that case, for transportation charges, category selected should be Total and Valuation. With this, INR 100 transportation charge will be added to the actual purchase amount 800. Also, INR 100 will reflect in the total, as it will be payable for us towards supplier. \ No newline at end of file +Let's assume that transportion is arranged by our supplier, but we need to pay transportation charges to them. In that case, for transportation charges, category selected should be Total and Valuation. With this, INR 100 transportation charge will be added to the actual purchase amount 800. Also, INR 100 will reflect in the total, as it will be payable for us towards supplier. \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/accounts/chart-of-accounts.md b/foundation/www/docs/user/manual/en/accounts/chart-of-accounts.md index 10448844..ee1d788d 100644 --- a/foundation/www/docs/user/manual/en/accounts/chart-of-accounts.md +++ b/foundation/www/docs/user/manual/en/accounts/chart-of-accounts.md @@ -109,6 +109,11 @@ Supplier). Chart of Accounts +### Account Number +A standard chart of accounts is organized according to a numerical system. Each major category will begin with a certain number, and then the sub-categories within that major category will all begin with the same number. For example, if assets are classified by numbers starting with the digit 1000, then cash accounts might be labeled 1100, bank accounts might be labeled 1200, accounts receivable might be labeled 1300, and so on. A gap between account numbers is generally maintained for adding accounts in the future. + +You can assign a number while creating an account from Chart of Accounts page. You can also edit a number from account record, by clicking "Update Account Number" button. On updating account number, system renames the account name automatically to embed the number in the account name. + ### Other Account Types In ERPNext, you can also specify more information when you create a new @@ -116,6 +121,19 @@ Account, this is there to help you select that particular account in a scenario like Bank Account or a Tax Account and has no effect on the Chart itself. +Explanation of account types: +- **Bank:** The account group under which bank account will be created. +- **Cash:** The account group under which cash account will be created. +- **Cost of Goods Sold:** The account to book the accumulated total of all costs used to manufacture / purchase a product or service, sold by a company. +- **Depreciation:** The expense account to book the depreciation of teh fixed assets. +- **Expenses Included In Valuation:** The account to book the expenses (apart from direct material costs) included in landed cost of an item/product, used in Perpetual Inventory, . +- **Fixed Asset:** The account to maintain the costs of fixed assets. +- **Payable:** The account which represents the amount owed by a company to its creditors. +- **Receivable:** The account which represents the amount owed by a company by its debtors. +- **Stock:** The account group under which the warehouse account will be created. +- **Stock Adjustment:** An expense account to book any adjustment entry of stock/inventory, and generally comes at the same level of Cost of Goods Sold. +- **Stock Received But Not Billed:** A temporary liability account which holds the value of stock received but not billed yet and used in Perpetual Inventory. + ### Creating / Editing Accounts To create new Accounts, explore your Chart of Accounts and click on an Account @@ -125,7 +143,8 @@ will see an option to “Open” or “Add Child” a new Account. Chart of Accounts Option to create will only appear if you click on a Group (folder) type -Account. +Account. There you need to enter account name, account number and some more +optional details. ERPNext creates a standard structure for you when the Company is created but it is up to you to modify or add or remove accounts. diff --git a/foundation/www/docs/user/manual/en/accounts/credit-limit.md b/foundation/www/docs/user/manual/en/accounts/credit-limit.md index 239b13bc..adc5cbbc 100644 --- a/foundation/www/docs/user/manual/en/accounts/credit-limit.md +++ b/foundation/www/docs/user/manual/en/accounts/credit-limit.md @@ -17,7 +17,9 @@ To set credit limit go to Customer - Master Credit Limit -Go to the 'More Info section' and enter the amount in the field Credit Limit. +Go to the 'CREDIT LIMIT' section and enter the amount in the field Credit Limit. + +If you leave CREDIT LIMIT as 0.00, it has no effect. In case a need arises to allow more credit to the customer as a good-will, the Credit Controller has access to submit order even if credit limit is crossed. @@ -27,6 +29,25 @@ has expired, go to accounting settings and make changes. In the field Credit Controller, select the role who would be authorized to accept orders or raise credit limits of customers. + +To set credit limit at Customer Group Level go to Selling -> Customers -> Customer Group + +Go to the 'CREDIT LIMIT' field and enter the amount. +If you leave CREDIT LIMIT as 0.00, it has no effect. + + +To set credit limit at Company level go to Account -> Company + +Go to the 'ACCOUNT SETTINGS' section and enter the amount in the CREDIT LIMIT field. +If you leave CREDIT LIMIT as 0.00, it has no effect. + +For 'CREDIT LIMIT' check functionality, Priority (High to Low) is as below +1) Customer +2) Customer Group +3) Company + + + #### Figure 2: Credit Controller diff --git a/foundation/www/docs/user/manual/en/accounts/item-wise-taxation.md b/foundation/www/docs/user/manual/en/accounts/item-wise-taxation.md index 99d2b2aa..2adfe91a 100644 --- a/foundation/www/docs/user/manual/en/accounts/item-wise-taxation.md +++ b/foundation/www/docs/user/manual/en/accounts/item-wise-taxation.md @@ -29,7 +29,7 @@ In Sales Taxes and Other Charges master, select GST 16% account and mention Tax ####Step 3: Tax Calculation in transaction -In the Sales Order, we have selected many Items. For the items mentioned in blue, tax rate is applied based on tax rate mentioned in the taxes table. For the items highlighted in red, tax rate has fetched for them from the respective item master. +In the Sales Order, we have selected many Items. For the items mentioned in blue, tax rate is applied based on tax rate mentioned in the taxes table. For the items highlited in red, tax rate has fetched for them from the respective item master. Opening Account diff --git a/foundation/www/docs/user/manual/en/accounts/opening-accounts.md b/foundation/www/docs/user/manual/en/accounts/opening-accounts.md index 3418566c..dc727061 100644 --- a/foundation/www/docs/user/manual/en/accounts/opening-accounts.md +++ b/foundation/www/docs/user/manual/en/accounts/opening-accounts.md @@ -1,5 +1,5 @@ -#Updating Opening Balance in Accounts +# Updating Opening Balance in Accounts If you are a new company you can start using ERPNext accounting module by going to chart of accounts. However, if you are migrating from a legacy accounting system like Tally or a Fox Pro based software @@ -14,28 +14,28 @@ If you were using another accounting software before, firstly you should close f > Opening entry is only for Balance Sheet accounts and not for the Accounts in the Profit and Loss statement. * For all assets (excluding Accounts Receivables): This entry will contain all your assets except the amounts you are expecting from your Customers against outstanding Sales Invoices. You will have to update your receivables by making an individual entry for each Invoice (this is because, the system will help you track the invoices which are yet to be paid). You can credit the sum of all these debits against the **Temporary Opening** account. - + * For all liabilities: Similarly you need to pass a Journal Entry for your Opening Liabilities (except for the bills you have to pay) against **Temporary Opening** account. ###Opening Entry -####Step 1: New Journal Entry +#### Step 1: New Journal Entry To open new Journal Entry, go to: `Explore > Accounts > Journal Entry` -####Step 2: Entry Type +#### Step 2: Entry Type If Entry Type is selected as Opening Entry, all the Balance Sheet Accounts will be auto-fetched in the Journal Entry. Opening Account -####Step 3: Posting Date +#### Step 3: Posting Date Select Posting Date on which Accounts Opening Balance will be updated. -####Step 4: Enter Debit/Credit Value +#### Step 4: Enter Debit/Credit Value For each Account, enter opening value in the Debit or Credit column. As per the double entry valuation system, Total Debit value in a entry must be equal to Total Credit value. @@ -87,9 +87,9 @@ To update stock opening balance, create [Stock Reconciliation entry](/docs/user/ Opening balance for the fixed asset account should be updated via Journal Entry. Assets which are not fully depreciated should be added in the [Asset master](/docs/user/manual/en/accounts/managing-fixed-assets.html). For adding Assets in your possession, ensure to check **Is Existing Asset** field. -### Outstanding Invoices +### Outstanding Payables and Receivables -After opening Journal Entries are made, you will need to enter each Sales Invoice and Purchase Invoice that is yet to be paid. +After opening Journal Entries are made, you will need to enter the Sales Invoice and Purchase Invoice that is yet to be paid. Since you have already booked the income or expense on these invoices in the previous period, select **Temporary Opening** in the “Income” and “Expense” accounts. @@ -97,4 +97,12 @@ Since you have already booked the income or expense on these invoices in the pre If you don’t care what items are in that invoice, just make a dummy item entry in the Invoice. Item code in the Invoice is not necessary, so it should not be such a problem. +You can also do this quickly using the **Opening Invoice Creation Tool** + +To use this tool, just type "Opening Invoice" in the search bar and select the **Opening Invoice Creation Tool** + +Here, select the company and type of invoice (sales or purchase) and add a line item for each invoice you want to create. + +Opening Invoice Creation Tool + {next} diff --git a/foundation/www/docs/user/manual/en/accounts/payment-terms.md b/foundation/www/docs/user/manual/en/accounts/payment-terms.md new file mode 100644 index 00000000..ccfa1738 --- /dev/null +++ b/foundation/www/docs/user/manual/en/accounts/payment-terms.md @@ -0,0 +1,71 @@ + +# Payment Terms +You can save your business' payment terms on ERPNext and include it in all documents in the sales/purchase cycle and ERPNext will make all the proper general ledger entries accordingly. + +The documents you can attach Payment Terms to are: +- Sales Invoice +- Purchase Invoice +- Sales Order +- Purchase Order +- Quotation + +Note that the introduction of Payment Terms removes "Credit Days" and "Credit Days Based On" fields in Customer/Supplier master. Payment Term contains the same information and makes it more flexible to use. + +## Payment Terms +Navigate to the Payment Term list page and click "New". +> Accounts > Payment Term > New Payment Term + +Payment Term has the following fields: +**Payment Term Name:** (optional) The name for this Payment Term. + +**Due Date Based On:** The basis by which the due date for the Payment Term is to be calculated. There are three options: +- Day(s) after invoice date: Due date should be calculated in days with reference to the posting date of the invoice +- Day(s) after the end of the invoice month: Due date should be calculated in days with reference to the last day of the month in which the invoice was created +- Month(s) after the end of the invoice month: Due date should be calculated in months with reference to the last day of the month in which the invoice was created + +**Invoice Portion:** (optional) The portion of the total invoice amount for which this Payment Term should be applied. Value given will be regarded as percentage i.e 100 = 100% + +**Credit Days:** (optional) The number of days or month credit is allowed depending on the option chosen in the `Due Date Based On` field. 0 means no credit allowed. + +**Description:** (optional) A brief description of the Payment Term. + +## Payment Terms In Converted Documents +When converting or copying documents in the sales/purchase cycle, the attached Payment Term(s) will not be copied. The reason for this is because the copied information might no longer be true. For example, a Quotation is created for a service costing $1000 on January 1 with payment term of "N 30" (Net payable within 30 days) and then sent to a customer. On the quotation, the due date on the invoice will be January 30. Let's say the customer agrees to the quotation of January 20 and you decide to make an invoice from the Quotation. If the Payment Terms from the Quotation is copied, the due date on the invoice will still wrongly read January 30. This issue also applies for recurring documents. + +This does not mean you have manually set Payment Terms for every document. If you want the Payment Terms to be copyable, make use of Payment Terms Template. + +## Payment Terms Template +Payment Terms Template tells ERPNext how to populate the table in the Payment Terms Schedule section of the sales/purchase document. + +You should use it if you have a set of standard Payment Terms or if you want the Payment Term(s) on a sales/purchase document to be copyable. + +To create a new Payment Terms Template, navigate to the Payment Term Template creation form: +> Accounts > Payment Terms Template > New Payment Terms Template + +**Payment Term:** (optional) The name for this Payment Term. + +**Due Date Based On:** The basis by which the due date for the Payment Term is to be calculated. There are three options: +- Day(s) after invoice date: Due date should be calculated in days with reference to the posting date of the invoice +- Day(s) after the end of the invoice month: Due date should be calculated in days with reference to the last day of the month in which the invoice was created +- Month(s) after the end of the invoice month: Due date should be calculated in months with reference to the last day of the month in which the invoice was created + +**Invoice Portion:** (optional) The portion of the total invoice amount for which this Payment Term should be applied. Value given will be regarded as percentage i.e 100 = 100% + +**Credit Days:** (optional) The number of days or month credit is allowed depending on the option chosen in the `Due Date Based On` field. 0 means no credit allowed. + +**Description:** (optional) A brief description of the Payment Term. + +Add as many rows as needed but make sure that the sum of the values in the `Invoice Portion` fields in all populated rows equals 100. + +## How to Add Payment Terms To Documents +You can add Payments Terms in the "Payment Terms Schedule" section of the Document. Each row in the table represents a portion of the document's grand total. The table collects the following information: + +**Payment Term:** (optional) The name of the Payment Term document you require. If this is added, the data from the selected Payment Term will be used to populate the remaining columns in the row. + +**Description:** (optional) Description of the Payment Term. + +**Due Date:** (optional) The due date for the portion of the invoice. Set this value only if you did not specify anything in the `Payment Term` column. + +**Invoice Portion:** The percentage portion of the document represented in each row. + +**Payment Amount:** The amount due from the portion of the invoice represented by each row. diff --git a/foundation/www/docs/user/manual/en/accounts/payments.md b/foundation/www/docs/user/manual/en/accounts/payments.md index 58790f7b..dc0b2df4 100644 --- a/foundation/www/docs/user/manual/en/accounts/payments.md +++ b/foundation/www/docs/user/manual/en/accounts/payments.md @@ -29,7 +29,7 @@ For more details about payment entry [check here.](/docs/user/manual/en/accounts ## Journal Entry -To make payment using journal entry, check below steps +To make paymant using journal entry, check below steps ####Step 1: Activate Payment via Journal Entry @@ -45,7 +45,7 @@ On submitting a document against which Journal Entry can be made, you will find ####Step 3: Journal Entry -Save and submit the journal entry to record the payment against the invoice +Save and submit the journal entry to record the payament against the invoice Making Payment For more details about journal entry [check here.](/docs/user/manual/en/accounts/journal-entry) diff --git a/foundation/www/docs/user/manual/en/accounts/point-of-sale-pos-invoice.md b/foundation/www/docs/user/manual/en/accounts/point-of-sale-pos-invoice.md index 3f138223..25381173 100644 --- a/foundation/www/docs/user/manual/en/accounts/point-of-sale-pos-invoice.md +++ b/foundation/www/docs/user/manual/en/accounts/point-of-sale-pos-invoice.md @@ -50,7 +50,7 @@ in Search box. ### Removing an Item from the Cart -1. Select row in the cart and click on delete button in the numeric keypad +1. Select row in the cart and clik on delete button in the numeric keypad POS Item @@ -90,7 +90,7 @@ POS calculate the extra amount paid by the customer, which user can return from POS Payment ### Offline Records -All the records from the POS stores into the browser's local storage and sync submitted records after every minute of the interval if system is connected to internet. User can view the offline records by clicking on Menu > View Offline Records +All the records from the POS stores into the browser's local storegae and sync submitted records after every minute of the interval if system is connected to internet. User can view the offline records by clicking on Menu > View Offline Records POS Payment diff --git a/foundation/www/docs/user/manual/en/accounts/pricing-rule.md b/foundation/www/docs/user/manual/en/accounts/pricing-rule.md index ee89544b..0aa5ec79 100644 --- a/foundation/www/docs/user/manual/en/accounts/pricing-rule.md +++ b/foundation/www/docs/user/manual/en/accounts/pricing-rule.md @@ -12,7 +12,7 @@ Following are the few cases which can be addressed using Pricing Rule. 3. Items categorized under specific Item Group has same selling or buying price. -4. Customers belonging to specific Customer Group should get ### selling price, ot % of Discount on Items. +4. Customers balonging to specific Customer Group should get ### selling price, ot % of Discount on Items. 5. Supplier's categorized under specific Supplier Type should have ### buying rate applied. @@ -88,7 +88,7 @@ For example : User want to add 10% margin on the supplier price list at the tim ####1. Make Price List -Create price list for supplier and create item price against the price list. +Create price list for supllier and create item price against the price list. Disable diff --git a/foundation/www/docs/user/manual/en/accounts/sales-invoice.md b/foundation/www/docs/user/manual/en/accounts/sales-invoice.md index 08a3e310..6acf6310 100644 --- a/foundation/www/docs/user/manual/en/accounts/sales-invoice.md +++ b/foundation/www/docs/user/manual/en/accounts/sales-invoice.md @@ -57,6 +57,21 @@ bill this Invoice and the period for which the contract is valid. ERPNext will automatically create new Invoices and mail it to the Email Addresses you set. +#### Automatically Fetching Item Batch Numbers + +If you are selling an item from a [Batch](/docs/user/manual/en/stock/batch), +ERPNext will automatically fetch a batch number for you if "Update Stock" +is checked. The batch number will be fetched on a First Expiring First Out +(FEFO) basis. This is a variant of First In First Out (FIFO) that gives +highest priority to the soonest to expire Items. + +POS Invoice + +Note that if the first batch in the queue cannot satisfy the order on the invoice, +the next batch in the queue that can satisfy the order will be selected. If there is +no batch that can satisfy the order, ERPNext will cancel its attempt to automatically +fetch a suitable batch number. + #### POS Invoices Consider a scenario where retail transaction is carried out. For e.g: A retail shop. diff --git a/foundation/www/docs/user/manual/en/accounts/setup/tax-rule.md b/foundation/www/docs/user/manual/en/accounts/setup/tax-rule.md index 75619753..09020adc 100644 --- a/foundation/www/docs/user/manual/en/accounts/setup/tax-rule.md +++ b/foundation/www/docs/user/manual/en/accounts/setup/tax-rule.md @@ -9,7 +9,7 @@ You can define Tax Rules for Sales or Purchase Taxes. While making a Transaction the system will select and apply tax template based on the tax rule defined. The system selects Tax Rule with maximum matching Filters. -Let us consider a scenario to understand Tax Rule Better. +Let us consider a senario to understand Tax Rule Better. Suppose we define 2 Tax Rules as below. diff --git a/foundation/www/docs/user/manual/en/accounts/tools/bank-reconciliation.md b/foundation/www/docs/user/manual/en/accounts/tools/bank-reconciliation.md index 8127197f..2215fade 100644 --- a/foundation/www/docs/user/manual/en/accounts/tools/bank-reconciliation.md +++ b/foundation/www/docs/user/manual/en/accounts/tools/bank-reconciliation.md @@ -11,7 +11,7 @@ The Bank Reconciliation Report provide the difference between the bank balance s Bank Reconciliation statement -In the report, check whether the field 'Balance as per bank' matches the Bank Account Statement. If it is matching, it means that Clearance Date is correctly updated for all the bank entries. If there is a mismatch, Its because of bank entries for which Clearance Date is not yet updated. +In the report, check whether the field 'Balance as per bank' matches the Bank Account Statement. If it is matching, it means that Clearance Date is correctly updated for all the bank entries. If there is a mismatch, Its because of bank entries for which Cleanrane Date is not yet updated. ###Bank Reconciliation Tool diff --git a/foundation/www/docs/user/manual/en/accounts/tools/index.txt b/foundation/www/docs/user/manual/en/accounts/tools/index.txt index 7f93166c..d5518207 100644 --- a/foundation/www/docs/user/manual/en/accounts/tools/index.txt +++ b/foundation/www/docs/user/manual/en/accounts/tools/index.txt @@ -1,4 +1,3 @@ bank-reconciliation payment-reconciliation period-closing-voucher -payment-tool \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/accounts/tools/payment-tool.md b/foundation/www/docs/user/manual/en/accounts/tools/payment-tool.md deleted file mode 100644 index e37cd42c..00000000 --- a/foundation/www/docs/user/manual/en/accounts/tools/payment-tool.md +++ /dev/null @@ -1,27 +0,0 @@ - -# Payment Tool - -###Payment Tool -The Payment Tool Feature allows non-accounting personnel to generate Journal Entries by populating relevant fields in the Journal Entry with account and payment details. - -To go to Payment Tool, click on Accounts > Tools > Payment Tool. - -1. Select the Company Name. -2. Select the Party Type (Customer or Supplier) and the name of the customer or supplier against whom the payment has been made or received. -3. Use the Received Or Paid field to specify 'Received' if payment is being received or 'Paid' if User is making the payment. -4. Select the Mode of Payment and the Payment Account . -5. Enter the Reference Number and Reference Date of the payment, for instance, the Cheque no. and Cheque date in case the payment is being made by cheque. -6. Click on Get Outstanding Vouchers to fetch all the valid Vouchers, Invoices and Orders against which a payment can be made/received. These will appear in the Against Voucher section. - * __Note:__ In case User is paying a customer or receiving payment from a supplier, add the details regarding the relevant invoices and orders manually. - - Payment Tool - -7. Once details have been fetched, click on the detail entry and enter the payment amount made against that Invoice/Order/Voucher - - Payment Tool - -8. Click on 'Make Journal Entry' to generate a new Journal Entry with the relevant Party Details and Credit/Debit details filled in. - - Payment Tool - -{next} diff --git a/foundation/www/docs/user/manual/en/accounts/tools/period-closing-voucher.md b/foundation/www/docs/user/manual/en/accounts/tools/period-closing-voucher.md index 240c0b60..93cef31e 100644 --- a/foundation/www/docs/user/manual/en/accounts/tools/period-closing-voucher.md +++ b/foundation/www/docs/user/manual/en/accounts/tools/period-closing-voucher.md @@ -24,7 +24,7 @@ In ERPNext after making all the special entries via Journal Entry for the curren Period Closing Voucher -This voucher will transfer Profit or Loss (availed from P&L statement) to Closing Account Head. You should select a liability account like Reserves and Surplus, or Capital Fund account as Closing Account. +This voucher will transfer Profit or Loss (availed from P&L statment) to Closing Account Head. You should select a liability account like Reserves and Surplus, or Capital Fund account as Closing Account. The Period Closing Voucher will make accounting entries (GL Entry) making all your Income and Expense Accounts zero and transferring Profit/Loss balance to the Closing Account. diff --git a/foundation/www/docs/user/manual/en/agriculture/_sidebar.json b/foundation/www/docs/user/manual/en/agriculture/_sidebar.json new file mode 100644 index 00000000..88f5aab5 --- /dev/null +++ b/foundation/www/docs/user/manual/en/agriculture/_sidebar.json @@ -0,0 +1,22 @@ +[ + { + "route": "/docs", + "title": "Docs Home" + }, + { + "route": "/docs/user", + "title": "User Guide" + }, + { + "route": "/docs/current/api", + "title": "Server API" + }, + { + "route": "/docs/current/models", + "title": "Models (Reference)" + }, + { + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "title": "Improve Docs" + } +] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/agriculture/analytics/_sidebar.json b/foundation/www/docs/user/manual/en/agriculture/analytics/_sidebar.json new file mode 100644 index 00000000..88f5aab5 --- /dev/null +++ b/foundation/www/docs/user/manual/en/agriculture/analytics/_sidebar.json @@ -0,0 +1,22 @@ +[ + { + "route": "/docs", + "title": "Docs Home" + }, + { + "route": "/docs/user", + "title": "User Guide" + }, + { + "route": "/docs/current/api", + "title": "Server API" + }, + { + "route": "/docs/current/models", + "title": "Models (Reference)" + }, + { + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "title": "Improve Docs" + } +] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/agriculture/analytics/index.md b/foundation/www/docs/user/manual/en/agriculture/analytics/index.md new file mode 100644 index 00000000..11b8c3d0 --- /dev/null +++ b/foundation/www/docs/user/manual/en/agriculture/analytics/index.md @@ -0,0 +1,13 @@ + +# Analytics + +This part of the Agriculture module is used for tracking data and report generation + +All the data pertaining to the following doctypes can be tracked by ERPNext + +* Plant Analysis +* Soil Analysis +* Water Analysis +* Soil Texture +* Weather +* Agriculture Analysis Criteria \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/agriculture/crops_and_land/_sidebar.json b/foundation/www/docs/user/manual/en/agriculture/crops_and_land/_sidebar.json new file mode 100644 index 00000000..88f5aab5 --- /dev/null +++ b/foundation/www/docs/user/manual/en/agriculture/crops_and_land/_sidebar.json @@ -0,0 +1,22 @@ +[ + { + "route": "/docs", + "title": "Docs Home" + }, + { + "route": "/docs/user", + "title": "User Guide" + }, + { + "route": "/docs/current/api", + "title": "Server API" + }, + { + "route": "/docs/current/models", + "title": "Models (Reference)" + }, + { + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "title": "Improve Docs" + } +] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/agriculture/crops_and_land/crop.md b/foundation/www/docs/user/manual/en/agriculture/crops_and_land/crop.md new file mode 100644 index 00000000..7a24324f --- /dev/null +++ b/foundation/www/docs/user/manual/en/agriculture/crops_and_land/crop.md @@ -0,0 +1,51 @@ + +# Crop + +Now we need to specify what our crop will be. A crop summarizes all that is necessary before creatng our first crop cycle or planting. + +> Agriculture > Crop + +On the desk, click on the Crop icon. A list will show any existing Crops. + +On the top right, click on 'New' to create the first Crop. A new Crop document will open, and we will enter basic information. + +The basic information should be entered as such: + +* Title: Carrot from carrot-top +* Crop Name: Carrot +* Scientific name: Daucus Carota +* Type: Biennial +* Planting UOM: Unit +* Yield UOM: Grams + +Click Save + +We will skip the Materials Required, Byproducts and Produce sections. In the Ideal Agriculture Task List we enter some planned tasks such as planting, watering, and harvesting. (Please note, our activity list will be intentionally abbreviated for illustraion purposes. For this example we will prepare our field, plant the next day, water only once, add a cover after germination on day 12, remove weeds at day 19, and harvest at day 90. + +The first row will look like this: + +* Task Name: Preparation - Make rows +* Start Day: 1 +* End Day: 1 +* Holiday Management: Ignore holidays + +When done, you can click 'Save' to prevent any work from being lost. + +We are not done yet, we simply have saved the minimum required information! +Continue filling the next rows with Task Name, Start Day, End Day and Holiday Management. + + +* Row 2: Preparation - Add mulch cover, 1, 1, Previous Business Day +* Row 3: Planting - Sow the seeds, 2, 2, Previous Business Day +* Row 4: Water - 10ml per plant, 2, 2, Ignore holidays +* Row 5: Disease - Pest control - Cover with Fine Net, 12, 12, Previous Business Day +* Row 6: Weed Control - Remove weeds, 19, 19, Previous Business Day +* Row 7: Harvest - When top is at 5cm, 90, 90, Previous Business Day + +Click 'Save' + +You form should now look something like this + +Task + +Repeat step 2 for as many crops as you need. You can save some time by duplicating existing crops and modifying only the necessary items \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/agriculture/crops_and_land/crop_cycle.md b/foundation/www/docs/user/manual/en/agriculture/crops_and_land/crop_cycle.md new file mode 100644 index 00000000..1b773587 --- /dev/null +++ b/foundation/www/docs/user/manual/en/agriculture/crops_and_land/crop_cycle.md @@ -0,0 +1,31 @@ + +# Crop Cycle + +Once we have defined our crop, we can create as many crop cycles as we like, using the parameters outlined previously + +On the desk, clik on the Crop Cycle icon. A list will show any existing Crop Cycles. + +> Agriculture > Crop Cycle + +On the top right, click on New to create the first Crop Cycle. A new Crop Cycle document will open, and right away you see that two of the required items are a Land Unit and a Crop. We shall give it a descriptive name, to differentiate it from Crop Cycles we might create later. + +* Title: Carrot Planting 2017 +* Land Unit: Add a row, and select, Carrot Field 1 +* Crop: Carrot from carrot-top +* Start Date: Today +* Leave the ISO 8016 Standard (week count) box unchecked +* Skip the next four fields for Crop Spacing + +Save the new Crop Cycle + +It should now look something like this + +Task + +Repeat these for every Crop Cycle you need + +As you can see a Project was created, with the same name as the Crop Cycle and linked to the Crop Cycle. If you click on the project, you'll see all the 'Sample Tasks' from the linked Crop, i.e. 'Carrot from carrot-top' in this case, were converted into actual 'Tasks' and linked to the Project, for easy management + +> Projects > Project + +Task diff --git a/foundation/www/docs/user/manual/en/agriculture/crops_and_land/index.md b/foundation/www/docs/user/manual/en/agriculture/crops_and_land/index.md new file mode 100644 index 00000000..f2dafe65 --- /dev/null +++ b/foundation/www/docs/user/manual/en/agriculture/crops_and_land/index.md @@ -0,0 +1,16 @@ + +# Crops and Land + +The core and most important elements of Agriculture module are: + +* Land Unit: Representing the physical space where the crops are planted. +* Crop: Characteristics of the crop, inputs and expected outputs, expected calendar of activities and harvest, etc. +* Crop Cycle: Individual representation of a single planting in a specific area. (Links a crop to a Land Unit for a specified period) + +Here we will learn to do a quick setup with the essential requirements to manage a simple example crop, Carrots. + + These instructions assume you have already completed the basic ERPNext setup, and you have the ERPNext desk on your browser window. + +### Topics + +{index} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/agriculture/crops_and_land/index.txt b/foundation/www/docs/user/manual/en/agriculture/crops_and_land/index.txt new file mode 100644 index 00000000..1b24d5b4 --- /dev/null +++ b/foundation/www/docs/user/manual/en/agriculture/crops_and_land/index.txt @@ -0,0 +1,3 @@ +land_unit +crop +crop_cycle \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/agriculture/crops_and_land/land_unit.md b/foundation/www/docs/user/manual/en/agriculture/crops_and_land/land_unit.md new file mode 100644 index 00000000..01d09f82 --- /dev/null +++ b/foundation/www/docs/user/manual/en/agriculture/crops_and_land/land_unit.md @@ -0,0 +1,32 @@ + +# Land Unit + +Before we do anything, we need to define some details about where our crops will be planted. We will first create our farm as a parent land unit, and then we will add one or more fields as children or nodes, belonging to the parent. + +> Agriculture > Land Unit + +On the desk, click on the Land Unit icon. assets/img/new-land-unit-icon.png A list will show any existing Land Units. + +On the top right, click on New to create the first Land Unit. + +* Land Unit Name: Carrot Farm +* Parent Land Unit: All Land Units +* Check the box next to 'Is Group' +* Location: plot the area as you please + +Click Save + +It should look something like this + +Task + +With the farm created, we can now create our first Carrot Field! Click on New + +* Land Unit Name: Carrot Field 1 +* Parent Land Unit:select the one we just created in step two, i.e. Carrot Farm +* Leave the 'Is Group' box unchecked +* Location: plot the area as you please + +Click Save + +Repeat step 3 for as many fields as you need \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/agriculture/diseases_and_fertilizer/_sidebar.json b/foundation/www/docs/user/manual/en/agriculture/diseases_and_fertilizer/_sidebar.json new file mode 100644 index 00000000..88f5aab5 --- /dev/null +++ b/foundation/www/docs/user/manual/en/agriculture/diseases_and_fertilizer/_sidebar.json @@ -0,0 +1,22 @@ +[ + { + "route": "/docs", + "title": "Docs Home" + }, + { + "route": "/docs/user", + "title": "User Guide" + }, + { + "route": "/docs/current/api", + "title": "Server API" + }, + { + "route": "/docs/current/models", + "title": "Models (Reference)" + }, + { + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "title": "Improve Docs" + } +] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/agriculture/diseases_and_fertilizer/disease.md b/foundation/www/docs/user/manual/en/agriculture/diseases_and_fertilizer/disease.md new file mode 100644 index 00000000..07e5dcbd --- /dev/null +++ b/foundation/www/docs/user/manual/en/agriculture/diseases_and_fertilizer/disease.md @@ -0,0 +1,25 @@ + +# Disease + +This part of Agriculture module deals with the management of Diseases, which may include various types of bacteria, funcgi, viruses, or pests which affect he Crop + +On the desk, click on the Disease icon. A list will show any existing Diseases. + +> Agriculture > Disease + +The basic information should be entered as such: + +* Disease Name: Aphids +* Scientific name: Aphidoidea +* Description: you could give a description of the disease here +* Treatment Task: This may contain a list of all the Tasks which need to to be executed in orfer to get rid of the Disease + +Once you fill the form, click Save + +Click Save + +Now it should look something like this + +Task + +These Tasks will be imported into the Crop Cycle Project if you choose to add this Disease to the list of Detected Diesase in Crop Cycle \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/agriculture/diseases_and_fertilizer/fertilizer.md b/foundation/www/docs/user/manual/en/agriculture/diseases_and_fertilizer/fertilizer.md new file mode 100644 index 00000000..53125878 --- /dev/null +++ b/foundation/www/docs/user/manual/en/agriculture/diseases_and_fertilizer/fertilizer.md @@ -0,0 +1,6 @@ + +# Fertilizer + +This is used to keep track of available fertilizers, and their chemical composition, which is linked to the Item master + +Task \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/agriculture/diseases_and_fertilizer/index.md b/foundation/www/docs/user/manual/en/agriculture/diseases_and_fertilizer/index.md new file mode 100644 index 00000000..d2b05815 --- /dev/null +++ b/foundation/www/docs/user/manual/en/agriculture/diseases_and_fertilizer/index.md @@ -0,0 +1,8 @@ + +# Disease and Fertilizer + +This part of Agriculture module deals with the management of Diseases which affect the Crop and Fertilizers which may be used to promote the growth of the Crop + +### Topics + +{index} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/agriculture/diseases_and_fertilizer/index.txt b/foundation/www/docs/user/manual/en/agriculture/diseases_and_fertilizer/index.txt new file mode 100644 index 00000000..eb13febe --- /dev/null +++ b/foundation/www/docs/user/manual/en/agriculture/diseases_and_fertilizer/index.txt @@ -0,0 +1,2 @@ +disease +fertilizer \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/agriculture/index.md b/foundation/www/docs/user/manual/en/agriculture/index.md new file mode 100644 index 00000000..eca5cf68 --- /dev/null +++ b/foundation/www/docs/user/manual/en/agriculture/index.md @@ -0,0 +1,23 @@ + +# Agriculture + +Farmers know that even a small operation requires intensive recordkeeping. A well-run farm requires proper management of accounting, payroll, suppliers, customers and logistics to name a few areas. ERPNext already helps organize these activities. + +A farm requires additional attention to manage its productive units (plots of land), time sensitive crop activities (such as planting, irrigating, fertilizing, etc.), recording environmental and crop data for analysis, and reports to help make effective decisions. + +Task + +The Agriculture module in ERPNext helps you keep track of your farming operations. It allows you keep records for each field where you farm, such as geospatial and soil texture characteristics. It allows you to: + +* Manage the physical spaces where you plant your crops +* Manage your crops +* Record analysis data +* Plan activities related to your crops +* Record sale of the harvest or transfer to warehouse for further processing +* View reports + +Task + +### Topics + +{index} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/agriculture/index.txt b/foundation/www/docs/user/manual/en/agriculture/index.txt new file mode 100644 index 00000000..a7f92f56 --- /dev/null +++ b/foundation/www/docs/user/manual/en/agriculture/index.txt @@ -0,0 +1,3 @@ +crops_and_land +diseases_and_fertlizers +analytics \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/asset/_sidebar.json b/foundation/www/docs/user/manual/en/asset/_sidebar.json new file mode 100644 index 00000000..88f5aab5 --- /dev/null +++ b/foundation/www/docs/user/manual/en/asset/_sidebar.json @@ -0,0 +1,22 @@ +[ + { + "route": "/docs", + "title": "Docs Home" + }, + { + "route": "/docs/user", + "title": "User Guide" + }, + { + "route": "/docs/current/api", + "title": "Server API" + }, + { + "route": "/docs/current/models", + "title": "Models (Reference)" + }, + { + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "title": "Improve Docs" + } +] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/asset/asset-maintenance.md b/foundation/www/docs/user/manual/en/asset/asset-maintenance.md new file mode 100644 index 00000000..ea936d3f --- /dev/null +++ b/foundation/www/docs/user/manual/en/asset/asset-maintenance.md @@ -0,0 +1,32 @@ + +# Asset Maintenance Management +ERPNext provides features to track the details of individual maintenance/calibration tasks for an asset by date, the person responsible for the maintenance and future maintenance due date. + +To perform Asset Maintenance in ERPNext, + + 1. Enable Asset Maintenance. + 2. Create Asset Maintenance Team. + 3. Create Asset Maintenance. + 4. Create Asset Maintenance Log. + 5. Create Asset Repair Log. + +### Enable Asset Maintenance +Check Maintain Required in Asset to enable Asset Maintenance +Asset + +### Asset Maintenance Team +Create Asset Maintenance Team, select team members and their role. +Asset + + +### Asset Maintenance +For each asset create a Asset Maintenance record listing all the associated maintenance tasks, maintenance type (Preventive Maintenance or Calibration), periodicity, assign to and start and end date of maintenance. Based on start date and periodicity the next due date is auto-calculated and a ToDo is created for the Assignee. +Asset + +### Asset Maintenance Log +For each task in Asset Maintenance, Asset Maintenance Log is auto created to keep track of the upcoming Maintenances. It will have status, completion date and actions performed. Based on completion date here, next due date is calculated automatically and new Asset Maintenance Log is created. +Asset + +### Asset Repair +You can also maintain the records of Repair/Failures of your asset which are not listed in Asset Maintenance. +Asset \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/accounts/managing-fixed-assets.md b/foundation/www/docs/user/manual/en/asset/assets.md similarity index 86% rename from foundation/www/docs/user/manual/en/accounts/managing-fixed-assets.md rename to foundation/www/docs/user/manual/en/asset/assets.md index 6951c451..8de79f46 100644 --- a/foundation/www/docs/user/manual/en/accounts/managing-fixed-assets.md +++ b/foundation/www/docs/user/manual/en/asset/assets.md @@ -7,7 +7,7 @@ In ERPNext, you can maintain fixed asset records like Computers, Furnitures, Car Based on the type of assets, create Asset Category. For example, all your desktops and laptops can be part of an Asset Category named "Computers". Here you can set default depreciation method, periodicity and depreciation related accounts, which will be applicable to all the assets under the category. -Asset Category +Asset Category > **Note:** You can also set default depreciation related Accounts and Cost Centers in Company master. @@ -15,13 +15,13 @@ Based on the type of assets, create Asset Category. For example, all your deskto Asset master is the heart of fixed asset management feature. All the transactions related to Asset like purchasing, sales, depreciation, scrapping will be managed from the Asset master. -Asset +Asset Explanation of the fields: 1. Item Code: An Item for the Asset must be a non-stock item, with "Is Asset" field checked. - Asset Item + Asset Item 2. Asset Category: The category of assets it belongs to. 3. Is Existing Asset: Check if the asset is being carried forward from the previous Fiscal Year. The existing assets which are partially / fully depreciated can also be created/maintained for the future reference. @@ -43,24 +43,24 @@ Explanation of the fields: The system automatically creates a schedule for depreciation based on depreciation method and other related inputs in the Asset record. -Asset +Asset On the scheduled date, system creates depreciation entry by creating a Journal Entry and the same Journal Entry is updated in the depreciation table for reference. Next Depreciation Date and Current Value are also updated on submission of depreciation entry. -Asset +Asset In the depreciation entry, the "Accumulated Depreciation Account" is credited and "Depreciation Expense Account" is debited. The related accounts can be set in the Asset Category or Company. For better visibility, net value of the asset on different depreciation dates are shown in a line graph. -Asset +Asset ## Purchase an Asset For purchasing a new asset, create and submit the asset record with all the depreciation settings. Then create a Purchase Invoice via "Make Purchase Invoice" button. On clicking the button, system will load a new Purchase Invoice form with pre-loaded items table. It will also set proper fixed asset account (defined in the Asset Category) in the Expense Account field. You need to select Supplier and other necessary details and submit the Purchase Invoice. -Asset +Asset On submission of the invoice, the "Fixed Asset Account" will be debited and payable account will be credited. It also updates purchase date, supplier and Purchase Invoice no. in the Asset master. @@ -74,23 +74,23 @@ To sell an asset, open the asset record and create a Sales Invoice by clicking o - "Accumulated Depreciation Account" will be debited by the total depreciated amount till now. - "Gain/Loss Account on Asset Disposal" will be credited/debited based on gain/loss amount. The Gain/Loss account can be set in Company record. -Asset +Asset ## Scrap an Asset You can scrap an asset anytime using the "Scrap Asset" button in the Asset record. The "Gain/Loss Account on Asset Disposal" mentioned in the Company is debited by the Current Value (After Depreciation) of the asset. After scrapping, you can also restore the asset using "Restore Asset" button. -Asset +Asset ## Asset Movement The movement of the assets (from one warehouse to another) is also tracked via Asset Movement form. -Asset +Asset There is also a dedicated button "Transfer Asset" inside the Asset form to track the Asset Movement. -Asset +Asset {next} diff --git a/foundation/www/docs/user/manual/en/buying/articles/purchasing-in-different-unit.md b/foundation/www/docs/user/manual/en/buying/articles/purchasing-in-different-unit.md index 1fda20a8..d5ea1162 100644 --- a/foundation/www/docs/user/manual/en/buying/articles/purchasing-in-different-unit.md +++ b/foundation/www/docs/user/manual/en/buying/articles/purchasing-in-different-unit.md @@ -1,7 +1,7 @@ #Purchasing in Different Unit (UoM) -Each item has stock unit of measurement (UoM) associated to it. For example UoM of pen could be numbers (Nos) and sand could be stocked kgs. However, when we place an order with Supplier, UoM for an item could change. Like we can order 1 set/box of Pen, or one truck of sand to our Supplier. When creating purchase transaction, you can change Purchase UoM for an item. +Each item has stock unit of measument (UoM) associated to it. For example UoM of pen could be numbers (Nos) and sand could be stocked kgs. However, when we place an order with Supplier, UoM for an item could change. Like we can order 1 set/box of Pen, or one truck of sand to our Supplier. When creating purchase transacton, you can change Purchase UoM for an item. ### Scenario: diff --git a/foundation/www/docs/user/manual/en/customer-portal/index.md b/foundation/www/docs/user/manual/en/customer-portal/index.md index c1929963..c1a4bc41 100644 --- a/foundation/www/docs/user/manual/en/customer-portal/index.md +++ b/foundation/www/docs/user/manual/en/customer-portal/index.md @@ -1,10 +1,9 @@ # Customer Portal -Customer Portal is designed to give easy accessibility to customers of a -company. +Customer Portal is designed to give easy accessibility to customers of a company. -This portal allows customers to login and find out information relevant to them.They can trace communication history of their mails. They can also check order status by logging into the website. +This portal allows customers to login and find out information relevant to them. The customers can trace the communication history of their mails. They can also check order status by logging into the website. ### Topics diff --git a/foundation/www/docs/user/manual/en/customize-erpnext/articles/allow-fields-to-be-changed-after-submit.md b/foundation/www/docs/user/manual/en/customize-erpnext/articles/allow-fields-to-be-changed-after-submit.md index 9bc58b69..016c05a9 100644 --- a/foundation/www/docs/user/manual/en/customize-erpnext/articles/allow-fields-to-be-changed-after-submit.md +++ b/foundation/www/docs/user/manual/en/customize-erpnext/articles/allow-fields-to-be-changed-after-submit.md @@ -1,7 +1,7 @@ #Editing Value in Submitted Document -Once document is submitted, fields are frozen, and no editing is allowed. Still there are certain standard fields like Letter Head, Print Heading which can still be edited. For the custom field, if **Allow on Submit** property is checked, it will be editable even after document is submitted. +Once document is submitted, fields are frozen, and no editing is allowd. Still there are certain standard fields like Letter Head, Print Heading which can still be edited. For the custom field, if **Allow on Submit** property is checked, it will be editable even after document is submitted.
    Standard fields cannot be set as Allow on Submit.
    diff --git a/foundation/www/docs/user/manual/en/customize-erpnext/articles/field-types.md b/foundation/www/docs/user/manual/en/customize-erpnext/articles/field-types.md index fffb7699..1517fd72 100644 --- a/foundation/www/docs/user/manual/en/customize-erpnext/articles/field-types.md +++ b/foundation/www/docs/user/manual/en/customize-erpnext/articles/field-types.md @@ -57,6 +57,17 @@ Integer field holds numeric value, without decimal place. Link field is connected to another master from where it fetches data. For example, in the Quotation master, Customer is a Link field. +- Geolocation + +Use Geolocation field to store GeoJSON     featurecollection. Stores polygons, lines and points. Internally it uses following custom properties for identifying a circle. + +``` +{ + "point_type": "circle", + "radius": 10.00 +} +``` + - Password Password field will have decode value in it. @@ -79,10 +90,10 @@ Small Text field carries text content, has more character limit than the Data fi - Table -Table will be (sort of) Link field which renders another doctype within the current form. For example, Item table in the Sales Order is a Table field, which is linked to Sales Order Item doctype. +Table will be (sort of) Link field which renders another docytpe within the current form. For example, Item table in the Sales Order is a Table field, which is linked to Sales Order Item doctype. - Text Editor Text Editor is text field. It has text-formatting options. In ERPNext, this field is generally used for defining Terms and Conditions. - \ No newline at end of file + diff --git a/foundation/www/docs/user/manual/en/customize-erpnext/articles/increase-max-attachments.md b/foundation/www/docs/user/manual/en/customize-erpnext/articles/increase-max-attachments.md index aded531e..16c9c5c0 100644 --- a/foundation/www/docs/user/manual/en/customize-erpnext/articles/increase-max-attachments.md +++ b/foundation/www/docs/user/manual/en/customize-erpnext/articles/increase-max-attachments.md @@ -1,7 +1,7 @@ #Increase Max Attachments -In ERPNext, you can limit how many files can be attached to specific Document. Using Customize Form, you can set **Max(imum) Attachments** which can be added to a particular documents. +In ERPNext, you can limit how many files can be attached to specific Document. Using Custmize Form, you can set **Max(imum) Attachments** which can be added to a particular documents. Let's assume we need to update Max Attachment for Quotation to five. diff --git a/foundation/www/docs/user/manual/en/customize-erpnext/articles/maximum-numbers-of-fields-in-a-form.md b/foundation/www/docs/user/manual/en/customize-erpnext/articles/maximum-numbers-of-fields-in-a-form.md index 7f0311df..74ab58f5 100644 --- a/foundation/www/docs/user/manual/en/customize-erpnext/articles/maximum-numbers-of-fields-in-a-form.md +++ b/foundation/www/docs/user/manual/en/customize-erpnext/articles/maximum-numbers-of-fields-in-a-form.md @@ -15,7 +15,7 @@ Every table (regardless of storage engine) has a maximum row size of 65,535 byte The maximum row size constrains the number (and possibly size) of columns because the total length of all columns cannot exceed this size (65,535 bytes). For example, `utf8mb3` characters require up to 3 bytes per character, so for a `VARCHAR(140)` column, the server must allocate `140 × 3 = 420` bytes per value. Consequently, a table cannot contain more than `65,535 / 420 = 156` such columns. -In Frappé framework, `VARCHAR(140)` type columns are created based on "Data", "Link", "Select", "Dynamic Link", "Password" and "Read Only" fieldtypes. Hence, you can create approximately 156 such columns in the system. +In Frappé frapework, `VARCHAR(140)` type columns are created based on "Data", "Link", "Select", "Dynamic Link", "Password" and "Read Only" fieldtypes. Hence, you can create approximately 156 such columns in the system. ### Solutions: diff --git a/foundation/www/docs/user/manual/en/customize-erpnext/articles/set-language.md b/foundation/www/docs/user/manual/en/customize-erpnext/articles/set-language.md index 5e799a90..638959f3 100644 --- a/foundation/www/docs/user/manual/en/customize-erpnext/articles/set-language.md +++ b/foundation/www/docs/user/manual/en/customize-erpnext/articles/set-language.md @@ -1,7 +1,7 @@ #Change the Language -ERPNext is an multi-lingual application. It allows each user to select preferred language. Following is how User can customize language in one's account. +ERPNext is an multi-lingual application. It allows each user to select preferred lannguage. Following is how User can customize language in one's account. ### 1. Setting Language in User's Account diff --git a/foundation/www/docs/user/manual/en/customize-erpnext/kanban-board.md b/foundation/www/docs/user/manual/en/customize-erpnext/kanban-board.md index a023a668..32fa5e68 100644 --- a/foundation/www/docs/user/manual/en/customize-erpnext/kanban-board.md +++ b/foundation/www/docs/user/manual/en/customize-erpnext/kanban-board.md @@ -3,7 +3,7 @@ Kanban is a Japanese manufacturing system in which the supply of components is regulated through the use of an instruction card sent along the production line. -In ERPNext Kanban board can be an alternative for the list views. It helps you in visualizing various documents (like Task, Projects, Quotation etc.) based on some status on a virtual board. Also, you can easily update card status by dragging and dropping to required status column. Kanban Board helps to visualize, control and optimize workflow and collaborate in real-time with the entire team. +In ERPNext Kanban board can be an alternative for the list views. It helps you in visualizing various documents (like Task, Projects, Quotatio etc.) based on some status on a virtual board. Also, you can easily update card status by dragging and dropping to required status column. Kanban Board helps to visualize, control and optimize workflow and collaborate in real-time with the entire team. ###Create new Kanban Board diff --git a/foundation/www/docs/user/manual/en/schools/setup/__init__.py b/foundation/www/docs/user/manual/en/education/Assessment/__init__.py similarity index 100% rename from foundation/www/docs/user/manual/en/schools/setup/__init__.py rename to foundation/www/docs/user/manual/en/education/Assessment/__init__.py diff --git a/foundation/www/docs/user/manual/en/education/Assessment/_sidebar.json b/foundation/www/docs/user/manual/en/education/Assessment/_sidebar.json new file mode 100644 index 00000000..88f5aab5 --- /dev/null +++ b/foundation/www/docs/user/manual/en/education/Assessment/_sidebar.json @@ -0,0 +1,22 @@ +[ + { + "route": "/docs", + "title": "Docs Home" + }, + { + "route": "/docs/user", + "title": "User Guide" + }, + { + "route": "/docs/current/api", + "title": "Server API" + }, + { + "route": "/docs/current/models", + "title": "Models (Reference)" + }, + { + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "title": "Improve Docs" + } +] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/schools/Assessment/assessment_criteria.md b/foundation/www/docs/user/manual/en/education/Assessment/assessment_criteria.md similarity index 83% rename from foundation/www/docs/user/manual/en/schools/Assessment/assessment_criteria.md rename to foundation/www/docs/user/manual/en/education/Assessment/assessment_criteria.md index fba3109f..03497409 100644 --- a/foundation/www/docs/user/manual/en/schools/Assessment/assessment_criteria.md +++ b/foundation/www/docs/user/manual/en/education/Assessment/assessment_criteria.md @@ -3,12 +3,12 @@ Assessment Criteria is the parameter based on which you assess the Student. -Assessment Criteria +Assessment Criteria After assessment is conducted for a Course, marks earned are entered based on the Assessment Criteria. For example, if assessment was conducted for science subject, then you can evaluate Student in Science on various criteria like Writing, Practicals, Presentation etc. Assessment Criteria is be used when scheduling Assessment Plan for Student Group and Course. -Assessment Plan Criteria +Assessment Plan Criteria {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/schools/Assessment/assessment_criteria_group.md b/foundation/www/docs/user/manual/en/education/Assessment/assessment_criteria_group.md similarity index 100% rename from foundation/www/docs/user/manual/en/schools/Assessment/assessment_criteria_group.md rename to foundation/www/docs/user/manual/en/education/Assessment/assessment_criteria_group.md diff --git a/foundation/www/docs/user/manual/en/schools/Assessment/assessment_group.md b/foundation/www/docs/user/manual/en/education/Assessment/assessment_group.md similarity index 81% rename from foundation/www/docs/user/manual/en/schools/Assessment/assessment_group.md rename to foundation/www/docs/user/manual/en/education/Assessment/assessment_group.md index 79ed5dcb..f697361b 100644 --- a/foundation/www/docs/user/manual/en/schools/Assessment/assessment_group.md +++ b/foundation/www/docs/user/manual/en/education/Assessment/assessment_group.md @@ -5,10 +5,10 @@ Assessment Group tree is a master where you can define the hierarchy for examina For example, if you conduct two assessment in a academic year, then setup Assessment Group as following. -Assessment Group Term +Assessment Group Term On the same lines, you can also define multiple Assessment Group bases on assessment conducted in your institute. -Assessment Group Term +Assessment Group Term {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/schools/Assessment/assessment_plan.md b/foundation/www/docs/user/manual/en/education/Assessment/assessment_plan.md similarity index 83% rename from foundation/www/docs/user/manual/en/schools/Assessment/assessment_plan.md rename to foundation/www/docs/user/manual/en/education/Assessment/assessment_plan.md index 0d15f631..12d74767 100644 --- a/foundation/www/docs/user/manual/en/schools/Assessment/assessment_plan.md +++ b/foundation/www/docs/user/manual/en/education/Assessment/assessment_plan.md @@ -11,10 +11,10 @@ To schedule an assessment/examination for a Student Group, for specific Course, 4. Examiner and Supervisor -Assessment Plan Details +Assessment Plan Details 5. Assessment Criteria is list of criteria based which each student in will be evaluated and grades will be assigned. -Assessment Plan Criteria +Assessment Plan Criteria {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/schools/Assessment/assessment_result.md b/foundation/www/docs/user/manual/en/education/Assessment/assessment_result.md similarity index 71% rename from foundation/www/docs/user/manual/en/schools/Assessment/assessment_result.md rename to foundation/www/docs/user/manual/en/education/Assessment/assessment_result.md index cd9ba678..5cff1851 100644 --- a/foundation/www/docs/user/manual/en/schools/Assessment/assessment_result.md +++ b/foundation/www/docs/user/manual/en/education/Assessment/assessment_result.md @@ -1,8 +1,8 @@ #Assessment Result -Assessment Result is a log of marks/grades earned by the student for specific Assessment. Assessment Result is created in the backend based on the marks entered in the [Assessment Result Tool](/docs/user/manual/en/schools/assessment/assessment_result_tool.html). +Assessment Result is a log of marks/grades earned by the student for specific Assessment. Assessment Result is created in the backend based on the marks entered in the [Assessment Result Tool](/docs/user/manual/en/education/assessment/assessment_result_tool.html). -Assessment Result +Assessment Result {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/schools/Assessment/assessment_result_tool.md b/foundation/www/docs/user/manual/en/education/Assessment/assessment_result_tool.md similarity index 90% rename from foundation/www/docs/user/manual/en/schools/Assessment/assessment_result_tool.md rename to foundation/www/docs/user/manual/en/education/Assessment/assessment_result_tool.md index 55182267..441e460f 100644 --- a/foundation/www/docs/user/manual/en/schools/Assessment/assessment_result_tool.md +++ b/foundation/www/docs/user/manual/en/education/Assessment/assessment_result_tool.md @@ -3,7 +3,7 @@ Assessment Result Tool help you entering marks earned by the Students for specific course. In this tool, based on the Assessment Plan, all the Student will be fetched into Assessment Result Tool. Also, Columns for Assessment Criteria will be where marks earned can be entered for each Student. -Assessment Result Tool +Assessment Result Tool As you go on entering marks for a Student, and switch to next student, in the backend, Student Result record will be auto-created for that Student. diff --git a/foundation/www/docs/user/manual/en/schools/Assessment/grading_scale.md b/foundation/www/docs/user/manual/en/education/Assessment/grading_scale.md similarity index 86% rename from foundation/www/docs/user/manual/en/schools/Assessment/grading_scale.md rename to foundation/www/docs/user/manual/en/education/Assessment/grading_scale.md index 0874cf14..123408ee 100644 --- a/foundation/www/docs/user/manual/en/schools/Assessment/grading_scale.md +++ b/foundation/www/docs/user/manual/en/education/Assessment/grading_scale.md @@ -3,6 +3,6 @@ In the Grading Scale, you can define various grades and threshold for them. Based on the score earned by an Student for an Assessment, Grade will be assigned. -Grading Scale +Grading Scale {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/schools/Assessment/index.md b/foundation/www/docs/user/manual/en/education/Assessment/index.md similarity index 100% rename from foundation/www/docs/user/manual/en/schools/Assessment/index.md rename to foundation/www/docs/user/manual/en/education/Assessment/index.md diff --git a/foundation/www/docs/user/manual/en/schools/Assessment/index.txt b/foundation/www/docs/user/manual/en/education/Assessment/index.txt similarity index 100% rename from foundation/www/docs/user/manual/en/schools/Assessment/index.txt rename to foundation/www/docs/user/manual/en/education/Assessment/index.txt diff --git a/foundation/www/docs/user/manual/en/schools/student/__init__.py b/foundation/www/docs/user/manual/en/education/Attendance/__init__.py similarity index 100% rename from foundation/www/docs/user/manual/en/schools/student/__init__.py rename to foundation/www/docs/user/manual/en/education/Attendance/__init__.py diff --git a/foundation/www/docs/user/manual/en/education/Attendance/_sidebar.json b/foundation/www/docs/user/manual/en/education/Attendance/_sidebar.json new file mode 100644 index 00000000..88f5aab5 --- /dev/null +++ b/foundation/www/docs/user/manual/en/education/Attendance/_sidebar.json @@ -0,0 +1,22 @@ +[ + { + "route": "/docs", + "title": "Docs Home" + }, + { + "route": "/docs/user", + "title": "User Guide" + }, + { + "route": "/docs/current/api", + "title": "Server API" + }, + { + "route": "/docs/current/models", + "title": "Models (Reference)" + }, + { + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "title": "Improve Docs" + } +] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/schools/Attendance/index.md b/foundation/www/docs/user/manual/en/education/Attendance/index.md similarity index 100% rename from foundation/www/docs/user/manual/en/schools/Attendance/index.md rename to foundation/www/docs/user/manual/en/education/Attendance/index.md diff --git a/foundation/www/docs/user/manual/en/schools/Attendance/index.txt b/foundation/www/docs/user/manual/en/education/Attendance/index.txt similarity index 100% rename from foundation/www/docs/user/manual/en/schools/Attendance/index.txt rename to foundation/www/docs/user/manual/en/education/Attendance/index.txt diff --git a/foundation/www/docs/user/manual/en/schools/Attendance/student-attendance-tool.md b/foundation/www/docs/user/manual/en/education/Attendance/student-attendance-tool.md similarity index 62% rename from foundation/www/docs/user/manual/en/schools/Attendance/student-attendance-tool.md rename to foundation/www/docs/user/manual/en/education/Attendance/student-attendance-tool.md index ce1a2298..058e395f 100644 --- a/foundation/www/docs/user/manual/en/schools/Attendance/student-attendance-tool.md +++ b/foundation/www/docs/user/manual/en/education/Attendance/student-attendance-tool.md @@ -3,14 +3,14 @@ The Student Attendance tool allow you to bulk update the attendance for students based on **Student Group and Course Schedule**. -To mark the **Attendance* based on Student Group select the group based on +To mark the **Attedance* based on Student Group select the group based on **1. Batch 2. Course 3. Activity ** -Student details will be autofetched and you can mark the attendance of the given date. +Student detials will be autofetched and you can mark the attendance of the given date. -Student Attendance +Student Attendance {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/schools/Attendance/student-attendance.md b/foundation/www/docs/user/manual/en/education/Attendance/student-attendance.md similarity index 93% rename from foundation/www/docs/user/manual/en/schools/Attendance/student-attendance.md rename to foundation/www/docs/user/manual/en/education/Attendance/student-attendance.md index d2f25f8c..e576b8c4 100644 --- a/foundation/www/docs/user/manual/en/schools/Attendance/student-attendance.md +++ b/foundation/www/docs/user/manual/en/education/Attendance/student-attendance.md @@ -9,7 +9,7 @@ To create Attendance record : Select the **Student, Course Schedule and Student Group** for which attendance is to be marked for the given date. Set the Status to Present/Absent and save. -Student Attendance +Student Attendance **Student Attendance tool** can be used for bulk updation of the attendance based on **Batch, Course or Activity**. diff --git a/foundation/www/docs/user/manual/en/schools/Attendance/student-leave-application.md b/foundation/www/docs/user/manual/en/education/Attendance/student-leave-application.md similarity index 65% rename from foundation/www/docs/user/manual/en/schools/Attendance/student-leave-application.md rename to foundation/www/docs/user/manual/en/education/Attendance/student-leave-application.md index a32f75fb..4876bb8a 100644 --- a/foundation/www/docs/user/manual/en/schools/Attendance/student-leave-application.md +++ b/foundation/www/docs/user/manual/en/education/Attendance/student-leave-application.md @@ -5,9 +5,9 @@ ERPNext allows you to record the leave application for a student. To create a Student Leave application record, enter the Student and the date for the leave is applied and save. -Student Attendance +Student Attendance -Incase the student is not attending the school in order to participate or represent school in any event, he/she can be mark as present from the Leave Application itself. +Incase the student is not attending the institute in order to participate or represent institute in any event, he/she can be mark as present from the Leave Application itself. Once a Leave Application is recorded for a student it will not be recorded in the absent student report as he has applied for a leave. diff --git a/foundation/www/docs/user/manual/en/subscription/__init__.py b/foundation/www/docs/user/manual/en/education/__init__.py similarity index 100% rename from foundation/www/docs/user/manual/en/subscription/__init__.py rename to foundation/www/docs/user/manual/en/education/__init__.py diff --git a/foundation/www/docs/user/manual/en/education/_sidebar.json b/foundation/www/docs/user/manual/en/education/_sidebar.json new file mode 100644 index 00000000..88f5aab5 --- /dev/null +++ b/foundation/www/docs/user/manual/en/education/_sidebar.json @@ -0,0 +1,22 @@ +[ + { + "route": "/docs", + "title": "Docs Home" + }, + { + "route": "/docs/user", + "title": "User Guide" + }, + { + "route": "/docs/current/api", + "title": "Server API" + }, + { + "route": "/docs/current/models", + "title": "Models (Reference)" + }, + { + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "title": "Improve Docs" + } +] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/es/schools/Assessment/__init__.py b/foundation/www/docs/user/manual/en/education/admission/__init__.py similarity index 100% rename from foundation/www/docs/user/manual/es/schools/Assessment/__init__.py rename to foundation/www/docs/user/manual/en/education/admission/__init__.py diff --git a/foundation/www/docs/user/manual/en/education/admission/_sidebar.json b/foundation/www/docs/user/manual/en/education/admission/_sidebar.json new file mode 100644 index 00000000..88f5aab5 --- /dev/null +++ b/foundation/www/docs/user/manual/en/education/admission/_sidebar.json @@ -0,0 +1,22 @@ +[ + { + "route": "/docs", + "title": "Docs Home" + }, + { + "route": "/docs/user", + "title": "User Guide" + }, + { + "route": "/docs/current/api", + "title": "Server API" + }, + { + "route": "/docs/current/models", + "title": "Models (Reference)" + }, + { + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "title": "Improve Docs" + } +] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/schools/admission/index.md b/foundation/www/docs/user/manual/en/education/admission/index.md similarity index 80% rename from foundation/www/docs/user/manual/en/schools/admission/index.md rename to foundation/www/docs/user/manual/en/education/admission/index.md index 916a220e..f9d0f14c 100644 --- a/foundation/www/docs/user/manual/en/schools/admission/index.md +++ b/foundation/www/docs/user/manual/en/education/admission/index.md @@ -1,7 +1,7 @@ # Admission -The Admission section allow you to create all records starting from Student application till the program enrollment. Below is the list of documents for Student admission. +The Admission section allow you to create all records starting from Student application till the program enrollment. Below is the list of documents for Student addmission. ### Topics diff --git a/foundation/www/docs/user/manual/en/schools/admission/index.txt b/foundation/www/docs/user/manual/en/education/admission/index.txt similarity index 100% rename from foundation/www/docs/user/manual/en/schools/admission/index.txt rename to foundation/www/docs/user/manual/en/education/admission/index.txt diff --git a/foundation/www/docs/user/manual/en/schools/admission/program-enrollment-tool.md b/foundation/www/docs/user/manual/en/education/admission/program-enrollment-tool.md similarity index 82% rename from foundation/www/docs/user/manual/en/schools/admission/program-enrollment-tool.md rename to foundation/www/docs/user/manual/en/education/admission/program-enrollment-tool.md index bf729b5a..e5719a3a 100644 --- a/foundation/www/docs/user/manual/en/schools/admission/program-enrollment-tool.md +++ b/foundation/www/docs/user/manual/en/education/admission/program-enrollment-tool.md @@ -8,10 +8,10 @@ You can create the the Program Enrollment for : 1. **Student Applicants** >> List of Student Applicants will be fetched for the selected **Program** and **Academic year**. -Student Applicant Enrollment +Student Applicant Enrollment 2. **Program Enrollment** >> You can bulk update the **Program** for the students from one academic year to another in the same **Program** or a new **Program**. -Student Applicant Enrollment +Student Applicant Enrollment {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/schools/admission/program-enrollment.md b/foundation/www/docs/user/manual/en/education/admission/program-enrollment.md similarity index 83% rename from foundation/www/docs/user/manual/en/schools/admission/program-enrollment.md rename to foundation/www/docs/user/manual/en/education/admission/program-enrollment.md index 9fb8141e..2b80c11c 100644 --- a/foundation/www/docs/user/manual/en/schools/admission/program-enrollment.md +++ b/foundation/www/docs/user/manual/en/education/admission/program-enrollment.md @@ -5,9 +5,9 @@ Program Enrollment describes an educational model where students must complete a Once a student have applied for the **Program** and the application is approved, the program enrollment is done for that student. -Student Applicant Enrollment +Student Applicant Enrollment -- A student can be enrolled in multiple Course for a program in a given academic year. -- Based on the Fee structure selected at the time of enrollment Fee details are created of the student. +- A student can be enrolled in multiple Course for a program in a given academeic year. +- Based on the Fee structure selected at the time of enrollment Fee detials are created of the student. {next} diff --git a/foundation/www/docs/user/manual/en/schools/admission/student-applicant.md b/foundation/www/docs/user/manual/en/education/admission/student-applicant.md similarity index 83% rename from foundation/www/docs/user/manual/en/schools/admission/student-applicant.md rename to foundation/www/docs/user/manual/en/education/admission/student-applicant.md index 8a5a21a9..3e1f1b50 100644 --- a/foundation/www/docs/user/manual/en/schools/admission/student-applicant.md +++ b/foundation/www/docs/user/manual/en/education/admission/student-applicant.md @@ -4,7 +4,7 @@ A Student Applicant record needs to be created when a student applies for a program at your institute. You can Approve or Reject a student applicant. By accepting a student applicant you can add them to the student master. -Student Applicant +Student Applicant ### Application Status @@ -21,11 +21,11 @@ You can Approve or Reject a student applicant. By accepting a student applicant ### Student Enrollment Once the form is submitted you can either approve or reject the application form. -Student Applicant Enrollment +Student Applicant Enrollment -Once you approve a Student Applicant you can enroll them to a program. When you click the 'Enroll' button, -the system shall create a student against that applicant and redirect you to the [Program Enrollment form](/docs/user/manual/en/schools/student/program-enrollment.html). +Once you approve a Student Applicant you can enroll them to a program. When you click the 'Enroll' buttom, +the system shall create a student against that applicant and redirect you to the [Program Enrollment form](/docs/user/manual/en/education/student/program-enrollment.html). -Student Applicant Enrollment +Student Applicant Enrollment {next} diff --git a/foundation/www/docs/user/manual/en/education/admission/student_admission.md b/foundation/www/docs/user/manual/en/education/admission/student_admission.md new file mode 100644 index 00000000..c89874f5 --- /dev/null +++ b/foundation/www/docs/user/manual/en/education/admission/student_admission.md @@ -0,0 +1,15 @@ + +# Student Admission + +The admission process begins with filling the admission form. The Student Admission record enables to initiate your admission process for a given **Academic year**. ERPNext admission module allows you to create an admission record which can be then published on the ERPNext generate website. + +To create a Student Admission record go to : + +**education** >> **Admissions** >> **Student Admission** >> + + +Student Applicant + +Once an admission record is created, the age eligibility criteria can be determined for the every program. Similarly, you can also determine the application fee and naming series for every student applicant. If you keep the naming series blank then the default naming series will be applied for every student applicant. + +The information provided in the Student Admission records will be used for the validation and creation of the Student Admission records (only if student admission link is filled there) \ No newline at end of file diff --git a/foundation/www/docs/user/manual/es/schools/__init__.py b/foundation/www/docs/user/manual/en/education/fees/__init__.py similarity index 100% rename from foundation/www/docs/user/manual/es/schools/__init__.py rename to foundation/www/docs/user/manual/en/education/fees/__init__.py diff --git a/foundation/www/docs/user/manual/en/education/fees/_sidebar.json b/foundation/www/docs/user/manual/en/education/fees/_sidebar.json new file mode 100644 index 00000000..88f5aab5 --- /dev/null +++ b/foundation/www/docs/user/manual/en/education/fees/_sidebar.json @@ -0,0 +1,22 @@ +[ + { + "route": "/docs", + "title": "Docs Home" + }, + { + "route": "/docs/user", + "title": "User Guide" + }, + { + "route": "/docs/current/api", + "title": "Server API" + }, + { + "route": "/docs/current/models", + "title": "Models (Reference)" + }, + { + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "title": "Improve Docs" + } +] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/schools/fees/fee-category.md b/foundation/www/docs/user/manual/en/education/fees/fee-category.md similarity index 81% rename from foundation/www/docs/user/manual/en/schools/fees/fee-category.md rename to foundation/www/docs/user/manual/en/education/fees/fee-category.md index 7994a317..0b67a529 100644 --- a/foundation/www/docs/user/manual/en/schools/fees/fee-category.md +++ b/foundation/www/docs/user/manual/en/education/fees/fee-category.md @@ -3,6 +3,6 @@ List of all different type of fees collected. -Fees Category +Fees Category {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/education/fees/fee-structure.md b/foundation/www/docs/user/manual/en/education/fees/fee-structure.md new file mode 100644 index 00000000..3e173e65 --- /dev/null +++ b/foundation/www/docs/user/manual/en/education/fees/fee-structure.md @@ -0,0 +1,24 @@ + +# Fee Structure + +A Fee Structure is a template that can be used while making Fees records or generating them via the Fee Schedule. In the Accounts section, you can set also the different accounts as for the Fees is an accounting transaction. + +You can create the Fee Structure directly from + +> Education > Fees > Fee Structure > New Fee Structure + +or you can create the Fee Structure from Program also. + +Fees Structure + +#### Academic Year Impact + +If the Fee amount doesn't change every academic year then Fee Structure can be created without the Acadamic year. In doing so, the same Fee Structure can be used every academic year until the Fees for that particular program doesn't change. Still you can set the academic year and term while creating the Fees or Fee Schedule records. + +#### Accounting Impact + +You can set the "Income Account" and "Receivable Account" in the Accounts section which refers to an Account of you [Chart of Accounts](/docs/user/manual/en/accounts/chart-of-accounts.md). You must also mention the Cost Center in which your income will be booked. + +If you are going to use this in the Fee Schedule, you must select the Accounts carefully as Fee Schedule updates the respected Accounts in bulk. + +{next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/education/fees/fees.md b/foundation/www/docs/user/manual/en/education/fees/fees.md new file mode 100644 index 00000000..1acdf052 --- /dev/null +++ b/foundation/www/docs/user/manual/en/education/fees/fees.md @@ -0,0 +1,9 @@ + +# Fees + +Maintain a record of fees collected from students. +The [Fee Structure](/docs/user/manual/en/education/fees/fee-structure.html) is fetched based on the selected Program and Academic Term. + +Fees + +{next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/schools/fees/index.md b/foundation/www/docs/user/manual/en/education/fees/index.md similarity index 82% rename from foundation/www/docs/user/manual/en/schools/fees/index.md rename to foundation/www/docs/user/manual/en/education/fees/index.md index ec90139c..46952ec7 100644 --- a/foundation/www/docs/user/manual/en/schools/fees/index.md +++ b/foundation/www/docs/user/manual/en/education/fees/index.md @@ -3,7 +3,7 @@ This section contains 'Fee' related documents. -Fees Section +Fees Section ### Topics diff --git a/foundation/www/docs/user/manual/en/schools/fees/index.txt b/foundation/www/docs/user/manual/en/education/fees/index.txt similarity index 100% rename from foundation/www/docs/user/manual/en/schools/fees/index.txt rename to foundation/www/docs/user/manual/en/education/fees/index.txt diff --git a/foundation/www/docs/user/manual/en/education/index.md b/foundation/www/docs/user/manual/en/education/index.md new file mode 100644 index 00000000..db28dfc1 --- /dev/null +++ b/foundation/www/docs/user/manual/en/education/index.md @@ -0,0 +1,9 @@ + +# Education + + +The Education Domain in ERPNext is designed to meet requirements of any educational Institute whether that is a school, college or any other private firm. ERPNext provides a centralized system, which can be used to maintain and update all the activities related to an Institution. It will provide a complete package for every funcationality required in any institute like Online Admission, Fees, Attendance, Examination. + +Fees Section + +{index} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/schools/index.txt b/foundation/www/docs/user/manual/en/education/index.txt similarity index 100% rename from foundation/www/docs/user/manual/en/schools/index.txt rename to foundation/www/docs/user/manual/en/education/index.txt diff --git a/foundation/www/docs/user/manual/es/schools/admission/__init__.py b/foundation/www/docs/user/manual/en/education/schedule/__init__.py similarity index 100% rename from foundation/www/docs/user/manual/es/schools/admission/__init__.py rename to foundation/www/docs/user/manual/en/education/schedule/__init__.py diff --git a/foundation/www/docs/user/manual/en/education/schedule/_sidebar.json b/foundation/www/docs/user/manual/en/education/schedule/_sidebar.json new file mode 100644 index 00000000..88f5aab5 --- /dev/null +++ b/foundation/www/docs/user/manual/en/education/schedule/_sidebar.json @@ -0,0 +1,22 @@ +[ + { + "route": "/docs", + "title": "Docs Home" + }, + { + "route": "/docs/user", + "title": "User Guide" + }, + { + "route": "/docs/current/api", + "title": "Server API" + }, + { + "route": "/docs/current/models", + "title": "Models (Reference)" + }, + { + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "title": "Improve Docs" + } +] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/schools/schedule/course-schedule.md b/foundation/www/docs/user/manual/en/education/schedule/course-schedule.md similarity index 85% rename from foundation/www/docs/user/manual/en/schools/schedule/course-schedule.md rename to foundation/www/docs/user/manual/en/education/schedule/course-schedule.md index a3af2a51..d4848005 100644 --- a/foundation/www/docs/user/manual/en/schools/schedule/course-schedule.md +++ b/foundation/www/docs/user/manual/en/education/schedule/course-schedule.md @@ -4,13 +4,13 @@ Course Schedule is the schedule of a session conducted by an Instructor for a particular Course. You can see the overall course schedule in the Calendar view. -Course Schedule +Course Schedule ### Marking Attendance You can mark attendance for a Student Group against a Course Schedule. -Course Schedule Attendance +Course Schedule Attendance - To make attendance, expand the attendance section. - Check the students who were present for that session. @@ -21,6 +21,6 @@ You can mark attendance for a Student Group against a Course Schedule. Once you have marked Attendance against a Course Schedule the Attendance section in the Course Schedule shall be hidden. A View Attendance button shall appear. Click on that button to view all attendance records created against that Course Schedule. -Course Schedule Attendance +Course Schedule Attendance {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/schools/schedule/examination.md b/foundation/www/docs/user/manual/en/education/schedule/examination.md similarity index 84% rename from foundation/www/docs/user/manual/en/schools/schedule/examination.md rename to foundation/www/docs/user/manual/en/education/schedule/examination.md index bd604501..63ef7633 100644 --- a/foundation/www/docs/user/manual/en/schools/schedule/examination.md +++ b/foundation/www/docs/user/manual/en/education/schedule/examination.md @@ -3,7 +3,7 @@ The Examination record can be used to track the exam schedule and the results of that exam. -Examination +Examination {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/schools/schedule/index.md b/foundation/www/docs/user/manual/en/education/schedule/index.md similarity index 72% rename from foundation/www/docs/user/manual/en/schools/schedule/index.md rename to foundation/www/docs/user/manual/en/education/schedule/index.md index e8176587..bb3ff65c 100644 --- a/foundation/www/docs/user/manual/en/schools/schedule/index.md +++ b/foundation/www/docs/user/manual/en/education/schedule/index.md @@ -1,7 +1,7 @@ # Schedule -Schedule Section +Schedule Section ### Topics diff --git a/foundation/www/docs/user/manual/en/schools/schedule/index.txt b/foundation/www/docs/user/manual/en/education/schedule/index.txt similarity index 100% rename from foundation/www/docs/user/manual/en/schools/schedule/index.txt rename to foundation/www/docs/user/manual/en/education/schedule/index.txt diff --git a/foundation/www/docs/user/manual/en/schools/schedule/scheduling-tool.md b/foundation/www/docs/user/manual/en/education/schedule/scheduling-tool.md similarity index 96% rename from foundation/www/docs/user/manual/en/schools/schedule/scheduling-tool.md rename to foundation/www/docs/user/manual/en/education/schedule/scheduling-tool.md index 82ba0075..0594c828 100644 --- a/foundation/www/docs/user/manual/en/schools/schedule/scheduling-tool.md +++ b/foundation/www/docs/user/manual/en/education/schedule/scheduling-tool.md @@ -3,7 +3,7 @@ This tool can be used to create 'Course Schedules'. -Scheduling Tool +Scheduling Tool ### Creating Course Schedules diff --git a/foundation/www/docs/user/manual/es/schools/fees/__init__.py b/foundation/www/docs/user/manual/en/education/setup/__init__.py similarity index 100% rename from foundation/www/docs/user/manual/es/schools/fees/__init__.py rename to foundation/www/docs/user/manual/en/education/setup/__init__.py diff --git a/foundation/www/docs/user/manual/en/education/setup/_sidebar.json b/foundation/www/docs/user/manual/en/education/setup/_sidebar.json new file mode 100644 index 00000000..88f5aab5 --- /dev/null +++ b/foundation/www/docs/user/manual/en/education/setup/_sidebar.json @@ -0,0 +1,22 @@ +[ + { + "route": "/docs", + "title": "Docs Home" + }, + { + "route": "/docs/user", + "title": "User Guide" + }, + { + "route": "/docs/current/api", + "title": "Server API" + }, + { + "route": "/docs/current/models", + "title": "Models (Reference)" + }, + { + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "title": "Improve Docs" + } +] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/schools/setup/academic-term.md b/foundation/www/docs/user/manual/en/education/setup/academic-term.md similarity index 87% rename from foundation/www/docs/user/manual/en/schools/setup/academic-term.md rename to foundation/www/docs/user/manual/en/education/setup/academic-term.md index 2ace79ac..57f81809 100644 --- a/foundation/www/docs/user/manual/en/schools/setup/academic-term.md +++ b/foundation/www/docs/user/manual/en/education/setup/academic-term.md @@ -1,11 +1,11 @@ # Academic Term -An academic term (or simply "term") is a portion of an academic year, the time during which an educational institution holds classes. The schedules adopted vary widely. The academic term can be a quarter, trimester or a semester. +An academic term (or simply "term") is a portion of an academic year, the time during which an educational institution holds classes. The schedules adopted vary widely. The academic term can be a quater, trimester or a semester. The **Academic term** form in ERPNext enables you to create academic terms within in a year. Based on the term schedule enter the start and end date for the schedule and generate the term for a Academic year. -Academic Term +Academic Term {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/schools/setup/academic-year.md b/foundation/www/docs/user/manual/en/education/setup/academic-year.md similarity index 65% rename from foundation/www/docs/user/manual/en/schools/setup/academic-year.md rename to foundation/www/docs/user/manual/en/education/setup/academic-year.md index 5025dd46..f6878444 100644 --- a/foundation/www/docs/user/manual/en/schools/setup/academic-year.md +++ b/foundation/www/docs/user/manual/en/education/setup/academic-year.md @@ -1,11 +1,11 @@ # Academic Year -An academic year is a period of time which schools, colleges and universities use to measure a quantity of study. +An academic year is a period of time which education, colleges and universities use to measure a quantity of study. The **Academic year** form have the Start and End date for the Academic year. -Academic Year +Academic Year **Student group** link is given to view or add the respective groups to the Academic year. diff --git a/foundation/www/docs/user/manual/en/schools/setup/course.md b/foundation/www/docs/user/manual/en/education/setup/course.md similarity index 80% rename from foundation/www/docs/user/manual/en/schools/setup/course.md rename to foundation/www/docs/user/manual/en/education/setup/course.md index 596051e0..427f5fe5 100644 --- a/foundation/www/docs/user/manual/en/schools/setup/course.md +++ b/foundation/www/docs/user/manual/en/education/setup/course.md @@ -5,11 +5,11 @@ To create a **Course** enter the Course name and Code. Code for the course should be unique for every course. You can also link the department under which the course is conducted. -Course +Course Once a **Course** is created, a course schedule can defined for the same. -Course +Course The Course form is further linked to **Program, Student Group and Assessment Plan** doctypes. The links allow to view/create the related documents for a **Course**. diff --git a/foundation/www/docs/user/manual/en/education/setup/index.md b/foundation/www/docs/user/manual/en/education/setup/index.md new file mode 100644 index 00000000..b93c8b28 --- /dev/null +++ b/foundation/www/docs/user/manual/en/education/setup/index.md @@ -0,0 +1,10 @@ + +# Setup + +The Setup section of education module provides facility to make some basic configuration. Below are doctypes for basic configuration. + +Setup Section + +### Topics + +{index} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/schools/setup/index.txt b/foundation/www/docs/user/manual/en/education/setup/index.txt similarity index 84% rename from foundation/www/docs/user/manual/en/schools/setup/index.txt rename to foundation/www/docs/user/manual/en/education/setup/index.txt index 8fb9bb2d..9f88c5de 100644 --- a/foundation/www/docs/user/manual/en/schools/setup/index.txt +++ b/foundation/www/docs/user/manual/en/education/setup/index.txt @@ -6,4 +6,4 @@ student-category student-batch-name academic-term academic-year -school-settings \ No newline at end of file +education-settings \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/education/setup/instructor.md b/foundation/www/docs/user/manual/en/education/setup/instructor.md new file mode 100644 index 00000000..c719aa04 --- /dev/null +++ b/foundation/www/docs/user/manual/en/education/setup/instructor.md @@ -0,0 +1,19 @@ + +# Instructor + +An instructoe is a teacher, or professor, of a specialised subject that involves skill. + +You can create an Instructor and link it to the Employee master and a Departmemt. + +Instructor + +An **Instructor** is further linked to a **Course Schedule**, where you can define the schedule for a **Course** for a give date and **Room no**. + +Instructor +It is also linked to **Student group** where an **Instructor** is assigned to the Student group. + +Instructor + +An **Instructor** is also linked to an **Assesment Plan** for a Student group. The Instructor can be an Examiner or the supervisor for the assesment. + +{next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/schools/setup/program.md b/foundation/www/docs/user/manual/en/education/setup/program.md similarity index 56% rename from foundation/www/docs/user/manual/en/schools/setup/program.md rename to foundation/www/docs/user/manual/en/education/setup/program.md index 1384f687..1552b5a5 100644 --- a/foundation/www/docs/user/manual/en/schools/setup/program.md +++ b/foundation/www/docs/user/manual/en/education/setup/program.md @@ -5,16 +5,16 @@ An educational program is a program written by the institutions which determines To create a Program go to : -###Schools >> Setup >> Program >> New Program +###education >> Setup >> Program >> New Program Enter a unique code for every **Program**. You can also link the **Program** to the department under which it is conducted. -Program +Program Add the relevant Course and the Fee details for a program. -Program +Program -The Program Doctype is further linked to the **Student applicant**, **Program enrollment, Student group, Fee structure and Fee**. The links allow to view or create the related document for a Program. +The Program Doctype is further linked to the **Student applicant**, **Program enrollment, Student group, Fee structre and Fee**. The links allow to view or create the related document for a Program. {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/schools/setup/room.md b/foundation/www/docs/user/manual/en/education/setup/room.md similarity index 73% rename from foundation/www/docs/user/manual/en/schools/setup/room.md rename to foundation/www/docs/user/manual/en/education/setup/room.md index bfdb3edd..d184e6ef 100644 --- a/foundation/www/docs/user/manual/en/schools/setup/room.md +++ b/foundation/www/docs/user/manual/en/education/setup/room.md @@ -5,14 +5,14 @@ A classroom is a space (room or lab) where you want to schedule courses or exami The Room doctype allows you to record the room number and the seating capacity for a classroom. Once a room is created Course schedule link is provided in the Room doctype to view or add the course schedule for the classroom. -Room +Room The course schedule validate the availability of the Room number and an alert message is shown if there is an overlap for the Room number for a given time slot. -Room +Room The Room number is further linked to the Assesment plan. It validates the availability of examination room for the assessment to be held for a given date and time. -Room +Room {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/education/setup/school-settings.md b/foundation/www/docs/user/manual/en/education/setup/school-settings.md new file mode 100644 index 00000000..cd87239b --- /dev/null +++ b/foundation/www/docs/user/manual/en/education/setup/school-settings.md @@ -0,0 +1,16 @@ + +# Education Settings + +The Education Settings page allow you to setup basic settings like **Academic Year and Term** for the educational setup. + +Student + +The checkbox to Validate Batch for Students in Student Group enables the Student Batch validation for every Student from the Program Enrollment for the **Batch** based on **Student Group** + +Student + +You can enable the validation of Course for every Student from the enrolled Courses in Program Enrollment,for Course based Student Group by checking the settings for **Validate Enrolled Course for Students in Student Group** + +Student + +{next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/schools/setup/student-batch-name.md b/foundation/www/docs/user/manual/en/education/setup/student-batch-name.md similarity index 81% rename from foundation/www/docs/user/manual/en/schools/setup/student-batch-name.md rename to foundation/www/docs/user/manual/en/education/setup/student-batch-name.md index 33768684..261ee0cf 100644 --- a/foundation/www/docs/user/manual/en/schools/setup/student-batch-name.md +++ b/foundation/www/docs/user/manual/en/education/setup/student-batch-name.md @@ -3,7 +3,7 @@ Student batch is a collection of students from Student Groups. **Student batch** allows you to create **Student Group** based on a batch. When a student is enrolled for a **Program**, the Student batch is selected to enroll the student for the given Program and batch -Student +Student You can also get a **Student Batch-Wise Attendance** report to view the number of student present from the Batch. diff --git a/foundation/www/docs/user/manual/en/schools/setup/student-category.md b/foundation/www/docs/user/manual/en/education/setup/student-category.md similarity index 80% rename from foundation/www/docs/user/manual/en/schools/setup/student-category.md rename to foundation/www/docs/user/manual/en/education/setup/student-category.md index 53423fae..bfaf4c7f 100644 --- a/foundation/www/docs/user/manual/en/schools/setup/student-category.md +++ b/foundation/www/docs/user/manual/en/education/setup/student-category.md @@ -7,7 +7,7 @@ To create Student category go to Setup >> Student Category >> New. We can create new student category by adding a name and save it -Student +Student {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/es/schools/schedule/__init__.py b/foundation/www/docs/user/manual/en/education/student/__init__.py similarity index 100% rename from foundation/www/docs/user/manual/es/schools/schedule/__init__.py rename to foundation/www/docs/user/manual/en/education/student/__init__.py diff --git a/foundation/www/docs/user/manual/en/education/student/_sidebar.json b/foundation/www/docs/user/manual/en/education/student/_sidebar.json new file mode 100644 index 00000000..88f5aab5 --- /dev/null +++ b/foundation/www/docs/user/manual/en/education/student/_sidebar.json @@ -0,0 +1,22 @@ +[ + { + "route": "/docs", + "title": "Docs Home" + }, + { + "route": "/docs/user", + "title": "User Guide" + }, + { + "route": "/docs/current/api", + "title": "Server API" + }, + { + "route": "/docs/current/models", + "title": "Models (Reference)" + }, + { + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "title": "Improve Docs" + } +] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/schools/student/guardian.md b/foundation/www/docs/user/manual/en/education/student/guardian.md similarity index 72% rename from foundation/www/docs/user/manual/en/schools/student/guardian.md rename to foundation/www/docs/user/manual/en/education/student/guardian.md index be92e1cd..6f291857 100644 --- a/foundation/www/docs/user/manual/en/schools/student/guardian.md +++ b/foundation/www/docs/user/manual/en/education/student/guardian.md @@ -3,7 +3,7 @@ The Guardian doctype allows you to record the guardian details for a **Student**. -Student +Student The email id added in the **Guardian** detail can be linked to a email group for sending newsletter or announcements. diff --git a/foundation/www/docs/user/manual/en/schools/student/index.md b/foundation/www/docs/user/manual/en/education/student/index.md similarity index 100% rename from foundation/www/docs/user/manual/en/schools/student/index.md rename to foundation/www/docs/user/manual/en/education/student/index.md diff --git a/foundation/www/docs/user/manual/en/schools/student/index.txt b/foundation/www/docs/user/manual/en/education/student/index.txt similarity index 100% rename from foundation/www/docs/user/manual/en/schools/student/index.txt rename to foundation/www/docs/user/manual/en/education/student/index.txt diff --git a/foundation/www/docs/user/manual/en/schools/student/student-batch.md b/foundation/www/docs/user/manual/en/education/student/student-batch.md similarity index 81% rename from foundation/www/docs/user/manual/en/schools/student/student-batch.md rename to foundation/www/docs/user/manual/en/education/student/student-batch.md index 33768684..261ee0cf 100644 --- a/foundation/www/docs/user/manual/en/schools/student/student-batch.md +++ b/foundation/www/docs/user/manual/en/education/student/student-batch.md @@ -3,7 +3,7 @@ Student batch is a collection of students from Student Groups. **Student batch** allows you to create **Student Group** based on a batch. When a student is enrolled for a **Program**, the Student batch is selected to enroll the student for the given Program and batch -Student +Student You can also get a **Student Batch-Wise Attendance** report to view the number of student present from the Batch. diff --git a/foundation/www/docs/user/manual/en/schools/student/student-group-creation-tool.md b/foundation/www/docs/user/manual/en/education/student/student-group-creation-tool.md similarity index 84% rename from foundation/www/docs/user/manual/en/schools/student/student-group-creation-tool.md rename to foundation/www/docs/user/manual/en/education/student/student-group-creation-tool.md index 7bb259b6..079f5e0b 100644 --- a/foundation/www/docs/user/manual/en/schools/student/student-group-creation-tool.md +++ b/foundation/www/docs/user/manual/en/education/student/student-group-creation-tool.md @@ -5,11 +5,11 @@ The Student group creation tool allows you to create student groups in bulk. To create Student group using this tool go to -##Schools >>Student >> Student Group creation tool +##education >>Student >> Student Group creation tool Select the **Academic Term** and the **Program** for which a student group is to be created. -Student Group Creation Tool +Student Group Creation Tool By default the student group is created based on the **Course** only. The check box for "Separate course based Group for every Batch" allows you to create batchwise Student groups for a course. diff --git a/foundation/www/docs/user/manual/en/schools/student/student-group.md b/foundation/www/docs/user/manual/en/education/student/student-group.md similarity index 59% rename from foundation/www/docs/user/manual/en/schools/student/student-group.md rename to foundation/www/docs/user/manual/en/education/student/student-group.md index 56c7a8a7..f3fe200c 100644 --- a/foundation/www/docs/user/manual/en/schools/student/student-group.md +++ b/foundation/www/docs/user/manual/en/education/student/student-group.md @@ -7,17 +7,17 @@ A Student Group needs to be created for every course for **Academic Term** and * To create a Student Group go to: -Schools >> Student >> New Student Group +education >> Student >> New Student Group -Student Group +Student Group -To create a Student group based on **Batch**, select the **Program** and **Batch**, where as to create a Student group based on **Course**, you will only have to select the Course Code. Creating a student group based on activity allows you to group of student for events and activities happening in the institute. +To create a Student group based on **Batch**, select the **Progam** and **Batch**, where as to create a Student group based on **Course**, you will only have to select the Course Code. Creating a student group based on activity allows you to group of student for events and activities happening in the institute. Once a student group is created you can mark attendance for the group. -Student Group +Student Group -You can also update the **Email Group** for the Student Group. Click on Update Email Group to add all the email ids of the guardians in the respective email group and **Newsletter** can be created and sent to the Email group. +You can also update the **Email Group** for the Student Group. Click on Update Email Group to add all the email ids of the gaurdians in the respective email group and **Newsletter** can be created and sent to the Email group. {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/schools/student/student-log.md b/foundation/www/docs/user/manual/en/education/student/student-log.md similarity index 50% rename from foundation/www/docs/user/manual/en/schools/student/student-log.md rename to foundation/www/docs/user/manual/en/education/student/student-log.md index 7963fd02..6d26622e 100644 --- a/foundation/www/docs/user/manual/en/schools/student/student-log.md +++ b/foundation/www/docs/user/manual/en/education/student/student-log.md @@ -1,10 +1,10 @@ # Student Log -The Student log Doctype enables you to add and edit additional information for a student. +The Student log Doctype enables you to add and edit addtional information for a student. You can make a note of student activities using Student log. Logs can be categorised as 'General', 'Academic', 'Medical' or 'Achievement' -Student +Student {next} diff --git a/foundation/www/docs/user/manual/en/schools/student/student.md b/foundation/www/docs/user/manual/en/education/student/student.md similarity index 60% rename from foundation/www/docs/user/manual/en/schools/student/student.md rename to foundation/www/docs/user/manual/en/education/student/student.md index 8872c48f..e2a98a0e 100644 --- a/foundation/www/docs/user/manual/en/schools/student/student.md +++ b/foundation/www/docs/user/manual/en/education/student/student.md @@ -2,10 +2,10 @@ # Student A Student is a person who has enrolled at your institute and you have accepted their application. -The Student doctype maintains details like personal information, date of birth, address etc. It also records the **Guardian** and sibling details. +The Student doctype maintains detials like personal information, date of birth, address etc. It also records the **Guardian** and sibling details. -Student -The student is enrolled in a **Program** when the application is approved. Once the enrollment is done the **Student Applicant** status is update to Admitted. +Student +The student is enrolled in a **Program** when the application is approved. Once the enrollement is done the **Student Applicant** status is update to Admitted. You can view every doctype created for a particular student. Eg : Fees, Student Group, etc diff --git a/foundation/www/docs/user/manual/en/fleet_management/index.md b/foundation/www/docs/user/manual/en/fleet_management/index.md index 941cb28d..f72328cf 100644 --- a/foundation/www/docs/user/manual/en/fleet_management/index.md +++ b/foundation/www/docs/user/manual/en/fleet_management/index.md @@ -20,15 +20,15 @@ ERPNext > Vehicle * Enter License Plate,Make,Model,Odometer Value,Fuel Type and Fuel UOM for a quick entry. - Vehicle + Vehicle * Enter details like Insurance,Chassis,Vehicle Value,Location and Employee. - Vehicle + Vehicle * Enter Vehicle attributes like color,wheels,doors and last carbon check - Vehicle + Vehicle ### Vehicle Log @@ -40,17 +40,17 @@ ERPNext > Vehicle Log * Enter License Plate,Employee,Date,Odometer reading for a quick entry. - Vehicle Log + Vehicle Log * Enter Refuelling details,Service details if applicable. - Vehicle Log + Vehicle Log ### Make Expense Claim * Click on Make Expense Claim button .This button appears only in case of Submitted Vehicle Logs. - Vehicle Log + Vehicle Log When you click on 'Make Expense Claim', @@ -58,10 +58,10 @@ When you click on 'Make Expense Claim', 2. The sum of Fuel Expenses and Service Expenses is copied over to Expense Claim Amount. 3. Employee can submit the Expense Claim for further processing. - Vehicle Log + Vehicle Log ### Vehicle Expenses Report * To track and monitor Vehicle Expenses you can use the Vehicle Expenses report.This report gives a one stop view of all your vehicle expenses month wise. - Vehicle Log + Vehicle Log diff --git a/foundation/www/docs/user/manual/en/healthcare/appointment.md b/foundation/www/docs/user/manual/en/healthcare/appointment.md index 2ee90307..266f0941 100755 --- a/foundation/www/docs/user/manual/en/healthcare/appointment.md +++ b/foundation/www/docs/user/manual/en/healthcare/appointment.md @@ -13,7 +13,7 @@ If you have a front desk executive to manage your appointments, you can configur ERPNext Healthcare -After Booking, the scheduled time of the Appointment and duration will be updated and saved in the document. +After Booking, the scheduled time of the Appointment and duration will be updated and seved in the document. ERPNext Healthcare diff --git a/foundation/www/docs/user/manual/en/hospitality/_sidebar.json b/foundation/www/docs/user/manual/en/hospitality/_sidebar.json new file mode 100644 index 00000000..88f5aab5 --- /dev/null +++ b/foundation/www/docs/user/manual/en/hospitality/_sidebar.json @@ -0,0 +1,22 @@ +[ + { + "route": "/docs", + "title": "Docs Home" + }, + { + "route": "/docs/user", + "title": "User Guide" + }, + { + "route": "/docs/current/api", + "title": "Server API" + }, + { + "route": "/docs/current/models", + "title": "Models (Reference)" + }, + { + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "title": "Improve Docs" + } +] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/hospitality/index.md b/foundation/www/docs/user/manual/en/hospitality/index.md new file mode 100644 index 00000000..9311135a --- /dev/null +++ b/foundation/www/docs/user/manual/en/hospitality/index.md @@ -0,0 +1,10 @@ + +# Hospitality + +ERPNext Hospitality module is designed to handle workflows for Hotels and Restaurants. This is still in early development stage. + +### Manage Restaurants + +The Restaurant module in ERPNext will help you manage a chain of restaurants. You can create Restaurants, Menus, Tables, Reservations and a manage Order Entry and Billing. + +{index} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/hospitality/index.txt b/foundation/www/docs/user/manual/en/hospitality/index.txt new file mode 100644 index 00000000..cbe6da00 --- /dev/null +++ b/foundation/www/docs/user/manual/en/hospitality/index.txt @@ -0,0 +1,4 @@ +restaurant +restaurant-menu +reservations +order-entry \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/hospitality/order-entry.md b/foundation/www/docs/user/manual/en/hospitality/order-entry.md new file mode 100644 index 00000000..663b9822 --- /dev/null +++ b/foundation/www/docs/user/manual/en/hospitality/order-entry.md @@ -0,0 +1,27 @@ + +# Restaurant Order Entry + +The Restaurant Order Entry is the screen where the waiters will punch in orders related to a particular table. + +This screen makes it easy for the waiters in your restaurant to punch in orders from various tables. + +When the guest places an order, the waiter will select the table number and add the items in the Order Entry. This can be changed until it is time for the bill. Unless you bill a table, you can change the items and they will automatically appear when you select the table ID. + +To place an order you can select an item and click the enter key so that the item will be updated in the items table. + +Order Entry + +You can also choose items with the POS style item selector. + +### Billing + +When it is time for billing, you just choose the bill and you can select the customer and mode of payment. On saving, a Sales Invoice is generated and the order section becomes empty. + +Order Entry + +### Sales Invoice + +To print the invoice, you can click on the Invoice Link and print the invoice + +Sales Invoice + diff --git a/foundation/www/docs/user/manual/en/hospitality/reservations.md b/foundation/www/docs/user/manual/en/hospitality/reservations.md new file mode 100644 index 00000000..545dc43c --- /dev/null +++ b/foundation/www/docs/user/manual/en/hospitality/reservations.md @@ -0,0 +1,14 @@ + +# Restaurant Reservations + +Once you have setup the restaurant and tables, you can start taking in reservations for your restaurant. + +To take a reservation, just make a new Restaurant Reservation from the Restaurant Page and set the time, number of people and name of the guest. + +Reservation + +### Kanban + +As your guests walk in, You can also manage the reservations by making a simple Kanban board for the same. + +Reservation Kanban Board diff --git a/foundation/www/docs/user/manual/en/hospitality/restaurant-menu.md b/foundation/www/docs/user/manual/en/hospitality/restaurant-menu.md new file mode 100644 index 00000000..9495382c --- /dev/null +++ b/foundation/www/docs/user/manual/en/hospitality/restaurant-menu.md @@ -0,0 +1,8 @@ + +# Restaurant Menu + +For every restaurant you must set an active Restaurant Menu from which orders can be placed. You can also set the rates for each of the item for the day. + +When you save the Restaurant Menu, a Price List is created for that Menu and all pricing is linked to that price list. This way you can easily control the items on offer and pricing from the menu. + +Restaurant Menu diff --git a/foundation/www/docs/user/manual/en/hospitality/restaurant.md b/foundation/www/docs/user/manual/en/hospitality/restaurant.md new file mode 100644 index 00000000..a37139c9 --- /dev/null +++ b/foundation/www/docs/user/manual/en/hospitality/restaurant.md @@ -0,0 +1,20 @@ + +# Restaurant + +The Restaurant record represents one restaurant in your organization. To create a new Restaurant, just set the name, Company and Default Customer. + +You can set a unique numbering prefix for each of your restaurants. All invoices for that restuarant will follow that numbering prefix. + +If you have a default Sales Taxes and Charges Template, you can add it so that the same charge + tax will be applicable for all invoices in the restaurant. + +Restaurant + +After your restaurant is created, you can add Tables and Menus for that restaurant + +### Adding Tables + +You can add a Restaurant Table by creating a new Restaurant Table from the dashboard. + +Restaurant Table + + diff --git a/foundation/www/docs/user/manual/en/human-resources/employee-advance.md b/foundation/www/docs/user/manual/en/human-resources/employee-advance.md new file mode 100644 index 00000000..e6a90dad --- /dev/null +++ b/foundation/www/docs/user/manual/en/human-resources/employee-advance.md @@ -0,0 +1,33 @@ + +# Employee Advance + +Sometimes employees go outside for company's work and company pays some amount for their expenses in advance. In that time, the employee can create Employee Advance form and the expense approver can submit the advance record after verification. After Employee Advance gets submitted, the accountant releases the payment and makes the payment entry. + +To make a new Employee Advance, go to: + +> HR > Employee Advance > New Employee Advance + +Expense Claim + +Set the Employee ID, date, purpose and requested amount and “Save” the record. + +### Employee Advance Submission + +Employee Advance record can be created by any employee but they cannot submit the record. + +After saving Employee Advance, Employee should [Assign document to Approver](/docs/user/manual/en/using-eprnext/assignment.html). On assignment, approving user will also receive email notification. To automate email notification, you can also setup [Email Alert](/docs/user/manual/en/setting-up/email/email-alerts.html). + +After verification, approver can submit the Employee Advance form or reject the request. + +### Make Payment Entry +After submission of Employee Advance record, accounts user will be able to create payment entry via Journal Entry or Payment Entry form. +The payment entry will look like following: +Employee Advance Payment via Journal Entry + +Employee Advance Payment via Payment Entry + +On submission of payment entry, the paid amount and status will be updated in Employee Advance record. + +### Adjust advances on Expense Claim +Later when employee claims the expense and advance record can be fetched in Expense Claim and linked to the claim record. +Employee Advance Payment via Payment Entry \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/human-resources/index.txt b/foundation/www/docs/user/manual/en/human-resources/index.txt index 673efdb8..04abb85a 100644 --- a/foundation/www/docs/user/manual/en/human-resources/index.txt +++ b/foundation/www/docs/user/manual/en/human-resources/index.txt @@ -1,5 +1,6 @@ employee leave +employee-advance expense-claim attendance salary-and-payroll diff --git a/foundation/www/docs/user/manual/en/human-resources/job-applicant.md b/foundation/www/docs/user/manual/en/human-resources/job-applicant.md index 9fd06b3b..075b57dd 100644 --- a/foundation/www/docs/user/manual/en/human-resources/job-applicant.md +++ b/foundation/www/docs/user/manual/en/human-resources/job-applicant.md @@ -1,7 +1,7 @@ # Job Applicant -You can maintain a list of People who have applied for a [Job Opening](/docs/user/manual/en/human-resources/job-opening.html). +You can mantain a list of People who have applied for a [Job Opening](/docs/user/manual/en/human-resources/job-opening.html). To create a new Job Applicant go to diff --git a/foundation/www/docs/user/manual/en/human-resources/leave-application.md b/foundation/www/docs/user/manual/en/human-resources/leave-application.md index 6943a840..5c272e07 100644 --- a/foundation/www/docs/user/manual/en/human-resources/leave-application.md +++ b/foundation/www/docs/user/manual/en/human-resources/leave-application.md @@ -2,7 +2,7 @@ # Leave Application If your company has a formal system where Employees have to apply for leaves -to be able to qualify as paid leaves, you can create Leave Application to +to be able to qualify as paid leaveas, you can create Leave Application to track approval and usage of leaves. You have to mention the Employee, Leave Type and the period for which the leave is taken. @@ -23,5 +23,5 @@ their “Employee ID” as a match rule in the Leave Application Permission settings. See the earlier discussion on [Setting Up Permissions](/docs/user/manual/en/setting-up/users-and-permissions/user-permissions.html) for more info. -You assign Leaves against an Employee check [Leave Allocation](/docs/user/manual/en/human-resources/leave.html) +You assign Leaves aginast an Employee check [Leave Allocation](/docs/user/manual/en/human-resources/leave.html) {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/human-resources/leave.md b/foundation/www/docs/user/manual/en/human-resources/leave.md index 8b3a5a50..931a46cf 100644 --- a/foundation/www/docs/user/manual/en/human-resources/leave.md +++ b/foundation/www/docs/user/manual/en/human-resources/leave.md @@ -19,9 +19,9 @@ requirement. **Is Carry Forward:** If checked, the balance leave will be carried forwarded to the next allocation period. -**Is Leave Without Pay:** This ensures that the Leave Type will be treated as leaves without pay and salary will get deducted for this Leave Type. +**Is Leave Without Pay:** This ensures that the Leave Type will be treated as leaves whithout pay and salary will get deducted for this Leave Type. -**Allow Negative Balance:** If checked, system will always allow to approve leave application for the Leave Type, even if there is no leave balance. +**Allow Nagative Balance:** If checked, system will always allow to approve leave application for the Leave Type, even if there is no leave balance. **Include holidays within leaves as leaves:** Check this option if you wish to count holidays within leaves as a ‘leave’. Such holidays will be deducted from the total number of leaves. diff --git a/foundation/www/docs/user/manual/en/human-resources/tools/upload-attendance.md b/foundation/www/docs/user/manual/en/human-resources/tools/upload-attendance.md index 82e5f453..b091ca0e 100644 --- a/foundation/www/docs/user/manual/en/human-resources/tools/upload-attendance.md +++ b/foundation/www/docs/user/manual/en/human-resources/tools/upload-attendance.md @@ -1,7 +1,7 @@ # Upload Attendance -This tool helps you to upload bulk attendance from a csv file. +This tool helps you to upload bulk attendence from a csv file. To upload the attendance go to: diff --git a/foundation/www/docs/user/manual/en/human-resources/training.md b/foundation/www/docs/user/manual/en/human-resources/training.md index ab121cb8..1f33f586 100644 --- a/foundation/www/docs/user/manual/en/human-resources/training.md +++ b/foundation/www/docs/user/manual/en/human-resources/training.md @@ -1,9 +1,14 @@ # Training +### Training Program + +Create Training Program and schedule Training Events under it. It has a dashboard linked to Training Event to view which event is under the Training Program. + +Employee ### Training Event -Schedule seminars, workshops, conferences etc using Training Event. You can also invite your employees to attend the event using this feature. +Schedule seminars, workshops, conferences etc using Training Event linked to a Training Program. You can also invite your employees to attend the event using this feature. Employee diff --git a/foundation/www/docs/user/manual/en/index.txt b/foundation/www/docs/user/manual/en/index.txt index 712ab8ea..34bb24e0 100644 --- a/foundation/www/docs/user/manual/en/index.txt +++ b/foundation/www/docs/user/manual/en/index.txt @@ -15,3 +15,4 @@ website using-erpnext regional customize-erpnext +education diff --git a/foundation/www/docs/user/manual/en/introduction/concepts-and-terms.md b/foundation/www/docs/user/manual/en/introduction/concepts-and-terms.md index dfa72e38..a54d83ec 100644 --- a/foundation/www/docs/user/manual/en/introduction/concepts-and-terms.md +++ b/foundation/www/docs/user/manual/en/introduction/concepts-and-terms.md @@ -98,8 +98,8 @@ fiscal year. A Cost Center is like an Account, but the only difference is that its structure represents your business more closely than Accounts. -For example, in your Chart of Accounts, you can separate your expenses by its type -(i.e., travel, marketing, etc.). In your Chart of Cost Centers, you can separate +For example, in your Chart of Accounts, you can separate your expenses by its type +(i.e., travel, marketing, etc.). In your Chart of Cost Centers, you can separate them by product line or business group (e.g., online sales, retail sales, etc.). > Accounts > Chart of Cost Centers @@ -317,7 +317,7 @@ A record of the monthly salary given to an Employee. #### Salary Structure -A template identifying all the components of an Employees' salary (earnings), +A template identifying all the components of an Employees' salary (earnings), tax and other social security deductions. > Human Resource > Salary and Payroll > Salary Structure diff --git a/foundation/www/docs/user/manual/en/introduction/getting-started-with-erpnext.md b/foundation/www/docs/user/manual/en/introduction/getting-started-with-erpnext.md index e43183e0..563e0863 100644 --- a/foundation/www/docs/user/manual/en/introduction/getting-started-with-erpnext.md +++ b/foundation/www/docs/user/manual/en/introduction/getting-started-with-erpnext.md @@ -1,8 +1,4 @@ -# Getting Started With Erpnext - - - # Getting Started with ERPNext There are many ways to get started with ERPNext. diff --git a/foundation/www/docs/user/manual/en/introduction/implementation-strategy.md b/foundation/www/docs/user/manual/en/introduction/implementation-strategy.md index ee978188..8d21825a 100644 --- a/foundation/www/docs/user/manual/en/introduction/implementation-strategy.md +++ b/foundation/www/docs/user/manual/en/introduction/implementation-strategy.md @@ -25,7 +25,7 @@ Once you are familiar with ERPNext, start entering your live data! * Clean up the account of test data or better, start a fresh install. * If you just want to clear your transactions and not your master data like Item, Customer, Supplier, BOM etc, you can click delete the transactions of your Company and start fresh. To do so, open the Company Record via Setup > Masters > Company and delete your Company's transactions by clicking on the **Delete Company Transactions** button at the bottom of the Company Form. - * You can also setup a new account at [https://erpnext.com](https://erpnext.com), and use the 30-day free trial. [Find out more ways of deploying ERPNext](/introduction/getting-started-with-erpnext) + * You can also setup a new account at [https://erpnext.com](https://erpnext.com), and use the 30-day free trial. [Find out more ways of deploying ERPNext](docs/user/manual/en/introduction/getting-started-with-erpnext) * Setup all the modules with Customer Groups, Item Groups, Warehouses, BOMs etc. * Import Customers, Suppliers, Items, Contacts and Addresses using Data Import Tool. * Import opening stock using Stock Reconciliation Tool. diff --git a/foundation/www/docs/user/manual/en/introduction/the-champion.md b/foundation/www/docs/user/manual/en/introduction/the-champion.md index 0dd7838b..50922bb6 100644 --- a/foundation/www/docs/user/manual/en/introduction/the-champion.md +++ b/foundation/www/docs/user/manual/en/introduction/the-champion.md @@ -1,10 +1,6 @@ # The Champion - - -

    The Champion

    - Champion We have seen dozens of ERP implementations over the past few years and we diff --git a/foundation/www/docs/user/manual/en/manufacturing/articles/nested-bom-structure.md b/foundation/www/docs/user/manual/en/manufacturing/articles/nested-bom-structure.md index 1e3bb8e3..5f7aeba4 100644 --- a/foundation/www/docs/user/manual/en/manufacturing/articles/nested-bom-structure.md +++ b/foundation/www/docs/user/manual/en/manufacturing/articles/nested-bom-structure.md @@ -5,7 +5,7 @@ **Answer:** You should create BOM for item in the order of their production. BOM for the sub-assembly item should be created first. BOM for the Product Order item should be created last. Let's consider an example to understand this better. -A computer assembler is creating a BOM for PC. They also manufacture Hard Disk and DVD Drive themselves. They should first create BOM for Hard Disk and DVD Drive. After that BOM for the PC should be created. +A computer assembler is creating a BOM for PC. They also manufacture Hard Disk and DVD Drive themselve. They should first create BOM for Hard Disk and DVD Drive. After that BOM for the PC should be created. BOM of PC will have all the raw-material items selected in it. Hard Disk and DVD Drive (sub-assemblies) will also be selected as raw-material items. For the sib-assembly items, respective BOM no. will be fetched as well. diff --git a/foundation/www/docs/user/manual/en/manufacturing/production-order.md b/foundation/www/docs/user/manual/en/manufacturing/production-order.md index 0170ac11..fb823d12 100644 --- a/foundation/www/docs/user/manual/en/manufacturing/production-order.md +++ b/foundation/www/docs/user/manual/en/manufacturing/production-order.md @@ -21,10 +21,10 @@ by: * Select the Item to be produced. * The default BOM for that item will be fetched by the system. You can also change BOM. * Enter the Qty to manufacture. - * If the selected BOM has operation mentioned in it, the system shall fetch all operations from BOM. + * If the selected BOM has operartion mentioned in it, the system shall fetch all operations from BOM. * Mention the Planned Start Date (an Estimated Date at which you want the Production to begin.) * Select Warehouses: - * Source Warehouses: The warehouse where you store your raw materials. Each required item can have separate source warehouse. Group warehouse also can be selected as source warehouse. On submission of Production Order, the raw materials will be reserved in these warehouses for production usage. + * Source Warehouses: The warehouse where you store your raw materials. Each required item can have separate source warehouse. Group warehouse also can be selected as source warehouse. On submission of Production Order, the raw mateirals will be reserved in these warehouses for production usage. * Work-in-Progress Warehouse: The warehouse where your Items will be transferred when you begin production. Group Warehouse can also be selected as Work-in-Progress warehouse. * Target Warehouse: The warehouse where you store finished Items before they are shipped. * Scrap Warehouse: Scrap Items will be stored in this warehouse. diff --git a/foundation/www/docs/user/manual/en/manufacturing/tools/bom-update-tool.md b/foundation/www/docs/user/manual/en/manufacturing/tools/bom-update-tool.md index 1ea0cada..dd8b9fe1 100644 --- a/foundation/www/docs/user/manual/en/manufacturing/tools/bom-update-tool.md +++ b/foundation/www/docs/user/manual/en/manufacturing/tools/bom-update-tool.md @@ -19,7 +19,7 @@ Suppose a company manufactures computers, Bill of Material of of the computer wi 1. Mouse 1. CPU -Out of all the items above, CPU is assembled separately. Hence separate BOM will be created for the CPU. Following are the items from the BOM of CPU. +Out of all the items above, CPU is asembled separately. Hence separate BOM will be created for the CPU. Following are the items from the BOM of CPU. 1. 250 GB Hard Disk 1. Mother Board @@ -41,14 +41,14 @@ To update new BOM in all the parent BOMs, where CPU is selected as raw-material, In this tool, you should select Current BOM, and New BOM. On clicking Replace button, current BOM of CPU will be replaced with New BOM in the BOM of finished Item (Computer). -**Will BOM Replace Tool work for replacing finished item in BOM?** +**Will BOM Replace Tool work for replacing finsihed item in BOM?** No. You should Cancel and Amend current BOM, or create a new BOM for finished item. ### Update BOM Cost Using the button **Update latest price in all BOMs**, you can update cost of all Bill of Materials, based on latest purchase price / price list rate / valuation rate of raw materials. -On clicking of this button, system will create a background process to update all the BOM's cost. It is processed via background jobs because this process can take a few minutes (depending on the number of BOMs) to update all the BOMs. +On clicking of this buttom, system will create a background process to update all the BOM's cost. It is processed via background jobs because this process can take a few minutes (depending on the number of BOMs) to update all the BOMs. This functionality can also be executed automatically on daily basis. For that, you need to enable "Update BOM Cost Automatically" from Manufacturing Settings. diff --git a/foundation/www/docs/user/manual/es/schools/setup/__init__.py b/foundation/www/docs/user/manual/en/non_profit/Chapter/__init__.py similarity index 100% rename from foundation/www/docs/user/manual/es/schools/setup/__init__.py rename to foundation/www/docs/user/manual/en/non_profit/Chapter/__init__.py diff --git a/foundation/www/docs/user/manual/en/non_profit/Chapter/_sidebar.json b/foundation/www/docs/user/manual/en/non_profit/Chapter/_sidebar.json new file mode 100644 index 00000000..88f5aab5 --- /dev/null +++ b/foundation/www/docs/user/manual/en/non_profit/Chapter/_sidebar.json @@ -0,0 +1,22 @@ +[ + { + "route": "/docs", + "title": "Docs Home" + }, + { + "route": "/docs/user", + "title": "User Guide" + }, + { + "route": "/docs/current/api", + "title": "Server API" + }, + { + "route": "/docs/current/models", + "title": "Models (Reference)" + }, + { + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "title": "Improve Docs" + } +] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/non_profit/Chapter/chapter.md b/foundation/www/docs/user/manual/en/non_profit/Chapter/chapter.md new file mode 100644 index 00000000..7f8a4e0b --- /dev/null +++ b/foundation/www/docs/user/manual/en/non_profit/Chapter/chapter.md @@ -0,0 +1,28 @@ + +#Chapter + +The Chapter doctype allows you to record the Chapter details. + +Chapter Head or System User can create Chapter. + +To Create Chapter: + +> Non Profit > Chapter > New + +Chapter + +System User or Chapter Head can add chapter Member directly from the desk or +User can join directly by visiting chapter page on website + +to join chapter online + +> My Account on website > Chapter from sidebar > Select Available chapter and click on join chapter button + +online Chapter + +online Chapter + + +To leave chapter click on leave chapter button + +{next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/non_profit/Chapter/index.md b/foundation/www/docs/user/manual/en/non_profit/Chapter/index.md new file mode 100644 index 00000000..e7971818 --- /dev/null +++ b/foundation/www/docs/user/manual/en/non_profit/Chapter/index.md @@ -0,0 +1,11 @@ + +# Chapter + +This section contains Chapter related documents. + +Chapter doctype is for people to organize or join offline group meetings in various cities around the world. user/members can find and join groups with a common interest. + + +### Topics + +{index} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/non_profit/Chapter/index.txt b/foundation/www/docs/user/manual/en/non_profit/Chapter/index.txt new file mode 100644 index 00000000..9eb7bdd7 --- /dev/null +++ b/foundation/www/docs/user/manual/en/non_profit/Chapter/index.txt @@ -0,0 +1 @@ +chapter \ No newline at end of file diff --git a/foundation/www/docs/user/manual/es/schools/student/__init__.py b/foundation/www/docs/user/manual/en/non_profit/Donor/__init__.py similarity index 100% rename from foundation/www/docs/user/manual/es/schools/student/__init__.py rename to foundation/www/docs/user/manual/en/non_profit/Donor/__init__.py diff --git a/foundation/www/docs/user/manual/en/non_profit/Donor/_sidebar.json b/foundation/www/docs/user/manual/en/non_profit/Donor/_sidebar.json new file mode 100644 index 00000000..88f5aab5 --- /dev/null +++ b/foundation/www/docs/user/manual/en/non_profit/Donor/_sidebar.json @@ -0,0 +1,22 @@ +[ + { + "route": "/docs", + "title": "Docs Home" + }, + { + "route": "/docs/user", + "title": "User Guide" + }, + { + "route": "/docs/current/api", + "title": "Server API" + }, + { + "route": "/docs/current/models", + "title": "Models (Reference)" + }, + { + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "title": "Improve Docs" + } +] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/non_profit/Donor/donor.md b/foundation/www/docs/user/manual/en/non_profit/Donor/donor.md new file mode 100644 index 00000000..631e1f87 --- /dev/null +++ b/foundation/www/docs/user/manual/en/non_profit/Donor/donor.md @@ -0,0 +1,22 @@ + +#Donor + +The Donor doctype allows you to record the Donor details. + +Donor are simply contacts in your ERPNext database with one or more Donation. The contact may be an individual, a household, an organisation, or some other contact sub-type, but it is always a contact to which a donation is applied. + +To create new Donor go to: + +> Non Profit > Donor > New + +Student + +**Email:** Email field is the id of Member doctype. + +**Donor Type:** DonorType is link field to Donor Type Doctype. Member can select Available Doctype. + +**Address and Contact Section:** This Section linked to address and contact doctypes. + +**Accounting Section:** This section allowed to set member accounting details such as Account Receivable. + +{next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/non_profit/Donor/donor_type.md b/foundation/www/docs/user/manual/en/non_profit/Donor/donor_type.md new file mode 100644 index 00000000..4ef03034 --- /dev/null +++ b/foundation/www/docs/user/manual/en/non_profit/Donor/donor_type.md @@ -0,0 +1,18 @@ + +#Donor Type + +The Donor Type doctype allows you to Create different Donor Profile for the Donor. + +Donor Types are a basic building block for Donor and contribution management. Typically an organization will set up a donor type for each of the different donation that they offer. For example, an organisation may define three donation types for 'regular', 'Organization', and 'honorary' donor. + +In this chapter we will cover the most common set-up for donor types. + +To create new donor Type go to: + +> Non Profit > Donor Type > New + +donor type + +**Donor Type:** The Donor Type is displayed throughout the system, on both public and backend pages so spend some time thinking about a donor type name that is appropriate to both audiences. It can be changed at a later date + +{next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/non_profit/Donor/index.md b/foundation/www/docs/user/manual/en/non_profit/Donor/index.md new file mode 100644 index 00000000..cfa50df4 --- /dev/null +++ b/foundation/www/docs/user/manual/en/non_profit/Donor/index.md @@ -0,0 +1,10 @@ + +# Donor + +This section contains Donors and Donors Contribution related documents. + +A donor in general is a person, organization or government who donates something voluntarily. The term is usually used to represent a form of pure altruism but sometimes used when the payment for a service is recognized by all parties as representing less than the value of the donation and that the motivation is altruistic. In business law, a donor is someone who is giving the gift (law), and a donee the person receiving the gift. + +### Topics + +{index} diff --git a/foundation/www/docs/user/manual/en/non_profit/Donor/index.txt b/foundation/www/docs/user/manual/en/non_profit/Donor/index.txt new file mode 100644 index 00000000..7f36f92b --- /dev/null +++ b/foundation/www/docs/user/manual/en/non_profit/Donor/index.txt @@ -0,0 +1,2 @@ +donor_type +donor \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/non_profit/Grant Application/__init__.py b/foundation/www/docs/user/manual/en/non_profit/Grant Application/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/foundation/www/docs/user/manual/en/non_profit/Grant Application/_sidebar.json b/foundation/www/docs/user/manual/en/non_profit/Grant Application/_sidebar.json new file mode 100644 index 00000000..88f5aab5 --- /dev/null +++ b/foundation/www/docs/user/manual/en/non_profit/Grant Application/_sidebar.json @@ -0,0 +1,22 @@ +[ + { + "route": "/docs", + "title": "Docs Home" + }, + { + "route": "/docs/user", + "title": "User Guide" + }, + { + "route": "/docs/current/api", + "title": "Server API" + }, + { + "route": "/docs/current/models", + "title": "Models (Reference)" + }, + { + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "title": "Improve Docs" + } +] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/non_profit/Grant Application/grant_application.md b/foundation/www/docs/user/manual/en/non_profit/Grant Application/grant_application.md new file mode 100644 index 00000000..6f2d5166 --- /dev/null +++ b/foundation/www/docs/user/manual/en/non_profit/Grant Application/grant_application.md @@ -0,0 +1,44 @@ + +#Grant Application + +The Grant Application doctype allows you to record the Grant Applicants details. + +To Generate Online Grant Application go to: + +> My Account on website > Grant Application from sidebar > Apply for new Grant Application. + + +Online Grant Application row + +Online Grant Application + +Online Grant Application + + +To Generate Grant Application go to: + +> Non Profit > Grant Application > New. + + +Grant Application + + +**Email:** Email is a mandatory field. + +**Organization:** Organization is data field contain organizaion name set as name field in erpnext. + + +**Address and Contact Section:** This Section linked to address and contact doctypes. + +**Grant Application Details Section:** This section contains information about grant description. + +**Amount:** Amount field describe requested amount by an applicant. + +**Route:** Route field leave blank it will automatically create route path grant-application/organization_name + +**Assessment Result Section:** In This section when status field selected as received, send Grant Review Email button appear on the top right corner which sends grant URL to Assessment Manager. + +After reviewing grant. Grant Assessment Manager scale application at 0 - 9 point and left a note about a grant. + + +{next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/non_profit/Grant Application/index.md b/foundation/www/docs/user/manual/en/non_profit/Grant Application/index.md new file mode 100644 index 00000000..adb41a38 --- /dev/null +++ b/foundation/www/docs/user/manual/en/non_profit/Grant Application/index.md @@ -0,0 +1,17 @@ + +# Grant Application + +Grant Application is designed to be used by organisations that distribute funds to others, for example grant seeker, etc. + +Grants are non-repayable funds or products disbursed or gifted by one party (grantmakers), often a government department, corporation, foundation or trust, to a recipient, often (but not always) a nonprofit entity, educational institution, business or an individual. In order to receive a grant, some form of "Grant Writing" often referred to as either a proposal or an application is required. + +Most grants are made to fund a specific project and require some level of compliance and reporting. + +The grant writing process involves an applicant submitting a proposal (or submission) to a potential funder, either on the applicant's own initiative or in response to a Request for Proposal from the funder. Other grants can be given to individuals, such as victims of natural disasters or individuals who seek to open a small business. Sometimes grant makers require grant seekers to have some form of tax-exempt status, be a registered nonprofit organization or a local government. + +Grant Application is grant writing process which can be review by assessment manager and then decided by the organization to disburse grant amount to the applicant or not. + + +### Topics + +{index} diff --git a/foundation/www/docs/user/manual/en/non_profit/Grant Application/index.txt b/foundation/www/docs/user/manual/en/non_profit/Grant Application/index.txt new file mode 100644 index 00000000..5d997e82 --- /dev/null +++ b/foundation/www/docs/user/manual/en/non_profit/Grant Application/index.txt @@ -0,0 +1 @@ +grant_application \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/non_profit/Membership/__init__.py b/foundation/www/docs/user/manual/en/non_profit/Membership/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/foundation/www/docs/user/manual/en/non_profit/Membership/_sidebar.json b/foundation/www/docs/user/manual/en/non_profit/Membership/_sidebar.json new file mode 100644 index 00000000..88f5aab5 --- /dev/null +++ b/foundation/www/docs/user/manual/en/non_profit/Membership/_sidebar.json @@ -0,0 +1,22 @@ +[ + { + "route": "/docs", + "title": "Docs Home" + }, + { + "route": "/docs/user", + "title": "User Guide" + }, + { + "route": "/docs/current/api", + "title": "Server API" + }, + { + "route": "/docs/current/models", + "title": "Models (Reference)" + }, + { + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "title": "Improve Docs" + } +] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/non_profit/Membership/index.md b/foundation/www/docs/user/manual/en/non_profit/Membership/index.md new file mode 100644 index 00000000..90712047 --- /dev/null +++ b/foundation/www/docs/user/manual/en/non_profit/Membership/index.md @@ -0,0 +1,10 @@ + +# Membership + +This section contains Member and Membership related documents. + +How to set up one or more membership types that you can use to manage your organization's members. It also explains the concept of membership statuses and how your organisation can use them to define a membership life-cycle. + +### Topics + +{index} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/non_profit/Membership/index.txt b/foundation/www/docs/user/manual/en/non_profit/Membership/index.txt new file mode 100644 index 00000000..f1d9bf36 --- /dev/null +++ b/foundation/www/docs/user/manual/en/non_profit/Membership/index.txt @@ -0,0 +1,3 @@ +membership_type +member +membership \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/non_profit/Membership/member.md b/foundation/www/docs/user/manual/en/non_profit/Membership/member.md new file mode 100644 index 00000000..4595e9da --- /dev/null +++ b/foundation/www/docs/user/manual/en/non_profit/Membership/member.md @@ -0,0 +1,22 @@ + +#Member + +The Member doctype allows you to record the Member details for a **Membership**. + +Members are simply contacts in your ERPNext database with one or more memberships. The contact may be an individual, a household, an organisation, or some other contact sub-type, but it is always a contact to which a membership is applied. + +To create new Member go to: + +> Non Profit > Member > New + +Student + +**Email:** Email field is the id of Member doctype. + +**Membership Type:** Membership Type is link field to Membership Type Doctype. Member can select Available Doctype. + +**Membership Expiry Date:** This Field fetch membership end date details from membership doctype. + +**Address and Contact Section:** This Section linked to address and contact doctypes. + +{next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/non_profit/Membership/membership.md b/foundation/www/docs/user/manual/en/non_profit/Membership/membership.md new file mode 100644 index 00000000..cf780ad4 --- /dev/null +++ b/foundation/www/docs/user/manual/en/non_profit/Membership/membership.md @@ -0,0 +1,24 @@ + +#Membership + +The Membership doctype allows you to record membership details for the **Member**. + +Membership is a term which refers to any organization that allows people to subscribe, and often requires them to pay a membership fee or "subscription". + + +To create new Membership go to: + +> Non Profit > Membership > New + +Membership + +**Member:** Member is a link field fetch member details from Member doctype. + +**Membership Status:** Membership Status is a select field which contains New, Current, Expired, Pending and Cancelled. + +**Membership Date Details section:** This section contain information related to Membership start date, end date and member since date. + +**Payment Details:** This section contains payment related details. If the person paid for membership checkbox paid is marked as checked else unmarked. +Amount fetch based on membership type. + +{next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/non_profit/Membership/membership_type.md b/foundation/www/docs/user/manual/en/non_profit/Membership/membership_type.md new file mode 100644 index 00000000..6ec48540 --- /dev/null +++ b/foundation/www/docs/user/manual/en/non_profit/Membership/membership_type.md @@ -0,0 +1,19 @@ + +#Membership Type + +Membership Types are a basic building block for membership management. Typically an organization will set up a membership type for each of the different memberships that they offer. For the simplest membership structures, one membership type may be enough. For more complex membership structures, more membership types may be required. For example, an organisation may define three membership types for 'regular', 'student', and 'honorary' members. Or an organization may choose to use membership types as subcriptions to their different publications, either free or paying ones. + +In this chapter we will cover the most common set-up for membership types. + +To create new Membership Type go to: + +> Non Profit > Membership Type > New + + +Student + +**Membership Type:** The Membership Type is displayed throughout the system, on both public and backend pages so spend some time thinking about a membership type name that is appropriate to both audiences. It can be changed at a later date + +**Amount:** If your memberships are free you should enter 0 (zero) in this field. Otherwise you should enter the amount that must be paid for this membership type. + +{next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/non_profit/Volunteer/__init__.py b/foundation/www/docs/user/manual/en/non_profit/Volunteer/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/foundation/www/docs/user/manual/en/non_profit/Volunteer/_sidebar.json b/foundation/www/docs/user/manual/en/non_profit/Volunteer/_sidebar.json new file mode 100644 index 00000000..88f5aab5 --- /dev/null +++ b/foundation/www/docs/user/manual/en/non_profit/Volunteer/_sidebar.json @@ -0,0 +1,22 @@ +[ + { + "route": "/docs", + "title": "Docs Home" + }, + { + "route": "/docs/user", + "title": "User Guide" + }, + { + "route": "/docs/current/api", + "title": "Server API" + }, + { + "route": "/docs/current/models", + "title": "Models (Reference)" + }, + { + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "title": "Improve Docs" + } +] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/non_profit/Volunteer/index.md b/foundation/www/docs/user/manual/en/non_profit/Volunteer/index.md new file mode 100644 index 00000000..943b9d65 --- /dev/null +++ b/foundation/www/docs/user/manual/en/non_profit/Volunteer/index.md @@ -0,0 +1,10 @@ + +# Volunteer + +This section contains Volunteer and Volunteer Type related documents. + +Volunteer is the practice of people working on behalf of others without being motivated by financial or material gain. + +### Topics + +{index} diff --git a/foundation/www/docs/user/manual/en/non_profit/Volunteer/index.txt b/foundation/www/docs/user/manual/en/non_profit/Volunteer/index.txt new file mode 100644 index 00000000..3d93d069 --- /dev/null +++ b/foundation/www/docs/user/manual/en/non_profit/Volunteer/index.txt @@ -0,0 +1,2 @@ +volunteer_type +volunteer \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/non_profit/Volunteer/volunteer.md b/foundation/www/docs/user/manual/en/non_profit/Volunteer/volunteer.md new file mode 100644 index 00000000..8b398325 --- /dev/null +++ b/foundation/www/docs/user/manual/en/non_profit/Volunteer/volunteer.md @@ -0,0 +1,25 @@ + +#Volunteer + +The Volunteer doctype allows you to record the Volunter details. + +Volunteer are simply contacts in your ERPNext database with one or more volunteering program. The contact may be an individual, a household, an organisation, or some other contact sub-type + +To create new Volunteer go to: + +> Non Profit > Volunteer > New + +Volunteer + +**Email:** Email field is the id of Member doctype. + +**Volunteer Type:** Volunteer Type is link field to Volunteer Type Doctype. Volunteer can select available Doctype. + +**Address and Contact Section:** This Section linked to address and contact doctypes. + +**Volunteer Availability Section:** This section is child table which contains select field about volunteer availability. a volunteer can select availability such as weekly, morning etc + +**Volunteer Skills Section:** This section is child table which contains data field about the volunteer skills. a volunteer can add multiple skill for eg. Desk Job, +Hospitality, Food management, computer operator etc. + +{next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/non_profit/Volunteer/volunteer_type.md b/foundation/www/docs/user/manual/en/non_profit/Volunteer/volunteer_type.md new file mode 100644 index 00000000..63bbc7c2 --- /dev/null +++ b/foundation/www/docs/user/manual/en/non_profit/Volunteer/volunteer_type.md @@ -0,0 +1,19 @@ + +#Volunteer Type + +Volunteer Types are a basic building block for Volunteering management. Typically an organization will set up a volunteer type for each of the different donation that they offer. For example, an organisation may define three volunteer types for 'regular', 'Student', and 'Member' donor. + +In this chapter we will cover the most common set-up for volunteer types. + +To create new volunteer Type go to: + +> Non Profit > Volunteer Type > New + +Volunteer + + +**Volunteer Type:** The Volunteer Type is displayed throughout the system, on both public and backend pages so spend some time thinking about a membership type name that is appropriate to both audiences. It can be changed at a later date + +**Amount:** If your Volunteering are free you should enter 0 (zero) in this field. Otherwise you should enter the amount that must be paid to the volunteer. + +{next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/non_profit/__init__.py b/foundation/www/docs/user/manual/en/non_profit/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/foundation/www/docs/user/manual/en/non_profit/_sidebar.json b/foundation/www/docs/user/manual/en/non_profit/_sidebar.json new file mode 100644 index 00000000..88f5aab5 --- /dev/null +++ b/foundation/www/docs/user/manual/en/non_profit/_sidebar.json @@ -0,0 +1,22 @@ +[ + { + "route": "/docs", + "title": "Docs Home" + }, + { + "route": "/docs/user", + "title": "User Guide" + }, + { + "route": "/docs/current/api", + "title": "Server API" + }, + { + "route": "/docs/current/models", + "title": "Models (Reference)" + }, + { + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "title": "Improve Docs" + } +] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/non_profit/index.md b/foundation/www/docs/user/manual/en/non_profit/index.md new file mode 100644 index 00000000..d7cab0fd --- /dev/null +++ b/foundation/www/docs/user/manual/en/non_profit/index.md @@ -0,0 +1,24 @@ + +# Non Profit + + +The Non Profit Modules in ERPNext is designed to meet requirements of NGO and Non Profit Organization. This is a centralized system, which maintains and updates all the activities related to an Organization. + +This will track all activity related to Memberships, Chapters, Volunteer Management, +Donor Management, Event and Grant etc + + +### Desk Page + + +
    +
    + Non Profit Domain +
    +
    + +### Non Profit Domain +Non Profit + +{index} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/non_profit/index.txt b/foundation/www/docs/user/manual/en/non_profit/index.txt new file mode 100644 index 00000000..9f5e13a6 --- /dev/null +++ b/foundation/www/docs/user/manual/en/non_profit/index.txt @@ -0,0 +1,5 @@ +Membership +Chapter +Volunteer +Donor +Grant Application \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/projects/project.md b/foundation/www/docs/user/manual/en/projects/project.md index b26a7484..72150e52 100644 --- a/foundation/www/docs/user/manual/en/projects/project.md +++ b/foundation/www/docs/user/manual/en/projects/project.md @@ -53,7 +53,7 @@ The Actual Start and End Time along with the costing shall then be updated based Project - Time Log List -* You can also create a Time Log directly and link it to the Project. +* You can also create a Time Log directlly and link it to the Project. Project - Link Time Log @@ -82,13 +82,13 @@ You can make a [Cost Center](/docs/user/manual/en/accounts/setup/cost-center.htm ###Project Costing -The Project Costing section helps you track the time and expenses incurred against the project. +The Project Costing section helps you track the time, expenses and purchases incurred against the project. Project - Costing -* The Costing Section is updated based on Time Logs made. +* The Total Cost is composed of the costing amount from timesheets, the total cost from expense claims and the total cost from purchase invoices created against this project. -* Gross Margin is the difference between Total Costing Amount and Total Billing Amount +* The Gross Margin is the difference between Total Billed Amount and the Total Cost Amount for this project. ###Billing diff --git a/foundation/www/docs/user/manual/en/projects/time-log-batch.md b/foundation/www/docs/user/manual/en/projects/time-log-batch.md index b712146d..896a6def 100644 --- a/foundation/www/docs/user/manual/en/projects/time-log-batch.md +++ b/foundation/www/docs/user/manual/en/projects/time-log-batch.md @@ -1,7 +1,7 @@ # Time Log Batch -You can bill Time Logs by batching them together. This gives you the flexibility to manage your customer billing in the way you want. To create a new Time Sheet, go to +You can bill Time Logs by batching them together. This gives you the flexiblity to manage your customer billing in the way you want. To create a new Time Sheet, go to > Projects > Time Sheet > New Time Sheet diff --git a/foundation/www/docs/user/manual/en/projects/timesheet/timesheet-against-project.md b/foundation/www/docs/user/manual/en/projects/timesheet/timesheet-against-project.md index 87973020..150803b4 100644 --- a/foundation/www/docs/user/manual/en/projects/timesheet/timesheet-against-project.md +++ b/foundation/www/docs/user/manual/en/projects/timesheet/timesheet-against-project.md @@ -16,6 +16,6 @@ User can also make invoice against timesheet by selecting the project on the inv When creating Timesheet, Employee will have to select an Activity Type. For each Activity Type, you can create an Activity Cost master. In the Activity Cost, Billing Rate and Costing rate is defined for each Employee. -In the Timesheet, costing will be done based on Activity Cost multiplied with number of hours. Based the Timesheet Cost, total costing will be done for the Task and Project as well. +In the Timesheet, costing will be done based on Activity Cost multiplied with number of hours. Based the Timesheet Cost, total costing will be doen for the Task and Project as well. To learn about setup of Activity Type and Activity Cost, click [here](/docs/user/manual/en/projects/articles/project-costing). \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/regional/index.md b/foundation/www/docs/user/manual/en/regional/index.md index 9d9d757a..68464f2e 100644 --- a/foundation/www/docs/user/manual/en/regional/index.md +++ b/foundation/www/docs/user/manual/en/regional/index.md @@ -1,7 +1,7 @@ # Regional -ERPNext aims to support local regulation for all the regions in the world. In most cases ERPNext is very flexible so you can easily add Custom Fields and make Custom Reports to support the regulation of your region. +ERPNext aims to support local regulation for all the regions in the world. In most cases ERPNext is very flexible so you can easily add Custom Fields and make Custom Reports to support the regluation of your region. As of mid-2017, ERPNext aims to pre-set additional fields and forms required for companies to easily submit reports to the relevant authorities. diff --git a/foundation/www/docs/user/manual/en/regional/united_arab_emirates/_sidebar.json b/foundation/www/docs/user/manual/en/regional/united_arab_emirates/_sidebar.json new file mode 100644 index 00000000..88f5aab5 --- /dev/null +++ b/foundation/www/docs/user/manual/en/regional/united_arab_emirates/_sidebar.json @@ -0,0 +1,22 @@ +[ + { + "route": "/docs", + "title": "Docs Home" + }, + { + "route": "/docs/user", + "title": "User Guide" + }, + { + "route": "/docs/current/api", + "title": "Server API" + }, + { + "route": "/docs/current/models", + "title": "Models (Reference)" + }, + { + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "title": "Improve Docs" + } +] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/regional/united_arab_emirates/index.txt b/foundation/www/docs/user/manual/en/regional/united_arab_emirates/index.txt new file mode 100644 index 00000000..cf167db3 --- /dev/null +++ b/foundation/www/docs/user/manual/en/regional/united_arab_emirates/index.txt @@ -0,0 +1 @@ +uae-vat-setup \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/regional/united_arab_emirates/uae-vat-setup.md b/foundation/www/docs/user/manual/en/regional/united_arab_emirates/uae-vat-setup.md new file mode 100644 index 00000000..2e45b9e7 --- /dev/null +++ b/foundation/www/docs/user/manual/en/regional/united_arab_emirates/uae-vat-setup.md @@ -0,0 +1,46 @@ + +# VAT/EXCISE Tax Implementation for UAE/KSA + +### 1. Setting up Tax Registration No for customer, supplier and company + +Set tax registation number in the field tax id for the customer, supplier and company + +1. For Customer +TRN in Customer + +2. For Company +TRN in Company + +### 2. Setting up TAX Code for Products +Setup tax code in the item master, system will fetch same code in the sales/purchase invoice on selection of an item. + +Tax Code in Item +### 3. Default Tax Templates + +ERPNext provides you default tax template for vat(5%, zero, exempted) and excise(50%, 100%). You can create your own [tax template](/docs/user/manual/en/setting-up/setting-up-taxes.html). + +Default Tax Template + +### 3. Making VAT Ready Invoices + +If you have setup the TRN of your Customers and Suppliers, and your tax template, you are ready to go for making VAT Ready Invoices! + +For **Sales Invoice**, + +1. Select the correct Customer and Item and the address where the transaction will happen. +2. Check if the TRN of your Company and Supplier have been correctly set. +3. Check if the TAX Code has been set in the Item +4. Select the template that you have created based on the type of transaction +5. Save and Submit the Invoice + +VAT Invoice + +### 4. Print Tax Invoice + +ERPNext provides 2 default print foramt + +1. Simplified Tax Invoice +Simplified Tax Invoice + +2. Detailed Tax Invoice +Detailed Tax Invoice diff --git a/foundation/www/docs/user/manual/en/schools/admission/student_admission.md b/foundation/www/docs/user/manual/en/schools/admission/student_admission.md deleted file mode 100644 index e757a7be..00000000 --- a/foundation/www/docs/user/manual/en/schools/admission/student_admission.md +++ /dev/null @@ -1,14 +0,0 @@ - -# Student Admission - -The admission process begins with filling the admission form. The Student Admission record enables to intitiate your admission process for a given **Academic year**. ERPNext admission module allow you to create an admission record which can be then published on the ERPNext generate website. - -To create a Student Admission record go to : - -**Schools** >> **Admissions** >> **Student Admission** >> - - -Student Applicant - - -Once a admission record is created it can be published on the website and the student can apply from the web portal itself. \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/schools/fees/fee-structure.md b/foundation/www/docs/user/manual/en/schools/fees/fee-structure.md deleted file mode 100644 index 2b0d6789..00000000 --- a/foundation/www/docs/user/manual/en/schools/fees/fee-structure.md +++ /dev/null @@ -1,8 +0,0 @@ - -# Fee Structure - -A Fee Structure is a template that can be used while making fee records. - -Fees Structure - -{next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/schools/fees/fees.md b/foundation/www/docs/user/manual/en/schools/fees/fees.md deleted file mode 100644 index 53b39edc..00000000 --- a/foundation/www/docs/user/manual/en/schools/fees/fees.md +++ /dev/null @@ -1,9 +0,0 @@ - -# Fees - -Maintain a record of fees collected from students. -The [Fee Structure](/docs/user/manual/en/schools/fees/fee-structure.html) is fetched based on the selected Program and Academic Term. - -Fees - -{next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/schools/index.md b/foundation/www/docs/user/manual/en/schools/index.md deleted file mode 100644 index 4e17d224..00000000 --- a/foundation/www/docs/user/manual/en/schools/index.md +++ /dev/null @@ -1,9 +0,0 @@ - -# Schools - - -The School Modules in ERPNext is designed to meet requirements of Schools, Colleges & Educational Institutes. This is a centralized system, which maintains and updates all the activities related to an Institution. This will ease the process of each and every aspect of a School, be it Students, Admission, Examination and Fee. - -Fees Section - -{index} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/schools/setup/index.md b/foundation/www/docs/user/manual/en/schools/setup/index.md deleted file mode 100644 index bc6a4cf2..00000000 --- a/foundation/www/docs/user/manual/en/schools/setup/index.md +++ /dev/null @@ -1,10 +0,0 @@ - -# Setup - -The Setup section of Schools module provides facility to make some basic configuration. Below are doctypes for basic configuration. - -Setup Section - -### Topics - -{index} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/schools/setup/instructor.md b/foundation/www/docs/user/manual/en/schools/setup/instructor.md deleted file mode 100644 index 0525782e..00000000 --- a/foundation/www/docs/user/manual/en/schools/setup/instructor.md +++ /dev/null @@ -1,19 +0,0 @@ - -# Instructor - -An instructor is a teacher, or professor, of a specialised subject that involves skill. - -You can create an Instructor and link it to the Employee master and a Department. - -Instructor - -An **Instructor** is further linked to a **Course Schedule**, where you can define the schedule for a **Course** for a give date and **Room no**. - -Instructor -It is also linked to **Student group** where an **Instructor** is assigned to the Student group. - -Instructor - -An **Instructor** is also linked to an **Assessment Plan** for a Student group. The Instructor can be an Examiner or the supervisor for the assessment. - -{next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/schools/setup/school-settings.md b/foundation/www/docs/user/manual/en/schools/setup/school-settings.md deleted file mode 100644 index 08b5b60b..00000000 --- a/foundation/www/docs/user/manual/en/schools/setup/school-settings.md +++ /dev/null @@ -1,16 +0,0 @@ - -#School Settings - -The Schools settings page allow you to setup basic settings like **Academic Year and Term** for the Schools setup. - -Student - -The checkbox to Validate Batch for Students in Student Group enables the Student Batch validation for every Student from the Program Enrollment for the **Batch** based on **Student Group** - -Student - -You can enable the validation of Course for every Student from the enrolled Courses in Program Enrollment,for Course based Student Group by checking the settings for **Validate Enrolled Course for Students in Student Group** - -Student - -{next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/selling/articles/close-sales-order.md b/foundation/www/docs/user/manual/en/selling/articles/close-sales-order.md index aaaeff2d..bc4be7a6 100644 --- a/foundation/www/docs/user/manual/en/selling/articles/close-sales-order.md +++ b/foundation/www/docs/user/manual/en/selling/articles/close-sales-order.md @@ -15,6 +15,6 @@ In this case, create Delivery Note and Sales Invoice will be created only for th Once Sales Order is set as stopped, you will not have pending quantities (three in this case) reflecting in Pending to Deliver and Pending to Invoice reports. To make further transactions against Stopped Sales Order, you should first Unstop it. -You will find same functionality in the Purchase Order as well. +You will find same funtionality in the Purchase Order as well. \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/selling/articles/drop-shipping.md b/foundation/www/docs/user/manual/en/selling/articles/drop-shipping.md index 49a05dae..bf823234 100644 --- a/foundation/www/docs/user/manual/en/selling/articles/drop-shipping.md +++ b/foundation/www/docs/user/manual/en/selling/articles/drop-shipping.md @@ -29,7 +29,7 @@ From Sales Order, all items, having **Supplier delivers to Customer** checked o It will automatically set Customer, Customer Address and Contact Person. -After submitting Purchase Order, to update delivery status, use **Mark as Delivered** button on Purchase Order. It will update delivery percentage and delivered quantity on Sales Order. +After submitting Purchase Order, to update delivery status, use **Mark as Delivered** button on Purchase Order. It will update delivery percetage and delivered quantity on Sales Order. Purchase Order for Drop Shipping diff --git a/foundation/www/docs/user/manual/en/selling/articles/erpnext-for-services-organization.md b/foundation/www/docs/user/manual/en/selling/articles/erpnext-for-services-organization.md index 4cdc7bf0..3540e673 100644 --- a/foundation/www/docs/user/manual/en/selling/articles/erpnext-for-services-organization.md +++ b/foundation/www/docs/user/manual/en/selling/articles/erpnext-for-services-organization.md @@ -1,7 +1,7 @@ #ERPNext for Service Organization -**Question:** ERPNext looks primarily designed for the traders and manufacturers. Is ERPNext used by companies offering services? +**Question:** ERPNext looks primarily designed for the traders and manufacturers. Is ERPNext used by companies offering servies? **Answer:** diff --git a/foundation/www/docs/user/manual/en/selling/articles/sales-persons-in-the-sales-transactions.md b/foundation/www/docs/user/manual/en/selling/articles/sales-persons-in-the-sales-transactions.md index c0fbedca..fb87b011 100644 --- a/foundation/www/docs/user/manual/en/selling/articles/sales-persons-in-the-sales-transactions.md +++ b/foundation/www/docs/user/manual/en/selling/articles/sales-persons-in-the-sales-transactions.md @@ -13,7 +13,7 @@ If more than one sales persons are working together on an order, then contributi Sales Person Order -On saving transaction, based on the Net Total and Contribution (%), `Contribution to Net Total` will be calculated for each Sales Person. +On saving transaction, based on the Net Total and Contriution (%), `Contribution to Net Total` will be calculated for each Sales Person.
    Total % Contribution for all Sales Person must be 100%. If only one Sales Person is selected, then % Contribution will be 100.
    @@ -29,7 +29,7 @@ This report can be generated based on Sales Order, Delivery Note and Sales Invoi ####Sales Person wise Commission -ERPNext only provide total amount of sale made by a Sales Person. If you offer commission to Sales Person, you should add Sales Person as Sales Partners in ERPNext. For Sales Partners, you can define Commission (%). On selected on Sales Partner in a sales transaction, based on Net Total, Commission Amount is calculated as well. You can check Sales Partner's commission report from: +ERPNext only provide total amount of sale made by a Sales Person. If you offer commission to Sales Person, you should add Sales Person as Sales Partners in ERPNext. For Sales Partners, you can define Commission (%). On selected on Sales Partner in a sales transction, based on Net Total, Commission Amount is calculated as well. You can check Sales Partner's commission report from: `Accounts > Standard Reports > Sales Partners Commission` diff --git a/foundation/www/docs/user/manual/en/selling/articles/shipping-rule.md b/foundation/www/docs/user/manual/en/selling/articles/shipping-rule.md index 3cf22d15..06a23cf4 100644 --- a/foundation/www/docs/user/manual/en/selling/articles/shipping-rule.md +++ b/foundation/www/docs/user/manual/en/selling/articles/shipping-rule.md @@ -13,7 +13,7 @@ To setup Shipping Rule, go to: Shipping Rule Prices -Referring above, you will notice that shipping charges are reducing as value is increasing. This shipping charge will only be applied if transaction total falls under one of the above range. +Referring above, you will notice that shipping charges are reducing as valye is increasing. This shipping charge will only be applied if transaction total falls under one of the above range. ####Valid for Countries diff --git a/foundation/www/docs/user/manual/en/selling/sales-order.md b/foundation/www/docs/user/manual/en/selling/sales-order.md index 18f77e71..1fc023c2 100644 --- a/foundation/www/docs/user/manual/en/selling/sales-order.md +++ b/foundation/www/docs/user/manual/en/selling/sales-order.md @@ -32,7 +32,7 @@ Most of the information in your Sales Order is the same as the Quotation. There are a few amongst other things that a Sales Order will ask you to update. - * Enter delivery date against each item. If there are multiple items and if you enter delivery date in the first row, the date will be copied to other rows as well where it is blank. + * Enter delivery date agaist each item. If there are multiple items and if you enter delivery date in the first row, the date will be copied to other rows as well where it is blank. * Customer Purchase Order number: If your customer has sent you a Purchase Order, you can update its number for future reference (in billing). ### Packing List diff --git a/foundation/www/docs/user/manual/en/selling/setup/item-price.md b/foundation/www/docs/user/manual/en/selling/setup/item-price.md index b72a9234..86696f2e 100644 --- a/foundation/www/docs/user/manual/en/selling/setup/item-price.md +++ b/foundation/www/docs/user/manual/en/selling/setup/item-price.md @@ -1,7 +1,7 @@ # Item Price -Item Price is the record in which you can log selling and buying rate of an item. +Item Price is the record in which you can log sellig and buying rate of an item. There are two ways to reach to new Item Price form. @@ -15,7 +15,7 @@ Following are the steps to create new Item Price. Step 1: Select Price List -You can create multiple Price List in ERPNext to track Selling and Buying Price List of an item separately. Also if item's selling prices id changing based on territory, or due to other criteria, you can create multiple selling Price List for it. +You can create multiple Price List in ERPNext to track Selling and Buying Price List of an item separtely. Also if item's selling prices id changing based on territory, or due to other criteria, you can create multiple selling Price List for it. +Item Price list diff --git a/foundation/www/docs/user/manual/en/selling/setup/sales-person-target-allocation.md b/foundation/www/docs/user/manual/en/selling/setup/sales-person-target-allocation.md index 273ed78f..58f87349 100644 --- a/foundation/www/docs/user/manual/en/selling/setup/sales-person-target-allocation.md +++ b/foundation/www/docs/user/manual/en/selling/setup/sales-person-target-allocation.md @@ -73,7 +73,7 @@ This report will provide you variance between target and actual performance of S ###3. Target Distribution -Target Distribution document allows you to divide allocated target across multiple months. If your product and services is seasonal, you can distribute the sales target accordingly. For example, if you are into umbrella business, then target allocated in the monsoon season will be higher than in other months. +Target Distribution document allows you to divide allocated target across multiple months. If your product and services is seasonal, you can distribute the sales target accordingly. For example, if you are into umbrella business, then target allocated in the monsoon seasion will be higher than in other months. To create new Monthly Distriibution, go to: diff --git a/foundation/www/docs/user/manual/en/selling/setup/selling-settings.md b/foundation/www/docs/user/manual/en/selling/setup/selling-settings.md index a8399efc..365069d7 100644 --- a/foundation/www/docs/user/manual/en/selling/setup/selling-settings.md +++ b/foundation/www/docs/user/manual/en/selling/setup/selling-settings.md @@ -1,7 +1,7 @@ # Selling Settings -Selling Setting is where you can define properties which will be applied in your selling transactions. +Selling Setting is where you can define propertiese which will be applied in your selling transactions. Let's check into each property one by one. Selling Settings @@ -65,7 +65,7 @@ and you need to bypass validation of same rate throughout cycle, then you should ####9. Allow User to Edit Price List Rate in Transaction -Item table of the sale transactions has field called Price List Rate. This field be non-editable +Item table of the sale transactions has field called Price List Rate. This field be non-editale by default in all the sales transactions. This is to ensure that price of an item is fetched from Item Price record, and user is not able to edit it. diff --git a/foundation/www/docs/user/manual/en/selling/setup/shipping-rule.md b/foundation/www/docs/user/manual/en/selling/setup/shipping-rule.md index 1ad6e1e2..b57d9bca 100644 --- a/foundation/www/docs/user/manual/en/selling/setup/shipping-rule.md +++ b/foundation/www/docs/user/manual/en/selling/setup/shipping-rule.md @@ -1,8 +1,8 @@ # Shipping Rule -Using Shipping Rule you can define the cost for delivering the product to the customer. -You can define different shipping rules for the same item across different territories. +Using Shipping Rule you can define the cost for delivering the product to the customer and also to the supplier. +You can define different shipping rules or a fixed shipping amount for the same item across different territories. Shipping Rule diff --git a/foundation/www/docs/user/manual/en/setting-up/articles/overwriting-data-from-data-import-tool.md b/foundation/www/docs/user/manual/en/setting-up/articles/overwriting-data-from-data-import-tool.md index de1b6f13..391d37f9 100644 --- a/foundation/www/docs/user/manual/en/setting-up/articles/overwriting-data-from-data-import-tool.md +++ b/foundation/www/docs/user/manual/en/setting-up/articles/overwriting-data-from-data-import-tool.md @@ -35,7 +35,7 @@ Columns of other field which won't have any impact can be removed, even if they ####Step 3: Browse Template -After updating Item Groups in spreadsheet, come back to Data Import Tool in ERPNext. Browse and select the File/template which has data to be overwritten. +After updating Item Groups in spreadheet, come back to Data Import Tool in ERPNext. Browse and select the File/template which has data to be overwritten. Browse template diff --git a/foundation/www/docs/user/manual/en/setting-up/authorization-rule.md b/foundation/www/docs/user/manual/en/setting-up/authorization-rule.md index fb0c5cd9..8d50856e 100644 --- a/foundation/www/docs/user/manual/en/setting-up/authorization-rule.md +++ b/foundation/www/docs/user/manual/en/setting-up/authorization-rule.md @@ -11,7 +11,7 @@ To create new Authorization Rule, go to: Let's consider an example of Authorization Rule to learn better. -Assume that Sales Manager needs to authorize Sales Orders, only if its Grand Total value exceeds 10000. If Sales Order values is less than 10000, then even Sales User will be able to submit it. It means Submit permission of Sales User will be restricted only upto Sales Order of Grand Total less than 10000. +Assume that Sales Manager needs to authorize Sales Orders, only if its Grand Total value exceeds 10000. If Sales Orer values is less than 10000, then even Sales User will be able to submit it. It means Submit permision of Sales User will be restricted only upto Sales Order of Grand Total less than 10000. **Step 1:** @@ -35,12 +35,12 @@ Select approvers Role. It will be Sales Manager role which if assigned to user, **Step 6:** -Set Above Value. Given the example, Above Value will be set as 10000. +Set Above Value. Given the exmaple, Above Value will be set as 10000. Authorization Rule If Sales User tries submitting Sales Order of value higher than 10000, then he will get error message. ->If you wish to restrict Sales User from submitting Sales Orders, then instead of creating Authorization Rule, you should remove submit priviledge from Role Permission Manager for Sales User. +>If you wish to restrict Sales User from submitting Sales Orders, then instead of creating Authorization Rule, you should remove submit previledge from Role Permission Manager for Sales User. {next} diff --git a/foundation/www/docs/user/manual/en/setting-up/bar-code.md b/foundation/www/docs/user/manual/en/setting-up/bar-code.md deleted file mode 100644 index 006201c5..00000000 --- a/foundation/www/docs/user/manual/en/setting-up/bar-code.md +++ /dev/null @@ -1,53 +0,0 @@ - -# Bar Code - -A Barcode is a machine-readable code in the form of numbers and a pattern of -parallel lines of varying widths, printed on a commodity and used especially -for stock control. - -When you purchase an item from any store, you will notice a label with thin, -black lines across it, along with a variation of different numbers. This label -is then scanned by the cashier, and the item's description and price -automatically comes up. This set of lines and numbers on the label are termed -as bar-code. - -A bar-code machine scans the number from the label of an Item. To work with -ERPNext and the bar-code mechanism, connect the bar-code machine to your -operating hardware. Then go to ERPNext setup and activate bar-code by going to -tools and clicking on 'hide / unhide features'. Under Materials, feature -setup, check the box that says Item Barcode. - -> Setup > Customize > Hide/ Unhide Features > Item Barcode. - -#### Figure 1: Check the box 'Item Barcode' - -Barcode - - -To start scanning with a bar-code, go to - -> Accounts > Sales Invoice - -Under Item, click on Add new row. The item row will expand to show new fields. -Place your cursor on the bar-code field and begin scanning. The bar-code will -be updated in the field. Once the bar-code is entered, all the Item details -will be fetched automatically by the system. - -For more ease, activate the POS view in ERPnext. The activation process is -same as the bar-code activation. Go to Setup and click on 'hide/unhide -features'. Check the 'POS view' box. - -Then go to Accounts and click on Sales Invoice. Check the box 'Is POS' - - -#### Figure 2: Check the box 'Is POS' - -Barcode - - -Go to Item and click on Add new row. - -The cursor will automatically be placed in the bar-code field. Thus you can -immediately scan the bar-code and proceed with your operations. - -{next} diff --git a/foundation/www/docs/user/manual/en/setting-up/data/data-import-tool.md b/foundation/www/docs/user/manual/en/setting-up/data/data-import-tool.md index a6dede62..44e22611 100644 --- a/foundation/www/docs/user/manual/en/setting-up/data/data-import-tool.md +++ b/foundation/www/docs/user/manual/en/setting-up/data/data-import-tool.md @@ -44,9 +44,9 @@ file. To export the document in Excel tick the checkbox for Download in Excel Fi Download Template -### 3\. Upload the File either in .xlsx or .csv +### 3\. Upload the File ethier in .xlsx or .csv -Finally attach the file in the section. Click on the "Upload". Once the upload is successful click Import" +Finally attach the file in the section. Click on the "Upload". Once the upload is successfull click Import" button. Upload diff --git a/foundation/www/docs/user/manual/en/setting-up/index.txt b/foundation/www/docs/user/manual/en/setting-up/index.txt index 129876eb..2733e91a 100644 --- a/foundation/www/docs/user/manual/en/setting-up/index.txt +++ b/foundation/www/docs/user/manual/en/setting-up/index.txt @@ -13,6 +13,5 @@ stock-reconciliation-for-non-serialized-item territory third-party-backups workflows -bar-code company-setup articles diff --git a/foundation/www/docs/user/manual/en/setting-up/integrations/ldap-integration.md b/foundation/www/docs/user/manual/en/setting-up/integrations/ldap-integration.md index ddac8cb0..2c486e31 100644 --- a/foundation/www/docs/user/manual/en/setting-up/integrations/ldap-integration.md +++ b/foundation/www/docs/user/manual/en/setting-up/integrations/ldap-integration.md @@ -1,7 +1,7 @@ #Setting up LDAP -Lightweight Directory Access Protocol is a centralised access control system used by many small medium scale organisations. +Lightweight Directory Access Protocol is a centralised access controll system used by many small medium scale organisations. By settings up LDAP service, you able to login to ERPNext account by using LDAP credentials. diff --git a/foundation/www/docs/user/manual/en/setting-up/print/index.md b/foundation/www/docs/user/manual/en/setting-up/print/index.md index c4fb5e44..198a3fa8 100644 --- a/foundation/www/docs/user/manual/en/setting-up/print/index.md +++ b/foundation/www/docs/user/manual/en/setting-up/print/index.md @@ -1,7 +1,7 @@ # Printing and Branding -Documents that you send to your customers carry your brand and image and they must be tailored to your requirements. ERPNext gives you many options so that you can set your organization's branding in your documents. +Documents that you send to your customers carry your brand and image and they must be tailored to your requirements. ERPNext gives you many options so that you can set your oraganization's branding in your documents. ### Topics diff --git a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-4-two-factor-authentication.md b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-4-two-factor-authentication.md index 04510832..f6e758c0 100644 --- a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-4-two-factor-authentication.md +++ b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-4-two-factor-authentication.md @@ -1,13 +1,13 @@ # Step 4: Two Factor Authentication -Enable Two Factor Authentication +Enable Two Factor Athentication TwoFactor --- ###Authentication Method -Whenever each user logs in, based on the role set for that user, +Whenevever each user logs in, based on the role set for that user, they will be asked for a **One Time Password** after they input their login details. diff --git a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-5-company-details.md b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-5-company-details.md index c8fb8db7..63246bff 100644 --- a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-5-company-details.md +++ b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-5-company-details.md @@ -9,7 +9,7 @@ Enter Company Details like Name, Abbreviation and Financial Year Details. ### Company Abbreviation -These will be appended to your **Account** Heads, for example if your abbreviation is **WP**, then your Sales account will be **Sales - WPL** +These will be appened to your **Account** Heads, for example if your abbreviation is **WP**, then your Sales account will be **Sales - WPL** For Example: East Wind will be abbreviated as EW. Shades of Green will be abbreviated as SOG. In case you wish to give your own abbreviation, you can do so. The text field allows any type of text. diff --git a/foundation/www/docs/user/manual/en/setting-up/stock-reconciliation-for-non-serialized-item.md b/foundation/www/docs/user/manual/en/setting-up/stock-reconciliation-for-non-serialized-item.md index db25e6ca..10bc5a9f 100644 --- a/foundation/www/docs/user/manual/en/setting-up/stock-reconciliation-for-non-serialized-item.md +++ b/foundation/www/docs/user/manual/en/setting-up/stock-reconciliation-for-non-serialized-item.md @@ -36,7 +36,7 @@ A predefined template of an spreadsheet file should be followed for importing it Stock Reconciliation -The csv format is case-sensitive. Do not edit the headers which are preset in the template. In the Item Code and Warehouse column, enter exact Item Code and Warehouse as created in your ERPNext account. For quantity, enter stock level you wish to set for that item, in a specific warehouse. +The csv format is case-sensitive. Do not edit the headers which are preset in the template. In the Item Code and Warehouse column, enter exact Item Code and Warehouse as created in your ERPNext account. For quatity, enter stock level you wish to set for that item, in a specific warehouse. #### Step 3: Upload file and Enter Values in Stock Reconciliation Form @@ -44,7 +44,7 @@ The csv format is case-sensitive. Do not edit the headers which are preset in th **Posting Date** -Posting Date will be date when you want uploaded stock to reflect in the report. Posting Date selection option allows you making back dated stock reconciliation as well. +Posting Date will be date when you want uploaded stock to reflect in the report. Posting Date selection option allows you making back dated stock reconcialiation as well. **Difference Account:** diff --git a/foundation/www/docs/user/manual/en/setting-up/users-and-permissions/user-permissions.md b/foundation/www/docs/user/manual/en/setting-up/users-and-permissions/user-permissions.md index a465a8c6..2376db2a 100644 --- a/foundation/www/docs/user/manual/en/setting-up/users-and-permissions/user-permissions.md +++ b/foundation/www/docs/user/manual/en/setting-up/users-and-permissions/user-permissions.md @@ -1,7 +1,7 @@ # User Permissions -Along with Role based permissions, you can also set user level permissions that are based on rules that are evaluated against the data contained in the document being accessed. This is particularly useful when you want to restrict based on: +Along with Role based permissions, you can also set user level permissions that are based on rules that are evaluated against the data containted in the document being accessed. This is particularly useful when you want to restrict based on: 1. Allow user to access data belonging to one Company 1. Allow user to access data related to a specific Customer or Territory @@ -34,13 +34,13 @@ Here you will see that Company has already been checked. If you want user permis ### Ignoring User Permissions on Certain Fields -Another way of allowing documents to be seen that have been restricted by User Permissions is to check "Ignore User Permissions" on a particular field by going to **Customize Form** +Another way of allowing documents to be seen that have been restricited by User Permissions is to check "Ignore User Permissions" on a particular field by going to **Customize Form** For example you don't want Assets to be restricited for any user, then select **Asset** in **Customize Form** and in the Company field, check on "Ignore User Permissions" Ignore User Permissions on specific properties -### Strict Permissions +### Strict Permisssions Since User Permissions are applied via Roles, there may be many users belonging to a particular Role. Suppose you have three users belonging to Role "Accounts User" and you have applied **User Permissions** to only one user, then the permissions will only be restricted to that user. diff --git a/foundation/www/docs/user/manual/en/stock/accounting-of-inventory-stock/perpetual-inventory.md b/foundation/www/docs/user/manual/en/stock/accounting-of-inventory-stock/perpetual-inventory.md index a336ab93..769b5850 100644 --- a/foundation/www/docs/user/manual/en/stock/accounting-of-inventory-stock/perpetual-inventory.md +++ b/foundation/www/docs/user/manual/en/stock/accounting-of-inventory-stock/perpetual-inventory.md @@ -25,7 +25,7 @@ On receipt of items in a particular warehouse, the balance in the Warehouse Acco * If user wants to set an individual account for each warehouse, create account head for each account under `Assets > Current Asset > Stock Assets > (Warehouse)` and set it on the respective warehouse under field 'Account'. - * For stock transactions, general ledger entries made against the account head set on the warehouse, if user had not set the account for the warehouse then system gets the account head from the parent warehouse. If account had not set for parent warehouse then system gets the account(Default Inventory Account) from the company master. + * For stock transactions, general ledger entries made against the account head set on the warehouse, if user had not set the account for the warhouse then system gets the account head from the parent warehouse. If account had not set for parent warehouse then system gets the account(Default Inventory Account) from the company master. * * * diff --git a/foundation/www/docs/user/manual/en/stock/articles/allow-over-delivery-billing-against-sales-order-upto-certain-limit.md b/foundation/www/docs/user/manual/en/stock/articles/allow-over-delivery-billing-against-sales-order-upto-certain-limit.md index 2c1cbc30..bee69488 100644 --- a/foundation/www/docs/user/manual/en/stock/articles/allow-over-delivery-billing-against-sales-order-upto-certain-limit.md +++ b/foundation/www/docs/user/manual/en/stock/articles/allow-over-delivery-billing-against-sales-order-upto-certain-limit.md @@ -1,11 +1,11 @@ #Allow Over Delivery/Billing -While creating Delivery Note, system validates if item's Qty mentioned is same as in the Sales Order. If Item Qty has been increased, you will get over-delivery validation. If you want to be able to deliver more items than mentioned in the Sales Order, you should update "Allow over delivery or receipt upto this percent" in the Item master. +While creating Delivery Note, system validates if item's Qty mentined is same as in the Sales Order. If Item Qty has been increased, you will get over-delivery validation. If you want to be able to deliver more items than mentioned in the Sales Order, you should update "Allow over delivery or receipt upto this percent" in the Item master. Item wise Allowance percentage -Item's and Rate is also validated when creating Sales Invoice from Sales Order. Also when creating Purchase Receipt and Purchase Invoice from Purchase Order. Updating "Allow over delivery or receipt upto this percent" will be affective in all sales and purchase transactions. +Item's and Rate is also validated when creating Sales Invoice from Sales Order. Also when creating Purchase Receipt and Purchaes Invoice from Purchase Order. Updating "Allow over delivery or receipt upto this percent" will be affective in all sales and purchase transactions. For example, if you have ordered 100 units of an item, and if item's over receipt percent is 50%, then you are allowed to make Purchase Receipt for upto 150 units. diff --git a/foundation/www/docs/user/manual/en/stock/articles/serial-no-naming.md b/foundation/www/docs/user/manual/en/stock/articles/serial-no-naming.md index cfbf0a40..c8a2b2d9 100644 --- a/foundation/www/docs/user/manual/en/stock/articles/serial-no-naming.md +++ b/foundation/www/docs/user/manual/en/stock/articles/serial-no-naming.md @@ -9,7 +9,7 @@ There are two ways Serial no. can be generated in ERPNext. ###1. Serializing Purchase Items -If purchased items are received with Serial Nos. applied by OEM (original equipment manufacturer), you can follow same Serial No in ERPNext as well. While creating Purchase Receipt, you shall scan or manually enter Serial nos. for an item. On submitting Purchase Receipt, Serial Nos. will be created in the backend as per Serial Nos. provided for an item. If using OEM' Serial No., then in the Item master, Prefix should not be mentioned for serialization. As per this scenario, Prefix field should be left blank. +If purchased items are received with Serial Nos. applied by OEM (original equipment manufacturer), you can follow same Serial No in ERPNext as well. While creating Purchase Receipt, you shall scan or manually enter Serial nos. for an item. On submitting Purchase Receipt, Serial Nos. will be created in the backend as per Serial Nos. provided for an item. If using OEM' Serial No., then in the Item master, Prefix should not be mentioned for serializalization. As per this scenaio, Prefix field should be left blank. If received items already has its Serial No. barcoded, you can simply scan that barcode for entering Serial No. in the Purchase Receipt. Click [here](https://frappe.io/blog/management/using-barcodes-to-ease-data-entry) to learn more about it. diff --git a/foundation/www/docs/user/manual/en/stock/articles/stock-entry-purpose.md b/foundation/www/docs/user/manual/en/stock/articles/stock-entry-purpose.md index 55b9e006..11c12abe 100644 --- a/foundation/www/docs/user/manual/en/stock/articles/stock-entry-purpose.md +++ b/foundation/www/docs/user/manual/en/stock/articles/stock-entry-purpose.md @@ -5,7 +5,7 @@ Stock Entry is a stock transaction, which can be used for multiple purposes. Let #### 1.Purpose: Material Issue -Material Issue entry create to issue item(s) from a warehouse. On submission of Material Issue, stock of item is deducted from the Source Warehouse. +Material Issue entry create to issue item(s) from a warehouse. On submission of Material Issue, stock of item is deducated from the Source Warehouse. Material Issue is generally made for the low value consumable items like office stationary, product consumables etc. Also you can create Material Issue to reconcile serialized and batched item's stock. diff --git a/foundation/www/docs/user/manual/en/stock/articles/track-items-using-barcode.md b/foundation/www/docs/user/manual/en/stock/articles/track-items-using-barcode.md index 24f29446..893ae7bb 100644 --- a/foundation/www/docs/user/manual/en/stock/articles/track-items-using-barcode.md +++ b/foundation/www/docs/user/manual/en/stock/articles/track-items-using-barcode.md @@ -9,7 +9,7 @@ To set the barcode of a particular item, you will have to open the Item record. Material Transfer -Once barcode field is updated in item master, items can be fetched using barcode. This feature will be available in Delivery Note, Sales Invoice and Purchase Receipt transactions only. +Once barcode field is updated in item master, items can be fetched using barcode. This feature will be availble in Delivery Note, Sales Invoice and Purchase Receipt transactions only. Material Transfer diff --git a/foundation/www/docs/user/manual/en/stock/batch.md b/foundation/www/docs/user/manual/en/stock/batch.md index 034d252f..b390e7f1 100644 --- a/foundation/www/docs/user/manual/en/stock/batch.md +++ b/foundation/www/docs/user/manual/en/stock/batch.md @@ -35,7 +35,7 @@ You can also split the batch into smaller one by clicking on "Split". This will ### Transacting Items with Batches Batch master is created before creation of Purchase Receipt. -Hence every time there is Purchase Receipt or Production Order being made for a batch item, +Hence eveytime there is Purchase Receipt or Production Order being made for a batch item, you will first create its Batch No, and then select it in Purchase order or Production Entry. On every stock transaction (Purchase Receipt, Delivery Note, POS Invoice) made for batch item, diff --git a/foundation/www/docs/user/manual/en/stock/delivery-trip.md b/foundation/www/docs/user/manual/en/stock/delivery-trip.md new file mode 100644 index 00000000..5d4c1489 --- /dev/null +++ b/foundation/www/docs/user/manual/en/stock/delivery-trip.md @@ -0,0 +1,18 @@ + +# Delivery Trip + +Delivery Trip is created to record Customer Deliveries in one vehicle. Multiple stops can also be added and Submitted Delivery Note can be tagged per Customer. + +You can make a Delivery directly from: + +> Stock > Delivery Trip > New Delivery Trip + +Delivery + +Delivery + +Delivery Stops + +Delivery + +{next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/stock/index.txt b/foundation/www/docs/user/manual/en/stock/index.txt index b89abe10..f807e736 100644 --- a/foundation/www/docs/user/manual/en/stock/index.txt +++ b/foundation/www/docs/user/manual/en/stock/index.txt @@ -16,3 +16,4 @@ purchase-return articles opening-stock stock-how-to +retain-sample-stock \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/stock/installation-note.md b/foundation/www/docs/user/manual/en/stock/installation-note.md index 461e9931..815849e2 100644 --- a/foundation/www/docs/user/manual/en/stock/installation-note.md +++ b/foundation/www/docs/user/manual/en/stock/installation-note.md @@ -1,7 +1,7 @@ # Installation Note -You can use installation note to record the installation of a product having a serial number. +You can use installation note to record the instalation of a product having a serial number. Installation Note diff --git a/foundation/www/docs/user/manual/en/stock/item/index.md b/foundation/www/docs/user/manual/en/stock/item/index.md index 64e21c0d..ca768485 100644 --- a/foundation/www/docs/user/manual/en/stock/item/index.md +++ b/foundation/www/docs/user/manual/en/stock/item/index.md @@ -1,7 +1,7 @@ # Item -An Item is your company's product or a service. The term Item is applicable to things (products or services) you sell as well as raw materials or components of products yet to be produced (before they can be sold to customers). An Item can be a physical product or a service that you buy/sell from your customers/suppliers. ERPNext allows you to manage all sorts of items like raw-materials, sub-assemblies, finished goods, item variants and service items. +An Item is your companys' product or a service. The term Item is applicable to things (products or services) you sell as well as raw materials or components of products yet to be produced (before they can be sold to customers). An Item can be a physical product or a service that you buy/sell from your customers/suppliers. ERPNext allows you to manage all sorts of items like raw-materials, sub-assemblies, finished goods, item variants and service items. ERPNext is optimised for itemised management of your sales and purchase. If you are in services, you can create an Item for each services that your offer. Completing the Item Master is very essential for successful implementation of ERPNext. @@ -9,7 +9,7 @@ ERPNext is optimised for itemised management of your sales and purchase. If you * **Item Name:** Item name is the actual name of your product or service. * **Item Code:** Item Code is a short-form to denote your Item. If you have very few Items, it is advisable to keep the Item Name and the Item Code same. This helps new users to recognise and update Item details in all transactions. In case you have lot of Items with long names and the list runs in hundreds, it is advisable to code. To understand naming Item codes see [Item Codification](/docs/user/manual/en/stock/item/item-codification.html) - * **Item Group:** Item Group is used to categorize an Item under various criteria such as products, raw materials, services, sub-assemblies, consumables or all Item groups. Create your default Item Group list under Setup> Item Group and pre-select the option while filling your New Item details under [Item Group](/docs/user/manual/en/stock/setup/item-group.html) + * **Item Group:** Item Group is used to categorize an Item under various criterias like products, raw materials, services, sub-assemblies, consumables or all Item groups. Create your default Item Group list under Setup> Item Group and pre-select the option while filling your New Item details under [Item Group](/docs/user/manual/en/stock/setup/item-group.html) * **Default Unit of Measure:** This is the default measuring unit that you will use for your product. It could be in nos, kgs, meters, etc. You can store all the UOM’s that your product will require under Set Up> Master Data > UOM. These can be preselected while filling New Item by using % sign to get a pop up of the UOM list. * **Brand:** If you have more than one brand save them under Set Up> Master Data> Brand and pre-select them while filling a New Item. * **Variant:** A Item Variant is a different version of a Item.To learn more about managing variants see [Item Variants](/docs/user/manual/en/stock/item/item-variants.html) diff --git a/foundation/www/docs/user/manual/en/stock/item/index.txt b/foundation/www/docs/user/manual/en/stock/item/index.txt index 4e668757..db5fa0ad 100644 --- a/foundation/www/docs/user/manual/en/stock/item/index.txt +++ b/foundation/www/docs/user/manual/en/stock/item/index.txt @@ -4,3 +4,4 @@ item-variants purchase-details reorder item-valuation-fifo-and-moving-average +item-settings diff --git a/foundation/www/docs/user/manual/en/stock/item/item-price.md b/foundation/www/docs/user/manual/en/stock/item/item-price.md index 13beb91a..f7e861ed 100644 --- a/foundation/www/docs/user/manual/en/stock/item/item-price.md +++ b/foundation/www/docs/user/manual/en/stock/item/item-price.md @@ -15,7 +15,7 @@ Following are the steps to create new Item Price. Step 1: Select Price List -You can create multiple Price List in ERPNext to track Selling and Buying Price List of an item separately. Also if item's selling prices id changing based on territory, or due to other criteria, you can create multiple selling Price List for it. +You can create multiple Price List in ERPNext to track Selling and Buying Price List of an item separtely. Also if item's selling prices id changing based on territory, or due to other criteria, you can create multiple selling Price List for it. ![Item Price list](/docs/assets/old_images/erpnext/item-price-list.png) @@ -39,7 +39,7 @@ Step 4: Save Item Price To check all Item Price together, go to: -Stock >> Main Report >> Item wise Price List Rate +Stock >> Main Report >> Itemwise Price List Rate You will find option to create new Item Price record (+) in this report as well. diff --git a/foundation/www/docs/user/manual/en/stock/retain-sample-stock.md b/foundation/www/docs/user/manual/en/stock/retain-sample-stock.md new file mode 100644 index 00000000..17cdaa98 --- /dev/null +++ b/foundation/www/docs/user/manual/en/stock/retain-sample-stock.md @@ -0,0 +1,27 @@ + +# Retain Sample Stock + +A sample of a batch of starting material, packaging material or finished product is stored for the purpose of being analyzed should the need arise later. + +### Set Sample Retention Warehouse in Stock Settings + +It is advised to create a new warehouse just for retaining samples and not use it in production. + +Sample Retention Warehouse + +### Enable Retain Sample in Item master + +Check Retain Sample and Maximum allowed samples in Item Master for a batch. Please note that Retain Sample is based +on Batch hence Has Batch No should be enabled as well. + +Retain Sample + +### Stock Entry + +Whenever a Stock Entry is created with the purpose as Material Receipt, for items which have Retain Sample enabled, the Sample Quantity can be set during that Stock Entry. Sample quantity cannot be more than the Maximum sample quantity set in Item Master. + +Retain Sample + +On submission of this Stock Entry, button 'Make Retention Stock Entry' will be available to make another Stock Entry for the transfer of sample items from the mentioned batch to the retention warehouse set in Stock Settings. On clicking this button it will direct you to new Stock Entry with all the information, verify the information and click Submit. + +Retain Sample \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/stock/setup/stock-settings.md b/foundation/www/docs/user/manual/en/stock/setup/stock-settings.md index 0c60cebe..1e161367 100644 --- a/foundation/www/docs/user/manual/en/stock/setup/stock-settings.md +++ b/foundation/www/docs/user/manual/en/stock/setup/stock-settings.md @@ -5,4 +5,12 @@ You can set default settings for your stock related transactions here. Stock Settings +### Clean HTML Description + +Usually descriptions are copy-pasted from a website or Word / PDF file and they contain a lot of embedded style. This messes up the Print view of your invoices or quotes. + +To fix this, you can check "Convert Item Description to Clean HTML" in Stock Settings. This will ensure that when you save your Items, their descriptions will be cleaned up. + +If you want control your description views and llow any HTML to be embedded, you can uncheck this property. + {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/stock/tools/landed-cost-voucher.md b/foundation/www/docs/user/manual/en/stock/tools/landed-cost-voucher.md index 07fbe312..b0e84d29 100644 --- a/foundation/www/docs/user/manual/en/stock/tools/landed-cost-voucher.md +++ b/foundation/www/docs/user/manual/en/stock/tools/landed-cost-voucher.md @@ -25,7 +25,7 @@ In the document, you can select multiple Purchase Receipts and fetch all items f Landed Cost Vouher -### What happened on submission? +### What happend on submission? 1. On submission of Landed Cost Voucher, the applicable landed cost charges are updated in Purchase Receipt Item table. diff --git a/foundation/www/docs/user/manual/en/stock/warehouse.md b/foundation/www/docs/user/manual/en/stock/warehouse.md index 3c146b9e..b1500ac8 100644 --- a/foundation/www/docs/user/manual/en/stock/warehouse.md +++ b/foundation/www/docs/user/manual/en/stock/warehouse.md @@ -13,7 +13,7 @@ practically is a shelf inside your actual location. This can become quite a detailed Tree like >Warehouse >Room >Row >Shelf >Box To go to Warehouse, click on Stock and go to Warehouse under Setup. You -could also switch to 'Tree' View or simply type warehouse tree in the search bar. +could also switch to 'Tree' View or simply type warehouse tree in the awsone bar. Warehouse diff --git a/foundation/www/docs/user/manual/en/subscription/index.md b/foundation/www/docs/user/manual/en/subscription/index.md deleted file mode 100644 index b3a54f49..00000000 --- a/foundation/www/docs/user/manual/en/subscription/index.md +++ /dev/null @@ -1,23 +0,0 @@ - -If you have a contract with the Customer where your organization gives bill to the Customer on a monthly, quarterly, half-yearly or annual basis, you can use subscription feature to make auto invoicing. - -Subscription - -#### Scenario - -Subscription for your hosted ERPNext account requires yearly renewal. We use Sales Invoice for generating proforma invoices. To automate proforma invoicing for renewal, we set original Sales Invoice on the subscription form. Recurring proforma invoice is created automatically just before customer's account is about to expire, and requires renewal. This recurring Proforma Invoice is also emailed automatically to the customer. - -To set the subscription for the sales invoice -Goto Subscription > select base doctype "Sales Invoice" > select base docname "Invoice No" > Save - -Subscription - -**From Date and To Date**: This defines contract period with the customer. - -**Repeat on Day**: If frequency is set as Monthly, then it will be day of the month on which recurring invoice will be generated. - -**Notify By Email**: If you want to notify the user about auto recurring invoice. - -**Print Format**: Select a print format to define document view which should be emailed to customer. - -**Disabled**: It will stop to make auto recurring documents against the subscription \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/support/support_reports.md b/foundation/www/docs/user/manual/en/support/support_reports.md index a31d20ea..1035d78e 100644 --- a/foundation/www/docs/user/manual/en/support/support_reports.md +++ b/foundation/www/docs/user/manual/en/support/support_reports.md @@ -4,7 +4,7 @@ ### Support Hours -This report provide the information about the time slot along with the count of issues has been reported during the slot day wise. +This report provide the information about the time slot along with the count of issues has been reported during the slot daywise. > Support > Reports > Support Hours diff --git a/foundation/www/docs/user/manual/en/using-erpnext/articles/check-link-between-documents.md b/foundation/www/docs/user/manual/en/using-erpnext/articles/check-link-between-documents.md index 62fab0be..a5e4e361 100644 --- a/foundation/www/docs/user/manual/en/using-erpnext/articles/check-link-between-documents.md +++ b/foundation/www/docs/user/manual/en/using-erpnext/articles/check-link-between-documents.md @@ -7,7 +7,7 @@ Links option shows one document is linked to which other documents. Check Menu f ####Scenario -If you need that against Sales Order, which Delivery Note and Sales Invoice has been created, you should open Sales Order document, and check Links. Same way, you can also check Purchase Order, and find which Purchase Receipt and Purchase Invoice is linked with it. +If you need that against Sales Order, which Delivery Note and Sales Invoice has been created, you should open Sales Order document, and check Links. Same way, you can also check Purchase Order, and find which Purchase Receipt and Purchase Ivoice is linked with it. ####How It Works? diff --git a/foundation/www/docs/user/manual/en/using-erpnext/articles/duplicate-record.md b/foundation/www/docs/user/manual/en/using-erpnext/articles/duplicate-record.md index 1c9dc3c7..b20e894a 100644 --- a/foundation/www/docs/user/manual/en/using-erpnext/articles/duplicate-record.md +++ b/foundation/www/docs/user/manual/en/using-erpnext/articles/duplicate-record.md @@ -5,7 +5,7 @@ Duplicate feature helps you to copy values of existing document into new documen ####Scenario -An electronic supplier receives a repeat order from an existing customer. Since new order will have details just like previous order, you should open previous order, and Duplicate it to create new order faster. On Duplicating, values of the previous transaction will be updated in a new document. You can make changes where needed and submit the document. +An electronic supplier receives a repeat order from an existing customer. Since new order will have details just like previous order, you should open previous order, and Duplciate it to create new order faster. On Duplicating, values of the previous transaction will be updated in a new document. You can make changes where needed and submit the document. You will find Copy option under: diff --git a/foundation/www/docs/user/manual/en/website/articles/website-home-page.md b/foundation/www/docs/user/manual/en/website/articles/website-home-page.md index c2aa7172..a39f8bcf 100644 --- a/foundation/www/docs/user/manual/en/website/articles/website-home-page.md +++ b/foundation/www/docs/user/manual/en/website/articles/website-home-page.md @@ -1,5 +1,5 @@ -# Website Home Page +# Wesite Home Page It is very much possible in ERPNext to setup certain standard page as default website Home Page. Following are steps to setup default website home page. diff --git a/foundation/www/docs/user/manual/en/website/setup/website-settings.md b/foundation/www/docs/user/manual/en/website/setup/website-settings.md index 35130287..be47a376 100644 --- a/foundation/www/docs/user/manual/en/website/setup/website-settings.md +++ b/foundation/www/docs/user/manual/en/website/setup/website-settings.md @@ -34,7 +34,7 @@ You can set the menus items in the Top Bar here. Top Bar - * Similarly you can also set sidebar and footer links. + * Similarlly you can also set sidebar and footer links. ####Integrations & Miscellaneous Settings diff --git a/foundation/www/docs/user/manual/es/education/Assessment/__init__.py b/foundation/www/docs/user/manual/es/education/Assessment/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/foundation/www/docs/user/manual/es/education/Assessment/_sidebar.json b/foundation/www/docs/user/manual/es/education/Assessment/_sidebar.json new file mode 100644 index 00000000..88f5aab5 --- /dev/null +++ b/foundation/www/docs/user/manual/es/education/Assessment/_sidebar.json @@ -0,0 +1,22 @@ +[ + { + "route": "/docs", + "title": "Docs Home" + }, + { + "route": "/docs/user", + "title": "User Guide" + }, + { + "route": "/docs/current/api", + "title": "Server API" + }, + { + "route": "/docs/current/models", + "title": "Models (Reference)" + }, + { + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "title": "Improve Docs" + } +] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/es/schools/Assessment/assessment_criteria.md b/foundation/www/docs/user/manual/es/education/Assessment/assessment_criteria.md similarity index 85% rename from foundation/www/docs/user/manual/es/schools/Assessment/assessment_criteria.md rename to foundation/www/docs/user/manual/es/education/Assessment/assessment_criteria.md index 1c3d8431..98487eee 100644 --- a/foundation/www/docs/user/manual/es/schools/Assessment/assessment_criteria.md +++ b/foundation/www/docs/user/manual/es/education/Assessment/assessment_criteria.md @@ -3,12 +3,12 @@ Criterios de evaluación es el parámetro basado en el que se evalúa el estudiante. -Assessment Criteria +Assessment Criteria Después de la evaluación para un curso, las calificaciones obtenidas se ingresan en base a los criterios de evaluación. Por ejemplo, si la evaluación se llevó a cabo para el tema de la ciencia, entonces usted puede evaluar al estudiante en ciencia en varios criterios como la escritura, prácticas, presentación, etc Los Criterios de Evaluación se usan al programar el Plan de Evaluación para el Grupo de Estudiantes y el Curso. -Assessment Plan Criteria +Assessment Plan Criteria {next} diff --git a/foundation/www/docs/user/manual/es/schools/Assessment/assessment_group.md b/foundation/www/docs/user/manual/es/education/Assessment/assessment_group.md similarity index 82% rename from foundation/www/docs/user/manual/es/schools/Assessment/assessment_group.md rename to foundation/www/docs/user/manual/es/education/Assessment/assessment_group.md index e9185453..a6aaca3c 100644 --- a/foundation/www/docs/user/manual/es/schools/Assessment/assessment_group.md +++ b/foundation/www/docs/user/manual/es/education/Assessment/assessment_group.md @@ -5,10 +5,10 @@ La estructura del grupo de evaluación es un maestro donde se puede definir la j Por ejemplo, si realiza dos evaluaciones en un año académico, configure el Grupo de evaluación de la siguiente manera. -Assessment Group Term +Assessment Group Term En la misma línea, también puede definir varios Grupo de Evaluación basado sobre la evaluación llevada a cabo en su instituto. -Assessment Group Term +Assessment Group Term {next} diff --git a/foundation/www/docs/user/manual/es/schools/Assessment/assessment_plan.md b/foundation/www/docs/user/manual/es/education/Assessment/assessment_plan.md similarity index 85% rename from foundation/www/docs/user/manual/es/schools/Assessment/assessment_plan.md rename to foundation/www/docs/user/manual/es/education/Assessment/assessment_plan.md index 44f5646a..92dd6af6 100644 --- a/foundation/www/docs/user/manual/es/schools/Assessment/assessment_plan.md +++ b/foundation/www/docs/user/manual/es/education/Assessment/assessment_plan.md @@ -11,10 +11,10 @@ Para programar una evaluación/examinación para un Grupo de Estudiantes, para u 4. Examinador y Supervisor -Assessment Plan Details +Assessment Plan Details 5. Los Criterios de Evaluación son la lista de criterios basados ​​en que cada estudiante en será evaluado y los grados serán asignados. -Assessment Plan Criteria +Assessment Plan Criteria {next} diff --git a/foundation/www/docs/user/manual/es/schools/Assessment/assessment_result.md b/foundation/www/docs/user/manual/es/education/Assessment/assessment_result.md similarity index 76% rename from foundation/www/docs/user/manual/es/schools/Assessment/assessment_result.md rename to foundation/www/docs/user/manual/es/education/Assessment/assessment_result.md index c640f395..076d6766 100644 --- a/foundation/www/docs/user/manual/es/schools/Assessment/assessment_result.md +++ b/foundation/www/docs/user/manual/es/education/Assessment/assessment_result.md @@ -1,8 +1,8 @@ #Resultados de Evaluación -El resultado de la evaluación es un registro de las calificaciones obtenidas por el estudiante para una evaluación específica. El resultado de la evaluación se crea en el backend en base a los puntos en [Herramienta de Resultados de Evaluación](/docs/user/manual/es/schools/assessment/assessment_result_tool.html). +El resultado de la evaluación es un registro de las calificaciones obtenidas por el estudiante para una evaluación específica. El resultado de la evaluación se crea en el backend en base a los puntos en [Herramienta de Resultados de Evaluación](/docs/user/manual/es/education/assessment/assessment_result_tool.html). -Assessment Result +Assessment Result {next} diff --git a/foundation/www/docs/user/manual/es/schools/Assessment/assessment_result_tool.md b/foundation/www/docs/user/manual/es/education/Assessment/assessment_result_tool.md similarity index 92% rename from foundation/www/docs/user/manual/es/schools/Assessment/assessment_result_tool.md rename to foundation/www/docs/user/manual/es/education/Assessment/assessment_result_tool.md index c9523703..126c42db 100644 --- a/foundation/www/docs/user/manual/es/schools/Assessment/assessment_result_tool.md +++ b/foundation/www/docs/user/manual/es/education/Assessment/assessment_result_tool.md @@ -4,7 +4,7 @@ Herramienta de resultados de evaluación le ayuda a ingresar las calificaciones obtenidas por los estudiantes para un curso específico. En esta herramienta, basada en el plan de evaluación, todos los estudiantes van a ser filtrados dentro de la herramienta de resultados de la evaluación. También, Columnas para los Criterios de Evaluación serán donde las calificaciones ganadas pueden ser ingresadas para cada Estudiante. -Assessment Result Tool +Assessment Result Tool A medida que vaya introduciendo las notas para un Estudiante y cambie al siguiente alumno, en el backend, el registro de Resultados del Estudiante se creará automáticamente para ese Estudiante. diff --git a/foundation/www/docs/user/manual/es/schools/Assessment/grading_scale.md b/foundation/www/docs/user/manual/es/education/Assessment/grading_scale.md similarity index 88% rename from foundation/www/docs/user/manual/es/schools/Assessment/grading_scale.md rename to foundation/www/docs/user/manual/es/education/Assessment/grading_scale.md index 792b6f21..ad3fff9a 100644 --- a/foundation/www/docs/user/manual/es/schools/Assessment/grading_scale.md +++ b/foundation/www/docs/user/manual/es/education/Assessment/grading_scale.md @@ -3,6 +3,6 @@ En la escala de calificación, puedes definir varios grados y límites para los estudiantes. Basado en la calificación obtenida por el estudiante en la evaluación, el grado (Grade) será asignado. -Grading Scale +Grading Scale {next} diff --git a/foundation/www/docs/user/manual/es/schools/Assessment/index.md b/foundation/www/docs/user/manual/es/education/Assessment/index.md similarity index 100% rename from foundation/www/docs/user/manual/es/schools/Assessment/index.md rename to foundation/www/docs/user/manual/es/education/Assessment/index.md diff --git a/foundation/www/docs/user/manual/es/schools/Assessment/index.txt b/foundation/www/docs/user/manual/es/education/Assessment/index.txt similarity index 100% rename from foundation/www/docs/user/manual/es/schools/Assessment/index.txt rename to foundation/www/docs/user/manual/es/education/Assessment/index.txt diff --git a/foundation/www/docs/user/manual/es/education/__init__.py b/foundation/www/docs/user/manual/es/education/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/foundation/www/docs/user/manual/es/education/_sidebar.json b/foundation/www/docs/user/manual/es/education/_sidebar.json new file mode 100644 index 00000000..88f5aab5 --- /dev/null +++ b/foundation/www/docs/user/manual/es/education/_sidebar.json @@ -0,0 +1,22 @@ +[ + { + "route": "/docs", + "title": "Docs Home" + }, + { + "route": "/docs/user", + "title": "User Guide" + }, + { + "route": "/docs/current/api", + "title": "Server API" + }, + { + "route": "/docs/current/models", + "title": "Models (Reference)" + }, + { + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "title": "Improve Docs" + } +] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/es/education/admission/__init__.py b/foundation/www/docs/user/manual/es/education/admission/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/foundation/www/docs/user/manual/es/education/admission/_sidebar.json b/foundation/www/docs/user/manual/es/education/admission/_sidebar.json new file mode 100644 index 00000000..88f5aab5 --- /dev/null +++ b/foundation/www/docs/user/manual/es/education/admission/_sidebar.json @@ -0,0 +1,22 @@ +[ + { + "route": "/docs", + "title": "Docs Home" + }, + { + "route": "/docs/user", + "title": "User Guide" + }, + { + "route": "/docs/current/api", + "title": "Server API" + }, + { + "route": "/docs/current/models", + "title": "Models (Reference)" + }, + { + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "title": "Improve Docs" + } +] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/es/schools/admission/index.md b/foundation/www/docs/user/manual/es/education/admission/index.md similarity index 100% rename from foundation/www/docs/user/manual/es/schools/admission/index.md rename to foundation/www/docs/user/manual/es/education/admission/index.md diff --git a/foundation/www/docs/user/manual/es/schools/admission/index.txt b/foundation/www/docs/user/manual/es/education/admission/index.txt similarity index 100% rename from foundation/www/docs/user/manual/es/schools/admission/index.txt rename to foundation/www/docs/user/manual/es/education/admission/index.txt diff --git a/foundation/www/docs/user/manual/es/schools/admission/program-enrollment.md b/foundation/www/docs/user/manual/es/education/admission/program-enrollment.md similarity index 80% rename from foundation/www/docs/user/manual/es/schools/admission/program-enrollment.md rename to foundation/www/docs/user/manual/es/education/admission/program-enrollment.md index 4ca2f457..adda6a27 100644 --- a/foundation/www/docs/user/manual/es/schools/admission/program-enrollment.md +++ b/foundation/www/docs/user/manual/es/education/admission/program-enrollment.md @@ -3,6 +3,6 @@ Este formulario te permite inscribir un estudiante a un programa. Un estudiante puede ser inscrito en multiples programas. -Student Applicant Enrollment +Student Applicant Enrollment {next} diff --git a/foundation/www/docs/user/manual/es/schools/admission/student-applicant.md b/foundation/www/docs/user/manual/es/education/admission/student-applicant.md similarity index 89% rename from foundation/www/docs/user/manual/es/schools/admission/student-applicant.md rename to foundation/www/docs/user/manual/es/education/admission/student-applicant.md index a14feb20..e1631d25 100644 --- a/foundation/www/docs/user/manual/es/schools/admission/student-applicant.md +++ b/foundation/www/docs/user/manual/es/education/admission/student-applicant.md @@ -4,7 +4,7 @@ Un registro de Aplicación de Estudiante necesita ser creado cuando un estudiante aplica para un programa en su institución. Puedes Aprobar o Rechazar una aplicación de estudiante. Aceptando una aplicación de un estudiante puedes agregarlos al master de estudiantes. -Student Applicant +Student Applicant ### Estados de la Aplicación @@ -22,8 +22,8 @@ Puedes Aprobar o Rechazar una aplicación de estudiante. Aceptando una aplicaci Una vez aprobada una Aplicación de Estudiante, puedes inscribirlo a un programa. Cuando le das click al butón 'Inscribir', -el sistema creará un estudiante usando esa aplicación y le va a redireccionar a el [Formulario de Inscripción al Programa](/docs/user/manual/es/schools/student/program-enrollment.html). +el sistema creará un estudiante usando esa aplicación y le va a redireccionar a el [Formulario de Inscripción al Programa](/docs/user/manual/es/education/student/program-enrollment.html). -Student Applicant Enrollment +Student Applicant Enrollment {next} diff --git a/foundation/www/docs/user/manual/es/education/fees/__init__.py b/foundation/www/docs/user/manual/es/education/fees/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/foundation/www/docs/user/manual/es/education/fees/_sidebar.json b/foundation/www/docs/user/manual/es/education/fees/_sidebar.json new file mode 100644 index 00000000..88f5aab5 --- /dev/null +++ b/foundation/www/docs/user/manual/es/education/fees/_sidebar.json @@ -0,0 +1,22 @@ +[ + { + "route": "/docs", + "title": "Docs Home" + }, + { + "route": "/docs/user", + "title": "User Guide" + }, + { + "route": "/docs/current/api", + "title": "Server API" + }, + { + "route": "/docs/current/models", + "title": "Models (Reference)" + }, + { + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "title": "Improve Docs" + } +] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/es/schools/fees/fee-category.md b/foundation/www/docs/user/manual/es/education/fees/fee-category.md similarity index 82% rename from foundation/www/docs/user/manual/es/schools/fees/fee-category.md rename to foundation/www/docs/user/manual/es/education/fees/fee-category.md index 6cc4f400..4e9e107c 100644 --- a/foundation/www/docs/user/manual/es/schools/fees/fee-category.md +++ b/foundation/www/docs/user/manual/es/education/fees/fee-category.md @@ -3,6 +3,6 @@ Todos los tipos diferentes de cuotas que se cobran -Fees Category +Fees Category {next} diff --git a/foundation/www/docs/user/manual/es/schools/fees/fee-structure.md b/foundation/www/docs/user/manual/es/education/fees/fee-structure.md similarity index 85% rename from foundation/www/docs/user/manual/es/schools/fees/fee-structure.md rename to foundation/www/docs/user/manual/es/education/fees/fee-structure.md index cfc7659d..96d31619 100644 --- a/foundation/www/docs/user/manual/es/schools/fees/fee-structure.md +++ b/foundation/www/docs/user/manual/es/education/fees/fee-structure.md @@ -3,6 +3,6 @@ Una Estructura de Cuota es una plantilla que puede ser usada cuando se hacen registros de cuotas. -Fees Structure +Fees Structure {next} diff --git a/foundation/www/docs/user/manual/es/education/fees/fees.md b/foundation/www/docs/user/manual/es/education/fees/fees.md new file mode 100644 index 00000000..c5f4923a --- /dev/null +++ b/foundation/www/docs/user/manual/es/education/fees/fees.md @@ -0,0 +1,9 @@ + +# Cuotas + +Mantiene un registro de todas las cuotas recolectadas de los estudiantes. +La [Estructura de Cuota](/docs/user/manual/es/education/fees/fee-structure.html) es seleccionada basada en el programa seleccionada y los Términos Académicos. + +Fees + +{next} diff --git a/foundation/www/docs/user/manual/es/schools/fees/index.md b/foundation/www/docs/user/manual/es/education/fees/index.md similarity index 84% rename from foundation/www/docs/user/manual/es/schools/fees/index.md rename to foundation/www/docs/user/manual/es/education/fees/index.md index 0b4f4cb8..ab670246 100644 --- a/foundation/www/docs/user/manual/es/schools/fees/index.md +++ b/foundation/www/docs/user/manual/es/education/fees/index.md @@ -3,7 +3,7 @@ Esta sección contiene todos los documentos relacionado a las 'Cuota' -Fees Section +Fees Section ### Temas diff --git a/foundation/www/docs/user/manual/es/schools/fees/index.txt b/foundation/www/docs/user/manual/es/education/fees/index.txt similarity index 100% rename from foundation/www/docs/user/manual/es/schools/fees/index.txt rename to foundation/www/docs/user/manual/es/education/fees/index.txt diff --git a/foundation/www/docs/user/manual/es/schools/index.md b/foundation/www/docs/user/manual/es/education/index.md similarity index 86% rename from foundation/www/docs/user/manual/es/schools/index.md rename to foundation/www/docs/user/manual/es/education/index.md index 3ea18e40..347f2f63 100644 --- a/foundation/www/docs/user/manual/es/schools/index.md +++ b/foundation/www/docs/user/manual/es/education/index.md @@ -1,9 +1,9 @@ -# Schools +# Education Los módulos de School estan diseñados para satisfacer los requerimientos de Escuelas, Colegios e Institutos Educacionales. -Fees Section +Fees Section {index} diff --git a/foundation/www/docs/user/manual/es/schools/index.txt b/foundation/www/docs/user/manual/es/education/index.txt similarity index 100% rename from foundation/www/docs/user/manual/es/schools/index.txt rename to foundation/www/docs/user/manual/es/education/index.txt diff --git a/foundation/www/docs/user/manual/es/education/schedule/__init__.py b/foundation/www/docs/user/manual/es/education/schedule/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/foundation/www/docs/user/manual/es/education/schedule/_sidebar.json b/foundation/www/docs/user/manual/es/education/schedule/_sidebar.json new file mode 100644 index 00000000..88f5aab5 --- /dev/null +++ b/foundation/www/docs/user/manual/es/education/schedule/_sidebar.json @@ -0,0 +1,22 @@ +[ + { + "route": "/docs", + "title": "Docs Home" + }, + { + "route": "/docs/user", + "title": "User Guide" + }, + { + "route": "/docs/current/api", + "title": "Server API" + }, + { + "route": "/docs/current/models", + "title": "Models (Reference)" + }, + { + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "title": "Improve Docs" + } +] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/es/schools/schedule/course-schedule.md b/foundation/www/docs/user/manual/es/education/schedule/course-schedule.md similarity index 86% rename from foundation/www/docs/user/manual/es/schools/schedule/course-schedule.md rename to foundation/www/docs/user/manual/es/education/schedule/course-schedule.md index ea517e1b..d1bfd41a 100644 --- a/foundation/www/docs/user/manual/es/schools/schedule/course-schedule.md +++ b/foundation/www/docs/user/manual/es/education/schedule/course-schedule.md @@ -4,13 +4,13 @@ El Horario de Curso es el horario de una sesión de un profesor para un Curso en particular. Puedes ver un resumen del horario del curso en la vista de Calendario. -Course Schedule +Course Schedule ### Marcando asistencia Puedes pasar la asistencia para un grupo de estudiantes usando el Horario de Curso. -Course Schedule Attendance +Course Schedule Attendance - Para hacer la asistencia, expandir la sección de asistencia. - Selecciona los estudiantes que estaban presentes para esa sesión. @@ -21,6 +21,6 @@ Puedes pasar la asistencia para un grupo de estudiantes usando el Horario de Cur Una vez hayas marcado la asistencia usando la sección de asistencia en el Horario de un Curso, esta sección debería estar oculta. Un botón de Ver Asistencia debería aparecer. Click en el botón para ver todos los registros de asistencia creados para ese Horario de Curso. -Course Schedule Attendance +Course Schedule Attendance {next} diff --git a/foundation/www/docs/user/manual/es/schools/schedule/examination.md b/foundation/www/docs/user/manual/es/education/schedule/examination.md similarity index 86% rename from foundation/www/docs/user/manual/es/schools/schedule/examination.md rename to foundation/www/docs/user/manual/es/education/schedule/examination.md index 86c5b0f3..d82b2c7a 100644 --- a/foundation/www/docs/user/manual/es/schools/schedule/examination.md +++ b/foundation/www/docs/user/manual/es/education/schedule/examination.md @@ -3,7 +3,7 @@ El registro de examinación puede ser usado para hacer el seguimiento del horario de los examenes y los resultados de los mismos. -Examination +Examination {next} diff --git a/foundation/www/docs/user/manual/es/schools/schedule/index.md b/foundation/www/docs/user/manual/es/education/schedule/index.md similarity index 71% rename from foundation/www/docs/user/manual/es/schools/schedule/index.md rename to foundation/www/docs/user/manual/es/education/schedule/index.md index 5d37fa13..e9f8a5c3 100644 --- a/foundation/www/docs/user/manual/es/schools/schedule/index.md +++ b/foundation/www/docs/user/manual/es/education/schedule/index.md @@ -1,7 +1,7 @@ # Horario -Schedule Section +Schedule Section ### Temas diff --git a/foundation/www/docs/user/manual/es/schools/schedule/index.txt b/foundation/www/docs/user/manual/es/education/schedule/index.txt similarity index 100% rename from foundation/www/docs/user/manual/es/schools/schedule/index.txt rename to foundation/www/docs/user/manual/es/education/schedule/index.txt diff --git a/foundation/www/docs/user/manual/es/schools/schedule/scheduling-tool.md b/foundation/www/docs/user/manual/es/education/schedule/scheduling-tool.md similarity index 96% rename from foundation/www/docs/user/manual/es/schools/schedule/scheduling-tool.md rename to foundation/www/docs/user/manual/es/education/schedule/scheduling-tool.md index 089f771f..70400127 100644 --- a/foundation/www/docs/user/manual/es/schools/schedule/scheduling-tool.md +++ b/foundation/www/docs/user/manual/es/education/schedule/scheduling-tool.md @@ -3,7 +3,7 @@ Esta herramienta puede ser usada para crear los Horarios de los Cursos. -Scheduling Tool +Scheduling Tool ### Creando Horarios de Cursos diff --git a/foundation/www/docs/user/manual/es/schools/schedule/student-attendance.md b/foundation/www/docs/user/manual/es/education/schedule/student-attendance.md similarity index 84% rename from foundation/www/docs/user/manual/es/schools/schedule/student-attendance.md rename to foundation/www/docs/user/manual/es/education/schedule/student-attendance.md index 59b125b2..888ab85d 100644 --- a/foundation/www/docs/user/manual/es/schools/schedule/student-attendance.md +++ b/foundation/www/docs/user/manual/es/education/schedule/student-attendance.md @@ -3,6 +3,6 @@ Mantiene los registros de la asistencia del estudiante. Los registros de asistencia pueden ser creados sobre los horarios de los cursos (Course Schedules). -Student Attendance +Student Attendance {next} diff --git a/foundation/www/docs/user/manual/es/education/setup/__init__.py b/foundation/www/docs/user/manual/es/education/setup/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/foundation/www/docs/user/manual/es/education/setup/_sidebar.json b/foundation/www/docs/user/manual/es/education/setup/_sidebar.json new file mode 100644 index 00000000..88f5aab5 --- /dev/null +++ b/foundation/www/docs/user/manual/es/education/setup/_sidebar.json @@ -0,0 +1,22 @@ +[ + { + "route": "/docs", + "title": "Docs Home" + }, + { + "route": "/docs/user", + "title": "User Guide" + }, + { + "route": "/docs/current/api", + "title": "Server API" + }, + { + "route": "/docs/current/models", + "title": "Models (Reference)" + }, + { + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "title": "Improve Docs" + } +] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/es/schools/setup/academic-term.md b/foundation/www/docs/user/manual/es/education/setup/academic-term.md similarity index 76% rename from foundation/www/docs/user/manual/es/schools/setup/academic-term.md rename to foundation/www/docs/user/manual/es/education/setup/academic-term.md index 043aa21d..fb2e7744 100644 --- a/foundation/www/docs/user/manual/es/schools/setup/academic-term.md +++ b/foundation/www/docs/user/manual/es/education/setup/academic-term.md @@ -1,7 +1,7 @@ # Término Académico -Academic Term +Academic Term {next} diff --git a/foundation/www/docs/user/manual/es/schools/setup/academic-year.md b/foundation/www/docs/user/manual/es/education/setup/academic-year.md similarity index 75% rename from foundation/www/docs/user/manual/es/schools/setup/academic-year.md rename to foundation/www/docs/user/manual/es/education/setup/academic-year.md index fff8a7d2..3c425dcd 100644 --- a/foundation/www/docs/user/manual/es/schools/setup/academic-year.md +++ b/foundation/www/docs/user/manual/es/education/setup/academic-year.md @@ -1,6 +1,6 @@ # Año Académico -Academic Year +Academic Year {next} diff --git a/foundation/www/docs/user/manual/es/education/setup/course.md b/foundation/www/docs/user/manual/es/education/setup/course.md new file mode 100644 index 00000000..64559c87 --- /dev/null +++ b/foundation/www/docs/user/manual/es/education/setup/course.md @@ -0,0 +1,6 @@ + +# Curso + +Course + +{next} diff --git a/foundation/www/docs/user/manual/es/schools/setup/index.md b/foundation/www/docs/user/manual/es/education/setup/index.md similarity index 76% rename from foundation/www/docs/user/manual/es/schools/setup/index.md rename to foundation/www/docs/user/manual/es/education/setup/index.md index cf23d3a5..619755be 100644 --- a/foundation/www/docs/user/manual/es/schools/setup/index.md +++ b/foundation/www/docs/user/manual/es/education/setup/index.md @@ -1,7 +1,7 @@ # Configuración -Setup Section +Setup Section ### Temas diff --git a/foundation/www/docs/user/manual/es/schools/setup/index.txt b/foundation/www/docs/user/manual/es/education/setup/index.txt similarity index 100% rename from foundation/www/docs/user/manual/es/schools/setup/index.txt rename to foundation/www/docs/user/manual/es/education/setup/index.txt diff --git a/foundation/www/docs/user/manual/es/education/setup/instructor.md b/foundation/www/docs/user/manual/es/education/setup/instructor.md new file mode 100644 index 00000000..f5477167 --- /dev/null +++ b/foundation/www/docs/user/manual/es/education/setup/instructor.md @@ -0,0 +1,6 @@ + +# Instructor + +Instructor + +{next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/es/education/setup/program.md b/foundation/www/docs/user/manual/es/education/setup/program.md new file mode 100644 index 00000000..3e03bef7 --- /dev/null +++ b/foundation/www/docs/user/manual/es/education/setup/program.md @@ -0,0 +1,6 @@ + +# Programa + +Program + +{next} diff --git a/foundation/www/docs/user/manual/es/education/setup/room.md b/foundation/www/docs/user/manual/es/education/setup/room.md new file mode 100644 index 00000000..755e0142 --- /dev/null +++ b/foundation/www/docs/user/manual/es/education/setup/room.md @@ -0,0 +1,7 @@ + +# Aula + + +Room + +{next} diff --git a/foundation/www/docs/user/manual/es/education/student/__init__.py b/foundation/www/docs/user/manual/es/education/student/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/foundation/www/docs/user/manual/es/education/student/_sidebar.json b/foundation/www/docs/user/manual/es/education/student/_sidebar.json new file mode 100644 index 00000000..88f5aab5 --- /dev/null +++ b/foundation/www/docs/user/manual/es/education/student/_sidebar.json @@ -0,0 +1,22 @@ +[ + { + "route": "/docs", + "title": "Docs Home" + }, + { + "route": "/docs/user", + "title": "User Guide" + }, + { + "route": "/docs/current/api", + "title": "Server API" + }, + { + "route": "/docs/current/models", + "title": "Models (Reference)" + }, + { + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "title": "Improve Docs" + } +] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/es/schools/student/index.md b/foundation/www/docs/user/manual/es/education/student/index.md similarity index 100% rename from foundation/www/docs/user/manual/es/schools/student/index.md rename to foundation/www/docs/user/manual/es/education/student/index.md diff --git a/foundation/www/docs/user/manual/es/schools/student/index.txt b/foundation/www/docs/user/manual/es/education/student/index.txt similarity index 100% rename from foundation/www/docs/user/manual/es/schools/student/index.txt rename to foundation/www/docs/user/manual/es/education/student/index.txt diff --git a/foundation/www/docs/user/manual/es/schools/student/student-batch.md b/foundation/www/docs/user/manual/es/education/student/student-batch.md similarity index 60% rename from foundation/www/docs/user/manual/es/schools/student/student-batch.md rename to foundation/www/docs/user/manual/es/education/student/student-batch.md index 692462c0..4606f363 100644 --- a/foundation/www/docs/user/manual/es/schools/student/student-batch.md +++ b/foundation/www/docs/user/manual/es/education/student/student-batch.md @@ -4,6 +4,6 @@ Un lote de estudiantes es una colección de estudiantes desde los Grupos de Estudiantes. -Student +Student {next} diff --git a/foundation/www/docs/user/manual/es/schools/student/student-group-creation-tool.md b/foundation/www/docs/user/manual/es/education/student/student-group-creation-tool.md similarity index 79% rename from foundation/www/docs/user/manual/es/schools/student/student-group-creation-tool.md rename to foundation/www/docs/user/manual/es/education/student/student-group-creation-tool.md index c188640f..220fc0e1 100644 --- a/foundation/www/docs/user/manual/es/schools/student/student-group-creation-tool.md +++ b/foundation/www/docs/user/manual/es/education/student/student-group-creation-tool.md @@ -4,6 +4,6 @@ Esta herramienta te permite crear grupos de estudiantes. Puedes especificar multiples parámetros para crearlos. -Student Group Creation Tool +Student Group Creation Tool {next} diff --git a/foundation/www/docs/user/manual/es/schools/student/student-group.md b/foundation/www/docs/user/manual/es/education/student/student-group.md similarity index 90% rename from foundation/www/docs/user/manual/es/schools/student/student-group.md rename to foundation/www/docs/user/manual/es/education/student/student-group.md index 058a60b0..bdd7c3a1 100644 --- a/foundation/www/docs/user/manual/es/schools/student/student-group.md +++ b/foundation/www/docs/user/manual/es/education/student/student-group.md @@ -4,6 +4,6 @@ Un Grupo de Estudiante es una colección de estudiantes tomando el mismo curso. Puedes crear calendarios para los cursos y examinaciones para un Grupo de Estudiante. Un Grupo de Estudiante necesita ser creado para cada curso en un año o término académico en particular. -Student Group +Student Group {next} diff --git a/foundation/www/docs/user/manual/es/schools/student/student-log.md b/foundation/www/docs/user/manual/es/education/student/student-log.md similarity index 73% rename from foundation/www/docs/user/manual/es/schools/student/student-log.md rename to foundation/www/docs/user/manual/es/education/student/student-log.md index 69a41942..c48f8e90 100644 --- a/foundation/www/docs/user/manual/es/schools/student/student-log.md +++ b/foundation/www/docs/user/manual/es/education/student/student-log.md @@ -4,6 +4,6 @@ Puedes crear una nota de una actividad de un estudiante usando la bitácora de estudiante (log) Los registros de bitágora pueden ser categorizadas como 'General', 'Academic', 'Medical' or 'Achievement' -Student +Student {next} diff --git a/foundation/www/docs/user/manual/es/schools/student/student.md b/foundation/www/docs/user/manual/es/education/student/student.md similarity index 79% rename from foundation/www/docs/user/manual/es/schools/student/student.md rename to foundation/www/docs/user/manual/es/education/student/student.md index e0e7ac98..b95a76c8 100644 --- a/foundation/www/docs/user/manual/es/schools/student/student.md +++ b/foundation/www/docs/user/manual/es/education/student/student.md @@ -6,6 +6,6 @@ El doctype de Estudiante mantiene los detalles personales de los estudiantes. Puedes ver todo lo relacionado a un estudiante en particular en esta página. Ejemplo: Pagos, Grupo de Estudiante, etc. -Student +Student {next} diff --git a/foundation/www/docs/user/manual/es/index.txt b/foundation/www/docs/user/manual/es/index.txt index feb68a2f..ad85a791 100644 --- a/foundation/www/docs/user/manual/es/index.txt +++ b/foundation/www/docs/user/manual/es/index.txt @@ -1,3 +1,4 @@ introduction accounts -schools +projects +education diff --git a/foundation/www/docs/user/manual/es/projects/__init__.py b/foundation/www/docs/user/manual/es/projects/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/foundation/www/docs/user/manual/es/projects/_sidebar.json b/foundation/www/docs/user/manual/es/projects/_sidebar.json new file mode 100644 index 00000000..88f5aab5 --- /dev/null +++ b/foundation/www/docs/user/manual/es/projects/_sidebar.json @@ -0,0 +1,22 @@ +[ + { + "route": "/docs", + "title": "Docs Home" + }, + { + "route": "/docs/user", + "title": "User Guide" + }, + { + "route": "/docs/current/api", + "title": "Server API" + }, + { + "route": "/docs/current/models", + "title": "Models (Reference)" + }, + { + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "title": "Improve Docs" + } +] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/es/projects/activity-cost.md b/foundation/www/docs/user/manual/es/projects/activity-cost.md new file mode 100644 index 00000000..95db500c --- /dev/null +++ b/foundation/www/docs/user/manual/es/projects/activity-cost.md @@ -0,0 +1,7 @@ + +# Costo de Actividad + +El costo de la actividad registra la tasa de facturación por hora y la tasa de costos de un empleado en comparación con un tipo de actividad. +El sistema hace uso de esta tasa mientras hace registros de tiempo. Se usa para Costeo de proyectos. + +Activity Cost diff --git a/foundation/www/docs/user/manual/es/projects/activity-type.md b/foundation/www/docs/user/manual/es/projects/activity-type.md new file mode 100644 index 00000000..1348eb6f --- /dev/null +++ b/foundation/www/docs/user/manual/es/projects/activity-type.md @@ -0,0 +1,16 @@ + +# Tipo de Actividad + +Los tipos de actividad son la lista de los diferentes tipos de actividades sobre las que se hacen registro de tiempo. + +Activity Type + +Por defecto, los siguientes tipos de actividades son creados. + +* Planning +* Research +* Proposal Writing +* Execution +* Communication + +{next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/es/projects/articles/__init__.py b/foundation/www/docs/user/manual/es/projects/articles/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/foundation/www/docs/user/manual/es/projects/articles/_sidebar.json b/foundation/www/docs/user/manual/es/projects/articles/_sidebar.json new file mode 100644 index 00000000..88f5aab5 --- /dev/null +++ b/foundation/www/docs/user/manual/es/projects/articles/_sidebar.json @@ -0,0 +1,22 @@ +[ + { + "route": "/docs", + "title": "Docs Home" + }, + { + "route": "/docs/user", + "title": "User Guide" + }, + { + "route": "/docs/current/api", + "title": "Server API" + }, + { + "route": "/docs/current/models", + "title": "Models (Reference)" + }, + { + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "title": "Improve Docs" + } +] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/es/projects/articles/index.md b/foundation/www/docs/user/manual/es/projects/articles/index.md new file mode 100644 index 00000000..7126ad40 --- /dev/null +++ b/foundation/www/docs/user/manual/es/projects/articles/index.md @@ -0,0 +1,4 @@ + +# Artículos + +{index} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/es/projects/articles/index.txt b/foundation/www/docs/user/manual/es/projects/articles/index.txt new file mode 100644 index 00000000..56c193c2 --- /dev/null +++ b/foundation/www/docs/user/manual/es/projects/articles/index.txt @@ -0,0 +1 @@ +project-costing \ No newline at end of file diff --git a/foundation/www/docs/user/manual/es/projects/articles/project-costing.md b/foundation/www/docs/user/manual/es/projects/articles/project-costing.md new file mode 100644 index 00000000..a7f4142c --- /dev/null +++ b/foundation/www/docs/user/manual/es/projects/articles/project-costing.md @@ -0,0 +1,41 @@ + +# Costeo de proyectos + +Cada proyecto tiene multiples tareas asociadas a el. Para hacer el seguimiento del costo actual de un proyecto, primeramente en términos de servicios, el usuario +tiene que crear un registro de tiempo basado en el tiempo que invirtió en una tarea del proyecto. Siguiendo los pasos de como puedes hacer el seguimiento del costo actual de un servicio usando el proyecto. + +#### Tipo de actividad + +Tipo de actividad es un maestro de los servicios ofrecidos por su personal. Puedes agregar un nuevo Tipo de Actividad desde: + +`Project > Activity Type > New` + +#### Costo de actividad + +Costo de actividad es un maestro donde puedes hacer el seguimiento de los montos de facturación y costo de cada empleado, y por cada tipo de Tipo de Actividad. + +Activity Cost + +#### Registro de Tiempo + +Basados en el tiempo actual invertido en una Tarea del Proyecto, El empleado va a crear un registro de tiempo. + +Time Log + +Al momento de seleccionar el Tipo de Actividad en el Registro de tiempo, el monto de Facturación y Costo del empleado va a ser traído de su respectivo registro en el master de Costo de Actividad. + +Time Log Costing + +Multiplicando esos montos con el total de número de horas en el registro de tiempo, nos da el monto de costos y Facturación para el registro de tiempo específico. + +#### Costeo en Proyectos y Tareas + +Basados en el total de registros de tiempos creados por una tarea en específico, su costo va a ser actualizado en el registro maestro de la tarea, o sea, en el detalle de la tarea. + +Costing in Task + +De la misma manera, el detalle del Proyecto va a actualizar su costo basado en el total de registros de tiempo a ese proyecto, y las tareas asociadas a ese proyecto. + +Costing in Project + + \ No newline at end of file diff --git a/foundation/www/docs/user/manual/es/projects/index.md b/foundation/www/docs/user/manual/es/projects/index.md new file mode 100644 index 00000000..8dfbb10f --- /dev/null +++ b/foundation/www/docs/user/manual/es/projects/index.md @@ -0,0 +1,16 @@ + +# Proyectos + +ERPNext le ayuda en la administración de su proyecto a traves de la creacion de tareas y +poder asignarlas a diferentes personas. + +Las compras y las ventas también se pueden rastrear en relación con los proyectos y +esto puede ayudar a la empresa a controlar su presupuesto, entrega y rentabilidad para un proyecto. + +Los proyectos pueden ser usados para manejar los proyectos internos, trabajos de manufacturación y +planificación de servicios. Para los trabajos de servicios, los Time Sheets (hojas de tiempo) pueden ser creadas +para facturar a los clientes, en caso que el proceso de facturación se haga basado en tiempo y dinero de tareas. + +### Temas + +{index} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/es/projects/index.txt b/foundation/www/docs/user/manual/es/projects/index.txt new file mode 100644 index 00000000..716ec1fe --- /dev/null +++ b/foundation/www/docs/user/manual/es/projects/index.txt @@ -0,0 +1,7 @@ +tasks +project +time-log-batch +activity-type +activity-cost +articles +timesheet \ No newline at end of file diff --git a/foundation/www/docs/user/manual/es/projects/project.md b/foundation/www/docs/user/manual/es/projects/project.md new file mode 100644 index 00000000..33394522 --- /dev/null +++ b/foundation/www/docs/user/manual/es/projects/project.md @@ -0,0 +1,111 @@ + +# Proyecto + +El manejo de proyectos en ERPNext se hace a traves de tareas. Puedes crear un proyecto y asignar varias tareas al mismo. + +Project + +También puedes hacer el seguimiento del % completado del proyecto usando diferentes métodos. + + 1. Tareas Completadas + 2. Progreso de tareas + 3. Peso de tarea + +Project + +Algunos ejemplos de como el % completado es cálculado basado en tareas. + +Project + +Project + +### Manejando tareas + +Los proyecto pueden ser divididos en multiples tareas. +Las tareas pueden ser creadas a traves del documento de Proyecto o pueden ser creadas via [Tarea](/docs/user/manual/en/projects/tasks.html) + +Project + +* Para ver las tareas creadas a un proyecto click en 'Tasks' + +Project - View Task + +Project - Task List + +* También puedes ver las tareas desde la misma vista del proyecto. + +Project - Task Grid + +* Para agregar peso a las tareas puedes seguir los pasos siguientes + +Project - Task Grid +Project - Task Grid + + +### Manejando tiempo + +ERPNext usa [Time Log](/docs/user/manual/en/projects/time-log.html) para hacer el seguimiento del progreso de un Proyecto. +Puedes crear registros de tiempo sobre cada Tarea. +El tiempo actual de inicio y finalización junto con el costo deben ser actualizados basados en los Registros de Tiempo. + +* Para ver los Registros de Tiempo realizados a un proyecto, dar click en 'Time Logs' + +Project - View Time Log + +Project - Time Log List + +* Puedes agregar un registro de tiempo directamente y luego asociarlo con el proyecto. + +Project - Link Time Log + +### Gestión de gastos + +Puede reservar la [Reclamación de gastos](/docs/user/manual/en/human-resources/expense-claim.html) contra una tarea de proyecto. +El sistema actualizará el monto total de las reclamaciones de gastos en la sección de costos del proyecto. + +* Para ver las reclamaciones de gastos realizadas en un proyecto, haga clic en 'Reclamaciones de gastos' + +Project - View Expense Claim + +* También puede crear un Reclamo de gastos directamente y vincularlo al Proyecto. + +Project - Link Expense Claim + +* El monto total de los Reclamos de gastos reservados contra un proyecto se muestra en 'Reclamo de gastos totales' en la Sección de Costos del proyecto + +Project - Total Expense Claim + +### Centro de Costo + +Puedes crear un [Cost Center](/docs/user/manual/en/accounts/setup/cost-center.html) sobre un proyecto o usar un centro de costo existente para hacer el seguimiento de todos los gastos realizados al proyecto. + +Project - Cost Center + +###Costeo del proyecto + +La sección Costeo del proyecto le ayuda a rastrear el tiempo y los gastos incurridos en relación con el proyecto. + +Project - Costing + +* La sección de cálculo de costos se actualiza según los registros de tiempo realizados. + +* El margen bruto es la diferencia entre el monto total de costos y el monto total de facturación + +###Facturación + +Puedes crear/enlazar una [Sales Order](/docs/user/manual/en/selling/sales-order.html) a un proyecto. Una vez asociada puedes usar el módulo de ventas para facturar a un cliente sobre el proyecto. + +Project - Sales Order + +###Gantt Chart + +Un Gantt Chart muestra la planificación del proyecto. +ERPNext te provee con una vista para visualizar las tareas de forma calendarizada usando un Gantt Chart (Hoja de Gantt). + +* Para visualizar el gantt chart de un proyecto, ve hasta el proyecto y dar click en 'Gantt Chart' + +Project - View Gantt Chart + +Project - Gantt Chart + +{next} diff --git a/foundation/www/docs/user/manual/es/projects/tasks.md b/foundation/www/docs/user/manual/es/projects/tasks.md new file mode 100644 index 00000000..40669d64 --- /dev/null +++ b/foundation/www/docs/user/manual/es/projects/tasks.md @@ -0,0 +1,62 @@ + +# Tareas + +Proyecto es dividido en Tareas. +En ERPNext, puedes crear las tareas de forma independiente. + +Task + +### Estado de una Tarea + +Una tarea puede tener uno de los siguientes estados - Abierto, Trabajando, Pendiente de Revisión, Cerrado, o Cancelado. + +Task - Status + +* Por defecto, cada nueva tarea creada se le establece el estado 'Abierto'. + +* Si un registro de tiempo es realizado sobre una tarea, su estado es asignado a 'Working'. + +### Tarea Dependiente + +Puedes especificar una lista de tareas dependientes en la sección 'Depende de' + +Depends On + +* No puedes cerrar una tarea padre hasta que todas las tareas dependientes esten cerradas. + +* Si una tarea dependiente se encuentra en retraso y se sobrepone con la fecha esperada de inicio de la tarea padre, el sistema va a re calandarizar la tarea padre. + +### Manejando el tiempo + +ERPNext usa [Time Log](/docs/user/manual/en/projects/time-log.html) para seguir el progreso de una tarea. +Puedes crear varios registros de tiempo para cada tarea. +El tiempo de inicio y fin actual junto con el costo es actualizado en base al Registro de Tiempo. + +* Para ver el Registro de tiempo realizado a una tarea, dar click en 'Time Logs' + +Task - View Time Log + +Task - Time Log List + +* Puedes también crear un Registro de Tiempo directamente y luego asociarlo a una Tarea. + +Task - Link Time Log + +### Gestión de gastos + +Puede reservar la [Reclamación de gastos](/docs/user/manual/en/human-resources/expense-claim.html) contra una tarea de proyecto. +El sistema actualizará el monto total de las reclamaciones de gastos en la sección de costos del proyecto. + +* Para ver las reclamaciones de gastos realizadas en un proyecto, haga clic en 'Reclamaciones de gastos' + +Task - View Expense Claim + +* También puede crear un Reclamo de gastos directamente y vincularlo al Proyecto. + +Task - Link Expense Claim + +* El monto total de los Reclamos de gastos reservados contra un proyecto se muestra en 'Reclamo de gastos totales' en la Sección de Costos del proyecto + +Task - Total Expense Claim + +{next} diff --git a/foundation/www/docs/user/manual/es/projects/time-log-batch.md b/foundation/www/docs/user/manual/es/projects/time-log-batch.md new file mode 100644 index 00000000..5d1e744d --- /dev/null +++ b/foundation/www/docs/user/manual/es/projects/time-log-batch.md @@ -0,0 +1,26 @@ + +# Lote de registro de tiempo + +Puede facturar Registros de tiempo viéndolos juntos. Esto le da la flexibilidad de administrar la facturación de su cliente de la manera que desee. Para crear una nueva hoja de tiempo, ve a + +> Projects > Time Sheet > New Time Sheet + +O + +Simplemente abra su lista de registro de tiempo y marque los elementos que desea agregar al registro de tiempo. A continuación, haga clic en el botón "Crear hoja de tiempo" y se seleccionarán estos registros de tiempo. + +Time Log - Drag Calender + +###Creando Factura de Venta + +* Despues de crear la Hoja de Tiempo/Horario, el botón "Crear Factura" debe aparecer. + +Time Log - Drag Calender + +* Haga clic en ese botón para hacer una factura de venta usando la hoja de tiempo. + +Time Log - Drag Calender + +* Cuando "Presente" la Factura de Ventas, el número de Factura de Ventas se actualizará en los Registros de Tiempo y la Hoja de Horario y su estado cambiará a "Facturado". + +{next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/es/schools/fees/fees.md b/foundation/www/docs/user/manual/es/schools/fees/fees.md deleted file mode 100644 index c91e9231..00000000 --- a/foundation/www/docs/user/manual/es/schools/fees/fees.md +++ /dev/null @@ -1,9 +0,0 @@ - -# Cuotas - -Mantiene un registro de todas las cuotas recolectadas de los estudiantes. -La [Estructura de Cuota](/docs/user/manual/es/schools/fees/fee-structure.html) es seleccionada basada en el programa seleccionada y los Términos Académicos. - -Fees - -{next} diff --git a/foundation/www/docs/user/manual/es/schools/setup/course.md b/foundation/www/docs/user/manual/es/schools/setup/course.md deleted file mode 100644 index f8d90b56..00000000 --- a/foundation/www/docs/user/manual/es/schools/setup/course.md +++ /dev/null @@ -1,6 +0,0 @@ - -# Curso - -Course - -{next} diff --git a/foundation/www/docs/user/manual/es/schools/setup/instructor.md b/foundation/www/docs/user/manual/es/schools/setup/instructor.md deleted file mode 100644 index b05be687..00000000 --- a/foundation/www/docs/user/manual/es/schools/setup/instructor.md +++ /dev/null @@ -1,6 +0,0 @@ - -# Instructor - -Instructor - -{next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/es/schools/setup/program.md b/foundation/www/docs/user/manual/es/schools/setup/program.md deleted file mode 100644 index 954269b1..00000000 --- a/foundation/www/docs/user/manual/es/schools/setup/program.md +++ /dev/null @@ -1,6 +0,0 @@ - -# Programa - -Program - -{next} diff --git a/foundation/www/docs/user/manual/es/schools/setup/room.md b/foundation/www/docs/user/manual/es/schools/setup/room.md deleted file mode 100644 index aa3fbce8..00000000 --- a/foundation/www/docs/user/manual/es/schools/setup/room.md +++ /dev/null @@ -1,7 +0,0 @@ - -# Aula - - -Room - -{next} diff --git a/foundation/www/docs/user/videos/learn/bulk-update.md b/foundation/www/docs/user/videos/learn/bulk-update.md index 71034cc0..f76d9d3a 100644 --- a/foundation/www/docs/user/videos/learn/bulk-update.md +++ b/foundation/www/docs/user/videos/learn/bulk-update.md @@ -5,4 +5,4 @@ **Duration: 1:38** -The Bulk Update Tool helps you over-write a value in a specific field of existing records. +Bulk Update Tool help you in over-writing value in the specific field of exitsting records. diff --git a/foundation/www/docs/user/videos/learn/distributors.md b/foundation/www/docs/user/videos/learn/distributors.md index ede30ce4..4b519f65 100644 --- a/foundation/www/docs/user/videos/learn/distributors.md +++ b/foundation/www/docs/user/videos/learn/distributors.md @@ -5,4 +5,4 @@ **Duration: 51:47** -This video is a recording of a webinar on how a distribution business can use ERPNext. It covers Selling, Buying, Stock and Accounts module. Also, you can can learn how serialised and batch wise inventory can be maintained in ERPNext. \ No newline at end of file +This video is a recording of a webinar on how a distribution business can use ERPNext. It covers Selling, Buying, Stock and Accounts module. Also, you can can learn how serialised and batchwise inventory can be maintained in ERPNext. \ No newline at end of file diff --git a/foundation/www/docs/user/videos/learn/education.md b/foundation/www/docs/user/videos/learn/education.md new file mode 100644 index 00000000..37a7157a --- /dev/null +++ b/foundation/www/docs/user/videos/learn/education.md @@ -0,0 +1,8 @@ + +# ERPNext for Education + + + +**Duration: 39:21** + +This video is a recording of a webinar on how education institutes can use ERPNext Education module. It covers management of Student Applications, managing masters like Students, Programs and Courses. Also, you can manage processes like Course Scheduling, Student Assessment, Fees and Attendance. \ No newline at end of file diff --git a/foundation/www/docs/user/videos/learn/file-manager.md b/foundation/www/docs/user/videos/learn/file-manager.md index dfcab10e..c2d4548b 100644 --- a/foundation/www/docs/user/videos/learn/file-manager.md +++ b/foundation/www/docs/user/videos/learn/file-manager.md @@ -5,6 +5,6 @@ **Duration: 2:24** -Using File Manager in ERPNext, you can organized files received from various sources. You can also create custom folders, and put files in them. +Using File Manager in ERPNext, you can organized files received from varius sources. You can also create custom folders, and put files in them. To ensure only authorize person has access to file, set permission rules can be applied on specific Folder or File. \ No newline at end of file diff --git a/foundation/www/docs/user/videos/learn/index.md b/foundation/www/docs/user/videos/learn/index.md index 2ba9b608..f96f5f21 100644 --- a/foundation/www/docs/user/videos/learn/index.md +++ b/foundation/www/docs/user/videos/learn/index.md @@ -28,8 +28,8 @@ ERPNext for Retailers 39:21
    • -
  • - ERPNext for Schools +
  • + ERPNext for Education 39:21
    • diff --git a/foundation/www/docs/user/videos/learn/item-variant.md b/foundation/www/docs/user/videos/learn/item-variant.md index 6ccea7dd..c2238acb 100644 --- a/foundation/www/docs/user/videos/learn/item-variant.md +++ b/foundation/www/docs/user/videos/learn/item-variant.md @@ -5,4 +5,4 @@ **Duration: 2:38** -This video tutorial helps you in setting up Item Attributes (like Size, Length etc.) and creating item variants using these attributes. +This video tutorial helps you in setting up Item Attributes (like Size, Lenthg etc.) and creating item variants using these attributes. diff --git a/foundation/www/docs/user/videos/learn/schools.md b/foundation/www/docs/user/videos/learn/schools.md deleted file mode 100644 index 91d051fd..00000000 --- a/foundation/www/docs/user/videos/learn/schools.md +++ /dev/null @@ -1,8 +0,0 @@ - -# ERPNext for Schools - - - -**Duration: 39:21** - -This video is a recording of a webinar on how education institutes can use ERPNext Schools module. It covers management of Student Applications, managing masters like Students, Programs and Courses. Also, you can manage processes like Course Scheduling, Student Assessment, Fees and Attendance. \ No newline at end of file diff --git a/foundation/www/docs/user/videos/learn/shopping-cart.md b/foundation/www/docs/user/videos/learn/shopping-cart.md index 5065ea0a..ea10d4de 100644 --- a/foundation/www/docs/user/videos/learn/shopping-cart.md +++ b/foundation/www/docs/user/videos/learn/shopping-cart.md @@ -5,4 +5,4 @@ **Duration: 6:32** -ERPNext has a Customers Portal. It allows a Customer to login, and place new orders using shopping cart. From Customer Portal,a Customer can also track the progress of their existing orders, view history of transactions and communicate via Issues. \ No newline at end of file +ERPNext has Customers Portal. It allos Customer to login, and place new orderes using shopping cart. From Customer Portal, customer can also track progress on their existing orders, view history of transactions and communicate via Issues. \ No newline at end of file diff --git a/foundation/www/docs/user/videos/learn/subcontracting.md b/foundation/www/docs/user/videos/learn/subcontracting.md index cc7a179e..bc6120c5 100644 --- a/foundation/www/docs/user/videos/learn/subcontracting.md +++ b/foundation/www/docs/user/videos/learn/subcontracting.md @@ -7,4 +7,4 @@ Subcontracting is a type of job contract that seeks to outsource certain types of work to other companies. -There are warehouses masters created in order to carry out subcontracting transaction. This video walks you through various steps involved like creating BOM, transfer raw-material to subcontractor, receiving processed goods from subcontractor. +There are warehouses masters created in order to carryout subcontracting transaction. This video walks you through various steps involved like creating BOM, transfer raw-material to subcontractor, receiving processed goods from subcontractor. diff --git a/foundation/www/docs/user/videos/learn/workflow.md b/foundation/www/docs/user/videos/learn/workflow.md index 51c4ed2d..200599f0 100644 --- a/foundation/www/docs/user/videos/learn/workflow.md +++ b/foundation/www/docs/user/videos/learn/workflow.md @@ -7,4 +7,4 @@ This video walks you through setting up Workflow for a document type. -By default, ERPNext has two level verification system for documents, Save and Submit. If you have more than one authority approving document, you can manage it via Workflow. Workflow allow you do define multiple stages through which document will be review and finally get approved, and who will be the approver at each stage. +Bydefault, ERPNext has two level verification system for documents, Save and Submit. If you have more than one authority approving document, you can manage it via Workflow. Workflow allow you do define multiple stages through which document will be review and finally get approved, and who will be the approver at each stage.