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

9427 Commits

Author SHA1 Message Date
ruthra kumar
e3af1dc864
Merge pull request #38258 from ruthra-kumar/rename_unreconcile 
refactor: rename 'Unreconcile Payments' doctype to singular 'Unreconcile Payment'
 2023-11-22 10:03:13 +05:30
ruthra kumar
74f9e34182 chore: update new unreconcile doctype name in JS and PY files 2023-11-22 05:59:20 +05:30
ruthra kumar
1fddc30350
Merge pull request #38081 from GursheenK/validate-repost-ledger-settings-for-editable-invoices 
fix: check reposting ledger settings before setting repost flag
 2023-11-22 05:22:59 +05:30
ruthra kumar
9006c9b747 chore: rename 'unreconcile payments' to 'unreconcile payment' 2023-11-21 16:44:01 +05:30
ruthra kumar
56e991b7f4 test: prevent rounding loss based validation error 2023-11-21 11:46:45 +05:30
ruthra kumar
ce092bf23b
Merge pull request #38210 from ruthra-kumar/set_default_on_billed_amt_update 
refactor: extend billed amount update flag to POS Invoice as well
 2023-11-20 14:05:45 +05:30
ruthra kumar
83a13e22b7 refactor: add flag to POS Invoice 2023-11-20 12:29:37 +05:30
ruthra kumar
ee0c64215d refactor: set default for 'update_billed_amount_in_delivery_note' 2023-11-20 12:29:35 +05:30
ruthra kumar
7b2eacd4d8
Merge pull request #38159 from ruthra-kumar/provision_to_truncate_remarks 
refactor: provision to truncate `remarks` in General Ledger and Accounts Receivable/Payable reports
 2023-11-20 10:07:10 +05:30
ruthra kumar
a9bf906545 refactor: add substring logic in ar/ap report 2023-11-20 09:38:26 +05:30
ruthra kumar
97090ff367 refactor: provision to set remarks length in accounts settings 2023-11-20 09:38:23 +05:30
Deepesh Garg
6c8b6de4c9
Merge pull request #38171 from rtdany10/rounded-total 
fix: wrong round off and rounded total
 2023-11-19 19:18:38 +05:30
Dany Robert
cc60c328fe fix: test case for rounded total with cash disc 2023-11-19 02:53:09 +00:00
Devin Slauenwhite
3d1e3a9cde fix: payment entry rounding error 2023-11-18 14:36:20 +00:00
Vishakh Desai
45299fe4b3 fix: pass check permission in render_address 2023-11-18 17:10:01 +05:30
Gursheen Kaur Anand
5b3eba7bee
Merge branch 'develop' into validate-repost-ledger-settings-for-editable-invoices 2023-11-17 14:21:02 +05:30
Gursheen Kaur Anand
8c6e341a71
Merge pull request #38144 from GursheenK/tax-report-party-without-naming-series 
fix(minor): show party instead of party name where naming series not set
 2023-11-17 14:18:16 +05:30
Smit Vora
7e43d7b131
fix: allow regional gl in payment entry for gl preview (#38136) 2023-11-17 12:38:08 +05:30
Gursheen Anand
b27af6b5c8 fix: show party instead of party name where naming series not set 2023-11-17 12:36:57 +05:30
ruthra kumar
c69fb80222
Merge pull request #38119 from ruthra-kumar/missing_filter_in_payable_report 
fix: add revaluation journal filter in Payable report
 2023-11-17 09:56:51 +05:30
ruthra kumar
134201794a fix: add revaluation journal filter in Payable report 2023-11-17 09:48:17 +05:30
Deepesh Garg
9731b74ad3
Merge pull request #38071 from GursheenK/unequal-dr-cr-for-payments-with-partial-credit-note 
fix: handle partial return against invoices in payment entries
 2023-11-16 10:35:55 +05:30
ruthra kumar
3e884d347a
Merge pull request #38082 from ruthra-kumar/fix_fy_exception 
refactor: use 'boolean' parameter while fetching FY year
 2023-11-16 09:47:30 +05:30
Gursheen Anand
2499675ad1 fix: test total unallocated amount in payment 2023-11-15 13:32:23 +05:30
Anand Baburajan
e93a19ffb5
chore: refetch item images on transaction save (#38095) 
chore: re fetch item images on transaction save
 2023-11-14 19:38:15 +05:30
ruthra kumar
c31ee8ea33 refactor: use 'boolean' parameter while fetching FY year 2023-11-14 07:25:10 +05:30
Gursheen Anand
894ae1fe0f fix: check reposting settings before allowing editable si 2023-11-13 20:28:44 +05:30
Gursheen Anand
5fae2f6d57 fix: allow on submit for child table fields 2023-11-13 20:27:09 +05:30
Gursheen Anand
ad5edbb1de fix: do not set repost flag without validating voucher 2023-11-13 20:25:26 +05:30
Gursheen Anand
780b827adc refactor: validate reposting settings for editables inv 2023-11-13 20:24:32 +05:30
Gursheen Anand
09f9764bbd test: payment against partial return invoices 2023-11-13 18:11:00 +05:30
Gursheen Anand
a59c942cd4 fix: reset dr_or_cr for every reference 2023-11-13 18:09:49 +05:30
Gursheen Anand
5b446d4575 fix: handle partial return against invoices 2023-11-13 15:05:34 +05:30
ruthra kumar
95edd82638 refactor: add revaluation journal checkbox in AR/AP summary reports 2023-11-13 11:56:43 +05:30
Deepesh Garg
8634abc021
fix: COA Importer app related issues (#37238) 
* fix: COA Importer app related issues

* fix: Clear all account links fields befor import

* fix: Attribute error
 2023-11-12 11:42:26 +05:30
ruthra kumar
8d9f391309
Merge pull request #38004 from ruthra-kumar/ar_report_refactor_in_handling_gain_loss 
fix: handling of exchange rate journals in AR/AP
 2023-11-10 11:06:03 +05:30
ruthra kumar
1d8fcd66e6 fix: new logic for handling revaluation journals 2023-11-10 10:31:39 +05:30
ruthra kumar
6ca3b26820
Merge pull request #37859 from marination/split-invoice-refactor 
fix: `split_invoices_based_on_payment_terms`
 2023-11-10 10:22:37 +05:30
David Arnold
922fffda1f
fix(payments): incoming payment requests aren't supposed to be in 'initiated' state (only outgoing are) (#37447) 
* fix(payments): incoming payment requests aren't supposed to be in 'initiated' state (only outgoing are)

* fixup! fix(payments): incoming payment requests aren't supposed to be in 'initiated' state (only outgoing are)
 2023-11-09 22:04:27 +05:30
marination
1fc5844025 fix: Re-add no.of rows split in alert message 2023-11-09 15:01:58 +01:00
Vishakh Desai
c2bda2c705
fix: Supplier Quotation fields (#37963) 2023-11-09 18:26:34 +05:30
marination
4b4b176fcf style: Remove spaces introduced via merge conflict 2023-11-09 13:03:52 +01:00
Marica
a27374fd8f
Merge branch 'develop' into split-invoice-refactor 2023-11-09 17:28:01 +05:30
marination
56ac3424d2 fix: Alert message and make sure invoice due dates are different for effective test 
- Make invoice due dates are different so that the invoice with the earliest due date is allocated first in the test
- Translate voucher type, simplify alert message. The invoice could be "split" into 1 row, no. of rows in the message seems unnecessary.
 2023-11-09 12:50:44 +01:00
ruthra kumar
696e2108ac
Merge pull request #37746 from casesolved-co-uk/ar_billed_cur 
feat: in_party_currency option for AR/AP reports
 2023-11-09 13:04:47 +05:30
ruthra kumar
89612f2605
Merge pull request #37716 from vishdha/ar_report 
feat: multi-select customer group in AR Report
 2023-11-09 13:04:01 +05:30
Deepesh Garg
860b67e9c0
Merge pull request #37828 from GursheenK/payments-irrespective-of-party-types 
fix: payments irrespective of party types
 2023-11-09 12:14:58 +05:30
Deepesh Garg
47ba357bea
Merge pull request #38000 from bosue/payment_entry_status 
fix: Mark Status field in Payment Entry 'no_copy'.
 2023-11-09 12:14:02 +05:30
ruthra kumar
3502c01aa4
Merge pull request #37860 from ruthra-kumar/filter_disable_accounts 
refactor: ignore disabled account while selecting Income Accounts
 2023-11-09 10:14:10 +05:30
ruthra kumar
6e3e094c95 refactor: ignore disabled account while selecting Income Accounts 2023-11-09 09:39:39 +05:30