Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
41,804 Commits 3 Branches 0 Tags 1 GiB
3b6752dc8b
Commit Graph

1133 Commits

Author SHA1 Message Date
Saqib Ansari
cf13a20438
feat(india): generate qrcode button for e-invoice (#30939) 2022-05-10 12:07:47 +05:30
maharshivpatel
e5ebbf4799
fix(india): re-arrange e-way bill dialog fields (#30920) 2022-05-09 18:20:20 +05:30
Deepesh Garg
c9f6405b2a chore: Resolve conflicts 2022-05-09 10:33:03 +05:30
Deepesh Garg
85c137b3aa chore: Remove print statement 
(cherry picked from commit a8fbd2451b498ad49356cf0e6a710616ab802465)
 2022-05-08 14:07:00 +00:00
Deepesh Garg
3ae4b9033f chore: Remove extra columns 
(cherry picked from commit b0e929b8ae8780ada76ea6b699a2b4d840b31487)

# Conflicts:
#	erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py
 2022-05-08 14:07:00 +00:00
Govind S Menokee
d99b4e29b9 fix: HSN-wise-summary of outward supplies Updated Report 
Report changes done in order to meet the specification as per govt guideline - [GUIDELINE](https://taxguru.in/goods-and-service-tax/12-points-note-filing-gstr-1-01st-2021-onwards.html)

(cherry picked from commit 363752510ead7d3b86693d3659b2157753f2762d)

# Conflicts:
#	erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py
 2022-05-08 14:06:58 +00:00
maharshivpatel
b8dc40b7a0
feat(india): cancel e-way bill is enabled with e-invoicing APIs. (#30888) 2022-05-07 18:59:27 +05:30
maharshivpatel
b825179286
feat(india): store e-way bill auto calculated distance in sales invoice (#30908) 2022-05-07 18:46:12 +05:30
maharshivpatel
ee7a7eb782
fix(india): keyerror while generating e-way bill from an e-invoice (#30879) 2022-05-06 11:23:16 +05:30
maharshivpatel
80a13c38bc
fix(india): e-invoice generation for registered composition gst category type (#30814) 2022-05-02 21:51:27 +05:30
Saqib Ansari
2b354270eb
Merge pull request #30875 from deepeshgarg007/supply_type_einvoice 
fix(India): Supply type for overseas invoices with payment of tax
 2022-05-02 21:49:52 +05:30
Saqib Ansari
c8aa77285e fix: supply type for sez invoices with payment of tax 2022-05-02 21:15:54 +05:30
Deepesh Garg
d7cb269e0c fix: Supply type for overseas invoices with payment of tax 2022-05-02 19:23:43 +05:30
Deepesh Garg
a31f577c9e fix: Vat Audit report fixes 
(cherry picked from commit d5319a48269a4277818486e7ed74468e9107b8f4)
 2022-05-02 10:44:37 +00:00
Rushabh Mehta
548afba8bb
fix(minor): update frappe.error_log to new API (#30864) 
* fix(minor): update frappe.error_log to new API

* refactor: changes for updated log_error api

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-05-02 15:04:26 +05:30
Deepesh Garg
bfd053ed23
Merge branch 'develop' into uae_setup_cleaup 2022-04-30 19:54:40 +05:30
Deepesh Garg
67bb29026f fix: Ignore custom field validation while setup 2022-04-26 20:15:15 +05:30
Ankush Menat
cdac2b8c63 fix: ignore duplicate fixtures 2022-04-26 11:03:32 +05:30
Deepesh Garg
b1158bcb7c
Merge pull request #30799 from nextchamp-saqib/einv-cess-fix 
fix(india): cess value not considered while validating e-invoice totals
 2022-04-25 14:39:15 +05:30
Saqib Ansari
8e6c7a6bf7 fix(india): cess value not considered while validating e-invoice totals 2022-04-25 14:02:46 +05:30
Deepesh Garg
81b3342480
Merge pull request #30757 from nextchamp-saqib/einv-401-fix 
fix(india): 401 & 403 client error while generating IRN
 2022-04-21 18:55:26 +05:30
Saqib Ansari
ee8047aba3 fix(india): 401 & 403 client error while generating IRN 2022-04-20 14:14:29 +05:30
FinByz Tech Pvt. Ltd
54a05075f3 fix(india): transporter name is null while generating e-way bill (#30736) 
(cherry picked from commit 6291b28c37f02380001ab68b3a660b2804383ab2)
 2022-04-19 10:57:59 +00:00
Raffael Meyer
6453fb4cea
refactor!: remove DATEV integration (#30584) 
The DATEV integration follows the trend and moves into a separate app.

- the DATEV Integration will be maintained at https://github.com/alyf-de/erpnext_datev (version-14 branch)
- the German Compliance and Localization will be maintained at https://github.com/alyf-de/erpnext_germany
 2022-04-13 09:24:19 +00:00
Deepesh Garg
79b90118e1
Merge branch 'develop' into gst_download_json_key_error 2022-04-11 17:15:04 +05:30
Deepesh Garg
ddbd82af95
Merge pull request #30459 from frappe/mergify/bp/develop/pr-30385 
fix(India): Auto tax fetching based on GSTIN (backport #30385)
 2022-04-10 18:55:26 +05:30
Deepesh Garg
809117229d
Merge pull request #30626 from nextchamp-saqib/einv-utgst 
feat(india): e-invoicing for intra-state union territory transactions
 2022-04-10 18:54:17 +05:30
Deepesh Garg
02c6b898a6
Merge branch 'develop' into mergify/bp/develop/pr-30385 2022-04-09 19:57:59 +05:30
Deepesh Garg
2e00678c76
Merge pull request #30542 from deepeshgarg007/disabled_tax_category 
fix: Ignore disabled tax categories
 2022-04-09 19:52:31 +05:30
Deepesh Garg
b532ade383 fix: Download JSON for GSTR-1 report 2022-04-08 17:14:10 +05:30
Saqib Ansari
45fca6bed7 feat(india): e-invoicing for intra-state union territory transactions 2022-04-07 13:09:05 +05:30
Deepesh Garg
ec6f7040f4
Merge branch 'develop' into mergify/bp/develop/pr-30385 2022-04-06 10:00:51 +05:30
Saqib Ansari
7757790572
Merge pull request #30579 from nextchamp-saqib/eway-bill-dialog-fix 
fix: fetch from fields not working in eway bill dialog
 2022-04-05 15:51:38 +05:30
Saqib Ansari
c8779aa446 fix: fetch from fields not working in eway bill dialog 2022-04-05 15:44:17 +05:30
Saqib Ansari
2451452434
Merge branch 'develop' into e-inv-paid-invoice-fix 2022-04-05 13:12:08 +05:30
Ankush Menat
a896895a9e fix: bulk fix (~330) missing translations 2022-04-04 13:59:51 +05:30
Saqib Ansari
0c26f9a8c8 fix(india): cannot generate e-invoice for is_pos invoices 
* If mode of payment > 18 characters, the e-invoice portal throws error
 2022-04-04 12:28:09 +05:30
Deepesh Garg
485f5cfdfe fix: Resolve conflicts 2022-04-02 17:25:29 +05:30
Deepesh Garg
0f6d52c625 Merge branch 'develop' of https://github.com/frappe/erpnext into mergify/bp/develop/pr-30385 2022-04-02 17:24:19 +05:30
Deepesh Garg
9a6a181f14 fix: Ignore disabled tax categories 2022-04-01 14:46:26 +05:30
Deepesh Garg
532961fad2 fix(India): Tax fetching based on tax category 2022-03-30 19:33:44 +05:30
Deepesh Garg
03952f8819 fix(India): Auto tax fetching based on GSTIN 
(cherry picked from commit 7cae669e814a958310ca1b8ee408450569c32d10)

# Conflicts:
#	erpnext/patches.txt
#	erpnext/regional/india/setup.py
#	erpnext/selling/doctype/quotation/quotation.json
 2022-03-29 04:56:49 +00:00
Ankush Menat
494bd9ef78 style: format code with black 2022-03-28 18:52:46 +05:30
Deepesh Garg
363e676a35 fix: Reset GST State number 2022-03-21 16:28:17 +05:30
Deepesh Garg
e33d4713cd
Update erpnext/regional/saudi_arabia/utils.py 
Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com>
 2022-03-14 18:35:49 +05:30
Deepesh Garg
1faca0eb5a
Merge branch 'develop' into vat_amount_in_ksa 2022-03-14 17:36:16 +05:30
Deepesh Garg
be56efad26 fix: Itemised tax rate updation 2022-03-14 17:17:01 +05:30
Deepesh Garg
3cc2e53b08 fix: Linting Issue 2022-03-14 16:27:04 +05:30
Deepesh Garg
b37559c535 fix: KSA E-Invoice QR Code showing wrong VAT amount 2022-03-14 16:13:35 +05:30
Deepesh Garg
5ae610bd32
Merge pull request #30039 from deepeshgarg007/gstr_3b_nil_exempt_fixed 
fix: Nil and Exempted values in GSTR-3B Report
 2022-03-13 20:00:48 +05:30