Deepesh Garg
|
8819ba07a9
|
Merge pull request #30266 from deepeshgarg007/expense_income_account_validation
fix: Validate income/expense account in sales and purchase invoice
|
2022-03-17 18:32:34 +05:30 |
|
Deepesh Garg
|
5390d5e65a
|
Merge branch 'develop' into mergify/bp/develop/pr-30284
|
2022-03-17 18:02:57 +05:30 |
|
Deepesh Garg
|
4237e5d928
|
fix: Test case
|
2022-03-17 18:00:39 +05:30 |
|
Deepesh Garg
|
a651a0ffc8
|
Merge pull request #30261 from deepeshgarg007/bank_reco_error
fix: Error in bank reconciliation statement
|
2022-03-17 17:29:15 +05:30 |
|
Deepesh Garg
|
5f89cb2cca
|
fix: Remove comments
(cherry picked from commit cab69fe1f298b44613be21c06591e868c24ee249)
|
2022-03-17 11:57:50 +00:00 |
|
Deepesh Garg
|
2dd0e20003
|
fix: Clean and fixes in Dimension-wise Accounts Balance Report
(cherry picked from commit 08a06ce5c68023c41f53b584082b5e1c4ddb1f59)
|
2022-03-17 11:57:50 +00:00 |
|
Saqib Ansari
|
119273e633
|
fix: custom cash flow mapper doesn't show any data
|
2022-03-17 14:47:50 +05:30 |
|
Ankush Menat
|
b781e8b7d1
|
revert: "fix: updated packed_items getting fetched on Sales Return / Credit Note (#28607)"
This reverts commit 20216fa9f1.
|
2022-03-16 13:36:53 +05:30 |
|
Deepesh Garg
|
2958f60b46
|
Merge pull request #30269 from deepeshgarg007/implicit_pricing_rule_enable_v2
fix: Do not update ignore pricing rule check implicitly
|
2022-03-16 12:32:25 +05:30 |
|
Deepesh Garg
|
1f79b47a17
|
fix: Do not update ignore prcing rule check implicitly
|
2022-03-16 11:55:43 +05:30 |
|
Deepesh Garg
|
06936cf1c0
|
fix: Validate income/expense account in sales and purchase invoice
|
2022-03-16 09:02:04 +05:30 |
|
Saqib Ansari
|
1797b6013e
|
Merge pull request #30244 from nextchamp-saqib/fix-gl-representation
fix: incorrect debit credit amount in presentation currency
|
2022-03-15 18:39:37 +05:30 |
|
Deepesh Garg
|
fbcb413d96
|
fix: Error in bank reco statement
|
2022-03-15 18:20:11 +05:30 |
|
Saqib Ansari
|
12d99ed69a
|
test: foreign_account_balance_after_exchange_rate_revaluation
|
2022-03-15 17:56:42 +05:30 |
|
Saqib Ansari
|
7b0a97d679
|
fix(pos): loyalty points in case of returned pos invoice (#30242)
|
2022-03-15 15:54:37 +05:30 |
|
Saqib Ansari
|
83a5fae591
|
fix: incorrect debit credit amount in presentation currency
|
2022-03-14 20:14:46 +05:30 |
|
Deepesh Garg
|
25a128220a
|
Merge pull request #30207 from deepeshgarg007/trail_balance_for_party
fix: Do not consider cancelled entries
|
2022-03-14 17:19:34 +05:30 |
|
Saqib Ansari
|
935218598a
|
Merge pull request #30198 from nextchamp-saqib/pos-fixes-#12
fix(pos): do not reset mode of payments in case of consolidation
|
2022-03-14 12:34:40 +05:30 |
|
Saqib Ansari
|
2e265d9bf6
|
test: mode of payments in case of consolidation
|
2022-03-14 11:02:33 +05:30 |
|
Deepesh Garg
|
835c029e53
|
Merge pull request #29979 from deepeshgarg007/bank_reco_multicurrency_fix
fix: Multi-currency bank reconciliation fixes
|
2022-03-13 20:27:04 +05:30 |
|
Ankush Menat
|
1a256c62c4
|
fix: attach sr no si standalone credit note
|
2022-03-13 19:00:34 +05:30 |
|
Ankush Menat
|
1c37d2711a
|
test: standalone SI creates and attaches serial nos
|
2022-03-13 19:00:34 +05:30 |
|
Deepesh Garg
|
6308e1be91
|
fix: Do not consider cancelled entries
|
2022-03-13 18:13:12 +05:30 |
|
mergify[bot]
|
b085e96a12
|
revert: "Merge pull request #29290 from s-aga-r/fix/delivery-note/billed-amount" (#29782) (#29807)
* Revert "Merge pull request #29290 from s-aga-r/fix/delivery-note/billed-amount"
This reverts commit 038f94955006c88209f9df28e3a785c59a4ddb28, reversing
changes made to c7b491843476bca89be02851ccafb7e409876609.
* fix: linter
(cherry picked from commit 7fa46f77e0bdbc516b3c0cb0fb20594ee7fa398b)
# Conflicts:
# erpnext/patches.txt
Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
|
2022-03-11 18:28:50 +05:30 |
|
Deepesh Garg
|
13dce71c21
|
Merge pull request #30181 from deepeshgarg007/shipping_rule_application
fix: Shipping rule application fixes
|
2022-03-11 12:04:12 +05:30 |
|
Deepesh Garg
|
d596e0e4df
|
fix: Shipping rule application fixes
|
2022-03-10 20:56:36 +05:30 |
|
Saqib Ansari
|
e5fb871ef4
|
fix: Ignore missing customer group while fetching price list
|
2022-03-10 13:54:43 +05:30 |
|
Saqib Ansari
|
9dc9758522
|
Merge branch 'develop' of https://github.com/frappe/erpnext into party
|
2022-03-10 13:51:36 +05:30 |
|
Saqib Ansari
|
8021572432
|
Merge branch 'develop' into fix-psoa-template
|
2022-03-10 12:17:11 +05:30 |
|
Saqib Ansari
|
5d5ae16fe5
|
fix(psoa): no such element: dict object['account']
|
2022-03-10 11:12:33 +05:30 |
|
Saqib Ansari
|
45c1d83ea1
|
Merge pull request #30145 from nextchamp-saqib/add-filter-to-psoa
fix(psoa): add company filter to account
|
2022-03-10 10:53:52 +05:30 |
|
Saqib Ansari
|
fc42041f8f
|
fix(psoa): add company filter to account
|
2022-03-09 18:04:35 +05:30 |
|
Deepesh Garg
|
9b8258479c
|
fix: Update timestamp
|
2022-03-09 15:43:26 +05:30 |
|
Deepesh Garg
|
8a2fe7a2e3
|
fix: Remove tax invoice no field
|
2022-03-09 15:42:06 +05:30 |
|
Deepesh Garg
|
e192956520
|
Merge pull request #30096 from deepeshgarg007/debit_note_ux
fix(ux): Improve label for better understanding
|
2022-03-09 15:34:11 +05:30 |
|
Chillar Anand
|
282e9f83b9
|
Merge branch 'develop' into party
|
2022-03-08 09:53:03 +05:30 |
|
ChillarAnand
|
9ace7d606c
|
fix: Ignore missing customer group while fetching price list
|
2022-03-08 08:44:48 +05:30 |
|
Saqib Ansari
|
a13624d78b
|
Merge branch 'develop' into fix-pos-round-off
|
2022-03-07 18:24:13 +05:30 |
|
Saqib Ansari
|
17445c7e04
|
fix(pos): multiple pos round off cases
|
2022-03-07 18:01:07 +05:30 |
|
Deepesh Garg
|
f3a95d3c27
|
fix(ux): Improve label for better understanding
|
2022-03-07 16:10:26 +05:30 |
|
Deepesh Garg
|
629a296fb6
|
Merge branch 'develop' into bank_reco_multicurrency_fix
|
2022-03-06 18:09:30 +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 |
|
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 |
|
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 |
|
Deepesh Garg
|
366120ffee
|
fix: Deferred revenue booking
|
2022-03-01 11:57:34 +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 |
|
Ankush Menat
|
b0d1e6db54
|
test(refactor): use FrappeTestCase
|
2022-02-28 17:23:32 +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
|
a891c426b5
|
Merge branch 'develop' into remove-nonprofit
|
2022-02-28 09:50:45 +05:30 |
|
Deepesh Garg
|
5464ba6430
|
Merge branch 'develop' into psoa_account_filter
|
2022-02-25 15:55:06 +05:30 |
|
Saqib Ansari
|
69c34cd7ae
|
fix(pos): mode of payment disappears after save
|
2022-02-25 14:36:29 +05:30 |
|
Rucha Mahabal
|
d647de3782
|
Merge branch 'develop' into remove-nonprofit
|
2022-02-24 17:03:52 +05:30 |
|
Deepesh Garg
|
cbb5ffb6fe
|
fix: Multi-currency bank reconciliation fixes
|
2022-02-24 15:58: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 |
|
Ankush Menat
|
b44cead317
|
test: fix flaky stateful tests (#29749)
Co-Authored-By: Marica <maricadsouza221197@gmail.com>
|
2022-02-23 16:17:41 +05:30 |
|
Ankush Menat
|
9c7df2eec5
|
fix: ignore duplicates explicitly
|
2022-02-23 14:27:45 +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 |
|
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 |
|
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 |
|
Deepesh Garg
|
70b960e650
|
fix: Account filter in PSOA
|
2022-02-22 09:16:08 +05:30 |
|
Deepesh Garg
|
0d8c24f488
|
Merge branch 'develop' of https://github.com/frappe/erpnext into loan_bank_reco
|
2022-02-21 22:22:02 +05:30 |
|
Deepesh Garg
|
a4c6cb9f12
|
fix: Remove print statements
|
2022-02-21 17:08:25 +05:30 |
|
Deepesh Garg
|
b7c388976d
|
Merge branch 'develop' of https://github.com/frappe/erpnext into loan_bank_reco
|
2022-02-21 16:58:52 +05:30 |
|
Deepesh Garg
|
6bf7bd6a9f
|
Merge branch 'develop' into gross_profit_non_stock_item
|
2022-02-21 16:56:49 +05:30 |
|
Deepesh Garg
|
40a45a3139
|
Merge pull request #29907 from deepeshgarg007/tds_payable_total_amount
fix: Total Credit amount in TDS Payable monthly report
|
2022-02-21 15:33:58 +05:30 |
|
Ankush Menat
|
afc81351b7
|
test: only test erpnext doctypes
Co-authored-by: gavin <gavin18d@gmail.com>
|
2022-02-21 15:32:28 +05:30 |
|
Ankush Menat
|
3a5dbfab50
|
fix: make cashflow mapping template child doctype
|
2022-02-21 15:32:28 +05:30 |
|
Deepesh Garg
|
a82cf7214e
|
fix: Total Credit amount in TDS Payable monthly report
|
2022-02-21 13:58:56 +05:30 |
|
Deepesh Garg
|
e13d774e8e
|
Merge branch 'develop' into gross_profit_non_stock_item
|
2022-02-21 12:34:14 +05:30 |
|
Deepesh Garg
|
0b5e618e3a
|
fix: Update bank reconciliation statement
|
2022-02-21 11:46:44 +05:30 |
|
Deepesh Garg
|
295cbb0ff2
|
fix: Update queries in Bank Reconciliation Tool
|
2022-02-21 11:45:23 +05:30 |
|
Deepesh Garg
|
5a2b571aa9
|
fix: Validate party account with company
|
2022-02-18 20:05:49 +05:30 |
|
Deepesh Garg
|
8b3d9088df
|
Merge branch 'develop' into consolidated_financial_statment_error
|
2022-02-17 23:32:50 +05:30 |
|
Deepesh Garg
|
555b1335f6
|
feat: Bank Reconciliation for loan documents
|
2022-02-17 19:15:30 +05:30 |
|
ChillarAnand
|
b3d4465db6
|
Merge branch 'develop' into remove-nonprofit
|
2022-02-17 15:30:11 +05:30 |
|
Saqib Ansari
|
680f8c4dc2
|
Merge pull request #29848 from nextchamp-saqib/fix-brt-currency
fix: currency in bank reconciliation tool
|
2022-02-17 14:27:07 +05:30 |
|
Saqib Ansari
|
60674e52b8
|
fix: currency in bank reconciliation tool
|
2022-02-17 14:19:42 +05:30 |
|
ChillarAnand
|
db1957ffe6
|
Merge branch 'develop' into remove-nonprofit
|
2022-02-17 13:00:58 +05:30 |
|
Deepesh Garg
|
4a33cdab34
|
Merge pull request #29791 from deepeshgarg007/tds_payable_cancelled_entries
fix: Fixes in TDS payable monthly report
|
2022-02-15 15:39:47 +05:30 |
|
Deepesh Garg
|
fec40aac7a
|
fix: Linting issues
|
2022-02-15 12:15:35 +05:30 |
|
Deepesh Garg
|
42cdd6d237
|
fix: Remove commented out code
|
2022-02-15 12:05:51 +05:30 |
|
Deepesh Garg
|
10629f78fa
|
Merge branch 'develop' into reverse_entry_dead_lock
|
2022-02-15 11:59:50 +05:30 |
|
Deepesh Garg
|
973f6b1bbd
|
fix: Gross profit for credit notes
|
2022-02-14 22:14:17 +05:30 |
|
Deepesh Garg
|
04cbde2e52
|
fix: Filter out bank payment entries
|
2022-02-14 20:38:04 +05:30 |
|
Deepesh Garg
|
2ff6b3560e
|
fix: Fixes in TDS payable monthly report
|
2022-02-14 19:51:58 +05:30 |
|
Saqib Ansari
|
18d0a59a9d
|
fix: disable rounded total in opening invoice creation tool
|
2022-02-14 18:38:02 +05:30 |
|
Deepesh Garg
|
ae613008be
|
fix: Error in consolidated financial statements
|
2022-02-12 21:54:22 +05:30 |
|
Deepesh Garg
|
07bcbc6c7e
|
fix: Remove unused param
|
2022-02-12 19:05:03 +05:30 |
|
Ankush Menat
|
eb8b424722
|
feat: item-wise negative stock setting (#29761)
|
2022-02-12 13:08:28 +05:30 |
|
Sagar Vora
|
d93d2a80b1
|
chore: remove deprecated print format
|
2022-02-11 15:21:17 +05:30 |
|
Deepesh Garg
|
2172ab2d37
|
fix: Update columns in new format
|
2022-02-11 14:48:39 +05:30 |
|
Saqib Ansari
|
78dd364b0b
|
fix: cannot jump to sales invoice in gross profit report
|
2022-02-11 12:32:45 +05:30 |
|
Deepesh Garg
|
da73685f71
|
fix: Multiple fixes in Gross Profit report
|
2022-02-10 13:07:51 +05:30 |
|
Saqib Ansari
|
b35b637d01
|
Merge pull request #29701 from nextchamp-saqib/consolidation-round-off-err
fix(pos): incorrect grand_total in case of inclusive taxes on item
|
2022-02-09 16:42:30 +05:30 |
|