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 #4587: Status does not display "Pending" in report filter #9104

Merged
merged 16 commits into from
Jun 7, 2017

Conversation

tundebabzy
Copy link
Contributor

@tundebabzy tundebabzy commented May 31, 2017

Fix for #4587

Before

peek 2017-05-31 20-23

After

In the list view

peek 2017-05-31 17-56

In the report view

peek 2017-05-31 19-41

@tundebabzy tundebabzy requested a review from mbauskar June 6, 2017 22:14
@nabinhait nabinhait merged commit 99b734b into frappe:hotfix Jun 7, 2017
tundebabzy added a commit to tundebabzy/erpnext that referenced this pull request Jun 13, 2017
…rappe#9104)

* adds Material Request to `status_map`

* updates eval condition for Partially Ordered in Material Request map

* changes material_request doctype to include "pending", "ordered", "partially ordered", "issued", "transferred" as options

* adds more options to `validate_status`

* adds `set_status` just before saving

* adds `check_for_closed_status` in `before_cancel`

* adds patch to convert status to material request specific status

* adds stricter status update conditions

* changes `update_status` to me `set_status`

* adds checker such that draft status can only change to pending

* renames `check_draft_status` to `status_can_change`

* adds Cancelled to Material Request map

* makes `status_can_change` block any attempt to change a cancelled document

* adds more test cases

* updates what `set_status` checks for before adding comment

* adds patch to rename the present material request status
@tundebabzy tundebabzy deleted the 4587 branch June 21, 2017 22:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants