Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
46,114 Commits 3 Branches 0 Tags 1 GiB
000de4eddf
Commit Graph

46114 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Gursheen Anand
d3759b3971 fix: make offsetting entry for acc dimensions 2023-07-15 19:32:56 +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
Gursheen Anand
a93d7633d4 test: purchase register and ledger view 2023-07-14 17:16:39 +05:30
barredterra
dab9688410 refactor(Holiday List): use autocomplete fieldtype 2023-07-14 13:33:55 +02:00
Gursheen Anand
b8a83f57b7 chore: fix typo 2023-07-14 16:25:58 +05:30
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
barredterra
4888d75e72 feat(Holiday List): display localized country name 2023-07-14 11:59:45 +02:00
Gursheen Anand
0d89bfacdb fix: show additional table cols from india compliance api call 2023-07-14 13:03:22 +05:30
Kitti U. @ Ecosoft
3b884efca9
fix: get_dimension with_cost_center_and_project=false is not working. (#35974) 
* fix: get_dimension with_cost_center_and_project=false is not working.

with_cost_center_and_project is no python str, and it always evaluated as True, despite JS call it with false

* chore: Linting Issues

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-07-14 13:03:00 +05:30
Raffael Meyer
d5fe1432f8
fix: improve "Update Items" modal (#36105) 
* fix: make "Update Items" modal larger

* fix: remove conversion factor from overview

Conversion factor doesn't make much sense without two different UOMs
next to it, hence moving it to row detail view
 2023-07-14 12:27:35 +05:30
Gursheen Anand
c084fe6b3f refactor: filter accounting dimensions using qb 2023-07-14 11:05:50 +05:30
Gursheen Anand
944244ceff fix: modify rows and columns for ledger view 2023-07-14 10:50:12 +05:30
Deepesh Garg
b4bd978791
fix: Account balance patch and query fixes (#36117) 2023-07-14 10:28:36 +05:30
Ankush Menat
b5f6a1cc20 ci: fix repo name in relase notes workflow 
[skip ci]
 2023-07-13 21:04:09 +05:30
barredterra
fd23bd0434 test(Holiday List): weekly off and local holidays 2023-07-13 14:13:33 +02:00
barredterra
aa18b25a71 feat: add local holidays 2023-07-13 13:29:07 +02:00
Deepesh Garg
d631c7dffa
fix: Accounts closing balance patch (#36113) 2023-07-13 16:10:05 +05:30
ruthra kumar
72f577aad2 fix: incorrect idx on JE's after reconciliation 2023-07-13 15:12:58 +05:30
s-aga-r
5f307f92e0
refactor: Batch Item Expiry Status report (#36106) 2023-07-13 05:44:58 +05:30
Gursheen Anand
21c993a7b3 fix: clear accounting dimension value when based on field changes 2023-07-12 20:32:08 +05:30
Gursheen Anand
c973e3c746 chore: remove debugging print statements 2023-07-12 17:40:27 +05:30
Gursheen Anand
bf08aa7529 fix: filtering through accounting dimensions 2023-07-12 17:17:58 +05:30
Gursheen Anand
f5027fdcaf refactor: move fn to fetch advance taxes to utils & use qb 2023-07-12 16:42:58 +05:30
Gursheen Kaur Anand
596a14e34f
feat: add project filter in reports importing financial statements js file (#36097) 
feat: add project filter in financial statements js file
 2023-07-12 15:49:17 +05:30
Gursheen Anand
6c11ca1b75 refactor: use qb to fetch PE JV and Inv 2023-07-12 14:43:18 +05:30
Ankush Menat
0340bfc90d
ci: regen release notes with GH API (#36098) 
[skip ci]
 2023-07-12 12:17:20 +05:30
Gursheen Anand
1e8b8b5b29 fix: linting issues 2023-07-12 11:14:03 +05:30