Rucha Mahabal
e874149b94
Merge pull request #29335 from ruchamahabal/emp-adv-status
2022-03-01 22:36:04 +05:30
Rucha Mahabal
9988ec697f
test: test advance filters in expense claim and cancelled status
2022-03-01 21:40:39 +05:30
Rucha Mahabal
57f92df108
fix: flake8 issues
2022-03-01 20:50:36 +05:30
Rucha Mahabal
650099ee65
Merge branch 'develop' into emp-adv-status
2022-03-01 20:30:58 +05:30
Deepesh Garg
2eb7921bff
fix: Exchange rate not getting set in payment entry
...
(cherry picked from commit 86e6bdf2c9ffc0a656c14663b6f790071a7f3afd)
2022-03-01 12:49:09 +00:00
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
Marica
adeca5a25c
Merge pull request #28939 from marination/prod-plan-sub-items-aggregate
...
feat: Provision to aggregate subassembly items in production plan
2022-03-01 16:07:35 +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
1191232f02
Merge pull request #29977 from deepeshgarg007/payment_entry_total_taxes
...
fix: Total taxes and charges in payment entry for multi-currency payments
2022-02-28 19:09:39 +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
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
Saqib Ansari
cde711151e
Merge branch 'develop' into ordered-qty-for-packed-items
2022-02-28 11:35:42 +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
