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

2295 Commits

Author SHA1 Message Date
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
mergify[bot]
aebb0c7979 chore: cleanup doctype descriptions (backport #39637) (#39652) 
* chore: cleanup doctype descriptions (#39637)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
(cherry picked from commit 6b8f046fb4)

# Conflicts:
#	erpnext/accounts/doctype/accounts_settings/accounts_settings.json
#	erpnext/accounts/doctype/fiscal_year/fiscal_year.json
#	erpnext/stock/doctype/item_price/item_price.json
#	erpnext/stock/doctype/stock_settings/stock_settings.json

* chore: fix conflicts

---------

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2024-01-31 12:38:37 +05:30
ruthra kumar
222005ca44 fix: AttributeError in company transaction deletion 
(cherry picked from commit b127aa308e)
 2024-01-24 07:40:59 +00:00
ruthra kumar
80e3597338 refactor: delete transactions in background 
(cherry picked from commit a50808a077)
 2024-01-22 04:28:27 +00:00
barredterra
8a84f8a465 test: improve test for local holidays 
(cherry picked from commit 60329ade9e)
 2024-01-11 13:29:01 +00:00
barredterra
21eed78fa1 fix: consider all years in holiday list 
(cherry picked from commit 300aaa39fe)
 2024-01-11 13:29:00 +00:00
mergify[bot]
3caf462c6b fix: flaky demo test case (backport #39135) (#39198) 
fix: flaky demo test case

(cherry picked from commit 5b1571879c)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2024-01-08 17:44:24 +05:30
Raffael Meyer
6020c8e8f7 fix(Employee): treeview (#39126) 
(cherry picked from commit e912e9597d)
 2024-01-04 12:34:52 +00:00
mergify[bot]
d8cf994e94 fix: enqueue demo data setup on setup complete (backport #39043) (#39044) 
fix: enqueue demo data setup on setup complete (#39043)

(cherry picked from commit 877cc7255d)

Co-authored-by: Smit Vora <smitvora203@gmail.com>
 2023-12-31 18:25:15 +05:30
mergify[bot]
a8f3f2343d chore: fixup broken JSON files (backport #38915) (#38917) 
chore: fixup broken JSON files (#38915)

(cherry picked from commit 2dc49c834a)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2023-12-22 07:41:00 +05:30