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

9078 Commits

Author SHA1 Message Date
HarryPaulo
1e20016059
fix: POS Closing Entry load all invoices with one request on save (#35819) 
fix: load all invoices with one request
 2023-06-24 16:34:24 +05:30
Deepesh Garg
1894dc8197 fix: Test case and code cleanup 2023-06-23 21:53:34 +05:30
Deepesh Garg
da6bc1a13e refactor: Redo workflows 2023-06-23 20:57:51 +05:30
ruthra kumar
2f638ae32a
Merge pull request #35604 from pps190/fix-reconcile-invoice-return 
fix: reconcile invoice against credit note.
 2023-06-23 17:44:25 +05:30
ruthra kumar
9655d78642 test: test reference details response 2023-06-23 17:24:19 +05:30
Marica
2868baebab
fix: Payment Term must be mandatory if Allocate Payment based on .. is checked (#35798) 
- Front and Back end validation of condition
- Fix test to accomodate fix
 2023-06-23 16:00:20 +05:30
Deepesh Garg
df035f6b19
Merge branch 'develop' into Provision-to-send-Accounts-Receivable-Reports 2023-06-23 15:58:38 +05:30
ruthra kumar
9e73af891d fix: get base grand total while pulling reference details in PE 2023-06-23 14:50:14 +05:30
Gursheen Anand
555c126eb9 fix: add patch for setting default value of report field 2023-06-23 10:52:25 +05:30
Anand Baburajan
f37484c6fe
chore: better err msg on cancelling JE for asset scrap [dev] (#35850) 
chore: better err msg on cancelling JE for asset scrap
 2023-06-22 22:32:06 +05:30
Deepesh Garg
904f835d4a
Merge pull request #35602 from deepeshgarg007/pl_account_balance 
fix: Remove special treatment for P&L Accounts
 2023-06-22 21:11:23 +05:30
Deepesh Garg
05c2198569 test: Update order 2023-06-22 21:08:58 +05:30
Deepesh Garg
13c0c129df
Merge pull request #35828 from phot0n/pr-fieldname-item-wise-purchase-register 
fix: use correct fieldname for purchase receipt column in item_wise_purchase_register report
 2023-06-22 20:40:14 +05:30
Deepesh Garg
11a9bd523d test: Add posting date parameter 2023-06-22 20:26:12 +05:30
Deepesh Garg
b101dceb2a test: GL Entry order 2023-06-22 19:38:33 +05:30
Deepesh Garg
d81d6069fb fix: JV query 2023-06-22 18:28:16 +05:30
Deepesh Garg
b523c779f5 Merge branch 'develop' of https://github.com/frappe/erpnext into ledger_preview 2023-06-22 15:43:43 +05:30
Deepesh Garg
0e68da5a2a feat: Show stock ledger preview 2023-06-22 15:43:32 +05:30
ruthra kumar
b4db25dd18 refactor: increase precision for current exc rate in ERR 2023-06-22 12:40:02 +05:30
Deepesh Garg
3aead05f42 fix: Test related errors 2023-06-22 11:41:43 +05:30
ruthra kumar
4e7deba2ad
Merge pull request #35825 from ruthra-kumar/convert_db_call_to_whitelisted_method 
fix: multiple fixes in reconciliation tools
 2023-06-22 11:27:04 +05:30
ruthra kumar
41b9e92868 fix: incorrect cost center error in bank reconciliation 2023-06-22 10:43:13 +05:30
Deepesh Garg
b64ebc6fcc test: fix payment reco tests 2023-06-21 17:49:45 +05:30
Deepesh Garg
e7d2bcf108 Merge branch 'develop' of https://github.com/frappe/erpnext into ledger_preview 2023-06-21 17:16:46 +05:30
Deepesh Garg
ed76ee3e16 fix: Move ledger display to dialog 2023-06-21 17:15:46 +05:30
phot0n
dcfc86e3af fix: use correct fieldname for purchase receipt column in item_wise_purcchase_register report 2023-06-21 16:49:54 +05:30
ruthra kumar
ad758b8d85 fix: no permission for accounts settings on payment reconciliation 2023-06-21 14:19:02 +05:30
Deepesh Garg
92f845c0e1 chore: Advance fetching order 2023-06-21 12:21:19 +05:30
Deepesh Garg
ddbd7d8bbc
Merge pull request #35591 from resilient-tech/remove-whitelisting 
chore: remove whitelisting for methods not accessed from UI
 2023-06-20 20:29:49 +05:30
ruthra kumar
8aa47a13e3
Merge pull request #35794 from ruthra-kumar/exchange_revaluation_only_post_on_account_currency_based_on_scenario 
fix: Exchange Rate Revaluation should only post on the currency that has balance in a 'zero' balance account
 2023-06-20 13:58:54 +05:30
Deepesh Garg
98cfea6f63 Merge branch 'develop' of https://github.com/frappe/erpnext into #34282-Record-advance-payment-as-a-liability 2023-06-20 13:26:14 +05:30
Deepesh Garg
32c35b87f9
Merge pull request #34675 from frappe/bank-trans-party-automatch 
feat: Auto set Party in Bank Transaction
 2023-06-20 13:24:44 +05:30
Deepesh Garg
016ed951da test: Update tests 2023-06-20 13:22:32 +05:30
ruthra kumar
6694175a51 refactor: higher precision for rounding loss and allow '0' 2023-06-20 12:44:08 +05:30
ruthra kumar
4567474418 refactor: allow '0' rounding allowance 2023-06-20 12:44:08 +05:30
ruthra kumar
9d04af9ecc refactor: allow higher precision for new exchange rate 2023-06-20 12:44:08 +05:30
ruthra kumar
1b33afd699 fix: for zero bal accounts, dr/cr only on currency that has balance 2023-06-20 12:44:04 +05:30
marination
8f2e5288ff test: Dunning and PE against partially due invoice 
- Check if the right payment portion is picked
- Check if the SI and Dunning are updated on submission and cancellation of PE
 2023-06-20 11:47:04 +05:30
Deepesh Garg
175a7baa60 Merge branch 'develop' of https://github.com/frappe/erpnext into #34282-Record-advance-payment-as-a-liability 2023-06-19 21:39:01 +05:30
Smit Vora
4fbff20954
fix: make credit note and debit note exclusive (#35781) 2023-06-19 21:14:42 +05:30
Gursheen Anand
b3d565c91f feat: Provision to send Accounts Receivable Reports using Process Statement of Accounts 
Issue #35707
 2023-06-19 19:59:24 +05:30
Anand Baburajan
c1da3ddbbf
fix: fix get outstanding invoices btn and add get outstanding orders btn (#35776) 
* fix: fix get outstanding invoices btn and add get outstanding orders btn

* chore: remove unnecessary arg
 2023-06-19 19:53:05 +05:30
Raffael Meyer
11126521c9
Merge branch 'develop' into bank-trans-party-automatch 2023-06-19 15:04:37 +02:00
Deepesh Garg
9d27a25e5f
fix: Allocated amount validation for other party types (#35741) 
* fix: Allocated amount validation for other party types

* chore: Validation for return allocations

* chore: minor typo

---------

Co-authored-by: anandbaburajan <anandbaburajan@gmail.com>
 2023-06-19 11:04:50 +05:30
Deepesh Garg
7ec9d76545 Merge branch 'develop' of https://github.com/frappe/erpnext into #34282-Record-advance-payment-as-a-liability 2023-06-19 09:48:01 +05:30
Deepesh Garg
86744b6fbb chore: Add more invoices 2023-06-19 09:44:57 +05:30
Deepesh Garg
5e9014be8c
Merge branch 'develop' into make-accounting-dimension-filter-values-optional 2023-06-19 09:21:04 +05:30
Lakshit Jain
93c0c26843
fix: modify filters for account in journal entry (#35626) 2023-06-18 22:25:28 +05:30
David Arnold
0444b98802
feat: add verified chart of accounts for colombia in two variants (#34508) 
This information is scraped from the in Colombia widely trusted site
dedicated to the plan unico de cuentas (PUC): puc.com.co

feat(accounts): add account_type overlay to colombian CoA

Add account_type overlay with a most significant number matching
strategy and a hand-crafted dictionary based on the erpnext
documentation and the corresponding account description from puc.com.co

Script used for scraping:
https://gist.github.com/blaggacao/d45a454d27556f41fef88833937088f1
 2023-06-18 22:17:31 +05:30
Deepesh Garg
5b6a9fcca9 feat: Clear demo data 2023-06-17 13:08:18 +05:30