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

Unizone mobile app #42422

Closed
wants to merge 3,626 commits into from
Closed

Conversation

Aditya-skyai
Copy link

Please provide enough information so that others can review your pull request:

Explain the details for making this change. What existing problem does the pull request solve?

Screenshots/GIFs

mergify bot and others added 30 commits June 7, 2022 16:04
…kport frappe#31168) (frappe#31267)

fix: Auto Insert Item Price If Missing when discount & blank UOM (frappe#31168)

* fix: Auto Insert Item Price If Missing when discount and blank UOM

fixes wrong item price insert when discount is used and adds uom=stock_uom instead of blank as price is converted to stock uom

* unit tests added for item with discount

I have added test  for auto_insert_price where discount is used.

* unit test issue fixed

fixed make_sales_order as some of the test that depended on it were failing due to passing of incorrect parameters.

Co-authored-by: Ankush Menat <[email protected]>
(cherry picked from commit b3ccc4b)

Co-authored-by: maharshivpatel <[email protected]>
- Utility to update cost in all BOMs without cron jobs or background jobs (run immediately)
- Re-use util wherever all bom costs are to be updated
- Skip explicit commits if in test
- Specify company in test records (dirty data sometimes, company wh mismatch)
- Skip background jobs queueing if in test
- Use base_rate for assertions as rate is subject to change due to conversion factor (USD)
- Use qb instead of db.sql
- Don't use `args` as argument for function
- Cleaner variable names
…ackport frappe#31282) (frappe#31283)

fix: Use `frappe.as_unicode` to decode output of redis module list (frappe#31282)

- As of redis 7, a list is added to the result of fetching the module list
- This list cannot be "decoded",so use `frappe.as_unicode` that handles bytes as well as other types

(cherry picked from commit 2832731)

Co-authored-by: Marica <[email protected]>
…ta (update cost)

- Remove `auto_commit_on_many_writes` in `update_cost_in_level()` as commits happen every N BOMs
- Auto commit every 50 BOMs
- test: Remove hacky `frappe.flags.in_test` returns
- test: Enqueue `now` if in tests (for update cost and replace bom)
- Replace BOM: Copy bom object to `_doc_before_save` so that version.py finds a difference between the two
- Replace BOM: Add reference to version
- Update Cost: Unset `processed_boms` if Log is completed (useless after completion)
- test: `update_cost_in_all_boms_in_test` works close to actual prod implementation (only call Cron job manually)
- Test: use `enqueue_replace_bom`  so that test works closest to production behaviour

Co-authored-by: Ankush Menat <[email protected]>
…rappe#31298)

fix(ux): hide new version btn on unsaved BOM (frappe#31297)

(cherry picked from commit d9a5213)

Co-authored-by: Ankush Menat <[email protected]>
Update ar.csv

Fix Translation arabic translation that caused an error when submitting an asset if user language was arabic
…fix/pr-31296

fix: misaligned columns in print format of AR/AP report (backport frappe#31296)
* fix: update ru translate (frappe#31200)

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

fix logic

* Update ru.csv

* Update ru.csv

* Update ru.csv

(cherry picked from commit 2675751)

# Conflicts:
#	erpnext/translations/ru.csv

* fix: Merge conflicts

Co-authored-by: Vladislav <[email protected]>
Co-authored-by: Marica <[email protected]>
…lier (backport frappe#31302) (frappe#31306)

fix: Reset represents company on disabling internal customer and supplier (frappe#31302)

(cherry picked from commit c13e5ad)

Co-authored-by: Deepesh Garg <[email protected]>
(cherry picked from commit b9dbb36)
(cherry picked from commit ee2949a)
…fix/pr-31216

fix: Trial Balance failing to ignore Finance Book (backport frappe#31216)
(cherry picked from commit 50aafdb)
In fieldtypes locale settings (example NL) . and , changes whereby the field is inproperly filled

(cherry picked from commit 17887cd)
…fix/pr-31102

feat: Add german translations (backport frappe#31102)
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet