schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
48,701 Commits 322 Branches 1,581 Tags
3bc5076dfc6e9c0d100c778cdee27e0f5fc2c4bf
Commit Graph

2304 Commits

Author SHA1 Message Date
mergify[bot]
3bc5076dfc fix: allow Employee role to select Department (backport #41877) (#41881) 
* fix: allow Employee role to select Department (#41877)

(cherry picked from commit 56082f5a29)

# Conflicts:
#	erpnext/setup/doctype/department/department.json

* chore: fix conflicts

---------

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2024-06-12 17:19:36 +05:30
mergify[bot]
4d37739dd3 fix(Vehicle): allow doc renaming and add test (backport #41729) (#41785) 
* fix(Vehicle): allow doc renaming and add test (#41729)

fix(Vehicle): allow renaming doc and add test

(cherry picked from commit c76f466528)

# Conflicts:
#	erpnext/setup/doctype/vehicle/vehicle.json

* fix: resolve conflicts for backporting

---------

Co-authored-by: Viny Selopal <52369157+vinyselopal@users.noreply.github.com>
Co-authored-by: Viny Selopal <viny0698@gmail.com>
 2024-06-07 15:45:50 +05:30
mergify[bot]
4d3e883130 fix: typo in method - holiday list (backport #41811) (#41812) 
fix: typo in method - holiday list (#41811)

(cherry picked from commit 699cfd85c6)

Co-authored-by: Nihantra C. Patel <141945075+Nihantra-Patel@users.noreply.github.com>
 2024-06-06 19:46:02 +05:30
mergify[bot]
27f3981269 fix: Auditor permissions (backport #41659) (#41661) 
* fix: allow Auditor to select a company

(cherry picked from commit 06401cc84f)

* fix: allow Auditor to read a Fiscal Year

(cherry picked from commit eaa4efbc45)

---------

Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com>
 2024-06-04 12:19:36 +05:30
mergify[bot]
dc922abfbe fix: Ignore disabling default currency field while creating new company (backport #41699) (#41761) 
fix: Ignore disabling default currency field while creating new company (#41699)

(cherry picked from commit 80f6228d45)

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2024-06-04 11:55:35 +05:30
mergify[bot]
460ee5d542 fix(Company): Allow Equity type account in unrealised exchange gain/loss account (backport #41740) (#41747) 
fix(Company): Allow Equity type account in unrealised exchange gain/loss account (#41740)

(cherry picked from commit d30c797d24)

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2024-06-03 18:38:25 +05:30
ruthra kumar
349caf895b chore: better description 
(cherry picked from commit 000c1b49dc)
 2024-05-20 09:30:14 +00:00
ruthra kumar
2b307ff526 refactor: advance payments, allow configurable reconciliation date 
(cherry picked from commit 070e2d4d26)
 2024-05-20 09:30:13 +00:00
Deepesh Garg
46ec61f0c9 fix: Demo data clearing 
(cherry picked from commit d6fe220fab)
 2024-05-17 03:47:50 +00:00
ruthra kumar
5136ffd10d Merge pull request #41139 from frappe/mergify/bp/version-15-hotfix/pr-41086 
fix: prevent foreign currency  accounts as advance accounts. (backport #41086)
 2024-04-25 09:37:49 +05:30
ruthra kumar
2b736b52d6 chore: resolve conflicts 2024-04-23 15:35:02 +05:30
ruthra kumar
ed5affe25a refactor: better description for advance account 
(cherry picked from commit de9c8fc9d6)

# Conflicts:
#	erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
#	erpnext/setup/doctype/company/company.json
 2024-04-23 09:17:00 +00:00
ruthra kumar
dd67b0ee61 fix: advance account validation in company master 
(cherry picked from commit 1ad065fc54)
 2024-04-23 01:45:45 +00:00
mergify[bot]
ee7aaf0ea4 fix: don't attempt to set gender from salutation (backport #40997) (#41073) 
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
fix: don't attempt to set gender from salutation (#40997)
 2024-04-17 17:53:43 +02:00
Akhil Narang
7828eee014 fix(treewide): manual ruff fixes 
(cherry picked from commit f63396ef47)
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
 2024-04-10 16:11:10 +05:30
Akhil Narang
960ef14b7a refactor(treewide): formatting and ruff fixes, + manually enabled F401 
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
 2024-04-10 14:15:58 +05:30
ruthra kumar
f50a2586b6 refactor: use sql to clear comments 
(cherry picked from commit 1f46c1530e)
 2024-03-28 12:12:17 +00:00
ruthra kumar
b7dc28fff9 refactor: config changes in Transaction Deletion Record 
(cherry picked from commit 4ba67fb3ec)
 2024-03-21 05:17:25 +00:00
ruthra kumar
e7d2451f60 chore: fix linting issue in JS 
(cherry picked from commit 02c522b7cd)
 2024-03-20 14:13:21 +00:00
ruthra kumar
5bbccf1fbd refactor(test): test cases modified to handle new approach 
(cherry picked from commit 81309576b0)
 2024-03-20 14:13:21 +00:00
ruthra kumar
40574f0d72 refactor: ability to process in single transaction 
(cherry picked from commit a158b825d7)
 2024-03-20 14:13:20 +00:00
ruthra kumar
1104deb58e refactor: link running doc validation to company master 
(cherry picked from commit 5a3afea8c7)
 2024-03-20 14:13:20 +00:00
ruthra kumar
29804f6a41 chore: rename entry point 
(cherry picked from commit 5fe0b20be1)
 2024-03-20 14:13:20 +00:00
ruthra kumar
ae6260f717 chore: move status and error log to their own section 
(cherry picked from commit 3cec62d4f8)
 2024-03-20 14:13:19 +00:00
ruthra kumar
aceee829d2 refactor: minor UI tweaks 
(cherry picked from commit 0455d0c46c)
 2024-03-20 14:13:19 +00:00
ruthra kumar
02c3303fee refactor: exception propogation 
(cherry picked from commit 4a55240e63)
 2024-03-20 14:13:18 +00:00
ruthra kumar
3f45f63ff8 chore: code cleanup 
(cherry picked from commit eea260b9f9)
 2024-03-20 14:13:17 +00:00
ruthra kumar
3de53999ce refactor: better method naming 
(cherry picked from commit 30463657bf)
 2024-03-20 14:13:17 +00:00
ruthra kumar
b31e43e3db refactor: barebones hook on all doctypes with 'company' field 
(cherry picked from commit ec194ef076)
 2024-03-20 14:13:16 +00:00
ruthra kumar
d4c2e6c77d refactor: make sure only one task is running for doc 
(cherry picked from commit 78c9cc63b1)
 2024-03-20 14:13:16 +00:00
ruthra kumar
d35bef12b6 refactor: validations to prevent duplicate jobs 
(cherry picked from commit 31a2da552b)
 2024-03-20 14:13:15 +00:00
ruthra kumar
90ad3d3176 refactor: no copy on summary table and more validations 
(cherry picked from commit 55e93b3fe1)
 2024-03-20 14:13:15 +00:00
ruthra kumar
db9cc5350d refactor: reset all flags and remove unwanted code 
(cherry picked from commit 2dbe68a09d)
 2024-03-20 14:13:15 +00:00
ruthra kumar
f67c447402 chore: show correct status in list view 
(cherry picked from commit 1014940953)
 2024-03-20 14:13:14 +00:00
ruthra kumar
cbaee05740 refactor: validate status before running events 
(cherry picked from commit 86b5e2e277)
 2024-03-20 14:13:14 +00:00
ruthra kumar
c827be4345 refactor: make Excluded doctype table read only 
(cherry picked from commit 7c4cff2649)
 2024-03-20 14:13:14 +00:00
ruthra kumar
efebec3f95 chore: remove unwanted UI code 
(cherry picked from commit b98a5e4edc)
 2024-03-20 14:13:14 +00:00
ruthra kumar
c3dd68ecc3 refactor: use separate child table for summary 
(cherry picked from commit 49d3bcbc8d)
 2024-03-20 14:13:13 +00:00
ruthra kumar
2bb1bfc4a0 refactor: chained callback 
(cherry picked from commit b12ca65fcc)
 2024-03-20 14:13:13 +00:00
ruthra kumar
195bffdf44 refactor: reorder flags in Tasks section 
(cherry picked from commit cccb2d5141)
 2024-03-20 14:13:13 +00:00
ruthra kumar
17ed1bb12c refactor: use flags to decide on current stage 
(cherry picked from commit 6a77d86a53)
 2024-03-20 14:13:13 +00:00
ruthra kumar
f9321767a6 refactor: UI trigger 
(cherry picked from commit 8944ab8b6a)
 2024-03-20 14:13:13 +00:00
ruthra kumar
9c5108e492 refactor: tasks section and UI niceties 
(cherry picked from commit d0dc2c6e77)
 2024-03-20 14:13:12 +00:00
ruthra kumar
529abd619a refactor: set status and trigger job on submit 
(cherry picked from commit 6fbb67b1d2)
 2024-03-20 14:13:12 +00:00
ruthra kumar
03fc3cec70 refactor: more options for 'status' and move it to top 
(cherry picked from commit 0d65d878de)
 2024-03-20 14:13:11 +00:00
mergify[bot]
44bbf4b983 fix: Update Existing Price List Rate not working (backport #40333) (#40527) 
fix: Update Existing Price List Rate not working (#40333)

(cherry picked from commit 09ea7edb86)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-03-19 14:26:41 +05:30
mergify[bot]
7d3d2eb928 ci: add prettier to pre-commit (backport #40206) (#40362) 
* ci: add prettier to pre-commit

(cherry picked from commit 2c16036ef3)

* style: format js files

---------

Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
 2024-03-11 10:47:18 +05:30
Nihantra C. Patel
5fac50036a fix: load ignored doctype and include Mode of Payment Account (#40334) 
(cherry picked from commit 68baa3612a)
 2024-03-07 12:14:18 +00:00
mergify[bot]
9cb8d33923 fix(setup): avoid duplicate entry for Analytics role (backport #40183) (#40185) 
fix(setup): avoid duplicate entry for Analytics role (#40183)

(cherry picked from commit 29f91a7919)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2024-02-29 11:09:24 +05:30
ruthra kumar
56ee843233 fix: Fiscal Year exception on demo data setup 
(cherry picked from commit 3c3c57c674)
 2024-02-25 10:13:09 +00:00