| commit | ad08d4ce9611e9d5f59e674bd6198a9eef2cdc5f | [log] [tgz] |
|---|---|---|
| author | tundebabzy <tundebabzy@gmail.com> | Wed May 16 07:01:41 2018 +0100 |
| committer | Rushabh Mehta <rmehta@gmail.com> | Wed May 16 11:31:41 2018 +0530 |
| tree | 738dd6de8acacf3c453f5163d708332ace16fd17 | |
| parent | 1906cadd94d51a476cc233053a03e3ce27e9ea94 [diff] |
Ability to hold payment for disputed invoices #12048 (#13298) * add new fields to Supplier Master: - on_hold: To signal the Customer is blocked from completing certain transactions - hold_type: 3 options - All, invoices and payments * sanitize `on_hold` field input * show hold status in list view * add `release_date` field to Supplier Master: - specifies the date when transaction restraint will be removed * reset release date if supplier is not on hold * add validation to stop transactions when Supplier is blocked * add test cases * return empty list for outstanding references if supplier is blocked * block make button:payment if supplier is blocked * adjust test cases * PEP 8 clean up * more tests * adds new fields to Purchase Invoice: - release_date: once set, invoice will be on hold until set date - hold_comment: so user can add comment pertaining to why invoice is on hold * implement individual purchase invoice on hold logic * allow user to change release date * update manual * final cleanup including more validation and tests * update supplier manual * make default for release_date argument todays date * remove Auto Repeat added by mistake * add on_hold_field to purchase invoice * add 'On Hold' or 'Temporarily on Hold' status for purchase invoice in list view * implement explicit payment hold in purchase invoice * update manual * add dialog for saving comment * bug fix, refactor, clean up * more test cases
- erpnext/accounts/doctype/payment_entry/payment_entry.py[diff]
- erpnext/accounts/doctype/payment_entry/test_payment_entry.py[diff]
- erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js[diff]
- erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json[diff]
- erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py[diff]
- erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js[diff]
- erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py[diff]
- erpnext/accounts/utils.py[diff]
- erpnext/buying/doctype/purchase_order/test_purchase_order.py[diff]
- erpnext/buying/doctype/supplier/supplier.json[diff]
- erpnext/buying/doctype/supplier/supplier.py[diff]
- erpnext/buying/doctype/supplier/supplier_list.js[diff]
- erpnext/controllers/accounts_controller.py[diff]
- erpnext/docs/assets/img/accounts/purchase-invoice-hold.png[Added - diff]
- erpnext/docs/user/manual/en/accounts/purchase-invoice.md[diff]
- erpnext/docs/user/manual/en/buying/supplier.md[diff]
- .github/
- erpnext/
- test_sites/
- travis/
- .eslintrc
- .gitignore
- .travis.yml
- __init__.py
- attributions.md
- CODE_OF_CONDUCT.md
- license.txt
- MANIFEST.in
- package-lock.json
- README.md
- requirements.txt
- setup.py
- sponsors.md
Includes: Accounting, Inventory, Manufacturing, CRM, Sales, Purchase, Project Management, HRMS. Requires MariaDB.
ERPNext is built on the Frappé Framework, a full-stack web app framework in Python & JavaScript.
Full 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).
Virtual Image
You can download a virtual image to run ERPNext in a virtual machine on your local system.
System and user credentials are listed on the download page.
License
GNU/General Public License (see 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 Frappé Technologies Pvt Ltd (Frappé) and Contributors.
Contributing
Logo and Trademark
The brand name ERPNext and the logo are trademarks of Frappé Technologies Pvt. Ltd.
Introduction
Frappé Technologies Pvt. Ltd. (Frappé) owns and oversees the trademarks for the ERPNext name and logos. We have developed this trademark usage policy with the following goals in mind:
- We’d like to make it easy for anyone to use the ERPNext name or logo for community-oriented efforts that help spread and improve ERPNext.
- We’d like to make it clear how ERPNext-related businesses and projects can (and cannot) use the ERPNext name and logo.
- We’d like to make it hard for anyone to use the ERPNext name and logo to unfairly profit from, trick or confuse people who are looking for official ERPNext resources.
Frappé Trademark Usage Policy
Permission from Frappé is required to use the ERPNext name or logo as part of any project, product, service, domain or company name.
We will grant permission to use the ERPNext name and logo for projects that meet the following criteria:
- The primary purpose of your project is to promote the spread and improvement of the ERPNext software.
- Your project is non-commercial in nature (it can make money to cover its costs or contribute to non-profit entities, but it cannot be run as a for-profit project or business). Your project neither promotes nor is associated with entities that currently fail to comply with the GPL license under which ERPNext is distributed.
- If your project meets these criteria, you will be permitted to use the ERPNext name and logo to promote your project in any way you see fit with one exception: Please do not use ERPNext as part of a domain name.
Use of the ERPNext name and logo is additionally allowed in the following situations:
All other ERPNext-related businesses or projects can use the ERPNext name and logo to refer to and explain their services, but they cannot use them as part of a product, project, service, domain, or company name and they cannot use them in any way that suggests an affiliation with or endorsement by ERPNext or Frappé Technologies or the ERPNext open source project. For example, a consulting company can describe its business as “123 Web Services, offering ERPNext consulting for small businesses,” but cannot call its business “The ERPNext Consulting Company.”
Similarly, it’s OK to use the ERPNext logo as part of a page that describes your products or services, but it is not OK to use it as part of your company or product logo or branding itself. Under no circumstances is it permitted to use ERPNext as part of a top-level domain name.
We do not allow the use of the trademark in advertising, including AdSense/AdWords.
Please note that it is not the goal of this policy to limit commercial activity around ERPNext. We encourage ERPNext-based businesses, and we would love to see hundreds of them.
When in doubt about your use of the ERPNext name or logo, please contact Frappé Technologies for clarification.
(inspired by WordPress)