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
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
rohitwaghchaure
eb2a42d9e1
Merge pull request #22589 from deepeshgarg007/rcm_fix
...
fix: Do not add GST tax amount in grand total for reverse charge invoices
2020-07-14 13:42:48 +05:30
rohitwaghchaure
ac984eb37c
Merge branch 'develop' into project-link-for-all-accounts
2020-07-13 11:50:11 +05:30
Raffael Meyer
193e12f02a
fix: download button ( #22652 )
2020-07-12 17:26:27 +05:30
Sagar Vora
c9b4ba6de8
fix: ewaybill json had json dump of json dump, and other related fixes
2020-07-11 21:29:17 +05:30
Deepesh Garg
92a03aa5db
Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts
2020-07-06 12:37:28 +05:30
Deepesh Garg
62181707ee
Merge pull request #22574 from deepeshgarg007/uae_item_tax_fix
...
fix: Update item tax only if item code available
2020-07-03 21:25:28 +05:30
Deepesh Garg
04661a4e15
fix: Update item tax only if item code available
2020-07-03 21:23:23 +05:30
Deepesh Garg
3c004ad798
fix(GST): Do not add tax amount in grand total for reverse charge invoices
2020-07-02 21:18:29 +05:30
Anurag Mishra
c2523e8453
fixes: Payroll module pre relese test fixes ( #22500 )
...
* fix: salary payment based on payments
* fix: bank remittance report
* fix: Payroll period onboarding
* fix: provident-fund-deductions report
* fix: Considered unmarked days
* fix: onboarding paYroll
* feat: quick entry in payroll entry
2020-06-29 19:54:23 +05:30
Deepesh Garg
a74cffe7a4
Merge pull request #21047 from vishdha/feat_taxjar
...
feat(ERPNext Integrations): Taxjar Integration Added
2020-06-28 23:01:37 +05:30
Deepesh Garg
4c230ed4b0
Merge pull request #21690 from alyf-de/refactor_datev
...
fix(regional): DATEV report
2020-06-28 16:55:18 +05:30
vishdha
d3ec1c1d89
feat: Taxjar Integration Added
2020-06-24 16:37:21 +05:30
Anurag Mishra
ece9508eb5
fix: test_tax_for_payroll_period
2020-06-23 14:25:43 +05:30
Anurag Mishra
f9ca29cebd
Fix: if there is no component
2020-06-23 11:57:02 +05:30
Raffael Meyer
c3e91be48e
Merge branch 'develop' into refactor_datev
2020-06-22 19:53:47 +02:00
Deepesh Garg
d79e8e82cb
fix: Test cases
2020-06-22 10:00:12 +05:30
Anurag Mishra
289c82243f
feat: New Payroll module ( #21990 )
...
* feat: Moved Document to Payroll Module
* feat: Moved Reports to Payroll Module
* feat: Moved Print fromat With Patch
* feat: Moved Notifiction to Payroll Module and patches
* feat: added dashboard and desk page to Payroll
* feat: Payroll Dashboard
* feat: Module onboarding
* feat: Income tax Deductions Report
* feat: Ecs Checklist Report
* feat: Provident Fund Report
* feat: Professional Fund report and commonified Code
* feat: Total Payments Based On Payment Mode Report
* fix: refactor and added chart Total Payments Based On Payment Mode
* feat: Payroll Settings
* fix: Bank remittance Report
* feat(Payroll based on): Considered unmarked days
* feat: Added Help for condition an formula in Salary structure
* fix: requested changes
* fix: rename report Ecs checklist to salary_payments_via_ecs
* fix: renamed report report/total_payments_based_on_payment_mode
* fix: added role via setup.py for regional report
* feat: added All reports to desk page
* fix: frappe.reload doc in all patches
* fix: codacy
* fix: frappe.reload_doctype for patches
* patch: is_income_tax_component and component_type for salary component
* fix: uncommented code
* test: fixture
* fix: test
* test: test_payment_days_based_on_attendance
2020-06-19 19:17:57 +05:30
