Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
45,909 Commits 3 Branches 0 Tags 1 GiB
70dd9d0671
Commit Graph

45909 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rohit Waghchaure
16498627ce fix: made item or warehouse filter mandatory 2023-07-20 13:00:05 +05:30
Deepesh Garg
3bc79eebe3
Merge pull request #35689 from marination/payments-based-dunning 
feat: Payments based dunning
 2023-07-20 12:06:36 +05:30
ruthra kumar
e7e3853f81 test: overallocation validation in payment entry 2023-07-20 09:08:55 +05:30
Deepesh Garg
781e57f5bf
Merge pull request #36189 from deepeshgarg007/default_dashboard_dates 
fix: Default fiscal year in accounting, buying and selling charts
 2023-07-19 13:28:04 +05:30
Deepesh Garg
3759a41b83 fix: Default fiscal year in accounting, buying and sellingcharts 2023-07-19 13:17:12 +05:30
Ankush Menat
0218f11f47 ci: dont run tests on branch 
6dda420176
 2023-07-19 12:17:32 +05:30
Gursheen Anand
dd37f6cbd6 fix: show tax withholding category details for customers 2023-07-19 11:51:45 +05:30
ruthra kumar
bccfd22fc0
Merge pull request #36181 from ruthra-kumar/fix_broken_overallocation_validation_on_multi_term_payment_against_invoice 
fix: broken overallocation validation in payment entry
 2023-07-19 10:46:41 +05:30
ruthra kumar
ee83f94bb0 refactor: payment term outstanding in party account currency 2023-07-19 10:06:49 +05:30
ruthra kumar
f8d4b19cb9 fix: broken overallocation validation in payment entry 
In a multi term payment schedule, overallocation logic broke. Fixing
it using individual term outstanding amount in references. this should
work for the simple, one term payment schedule as well
 2023-07-18 21:04:13 +05:30
mergify[bot]
b4db5e9561
fix: validate docs in closed accounting period on save (#36157) 
fix: validate docs in closed accounting period on save (#36157)

(cherry picked from commit 5985e02574e387ef92a2bf0a9d2d1b49ad57cdd3)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-07-18 17:40:49 +05:30
Deepesh Garg
fbea61bbc6
fix: Trailing opening entries in Accounts closing balance (#36175) 2023-07-18 15:16:52 +05:30
Ankush Menat
07d2b896c1 fix: log error during exotel migration 2023-07-18 13:01:33 +05:30
Deepesh Garg
cfae52a40a
fix: Opening balance in TB report (#36171) 2023-07-18 12:26:19 +05:30
s-aga-r
9fb1533b8f
fix(test): test_stock_reservation_against_sales_order (#36166) 2023-07-18 08:31:02 +05:30
rohitwaghchaure
55d5469740
Merge pull request #36168 from frappe/mergify/bp/develop/pr-36162 
fix: incorrect Reserved Qty for Production Plan in BIN for the multi-uom case (backport #36162)
 2023-07-17 22:44:02 +05:30
Deepesh Garg
9e791efc82 refactor: client side accounts controller 2023-07-17 21:44:43 +05:30
Deepesh Garg
43e65d91ea chore: Remove unused files 2023-07-17 21:26:40 +05:30
Rohit Waghchaure
7af3c3d0b6 fix: incorrect Reserved Qty for Production Plan in BIN for multi-uom case 
(cherry picked from commit 2f632d031aa53e1e03763623449e7cde7dca3c55)
 2023-07-17 15:11:13 +00:00
Sagar Vora
3b246fd7e6
Merge pull request #36163 from resilient-tech/consistent-quotes 2023-07-17 15:46:40 +05:30
Sagar Vora
bccb718cc2 chore: use consistent quotes 2023-07-17 15:45:36 +05:30
Marica
1c1e7380e3
Merge branch 'develop' into payments-based-dunning 2023-07-17 12:33:19 +05:30
Deepesh Garg
ef19634a13 chore: fix build 2023-07-17 12:25:56 +05:30
Anand Baburajan
305c37917f
chore: add validation for account type of party type and account (#36141) 
chore: add validation to check if account type of party type and account match
 2023-07-17 11:00:19 +05:30
Kitti U. @ Ecosoft
2607847061
refactor: Leave Application should not be in hook.py (#36008) 2023-07-17 10:14:37 +05:30
rohitwaghchaure
a0742c52bb
Merge pull request #36151 from rohitwaghchaure/table-for-serial-and-batch 
fix: Added report 'Serial and Batch Summary' to view serial / batch nos
 2023-07-16 19:50:15 +05:30
Florian HENRY
e48dc0808d Merge branch 'develop' of https://github.com/frappe/erpnext into dev_feat_adress_contact_report 2023-07-16 11:28:59 +02:00
Rohit Waghchaure
708eefb383 fix: Added report 'Serial and Batch Summary' to view serial / batch nos 2023-07-16 13:28:08 +05:30
Deepesh Garg
6270607c6d
fix: Remove current fiscal year from Global Defaults (#35960) 
* fix: Remove current fiscal year from Global Defaults

* fix: Remove button to set default

* fix: Add utils to get fiscal year

* fix: Incorrect import

* feat: Add hook for naming series parser
 2023-07-16 12:58:42 +05:30
Ankush Menat
c545399b96
Merge pull request #36150 from ankush/perf/desk_requests 
perf: send SLA doctypes in boot
 2023-07-16 12:30:40 +05:30
Ankush Menat
bd9ef74ef7 perf: send SLA doctypes in boot 
This request is fired on every load, data rarely if ever changes though.
 2023-07-16 11:38:54 +05:30
Deepesh Garg
f0d4c4c180 Merge branch 'develop' of https://github.com/frappe/erpnext into eslint 2023-07-15 20:29:14 +05:30
Deepesh Garg
a6ce20a0fc chore: Remove domain related files 2023-07-15 19:40:53 +05:30
Deepesh Garg
3fa2a8c2d8 chore: fix linting issues 2023-07-15 18:03:16 +05:30
s-aga-r
6daaf42b38
Merge pull request #36133 from s-aga-r/FIX-ISS-23-24-02011 
perf: index in `Item` and `Item Variant Attribute`
 2023-07-15 10:09:27 +05:30
Deepesh Garg
924cdef6d9 ci: add eslint and update linting confs 2023-07-14 18:53:02 +05:30
Deepesh Garg
297c7e833c
fix: Opening entries showing up incorrectly in TB report (#36135) 
* fix: Opening entries showing up incorrectly in TB report

* chore: Linting Issue
 2023-07-14 18:39:37 +05:30
Ankush Menat
6b0b6404fc
Merge pull request #36131 from surajshetty3416/move-exotel-to-separate-app 
refactor!: Remove exotel
 2023-07-14 18:23:00 +05:30
s-aga-r
8f5b94f5fd
fix: TypeError while creating WO from PP (#36136) 2023-07-14 18:01:11 +05:30
Rucha Mahabal
692bfccb6e
Merge pull request #36116 from barredterra/local-holidays 2023-07-14 17:46:18 +05:30
Ankush Menat
41b6b739c0 fix: touch modified to migrate 2023-07-14 17:39:25 +05:30
Ankush Menat
d95559a53c fix: patch for exotel 2023-07-14 17:39:22 +05:30
s-aga-r
04400eb2e4 perf: index disabled in Item 2023-07-14 17:18:55 +05:30
s-aga-r
e4128a5c91 perf: index variant_of and attribute in Item Variant Attribute 2023-07-14 17:17:24 +05:30
barredterra
dab9688410 refactor(Holiday List): use autocomplete fieldtype 2023-07-14 13:33:55 +02:00
Suraj Shetty
23bc87f2aa Merge branch 'develop' of https://github.com/frappe/erpnext into move-exotel-to-separate-app 2023-07-14 16:21:48 +05:30
barredterra
8aff5a1dab fix(Holiday List): allow empty value 2023-07-14 12:33:27 +02:00
Deepesh Garg
ac9ad8ec36
fix: Handle multi-company in patch (#36127) 
fix: Handle multi-compnay in patch
 2023-07-14 15:56:59 +05:30
barredterra
8271a39cdb fix(Holiday List): use current user's language 
For consistency with "weekly off" descriptions
 2023-07-14 12:16:49 +02:00
barredterra
509061f05b fix: German translations of Holiday List 2023-07-14 12:14:01 +02:00