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

47934 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ruthra kumar
af35590549 refactor: add basic functionalities 2023-11-10 13:18:41 +05:30
ruthra kumar
a248b13cc3 feat: virtual parent doctype 2023-11-10 13:18:41 +05:30
ruthra kumar
b0dfc936a1 chore: make from_doctype readonly 2023-11-10 13:18:41 +05:30
ruthra kumar
73090fa130 chore: add indexes 2023-11-10 13:18:41 +05:30
ruthra kumar
ade09bc709 chore: add list view filters 2023-11-10 13:18:33 +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
ebd74a4e5b refactor: simplify logging logic bulk_transaction 2023-11-10 10:33:32 +05:30
ruthra kumar
c4f8f3613f chore: rearrange fields 2023-11-10 10:33:31 +05:30
ruthra kumar
e5a8ad54e2 chore: convert child to normal table 2023-11-10 10:33:31 +05:30
ruthra kumar
815c616f18 chore: remove 'Bulk Transaction Log' doctype 2023-11-10 10:33:31 +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
s-aga-r
18a2e6ecb2
Merge pull request #38010 from s-aga-r/FIX-ITEM-READ-ONLY 
fix: make item field read-only in batch
 2023-11-10 10:21:20 +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
jabir-elat
45b4bfc947
fix: sales order not assigned to territory orders (#37905) 
filtered sales order are not assigned to 'territory_orders' which results in 0 order amount and 0 billing amount in the output
 2023-11-09 18:30:00 +05:30
Sympatron GmbH
92f6d2c87c
chore: Update de.csv (#37810) 
chore: chore: Update de.csv
 2023-11-09 18:27:11 +05:30
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
rohitwaghchaure
a8216b9727
fix: make adjustment entry using stock reconciliation (#37995) 
fix: do adjustment entry using stock reconciliation
 2023-11-09 12:22:26 +05:30
s-aga-r
779260fb49 fix: make item field read-only in batch 2023-11-09 12:19:45 +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
Bernd Oliver Sünderhauf
a89afb65d7 fix: Mark Status field in Payment Entry 'no_copy'. 2023-11-08 21:52:32 +01:00
Anand Baburajan
9a171db97f
fix: asset depreciation ledger (#37991) 
* fix: include opening acc depr while calculating asset depr ledger report

* chore: include opening acc depr properly in acc depr amt

* chore: add cost_center in asset depr ledger report

* fix: handle finance books properly in asset depr ledger report

* chore: rename 'include default book entries' to 'include default FB entries'
 2023-11-08 22:02:09 +05:30
s-aga-r
48567ef755
Merge pull request #37979 from s-aga-r/FIX-STOCK-RESERVATION 
fix: ignore Stock Reservation for future dated PR
 2023-11-08 19:45:15 +05:30
Deepesh Garg
b57eba6eaf
Merge pull request #37987 from frappe/revert-37496-reset-tax-template-in-item-details 
Revert "fix: set empty value for tax template in item details"
 2023-11-08 19:13:30 +05:30
Deepesh Garg
70d99eebc0 Revert "fix: set empty value for tax template in item details (#37496)" 
This reverts commit b0d440c34b9cb4d0e0d75153c279ccaa6206253d.
 2023-11-08 18:38:39 +05:30
Wolfram Schmidt
4783e4beee
Update de.csv (#37981) 
added translation for DocType Competitor https://www.duden.de/rechtschreibung/Konkurrent
 2023-11-08 15:12:47 +05:30
Gursheen Anand
450c2470e9 refactor: set against account link for jv 2023-11-08 14:08:57 +05:30
Gursheen Anand
09439334ca refactor: use both fields to store against values 2023-11-08 12:57:00 +05:30
Gursheen Anand
f9c88ea7bc refactor: keep old against fields intact 2023-11-08 12:55:41 +05:30
s-aga-r
33eedb97dc fix: ignore Stock Reservation for future dated PR 2023-11-08 12:38:09 +05:30
Gursheen Anand
2984a86f37 fix: use get_all instead of get_list 2023-11-08 12:30:24 +05:30
Gursheen Anand
5f5d75a0bb chore: linting issues 2023-11-08 11:19:45 +05:30
ruthra kumar
6f231e4c83
Merge branch 'develop' into ar_billed_cur 2023-11-08 10:30:15 +05:30
ruthra kumar
c750e4d7ef
Merge pull request #37971 from ruthra-kumar/performance_optimization_on_bulk_transaction_processing 
refactor: optimize bulk transaction for speed
 2023-11-08 06:32:23 +05:30
Gursheen Anand
291a499124 fix: split expected jv entries for scrap asset 2023-11-08 00:46:52 +05:30
s-aga-r
67b36a0823
Merge pull request #37970 from s-aga-r/FIX-5528 
chore: typo in `Stock Entry` enqueue msg
 2023-11-07 20:57:45 +05:30
marination
162c0497d1 test: get_outstanding_reference_documents (triggered via UI) 2023-11-07 14:44:04 +01:00
ruthra kumar
416bd400bb refactor: optimize for speed 2023-11-07 17:57:20 +05:30
s-aga-r
ee60fa940c chore: typo in Stock Entry enqueue msg 2023-11-07 17:33:29 +05:30
ruthra kumar
6210b24c64
Merge pull request #37954 from ruthra-kumar/expense_claim_repost 
refactor: expand repost to `Expense Claim` and make it configurable
 2023-11-07 15:40:55 +05:30
Gursheen Anand
68c6ad6036 fix: test for balance in forex account after revaluation 2023-11-07 15:31:52 +05:30