Deepesh Garg
|
c6c51d7312
|
Merge branch 'develop' into gstr_3b_nil_exempt_fixed
|
2022-03-06 18:09:38 +05:30 |
|
Deepesh Garg
|
629a296fb6
|
Merge branch 'develop' into bank_reco_multicurrency_fix
|
2022-03-06 18:09:30 +05:30 |
|
Deepesh Garg
|
428415ed55
|
Merge pull request #30040 from frappe/mergify/bp/develop/pr-30025
fix: Exchange rate not getting set in payment entry (backport #30025)
|
2022-03-06 18:07:35 +05:30 |
|
Ankush Menat
|
9ef35ef773
|
fix: dont hardcode precision in routing
Co-Authored-By: Suraj Shetty <surajshetty3416@gmail.com>
|
2022-03-02 18:27:22 +05:30 |
|
Ankush Menat
|
f8ac4c082a
|
fix: remove dead dashboard links
|
2022-03-02 18:27:22 +05:30 |
|
Saqib Ansari
|
cd2513ceec
|
Merge pull request #29939 from nextchamp-saqib/ordered-qty-for-packed-items
feat: update ordered qty for packed items
|
2022-03-02 17:10:20 +05:30 |
|
Ankush Menat
|
55a966ec41
|
chore: get stock reco qty from SR instead of SLE (#30059)
[skip ci]
|
2022-03-02 14:49:45 +05:30 |
|
Rucha Mahabal
|
b988046082
|
fix(Timesheet): fetch exchange rate only if currency is set (#30057)
|
2022-03-02 14:15:22 +05:30 |
|
Ankush Menat
|
90af40ac3c
|
Merge pull request #30055 from resilient-tech/fix-install-fixtures
fix: handle `ImportError` when installing country fixtures
|
2022-03-02 14:11:23 +05:30 |
|
Ankush Menat
|
3638fbf06b
|
fix: repost items with repeating item-warehouses
|
2022-03-02 13:11:04 +05:30 |
|
Ankush Menat
|
701878f60b
|
revert "fix: FIFO valuation in case of multi-item entries"
This reverts commit b8ee193d1a124668691b3d8181ce4e3bf612afe0.
This is huge performance regression for large docs.
|
2022-03-02 13:11:04 +05:30 |
|
Ankush Menat
|
2f71c5bcca
|
test: repack FIFO rates
|
2022-03-02 13:11:04 +05:30 |
|
Ankush Menat
|
ccd2ce56b1
|
fix: FIFO valuation in case of multi-item entries
|
2022-03-02 13:11:04 +05:30 |
|
Ankush Menat
|
b3b7cdfb49
|
test: FIFO transfer for multi-batch transaction
|
2022-03-02 13:11:04 +05:30 |
|
marination
|
54b3676f35
|
fix: linter (imports alphabetical)
|
2022-03-02 13:09:34 +05:30 |
|
Sagar Vora
|
89368ece41
|
style: use f-string
|
2022-03-02 12:40:25 +05:30 |
|
Sagar Vora
|
98f26e9cbb
|
fix: handle ImportError when installing country fixtures
|
2022-03-02 12:39:00 +05:30 |
|
Ankush Menat
|
5d85b35f41
|
test: fix flaky bin value test
|
2022-03-02 12:32:54 +05:30 |
|
Ankush Menat
|
eb8495a401
|
docs: explain make_sl_entries arguments
|
2022-03-02 12:27:18 +05:30 |
|
Ankush Menat
|
efc4b943f8
|
fix: ignore serial no during landed cost voucher
|
2022-03-02 12:27:18 +05:30 |
|
Marica
|
e0d5c6118f
|
Merge branch 'develop' into mr-to-order-and-receive-report
|
2022-03-02 12:14:50 +05:30 |
|
Saqib Ansari
|
89f87cee87
|
Merge branch 'develop' into ordered-qty-for-packed-items
|
2022-03-02 12:13:56 +05:30 |
|
Deepesh Garg
|
d95f8934aa
|
fix: Test cases with discount
|
2022-03-01 23:09:59 +05:30 |
|
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 |
|
Deepesh Garg
|
abe580e8b0
|
fix: Nil and Exempted values in GSTR-3B Report
|
2022-03-01 17:37:38 +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 |
|