Devin Slauenwhite
a1ae7fcbc8
fix: show fail message
2022-02-24 16:36:30 -05:00
Marica
4d8d4acec4
Merge pull request #29913 from marination/item-merge-bundles
...
fix: Block merging items if both have product bundles
2022-02-23 16:59:22 +05:30
marination
a33f04ea41
fix: Check if both old and new items have bundles before merging
...
- If only one has bundle against it, they can be merged
2022-02-23 16:26:20 +05:30
Ankush Menat
b44cead317
test: fix flaky stateful tests ( #29749 )
...
Co-Authored-By: Marica <maricadsouza221197@gmail.com>
2022-02-23 16:17:41 +05:30
Marica
8b1ef7bcc6
Merge pull request #29964 from marination/fox-flaky-stock-reports-test
...
chore: Rollback after each test, due to premature commit via `remove_user_permission`
2022-02-23 15:18:39 +05:30
marination
5ff3705872
test: Make Variant if absent in test_variant_work_order, keep test atomic
2022-02-23 14:54:16 +05:30
Ankush Menat
9c7df2eec5
fix: ignore duplicates explicitly
2022-02-23 14:27:45 +05:30
marination
bf8743713d
chore: Rollback after each test, due to premature commit via remove_user_permission
...
- `remove_user_permission` in `test_warehouse_user` calls delete_doc that enqueues dynamic link deletion
- Execution of background job eventually commits
- While in the test suite it runs sequentially in the same thread and commits whatever was done until then
- Which is why the rollback in `tearDownClass` is quite useless here
- This premature commit causes many illegal transactions caught by `assertRaises` to be committed in the db
- This creates faulty/dirty ledgers and breaks reports, as outiside the test suite this shouldn't/wouldn't happen
- Rollback after each test, and for `test_warehouse_user` in particular, manually cancel transaction
2022-02-23 14:03:48 +05:30
Marica
857ac8c045
Merge branch 'develop' into item-merge-bundles
2022-02-23 13:01:56 +05:30
Marica
856d3f63b5
Merge pull request #29953 from marination/heart-icon-and-shop-by-category
...
chore: Adjust heart icon to v14 icons in frappe (make consistent with v13) & misc fix
2022-02-23 13:01:30 +05:30
Deepesh Garg
1bdcb73d5d
Merge pull request #29879 from deepeshgarg007/misc_fixes
...
fix: Validate party account with company
2022-02-23 11:22:08 +05:30
Suraj Shetty
b96bbeef64
Merge pull request #29956 from surajshetty3416/fix-de-translations
2022-02-23 10:59:41 +05:30
Suraj Shetty
aaa84a21ba
fix: Email translations
2022-02-23 10:54:44 +05:30
Marica
0fde2f522e
Merge branch 'develop' into item-merge-bundles
2022-02-23 00:28:51 +05:30
marination
714325071f
fix: Remove accidental as_dict in frappe.db.get_all
2022-02-23 00:15:39 +05:30
marination
b0a1cd6a7b
chore: Change heart icon to icon-heart and change var icon-stroke to accomodate changes in frappe icon
...
- `icon-heart` got a stroke colour that needs to be overriden via var `icon-stroke
- Use `icon-heart` instead of `icon-heart-active` as the latter has a color fill now
2022-02-23 00:13:44 +05:30
Deepesh Garg
a61790c00f
fix: Remove unintended changes
2022-02-22 20:58:10 +05:30
Deepesh Garg
bd80e04aa7
Merge pull request #29865 from deepeshgarg007/loan_bank_reco
...
feat: Bank Reconciliation for loan documents
2022-02-22 20:43:00 +05:30
Deepesh Garg
60a006fdaf
Merge pull request #29942 from nemesis189/taxjar-fixes
...
fix: Taxjar minor fixes
2022-02-22 19:37:56 +05:30
Ankush Menat
5d403449bd
test: move report tests to subttest ( #29945 )
...
Basically failfast=False but for sub-tests
2022-02-22 19:24:49 +05:30
Subin Tom
1682a26fe6
fix: Taxjar minor fixes
2022-02-22 17:20:48 +05:30
Ankush Menat
745f7bc5f0
docs: add human readable specifications for stock ledger ( #29308 )
...
* docs: add human readable specifications for stock ledger
* docs: reposting technical implementation notes
2022-02-22 17:03:11 +05:30
Ankush Menat
7f55226a58
fix: remove customer field value when MR is not customer provided ( #29938 )
2022-02-22 16:55:43 +05:30
Saqib Ansari
2a69730a40
Merge pull request #29900 from nextchamp-saqib/asset-fix-#3
...
fix(asset): no. of depr booked cannot be equal to total no. of depr
2022-02-22 14:23:19 +05:30
Marica
235fc127b3
fix: Fetch conversion factor even if it already existed in row, on item change ( #29917 )
...
* fix: Fetch conversion factor even if it already existed in row, on item change
* fix: Retain manually changed conversion factor
- If item code changes, reset conversion factor on client side
- Keep API behavious consistent, if conversion factor is sent, same must come back
- API should not ideally reset values in most cases
2022-02-22 12:53:46 +05:30
Rucha Mahabal
d011a3f82c
fix(Salary Slip): TypeError while clearing any amount field in components ( #29931 )
2022-02-22 11:41:09 +05:30
Rucha Mahabal
4738367d64
fix: boarding task dates not set when activity begins on is set to 0 ( #29921 )
2022-02-21 22:54:46 +05:30
Rucha Mahabal
87b59fc96c
fix(LMS): program enrollment does not give any feedback ( #29922 )
2022-02-21 22:53:29 +05:30
Deepesh Garg
0d8c24f488
Merge branch 'develop' of https://github.com/frappe/erpnext into loan_bank_reco
2022-02-21 22:22:02 +05:30
Sagar Sharma
e4c4dc402e
fix: JobCard TimeLog to_date ( #29872 )
2022-02-21 19:49:19 +05:30
Deepesh Garg
0c6835eab2
Merge pull request #29740 from deepeshgarg007/gross_profit_non_stock_item
...
fix: Multiple fixes in Gross Profit report
2022-02-21 19:28:55 +05:30
Ankush Menat
9661058cc7
fix: only set batchwise valuation flag if new batch
2022-02-21 19:04:10 +05:30
Ankush Menat
af9fa049c7
fix: batchwise valuation can only be used by FIFO/LIFO
2022-02-21 18:02:40 +05:30
Ankush Menat
75fb561698
test: force correct flag in test data
2022-02-21 18:02:40 +05:30
Ankush Menat
f38690f703
fix: check if Moving average item can use batchwise valuation
2022-02-21 18:02:40 +05:30
Ankush Menat
6b0bc35063
test: mixed moving average items
2022-02-21 18:02:40 +05:30
Ankush Menat
609d2fccad
fix: reset stock value if no qty
2022-02-21 18:02:40 +05:30
Ankush Menat
35483242b3
fix: extend round_off_if_near_zero fix to other methods
2022-02-21 18:02:40 +05:30
Ankush Menat
76b395d62e
test: old/new mix batches valuation consumption
2022-02-21 18:02:40 +05:30
Ankush Menat
b1555fd477
chore: batch flag and consumption rate in invariant report
2022-02-21 18:02:40 +05:30
Ankush Menat
b534fee2c7
refactor: use queue difference instead of actual values
2022-02-21 18:02:40 +05:30
Ankush Menat
aba7a7ce4e
fix: handle negative inventory inside a batch
2022-02-21 18:02:40 +05:30
Ankush Menat
d7ca83ef0b
refactor: code duplication for fallback rates
2022-02-21 18:02:40 +05:30
Ankush Menat
c5bd34d238
test: multi-batch stock entry
2022-02-21 18:02:40 +05:30
Ankush Menat
60b8bae85f
test: batch wise valuation for transfer and intermediate
2022-02-21 18:02:40 +05:30
Ankush Menat
5718777a2b
fix: consider batch_no when getting incoming rate
2022-02-21 18:02:40 +05:30
18alantom
683ef8a603
test: more tests for batchwise valuation
...
Co-Authored-By: Ankush Menat <ankush@frappe.io>
2022-02-21 18:02:40 +05:30
Ankush Menat
312db429e4
refactor: use qb for patching flag
2022-02-21 18:02:40 +05:30
Ankush Menat
d130233ffc
test: fix expected test failures
2022-02-21 18:02:40 +05:30
Ankush Menat
102fff24c8
refactor: convert query to QB and make creation optional
2022-02-21 18:02:40 +05:30
