nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-19 01:25:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
40,724 Commits 404 Branches 1,700 Tags
0d5bb92149d08d32c457217512e808f16f07d366
Commit Graph

40724 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepesh Garg
0d5bb92149 Merge pull request #31464 from frappe/version-13-hotfix 
chore: weekly version-13 release
 2022-06-28 13:00:06 +05:30
mergify[bot]
815530650c fix: dont update RM items table if not required (backport #31408) (#31457) 
fix: dont update RM items table if not required (#31408)

Currently on PO update RM item table is auto computed again and again,
if there was any transfer/consumption against that then it will be lost.

This change:
1. Disables updating RM table if no change in qty of FG was made. Since
   RM table can't possibly be different with same FG qty.
2. Blocks update completely if qty is changed and RM items are already
   transferred.

(cherry picked from commit dd11f26eba)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-06-28 10:28:11 +05:30
Deepesh Garg
8ab65bc44e Merge pull request #31453 from frappe/mergify/bp/version-13-hotfix/pr-31446 
fix: Quotation and Sales Order item sync (backport #31446)
 2022-06-28 08:49:21 +05:30
mergify[bot]
5e7cad476f refactor: clean up product bundle client side code (backport #31455) (#31456) 
refactor: clean up product bundle client side code (#31455)

refactor: clean up product bundle cient side code

- Remove deprecated CUR_FRM scripts
- Remove client side fetches and move it to doctype schema

(cherry picked from commit 20dac08f5f)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-06-27 18:33:17 +05:30
Deepesh Garg
2219132fdb fix: Quotation and Sales Order item sync 
(cherry picked from commit 58fe220479)
 2022-06-27 05:48:39 +00:00
Deepesh Garg
873d1ecdf0 Merge pull request #31447 from frappe/mergify/bp/version-13-hotfix/pr-31439 
fix: General Ledger and TB opening entries mismatch issues (backport #31439)
 2022-06-27 09:47:00 +05:30
Deepesh Garg
a0c5c730f5 fix: General Ledger and TB opening entries mismatch issues 
(cherry picked from commit 6acd0325be)
 2022-06-24 16:15:38 +00:00
Nabin Hait
e7659a10e4 fix: Monthly depreciation using WDV method 2022-06-24 21:12:31 +05:30
Marica
5f8d8c096c Merge pull request #31440 from frappe/mergify/bp/version-13-hotfix/pr-31421 
fix: add UOM validation for planned-qty (backport #31421)
 2022-06-24 13:02:44 +05:30
s-aga-r
559bde3135 fix: add UOM validation for planned-qty 
(cherry picked from commit 00807abe31)
 2022-06-24 07:10:55 +00:00
Deepesh Garg
d1bb94bb1d Merge pull request #31431 from frappe/mergify/bp/version-13-hotfix/pr-31395 
fix: filter set in Bank Clearance Summary (backport #31395)
 2022-06-23 14:26:45 +05:30
Rucha Mahabal
abfe926a45 fix(Salary Slip): Components not updated when amount evaluates to 0 due to payment days (#31425) 
* fix(Salary Slip): Components not updated when amount evaluates to 0 due to payment days

* fix: remove 0 valued components that have been updated later
 2022-06-23 11:01:00 +05:30
Nihantra C. Patel
4b53ec22c5 Update bank_clearance_summary.py 
(cherry picked from commit 0097a2b60c)
 2022-06-23 05:25:17 +00:00
Marica
87f77813ea Merge pull request #31422 from frappe/mergify/bp/version-13-hotfix/pr-31420 
fix: translation for filter status on report (backport #31420)
 2022-06-22 14:01:42 +05:30
Marica
b4e64d0ebb Merge pull request #31423 from marination/bom-update-log-cleanup-perf-hotfix 
chore: Clear Progress section for completed logs & `on_submit` UX
 2022-06-22 14:01:19 +05:30
marination
fcec318588 chore: Clear Progress section for completed logs & on_submit UX 
- Delete `BOM Update Batch` table on 'Completed' log, to save space
- Hide Progress section on 'Completed' log
- Enqueue `on_submit` for 'Update Cost' job, getting leaf boms could take time for huge DBs. Users have to wait for screen to unfreeze.
- Add error handling to `process_boms_cost_level_wise` (Called via cron job and on submit, both in background)
 2022-06-22 12:27:08 +05:30
hrzzz
736f20656d fix: translation for filter status on report 
(cherry picked from commit 8b1ff96e30)
 2022-06-22 06:16:52 +00:00
mergify[bot]
8b78a122e7 fix: update ru translate (backport #31404) (#31417) 
* fix: update ru translate (#31404)

* 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

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

(cherry picked from commit ce1b4e40a1)

# Conflicts:
#	erpnext/translations/ru.csv

* chore: Fix merge conflicts

Co-authored-by: Vladislav <integration.into.society@gmail.com>
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2022-06-21 20:14:13 +05:30
Marica
1e34616c91 Merge pull request #31393 from frappe/mergify/bp/version-13-hotfix/pr-30837 
fix: Respect system precision for user facing balance qty values (backport #30837)
 2022-06-21 20:13:23 +05:30
Frappe PR Bot
0a25d28e34 chore(release): Bumped to Version 13.34.1 
## [13.34.1](https://github.com/frappe/erpnext/compare/v13.34.0...v13.34.1) (2022-06-21)

### Bug Fixes

* Conversion rate validation for multi-currency invoices ([4186aaf](4186aafd07))
* **india:** e-invoice eligibility if company gstin is not configured ([#31247](https://github.com/frappe/erpnext/issues/31247)) ([7696ae4](7696ae4de1))
* internal transfer GLE validation ([8a4cd2a](8a4cd2aba1))
* Merge Conflicts ([0f3a02d](0f3a02db57))
* Pick Template BOM if variant BOM absent in WO popup from SO ([7c35887](7c35887d07))
* Quotation lost update ([3b9f943](3b9f943335))
* Spelling mistake in quotation depend on (backport [#31362](https://github.com/frappe/erpnext/issues/31362)) ([#31363](https://github.com/frappe/erpnext/issues/31363)) ([ebcdaf7](ebcdaf7c82))
* transaction date gets unset in material request ([#31387](https://github.com/frappe/erpnext/issues/31387)) ([4e2ed6f](4e2ed6f9d9)), closes [#31327](https://github.com/frappe/erpnext/issues/31327)
* UOM handling for transaction without item (backport [#31389](https://github.com/frappe/erpnext/issues/31389)) ([#31391](https://github.com/frappe/erpnext/issues/31391)) ([051e5cd](051e5cd741))

### Performance Improvements

* GLE reposting with progress and chunking (backport [#31343](https://github.com/frappe/erpnext/issues/31343)) ([#31373](https://github.com/frappe/erpnext/issues/31373)) ([f19ed0b](f19ed0b74c))
v13.34.1 		2022-06-21 11:14:34 +00:00
Ankush Menat
d6d2215d8e Merge pull request #31414 from frappe/version-13-hotfix 
chore: weekly version-13 release
 2022-06-21 16:39:04 +05:30
Deepesh Garg
e43e442448 Merge pull request #31413 from frappe/mergify/bp/version-13-hotfix/pr-31264 
fix: internal transfer GLE validation (backport #31264)
 2022-06-21 14:56:56 +05:30
Ankush Menat
8a4cd2aba1 fix: internal transfer GLE validation 
(cherry picked from commit 65b21ee7d6)
 2022-06-21 09:02:02 +00:00
Marica
3f4d00d288 Merge branch 'version-13-hotfix' into mergify/bp/version-13-hotfix/pr-30837 2022-06-21 11:02:46 +05:30
Deepesh Garg
8b3fc15ca8 Merge pull request #31397 from frappe/mergify/bp/version-13-hotfix/pr-31396 
fix: Quotation lost update (backport #31396)
 2022-06-21 10:28:45 +05:30
Deepesh Garg
760ba0877c Merge pull request #31411 from frappe/mergify/bp/version-13-hotfix/pr-31350 
fix: Conversion rate validation for multi-currency invoices (backport #31350)
 2022-06-21 10:28:15 +05:30
Deepesh Garg
da70b69d68 test: Add test case 
(cherry picked from commit 8f37393044)
 2022-06-21 03:40:13 +00:00
Deepesh Garg
4186aafd07 fix: Conversion rate validation for multi-currency invoices 
(cherry picked from commit d05d15346a)
 2022-06-21 03:40:13 +00:00
marination
70a7dfe2f0 chore: Missing import flt 2022-06-20 17:18:01 +05:30
Marica
e982abbe4d chore: Change autoname to v13 compatible value (#31407) 
- 'autoincrement' is present only in v14
- 'hash' is automatically still used in tables but change value for safety
 2022-06-20 17:09:52 +05:30
marination
5bcfbbe124 chore: fix merge conflict 2022-06-20 16:59:18 +05:30
Deepesh Garg
8e2e61ef84 chore: resolve conflicts 2022-06-18 20:23:58 +05:30
Deepesh Garg
b3169edfc8 Merge pull request #31275 from frappe/mergify/bp/version-13-hotfix/pr-31247 
fix(india): e-invoice eligibility if company gstin is not configured (backport #31247)
 2022-06-17 21:41:44 +05:30
Deepesh Garg
8d63abb442 chore: fix condition 
(cherry picked from commit e457288dba)

# Conflicts:
#	erpnext/selling/doctype/quotation/quotation.py
 2022-06-17 15:39:53 +00:00
Deepesh Garg
3b9f943335 fix: Quotation lost update 
(cherry picked from commit 02f9441e1a)

# Conflicts:
#	erpnext/selling/doctype/quotation/quotation.py
 2022-06-17 15:39:52 +00:00
Marica
642b9c5466 fix: Respect system precision for user facing balance qty values (#30837) 
* fix: Respect system precision for user facing balance qty values

- `get_precision` -> `set_precision`
- Use system wide currency precision for `stock_value`
- Round of qty defiiciency as per user defined precision (system flt precision), so that it is WYSIWYG for users

* fix: Consider system precision when validating future negative qty

* test: Immediate Negative Qty precision test

- Test for Immediate Negative Qty precision
- Stock Entry Negative Qty message: Format available qty in system precision
- Pass `stock_uom` as confugrable option in `make_item`

* test: Future Negative Qty validation with precision

* fix: Use `get_field_precision` for currency precision as it used to

- `get_field_precision` defaults to number format for precision (maintain old behaviour)
- Don't pass `currency` to `get_field_precision` as its not used anymore

(cherry picked from commit d6078aa911)

# Conflicts:
#	erpnext/stock/doctype/stock_ledger_entry/test_stock_ledger_entry.py
 2022-06-17 09:46:09 +00:00
mergify[bot]
051e5cd741 fix: UOM handling for transaction without item (backport #31389) (#31391) 
fix: UOM handling for transaction without item (#31389)

If invoice is made without item code then UOM, Stock UOM and
conversion_factor all need to be manually added, this is confusing and
leads missing them out leads to errors.

Simplest solution:

- if either UOM exists then set both to same uom conversion factor to
- also set conversion factor based on UOM conversions

(cherry picked from commit 10583eb3ce)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-06-17 15:11:28 +05:30
mergify[bot]
4e2ed6f9d9 fix: transaction date gets unset in material request (#31387) 
* fix: transaction date gets unset in material request (#31327)

* fix: set date correctly in material request

* fix: use only `transaction_date` in `get_item_details`

* fix: resolve merge conflict

Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2022-06-17 12:04:10 +05:30
Marica
2d6e518f87 Merge pull request #31380 from frappe/mergify/bp/version-13-hotfix/pr-31372 
chore: Fix a potential variable misuse bug (backport #31372)
 2022-06-16 12:47:58 +05:30
Marica
0f3a02db57 fix: Merge Conflicts 2022-06-16 12:23:13 +05:30
Jingxuan He
2cd03196a4 chore: Fix a potential variable misuse bug (#31372) 
* Fix a potential variable misuse bug

* chore: Separate check (separate line) for empty table in Pricing Rule

* chore: Code readability & check for field in row (now row itself)

Co-authored-by: marination <maricadsouza221197@gmail.com>
(cherry picked from commit b4a93da9f3)

# Conflicts:
#	erpnext/accounts/doctype/pricing_rule/pricing_rule.py
 2022-06-16 06:47:49 +00:00
Ankush Menat
f19ed0b74c perf: GLE reposting with progress and chunking (backport #31343) (#31373) 
* fix: dont use cached doc for GLE reposts

ported from https://github.com/frappe/erpnext/pull/31240

* perf: GLE reposting with progress and chunking

If stock voucher count goes >1000 then fetching all gles and reposting
them all at once requires much more memory and can cause crash.

- This PR ensures that GLE reposting is done in chunks of 100 vouchers.
- This PR also starts keeping track of how many such chunks were
  processed so in future progress is resumed in event of timeout.

* test: add "actual" test for chunked GLE reposting
 2022-06-15 20:54:20 +05:30
Marica
001130c0da Merge pull request #31368 from frappe/mergify/bp/version-13-hotfix/pr-31353 
fix: Pick Template BOM if variant BOM absent in WO popup from SO (backport #31353)
 2022-06-15 15:42:58 +05:30
marination
7c35887d07 fix: Pick Template BOM if variant BOM absent in WO popup from SO 
- Use `get_default_bom` in sales_order.py (reduce duplicate utility functions)
- Remove redundant if else in `get_work_order_items`
- `get_default_bom`: If no BOM and template exists try to fetch template BOM
- test: `get_work_order_items` via SO and if right BOM is picked

(cherry picked from commit 9f2d325e67)
 2022-06-15 09:07:54 +00:00
mergify[bot]
ebcdaf7c82 fix: Spelling mistake in quotation depend on (backport #31362) (#31363) 
* fix: Spelling mistake in quotation depend on (#31362)

Update quotation.json

(cherry picked from commit 37e9622426)

* chore: bump modified

Co-authored-by: Nihantra C. Patel <99652762+nihantra@users.noreply.github.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-06-15 12:05:46 +05:30
Frappe PR Bot
943d83b739 chore(release): Bumped to Version 13.34.0 
# [13.34.0](https://github.com/frappe/erpnext/compare/v13.33.0...v13.34.0) (2022-06-14)

### Bug Fixes

* (auto-merge) Use `frappe.log_error` instead of `doc.log_error` ([bced6a0](bced6a07b4))
* `test_work_order_with_non_stock_item` ([b827c3b](b827c3b3c9))
* Add cost center in loan document ([c19dfbe](c19dfbe98a))
* **asset:** failing test case ([#31277](https://github.com/frappe/erpnext/issues/31277)) ([8a4c9d1](8a4c9d1238))
* Auto Insert Item Price If Missing when discount & blank UOM (backport [#31168](https://github.com/frappe/erpnext/issues/31168)) ([#31267](https://github.com/frappe/erpnext/issues/31267)) ([e69bff0](e69bff0caa))
* Call `calculate_cost` for Draft BOM and typo in argument ([d035aa2](d035aa2afb))
* Company address filter in quotation ([d375939](d375939475))
* DB update child items, remove redundancy, fix perf ([cbc52a2](cbc52a2e45))
* Depreciate Asset before generating GL Entries on sale ([#30759](https://github.com/frappe/erpnext/issues/30759)) ([dfbfe40](dfbfe403e9))
* Get fresh RM rate in `calculate_rm_cost` ([9a513fd](9a513fda74))
* **India:** Incorrect taxable in GSTR-3B report ([e5d2c59](e5d2c59929))
* **India:** Sales taxes and charges template fetching in quotation ([a1ba847](a1ba8475d0))
* locale Currency and Float setting in update_employee ([391ed9c](391ed9c567))
* misaligned columns in print format of AR/AP report ([81e32e2](81e32e2855))
* Partially Ordered status for quotation ([37ba550](37ba550398))
* purchase invoice standalone return GLEs (backport [#31209](https://github.com/frappe/erpnext/issues/31209)) ([#31263](https://github.com/frappe/erpnext/issues/31263)) ([6d99b5a](6d99b5a95a))
* Reset represents company on disabling internal customer and supplier (backport [#31302](https://github.com/frappe/erpnext/issues/31302)) ([#31306](https://github.com/frappe/erpnext/issues/31306)) ([fb9b302](fb9b302ecf))
* Safe cast `row.rate` (in case of faulty exploded items, edge case but oh well) ([6d65e2b](6d65e2bab4))
* Supplied Qty not updated on Stock Entry cancel ([79b2062](79b20622c9))
* Trial Balance failing to ignore Finance Book ([00371f4](00371f4a22))
* typo in sql condition ([894f945](894f945be7))
* update fr translation (backport [#31232](https://github.com/frappe/erpnext/issues/31232)) ([#31334](https://github.com/frappe/erpnext/issues/31334)) ([5d0f271](5d0f271451))
* update Period Closing Voucher per Company ([5ebbe81](5ebbe81543))
* update ru translate (backport [#31200](https://github.com/frappe/erpnext/issues/31200)) ([#31304](https://github.com/frappe/erpnext/issues/31304)) ([77e4755](77e4755c1f))
* Use `frappe.as_unicode` to decode output of redis module list (backport [#31282](https://github.com/frappe/erpnext/issues/31282)) ([#31283](https://github.com/frappe/erpnext/issues/31283)) ([633a452](633a4521e4))
* **ux:** hide new version btn on unsaved BOM (backport [#31297](https://github.com/frappe/erpnext/issues/31297)) ([#31298](https://github.com/frappe/erpnext/issues/31298)) ([9f6b32a](9f6b32af12))
* **UX:** use doc.status for Job Card status ([#31320](https://github.com/frappe/erpnext/issues/31320)) ([78473b8](78473b8d99))

### Features

* Add german translations ([a3f2cf3](a3f2cf3917))
* Level-wise BOM cost updation ([74d7d81](74d7d81d6e))
* Only update exploded items rate and amount ([a26da58](a26da58718))
* Track progress in Log Batch/Job wise ([3b2a8bf](3b2a8bf837))

### Performance Improvements

* `get_boms_in_bottom_up_order` ([87c2b3b](87c2b3be0b))
* `get_next_higher_level_boms` ([767a775](767a775709))
* Use cached doc instead of `get_doc` ([faa69c9](faa69c942b))
v13.34.0 		2022-06-14 07:45:40 +00:00
Deepesh Garg
662a63b3f5 Merge pull request #31349 from frappe/version-13-hotfix 
chore: weekly version-13 release
 2022-06-14 13:13:45 +05:30
Deepesh Garg
55e0c03ef0 Merge pull request #31347 from frappe/mergify/bp/version-13-hotfix/pr-31322 
fix: Company address filter in quotation (backport #31322)
 2022-06-14 12:44:59 +05:30
Deepesh Garg
da1a948a28 chore: resolve conflicts 2022-06-14 11:36:43 +05:30
Deepesh Garg
823cf88c3c chore: linting issues 
(cherry picked from commit fb3da124e5)
 2022-06-14 05:47:58 +00:00