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

2336 Commits

Author SHA1 Message Date
Sanket322
6c206c1cb3 fix: ignore duplicate while creating default templates 
(cherry picked from commit 9368485594)
 2024-12-27 09:17:44 +00:00
ruthra kumar
3d4a4e661c chore: resolve conflicts 2024-12-23 11:14:33 +05:30
barredterra
e6390bfba1 fix: permissions for marking Quotation as lost 
(cherry picked from commit 4d5241486f)

# Conflicts:
#	erpnext/crm/doctype/competitor/competitor.json
#	erpnext/setup/doctype/quotation_lost_reason/quotation_lost_reason.json
 2024-12-23 05:41:57 +00:00
mahsem
cc1834b0cc fix: Swedish tax templates 
(cherry picked from commit 73112fa3c9)
 2024-12-20 08:42:38 +00:00
ruthra kumar
5c6d9c9812 refactor(UI): Rearranging fields under new sections 
(cherry picked from commit 7244754d28)
 2024-12-03 05:00:17 +00:00
RitvikSardana
6bff9d39e3 fix: remove validate_name_in_customer function 
(cherry picked from commit 2b32d3644f)
 2024-11-19 14:22:34 +00:00
Corentin Forler
7abcfca1cb fix(setup): Fix typo in COA setup 
(cherry picked from commit a245cc6b07)
 2024-11-19 12:15:15 +00:00
ruthra kumar
f4603910e4 fix: broken UI on currency exchange 
(cherry picked from commit e91b65e7bd)
 2024-11-15 06:52:46 +00:00
ruthra kumar
7eb4b42280 refactor: filter on account_type 
(cherry picked from commit 193ea9ad8f)
 2024-11-14 07:01:53 +00:00
ruthra kumar
9a3e9c4c9a refactor: use separate round off for opening entries 
(cherry picked from commit 88e68168e3)

# Conflicts:
#	erpnext/accounts/general_ledger.py
 2024-11-14 07:01:52 +00:00
ruthra kumar
8e6249d361 feat: round off for opening entries 
(cherry picked from commit a5b228549c)
 2024-11-14 07:01:51 +00:00
ruthra kumar
92551751bf Merge pull request #44063 from frappe/mergify/bp/version-15-hotfix/pr-42757 
feat: add template taxe for charts of account France - Plan Comptable General avec code (backport #42757)
 2024-11-11 16:53:15 +05:30
HENRY Florian
865786e0b6 feat: add template taxe for charts of account France - Plan Comptable General avec code (#42757) 
* feat: add template taxe for charts of account France - Plan Comptable General avec code

* feat: add template taxe for charts of account France - Plan Comptable General avec code

* feat: add template taxe for charts of account France - Plan Comptable General avec code

* feat: add template taxe for charts of account France - Plan Comptable General avec code

* feat: add template taxe for charts of account France - Plan Comptable General avec code

(cherry picked from commit 1fe6efdeb9)
 2024-11-11 04:48:37 +00:00
HENRY Florian
e6894b949c fix: when company is created with other company template Chart of Account the Create Taxe Template failed (#42755) 
fix: when company if create with other company template Created Template Taxe failed
(cherry picked from commit 8383883977)
 2024-11-11 04:47:02 +00:00
Doğancan
f70506fc92 refactor: update default_success_action.py 
The _(doctype) inside get_message is removed from the .format() method. The reason is that _(doctype) would attempt to translate the doctype itself, which is generally not required since the doctypes in doctype_list are system-level terms. The main string "{0} has been submitted successfully" should be translated, and then it should receive the doctype name as an argument.

(cherry picked from commit 804558e5bf)
 2024-10-18 06:18:53 +00:00
Sagar Vora
8e7d893669 test: update test for API change 
(cherry picked from commit c444de017a)
 2024-10-02 09:11:47 +00:00
Corentin Forler
d96cee8779 fix: Fix API endpoint for Frankfurter 
(cherry picked from commit 33e72111c7)
 2024-10-02 09:11:47 +00:00
Deepesh Garg
1d6f97ad94 fix: Ignore transaction deletion check on ledger entry insertion 
(cherry picked from commit 998f6a92a4)
 2024-09-27 18:22:41 +00:00
mergify[bot]
f101a1ce3b fix(holiday-list): use same date format for same holiday error message (backport #42606) (#43222) 
fix(holiday-list): use same date format for same holiday error message (#42606)

* fix(holiday-list): use same date format for same holiday error message

* chore: fix formatting

---------

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
(cherry picked from commit a435441536)

Co-authored-by: Ananyobrata Pal <74728797+ananyo141@users.noreply.github.com>
 2024-09-14 13:36:26 +05:30
Nihantra C. Patel
b99cdb5be7 fix: company accounts setup_queries 
(cherry picked from commit 80ace72541)
 2024-09-03 10:36:29 +00:00
mergify[bot]
8d8dd0cd2b feat: Disassembly Order (backport #42655) (#42957) 
* feat: Disassembly Order (#42655)

(cherry picked from commit 663a08e4cd)

# Conflicts:
#	erpnext/stock/doctype/stock_entry_type/stock_entry_type.json

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-08-27 23:07:37 +05:30
mergify[bot]
831e2aaf18 fix: custom stock entry type issue (backport #42835) (#42846) 
* fix: custom stock entry type issue (#42835)

(cherry picked from commit 9c82c2b5d3)

# Conflicts:
#	erpnext/stock/doctype/stock_entry_type/stock_entry_type.py

* chore: fix conflicts

* chore: fix linters issue

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-08-21 16:46:05 +05:30
mergify[bot]
ae6c1a30ac refactor: brand js and allow quick entry (backport #42829) (#42830) 
* refactor: brand js and allow quick entry (#42829)

* refactor: brand js and allow quick entry

* refactor: brand js and allow quick entry --prettier

* refactor: brand js and allow quick entry --prettier

(cherry picked from commit a1183f0165)

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

* refactor: brand js and allow quick entry --refactor

---------

Co-authored-by: Nihantra C. Patel <141945075+Nihantra-Patel@users.noreply.github.com>
 2024-08-20 15:03:23 +05:30
barredterra
4914481105 fix: translatability of boldened text 
(cherry picked from commit af0ae930ca)

# Conflicts:
#	erpnext/controllers/accounts_controller.py
 2024-08-17 00:21:05 +00:00
ruthra kumar
b2e108afcc refactor: allow foreign currency accounts in Supplier Group 
(cherry picked from commit 164498bafb)
 2024-08-16 04:30:12 +00:00
ruthra kumar
114a5f8cca refactor: allow foreign currency accounts in customer group 
(cherry picked from commit 066e935892)
 2024-08-16 04:30:12 +00:00
ruthra kumar
219310e817 refactor: provision for monthly re-evaluation 
(cherry picked from commit ce2b9e0f1a)
 2024-07-24 13:15:18 +00:00
Smit Vora
aea8271f7e fix: ignore duplicates while creating default templates 
(cherry picked from commit cf55c2ab3d)
 2024-07-23 04:56:36 +00:00
mergify[bot]
b5556156c1 fix(Holiday List): sort holidays on save to avoid disorienting the user (backport #42236) (#42250) 
fix(Holiday List): sort holidays on save to avoid disorienting the user (#42236)

fix: sort holidays on save to avoid disorienting the user
(cherry picked from commit ad137250fc)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2024-07-09 17:53:38 +05:30
ruthra kumar
545d0b9730 refactor: validation in Supplier Group 
(cherry picked from commit 107b614518)
 2024-06-22 23:58:10 +00:00
ruthra kumar
4bde345399 refactor: validation in customer group 
(cherry picked from commit 4f9a228175)
 2024-06-22 23:58:10 +00:00
mergify[bot]
44c16713ba feat: default account head for operating cost (backport #41985) (#41987) 
* feat: default account head for operating cost (#41985)

(cherry picked from commit fd7666a029)

# Conflicts:
#	erpnext/manufacturing/doctype/bom/bom.py
#	erpnext/setup/doctype/company/company.json

* chore: fix conflicts

* chore: fix conflicts

* chore: fix conflicts

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-06-22 10:39:53 +05:30
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