nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-15 03:01:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
47,845 Commits 463 Branches 1,752 Tags
710771edf41b897d77f4235b0ec09f4dbfcd3b10
Commit Graph

1196 Commits

Author SHA1 Message Date
Markus Lobedann
2cf82561f6 refactor: remove obsolete function call (#42162) 
(cherry picked from commit 4512432816)
 2024-07-03 10:22:23 +00:00
Raffael Meyer
aa38f69a67 Merge pull request #40543 from frappe/mergify/bp/version-14-hotfix/pr-40542 2024-06-18 12:51:55 +02:00
Deepesh Garg
35230a9692 chore: Resolve conflicts 2024-04-24 11:33:34 +05:30
Deepesh Garg
a22be6f9b9 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:41 +00:00
Akhil Narang
4d34b1ead7 refactor(treewide): formatting and ruff fixes, + manually enabled F401 
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
 2024-04-10 17:13:31 +05:30
barredterra
7f2a54d95b refactor: usage of in_list 
(cherry picked from commit d238751e6b)

# Conflicts:
#	erpnext/accounts/doctype/payment_entry/payment_entry.js
#	erpnext/buying/doctype/purchase_order/purchase_order.js
#	erpnext/public/js/controllers/accounts.js
#	erpnext/public/js/controllers/buying.js
#	erpnext/public/js/controllers/transaction.js
#	erpnext/public/js/utils/sales_common.js
#	erpnext/templates/form_grid/item_grid.html
 2024-03-19 11:12:58 +00:00
Ankush Menat
4c629d31c6 style: format js files 2024-03-11 11:03:58 +05:30
Govind S Menokee
02cd8c4b98 fix: UAE tax computation fix 2024-02-21 19:46:44 +05:30
mergify[bot]
d337533907 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:09:08 +05:30
Dany Robert
0448d56a4f fix(regional): item wise tax calc issue 
(cherry picked from commit 89ddf3272e)
 2023-11-24 04:28:23 +00:00
Deepesh Garg
5b1016c17d Merge pull request #37524 from deepeshgarg007/ksa_vat 
fix: Incorrect vat amount in KSA VAT report
 2023-10-16 18:41:25 +05:30
Deepesh Garg
44f7de0f31 fix: Incorrect vat amount in KSA VAT report 2023-10-16 14:37:16 +05:30
mergify[bot]
2216875bd6 fix: Lower deduction certificate for multi-company (#36491) 
fix: Lower deduction certificate for multi-company (#36491)

(cherry picked from commit 96035b87d5)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-08-05 22:44:10 +05:30
mergify[bot]
b877fa60db fix: Remove current fiscal year from Global Defaults (#35960) 
* 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

(cherry picked from commit 6270607c6d)

# Conflicts:
#	erpnext/accounts/doctype/fiscal_year/fiscal_year.py
#	erpnext/patches.txt
#	erpnext/public/js/utils.js

* chore: resolve conflicts

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-07-17 11:52:37 +05:30
mergify[bot]
d732083166 fix: Add company field to lower deduction certificate (#34914) 
* fix: Add company field to lower deduction certificate (#34914)

(cherry picked from commit b545e3def0)

# Conflicts:
#	erpnext/patches.txt

* chore: resolve conflicts

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-04-25 21:33:43 +05:30
mergify[bot]
6aabab26d8 fix: FEC report for France accountancy (#34781) 
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>
(cherry picked from commit af8da53cf4)

Co-authored-by: HENRY Florian <florian.henry@open-concept.pro>
 2023-04-21 14:23:18 +05:30
gavin
9e8a8356e9 fix(realtime): Restrict updates to only last modified or current user (#33034) 
(cherry picked from commit dd2493a541)
 2022-11-18 11:48:47 +00:00
Nabin Hait
eeaa9329f6 fix(ux): Tab break in Customer and Supplier form 
(cherry picked from commit fb7ee301b5)
 2022-11-10 13:01:14 +00:00
Nabin Hait
db4fbc9e58 fix: more fields reordering related to Tab Break 
(cherry picked from commit 5389a35798)
 2022-10-11 10:33:30 +00:00
hamzaali15
d14a9a1e89 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:08 +00:00
hamzaali15
b96526eefd fix: KSA VAT report multi currency amount issue 
In KSA VAT report amount is not showing correctly for multi currencies because net_amount field is fetched instead of base_net_amount

(cherry picked from commit 56d8962e40)
 2022-09-04 07:43: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
Sagar Vora
12b7e14fde chore: keep back code to be a part of other apps / to be ported later 2022-06-24 13:38:13 +05:30
Sagar Vora
ec9861266e Merge remote-tracking branch 'upstream/develop' into remove-india 2022-06-19 22:57:22 +05:30
Conor
74a782d81d refactor: DB independent quoting and truthy/falsy values (#31358) 
* refactor: DB independent quoting and truthy/falsy values

* style: reformat to black spec

* fix: ifnull -> coalesce

* fix: coalesce -> Coalesce

* fix: revert pypika comparison

* refactor: convert queries to QB

* fix: incorrect value types for query

`=` query makes no sense with list of values

* fix: remove warehouse docstatus condition

* fix: keep using base rate as rate

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-06-17 17:01:27 +05:30
Deepesh Garg
5b2ba087a3 Merge branch 'develop' of https://github.com/frappe/erpnext into quotation_issues 2022-06-14 10:50:47 +05:30
Gavin D'souza
5f8cd34da5 fix: Use newer PyPDF2 APIs 
Depends on https://github.com/frappe/frappe/pull/17127
 2022-06-13 12:43:08 +05:30
Deepesh Garg
eb93564db6 Merge branch 'develop' of https://github.com/frappe/erpnext into quotation_issues 2022-06-11 21:56:24 +05:30
Deepesh Garg
243625898e fix(India): Sales taxes and charges template fetching in quotation 2022-06-10 22:05:58 +05:30
Rucha Mahabal
ab8df98cab chore: Remove regional code for India HR, moved to HRMS 2022-06-10 18:22:07 +05:30
Deepesh Garg
8008653082 Merge pull request #31294 from deepeshgarg007/gstr_3b_taxable_value 
fix(India): Incorrect taxable in GSTR-3B report
 2022-06-10 10:49:14 +05:30
Deepesh Garg
50aafdbe99 chore: cleanup 2022-06-09 11:52:46 +05:30
Deepesh Garg
20f568c159 fix(India): Incorrect taxable in GSTR-3B report 2022-06-09 11:50:37 +05:30
Saqib Ansari
fb4f8d870b fix(india): e-invoice eligibility if company gstin is not configured (#31247) 2022-06-08 09:36:33 +05:30
Deepesh Garg
95a4602a23 Merge pull request #31231 from deepeshgarg007/gstr_3b_composite_supplies 
fix(India): Supplies from composite dealer not showing up
 2022-06-06 09:00:40 +05:30
Deepesh Garg
db07831db7 fix(India): Supplies from composite dealer not showing up 2022-06-05 12:13:02 +05:30
Deepesh Garg
f0ac394d6e fix(India): GSTIN filter in GSTR-1 report 2022-06-02 12:59:55 +05:30
maharshivpatel
a8f98f3f96 feat(india): Improve E-way Bill Cancellation. (#31088) 2022-05-31 12:14:39 +05:30
Rucha Mahabal
2e98e9e0b9 test: set country to India before running regional tests 2022-05-31 11:54:43 +05:30
Rucha Mahabal
00adda7c8d fix: Tax Declaration tests and amount precision 2022-05-31 11:54:43 +05:30
Rucha Mahabal
2b65c9616f fix: component pay calculation 2022-05-31 11:54:43 +05:30
Rucha Mahabal
34925a3a8c fix: HRA Exemption calculation in case of multiple salary structure assignments 2022-05-31 11:54:43 +05:30
maharshivpatel
935e5b1dcd fix(india): duplicate qrcode and hide button (#31100) 2022-05-27 11:48:55 +05:30
Deepesh Garg
6edbc58873 fix: Handle missing HSN Codes 
(cherry picked from commit ce3a21eb03)
 2022-05-25 07:04:44 +00:00
Deepesh Garg
d81fad09ea Merge pull request #31080 from deepeshgarg007/company_address_trigger 
fix(India): Async issue in company address trigger
 2022-05-25 11:22:56 +05:30
Deepesh Garg
8fd0b3b9f5 chore: Linting issues 2022-05-20 15:34:03 +05:30