Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
44,416 Commits 3 Branches 0 Tags 1 GiB
60d3b86cdb
Commit Graph

343 Commits

Author SHA1 Message Date
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
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
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
f0ac394d6e fix(India): GSTIN filter in GSTR-1 report 2022-06-02 12:59:55 +05:30
Deepesh Garg
6edbc58873 fix: Handle missing HSN Codes 
(cherry picked from commit ce3a21eb039453d4786dfd0871a278b588039d80)
 2022-05-25 07:04:44 +00:00
Deepesh Garg
b2d24e2f93
chore: Linting issues 2022-05-16 10:40:55 +05:30
Deepesh Garg
f83e32ab64
chore: resolve conflicts 2022-05-15 20:43:47 +05:30
Deepesh Garg
4ca7a3de4e fix: Just add one rate in GST HSN Code 
(cherry picked from commit ed76687dac52b81df2b9a415b8ce88c648da1446)
 2022-05-15 15:04:22 +00:00
Deepesh Garg
5ac4bf9750 chore: Linting Issues 
(cherry picked from commit 8af30bcc160c335f2d0898e52af85fd7673ba903)
 2022-05-15 15:04:20 +00:00
Deepesh Garg
edb3ef7222 fix: UOM in HSN-wise summary of outward supply 
(cherry picked from commit cd7d5cdb2201b904bcf5ccfdcb1c4f29cd7e1369)
 2022-05-15 15:04:19 +00:00
Deepesh Garg
c6b98d8de9 fix: Multiple fixes in GSTR-1 report 
(cherry picked from commit f2cbb703252564149620a26d6f52800b18c53632)

# Conflicts:
#	erpnext/regional/report/gstr_1/gstr_1.py
 2022-05-15 15:04:16 +00:00
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
Deepesh Garg
a31f577c9e fix: Vat Audit report fixes 
(cherry picked from commit d5319a48269a4277818486e7ed74468e9107b8f4)
 2022-05-02 10:44:37 +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
b532ade383 fix: Download JSON for GSTR-1 report 2022-04-08 17:14:10 +05:30
Ankush Menat
494bd9ef78 style: format code with black 2022-03-28 18:52:46 +05:30
Chillar Anand
fe4b6771b5
refactor: Remove dead code (#30140) 2022-03-09 17:16:05 +05:30
Deepesh Garg
45eed7167c
Merge pull request #29654 from alyf-de/revert-bu-schluessel 
revert: BU Schlüssel (a21f76f)
 2022-03-09 16:48:54 +05:30
Sagar Vora
3936d8b70e refactor: remove India specific code 2022-02-20 11:48:04 +05:30
Deepesh Garg
a28ec89507
Update gstr_1.js 2022-02-19 19:35:57 +05:30
Deepesh Garg
87b074ac09 fix: GSTIN filter for GSTR-1 report 2022-02-17 22:01:00 +05:30
Deepesh Garg
19e281a54f
Merge pull request #29700 from vorasmit/gstr-1-fixes 
fix(India): Report GSTR-1 minor fixes
 2022-02-12 17:16:24 +05:30
barredterra
5811d9e318 fix: encode filters for URI 2022-02-09 17:53:33 +01:00
Sagar Vora
2bc157a95c fix: cleaner implementation for get_invoice_type 2022-02-09 17:48:24 +05:30
Smit Vora
6e679a5ad2 fix(India): Report GSTR-1 minor fixes 2022-02-09 17:48:24 +05:30
barredterra
363ed9ccba revert: BU Schlüssel (a21f76f) 2022-02-05 14:06:18 +01:00
Saqib Ansari
a1f3dc4e9e chore: remove unnecessary imports 2022-01-28 16:58:13 +05:30
Saqib Ansari
2c100a5313
Merge branch 'develop' into revert-drop-einvoicing 2022-01-28 14:34:29 +05:30
Saqib Ansari
c5782b0e71 revert: "refactor!: drop e-invoicing integration from erpnext (#26940)" 
This reverts commit c335962827.
 2022-01-27 20:09:56 +05:30
Ankush Menat
b05287dea0
fix: drop six code (#29479) 2022-01-27 20:08:05 +05:30
Deepesh Garg
55c445cd37 fix: JSON for nil/exempt and non gst 2022-01-13 22:39:57 +05:30
Deepesh Garg
7d85755595 fix(India): NIL Rated, Exempted and non gst invoices in GSTR-1 report 2022-01-10 12:50:34 +05:30
Deepesh Garg
fe929304cf fix: Currency in KSA VAT report 
(cherry picked from commit 1d87e9d8f67e3611993d638f2d422fe66acf2c00)
 2022-01-06 10:53:14 +00:00
Saqib Ansari
6a239c8ea3 test: test_hsn_summary_for_invoice_with_duplicate_items 2021-12-13 20:58:35 +05:30
Saqib Ansari
e74739a677 fix: hsn-wise summary is incorrect if an invoice has repeated item code 2021-12-12 19:53:33 +05:30
Ankush Menat
f862339024 fix: use get_all instead of get_list for child tables 2021-11-29 13:04:29 +05:30
Deepesh Garg
0dca97eb9f fix(India): Sales Invoice with duplicate items not showing correct taxable value 2021-11-10 21:07:48 +05:30
Deepesh Garg
c81d4734c4 fix: KSA VAT setup issues 2021-11-08 17:14:03 +05:30
Ankush Menat
8fe5feb6a4 chore: remove all six compat code 2021-11-05 11:16:29 +05:30
Ankush Menat
6098e92ba9 chore: remove utf-8 compat code 2021-11-05 11:16:29 +05:30
Raffael Meyer
114028e473
feat: replace newline in remarks (DATEV report) (#28152) 2021-11-04 21:44:24 +05:30
Dany Robert
4c499e804a
fix: wrong vat amount 2021-10-19 14:12:59 +05:30