Commit Graph

42291 Commits

Author SHA1 Message Date
Mohammad Hussain Nagaria
37433aad48
fix: Pluralize year text instead of optional bracket (#31210)
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2022-06-01 16:29:20 +05:30
Rucha Mahabal
536f1dfc4b
test: fix attendance tests for unmarked days (#31205)
* test: fix attendance tests for unmarked days

* chore: remove unused import
2022-06-01 13:56:55 +05:30
Ankush Menat
c84e11ac82
fix: re-validate warehouse after 'update items' (#31203) 2022-06-01 12:55:10 +05:30
Ankush Menat
03a24ce774 chore: delete dead cypress code
Moved to separate repo
2022-06-01 12:33:23 +05:30
Rucha Mahabal
d4b9cc0242
fix: remove leave policy assignment creation patch (#31097) 2022-06-01 12:18:14 +05:30
Rucha Mahabal
1c91793634
Merge branch 'develop' into fix-salary-slip-bg-job 2022-06-01 12:15:42 +05:30
Rucha Mahabal
653d6341d4 refactor: clean-up and commonify payroll entry test setups 2022-06-01 12:14:42 +05:30
Deepesh Garg
82be717f10
Merge pull request #31201 from deepeshgarg007/manufacturing_workspace_fix
fix: Remove domain restriction from Manufacturing Workspace
2022-06-01 09:30:39 +05:30
Deepesh Garg
167cf7b49d fix: Remove domain restrcition from Manufacturing Workspace 2022-06-01 09:04:53 +05:30
Deepesh Garg
753eb3ec3a
Merge branch 'develop' into bug_sales_order_analysis_report 2022-05-31 21:41:35 +05:30
Deepesh Garg
5fd31c6433
Merge pull request #31199 from deepeshgarg007/settings_perm_fix
fix: Permission for selling and buying settings
2022-05-31 21:40:55 +05:30
maharshivpatel
b3ccc4bfb9
fix: Auto Insert Item Price If Missing when discount & blank UOM (#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 <me@ankush.dev>
2022-05-31 19:48:30 +05:30
Deepesh Garg
a6beafbc3c fix: Permission for selling and buying settings 2022-05-31 19:41:46 +05:30
hrzzz
c4af63ad98 feat: two new groupby mode: Monthly, Payment Term 2022-05-31 10:46:56 -03:00
ruthra kumar
4f1bfbb93d test: multiple delivery notes and billed quantity 2022-05-31 17:24:36 +05:30
ruthra kumar
0331e37982 fix: incorrect billed_qty when item has multiple Delivery note
sales order analysis report returns incorrect billed_qty value for
an SO item has multiple delivery notes
2022-05-31 17:15:31 +05:30
marination
a62bc9b6c9 chore: Limit Update Cost jobs & db_update only if changed values
- If `Update Cost` job is ongoing, then block creation of new ones since all BOMs are updated
- `db_update` in `calculate_rm_cost` only if changed values to reduce redundant row updates
- Misc: Use variable for batch size
2022-05-31 16:00:29 +05:30
Ankush Menat
a1b7a7983a
refactor!: drop naming series tool (#31183) 2022-05-31 15:35:40 +05:30
Ankush Menat
691b34a8ed chore: unnessary args 2022-05-31 14:15:13 +05:30
Ankush Menat
ddb46c5711
fix: batch selector flag (#31191)
This is broken again after serializing scan actions, which causes
selector to trigger before batch_no is set.

Solution: for duration of scan disable the selector
2022-05-31 14:14:27 +05:30
maharshivpatel
a8f98f3f96
feat(india): Improve E-way Bill Cancellation. (#31088) 2022-05-31 12:14:39 +05:30
Rucha Mahabal
ed1ba677d6 test: HRA Exemption in Proof Submission 2022-05-31 11:54:43 +05:30
Rucha Mahabal
cfe2f8cac1 fix: amount precision for Tax Exemption Proof Submission 2022-05-31 11:54:43 +05:30
Rucha Mahabal
2e98e9e0b9 test: set country to India before running regional tests 2022-05-31 11:54:43 +05:30
Rucha Mahabal
00adda7c8d fix: Tax Declaration tests and amount precision 2022-05-31 11:54:43 +05:30
Rucha Mahabal
5e96a46c87 test: HRA Exemption in Employee Tax Exemption Declaration 2022-05-31 11:54:43 +05:30
Rucha Mahabal
2b65c9616f fix: component pay calculation 2022-05-31 11:54:43 +05:30
Rucha Mahabal
34925a3a8c fix: HRA Exemption calculation in case of multiple salary structure assignments 2022-05-31 11:54:43 +05:30
Deepesh Garg
f07246af82
Merge pull request #31127 from deepeshgarg007/loan_interest_accrual
feat: Auto accrue loan interest for backdated term loans
2022-05-31 09:55:26 +05:30
Deepesh Garg
25290bb5d5
Merge pull request #31184 from Mitchy25/patch-1
fix(accounts): Ignore Cancelled GL Entries
2022-05-31 09:48:44 +05:30
Mitchy25
a0c412a0dd
Ignore Cancelled GL Entries
Profitability Analysis includes 'is_cancelled' GL Entries which means that the profit numbers are incorrect. This change will ensure that the profit figures ignore cancelled GL Entries.
2022-05-31 15:25:09 +12:00
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
Saqib Ansari
08bf0baaae
chore!: remove unused bill no & date from purchase receipt (#31163) 2022-05-30 14:50:50 +05:30
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
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