Ankush Menat
65bb727030
fix: dont validate empty category
2022-03-01 17:47:47 +05:30
marination
ac425722e2
fix: Sider and Linter
2022-03-01 17:30:37 +05:30
marination
e6952cb7f9
refactor: Convert to QB, added test file, removed white space
...
- Converted mysql raw query to qb
- Test file for Report Requested Items to Order and Receive
- Removed white space and edited copyright year
2022-03-01 17:15:04 +05:30
marination
1d1d586d4d
test: Included sub assembly non-merging in test case
2022-03-01 15:42:34 +05:30
Marica
d2f1c4f307
Merge branch 'develop' into prod-plan-sub-items-aggregate
2022-03-01 15:33:02 +05:30
Saqib Ansari
056a0ec421
Merge pull request #30034 from nextchamp-saqib/fix-pos-flaky-test
...
fix(test): flaky test_point_of_sale
2022-03-01 15:32:33 +05:30
Saqib Ansari
47fe87a72f
fix(test): flaky test_point_of_sale
2022-03-01 14:56:24 +05:30
Saqib Ansari
6b494eed79
Merge pull request #30032 from nextchamp-saqib/fix-debit-credit-diff
...
fix: debit credit difference case with rounding adjustment
2022-03-01 14:12:31 +05:30
Saqib Ansari
ad2c64f3ff
fix: debit credit difference case with rounding adjustment
2022-03-01 13:32:34 +05:30
Ankush Menat
d22a1d440c
fix: track changes on warehouse
2022-03-01 13:08:25 +05:30
Marica
5a8c80b153
Merge branch 'develop' into mr-to-order-and-receive-report
2022-03-01 13:01:35 +05:30
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
Deepesh Garg
0542416c47
Merge pull request #30026 from deepeshgarg007/deferred_revenue_post_accounts_freeze
...
fix: Deferred revenue booking
2022-03-01 12:41:41 +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
Deepesh Garg
366120ffee
fix: Deferred revenue booking
2022-03-01 11:57:34 +05:30
Ankush Menat
afb69b0b7f
Merge branch 'develop' into item_discounts_quotation
2022-03-01 11:49:25 +05:30
Ankush Menat
bbc4710fa3
fix: apply margin on duplicated doc too
2022-03-01 11:48:28 +05:30
Rushabh Mehta
4e2c284be7
fix(minor): nix the ugly banner
2022-03-01 08:52:42 +05:30
Deepesh Garg
785fcca957
Merge branch 'develop' of https://github.com/frappe/erpnext into payment_entry_total_taxes
2022-02-28 18:06:14 +05:30
Deepesh Garg
19fb7ead9f
test: Add test case for payment entry taxes
2022-02-28 18:05:58 +05:30
rohitwaghchaure
bbfff1b795
Merge pull request #30015 from rohitwaghchaure/removed-validation-for-zero-qty
...
refactor: removed validation to check zero qty
2022-02-28 17:54:26 +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
Rohit Waghchaure
39d3f20d9b
fix: removed validation to check zero qty
2022-02-28 14:29:07 +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
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
Saqib Ansari
cde711151e
Merge branch 'develop' into ordered-qty-for-packed-items
2022-02-28 11:35:42 +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
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
hrzzz
16de29a3cb
fix(translation) - correction for translation
2022-02-25 16:56:23 -03:00
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
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
marination
d3b0ca30c6
fix: Get MRs that are yet to be received but fully ordered in Report
...
- Remove incorrect query clause that only check if ordered qty < 100
- MR should be visible in report until fully received (cycle complete)
2022-02-25 12:10:11 +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
Saqib Ansari
2f1709dfef
chore: remove unintentional search index
2022-02-24 15:12:35 +05:30
Saqib Ansari
1e139cf9a1
chore: remove unintentional search index
2022-02-24 15:12:12 +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
b1a46c80d5
fix: Total taxes and charges in payment entry for multicurrency payments
2022-02-24 13:11:17 +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
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
aaa84a21ba
fix: Email translations
2022-02-23 10:54:44 +05:30
Saqib Ansari
8743e39469
fix: sider
...
(cherry picked from commit bc28755978c17d7e85cdc5ffd4a45a629183e2c8)
2022-02-23 03:55:49 +00:00
Saqib Ansari
3dcc3a349e
fix: cannot edit valutaion_rate in asset repair
...
(cherry picked from commit 2aba6c38b36e5fce373800eb129a93eb010c691f)
2022-02-23 03:55:49 +00:00
Saqib Ansari
414c3b8dd2
fix: remove redundant method
...
(cherry picked from commit 57d5a027fb929803ffd62463da3e5b4611b17ff4)
2022-02-23 03:55:48 +00:00
GangaManoj
5d3b65b944
fix: Pass value instead of array
...
(cherry picked from commit e1a9b61103e27099696ae4b186a6575b28c16b06)
2022-02-23 03:55:48 +00:00
GangaManoj
3d6ed4ebde
fix: Fetch valuation rate
...
(cherry picked from commit df71907be453a481a43d2c62a5c076602ab8af07)
2022-02-23 03:55:48 +00:00
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
Saqib Ansari
3ee1383802
Merge branch 'develop' into ordered-qty-for-packed-items
2022-02-22 18:45:31 +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
Deepesh Garg
3a547cb0d9
fix: Item discounts for quotation
2022-02-22 16:25:32 +05:30
Saqib Ansari
8e3f1e306d
test: po updates packed item's ordered_qty
2022-02-22 15:34:26 +05:30
Saqib Ansari
8005fee656
feat: update ordered qty for packed items
2022-02-22 15:06:19 +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
Deepesh Garg
70b960e650
fix: Account filter in PSOA
2022-02-22 09:16:08 +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
