marination
ffbb2c8311
fix: Assert False for test that is anticipating an empty table and remove second arg to assertTrue
2022-03-01 12:57:09 +05:30
marination
25fa6344a6
test: Adjust test as per teardown
...
- make tests use multi level bom in WO, as BOM at setup is used
- earlier, an intermediate BOM made in a test would override the BOM at setup
2022-03-01 12:24:45 +05:30
Marica
789e042f7d
Merge branch 'develop' into prod-plan-sub-items-aggregate
2022-02-28 17:38:29 +05:30
Marica
5fe8c48ba8
Merge branch 'develop' into prod-plan-sub-items-aggregate
2022-02-28 17:38:14 +05:30
Ankush Menat
829c453cb6
test: remove transaction commits from buying module
2022-02-28 17:36:58 +05:30
Ankush Menat
b0d1e6db54
test(refactor): use FrappeTestCase
2022-02-28 17:23:32 +05:30
marination
292fe370db
test: combine sub assembly items and make Production Plan tests atomic
2022-02-28 16:35:20 +05:30
Marica
b8593188f3
Merge branch 'develop' into prod-plan-sub-items-aggregate
2022-02-28 15:08:21 +05:30
Ankush Menat
1d1203d5ec
fix: dont fetch draft/cancelled BOMs
2022-02-28 13:14:16 +05:30
Ankush Menat
3cc47d5ba5
fix: correct fieldname for source warehouse
2022-02-28 13:06:56 +05:30
Ankush Menat
0bed592777
fix: open stock entry instead of submitting from item dashboard
2022-02-28 13:06:56 +05:30
Ankush Menat
88a21ca7d2
fix: only show child warehouses for transfer
2022-02-28 13:06:56 +05:30
Deepesh Garg
0624b7f1ab
Merge pull request #29978 from deepeshgarg007/grant_commission_check
...
fix: Commission not applied while making Sales Order from Quotation
2022-02-28 13:04:18 +05:30
Deepesh Garg
1b186682ea
Merge branch 'develop' of https://github.com/frappe/erpnext into grant_commission_check
2022-02-28 12:42:21 +05:30
Deepesh Garg
4e9a9f35a6
test: add correct test case
2022-02-28 12:41:59 +05:30
Deepesh Garg
83ad8f9caa
Merge pull request #29928 from deepeshgarg007/psoa_account_filter
...
fix: Account filter in PSOA
2022-02-28 11:41:50 +05:30
Rucha Mahabal
85aad52378
Merge pull request #29151 from ChillarAnand/remove-nonprofit
2022-02-28 10:43:20 +05:30
Rucha Mahabal
a891c426b5
Merge branch 'develop' into remove-nonprofit
2022-02-28 09:50:45 +05:30
Deepesh Garg
bfa9bfd39f
Merge branch 'develop' into psoa_account_filter
2022-02-28 09:28:26 +05:30
Deepesh Garg
955d5afeff
Merge pull request #29995 from deepeshgarg007/missing_pos_invoice_json
...
fix: Regional print format addition
2022-02-28 09:28:06 +05:30
Deepesh Garg
6a4975f9f1
Merge branch 'develop' into missing_pos_invoice_json
2022-02-28 08:40:48 +05:30
mergify[bot]
96e87fe3c9
fix: validate Work Order qty against Production Plan ( #29721 ) ( #30003 )
...
* fix: validate Work Order qty against Production Plan
* chore: err msg when max_qty is 0
* test: add test for overproduction
* fix: CI
(cherry picked from commit 067ede76ea0851a29e270e150f482368e0afa194)
Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
2022-02-26 12:54:13 +05:30
Rushabh Mehta
0c7037f004
Merge pull request #30004 from rmehta/student-attendance-fix
...
fix(minor): student attendance tool query fix
2022-02-26 11:34:14 +05:30
Rushabh Mehta
2dabda03af
fix(minor): student_attendance_tool.js fix fetching UX
2022-02-26 11:32:54 +05:30
Sagar Sharma
77ffcd3aed
fix(ux): make "allow zero valuation rate" readonly if "s_warehouse" is set ( #29681 )
...
* chore: make allow zero valuation rate readonly if s_warehouse is set
* fix: setting the checkbox to zero whenever the source warehouse is set
* fix: remove allow_on_submit and refresh trigger
Co-authored-by: Ankush Menat <ankush@frappe.io>
2022-02-26 11:25:02 +05:30
Rushabh Mehta
1e7df5d0c2
fix(minor): student attendance tool query fix
2022-02-26 11:07:44 +05:30
Rucha Mahabal
71d33081aa
fix: org chart connectors not rendered when Employee Naming is set to Full Name ( #29997 )
2022-02-25 23:01:32 +05:30
Deepesh Garg
4f46394399
fix: Add parent to department
2022-02-25 21:18:22 +05:30
Deepesh Garg
3e573e9838
fix: Condition
2022-02-25 17:18:53 +05:30
Deepesh Garg
36c76c4035
fix: Failing setup wizard test
2022-02-25 17:15:57 +05:30
Deepesh Garg
fe2ced7bee
fix: Regional print format addition
2022-02-25 16:57:59 +05:30
Marica
e8e9bc4daa
Merge pull request #29733 from dj12djdjs/fix-user-unique-cart
...
fix(e-commerce): Unique Shopping Cart Per Logged In User
2022-02-25 16:35:14 +05:30
Deepesh Garg
5464ba6430
Merge branch 'develop' into psoa_account_filter
2022-02-25 15:55:06 +05:30
Deepesh Garg
25edc700bd
Merge pull request #29974 from deepeshgarg007/abbr_check
...
fix: Make abbreviation limit to 10
2022-02-25 15:52:51 +05:30
Saqib Ansari
dd566a68f1
Merge pull request #29991 from nextchamp-saqib/fix-pos-mop
...
fix(pos): minor fixes
2022-02-25 15:35:24 +05:30
Saqib Ansari
81514516f3
fix(pos): coupon code is applied even if ignore pricing rule is check
2022-02-25 15:18:06 +05:30
Saqib Ansari
69c34cd7ae
fix(pos): mode of payment disappears after save
2022-02-25 14:36:29 +05:30
Rucha Mahabal
04b9091821
fix: web form deletion
2022-02-24 18:10:29 +05:30
Rucha Mahabal
761e528ba3
fix: deprecation warning
2022-02-24 17:57:39 +05:30
Rucha Mahabal
d647de3782
Merge branch 'develop' into remove-nonprofit
2022-02-24 17:03:52 +05:30
marination
6d72aa377f
feat: Combine Sub-assembly items in Production Plan
...
- Combine subassembly rows if same Item, Warehouse, Inhouse/Outhouse Manu.g, BOM No.
2022-02-24 15:20:18 +05:30
Deepesh Garg
0373914704
fix: Commission not applied while making Sales Order from Quotation
2022-02-24 14:42:56 +05:30
Deepesh Garg
239733acd1
fix: Make abbreviation limit to 10
2022-02-23 20:41:49 +05:30
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
