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

47014 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dany Robert
56b8d1b927
fix: remove ESS role when not mapped to employee (#37867) 
* fix: remove ESS role when not mapped to employee

* fix: emp role removal on unlinking

* fix: test case for user employee role mapping

* fix: mapped employee and user on creation
 2023-11-13 17:00:02 +05:30
mergify[bot]
9ae5c979e8
fix: Identical items are added line by line instead of grouped together in POS (#37986) 
fix: Identical items are added line by line instead of grouped together in POS (#37986)

fix: Identical items are added line by line instead of grouped together in POS (#37986)
(cherry picked from commit 011cf3d73e2f4dd98c4b33c502ca34665e067c57)

Co-authored-by: bVisible <info@bvisible.ch>
 2023-11-13 14:43:46 +05:30
David Arnold
ea7565889f
feat(customer): add button to quick-create sales order and quotation (#37320) 
* feat(customer): add button to quick-create sales order and quotation

* fix: create buttons in customer

* refactor: don't repeat yourself

---------

Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com>
 2023-11-13 14:19:22 +05:30
rohitwaghchaure
4a111f7362
fix: indentation issue in the Production Plan Summary report (#38019) 
fix: Production Plan Summary report
 2023-11-13 13:26:55 +05:30
ruthra kumar
ffd171a26b
Merge pull request #38064 from ruthra-kumar/revaluation_checkbox_for_ar_summary 
refactor: add revaluation journal checkbox in AR/AP summary reports
 2023-11-13 12:07:33 +05:30
ruthra kumar
95edd82638 refactor: add revaluation journal checkbox in AR/AP summary reports 2023-11-13 11:56:43 +05:30
Raffael Meyer
e07c3aad6b
Merge pull request #38063 from barredterra/remove-create-contact 2023-11-13 06:25:30 +01:00
barredterra
d380bf8179 feat: remove unused method create_contact 2023-11-12 20:04:38 +01:00
Raffael Meyer
8062d2be3b
Merge pull request #38060 from barredterra/refactor-fullname-parsing 
refactor: parse full name
 2023-11-12 16:16:15 +01:00
barredterra
d17e37c581 test: parse full name 2023-11-12 14:51:40 +01:00
barredterra
6f432b8e45 refactor: parse full name 2023-11-12 14:48:18 +01:00
Arjun
94faa44697
fix: close Credit Limit Crossed dialog (#38052) 2023-11-12 18:02:13 +05:30
David Arnold
9fde782403
fix(customer): contact creation for companies (#38055) 2023-11-12 17:51:18 +05:30
ViralKansodiya
ecc305dd59
fix: add customer name and supplier name columns (#37557) 
fix: add customer name and supplier name columns
 2023-11-12 17:48:37 +05:30
Niraj Gautam
6f6d5cb4cf
fix(POS): 100 % Discount on Point of Sales (#37411) 
fix: Allow 100% discount in POS
 2023-11-12 11:52:35 +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
David Arnold
a74e1f1600
fix(crm): ensure primary address and contact follows customer setting (#37710) 
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-11-11 20:20:21 +05:30
hyaray
59438ee8d4
chore: Add missing translations (#38043) 
chore: Add missing translations
 2023-11-11 19:38:24 +05:30
David Arnold
4ed9927a30
fix(patch): to migrate properly in post section (#38045) 2023-11-11 19:37:23 +05:30
David Arnold
ae508144cd
fix(customer): quick form and integration fixes (#37386) 2023-11-11 19:35:07 +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
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
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
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