From 43b0f2efe63c7e8c5dfd818ed61d70bdbc62cdab Mon Sep 17 00:00:00 2001 From: "Nihantra C. Patel" Date: Wed, 8 Jun 2022 17:36:42 +0530 Subject: [PATCH 1/6] [DEV] Accounts: Added total of future amount, Remaining Balance in Payable and Receivable reports. --- erpnext/accounts/report/accounts_payable/accounts_payable.js | 5 +++++ .../report/accounts_receivable/accounts_receivable.py | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/erpnext/accounts/report/accounts_payable/accounts_payable.js b/erpnext/accounts/report/accounts_payable/accounts_payable.js index f6961eb95f..7cf14e6738 100644 --- a/erpnext/accounts/report/accounts_payable/accounts_payable.js +++ b/erpnext/accounts/report/accounts_payable/accounts_payable.js @@ -136,6 +136,11 @@ frappe.query_reports["Accounts Payable"] = { "label": __("Tax Id"), "fieldtype": "Data", "hidden": 1 + }, + { + "fieldname": "show_future_payments", + "label": __("Show Future Payments"), + "fieldtype": "Check", } ], diff --git a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py index de9d63d849..85e0f2bdd0 100755 --- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py @@ -160,6 +160,8 @@ class ReceivablePayableReport(object): "range3", "range4", "range5", + "future_amount", + "remaining_balance" ] def update_voucher_balance(self, gle): @@ -563,7 +565,7 @@ class ReceivablePayableReport(object): jea.party, jea.party_type, je.posting_date as future_date, - sum({0}) as future_amount, + sum('{0}') as future_amount, je.cheque_no as future_ref from `tabJournal Entry` as je inner join `tabJournal Entry Account` as jea From b461724416ba0ebdfc979a01f8ce913c69bcb105 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Fri, 22 Jul 2022 14:32:14 +0530 Subject: [PATCH 2/6] fix: enable tax withholding checkbox in PI with supplier_tds --- erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py | 1 + 1 file changed, 1 insertion(+) diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py index 775d2550a9..de3927e45b 100644 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py @@ -162,6 +162,7 @@ class PurchaseInvoice(BuyingController): if tds_category and not for_validate: self.apply_tds = 1 self.tax_withholding_category = tds_category + self.set_onload("supplier_tds", tds_category) super(PurchaseInvoice, self).set_missing_values(for_validate) From 5da7e01db205098a5075def850a478a77931af78 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Fri, 22 Jul 2022 17:54:46 +0530 Subject: [PATCH 3/6] fix: dont show zero qty available items in stock ageing report --- erpnext/stock/report/stock_ageing/stock_ageing.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/erpnext/stock/report/stock_ageing/stock_ageing.py b/erpnext/stock/report/stock_ageing/stock_ageing.py index 1956238331..7c430e491a 100644 --- a/erpnext/stock/report/stock_ageing/stock_ageing.py +++ b/erpnext/stock/report/stock_ageing/stock_ageing.py @@ -34,6 +34,9 @@ def format_report_data(filters: Filters, item_details: Dict, to_date: str) -> Li precision = cint(frappe.db.get_single_value("System Settings", "float_precision", cache=True)) for item, item_dict in item_details.items(): + if not flt(item_dict.get("total_qty"), precision): + continue + earliest_age, latest_age = 0, 0 details = item_dict["details"] From 38e71b06390652acb6412a8059290ec6feee113c Mon Sep 17 00:00:00 2001 From: Sagar Vora Date: Tue, 26 Jul 2022 13:08:39 +0530 Subject: [PATCH 4/6] docs: improve README --- README.md | 104 ++++++++++++++++++++---------------------------------- 1 file changed, 38 insertions(+), 66 deletions(-) diff --git a/README.md b/README.md index cea3472447..d6bbacc81f 100644 --- a/README.md +++ b/README.md @@ -1,87 +1,59 @@
- - - -

ERPNext

-

-

ERP made simple

-

-[![CI](https://github.com/frappe/erpnext/actions/workflows/server-tests.yml/badge.svg?branch=develop)](https://github.com/frappe/erpnext/actions/workflows/server-tests.yml) -[![UI](https://github.com/erpnext/erpnext_ui_tests/actions/workflows/ui-tests.yml/badge.svg?branch=develop&event=schedule)](https://github.com/erpnext/erpnext_ui_tests/actions/workflows/ui-tests.yml) -[![Open Source Helpers](https://www.codetriage.com/frappe/erpnext/badges/users.svg)](https://www.codetriage.com/frappe/erpnext) -[![codecov](https://codecov.io/gh/frappe/erpnext/branch/develop/graph/badge.svg?token=0TwvyUg3I5)](https://codecov.io/gh/frappe/erpnext) -[![docker pulls](https://img.shields.io/docker/pulls/frappe/erpnext-worker.svg)](https://hub.docker.com/r/frappe/erpnext-worker) + +

India Compliance

-[https://erpnext.com](https://erpnext.com) +Simple, yet powerful compliance solutions for Indian businesses + +[![Server Tests](https://github.com/resilient-tech/india-compliance/actions/workflows/server-tests.yml/badge.svg)](https://github.com/resilient-tech/india-compliance/actions/workflows/server-tests.yml)
-ERPNext as a monolith includes the following areas for managing businesses: -1. [Accounting](https://erpnext.com/open-source-accounting) -1. [Warehouse Management](https://erpnext.com/distribution/warehouse-management-system) -1. [CRM](https://erpnext.com/open-source-crm) -1. [Sales](https://erpnext.com/open-source-sales-purchase) -1. [Purchase](https://erpnext.com/open-source-sales-purchase) -1. [HRMS](https://erpnext.com/open-source-hrms) -1. [Project Management](https://erpnext.com/open-source-projects) -1. [Support](https://erpnext.com/open-source-help-desk-software) -1. [Asset Management](https://erpnext.com/open-source-asset-management-software) -1. [Quality Management](https://erpnext.com/docs/user/manual/en/quality-management) -1. [Manufacturing](https://erpnext.com/open-source-manufacturing-erp-software) -1. [Website Management](https://erpnext.com/open-source-website-builder-software) -1. [Customize ERPNext](https://erpnext.com/docs/user/manual/en/customize-erpnext) -1. [And More](https://erpnext.com/docs/user/manual/en/) -ERPNext is built on the [Frappe Framework](https://github.com/frappe/frappe), a full-stack web app framework built with Python & JavaScript. +## Introduction + +India Compliance has been designed to make compliance with Indian rules and regulations simple, swift and reliable. To this end, it has been carefully integrated with GST APIs to simplify recurring compliance processes. + +India Compliance builds on top of [ERPNext](https://github.com/frappe/erpnext) and the [Frappe Framework](https://github.com/frappe/frappe) - incredible FOSS projects built and maintained by the incredible folks at Frappe. Go check these out if you haven't already! + +## Key Features + +- End-to-end GST e-Waybill management +- Automated GST e-Invoice generation and cancellation +- Autofill Party and Address details by entering their GSTIN +- Configurable features based on business needs +- Powerful validations to ensure correct compliance + +For a detailed overview of these features, please [refer to the documentation](https://docs.erpnext.com/docs/v14/user/manual/en/regional/india). ## Installation -
- - - - - Try in PWD - -
- -> Login for the PWD site: (username: Administrator, password: admin) - -### Containerized Installation - -Use docker to deploy ERPNext in production or for development of [Frappe](https://github.com/frappe/frappe) apps. See https://github.com/frappe/frappe_docker for more details. - -### Manual Install - -The Easy Way: our install script for bench will install all dependencies (e.g. MariaDB). See https://github.com/frappe/bench for more details. - -New passwords will be created for the ERPNext "Administrator" user, the MariaDB root user, and the frappe user (the script displays the passwords and saves them to ~/frappe_passwords.txt). +Once you've [set up a Frappe site](https://frappeframework.com/docs/v14/user/en/installation/), installing India Compliance is simple: -## Learning and community +1. Download the app using the Bench CLI -1. [Frappe School](https://frappe.school) - Learn Frappe Framework and ERPNext from the various courses by the maintainers or from the community. -2. [Official documentation](https://docs.erpnext.com/) - Extensive documentation for ERPNext. -3. [Discussion Forum](https://discuss.erpnext.com/) - Engage with community of ERPNext users and service providers. -4. [Telegram Group](https://t.me/erpnexthelp) - Get instant help from huge community of users. + ```bash + bench get-app https://github.com/resilient-tech/india-compliance.git + ``` +2. Install the app on your site + + ```bash + bench --site [site name] install-app india_compliance + ``` + +## Planned Features + +- Advanced purchase reconciliation based on GSTR-2B and GSTR-2A +- Quick and easy filing process for GSTR-1 and GSTR-3B ## Contributing -1. [Issue Guidelines](https://github.com/frappe/erpnext/wiki/Issue-Guidelines) -1. [Report Security Vulnerabilities](https://erpnext.com/security) -1. [Pull Request Requirements](https://github.com/frappe/erpnext/wiki/Contribution-Guidelines) -1. [Translations](https://translate.erpnext.com) - +- [Issue Guidelines](https://github.com/frappe/erpnext/wiki/Issue-Guidelines) +- [Pull Request Requirements](https://github.com/frappe/erpnext/wiki/Contribution-Guidelines) ## License -GNU/General Public License (see [license.txt](license.txt)) - -The ERPNext code is licensed as GNU General Public License (v3) and the Documentation is licensed as Creative Commons (CC-BY-SA-3.0) and the copyright is owned by Frappe Technologies Pvt Ltd (Frappe) and Contributors. - -## Logo and Trademark Policy - -Please read our [Logo and Trademark Policy](TRADEMARK_POLICY.md). +[GNU General Public License (v3)](https://github.com/resilient-tech/india-compliance/blob/develop/license.txt) From c6fbb7b27d570b75073668f0fa249e4501da5d4d Mon Sep 17 00:00:00 2001 From: Sagar Vora Date: Tue, 26 Jul 2022 13:09:46 +0530 Subject: [PATCH 5/6] Revert "docs: improve README" This reverts commit 38e71b06390652acb6412a8059290ec6feee113c. --- README.md | 104 ++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 66 insertions(+), 38 deletions(-) diff --git a/README.md b/README.md index d6bbacc81f..cea3472447 100644 --- a/README.md +++ b/README.md @@ -1,59 +1,87 @@
+ + + +

ERPNext

+

+

ERP made simple

+

- -

India Compliance

+[![CI](https://github.com/frappe/erpnext/actions/workflows/server-tests.yml/badge.svg?branch=develop)](https://github.com/frappe/erpnext/actions/workflows/server-tests.yml) +[![UI](https://github.com/erpnext/erpnext_ui_tests/actions/workflows/ui-tests.yml/badge.svg?branch=develop&event=schedule)](https://github.com/erpnext/erpnext_ui_tests/actions/workflows/ui-tests.yml) +[![Open Source Helpers](https://www.codetriage.com/frappe/erpnext/badges/users.svg)](https://www.codetriage.com/frappe/erpnext) +[![codecov](https://codecov.io/gh/frappe/erpnext/branch/develop/graph/badge.svg?token=0TwvyUg3I5)](https://codecov.io/gh/frappe/erpnext) +[![docker pulls](https://img.shields.io/docker/pulls/frappe/erpnext-worker.svg)](https://hub.docker.com/r/frappe/erpnext-worker) -Simple, yet powerful compliance solutions for Indian businesses - -[![Server Tests](https://github.com/resilient-tech/india-compliance/actions/workflows/server-tests.yml/badge.svg)](https://github.com/resilient-tech/india-compliance/actions/workflows/server-tests.yml) +[https://erpnext.com](https://erpnext.com)
+ERPNext as a monolith includes the following areas for managing businesses: +1. [Accounting](https://erpnext.com/open-source-accounting) +1. [Warehouse Management](https://erpnext.com/distribution/warehouse-management-system) +1. [CRM](https://erpnext.com/open-source-crm) +1. [Sales](https://erpnext.com/open-source-sales-purchase) +1. [Purchase](https://erpnext.com/open-source-sales-purchase) +1. [HRMS](https://erpnext.com/open-source-hrms) +1. [Project Management](https://erpnext.com/open-source-projects) +1. [Support](https://erpnext.com/open-source-help-desk-software) +1. [Asset Management](https://erpnext.com/open-source-asset-management-software) +1. [Quality Management](https://erpnext.com/docs/user/manual/en/quality-management) +1. [Manufacturing](https://erpnext.com/open-source-manufacturing-erp-software) +1. [Website Management](https://erpnext.com/open-source-website-builder-software) +1. [Customize ERPNext](https://erpnext.com/docs/user/manual/en/customize-erpnext) +1. [And More](https://erpnext.com/docs/user/manual/en/) -## Introduction - -India Compliance has been designed to make compliance with Indian rules and regulations simple, swift and reliable. To this end, it has been carefully integrated with GST APIs to simplify recurring compliance processes. - -India Compliance builds on top of [ERPNext](https://github.com/frappe/erpnext) and the [Frappe Framework](https://github.com/frappe/frappe) - incredible FOSS projects built and maintained by the incredible folks at Frappe. Go check these out if you haven't already! - -## Key Features - -- End-to-end GST e-Waybill management -- Automated GST e-Invoice generation and cancellation -- Autofill Party and Address details by entering their GSTIN -- Configurable features based on business needs -- Powerful validations to ensure correct compliance - -For a detailed overview of these features, please [refer to the documentation](https://docs.erpnext.com/docs/v14/user/manual/en/regional/india). +ERPNext is built on the [Frappe Framework](https://github.com/frappe/frappe), a full-stack web app framework built with Python & JavaScript. ## Installation -Once you've [set up a Frappe site](https://frappeframework.com/docs/v14/user/en/installation/), installing India Compliance is simple: + + +> Login for the PWD site: (username: Administrator, password: admin) + +### Containerized Installation + +Use docker to deploy ERPNext in production or for development of [Frappe](https://github.com/frappe/frappe) apps. See https://github.com/frappe/frappe_docker for more details. + +### Manual Install + +The Easy Way: our install script for bench will install all dependencies (e.g. MariaDB). See https://github.com/frappe/bench for more details. + +New passwords will be created for the ERPNext "Administrator" user, the MariaDB root user, and the frappe user (the script displays the passwords and saves them to ~/frappe_passwords.txt). -1. Download the app using the Bench CLI +## Learning and community - ```bash - bench get-app https://github.com/resilient-tech/india-compliance.git - ``` +1. [Frappe School](https://frappe.school) - Learn Frappe Framework and ERPNext from the various courses by the maintainers or from the community. +2. [Official documentation](https://docs.erpnext.com/) - Extensive documentation for ERPNext. +3. [Discussion Forum](https://discuss.erpnext.com/) - Engage with community of ERPNext users and service providers. +4. [Telegram Group](https://t.me/erpnexthelp) - Get instant help from huge community of users. -2. Install the app on your site - - ```bash - bench --site [site name] install-app india_compliance - ``` - -## Planned Features - -- Advanced purchase reconciliation based on GSTR-2B and GSTR-2A -- Quick and easy filing process for GSTR-1 and GSTR-3B ## Contributing -- [Issue Guidelines](https://github.com/frappe/erpnext/wiki/Issue-Guidelines) -- [Pull Request Requirements](https://github.com/frappe/erpnext/wiki/Contribution-Guidelines) +1. [Issue Guidelines](https://github.com/frappe/erpnext/wiki/Issue-Guidelines) +1. [Report Security Vulnerabilities](https://erpnext.com/security) +1. [Pull Request Requirements](https://github.com/frappe/erpnext/wiki/Contribution-Guidelines) +1. [Translations](https://translate.erpnext.com) + ## License -[GNU General Public License (v3)](https://github.com/resilient-tech/india-compliance/blob/develop/license.txt) +GNU/General Public License (see [license.txt](license.txt)) + +The ERPNext code is licensed as GNU General Public License (v3) and the Documentation is licensed as Creative Commons (CC-BY-SA-3.0) and the copyright is owned by Frappe Technologies Pvt Ltd (Frappe) and Contributors. + +## Logo and Trademark Policy + +Please read our [Logo and Trademark Policy](TRADEMARK_POLICY.md). From 5b7b58322f463993722fafd2f963f9f76fe11532 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Tue, 26 Jul 2022 13:46:03 +0530 Subject: [PATCH 6/6] fix: hero image not loading in portal homepage (backport #31699) (#31700) fix: hero image not loading in portal homepage (#31699) (cherry picked from commit 8a6432ec3f4bf63c39d1f687f618cec2360ebccf) Co-authored-by: Rucha Mahabal --- erpnext/templates/pages/home.css | 1 - erpnext/templates/pages/home.html | 6 +++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/erpnext/templates/pages/home.css b/erpnext/templates/pages/home.css index 785d8059ba..f2661491ce 100644 --- a/erpnext/templates/pages/home.css +++ b/erpnext/templates/pages/home.css @@ -1,7 +1,6 @@ /* csslint ignore:start */ {% if homepage.hero_image %} .hero-image { - background-image: url("{{ homepage.hero_image }}"); background-size: cover; padding: 10rem 0; } diff --git a/erpnext/templates/pages/home.html b/erpnext/templates/pages/home.html index 9a61eabaf8..4c69b8388d 100644 --- a/erpnext/templates/pages/home.html +++ b/erpnext/templates/pages/home.html @@ -5,7 +5,11 @@ {% block content %}
{% if homepage.hero_section_based_on == 'Default' %} -
+

{{ homepage.tag_line }}

{{ homepage.tag_line }}