rohitwaghchaure
|
8156cb4db0
|
Merge pull request #33490 from frappe/mergify/bp/version-13-hotfix/pr-33487
Revert "fix: daily scheduler to identify and fix stock transfer entries having incorrect valuation" (backport #33487)
|
2022-12-30 16:13:20 +05:30 |
|
rohitwaghchaure
|
f0475e9cc5
|
fix: linter
|
2022-12-30 15:32:38 +05:30 |
|
ruthra kumar
|
b2333d3b5f
|
Merge pull request #33483 from ruthra-kumar/debit_note_not_pulled_in_reconciliation_tool
fix: debit note not pulled on reconciliation tool
|
2022-12-30 15:02:49 +05:30 |
|
rohitwaghchaure
|
8521e12753
|
fix: conflicts
|
2022-12-30 14:35:12 +05:30 |
|
rohitwaghchaure
|
1c7c591ee2
|
fix: conflicts
|
2022-12-30 14:30:35 +05:30 |
|
rohitwaghchaure
|
c18a451362
|
fix: conflicts
|
2022-12-30 14:28:18 +05:30 |
|
rohitwaghchaure
|
529fb411ab
|
Revert "fix: daily scheduler to identify and fix stock transfer entries having incorrect valuation"
(cherry picked from commit 728dc1acf4)
# Conflicts:
# erpnext/hooks.py
# erpnext/stock/doctype/stock_entry/stock_entry.py
# erpnext/stock/doctype/stock_entry/test_stock_entry.py
|
2022-12-30 08:51:54 +00:00 |
|
ruthra kumar
|
4acaa3eecf
|
Merge pull request #33475 from frappe/mergify/bp/version-13-hotfix/pr-33457
fix: use base_net_amount in case of missing stock qty (backport #33457)
|
2022-12-30 13:39:54 +05:30 |
|
ruthra kumar
|
cf133b2f1c
|
fix: debit note not pulled on reconciliation tool
|
2022-12-29 18:02:16 +05:30 |
|
ruthra kumar
|
92c895aa1c
|
Merge pull request #33460 from frappe/mergify/bp/version-13-hotfix/pr-33380
fix: ERR journals should be reported in AR/AP (backport #33380)
|
2022-12-29 11:27:05 +05:30 |
|
ruthra kumar
|
ec15965a6c
|
test: err for party should be in AR/AP report
(cherry picked from commit 2ed86760d7)
|
2022-12-29 10:53:55 +05:30 |
|
ruthra kumar
|
c850635551
|
fix: ERR journals reported in AR/AP
Exchange Rate Revaluation on Receivable/Payable will included in AR/AP report
(cherry picked from commit b09eade3e4)
|
2022-12-29 10:53:07 +05:30 |
|
ruthra kumar
|
5ec11bad4f
|
fix: reconciled credit notes being fetched again in Payment Reconciliation tool (#33471)
fix: reconciled cr note showing up as Payments
|
2022-12-29 10:31:06 +05:30 |
|
ruthra kumar
|
6e363a62db
|
fix: use base_net_amount in case of missing stock qty (#33457)
(cherry picked from commit e3a0ce5d63)
|
2022-12-29 04:05:54 +00:00 |
|
Deepesh Garg
|
334219e36a
|
fix: Tax withheld vouchers naming rule (#33467)
|
2022-12-28 18:05:24 +05:30 |
|
Saurabh
|
79643a5716
|
chore: linter (#33455)
fix: linter
|
2022-12-27 17:49:38 +05:30 |
|
Sagar Sharma
|
707eb9e8d5
|
Merge pull request #33446 from frappe/mergify/bp/version-13-hotfix/pr-33437
fix: `shipping_address` in PO for non-drop ship item (backport #33437)
|
2022-12-27 10:16:50 +05:30 |
|
s-aga-r
|
19feebbcb6
|
fix: shipping_address for non-drop shipping item
(cherry picked from commit 67a7ccf3ce)
|
2022-12-26 15:51:49 +00:00 |
|
Nabin Hait
|
0cf9702a21
|
Merge pull request #33412 from saurabh6790/provision-to-set-earnings-and-deductions-till-date
feat: provision to setup opening balances for earnings and deductions while creating SSA
|
2022-12-26 17:26:35 +05:30 |
|
Saurabh
|
64454e0d4e
|
fix: provision to set tax_deducted_till_date after document is subnmmited
|
2022-12-26 12:48:37 +05:30 |
|
Saurabh
|
7b813d6045
|
fix: patch
|
2022-12-26 12:22:34 +05:30 |
|
Saurabh
|
bc04e05b46
|
fix: use get_all instead of get_value as get_value api dont supports between condition
|
2022-12-26 12:09:03 +05:30 |
|
Saurabh
|
c3b9059c1b
|
feat: provision to setup opening balances for earnings and deductions while creating SSA
|
2022-12-26 12:09:03 +05:30 |
|
Sagar Sharma
|
7f1574478b
|
Merge pull request #33436 from frappe/mergify/bp/version-13-hotfix/pr-33434
fix(ux): `shipping_address` in PO (backport #33434)
|
2022-12-26 11:19:01 +05:30 |
|
Sagar Sharma
|
b634e44fac
|
Merge branch 'version-13-hotfix' into mergify/bp/version-13-hotfix/pr-33434
|
2022-12-26 10:49:48 +05:30 |
|
mergify[bot]
|
3aa335d36a
|
refactor: Customer and Supplier Ledger summary will have hidden fields for better handling of user permission (#33432)
|
2022-12-26 10:12:35 +05:30 |
|
s-aga-r
|
820e82265b
|
chore: linter
|
2022-12-25 21:46:58 +05:30 |
|
s-aga-r
|
91dad909ec
|
chore: conflicts
|
2022-12-25 21:40:49 +05:30 |
|
s-aga-r
|
1068d0ec63
|
fix: shipping_address in PO
(cherry picked from commit 7e1b6b3c2a)
# Conflicts:
# erpnext/buying/doctype/purchase_order/purchase_order.json
|
2022-12-25 14:11:23 +00:00 |
|
ruthra kumar
|
ae3581c7d0
|
Merge pull request #33416 from frappe/mergify/bp/version-13-hotfix/pr-32219
fix: No permission to read doctype (backport #32219)
|
2022-12-24 07:34:39 +05:30 |
|
ruthra kumar
|
7a97cc4629
|
Merge pull request #33413 from frappe/mergify/bp/version-13-hotfix/pr-33410
fix: TypeError on GP Report due to multiple warehouse on bundled items (backport #33410)
|
2022-12-22 12:06:55 +05:30 |
|
Nabin Hait
|
8e1c0cd234
|
fix: No permission to read doctype
(cherry picked from commit c0da948a4e)
|
2022-12-22 04:12:14 +00:00 |
|
ruthra kumar
|
d58719a30a
|
test: type error on bundled products with different warehouses
(cherry picked from commit 5918bb03f7)
|
2022-12-21 12:58:15 +00:00 |
|
ruthra kumar
|
6a394c5be7
|
fix: typerror on multi warehouse in Packed Items
DN(with bundled item with varying warehouses)-> Sales Invoice.
(cherry picked from commit e684eb32d0)
|
2022-12-21 12:58:13 +00:00 |
|
Deepesh Garg
|
3691eec66c
|
Merge pull request #33401 from frappe/mergify/bp/version-13-hotfix/pr-33393
fix: Cost center filter not working in cash flow report (backport #33393)
|
2022-12-20 18:22:46 +05:30 |
|
rohitwaghchaure
|
e93af962a1
|
Merge pull request #33390 from frappe/mergify/bp/version-13-hotfix/pr-33387
fix: daily scheduler to identify and fix stock transfer entries having incorrect valuation (backport #33387)
|
2022-12-20 16:59:58 +05:30 |
|
rohitwaghchaure
|
9692eeeb15
|
Merge pull request #33392 from frappe/mergify/bp/version-13-hotfix/pr-33382
fix: unsupported operand type(s) for +=: 'int' and 'NoneType' (backport #33382)
|
2022-12-20 16:59:40 +05:30 |
|
Deepesh Garg
|
7825c564eb
|
fix: Consolidated financial report
|
2022-12-20 16:52:28 +05:30 |
|
Deepesh Garg
|
e5fd95bb21
|
chore: remove print statement
(cherry picked from commit 068df9f815)
|
2022-12-20 08:17:21 +00:00 |
|
Deepesh Garg
|
684a45f234
|
fix: Cost center filter not working in cash flow report
(cherry picked from commit d0dbfec052)
|
2022-12-20 08:17:20 +00:00 |
|
rohitwaghchaure
|
7ef0c6bb01
|
fix: conflict
|
2022-12-20 11:55:22 +05:30 |
|
rohitwaghchaure
|
4587bb3767
|
fix: conflict in stock_entry
|
2022-12-20 11:52:33 +05:30 |
|
rohitwaghchaure
|
2a18067aad
|
fix: conflict in hooks file
|
2022-12-20 11:49:22 +05:30 |
|
Rohit Waghchaure
|
b573d9739f
|
fix: unsupported operand type(s) for +=: 'int' and 'NoneType'
(cherry picked from commit 2b4eae5f84)
|
2022-12-20 04:19:14 +00:00 |
|
Rohit Waghchaure
|
4dbce87660
|
test: added test case to validate audit for incorrect entries
(cherry picked from commit f31612376a)
# Conflicts:
# erpnext/hooks.py
# erpnext/stock/doctype/stock_entry/test_stock_entry.py
|
2022-12-20 04:18:19 +00:00 |
|
Rohit Waghchaure
|
b82154cb9e
|
fix: daily scheduler to identify and fix stock transfer entries having incorrect valuation
(cherry picked from commit b1721b79ce)
# Conflicts:
# erpnext/stock/doctype/stock_entry/stock_entry.py
|
2022-12-20 04:18:18 +00:00 |
|
Deepesh Garg
|
2105193594
|
Merge pull request #33367 from ruthra-kumar/using_subquery_for_fetching_dr_cr_notes
perf: using subquery in get_dr_or_cr_notes() to improve performance
|
2022-12-17 16:41:58 +05:30 |
|
Deepesh Garg
|
ef74c6689b
|
Merge pull request #33360 from frappe/mergify/bp/version-13-hotfix/pr-33355
fix: disabled items showing in the report Itemwise Recommended Reorder Level (backport #33355)
|
2022-12-16 16:12:29 +05:30 |
|
ruthra kumar
|
799d7b254e
|
refactor: using subquery in get_dr_or_cr_notes to improve performance
|
2022-12-16 14:06:05 +05:30 |
|
rohitwaghchaure
|
086e74791b
|
fix: conflicts
|
2022-12-16 11:41:22 +05:30 |
|