ruthra kumar
4c74637c91
refactor: remove naming expression for payment ledger
2022-05-30 19:06:56 +05:30
Rucha Mahabal
78c39e947b
test: Salary Slip operations queuing, failure, and payroll entry status
...
- fix multicurrency test, remove redundant doc creation
2022-05-30 16:07:19 +05:30
Rucha Mahabal
42f6bca935
fix: reset Error Message on successful operation and fix status update on submit/cancel
2022-05-30 16:04:07 +05:30
Vladislav
832bedc747
Update ru.csv
2022-05-30 12:56:27 +03:00
Saqib Ansari
08bf0baaae
chore!: remove unused bill no & date from purchase receipt ( #31163 )
2022-05-30 14:50:50 +05:30
Vladislav
5b461bfa75
Merge branch 'frappe:develop' into develop
2022-05-30 12:11:20 +03:00
rohitwaghchaure
2cbc665d19
Merge pull request #31175 from ankush/recursive_non_explosive_bom
...
fix: allow recursive BOMs as long as they don't recursively explode
2022-05-30 13:27:16 +05:30
Rucha Mahabal
de55157997
chore: rename method get_salary_component_account method to set
...
- since it doesn't return any value
2022-05-30 12:47:26 +05:30
Ankush Menat
d7a7c47650
Merge branch 'develop' into recursive_non_explosive_bom
2022-05-30 11:12:57 +05:30
Ankush Menat
c02598a51b
chore: remove framework tests from erpnext
...
Similar tests exist in FW and this is failing because someone updated
the translations
2022-05-30 11:12:17 +05:30
Ankush Menat
954dac88a8
fix: allow non-explosive recrusive BOMs
...
Recursion should be allowed as long as child item is not "exploded"
further by a BOM.
2022-05-30 10:40:13 +05:30
Ankush Menat
d224bf1d34
fix: only erase BOM when do_not_explode is set
2022-05-30 10:40:13 +05:30
Ankush Menat
b170cec2fe
fix(ux): "New Version" button BOM
...
"duplicate" technically creates a new version but that's not intuitive
at all.
2022-05-30 10:40:12 +05:30
Devin Slauenwhite
85b48fcdb9
fix: barcode scan resolve after model is updated ( #31058 )
...
* fix: resolve row after model is updated.
* fix: wait for all fields in the model to be updated.
* fix: sider
* pref: clear scanned code after capturing value
* fix: use frappe.run_serially
2022-05-29 22:19:09 +05:30
Ankush Menat
933434c3ea
chore: format
2022-05-29 22:09:32 +05:30
Vladislav
ac160d58bd
Update ru.csv
2022-05-28 04:16:46 +03:00
Vladislav
1cff1df46b
Merge branch 'frappe:develop' into develop
2022-05-28 04:11:33 +03:00
marination
978ba5238f
fix: Safe cast row.rate (in case of faulty exploded items, edge case but oh well)
2022-05-27 21:59:59 +05:30
marination
2de2491e17
perf: get_next_higher_level_boms
...
- Separate getting dependants and checking if they are valid (loop within loop led to redundant processing that slowed down function)
- Adding to above, the same dependant(parent) was repeatedly processed as many children shared it. Expensive.
- Use a parent-child map similar to child-parent map to check if all children are resolved
- `map.get()` reduced time: 10 mins -> 0.9s~1 second (as compared to `get_cached_doc` or query)
- Total time: 17 seconds to process 6599 leaf boms and 4.2L parent boms
- Previous Total time: >10 mins (I terminated it due to not wanting to waste time XD)
2022-05-27 20:33:14 +05:30
HENRY Florian
ce8e05146e
chore: update translation fr for BOM ( #31126 )
...
* fix: update translation
* fix: fr translation for BOM
2022-05-27 17:27:43 +05:30
MOHAMMED NIYAS
7ff8acac51
fix: date filter on quality inspection report ( #31148 )
...
* fix: date filter
fix from date to to date filter btw those days
* fix: remove unnecessary conditions
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
2022-05-27 17:13:14 +05:30
marination
5949946265
chore: Change BOM Progress field types to Long Text
2022-05-27 17:04:21 +05:30
Rucha Mahabal
4df76f3956
Merge pull request #31160 from ruchamahabal/fix-gratuity-status-update
2022-05-27 15:05:31 +05:30
Rucha Mahabal
c9e070393d
test: make holiday list before running gratuity tests
2022-05-27 14:42:11 +05:30
marination
eabd8290d4
feat: Only update exploded items rate and amount
...
- Generate RM-Rate map from Items table (will include subassembly items with rate)
- Function to reset exploded item rate from above map
- `db_update` exploded item rate only if rate is changed
- Via Update Cost, only update exploded items rate, do not regenerate table again
- Exploded Items are regenerated on Save and Replace BOM job
- `calculate_exploded_cost` is run only via non doc events (Update Cost button, Update BOMs Cost Job)
2022-05-27 14:32:58 +05:30
Rucha Mahabal
79b0aede00
fix: add list view settings for Gratuity
2022-05-27 13:57:09 +05:30
Rucha Mahabal
6c66bbbbfe
refactor: clean-up gratuity tests
2022-05-27 13:39:25 +05:30
Rucha Mahabal
b81d7519c1
test: Gratuity status for payment via salary slip
2022-05-27 12:58:10 +05:30
Rucha Mahabal
385e22a067
fix: Gratuity status not updated on salary slip submission
2022-05-27 12:57:07 +05:30
Deepesh Garg
7adcac4e66
Merge pull request #31155 from deepeshgarg007/exchnage_rate_reset
...
fix: Exchange rate reste to 1 on making mapped doc
2022-05-27 12:17:17 +05:30
HarryPaulo
4b04694c2c
fix(pos): freeze screen while processing pos invoices ( #30850 )
2022-05-27 12:16:07 +05:30
Deepesh Garg
2a10f09d8d
fix: Exchange rate reste to 1 on making mapped doc
2022-05-27 12:12:34 +05:30
maharshivpatel
935e5b1dcd
fix(india): duplicate qrcode and hide button ( #31100 )
2022-05-27 11:48:55 +05:30
Deepesh Garg
d0a9eb4fd0
Merge branch 'develop' into fix-average-discount-auth
2022-05-26 18:22:34 +05:30
Ankush Menat
e3c0d0134e
Merge pull request #31101 from alyf-de/fix-warehouse-js
...
fix: Improve button labels in Warehouse
2022-05-26 18:14:49 +05:30
Ankush Menat
ff798dc5c0
Merge pull request #31141 from ankush/naming_series_live_preview
...
feat: live preview of naming series on naming series tool
2022-05-26 16:49:59 +05:30
Ankush Menat
47b539e638
fix: skip existing batch number during autogen ( #31140 )
2022-05-26 16:20:56 +05:30
Ankush Menat
964b4184a6
test: add basic tests for naming series tool
2022-05-26 16:17:56 +05:30
Ankush Menat
4d0e2aa33a
docs: update help information on naming series
2022-05-26 15:36:48 +05:30
Ankush Menat
24d1bf5328
feat: preview next numbers on naming series tool
2022-05-26 15:15:59 +05:30
Ankush Menat
82cd54b40b
chore: resave naming series doctype schema
...
separate commit to avoid mixing actual changes
2022-05-26 15:15:59 +05:30
Sagar Sharma
61296a0658
fix: Subcontracting through Production Plan
2022-05-26 15:08:16 +05:30
Sagar Sharma
bcaac8f90f
Merge branch 'develop' into subcontracting
2022-05-26 15:01:23 +05:30
Rucha Mahabal
5c7451438f
Merge pull request #31130 from ruchamahabal/fix-job-opening
2022-05-26 13:23:44 +05:30
Rucha Mahabal
2bc6d46070
fix: validation message
2022-05-26 13:00:34 +05:30
Deepesh Garg
f49d8cd3b1
Merge pull request #31102 from alyf-de/german-translations-2022-05-23
...
feat: Add german translations
2022-05-26 11:49:56 +05:30
Vladislav
8d2502b5ba
chore: update ru translate
2022-05-26 11:48:38 +05:30
Rucha Mahabal
3f13b0ec97
Merge branch 'develop' into fix-job-opening
2022-05-26 11:38:35 +05:30
Rucha Mahabal
ab0ef60918
test: Job Opening against a Staffing Plan
2022-05-26 11:32:46 +05:30
sersaber
e5d2c1b1f3
fix: change project's actual_start_date fieldtype from Data to Date ( #31085 )
...
* Update project.json
* Update project.json
2022-05-26 10:04:58 +05:30
