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: Improve button labels in Warehouse #31101

Merged
merged 6 commits into from
May 26, 2022
Merged

Conversation

barredterra
Copy link
Collaborator

@barredterra barredterra commented May 23, 2022

File was formatted like 💩
-> Format. I know this is discouraged, but at some point somebody has to take the blame...

Labels "Group to Non-Group" / "Non-Group to Group" were not descriptive.
-> Changed to "Convert to Ledger" / "Convert to Group".

Context was missing for translations.
-> Added "Warehouse" context.

Queries were set during onload and refresh.
-> Set queries during setup.

Also fixed german translations ("Convert to Group" already existed, therefore I just removed the old label).

@ankush
Copy link
Member

ankush commented May 23, 2022

File was formatted like 💩

we should introduce autoformat for JS too at some point 🥲

I like prettier but it makes some files totally shit in frappe codebase. Need to tweak the config so it's tolerable by most devs.

@barredterra barredterra requested a review from ankush May 24, 2022 14:27
@ankush ankush self-assigned this May 24, 2022
@ankush ankush merged commit e3c0d01 into frappe:develop May 26, 2022
@barredterra barredterra deleted the fix-warehouse-js branch May 26, 2022 13:49
ankush pushed a commit that referenced this pull request May 27, 2022
* style: format warehouse js

(cherry picked from commit c704ad8)

* fix: improve labels, simplify logic

(cherry picked from commit a6ddd86)

* fix: german translations

(cherry picked from commit 9356eb1)

* fix: remove unsupported arguments

Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
(cherry picked from commit e77c379)

* refactor: set queries during setup

(cherry picked from commit 1b16eb7)

* style: format

(cherry picked from commit 1e9f9c4)

Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com>
frappe-pr-bot pushed a commit that referenced this pull request May 31, 2022
# [13.32.0](v13.31.1...v13.32.0) (2022-05-31)

### Bug Fixes

* add list view settings for Gratuity ([e4426ad](e4426ad))
* amount precision for Tax Exemption Proof Submission ([bb04e4b](bb04e4b))
* component pay calculation ([b1e119d](b1e119d))
* conflicts ([cdb884b](cdb884b))
* conflicts ([c02a89d](c02a89d))
* conflicts ([6aa6114](6aa6114))
* date filter on quality inspection report (backport [#31148](#31148)) ([#31164](#31164)) ([f19747c](f19747c))
* Exchange rate reste to 1 on making mapped doc ([91863c7](91863c7))
* Gratuity status not updated on salary slip submission ([0a014ed](0a014ed))
* HRA Exemption calculation in case of multiple salary structure assignments ([de8f5f8](de8f5f8))
* Improve button labels in Warehouse (backport [#31101](#31101)) ([#31150](#31150)) ([d891394](d891394))
* **india:** duplicate qrcode and hide button ([#31154](#31154)) ([f40100d](f40100d))
* Job Opening linked to Staffing Plan cannot be created/updated if there are existing employees ([b4a3a53](b4a3a53))
* **pos:** freeze screen while processing pos invoices ([#30850](#30850)) ([a7bf236](a7bf236))
* skip existing batch number during autogen (backport [#31140](#31140)) ([#31144](#31144)) ([a380bae](a380bae))
* Tax Declaration tests and amount precision ([1e728df](1e728df))
* validation message ([096ae21](096ae21))

### Features

* Auto accrue loan interest for backdated term loans ([89c4d51](89c4d51))
* live preview of naming series on naming series tool (backport [#31141](#31141)) ([#31146](#31146)) ([fd2f3b9](fd2f3b9))
* provision to exclude exploded items in the BOM (backport [#29450](#29450)) ([#31174](#31174)) ([50d338d](50d338d))
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants