nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-16 02:11:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,742 Commits 631 Branches 1,812 Tags
4b49080bc4eb1977f6d916e85d9d12878568fce2
Commit Graph

1220 Commits

Author SHA1 Message Date
mergify[bot]
7926cfd8c4 fix: add option to disable Transaction Log (backport #49342) (#49344) 
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
fix: add option to disable Transaction Log (#49342)
 2025-08-27 14:13:39 +02:00
Dany Robert
90913c66ae fix: handle case where taxes is added invoice changed to non-export later 
(cherry picked from commit 29c3ef8280)
 2025-08-11 06:06:08 +00:00
Dany Robert
d47c25287d chore: code styling 
(cherry picked from commit c8940a39b3)
 2025-08-11 06:06:08 +00:00
Dany Robert
614d38d0e6 fix: show message only if no tax is applied 
(cherry picked from commit 38471995e7)
 2025-08-11 06:06:08 +00:00
Dany Robert
68c65866bf fix: simplify export determination logic 
(cherry picked from commit d25846f383)
 2025-08-11 06:06:07 +00:00
Dany Robert
62db42cf2f fix(regional-uae): restrict zero rated export to invoice 
(cherry picked from commit 1170e4fb2c)
 2025-08-11 06:06:06 +00:00
Dany Robert
106b83e9f9 fix(regional-uae): split export determination 
(cherry picked from commit dc72e6cf36)
 2025-08-11 06:06:06 +00:00
Dany Robert
9df6424a20 fix(regional-uae): mark export items as zero rated 
(cherry picked from commit b8224693c4)

# Conflicts:
#	erpnext/patches.txt
 2025-08-11 06:06:06 +00:00
Jeba Jebas
36cb5b6589 feat: added chart of accounts and tax template for australian localisation (#48208) 
* Add Australian Localisation Setup

* feat: added chart of accounts and tax template for australian localisation

* chore: linter fix

---------

Co-authored-by: ruthra kumar <ruthra@erpnext.com>
(cherry picked from commit bb62a01c0d)
 2025-08-07 04:39:17 +00:00
Marc Ramser
42479d9a7f feat(regional): Address Template for Germany & Add Switzerland Template (#46737) 
* Add Address template for Switzerland

* Fix address template for germany

If an ERPNext instance is set to German and used by a business outside Germany (e.g., in Switzerland or Austria), customer addresses in Germany are displayed in their national format. However, for postal services, the international format (including the country) is required.".

This is just a workaround. IMHO the correct fix would be to check where the company is located and based on that use the national or the international template.

(cherry picked from commit 21b8ad6aa5)
 2025-03-31 10:34:00 +00:00
ruthra kumar
ec43ca97cb test: report ouput on foreign currency PI 
(cherry picked from commit e80129627a)
 2025-03-18 05:30:10 +00:00
ruthra kumar
3e2749d6d5 fix: use base currency total 
(cherry picked from commit 46f4babcd0)
 2025-03-18 05:30:09 +00:00
ruthra kumar
31dc6021e2 chore: translatable strings 
(cherry picked from commit 121798ba85)
 2025-03-11 11:42:30 +00:00
Bhavan23
229f4d3d92 fix: make 'company_tax_id' and 'company_fiscal_code' as mandatory 
(cherry picked from commit abd044eb0d)
 2025-03-11 11:42:19 +00:00
mergify[bot]
e3ce17bd6e fix:[regional] Italian einvoice xml generated with wrong prices (#40254) (backport #45840) (#46318) 
Merge pull request #45840 from gms-electronics/40254-italian-einvoice

fix:[regional] Italian einvoice xml generated with wrong prices (#40254)
(cherry picked from commit c5f90c823d)

Co-authored-by: Fab <fabian.thobe@mwv.vc>
 2025-03-05 15:19:41 +05:30
Sanket322
1630979f05 refactor: add new line ragardless of postal code 
(cherry picked from commit 746adfd057)
 2025-03-04 12:36:40 +00:00
mergify[bot]
2e9e355329 fix(regional): removed payment schedule validation in sales invoice for italy (backport #45852) (#45854) 
fix(regional): removed payment schedule validation in sales invoice for italy (#45852)

(cherry picked from commit 494310293c)

Co-authored-by: Lakshit Jain <108322669+ljain112@users.noreply.github.com>
 2025-02-11 15:41:30 +05:30
Markus Lobedann
4f623c3b66 refactor: remove obsolete function call (#42162) 
(cherry picked from commit 4512432816)
 2024-07-03 10:22:39 +00:00
Deepesh Garg
4f5af0ff9f chore: Resolve conflicts 2024-04-24 11:32:26 +05:30
Deepesh Garg
d7ddb00e86 fix: Permission for lower dedcution certificate 
(cherry picked from commit f6f118855b)

# Conflicts:
#	erpnext/regional/doctype/lower_deduction_certificate/lower_deduction_certificate.json
 2024-04-19 10:11:47 +00:00
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
barredterra
f0e00daa1c refactor: usage of in_list 
(cherry picked from commit d238751e6b)
 2024-03-19 11:13:02 +00:00
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
mergify[bot]
73c0f3703c fix: Unable to save Sales Invoice (#39059) 
fix: Unable to save Sales Invoice (#39059)

(cherry picked from commit bacf2b7431)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2024-01-01 19:28:29 +05:30
mergify[bot]
5e6a4d257e feat: enable automatic type annotations (backport #38452) (#38454) 
feat: enable automatic type annotations (#38452)

(cherry picked from commit 63313eef6f)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2023-11-30 14:43:16 +05:30
mergify[bot]
4a243ce5b7 fix(regional): use net figures for sales calc (#38260) 
fix(regional): use net figures for sales calc (#38260)

(cherry picked from commit 663bb8726c)

Co-authored-by: Dany Robert <danyrt@wahni.com>
 2023-11-29 09:08:50 +05:30
Deepesh Garg
15df4924e8 Merge pull request #36797 from rtdany10/uae-item-tax 
fix(regional): item wise tax calc issue
 2023-10-15 18:17:40 +05:30
Florian HENRY
f447177f8d refactor: Remove Regionalisation From France as now there is an App ERPNext France to manage it 2023-09-06 17:41:27 +02:00
Florian HENRY
662e9547da refactor: Remove Regionalisation From France as now there is an App ERPNext France to manage it 2023-09-06 17:40:19 +02:00
Dany Robert
89ddf3272e fix(regional): item wise tax calc issue 2023-08-24 05:56:56 +00:00
Deepesh Garg
96035b87d5 fix: Lower deduction certificate for multi-company (#36491) 2023-08-05 22:21:06 +05:30
Deepesh Garg
3f81e15672 Merge pull request #36147 from deepeshgarg007/eslint 
refactor(ci): add eslint and update linting confs
 2023-07-24 20:55:07 +05:30
Deepesh Garg
8ccb8e3c5b chore: Move buying controller to utils 2023-07-23 18:50:44 +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
Deepesh Garg
924cdef6d9 ci: add eslint and update linting confs 2023-07-14 18:53:02 +05:30
rohitwaghchaure
62011410b2 fix: test case PyPDF2 (#35652) 
fix: test case
 2023-06-12 19:22:55 +05:30
Deepesh Garg
b545e3def0 fix: Add company field to lower deduction certificate (#34914) 2023-04-25 19:07:45 +05:30
HENRY Florian
af8da53cf4 fix: FEC report for France accountancy (#34781) 
* fix: FEC report for France Accountancy legal requirement

* fix: FEC report for France Accountancy legal requirement

* fix: change to query standard

* fix: change to query standard

* fix: columns to standard dict

* fix: columns to standard dict

* fix: columns to data

* refactor: french report FEC

* refactor: french report FEC (2)

---------

Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com>
 2023-04-21 13:26:32 +05:30
Sankara Subramanian V
a06d24037b refactor(region): Splitting of KSA(Saudi Arabia) Regional logic from ERPNext (#33895) 
* feat: remove KSA regional code
 2023-02-21 22:52:20 +05:30
Deepesh Garg
f448a077b8 chore: Cleanup patches 2022-11-23 17:47:05 +05:30
Deepesh Garg
1100816d7a refactor!: Move TaxJar integration from ERPNext 2022-11-21 20:18:06 +05:30
gavin
dd2493a541 fix(realtime): Restrict updates to only last modified or current user (#33034) 2022-11-18 17:17:54 +05:30
Nabin Hait
fb7ee301b5 fix(ux): Tab break in Customer and Supplier form 2022-11-09 18:03:23 +05:30
Nabin Hait
5389a35798 fix: more fields reordering related to Tab Break 2022-10-11 13:21:07 +05:30
hamzaali15
987ac513c8 fix: QR Code multi currency issue 
When try to scan qr code on app it is showing correct values for multi currencies because it is not getting base amount

(cherry picked from commit b10a2b87b6)
 2022-09-05 07:13:32 +00:00
Rucha Mahabal
2ae48fbdd4 Merge branch 'develop' into hr-separation 2022-07-18 10:58:22 +05:30
Sagar Vora
93f87cb6e2 chore: remove missed code for India localisation 2022-07-07 16:41:41 +05:30
Rucha Mahabal
ef02e58859 Merge branch 'develop' into hr-separation 2022-07-07 13:46:54 +05:30
Rucha Mahabal
6a65c8aff4 Merge branch 'develop' into hr-separation 2022-06-28 11:51:59 +05:30
Rucha Mahabal
1d5c8660bb chore: Remove regional HR reports, custom field setups 
- Removed reports Provident Fund Deductions, Professional Tax Deductions, helper js file `salary_slip_deductions_report_filters.js`

- Removed Gratuity rules setup for India and UAE

- Removed custom field setup for India

- Moved all setups to the HRMS app
 2022-06-27 15:12:05 +05:30