Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: list view for Terms and Conditions #33925

Merged
merged 2 commits into from
Feb 11, 2023

Conversation

barredterra
Copy link
Collaborator

@barredterra barredterra commented Feb 1, 2023

  • Remove redundant column "disabled" - already shown via status badge
  • Add columns "selling" and "buying"
  • Remove old form scripts

Bildschirmfoto 2023-02-01 um 14 40 24

@deepeshgarg007 deepeshgarg007 merged commit ab7293b into frappe:develop Feb 11, 2023
mergify bot pushed a commit that referenced this pull request Feb 11, 2023
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
(cherry picked from commit ab7293b)
deepeshgarg007 pushed a commit that referenced this pull request Feb 11, 2023
fix: list view for Terms and Conditions (#33925)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
(cherry picked from commit ab7293b)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
@barredterra barredterra deleted the tc-list branch February 11, 2023 10:46
frappe-pr-bot pushed a commit that referenced this pull request Feb 14, 2023
# [14.16.0](v14.15.1...v14.16.0) (2023-02-14)

### Bug Fixes

* `amount` in `Material Request` ([f1dd923](f1dd923))
* `get_picked_items_details` ([7afbd92](7afbd92))
* `pymysql.err.ProgrammingError` ([aa3dd33](aa3dd33))
* Add missing 1 required positional argument: 'bill_date' ([ced9274](ced9274))
* add payment hook to point of sale JS ([#33988](#33988)) ([49fd712](49fd712))
* allow PI cancel if linked asset is cancelled ([c98b2b5](c98b2b5))
* Amount for debit and credit notes with 0 qty line items ([#33902](#33902)) ([87a8c17](87a8c17))
* Amount validation in Payment Request against Purchase Order ([#34042](#34042)) ([c7c6123](c7c6123))
* BOM import failed as importer use same label field for Raw MaterialsItem table and Scrap Item table ([47d17f4](47d17f4))
* Concurrency issues in Sales and Purchase returns ([#34019](#34019)) ([087333a](087333a))
* consider `stock_qty` if `picked_qty` is zero ([df72e4a](df72e4a))
* consider existing pick list ([466a791](466a791))
* currency formatting in item-wise sales history ([#33903](#33903)) ([8e2d7bb](8e2d7bb))
* default due_date was wrong calculated on template "_Test Payment Term Template 1" (last day of next month) ([c8c9c50](c8c9c50))
* **ecommerce:** throw invalid doctype error in shop by category ([#33901](#33901)) ([1d0e71b](1d0e71b))
* failed test, convert date time to string ([7228a49](7228a49))
* german chart of accounts "SKR03" ([#33909](#33909)) ([02c4c55](02c4c55))
* Ignore mandatory fields while creating tax templates for new companies ([#34005](#34005)) ([b0ed3c8](b0ed3c8))
* Ignore Payment Ledger Entry on dunning cancel (backport [#34025](#34025)) ([#34028](#34028)) ([699e93e](699e93e))
* incorrect actual qty in Bin ([01ff6a1](01ff6a1))
* IntegrityError while cancelling journals against cr note ([c71d035](c71d035))
* list view for Terms and Conditions ([#33925](#33925)) ([bb8e232](bb8e232))
* negative stock error ([e0cd6c2](e0cd6c2))
* set per_billed based on hours when amounts are zero ([#33984](#33984)) ([5270fbe](5270fbe))
* should never get cutomer price on purchase document ([#34002](#34002)) ([6fe7600](6fe7600)), closes [#33998](#33998)
* stock entry from item dashboard (stock levels) ([04a474d](04a474d))
* **test:** `test_pick_list_for_items_with_multiple_UOM()` ([7124c0c](7124c0c))
* unwanted difference amount calculation on cr note and invoice with same currency ([#34020](#34020)) ([cbafc51](cbafc51))

### Features

* Add filters in Loan Interest Report ([#33907](#33907)) ([52bfb66](52bfb66))
* add incoterm named place to RFQ ([68a1615](68a1615))
* mandatory and mandatory depends on in inventory dimension ([3aca84c](3aca84c))
* Setting to allow Sales Order creation against expired quotation ([#33952](#33952)) ([4d0e27e](4d0e27e))

### Performance Improvements

* reduce memory usage by paging through records ([3ce8dc7](3ce8dc7))
* reduce memory usage while migrating remarks ([c191a3f](c191a3f))
@barredterra barredterra mentioned this pull request Mar 7, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jun 2, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport version-14-hotfix backport to version 14
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants