nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-19 19:37:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,998 Commits 636 Branches 1,812 Tags
9d5b50006023da0a8a3b867476cb38ba2407a220
Commit Graph

1074 Commits

Author SHA1 Message Date
Anand Baburajan
fed43aeb85 fix: asset monthly WDV and DD schedule [v13] (#34645) 
fix: monthly wdv and dd schedule
 2023-04-05 11:45:15 +05:30
Anand Baburajan
ae88ba5d18 fix: incorrect depr schedules after asset repair [v13] (#34520) 
* fix: incorrect schedule after repair for WDV and DD

* chore: only fix schedules for assets with calc_depr true

* fix: incorrect schedule after repair for straight line and manual
 2023-03-21 12:35:44 +05:30
Deepesh Garg
1b11566485 fix: e-Invoicing for SEZ Customer(v13) (#33796) 2023-01-25 08:57:52 +05:30
Saqib Ansari
b91860ddf2 fix: linter 2022-11-24 15:26:32 +05:30
Saqib Ansari
2121714856 fix: cannot update auth token until token expiry if credentials change 2022-11-23 21:33:04 +05:30
gavin
ecdd8493ea fix(realtime): Restrict updates to only last modified or current user (#33034) 
(cherry picked from commit dd2493a541)
 2022-11-18 11:49:11 +00:00
Dany Robert
79d508f4ff fix: wrong totals in hsn summary report 2022-11-12 05:22:31 +01:00
Deepesh Garg
9dc0edfb8a fix: Do not force eligibilgity of itc for reverse charge 2022-11-01 16:03:32 +05:30
Deepesh Garg
fbeb86b9c0 Merge pull request #32453 from deepeshgarg007/intra_state_transfer_eway_bill_v13 
fix: e-Way bill JSON for Intra-state internal transfers
 2022-10-03 09:07:26 +05:30
Deepesh Garg
9dbb2bf512 Merge pull request #32369 from maharshivpatel/fix-taxes-sez-without-payment-of-tax 
fix: SEZ Without Payment of Tax don't add tax rows
 2022-10-01 16:13:11 +05:30
Deepesh Garg
c4c52c1cd3 chore: Linting Issues 2022-10-01 16:06:31 +05:30
Deepesh Garg
b7fbf75e10 fix: e-Way bill JSON for Intra-state internal transfers 2022-10-01 15:58:31 +05:30
Maharshi Patel
988c5b95e6 fix: GST Itemised Sales Register GSTIN filter (#32367) 
fix: GST Itemised Sales Register GSTIN filte
 2022-09-27 22:21:14 +05:30
Maharshi Patel
a13eecc961 fix: SEZ Without Payment of Tax don't add tax rows 
taxes were added even when gst_category was SEZ and export_type was Without Payment of Tax
 2022-09-27 13:40:04 +05:30
Saqib Ansari
8f961abe8b fix(e-invoicing): local variable 'res' referenced before assignment (#32352) 2022-09-26 22:42:07 +05:30
hamzaali15
b10a2b87b6 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
 2022-09-05 11:15:43 +05:00
hamzaali15
56d8962e40 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
 2022-09-01 15:02:21 +05:00
Maharshi Patel
42b395916d fix: f-string and where clause 
Used f-string formatting and added conditions to WHERE clause
 2022-08-09 18:22:05 +05:30
Maharshi Patel
6c574fbf33 fix: taxable_value and gst_account_heads 
used taxable_value instead of base_net_amount and only appended required GST accounts
 2022-08-09 14:39:13 +05:30
Maharshi Patel
08c69c7a76 fix: (india) HSN wise report 
Problem:
The previous approach for calculating tax_rate was incorrect.
```
['tax_rate'] * ['number of unique rows']
```
Joining `tabSales Taxes and Charges` was adding unnecessary rows & complexity.

Solution:
Instead of trying to get tax_rate from the main query itself, I used the get_tax_accounts's data to calculate the correct tax_rate.

Todo:
Union Territory
 2022-07-29 14:22:31 +05:30
Maharshi Patel
a843e784e6 fix: discount and test added 
only report net rate if discount is less than 0 and added test.
 2022-07-26 17:40:59 +05:30
Maharshi Patel
b97d30aad0 fix: (india) (e-invoice) margin & internal company transfer 
When the item price is more than the price list rate ( margin added ) discount value becomes negative. The previous attempt to solve this was to convert discount to absolute value. However, that gives incorrect unit price and discount value. To solve this, I have made changes to report net rates in cases where the margin is added or is an internal company transfer.
 2022-07-26 12:57:47 +05:30
Deepesh Garg
85802b0f97 Merge pull request #31602 from rtdany10/patch-19 
fix(india): e-way bill json for unregistered gst category
 2022-07-22 13:11:19 +05:30
Maharshi Patel
1d69ce1932 fix: (india) add overseas in HSN wise report 
SQL query had WHERE `tabSales Taxes and Charges`.parent = `tabSales Invoice`.name. However, In overseas, there is no `tabSales Taxes and Charges` so I changed the query to use a combination of INNER JOIN and LEFT JOIN to fetch all entries.
 2022-07-21 13:27:30 +05:30
Maharshi Patel
b0efb98237 fix: (india) (e-invoice) qty should not be changed to 1 
Qty of 0 is allowed so can't change item.qty to 1  instead created item_qty and used it.
 2022-07-19 22:29:38 +05:30
Maharshi Patel
6e6b55ece0 fix: (india) (e-invoice) discount in CN/DN 
discount fixes
 2022-07-19 15:31:34 +05:30
Deepesh Garg
f02596242c Merge pull request #31609 from deepeshgarg007/gstr_3b_gst_category 
fix(India): Inward supplies from Composition Supplier in GST 3B report
 2022-07-19 10:23:44 +05:30
Deepesh Garg
144057f7e3 Merge pull request #31583 from maharshivpatel/fix-e_invoice-cn-dn-qty-0-error 
fix: (india) (e-invoice) CN / DN with 0 qty and discount issues
 2022-07-18 09:09:19 +05:30
Maharshi Patel
2066e5a53a discount settings for e-invoice added and test cases 2022-07-17 15:08:40 +05:30
Deepesh Garg
b147ce4206 fix(India): Inward supplies from Composition Supplier in 3B report 2022-07-17 00:43:25 +05:30
Deepesh Garg
0d6beed546 test: Update test case 2022-07-16 14:06:01 +05:30
Maharshi Patel
844758a27c fix: (india)(einvoice) discount for CN DN 2022-07-15 16:54:10 +05:30
Maharshi Patel
1f4d434675 fix: (india) (e-invoice) discount calculation 
I have added fixes for discount in e-inovice.
 2022-07-15 16:03:42 +05:30
Dany Robert
01d6df45d0 fix(india): e-way bill json for unregistered gst category 2022-07-15 11:17:41 +05:30
Maharshi Patel
82539fc18a fix: (india) (e-invoice) allow generation for UIN Holders 
e-invoice is required for UIN Holders and they should be treated as Registered Regular. there was incorrect if hasattr check that prevented UIN number validation.
 2022-07-14 15:12:51 +05:30
Maharshi Patel
84f260e1d8 fix: (india) (e-invoice) CN / DN with 0 qty 
Qty 0 is allowed when creating Credit or Debit Note this caused ZeroDivisionError during unit_rate calculation.
fixed the issue by adding required conditionals.
 2022-07-13 01:39:36 +05:30
Deepesh Garg
57dc1026c8 test: Add test for einvoice discounts 
(cherry picked from commit 38352b3e46)
 2022-07-03 08:05:22 +00:00
Deepesh Garg
9ba7290dc9 fix(India): Discounts in E-Invoicing 
(cherry picked from commit f337213f33)
 2022-07-03 08:05:21 +00:00
Deepesh Garg
b3169edfc8 Merge pull request #31275 from frappe/mergify/bp/version-13-hotfix/pr-31247 
fix(india): e-invoice eligibility if company gstin is not configured (backport #31247)
 2022-06-17 21:41:44 +05:30
Deepesh Garg
a1ba8475d0 fix(India): Sales taxes and charges template fetching in quotation 
(cherry picked from commit 243625898e)
 2022-06-14 05:47:55 +00:00
Saqib Ansari
fb1325d7a5 Merge branch 'version-13-hotfix' into mergify/bp/version-13-hotfix/pr-31247 2022-06-13 17:08:23 +05:30
Deepesh Garg
176a6722e5 chore: cleanup 
(cherry picked from commit 50aafdbe99)
 2022-06-10 05:19:55 +00:00
Deepesh Garg
e5d2c59929 fix(India): Incorrect taxable in GSTR-3B report 
(cherry picked from commit 20f568c159)
 2022-06-10 05:19:54 +00:00
Saqib Ansari
7696ae4de1 fix(india): e-invoice eligibility if company gstin is not configured (#31247) 
(cherry picked from commit fb4f8d870b)
 2022-06-08 04:06:58 +00:00
Deepesh Garg
281fe34457 Merge pull request #31236 from frappe/mergify/bp/version-13-hotfix/pr-31231 
fix(India): Supplies from composite dealer not showing up (backport #31231)
 2022-06-06 12:24:20 +05:30
Deepesh Garg
15712c742b fix(India): Supplies from composite dealer not showing up 
(cherry picked from commit db07831db7)
 2022-06-06 03:30:59 +00:00
Deepesh Garg
abe9fe70ce fix(India): GSTIN filter in GSTR-1 report 
(cherry picked from commit f0ac394d6e)
 2022-06-06 03:28:38 +00:00
Deepesh Garg
910ab405ae Merge pull request #31188 from frappe/mergify/bp/version-13-hotfix/pr-31088 
feat(india): Check E-way Bill Status before Cancellation. (backport #31088)
 2022-05-31 21:41:54 +05:30
Rucha Mahabal
cdb884bbf2 fix: conflicts 2022-05-31 13:11:32 +05:30
Rucha Mahabal
66deee1582 test: set country to India before running regional tests 
(cherry picked from commit 2e98e9e0b9)
 2022-05-31 13:11:32 +05:30