Commit Graph

7309 Commits

Author SHA1 Message Date
Deepesh Garg
2de5122262
fix: Add iteritems back 2022-01-07 18:30:19 +05:30
Deepesh Garg
00055bb159
fix: Conflicts 2022-01-07 18:11:38 +05:30
Deepesh Garg
bf5930c4bb fix: Show GL balance in Accounts Receivable and payable summary
(cherry picked from commit 1d270dca05501b5a15d19e3270188029b48eafde)

# Conflicts:
#	erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py
2022-01-07 09:35:19 +00:00
Deepesh Garg
f6f449ed18
Merge pull request #29176 from deepeshgarg007/outstanding_amount_anomaly
fix: Inconsistency in calculating outstanding amount
2022-01-07 13:28:52 +05:30
Deepesh Garg
9d3a5c3184 fix: Inconsistency in calculating outstanding amount 2022-01-06 18:58:49 +05:30
Deepesh Garg
80dce1ab73
Merge pull request #29125 from nextchamp-saqib/fix-reverse-jv
fix: cannot create reverse journal entry
2022-01-06 13:30:50 +05:30
Saqib Ansari
fbd706f232
fix: existing party link validation (#29159) 2022-01-05 17:55:08 +05:30
Subin Tom
3febca1a9a
fix: Modifying Opening invoice creation tool timestamp (#29127) 2022-01-04 19:37:44 +05:30
Saqib Ansari
f4db474be0
fix: minor issues (#29130) 2022-01-04 19:12:19 +05:30
Chillar Anand
0900c3d655
refactor: Removed agriculture module from ERPNext (#29022) 2022-01-04 17:26:11 +05:30
Saqib Ansari
3aa1817f7b fix: cannot create reverse journal entry 2022-01-04 14:43:02 +05:30
Saqib Ansari
7e777356ee
Merge pull request #28160 from resilient-tech/fix-invoice-statuses
refactor: `update_invoice_status` with query builder
2022-01-03 17:59:11 +05:30
Subin Tom
7385497219 fix: using get_batch_qty method to get available_qty 2022-01-03 16:57:00 +05:30
Saqib Ansari
568550874d
Merge branch 'develop' into pos-batch-no-stock-validation 2022-01-03 14:46:29 +05:30
Saqib Ansari
d0f5beeb34
fix: filter query in bank reconciliation tool (#29098) 2022-01-03 11:33:03 +05:30
Deepesh Garg
c3d890f3f1
fix: get fiscal year based on date 2022-01-02 19:10:49 +05:30
Deepesh Garg
4b6217a683 fix: Test Case
(cherry picked from commit 342658ea7028cc0d890200364cc08cf97e55d6d0)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
2022-01-02 13:36:43 +00:00
Deepesh Garg
db829a0610
Merge pull request #29050 from mohsinalimat/patch-1
feat: Add currency in import download statement
2022-01-02 17:15:01 +05:30
Dany Robert
321730a88e
Merge branch 'develop' into ledger-merger 2021-12-31 13:02:12 +05:30
MohsinAli
72369092a3
Merge branch 'develop' into patch-1 2021-12-30 17:13:59 +05:30
Pruthvi Patel
fc0dd3fcd7
Merge branch 'develop' into fix-invoice-statuses 2021-12-29 13:45:35 +05:45
Deepesh Garg
6405699821
Merge branch 'develop' into mergify/bp/develop/pr-28996 2021-12-28 14:46:12 +05:30
Deepesh Garg
6f933db3cc fix: Deferred revenue test case 2021-12-28 14:16:19 +05:30
Deepesh Garg
057cfb22d6 fix: Remove debug statement
(cherry picked from commit becb39da902e7e113c3dacb7eee7921144b8e99d)
2021-12-28 08:11:18 +00:00
Deepesh Garg
d807d78313 fix: Issues in Bank Reconciliation tool
(cherry picked from commit ff183ee895fb0dd1ca595eb76e2286695063315a)
2021-12-28 08:11:18 +00:00
MohsinAli
a0863d1cb1
feat: Add currency in import download statement
Add currency in bank statement import
2021-12-28 10:27:19 +05:30
Pruthvi Patel
617f7565ce
Merge branch 'develop' into fix-invoice-statuses 2021-12-21 22:16:14 +05:45
Saqib
7f786e44a1
Merge branch 'develop' into pos-batch-no-stock-validation 2021-12-21 17:05:43 +05:30
Saqib
c3a9ca09d1
chore: remove extra whitespace 2021-12-21 17:05:36 +05:30
Saqib
9c8f523537
fix: typo 2021-12-21 17:01:10 +05:30
Ganga Manoj
1ed30ee7c7
fix: Reset value_after_depreciation on reversing journal entry during Asset return 2021-12-21 13:59:53 +05:30
Ankush Menat
d7148adee5
test: remove unnecessary creation of companies #28965
test: remove unnecessary creation of companies
2021-12-20 22:00:31 +05:30
Deepesh Garg
c5c7777bd5
Merge pull request #28959 from deepeshgarg007/consolidated_balance_return_fix
fix: Error on viewing consolidated financial statement
2021-12-20 17:13:12 +05:30
Ankush Menat
f5d5281119 chore: drop deprecated qunit tests 2021-12-20 17:03:10 +05:30
Deepesh Garg
5d6199cf35 fix: Error on viewing consolidated financial statement 2021-12-20 16:54:52 +05:30
Pruthvi Patel
4d48ca4228 test: update_invoice_status 2021-12-20 13:23:14 +05:30
Dany Robert
e75295a151
Merge branch 'develop' into ledger-merger 2021-12-18 11:32:20 +05:30
Dany Robert
ab7f38224f fix: remove db commit 2021-12-17 16:42:24 +00:00
Dany Robert
32e5db7cb8 chore: styling according to linter 2021-12-17 16:38:16 +00:00
Dany Robert
399446460a feat: tests 2021-12-17 16:18:42 +00:00
Subin Tom
e85da7a03a
fix: Add Invoice Number field to list view in Opening Inv Creation Tool (#28938) 2021-12-17 21:48:10 +05:30
Dany Robert
b3a3367d1d feat: allow group accounts 2021-12-17 13:06:30 +00:00
Deepesh Garg
6ab753015e fix: Add tests for multicurrency subscription 2021-12-16 17:38:29 +05:30
Deepesh Garg
0e4842b986 fix: Multicurrency invoices using subscription 2021-12-16 16:51:41 +05:30
Subin Tom
9f235526d4 fix: Validation in POS for item batch no stock quantity 2021-12-15 22:34:44 +05:30
Deepesh Garg
64f68d5e94
Merge branch 'develop' into deferred_report_revenue_and_expense 2021-12-15 14:14:34 +05:30
Subin Tom
5c4d3f89d2
feat: 'Invoice Number' field in Opening Invoice Creation Tool (#28844) 2021-12-15 14:14:16 +05:30
Subin Tom
be103ab8e6
fix: Currency fix for cost field in subscription plan (#28821) 2021-12-15 13:01:48 +05:30
ruthra
9ec8841b91 refactor: rename checkbox and translations
- rename checkbox and make it
 - added translation text for labels
 - fixes for linter error
2021-12-14 20:59:14 +05:30
ruthra
a8a598ace7 refactor: remove unused function 'get_postings' 2021-12-14 16:34:51 +05:30