Ankush Menat
57c3d373a7
fix(India): Add GST state code for Ladakh
2021-02-15 15:03:50 +05:30
Afshan
c44d6b9546
fix: NoneType object has no attribute len() ( #24616 )
2021-02-12 12:24:41 +05:30
Saqib
f25ab6f826
fix: validate cancellation only if irn generated ( #24608 )
2021-02-11 17:50:57 +05:30
Anuja Pawar
e3c72a3d71
fix: fix filters for the report ( #24594 )
2021-02-11 11:06:12 +05:30
Saqib
7b2afaf349
fix: NoneType has no len() ( #24600 )
2021-02-10 17:21:12 +05:30
pateljannat
1ab95413be
fix: conditions simplified
2021-02-09 17:35:17 +05:30
Afshan
53dbe39d12
fix: StopIteration error when e-invoice not enabled ( #24548 )
...
* fix: StopIteration error when e-invoice not enabled
* chore: update message
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
2021-02-08 12:32:42 +05:30
Saqib
9490122abb
fix(e-invoice): skip e-invoice generation for non-taxable invoices ( #24568 )
2021-02-08 11:40:56 +05:30
Saqib
f29b811a56
fix(e-invoice): do not validate gstin for exports ( #24561 )
2021-02-06 17:55:20 +05:30
Nabin Hait
7177579051
fix: Dependant sle logic fixes ( #24489 )
...
* fix: Dependant sle logic fixes
* fix: negative qty validation
* fix: Travis fixes
2021-02-02 22:03:07 +05:30
Nabin Hait
243d59b0c3
Reposting logic fixes ( #24520 )
...
* fix: Dependant sle logic fixes
* fix: negative qty validation
* fix: Travis fixes
* fix: test fix
2021-02-02 16:55:13 +05:30
Saqib Ansari
cee3670167
chore: clean up sales invoice form
2021-02-01 15:45:26 +05:30
Suraj Shetty
055b81da7b
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2021-02-01 15:10:52 +05:30
Saqib
77d5f59376
fix: discount amount calculation on net total ( #24497 )
2021-01-29 14:24:08 +05:30
Suraj Shetty
0a8939e1c1
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2021-01-29 08:56:22 +05:30
Saqib
ac9e6ff704
fix(pos): multiple pos fixes and additions ( #24227 )
...
* fix: make custom fields in pos invoice similar to sales invoice
* feat: allow/disallow rate & discount change
* fix: any pos profile can be selected while creating pos opening
* fix: cannot add item to cart
* fix: validate phone payment only if payment request exists
* fix: replace pos payment method patch
* chore: rearrange item & customer group filter
* fix: allow/disallow invoice level discount
* fix: updating qty of item with uom having space char
* fix: move configuration checbox to config section
* fix: invalid item rate trigger
* fix: cannot remove item from draft invoices
* fix: customer currency not set in pos invoice
* fix: duplicate item error message
* fix: sales uom not fetched in pos invoice
* fix: cannot add taxes to pos invoice for uae region
* fix: cannot merge pos invoice into credit note
* fix: tax calculation while merging pos invoices
* feat: delete draft orders from order list
* fix: merging of pos invoice with pricing rules
2021-01-28 17:58:55 +05:30
Nabin Hait
a6213ccd61
Merge branch 'develop' into version-13-beta-pre-release
2021-01-28 17:36:08 +05:30
Deepesh Garg
b4be292217
fix: Item valuation for internal stock transfers ( #24200 )
...
* fix: Item valuation for internal stocktransfers
* fix: Consider conversion factor for invoices
* fix: Add missing set warehouse fields
* fix: Add validations and other fixes
* fix: Fixes in flow
* fix: Internal sales item link in Purchase Invoice
* fix: Debugging
* fix: Debug travis
* fix: Remove commented code
* fix: Rate forcing in sales order
* fix: Unreallized profit in Sales Register
* fix: Item wise gst sales register fix
* fix: From warehouse in Purchase Order
* fix: Target field in Sales Invoice
* fix: remove self
* fix: GST Purchasse register and other fixes
* fix: Add shipping_address to no field map
* fix: Ref doc map
* fix: Test Cases
* fix: address mapping between sales and purchase document
* fix: Import Error
* fix: Tax updation for internal invoices
* fix: Purchase Order and Invoice linking
* fix: Internal Party validation fix
* fix: validation
* fix(india): GST Taxes for intra state transfer
* fix(india): GST Taxes for intra state transfer
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-01-28 13:09:56 +05:30
Jannat Patel
3914aca647
fix: check for tax rate ( #24376 )
2021-01-28 12:25:15 +05:30
Raffael Meyer
f6f4376463
feat: remove german sales invoice validation ( #24441 )
...
This can be better achieved via Customize Form
(mandatory and mandatory_depends_on)
2021-01-28 12:16:26 +05:30
Raffael Meyer
1991ba7910
feat: temporary against account ( #24086 )
...
* feat: add temporaray against account nmber to datev settings
* feat: use temporary against account in datev report
* test: add temp against account number to test data
* test: include temp against aaccount in filters
2021-01-25 21:22:10 +05:30
Suraj Shetty
0c34a711eb
Merge branch 'develop' of github.com:frappe/erpnext into version-13-beta-pre-release
2021-01-25 16:06:38 +05:30
Kaviya Periyasamy
c680547be3
fix(einvoice): QRCode generation ( #24412 )
2021-01-24 10:59:37 +05:30
Deepesh Garg
0d26d24164
Merge pull request #24414 from Alchez/dev-irs-1099-year
...
fix: use supplied year for IRS 1099 forms
2021-01-22 12:17:43 +05:30
Suraj Shetty
f0ff23eac3
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2021-01-21 19:07:57 +05:30
Saqib
577d2bed6e
fix: failing einvoice test ( #24434 )
2021-01-21 18:43:55 +05:30
pateljannat
f110759897
fix: date validation
2021-01-20 18:12:48 +05:30
Saqib
e2ed2324c3
fix: (e-invoicing) qrcode image generation ( #24395 )
...
* fix: invalid taxable value of item for e-invoice
* fix: qrcode image duplicate error
* fix: net total discount calculation
* fix: auto fetch auth token
2021-01-20 13:17:42 +05:30
Rohan Bansal
97b9995f8f
fix: use supplied year for IRS 1099 forms
2021-01-19 19:10:03 +05:30
Suraj Shetty
bbc6bfd3c3
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2021-01-19 09:34:06 +05:30
Anuja Pawar
4569e52b45
fix: fix for not having fiscal year while creating new company ( #24130 )
...
* fix: Fiscal year fix while creating new company
* fix: for failing Travis
* fix: suggested changes
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
2021-01-14 19:24:30 +05:30
Saqib
53cb9f9f47
fix(e-invoicing): ux issues ( #24358 )
...
* fix: overseas invoice rounding adjustment
* fix: overseas shipping address
* fix: qrcode for document name having forward slash
* feat: sandbox mode toggle
* fix: cannot delete sales invoice if linked to e invoice req log
2021-01-13 21:00:44 +05:30
Anurag Mishra
1e396dcb2a
fix: validated GST state
2021-01-13 14:01:57 +05:30
Rushabh Mehta
7619d3d6d6
fix(merge): develop
2021-01-12 09:16:21 +05:30
pateljannat
3c55463b4b
fix: validation for ldc against supplier and section code
2021-01-07 12:41:44 +05:30
Deepesh Garg
5e15a5d230
Merge pull request #24186 from frappe/validate_regional_germany
...
fix: regional validation of sales invoice (germany)
2021-01-06 09:35:05 +05:30
Saqib
80e0952ba7
refactor: fetch & validate address from erpnext rather than gst portal
2021-01-05 16:04:25 +05:30
Saqib
a56a5ccefa
refactor: fetch & validate address from erpnext rather than gst portal ( #24297 )
2021-01-05 15:59:17 +05:30
Anurag Mishra
b864b09d40
Merge branch 'develop' into gratuity
2021-01-05 14:47:38 +05:30
Saqib
60460a6d23
fix(e-invoicing): minor calculation fixes ( #24282 )
2021-01-05 13:54:04 +05:30
Saqib
1f591ab02e
fix(e-invoicing): minor calculation fixes ( #24285 )
2021-01-05 13:53:51 +05:30
Saqib
f8f015c961
fix: cannot submit e-invoice if legal name not found
2020-12-31 13:28:08 +05:30
Saqib
2b67d57480
fix: cannot submit e-invoice if legal name not found
2020-12-31 13:26:05 +05:30
Saqib
fc7a11e2aa
fix (e-invoicing): item & invoice value calculation ( #24253 )
2020-12-31 11:35:46 +05:30
Karthikeyan S
a25cb9a563
fix(GST E Invoice): update live URLs for adaequare GSP ( #24251 )
2020-12-30 19:41:00 +05:30
Karthikeyan S
aa44c754de
fix(GST E Invoice): update live URLs for adaequare GSP ( #24248 )
2020-12-30 19:22:37 +05:30
Saqib
f946bbd032
fix: minor e-invoicing issues ( #24239 )
...
* fix: invoice value set to zero if rounded total disabled
* fix: unit rate & gross amount calculation
* fix: e-invoice-setup patch
* chore: no need to re-run the patch
* fix: item value & invoice value calculations
2020-12-30 14:43:42 +05:30
Raffael Meyer
a3462f6b0c
Merge branch 'develop' into validate_regional_germany
2020-12-29 11:58:57 +01:00
Anurag Mishra
dfe8f7601b
Merge branch 'develop' into gratuity
2020-12-29 13:27:03 +05:30
Saqib
17e96901db
feat: GST E Invoicing ( #23455 )
...
* feat: init e-invoice settings
* feat: read public key file
* feat: rsa encryption with public key
* feat: save token and sek from auth request
* chore: handle error response
* feat: AES decryption of SEK with appkey
* feat: decrypt json data with SEK
* feat: make e invoice from erpnext sales invoice
* feat: generate IRN
* feat: decode signed json and QR code
* chore: validations
* feat: cancel IRN
* feat: complete e-invoice schema
* chore: move e-invoice settings to regional
* chore: split einvoice settings and operations
* chore: rename schema to template & js cleanup
* feat: make IRN field on regional setup
* feat: Generate & Cancel IRN from Sales Invoice
* chore: minor fixes
* fix: item discount
* chore: show irn cancelled check after cancellation
* fix: hide cancel irn dialog on error
* fix: public key is required on validate
* fix: cannot find attached key file
* fix: validation if e invoicing is disabled
* fix: do not show generate irn for invalid supply type
* fix: update irn_cancelled after cancelling irn
* chore: show irn field for proper gst_category
* feat: e-way bill details in e-invoice
* fix: save e-way bill no on irn generation
* chore: no copy on e invoice custom fields
* feat: cancel e-way bill before cancelling IRN
* feat: manual download / upload json
* chore: group e-invoicing actions
* fix: fn name
* chore: save signed invoice and qrcode after uplaoding irn
* fix: fetch token if not valid
* chore: move einvoicing stuff to seperate folder
* feat: QRCode Image and E-Invoice Print Format
* fix: bug
* fix: invalid syntax
* chore: code cleanup
* chore: clean up e invoice actions
* fix: download & upload e-invoice
* fix: print format
* fix: validations
* fix: add permissions on regional setup
* feat: add patch
* fix: validate document name
* fix: return date
* fix: credit note einvoice
* fix: validations
* fix: error logging
* fix: e_invoice module not found
* fix: add missing package
* fix: rename e_invoice_utils.py
* fix: einvoice field validation
* fix: patch
* fix: invoice totals calculation
* fix: other charges calculation
* chore: improve document name validation message
* fix: qr code image string
* feat: initialize GSP connector
* chore: remove unwanted fields
* fix: qr code generation
* feat: fetch and cache GSTIN details
* feat: generate & cancel IRN
* feat: cancel eway bill
* chore: remove unwanted fuctions
* chore: clean up einvoice actions
* fix: attach qrcode on irn generation
* fix: generate & cancel IRN
* fix: show/hide eway bill fields
* fix: valiations
* feat: generate eway bill from IRN
* chore: remove unwanted imports
* chore: error logging
* feat: header & footer in GST E Invoice
* chore: remove test pincode
* fix: invalid syntax
* feat: cess non advolem on einvoice item
* chore: remove fetch token from e invocie settings
* fix: imports
* fix: error handling
* feat: update timeline on einvoice actions
* fix: qrcode image size
* fix: exclude intra company transactions
* fix: eway bill test
* fix: ewaybill mandatory conditions
* chore: add tests
* fix: returning condition
* feat: log e-invocing requests
* chore: add ack date and ack no field for print formats
* fix: sider issues
* feat: show e-invoice preview before IRN generation
* fix: use as_list for error message
* fix: minor ux issues
* fix: dialog is undefined
* fix: error handling
* feat: add docs link to e invoice settings
* feat: multiple gstins for e invoicing
* fix: uncomment test condition
* fix: remove test pincode
* fix: cannot cancel irn without submitting sales invoice
* chore: code cleanup
* fix: sider issues
* fix: e invoice request log permissions
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-12-25 20:55:21 +05:30
Nabin Hait
0788df412c
fix: Removed permissions from UAE VAT Settings
2020-12-25 20:54:01 +05:30
Nabin Hait
f8c1cb5dc3
fix: Removed permissions from UAE VAT Settings
2020-12-25 20:53:18 +05:30
Saqib
6d74f5b59b
feat: GST E Invoicing ( #23455 )
...
* feat: init e-invoice settings
* feat: read public key file
* feat: rsa encryption with public key
* feat: save token and sek from auth request
* chore: handle error response
* feat: AES decryption of SEK with appkey
* feat: decrypt json data with SEK
* feat: make e invoice from erpnext sales invoice
* feat: generate IRN
* feat: decode signed json and QR code
* chore: validations
* feat: cancel IRN
* feat: complete e-invoice schema
* chore: move e-invoice settings to regional
* chore: split einvoice settings and operations
* chore: rename schema to template & js cleanup
* feat: make IRN field on regional setup
* feat: Generate & Cancel IRN from Sales Invoice
* chore: minor fixes
* fix: item discount
* chore: show irn cancelled check after cancellation
* fix: hide cancel irn dialog on error
* fix: public key is required on validate
* fix: cannot find attached key file
* fix: validation if e invoicing is disabled
* fix: do not show generate irn for invalid supply type
* fix: update irn_cancelled after cancelling irn
* chore: show irn field for proper gst_category
* feat: e-way bill details in e-invoice
* fix: save e-way bill no on irn generation
* chore: no copy on e invoice custom fields
* feat: cancel e-way bill before cancelling IRN
* feat: manual download / upload json
* chore: group e-invoicing actions
* fix: fn name
* chore: save signed invoice and qrcode after uplaoding irn
* fix: fetch token if not valid
* chore: move einvoicing stuff to seperate folder
* feat: QRCode Image and E-Invoice Print Format
* fix: bug
* fix: invalid syntax
* chore: code cleanup
* chore: clean up e invoice actions
* fix: download & upload e-invoice
* fix: print format
* fix: validations
* fix: add permissions on regional setup
* feat: add patch
* fix: validate document name
* fix: return date
* fix: credit note einvoice
* fix: validations
* fix: error logging
* fix: e_invoice module not found
* fix: add missing package
* fix: rename e_invoice_utils.py
* fix: einvoice field validation
* fix: patch
* fix: invoice totals calculation
* fix: other charges calculation
* chore: improve document name validation message
* fix: qr code image string
* feat: initialize GSP connector
* chore: remove unwanted fields
* fix: qr code generation
* feat: fetch and cache GSTIN details
* feat: generate & cancel IRN
* feat: cancel eway bill
* chore: remove unwanted fuctions
* chore: clean up einvoice actions
* fix: attach qrcode on irn generation
* fix: generate & cancel IRN
* fix: show/hide eway bill fields
* fix: valiations
* feat: generate eway bill from IRN
* chore: remove unwanted imports
* chore: error logging
* feat: header & footer in GST E Invoice
* chore: remove test pincode
* fix: invalid syntax
* feat: cess non advolem on einvoice item
* chore: remove fetch token from e invocie settings
* fix: imports
* fix: error handling
* feat: update timeline on einvoice actions
* fix: qrcode image size
* fix: exclude intra company transactions
* fix: eway bill test
* fix: ewaybill mandatory conditions
* chore: add tests
* fix: returning condition
* feat: log e-invocing requests
* chore: add ack date and ack no field for print formats
* fix: sider issues
* feat: show e-invoice preview before IRN generation
* fix: use as_list for error message
* fix: minor ux issues
* fix: dialog is undefined
* fix: error handling
* feat: add docs link to e invoice settings
* feat: multiple gstins for e invoicing
* fix: uncomment test condition
* fix: remove test pincode
* fix: cannot cancel irn without submitting sales invoice
* chore: code cleanup
* fix: sider issues
* fix: e invoice request log permissions
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-12-25 10:26:43 +05:30
Anurag Mishra
af9f172be8
fix: requested changes and sider
2020-12-23 18:07:53 +05:30
Anurag Mishra
46e1c09b45
style: Broken into smaller function
2020-12-23 18:07:53 +05:30
Anurag Mishra
493eea19e8
feat: added link from desk page and some minor fixes
2020-12-23 18:07:53 +05:30
Anurag Mishra
25c356894d
test: gratuity
2020-12-23 18:07:53 +05:30
Anurag Mishra
e1464a7bf0
feat: Indian Standard Gratuity Rule
2020-12-23 18:07:06 +05:30
Anurag Mishra
34a7250a2d
fix: Some enhancements and better validation
2020-12-23 18:07:06 +05:30
Anurag Mishra
0761301c2e
feat: Added all 3 standard slab for UAE
2020-12-23 18:07:06 +05:30
barredterra
df8ea19406
fix: whitespace
2020-12-22 17:34:31 +01:00
barredterra
2acd8cbc02
fix: sider
2020-12-22 17:34:22 +01:00
barredterra
511be6466d
Revert "fix: fail silently"
...
This reverts commit 6900a79421
2020-12-22 11:43:33 +01:00
barredterra
a69021018a
test: add test for accounts controller
2020-12-22 11:38:09 +01:00
barredterra
5adbe49ca6
refactor: translation syntax
2020-12-22 11:37:43 +01:00
barredterra
6900a79421
fix: fail silently
2020-12-22 11:37:13 +01:00
Deepesh Garg
e77e3aa36d
fix: Typo in tax category doctype query
2020-12-17 18:49:58 +05:30
Deepesh Garg
b074334dcf
fix: Typo in tax category doctype query
2020-12-17 18:46:59 +05:30
Deepesh Garg
a9db5a200f
Merge pull request #24160 from deepeshgarg007/tax_template_update_customer_v13
...
fix: Tax template update on customer address change
2020-12-16 21:51:01 +05:30
Deepesh Garg
ad59726f20
fix: Tax template update on customer address change
2020-12-16 20:51:59 +05:30
Your Name
3ebe511eb9
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2020-12-16 08:19:47 +00:00
Deepesh Garg
96a5e4effa
fix: Tax template update on customer address change
2020-12-16 13:00:55 +05:30
Rushabh Mehta
34fc528500
fix(minor): debounce taxes call
2020-12-16 09:44:11 +05:30
Nabin Hait
13dc63499a
Merge branch 'develop' into version-13-beta-pre-release
2020-12-15 09:06:27 +05:30
Deepesh Garg
05e8479521
Merge pull request #24117 from deepeshgarg007/gstr_opening_invoices
...
fix: Opening invoices in GSTR-1 report
2020-12-14 11:14:23 +05:30
Deepesh Garg
c838682188
fix: Opening invoices in GSTR-1 report
2020-12-14 10:35:16 +05:30
Nabin Hait
3423d94145
fix: Fixed merge conflict
2020-12-12 21:12:56 +05:30
Deepesh Garg
cfeca0dc87
fix: Show tax amount in base currencies
2020-12-06 18:28:30 +05:30
Deepesh Garg
a767085276
fix: Tax template update on supplier
2020-12-04 18:07:46 +05:30
Rohit Waghchaure
1ac040a418
fix: GSTR report
2020-12-01 13:50:01 +05:30
Deepesh Garg
d07447aa5f
fix: Validation for duplicate Tax Category ( #23978 )
...
* fix: Validation for duplicate Tax Category
* Update utils.py
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-11-24 08:09:17 +05:30
Deepesh Garg
06e16eb748
Merge pull request #23941 from pateljannat/place-of-supply-change-issue
...
fix: place of supply change on address change
2020-11-20 11:13:19 +05:30
pateljannat
1d5d863e9a
fix: removing return_taxes condition
2020-11-19 20:11:45 +05:30
pateljannat
cd05b34691
fix: company filter added again
2020-11-19 11:37:08 +05:30
Smit Vora
bbe4933a52
fix(regional): set proper state code in ewaybill JSON when gst_category is SEZ
2020-11-18 21:00:09 +05:30
pateljannat
410db04b48
fix: linter issue for translation syntax
2020-11-18 15:57:16 +05:30
Deepesh Garg
f0187f6db2
Merge pull request #23447 from hasnain2808/UAE-VAT-Format
...
feat: UAE VAT 201 Report
2020-11-18 15:15:00 +05:30
pateljannat
d0c528143f
Merge branch 'place-of-supply-change-issue' of https://github.com/pateljannat/erpnext into place-of-supply-change-issue
2020-11-18 12:52:24 +05:30
pateljannat
8c9b60edfe
fix: reversing previous commits and adding condition in regional controller
2020-11-18 12:51:13 +05:30
Jannat Patel
96a0c17626
Merge branch 'develop' into place-of-supply-change-issue
2020-11-18 10:27:20 +05:30
pateljannat
6b10d87d46
fix: place of supply change on address change
2020-11-17 20:34:51 +05:30
pateljannat
642819b955
fix: place of supply change when address changes
2020-11-17 09:47:10 +05:30
Mohammad Hasnain
d2477e6cc5
fix(UAE VAT 201): remove branch parts
2020-11-16 18:47:05 +05:30
Mohammad Hasnain
2e1787300d
feat(UAE VAT 201): emirate according to branch
2020-11-16 17:36:27 +05:30
Mohammad Hasnain
b8d0b546a7
feat(UAE VAT Format): use company address for emir
2020-11-16 12:58:38 +05:30
Raffael Meyer
7178df8567
fix: improve UX of DATEV report ( #23892 )
...
* feat(DATEV Settings): button to show report
* feat(desk): add DATEV to Reports under Accounting
* fix(report DATEV): last calendar month as default
* fix: let user create DATEV Settings
(Instead of showing an error message.)
2020-11-15 09:45:10 +05:30
Raffael Meyer
8ff0d0cff6
feat: make account number length configurable ( #23845 )
2020-11-15 09:34:05 +05:30
Mohammad Hasnain Mohsin Rajan
72adb0b218
Merge branch 'develop' into UAE-VAT-Format
2020-11-10 09:58:45 +05:30
Raffael Meyer
57ce0462d9
fix: remove check for exempt_from_sales_tax
2020-11-09 19:04:46 +01:00
Raffael Meyer
4f880e7454
refactor: zip_and_download ( #23844 )
2020-11-09 20:17:56 +05:30
rohitwaghchaure
94bfa6a659
Merge pull request #23843 from frappe/datev_check_fiscal_year
...
feat: validate fiscal year
2020-11-09 12:33:15 +05:30
Deepesh Garg
29a8994506
Merge pull request #23832 from deepeshgarg007/india_tax_template_fetch
...
fix: Auto Statewise gst tax template
2020-11-08 17:48:57 +05:30
Mohammad Hasnain
4d99d695a3
feat(uae vat 201): update desk page entry
2020-11-06 23:33:19 +05:30
Saurabh
7c06c28216
fix: merge-conflicts
2020-11-06 19:08:58 +05:30
barredterra
f91d82b538
fix: imports
2020-11-05 17:28:39 +01:00
barredterra
815341d454
feat: validate fiscal year
2020-11-05 16:57:23 +01:00
Deepesh Garg
59ccb64e18
fix: Auto Statewise gst tax template
2020-11-05 16:29:34 +05:30
Mohammad Hasnain
bed4e85aec
fix(uae vat 201): date filters were not working
2020-11-04 10:44:22 +05:30
Mohammad Hasnain
510d0d3f20
Merge branch 'UAE-VAT-Format' of https://github.com/hasnain2808/erpnext into UAE-VAT-Format
2020-11-04 10:32:22 +05:30
Mohammad Hasnain
f2c895ddb5
feat(uae vat 201): do not take zero and nil rated items in standard rated expense emiratewise
2020-11-04 10:31:37 +05:30
Mohammad Hasnain Mohsin Rajan
6a0b28bde3
Merge branch 'develop' into UAE-VAT-Format
2020-11-02 23:59:13 +05:30
Mohammad Hasnain
7a034595fe
fix(UAE VAT 201): Remove Chart
2020-11-02 13:12:27 +05:30
Mohammad Hasnain
b0eca23485
Refactor(UAE VAT 201): Fix fomatiing
2020-11-02 12:47:10 +05:30
Mohammad Hasnain
c53237f5e0
refactor(UAE VAT 201): solve syntax errors
2020-11-02 11:02:41 +05:30
Mohammad Hasnain Mohsin Rajan
d322181fd7
refactor(UAE VAT 201): Update erpnext/regional/report/uae_vat_201/uae_vat_201.py
...
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
2020-11-02 10:29:38 +05:30
Mohammad Hasnain Mohsin Rajan
7b771d139c
refactor(UAE VAT 201): Update erpnext/regional/report/uae_vat_201/test_uae_vat_201.py
...
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
2020-11-02 10:29:14 +05:30
Mohammad Hasnain Mohsin Rajan
46265d3fc7
refactor(UAE VAT 201): Update erpnext/regional/report/uae_vat_201/test_uae_vat_201.py
...
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
2020-11-02 10:28:41 +05:30
Mohammad Hasnain Mohsin Rajan
be7a4c8b0a
refactor(UAE VAT 201): Update erpnext/regional/report/uae_vat_201/test_uae_vat_201.py
...
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
2020-11-02 10:28:14 +05:30
Mohammad Hasnain Mohsin Rajan
f116fbf84d
refactor(UAE VAT 201): Update erpnext/regional/report/uae_vat_201/test_uae_vat_201.py
...
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
2020-11-02 10:27:54 +05:30
Deepesh Garg
eacfd792e6
fix: fieldname
2020-10-30 22:12:24 +05:30
Deepesh Garg
db3fa4e6b2
fix: Place of Supply fix in Sales Invoices
2020-10-30 19:19:48 +05:30
Mohammad Hasnain
eb3084b072
refactor(UAE VAT 201): break functions
2020-10-29 09:52:17 +05:30
Mohammad Hasnain
bf261a6c39
fix(UAE VAT 201): fix helper
2020-10-29 00:07:52 +05:30
Mohammad Hasnain
08846f6b11
refactor(UAE VAT 201): replace cartesian product to inner joins
2020-10-28 23:33:56 +05:30
Mohammad Hasnain
2c00549dfe
refactor(UAE VAT 201): Use frappe api instead sql
2020-10-28 22:54:56 +05:30
Mohammad Hasnain
81f2efd9b0
chore(UAE VAT 201): Rename emirate to vat emirate
2020-10-28 10:28:25 +05:30
Mohammad Hasnain
5953acab8b
chore(UAE VAT 201): cleanup
2020-10-25 15:43:21 +05:30
Mohammad Hasnain
0ceae0bd66
feat(UAE VAT 201): emirate customizable
2020-10-25 13:06:42 +05:30
Mohammad Hasnain
0ac40c75aa
chore(UAE VAT): update tesr dependencies
2020-10-25 01:16:06 +05:30
Mohammad Hasnain
8796567b42
chore(UAE VAT 201): add puctuation
2020-10-20 16:35:28 +05:30
Mohammad Hasnain
33e9a1ab31
refactor(UAE VAT 201): solve linting issues
2020-10-20 13:04:38 +05:30
Mohammad Hasnain
6a24da4efd
refactor(UAE VAT 201): break functions
2020-10-20 11:53:06 +05:30
Mohammad Hasnain
c08591124c
chore(UAE VAT 21): solve merge conflicts
2020-10-20 10:17:48 +05:30
Mohammad Hasnain
234036df32
chore(uae vat 201): solve travis issues
2020-10-20 07:42:10 +05:30
Mohammad Hasnain
853fd03f49
feat(uae vat 201): fix linter issues
2020-10-19 22:35:16 +05:30
Mohammad Hasnain
33cdfdfb7f
feat(UAE VAT 201): Add tests for report
2020-10-19 20:48:43 +05:30
Mohammad Hasnain
c1b8004757
feat(UAE VAT 21): claimable to recoverable
2020-10-19 20:47:56 +05:30
Mohammad Hasnain
32eb9a7893
feat(UAE VAT 201): claimable to recoverable
2020-10-19 17:58:50 +05:30
Mohammad Hasnain
b9dc13294d
chore(UAE VAT 201) solve translations issues
2020-10-14 16:56:26 +05:30
Mohammad Hasnain
dfc3993cec
chore(UAE VAT 21): rename report
2020-10-14 12:21:36 +05:30
Mohammad Hasnain Mohsin Rajan
abf628c95d
Merge branch 'develop' into UAE-VAT-Format
2020-10-14 00:26:57 +05:30
barredterra
9aa3e7a37d
feat: address template for luxembourg
2020-10-13 13:35:33 +02:00
Mohammad Hasnain
ac451b3a54
feat(UAE VAT 21): Move standard rated expense from Sales invoice to Purchase invoice
2020-10-11 01:40:22 +05:30
hasnain2808
f8db9582c3
feat(UAE VAT 21): Add currency formatting
2020-10-01 12:59:39 +05:30
hasnain2808
8cc6f2b388
feat(UAE VAT 21): add fixed width to columns
2020-10-01 12:44:39 +05:30
hasnain2808
10a3a338b6
refactor: change uae vat settingplural
2020-09-30 21:51:00 +05:30
hasnain2808
3294f86b92
refactor: fix linting
2020-09-30 12:15:07 +05:30
barredterra
81ad90c1d4
feat: validate sales invoice for germany
2020-09-29 11:54:57 +02:00
hasnain2808
23c8966e81
Merge branch 'develop' into UAE-VAT-Format
2020-09-28 20:06:02 +05:30
hasnain2808
2c62d946f5
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2020-09-28 20:03:27 +05:30
hasnain2808
80068e16e8
Refactor(UAE VAT 21): Replace f-strings by format
2020-09-28 18:58:27 +05:30
hasnain2808
0860c74c82
feat(UAE VAT 21): Add permissions for doctypes
2020-09-28 14:38:45 +05:30
hasnain2808
2d30148940
feat(UAE VAT 21): Add vat settings
2020-09-28 14:38:14 +05:30
hasnain2808
2a601e59bf
fix(UAE VAT 21): remove extra legend
2020-09-28 13:26:43 +05:30
hasnain2808
bed1add349
docs(UAE VAT 21): add docstrings
2020-09-28 13:26:05 +05:30
hasnain2808
815b7584dd
refactor(UAE VAT 21): seperate get_chart, get_data
2020-09-28 13:24:40 +05:30
hasnain2808
79aca28453
refactor(UAE VAT 21): rename UAE VAT - UAE VAT 21
2020-09-28 12:27:41 +05:30
hasnain2808
127fbfcb93
feat(UAE VAT 21): Added Print Format
2020-09-25 20:42:54 +05:30
hasnain2808
321b5f54ae
feat(UAE VAT 21): Add Roles for UAE VAT 21 Report
2020-09-25 14:24:57 +05:30
hasnain2808
72cad2a8ab
feat(UAE VAT 21): Add zero rated and vat exempt
2020-09-25 13:13:38 +05:30
hasnain2808
5225215d31
feat(UAE VAT 21): Add rows for inputs and tourists
2020-09-24 18:41:43 +05:30
hasnain2808
3ef11b1d64
feat(UAE VAT 21): Add region fields for UAE VAT 21
2020-09-24 13:21:23 +05:30
barredterra
16f1435d63
fix: codacy
2020-09-11 18:57:58 +02:00
barredterra
41978ac882
Merge branch 'develop' into datev_refactor
2020-09-11 17:54:50 +02:00
hasnain2808
f44524dd3e
feat: Added a Chart to compare Vat and sales between emirates
2020-09-10 18:35:04 +05:30
hasnain2808
323791d123
refactor: added docstrings
2020-09-10 17:53:29 +05:30
hasnain2808
031d77be2e
feat: add reverse charge to uae vat report
2020-09-10 17:40:01 +05:30
hasnain2808
91f1e26672
feat: Add rated supplies rows in UAE VAT report
2020-09-10 13:55:14 +05:30
hasnain2808
7b7a8e1309
feat: RCM for UAE VAT
2020-09-09 20:54:30 +05:30
Marica
c8eca9d5f3
Merge branch 'develop' into handle-irs
2020-09-08 12:03:45 +05:30
hasnain2808
2744765757
feat(UAE VAT Format): add fields for emirates in address and sales invoice
2020-09-07 12:31:19 +05:30
Anurag Mishra
54cd194b41
feat: removed roles for some reginal report and added via setup
2020-09-03 13:52:40 +05:30
Deepesh Garg
cebf803455
fix: Update tax template on supplier address change
2020-09-01 16:15:28 +05:30
Afshan
d659774190
fix:tests
2020-08-28 13:40:48 +05:30
Afshan
7586c3408e
fix: test case
2020-08-28 12:56:37 +05:30
Afshan
b719620d0c
fix: handleling condition if default company doesn't exist
2020-08-26 20:55:16 +05:30
Afshan
7600960d2b
fix: returned empty list if non US based company
2020-08-26 18:40:11 +05:30
Deepesh Garg
f4b939754c
fix: Codacy fixes
2020-08-26 12:10:12 +05:30
Deepesh Garg
29f187f4f3
Merge branch 'develop' into hsn_wise_json
2020-08-26 12:05:59 +05:30
Deepesh Garg
c3fb68265f
fix: Do not update total for RCM invvoices if net taxes are zero
2020-08-25 13:35:33 +05:30
Deepesh Garg
afd2dd3570
fix: Unable to submit reverse charge invoice
2020-08-20 16:52:52 +05:30
Raffael Meyer
f0b9f660cd
Merge branch 'develop' into datev_refactor
2020-08-20 12:05:50 +02:00
Deepesh Garg
8aed48fe31
fix: Do not update total for RCM invvoices if net taxes are zero
2020-08-19 18:59:27 +05:30
Deepesh Garg
aaeb3980bc
feat: JSON download for HSN wise outward summary
2020-08-19 15:13:30 +05:30
Deepesh Garg
1fb1c08872
Merge pull request #23076 from deepeshgarg007/hsn_wise_outward_v13
...
fix: Tax amounts in HSN Wise Outward summary
2020-08-19 11:43:14 +05:30
Deepesh Garg
b240cfe401
fix: Remove print statements
2020-08-19 11:41:43 +05:30
Deepesh Garg
64ebbf0907
fix: Tax amounts in HSN Wise Outward summary
2020-08-19 11:41:33 +05:30
Deepesh Garg
1c14606c06
fix: Total calculations for multicurrency RCM invoices ( #23072 )
2020-08-18 19:32:52 +05:30
Deepesh Garg
21a220e2a5
fix: Update state code and union territory for Daman and Diu ( #22988 )
...
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2020-08-12 19:19:03 +05:30
Deepesh Garg
097d89f550
Merge pull request #22946 from deepeshgarg007/gst_export_wopay
...
fix: GSTR 1 report for exports without payment of Tax
2020-08-10 09:56:12 +05:30
Deepesh Garg
d4ecf426b7
fix: Place of supply fix
2020-08-08 22:33:18 +05:30
Deepesh Garg
5ac2fd94f0
fix: Taxable value for RCM
2020-08-08 22:28:13 +05:30
Deepesh Garg
ab611d5fd8
fix: GSTR 1 report for exports without payment of Tax
2020-08-07 14:47:40 +05:30
Marica
0c818927a5
fix: get_regional_address_details missing positional arg 'company' ( #22915 )
2020-08-05 16:47:41 +05:30
barredterra
517df5fb0e
fix: codacy (again)
2020-07-29 18:16:49 +02:00
barredterra
b719378ee5
fix: codacy
2020-07-29 18:11:04 +02:00
barredterra
dec2c90866
refactor: move datev-specific stuff to utils
2020-07-29 17:14:23 +02:00
Deepesh Garg
188273564c
fix: Multiple fixes in GST
2020-07-17 11:31:15 +05:30
Deepesh Garg
52c319cfa7
fix: Update RCM only for indian countries
2020-07-16 00:23:58 +05:30
Deepesh Garg
0fa4143bac
fix: Cess amount in GSTR 3B report
2020-07-15 18:17:38 +05:30
