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

47604 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rohit Waghchaure
0104897d69 fix: remove voucher type and no for Item and Warehouse based reposting 2023-11-02 13:24:56 +05:30
ruthra kumar
5530a5b303
Merge pull request #37845 from ruthra-kumar/std_permissions_for_process_payment_reconciliation_log 
chore: add std permissions for Process Payment Reconciilation log
 2023-11-02 12:10:19 +05:30
ruthra kumar
a9fceeb00f chore: std permissions for Process Payment Reconciilation log 2023-11-02 11:32:24 +05:30
ruthra kumar
34e3538b55
Merge pull request #37838 from ruthra-kumar/pass_limits_to_je_and_pe_queries 
refactor: pass limits to JE and PE queries in reconciliation tool
 2023-11-02 10:42:11 +05:30
s-aga-r
851a234988
Merge pull request #37819 from s-aga-r/FIX-5274 
fix: `TypeError` in PR for non-stock item
 2023-11-02 10:39:35 +05:30
s-aga-r
17893eff59
Merge pull request #37836 from barredterra/filters-from-route-in-stock-balance 
feat(Stock Balance): add filters from route
 2023-11-02 10:12:48 +05:30
ruthra kumar
54e8ce1ac5 refactor: pass limits to JE and PE queries in reconciliation tool 2023-11-02 09:16:26 +05:30
barredterra
38e5e4a893 feat(Stock Balance): add filters from route 2023-11-01 18:05:50 +01:00
ruthra kumar
65cc804186
Merge pull request #37832 from ruthra-kumar/checkbox_to_toggle_remarks_in_general_ledger 
refactor: checkbox to toggle remarks in General Ledger
 2023-11-01 21:15:47 +05:30
ruthra kumar
8fa677b8e8 refactor: checkbox to toggle remarks in General Ledger 2023-11-01 20:30:16 +05:30
marination
6bd56d2d5f refactor: split_invoices_based_on_payment_terms 
- Invoices were in the wrong order due to the logic. The invoices with payment terms were added first and the rest after.
- Overly long function with unnecessary loops (reduced to one main loop) and complexity
- The split row as per payment terms was not ordered. So the second installment was allocated first
 2023-11-01 20:11:00 +05:30
s-aga-r
204face50d
Merge pull request #37827 from s-aga-r/REFACTOR-BIN 
refactor: update fields label and remove unused fields from BIN
 2023-11-01 16:25:40 +05:30
Raffael Meyer
c5f5aa8208
feat: report Timesheet Billing Summary (#37451) 2023-11-01 15:49:21 +05:30
Gursheen Anand
3d9938221a fix: remove validation for negative outstanding invoices 2023-11-01 15:40:54 +05:30
s-aga-r
f0a1f4ac7c refactor: remove unused fields fcfs_rate and ma_rate from Bin 2023-11-01 15:36:41 +05:30
s-aga-r
ec1a7869f8 refactor: rearrange fields and update label 2023-11-01 15:35:18 +05:30
mrchenxxx
7e67d42d1d
chore: Update translations 
chore: Update translations
 2023-11-01 15:25:36 +05:30
Deepesh Garg
da9a7ff63d
Merge pull request #37278 from barredterra/translate-accounts-settings-de 
fix: german translations of Accounts Settings
 2023-11-01 15:11:52 +05:30
Deepesh Garg
47f913abcb
Merge pull request #37694 from viralpatel15/develop 
fix: set docstatus filter to ignore cancel document
 2023-11-01 14:16:31 +05:30
Deepesh Garg
fc4199504f
Merge pull request #37590 from GursheenK/gov-compliance-for-tax-withholding-report 
fix: gov compliance for tax withholding report
 2023-11-01 14:09:29 +05:30
Deepesh Garg
0fc14b72ca
Merge pull request #37635 from GursheenK/validation-for-order-item-from-qtn 
fix: validate sales order item with quotation
 2023-11-01 14:03:41 +05:30
Deepesh Garg
804ed0d26a
Merge pull request #37680 from GursheenK/workaround-for-SO-status-updater 
fix: status when over delivery or billing in SO
 2023-11-01 12:29:28 +05:30
s-aga-r
028b3e2fbf fix: TypeError in PR for non-stock item 2023-11-01 11:48:27 +05:30
marination
e0a03789ae fix: Use process.extract to get the corresponding party doc name of the result 
- rapidfuzz accepts an iterable or a dict. dict input gives the dict key and value in the result
 2023-10-31 16:53:08 +01:00
s-aga-r
7a3e4a8a05
Merge pull request #37742 from aadhilpm/patch-1 
fix: remove GoCardless Settings and Mpesa Settings from Workspace
 2023-10-31 20:02:39 +05:30
Aadhil
e16cc38b70 fix: remove GoCardless Settings and Mpesa Settings from Workspace 2023-10-31 19:59:52 +05:30
ruthra kumar
c43b30cf36
Merge pull request #37795 from ruthra-kumar/patch_for_reconciliation_limits 
chore: update default limit values in reconciliation tool
 2023-10-31 19:51:13 +05:30
ruthra kumar
07a8024b45
Merge pull request #37793 from ruthra-kumar/refactor_ar_remarks_fetching 
refactor: pull remarks only if needed on AR/AP report
 2023-10-31 19:50:38 +05:30
s-aga-r
b64147cce9
Merge pull request #37644 from bosue/fix_typo_overrridden 
chore: Fix typo followup to #37636
 2023-10-31 19:45:37 +05:30
s-aga-r
058bb95171
Merge pull request #37743 from barredterra/translate-project-page 
fix: make project page translatable
 2023-10-31 19:41:02 +05:30
hyaray
daf2ec063c
fix: In-Transit Warehouse company filter (#37796) 2023-10-31 18:51:27 +05:30
rohitwaghchaure
77af247450
chore: fixed test cases (#37792) 2023-10-31 18:02:24 +05:30
ruthra kumar
1fd888175f chore: update default limit values in reconciliation tool 2023-10-31 17:47:55 +05:30
David Arnold
fb0ec74d08
fix(packed_item): ensure proper names for ref integrity (#37597) 2023-10-31 17:41:44 +05:30
ruthra kumar
eb73017798 refactor: pull remarks only if needed on AR/AP report 2023-10-31 17:31:28 +05:30
David Arnold
139a68fd0f
test: fix bad test data (#37773) 
* test(stock): fix bad test data

* test(asset): fix bad test data

* test(stock): fix bad test data

* test(manufacturing): fix bad test data
 2023-10-31 16:50:09 +05:30
mergify[bot]
d758fc1b89
fix: incorrect material request quantity in production plan (backport #37785) (#37789) 
fix: incorrect material request quantity in production plan (#37785)

(cherry picked from commit 25718d9f1b7cda3b87263c2cf885958cbd283947)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-10-31 16:28:27 +05:30
rohitwaghchaure
056b74b162
fix: indexing on Delivery Note Item (#37766) 
fix: added indexing on Delivery Note Item
 2023-10-31 12:32:52 +05:30
s-aga-r
e752f8f0ef
Merge pull request #37758 from s-aga-r/FIX-37566 
fix: `PermissionError` while creating DN from SO
 2023-10-30 18:08:27 +05:30
ruthra kumar
54a32adef3
Merge pull request #37761 from ruthra-kumar/add_index_to_posting_date_in_ple 
chore: add index to posting_date in PLE
 2023-10-30 16:48:46 +05:30
ruthra kumar
ca69845238 chore: add index to posting_date in PLE 2023-10-30 16:15:05 +05:30
ruthra kumar
d2fdda8bcd
Merge pull request #37720 from ruthra-kumar/ignore_cancelled_entries_while_looking_for_currency 
refactor: ignore cancelled GLE's while looking for currency of existing entries
 2023-10-30 16:11:05 +05:30
s-aga-r
afc64ed9ee fix: ignore permissions while mapping DN Item 2023-10-30 15:39:11 +05:30
Didiman1998
500435b856
fix: make changes that enable gantt view for job cards (#37661) 
* fix: make changes that enable gantt view for job cards

* fix: add fields on listview and remove from json file

* fix: undo modified date

---------

Co-authored-by: Dietmar Fischer <fischer@kk-software.de>
 2023-10-30 15:18:41 +05:30
viralkansodiya15
a15484fe3d
fix: solve linter test and update 2023-10-30 13:01:25 +05:30
viralkansodiya15
76c61c1b04
Merge branch 'frappe:develop' into develop 2023-10-30 12:12:47 +05:30
viralkansodiya15
de58c67991
fix: linter test solve 2023-10-30 10:44:17 +05:30
s-aga-r
8a34a4ba68
Merge pull request #37732 from bosue/remove_extraneous_disabled_filters 
refactor: remove extraneous disabled filters
 2023-10-30 09:54:05 +05:30
Richard Case
208d5042ee chore: update tests 2023-10-30 00:48:17 +00:00
Richard Case
ece7049390 feat: in_party_currency option for AR/AP reports 2023-10-30 00:15:05 +00:00