74b8c99bc2
feat: Introduced cypress tests in erpnext
3 years ago
81522ec521
fix: validate Product Bundle for existing transactions before deletion ( #25977 )
3 years ago
f5961b30db
Merge pull request #26112 from rtdany10/patch-4
fix: ignore permission to update call log
3 years ago
8a5c7ea9b4
Merge branch 'develop' into patch-4
3 years ago
5a4251107c
feat: Project Portal Enhancements ( #26090 )
* fix: project portal enhancements
* fix: timesheet table and task nesting
* fix: semgrep and link issue
* fix: sider
* fix: project details view title
* fix: project progress pills
* fix: website route rule for project
* fix: multi level nesting
* fix: added subject and indentation
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
3 years ago
07a74abcc3
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
3 years ago
fa006402b8
fix: merge conflict
3 years ago
d45e307f02
test: fix expected test failure ( #26275 )
reference: https://github.com/frappe/frappe/pull/13557
3 years ago
c2b5562a3f
Merge branch 'version-13-pre-release' into version-13
3 years ago
eee03fcbab
bumped to version 13.6.0
3 years ago
d7c4818a5d
Merge pull request #26281 from rohitwaghchaure/fixed-update-cost-not-working-for-draft-bom-pre
fix: update cost not working in the draft BOM
3 years ago
9a4926bb0d
Merge pull request #26280 from rohitwaghchaure/fixed-employee-selection-issue-in-payroll-entry-pre
fix: employee selection not working in payroll entry
3 years ago
f99f872946
fix: update cost not working in the draft bom
3 years ago
87b4e6ea32
fix: employee selection not working in payroll entry
3 years ago
cf4e29a604
chore: Added change log for v13.6.0
3 years ago
970d90f3b2
Merge pull request #25970 from GangaManoj/exchange-rate-difference-handling
feat: Exchange rate difference handling in procurement cycle
3 years ago
4df54cc62c
Merge pull request #26269 from anupamvs/payroll-iss-pre-release
fix: fetching employee in payroll entry
3 years ago
8492bf040d
fix: feating employee in payroll entry
3 years ago
cf7af62b05
fix: Code cleanup
3 years ago
b4b6c8e262
Revert "fix: Test"
This reverts commit feed97ec53
3 years ago
1f10a99910
fix: Employee Inactive status implications ( #26245 )
3 years ago
8f2b8e47f7
fix: Employee Inactive status implications ( #26243 )
3 years ago
d748e7f49c
fix: Create common function for fetching conversion rate details of linked docs
3 years ago
506d5ac3d5
fix: Make exchange rate handling more efficient
3 years ago
8f52db788a
fix(Purchase Invoice): Improve test for exchange rate difference handling
3 years ago
a826fb8f95
fix(Purchase Receipt): Remove print statements
3 years ago
3f5e7bf6d7
fix(Purchase Invoice): Fetch Purchase Receipt details using a function
3 years ago
feed97ec53
fix: Test
3 years ago
5314445d58
fix(Purchase Receipt): Add test for exchange rate difference handling
3 years ago
d97505b277
fix(Purchase Receipt): Resolve difference caused by change in exchange rate
3 years ago
206313d69b
fix(Purchase Invoice): Add test for exchange rate difference handling
3 years ago
6233eaa3bb
fix(Purchase Invoice): Fix condition
3 years ago
785a71dcd2
fix(Purchase Invoice): Resolve difference caused by change in exchange rate
3 years ago
4277e4c94b
fix: unreachable test case ( #26234 )
3 years ago
3c97839826
Merge pull request #26130 from rohitwaghchaure/develop-production-plan-fix-to-show-parent-warehouse
fix: allow to select group warehouse while downloading materials from…
3 years ago
9bcc402f41
Merge pull request #26230 from rohitwaghchaure/fixed-fetch-bom-items-in-stock-reco-pre
fix: fetch batch items in stock reconciliation
3 years ago
5abf905ff7
Merge pull request #26229 from rohitwaghchaure/fixed-removed-values-out-of-sync-on-stock-transaction-submission-pre
fix: removed values out of sync validation from stock transactions
3 years ago
478360397d
fix: fetch batch items in stock reco
3 years ago
5d5dc56f94
fix: removed values out of sync validation from stock transactions
3 years ago
6588a936d5
fix: order and time of operations for multilevel bom
- Order of operations was being sorted by idx of individual operations in
BOM table, which made the ordering useless.
- This adds ordering that's sorted from lowest level item to top level
item.
- chore: remove dead functionality. There's no `items` table. Required
item level operations get overwritten on fetching of items /
operations e.g. when clicking on multi-level BOM checkbox.
- test: add test for tree representation
- feat: BOMTree class to get complete representation of a tree
3 years ago
9af3f12411
fix(ux): show bom in operations child table
3 years ago
b4e7ee0e45
chore: remove dead and py2 compatibility code
form_grid_template doesn't exist
3 years ago
805ac4ffdf
fix: order and time of operations for multilevel bom
- Order of operations was being sorted by idx of individual operations in
BOM table, which made the ordering useless.
- This adds ordering that's sorted from lowest level item to top level
item.
- chore: remove dead functionality. There's no `items` table. Required
item level operations get overwritten on fetching of items /
operations e.g. when clicking on multi-level BOM checkbox.
- test: add test for tree representation
- feat: BOMTree class to get complete representation of a tree
3 years ago
305bbc7619
fix(ux): show bom in operations child table
# Conflicts:
# erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json
3 years ago
923832c316
chore: remove dead and py2 compatibility code
form_grid_template doesn't exist
3 years ago
4beaf74524
Merge pull request #26221 from deepeshgarg007/item_tax_error_fetch_develop
fix: Error while fetching item taxes
3 years ago
8dd99c02cc
fix: Check for is None
3 years ago
cae42b48f1
fix: Error while fetching item taxes
3 years ago
bb0b1e61d6
Merge pull request #26220 from deepeshgarg007/item_tax_error_fetch_v13
fix: Error while fetching item taxes
3 years ago
6eb8d19cc9
fix: Check for is None
3 years ago
Nabin Hait
Afshan
Deepesh Garg
Jannat Patel
Ankush
Rohit Waghchaure
Anupam Kumar
Deepesh Garg
GangaManoj
Rucha Mahabal
marination
Saqib