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: ui clean-up (backport #43305) #43312

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 20, 2024

Plant Floor
plant-floor

BOM Creator

Screenshot 2024-09-20 at 9 06 06 AM
This is an automatic backport of pull request #43305 done by [Mergify](https://mergify.com).

fix: ui cleanup
(cherry picked from commit b127a0c)

# Conflicts:
#	erpnext/manufacturing/doctype/bom_creator/bom_creator.json
#	erpnext/manufacturing/doctype/plant_floor/plant_floor.json
#	erpnext/public/js/templates/visual_plant_floor_template.html
Copy link
Contributor Author

mergify bot commented Sep 20, 2024

Cherry-pick of b127a0c has failed:

On branch mergify/bp/version-15-hotfix/pr-43305
Your branch is up to date with 'origin/version-15-hotfix'.

You are currently cherry-picking commit b127a0c8b7.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   erpnext/manufacturing/doctype/plant_floor/plant_floor.js
	modified:   erpnext/manufacturing/doctype/work_order/work_order.js
	modified:   erpnext/public/js/bom_configurator/bom_configurator.bundle.js
	modified:   erpnext/public/scss/erpnext.scss

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/manufacturing/doctype/bom_creator/bom_creator.json
	both modified:   erpnext/manufacturing/doctype/plant_floor/plant_floor.json
	both modified:   erpnext/public/js/templates/visual_plant_floor_template.html

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@rohitwaghchaure rohitwaghchaure merged commit 7e6d6f0 into version-15-hotfix Sep 22, 2024
11 checks passed
@rohitwaghchaure rohitwaghchaure deleted the mergify/bp/version-15-hotfix/pr-43305 branch September 22, 2024 05:48
frappe-pr-bot pushed a commit that referenced this pull request Sep 25, 2024
## [15.36.2](v15.36.1...v15.36.2) (2024-09-25)

### Bug Fixes

* add currency in financial statement ([927f800](927f800))
* added date condition ([0e18845](0e18845))
* AR / AP report to ignore 0.0 outstanding ([979d801](979d801))
* **Bank Account:** dashboard connections (backport [#43365](#43365)) ([#43367](#43367)) ([cfea2de](cfea2de))
* change dynamic link doctype fieldtype to data ([05c92cc](05c92cc))
* closing amount reset to expected amount on save (backport [#43358](#43358)) ([#43368](#43368)) ([0722aa5](0722aa5))
* create_address is failing ([557ef5d](557ef5d))
* handle missing liability account scenario in `set_liability_account` ([4045928](4045928))
* incorrect outstanding on non-pos invoice with write_off_account ([f89a3db](f89a3db))
* incorrect stock balance for inventory dimension (backport [#43284](#43284)) ([#43290](#43290)) ([f6725e2](f6725e2))
* item_query in pos_invoice ([99e004b](99e004b))
* make to tax category on tax rule to filter with percent ([63d4fdd](63d4fdd))
* **minor:** include condition to check docstatus ([1f42302](1f42302))
* not able to cancel Quality Inspection (backport [#43374](#43374)) ([#43375](#43375)) ([40fbb1d](40fbb1d))
* partial return on POS invoice ([998fef7](998fef7))
* partial return on POS invoice ([b99ca7d](b99ca7d))
* Payment Ledger Report currency fieldtype fix ([ad2d6a1](ad2d6a1))
* **Payment Reconciliation:** German translations ([e06a01f](e06a01f))
* set group_by condition if empty and voucher_no is set ([ec27077](ec27077))
* shipping rule must match the company ([085a4c6](085a4c6))
* show chart tool tip in report currency ([e5ae828](e5ae828))
* stock dashboard (backport [#43347](#43347)) ([#43349](#43349)) ([176feb2](176feb2))
* transaction exchange rate on GL's for Multi currency Journals ([a7ccc94](a7ccc94))
* translate in js ([84e26e2](84e26e2))
* Translation for button SO to PO ([73d98ad](73d98ad))
* ui clean-up (backport [#43305](#43305)) ([#43312](#43312)) ([7e6d6f0](7e6d6f0))
* update clearance date in invoice payment table ([10ecdb9](10ecdb9))
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.

1 participant