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

48256 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
David Arnold
c78fdaae90
Merge remote-tracking branch 'upstream/develop' into feat/so-po-advance-payment-status 2023-10-30 17:25:08 +01:00
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
barredterra
e72afd0bd6 fix: make project page translatable 2023-10-29 17:48:48 +01:00
Deepesh Garg
83db7c6a65
Merge pull request #37737 from deepeshgarg007/arbnb_account_fetch 
fix: fetch asset received but not billed account only when needed
 2023-10-29 13:55:24 +05:30
s-aga-r
62384e9321
Merge pull request #37722 from s-aga-r/FIX-TYPO 
fix: typo in function name and msg
 2023-10-29 12:17:27 +05:30
Deepesh Garg
1081df3d7e
Merge pull request #37674 from GursheenK/item-variant-tax-template 
fix(minor): set tax values for item variants
 2023-10-29 10:33:03 +05:30
Deepesh Garg
3a8736374c fix: fetch asset received but not billed account only when needed 2023-10-29 10:18:47 +05:30
Bernd Oliver Sünderhauf
f276fbba4f refactor: remove extraneous disabled filters 2023-10-28 02:10:28 +02:00
rohitwaghchaure
fd78f868e1
fix: unsupported operand type(s) for serial and batch bundle in POS Invoice (#37721) 2023-10-27 23:33:04 +05:30
Anand Baburajan
d99a56bc27
chore: allow wip_composite_asset in the MR PO PR PI flow (#37723) 2023-10-27 18:54:36 +05:30
s-aga-r
48c66b68ab fix: typo in function name and msg 2023-10-27 17:07:16 +05:30
ruthra kumar
8d9b90f3f5 refactor: ignore cancelled GLE's while looking for currency 2023-10-27 13:58:44 +05:30
Deepesh Garg
4a86375e89
Merge pull request #37690 from deepeshgarg007/plaid_fixes 
fix(plaid): Do not sync pending transactions
 2023-10-27 11:37:33 +05:30
vishal
b60c57a97d fix: minor issue 2023-10-27 11:22:55 +05:30
vishal
8903c1bc6f feat: multi-select customer group in AR Report 2023-10-27 11:12:55 +05:30
ruthra kumar
e33fd450fd
Merge pull request #37707 from ruthra-kumar/typeerror_on_tds_payable_monthly 
fix: typeerror on TDS payable monthly report
 2023-10-27 07:36:19 +05:30
ruthra kumar
dc5d2c7406 fix: typerror on TDS payable monthly report 2023-10-26 20:36:52 +05:30
David Arnold
1612d7ba3f
fix(defaults): apply discount and provisonal defaults from item group and brand if available (#37466) 2023-10-26 12:03:22 +00:00