Shiloh/brotherton-erpnext
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
45,347 Commits 3 Branches 0 Tags
Commit Graph

8554 Commits

Author SHA1 Message Date
Deepesh Garg
719ac5c8f3 Merge branch 'develop' of https://github.com/frappe/erpnext into opening_entry 2023-03-08 18:35:26 +05:30
Deepesh Garg
f0267feca8 test: Add test case for closing balance 2023-03-08 18:34:07 +05:30
marination
761f68d7bf fix: Paid amount must be discounted considering accounting currency 
- Accounting is in the same currency if party currency and company currency is the same
- If accounting is in the same currency, paid and recvd amount is in the base currency
- Then, discount amount must also be in the base currency as it is deducted from paid amount
- Received amount must be in base currency if not multi currency
- cleanup: Deductions setting broken into smaller functions
 2023-03-08 17:20:48 +05:30
Deepesh Garg
3249a79f07 chore: rename Closing Balance to Account Closing Balance 2023-03-08 15:15:33 +05:30
Devin Slauenwhite
6de826b8c4
fix: exchange rate revaluation errors (#33947) 
* fix: set new balance for non-positive balances

* fix: don't add debit: 0, credit: 0 entries to journal entry.

* fix: add journal entry difference to unbooked gain/loss of exchange.

* chore: linter

* chore: remove invlaid TODO. [skip-ci]
 2023-03-07 17:16:15 +05:30
marination
f02fc8acf0 fix: Don't add to deductions if amount is 0 
- misc: better docstring
 2023-03-07 12:12:45 +05:30
Deepesh Garg
ea8e23384d
fix: Payment Request against sales order with disabled rounded total (#34281) 
* fix: Payment Request against sales order with disabled rounded total

* chore: Do not consider advance amount
 2023-03-07 11:40:29 +05:30
marination
7f2e7badff fix: Set deduction amount in company currency on Doctype 
- Even via JS, deductions amount is always in company currency
- Since there is nothing dynamic about this field, set it in the doctype spec itself
- fixed: Inconsistency between label currency and field currency formatted value
 2023-03-06 17:45:26 +05:30
Deepesh Garg
5dabc98ba5 chore: Add index to period closing voucher column 2023-03-06 16:56:33 +05:30
marination
c217bb2018 test: PE from SI with early payment discount amount & PE assertions in discount % test 2023-03-06 15:02:32 +05:30
marination
2ae5834290 fix: Back update discounted amount in Invoice based on discount type 
- Discount value was always trated as a percentage on back updation
 2023-03-06 14:54:46 +05:30
Deepesh Garg
310f71c313 test: Add static posting dates to tests 2023-03-05 18:43:26 +05:30
Deepesh Garg
4a2046dfb6 fix: Aggregation with previous closing balance 2023-03-05 18:18:33 +05:30
marination
dc2998f544 fix: Set deductions in base currency 
- Use field precision to get more accurate values
 2023-03-03 17:24:43 +05:30
marination
75ec0a0a85 fix: Recalculate difference amount after setting deductions 2023-03-03 14:13:27 +05:30
Marica
619824855a
Merge branch 'develop' into early-payment-loss 2023-03-03 13:53:57 +05:30
marination
768c3a4927 fix: Taxes aren't discounted on early payment discount 
- Deductions in payment entry must be split into income loss and tax loss
- Compute total discount in percentage, makes discounting different amounts proportionately easier
 2023-03-03 13:21:38 +05:30
Deepesh Garg
c089c4156c chore: Minor fixes 2023-03-02 16:46:56 +05:30
Deepesh Garg
790f0aac12
Merge branch 'develop' into finance_book_read_only 2023-03-02 10:01:12 +05:30
Suraj Shetty
6cd2ba5c66 fix: Resolve conflicts 
(cherry picked from commit f6469d83981386a7bb57b41178055eae5cda30bf)
 2023-03-01 10:59:21 +00:00
Suraj Shetty
46a722d51c fix: Wrap unexpectedly long text in remark 
(cherry picked from commit ba66a6714c495f9d70dad79344342779c8011c6e)

# Conflicts:
#	erpnext/accounts/report/general_ledger/general_ledger.html
(cherry picked from commit b13bf1ebc517ccd9c5b6b079208ca3883e7418fd)
 2023-03-01 10:59:20 +00:00
Deepesh Garg
28dd1a25cb chore: Make finance book read only 2023-03-01 15:00:24 +05:30
Deepesh Garg
e5f603c9d9 perf: Apply closing balance in Trial Balance report 2023-03-01 14:48:06 +05:30
Deepesh Garg
436fc03eda fix: Closing balance entries for period closing voucher 2023-03-01 14:43:49 +05:30
rohitwaghchaure
2942cee31e
Merge pull request #34235 from rohitwaghchaure/feat-adjust-valuation-rate 
feat: adjust purchase receipt valuation rate as per purchase invoice rate
 2023-02-28 17:34:53 +05:30
Rohit Waghchaure
a8445da02a fix: labels name 2023-02-28 15:47:45 +05:30
Rohit Waghchaure
8e86553717 test: added test cases 2023-02-28 14:57:04 +05:30
Rohit Waghchaure
eab775ef32 feat: adjust purchase receipt valuation rate as per purchase invoice rate 2023-02-28 14:11:55 +05:30
Vishal
a51bec0269 chore: minor change 2023-02-28 11:03:26 +05:30
Vishal
3ebe7d861d chore: minor changes added to code 2023-02-28 11:03:26 +05:30
Vishal
1de531e56e fix: multiple pos conversion issue resolved 2023-02-28 11:03:25 +05:30
Deepesh Garg
81651beaef
Merge pull request #34174 from Vishnu7025/coa-import-currency 
fix: currency in coa import
 2023-02-27 11:48:44 +05:30
Deepesh Garg
6607c8bd82 fix: Order by issue in aggregation query 2023-02-26 16:05:26 +05:30
Deepesh Garg
f92c63fb10 feat: Add validations against period closing voucher 2023-02-26 15:53:33 +05:30
Deepesh Garg
7fa7d6b5e4 chore: Rewrite query using query builder 2023-02-26 15:52:30 +05:30
Deepesh Garg
e18336ebe7 feat: Add views in standard filter 2023-02-26 15:47:29 +05:30
Deepesh Garg
c3f39c3f32 feat: Cascade closing balances on PCV submit 2023-02-23 16:48:54 +05:30
ruthra kumar
a9920715ab
Merge pull request #34022 from ruthra-kumar/gross_profit_memory_and_performance_issue 
perf: Gross Profit report will fetch SLE's on demand and memoize
 2023-02-23 11:55:08 +05:30
ruthra kumar
88d888d9d0 refactor: use docstatus from Delivery Note Item 2023-02-23 11:15:56 +05:30
vishnu
e3c000d0be chore: change column label 2023-02-22 10:53:11 +00:00
vishnu
19c0b7a523 fix: currency in coa import 2023-02-22 10:24:45 +00:00
Deepesh Garg
b44a19bd1a feat: Introduce opening entry for reporting 2023-02-21 23:20:28 +05:30
ruthra kumar
dde5bbc9a7
Merge pull request #34102 from ruthra-kumar/pos_validate_for_duplicate_pos_invoices 
fix: check for duplicate pos invoices in closing entry
 2023-02-21 18:45:39 +05:30
ruthra kumar
47add0b751 fix: check for duplicate in pos closing and pos merge log entry 2023-02-21 17:50:57 +05:30
Deepesh Garg
9739d8b52a feat: Introduce opening entry for reporting 2023-02-21 15:23:29 +05:30
Deepesh Garg
35cdd996a9
fix: Use normal rounding for Tax Withholding Category (#34114) 2023-02-21 12:57:49 +05:30
rohitwaghchaure
3871cf7110
Merge pull request #33722 from rohitwaghchaure/purchase-invoice-performance-issue 
fix: purchase invoice performance issue
 2023-02-20 12:47:07 +05:30
Alirio Castro
183e42af1a
fix: differency entry journal debit/credit missing (#34104) 
* fix: difference entry journal is wrong

* fix: difference entry journal is wrong
 2023-02-19 19:40:13 +05:30
ruthra kumar
c722f2819c
fix: ignore repost payment ledger on basic documents cancellation (#34054) 
fix: ignore repost payment ledger on cancel/delete of Inv/Pay/JE's

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-02-19 12:09:10 +05:30
Richard Case
5b7d23de15
feat: bank reconciliation and plaid changes (#33986) 
fix: plaid link refresh: update account ids
fix: plaid transactions for credit cards & add accounts on link refresh if they don't exist
fix: bank reconciliation amount matching
fix: bank reconciliation dialog usability
feat: rewrite bank transaction reconciliation to allow multiple transactions to reconcile against vouchers before clearance
fix: matching transaction amounts and race condition bug
fix: ensure there is a reference number in plaid transactions and other tweaks
feat: add references to Payroll Entry Bank Journal Entry
feat: only clear Voucher once all Bank GLEs are allocated to Bank Transactions
fix: strange type error
feat: add payment method field to bank and plaid transactions and prepopulate relevant bank reconciliation new voucher fields
feat: bank reconciliation - allow bank transactions to reconcile against themselves for when there are banking amendments
fix: bank transaction self-reconcile bug and tidy
fix: bank reconciliation datatable index update
 2023-02-19 11:50:17 +05:30