Commit Graph

7483 Commits

Author SHA1 Message Date
Saqib Ansari
69c34cd7ae fix(pos): mode of payment disappears after save 2022-02-25 14:36:29 +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
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
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
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
Saqib Ansari
0ebd32dc63 fix: cancelling of consolidated sales invoice that doesn't have closing entry 2022-02-09 16:08:28 +05:30
Saqib Ansari
75256863c6 fix(test): do not enable negative stock 2022-02-09 16:07:33 +05:30
Saqib Ansari
8ff7587aaa
Merge branch 'develop' into fix-ignore-pricing-rule 2022-02-09 10:31:22 +05:30
Deepesh Garg
6fd5281b46
Merge branch 'develop' into reverse_entry_dead_lock 2022-02-08 22:37:18 +05:30
Saqib Ansari
07dc228e32
Merge branch 'develop' into consolidation-round-off-err 2022-02-08 18:06:41 +05:30
Saqib Ansari
6fa406dd04 fix(test): pass price_list_rate only if pricing rule has to be removed 2022-02-08 17:51:53 +05:30
Saqib Ansari
c2b83a0283 fix(test): case if write off is calculated as negative amount 2022-02-08 17:36:39 +05:30
Saqib Ansari
b51a5d9225
Merge pull request #29709 from nextchamp-saqib/fix-bank-reco-currency
fix: currency in bank reconciliation chart
2022-02-08 16:32:35 +05:30
Saqib Ansari
afc5c26d1c fix(test): ignore stock validation 2022-02-08 16:04:08 +05:30
Saqib Ansari
3f962739fb Merge branch 'develop' of https://github.com/frappe/erpnext into consolidation-round-off-err 2022-02-08 16:02:18 +05:30
Saqib Ansari
0fc5d2278d fix: currency in bank reconciliation chart 2022-02-08 15:50:41 +05:30
Saqib Ansari
4f4395545e
Merge branch 'develop' into fix-ignore-pricing-rule 2022-02-08 15:29:28 +05:30