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
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
Deepesh Garg
0511e8cc03
Merge branch 'develop' into rcm_develop
2020-06-17 15:33:29 +05:30
Anupam Kumar
0a3c34de01
address label chages ( #22137 )
...
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-06-17 10:53:13 +05:30
Deepesh Garg
5bf6bec656
fix: Consider Overseas category in RCM
2020-06-14 13:18:08 +05:30
Deepesh Garg
3a16b033b6
Merge branch 'develop' of https://github.com/frappe/erpnext into rcm_develop
2020-06-13 22:50:14 +05:30
Deepesh Garg
9df4532d14
fix: Travis(develop)
2020-06-11 21:33:43 +05:30
Rohit Waghchaure
60c1855014
fix: import supplier invoice not working
2020-06-04 14:31:35 +05:30
Deepesh Garg
24f9a80e7d
fix(India): Reverse charge mechanism for GST
2020-06-03 10:59:37 +05:30
karthikeyan5
ca46bedfcb
fix(ewb): remove checksum validation for TRANSIN
2020-05-30 15:00:56 +05:30
marination
29d7a7ea05
fix: Added permission via regional setup and patch
2020-05-27 22:14:36 +05:30
marination
3da51984f2
chore: Add Import Supplier Invoice to Menu
2020-05-27 22:13:40 +05:30
Deepesh Garg
5fa207f020
fix(UAE): Incorrect VAT rate display in Sales Invoice ( #21882 )
2020-05-26 18:02:21 +05:30
marination
90b4452a25
fix: Supplier Invoice No not fetched in Import Supplier Invoice
2020-05-21 14:03:29 +05:30
Deepesh Garg
9a914dc592
fix: Tax amount in GSTR-1 JSON
2020-05-19 20:01:25 +05:30
Deepesh Garg
007eda7164
fix: Instate Invoice not appearing in GSTR-1 report
2020-05-19 18:59:36 +05:30
Nabin Hait
10df3d5081
fix: Get basic and hra component from db, not from cache
2020-05-14 17:15:36 +05:30
barredterra
30d194d8a7
fix: hide transaction-specific for master data
2020-05-11 19:23:54 +02:00
barredterra
53445aa25a
fix: customer and supplier data
2020-05-11 19:15:49 +02:00
barredterra
2976831560
fix: truncate account names to max length
2020-05-11 19:15:03 +02:00
barredterra
55c048f56c
refactor: query meta data only once
2020-05-11 18:50:02 +02:00
barredterra
7a7add5001
fix(report view): explicitly set column width for
2020-05-11 18:36:57 +02:00
SDLyu
b2eb4ee0f9
Change <br> position
...
Change <br> position for better format
2020-05-07 17:09:17 +08:00
SDLyu
e164985903
Create taiwan.html
2020-05-07 16:49:29 +08:00
Raffael Meyer
3484a79ccf
Update datev_settings.json ( #21482 )
2020-04-30 16:27:11 +05:30
Anurag Mishra
33793d4e0d
fix: Permission issue Employee Tax exemption ( #21490 )
2020-04-29 11:48:41 +05:30
Deepesh Garg
57bfd38944
Merge pull request #21436 from deepeshgarg007/ewb_bill_error_message
...
fix: E-Way bill error message
2020-04-27 15:04:32 +05:30
Deepesh Garg
fe7e6f5f53
fix: Test
2020-04-27 14:05:45 +05:30
Deepesh Garg
00ea59b447
fix: Utils messsage cleanup
2020-04-27 10:50:40 +05:30
Deepesh Garg
d78cf97250
feat: Allow tax withholding category selection at invoice level ( #20870 )
...
* feat: Allow tax withholding category selection at invoice level
* fix: Linitng fixes
* feat: TDS calculation using common PAN
* fix: Add provision to deduct Lower TDS in purchase invoice
* fix: Consider only ref docs company while computing TDS
* fix: Default permission fixes
* fix: Add validation for dates in fiscal year
* fix: Undefined variable
2020-04-26 20:08:52 +05:30
Nabin Hait
58ee6c1e08
feat: Income tax slab ( #21399 )
...
* Feat: Multiple tax as per new taxation rule
* patch:for multiple tax slab, fix: payroll and exemption validation
* Test: Fixture
* feat: income tax slab with other charges and tax exempted deduction components
* fix: added missing init file
* fix: Patch fixed
* fix: Patch fixed
* fix: test fixes
* fix: validate duplicate exemption declaration
* fix: payment entry test case
Co-authored-by: Anurag Mishra <mishranaman123@gmail.com>
2020-04-26 17:45:57 +05:30
Marica
9942acd9d4
fix [ux]: Material Request Form Cleanup and UX ( #20810 )
...
* fix (ux): Material Request Form Cleanup
* fix: Get Items from popup UX
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-21 13:13:39 +05:30
Shivam Mishra
d9ce5843e5
chore: resolve conflicts
2020-04-13 13:43:04 +05:30
Syed Mujeer Hashmi
58a16f1a3b
fix: GSTR 3B Report tax amount calculation
...
The tax amount after discount amount should be considered for tax
calculation.
Fixes #21231
Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>
2020-04-11 00:52:10 +05:30
Raffael Meyer
28753268e6
fix(regional): DATEV report: description in header, quote nonnumeric values ( #21126 )
...
* fix description in header, quote nonnumeric values
* fix: truncate 'Buchungstext' to 60 chars
2020-04-08 09:26:18 +05:30
Raffael Meyer
9aae0c27c2
feat(regional): a central place for regional address templates ( #19862 )
...
* feat: a central place for regional address templates
* set up address templates during install
* why don't the tests run?
* fix: remove unused variables, fix cwd
* fix: .get() dicts contents
* fix: choose the right default
* fix: fieldname is template, not html
* fix: import unittest
* fix: remove unnecessary code
* fix: ensure country exists
* fix: ensure country exists
* feat: test updating an existing template
* fix(regional): DuplicateEntryError in test_update_address_template
* refactor and set 'is_default'
* fix codacy
* fix: patch gst_fixes
* fix: patch update_address_template_for_india
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-08 08:56:57 +05:30
Deepesh Garg
6c8efdef09
fix: User permissions in GSTR 3B report
2020-04-04 20:05:17 +05:30
Raffael Meyer
b0ab3981ea
fix(regional): header row in DATEV report ( #21113 )
...
* fix(regional): encoding of DATEV report
* feat(regional): filter datev report by voucher type
* fix: creation time, coa used, is frozen
* add voucher types: Payroll Entry, Bank Reconciliation, Asset, Stock Entry
* fix indentation
* fix indentation
* fix indentation
2020-03-31 10:40:03 +05:30
Shivam Mishra
1d6395c5cf
feat: add PAN details field to member for India
2020-03-30 18:14:44 +05:30
Raffael Meyer
89cac5af16
fix(regional): encoding of DATEV report ( #21059 )
2020-03-26 13:25:58 +05:30
Deepesh Garg
113c6c86b7
fix: Remove debug
2020-03-25 16:54:17 +05:30
Deepesh Garg
878e4fbcf8
fix: Place of supply validation in GSTR-1 report
2020-03-25 16:52:07 +05:30
Don-Leopardo
2b6a20aab5
fix: sql injection ( #20818 )
2020-03-16 22:36:44 +05:30
Deepesh Garg
9f28a3124c
Merge pull request #20890 from deepeshgarg007/itemised_purchase_register
...
fix: HSN code not visible in GST Itemised Purchase register
2020-03-10 10:05:31 +05:30
Deepesh Garg
5e58666091
fix: HSN code not visible in GST Itemised Purchase register
2020-03-09 22:38:41 +05:30
Marica
4528badfcf
fix: ModuleNotFoundError on Turkey Company setup ( #20853 )
2020-03-09 18:07:43 +05:30
Deepesh Garg
a245a3a47f
fix: HSN code no visible in GST itemised sales register
2020-03-04 10:23:49 +05:30
Deepesh Garg
cc56b690eb
Merge pull request #20582 from alyf-de/fix_datev
...
fix(regional): update DATEV Export to DATEV-Format v7.0
2020-02-19 19:36:45 +05:30
Deepesh Garg
15ff6a594b
feat: Inter warehouse stock transfer on valuation rate with taxation ( #20083 )
...
* fix: Validation for target warehouse
* feat: Get items on valuation rate in delivery note on Internal transfers
* fix: Create Inter company purchase receipt from delivery note
* feat: Inter company stock transfer on valuation rate with taxation
* fix: Add from warehouse in purchase invoice
* fix: Use get_value instead of get_cached_value
* fix: Get incoming rate instead of valuation rate
* fix: GL entry for from warehouse in purchase receipt
* fix: GL Entries fixes in purchase invoice
* fix: Address and tax fetching fixes
* fix: Add test case for stock transfer via purchase receipt
* fix: Code cleanup, added validations and test cases
* fix: Validation for supplier warehouse
* fix: Test Cases
* fix: Change validation condition
* fix: Address fixes while creating Purchase Receipt from delivery note
* fix: Set taxes while creating Purchase Receipt from Delivery Note
* fix: Update set_missing_value function
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-02-18 12:28:41 +05:30
Raffael Meyer
772394b95a
fix header
2020-02-13 20:58:59 +01:00
Raffael Meyer
54717fa993
update cloumn names
2020-02-13 20:58:44 +01:00
Raffael Meyer
3bacdf1f4b
quote format name
2020-02-13 20:40:15 +01:00
Raffael Meyer
96b66dfae6
update TRANSACTION_COLUMNS according to "DATEV Format v7.0"
2020-02-13 20:37:37 +01:00
Raffael Meyer
b555ed0cba
update header accoding to "DATEV Format v7.0"
2020-02-13 20:05:27 +01:00
Raffael Meyer
8818850174
consutant number and client number are mandatory
2020-02-13 17:13:15 +01:00
Raffael Meyer
46cf20825b
generated on is datetime, not date
2020-02-13 17:09:22 +01:00
Raffael Meyer
0070805bbb
add format version (data type)
2020-02-13 17:06:06 +01:00
Raffael Meyer
7d2777870e
bump version number
2020-02-13 17:05:37 +01:00
Raffael Meyer
4fb897728b
EXTF must be in quotes
2020-02-13 17:02:01 +01:00
Saqib
5e6ce88c78
fix: gst permission for gst settings & hsn code ( #20500 )
...
* fix: gst permission for gst settings & hsn code
* Fix: typo
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2020-02-03 15:40:35 +05:30
Deepesh Garg
cce3ac9f79
fix: Move E-Way bill button under create
2020-02-02 21:25:58 +05:30
Suraj Shetty
da2c69e836
fix(translations): Incorrect syntax
2020-01-29 15:34:06 +05:30
Suraj Shetty
48e9bc3fc9
fix: Incorrect translation syntax
2020-01-29 15:06:18 +05:30
Pawan Mehta
687cbc7c0c
fix : #20314
2020-01-15 23:44:36 +05:30
Deepesh Garg
ef0d26c161
feat: Validity for Item taxes ( #20135 )
...
* feat: Validity for Item taxes
* fix: Trigger for gst hsn code
* fix: Sort taxes based on validity
* fix: Validation for item tax template and filters based on validity
* fix: Add missing semicolon
* fix: Validate tax template only if item code available
* fix: Do not validate or filter item tax template if no item taxes applied
* fix: Consider item group for validating taxes
* fix: Test cases for item tax validation
* fix: Item tax template filtering fixes
* fix: Add missing semicolon
* fix: Remove unnecessary query
2020-01-06 15:34:15 +05:30
Rohit Waghchaure
2469fb9e35
fix: rounded total issue
2019-12-26 13:26:39 +05:30
Pawan Mehta
6e1ba43c3c
code fixes
2019-12-26 12:14:33 +05:30
Rohit Waghchaure
2c13a0533b
code cleanup
2019-12-26 12:14:32 +05:30
Pawan Mehta
bc40161d08
add ignore mandatory flag
2019-12-26 12:13:27 +05:30
Pawan Mehta
c3bb04ccb8
code improvements
2019-12-26 12:13:27 +05:30
hello@openetech.com
39b54cb889
validation change
2019-12-26 12:13:27 +05:30
hello@openetech.com
e9377e2513
review changes
2019-12-26 12:13:27 +05:30
hello@openetech.com
eb87566fa6
log encoding exception
2019-12-26 12:13:27 +05:30
hello@openetech.com
9e0762e8c2
code review changes
2019-12-26 12:13:27 +05:30
hello@openetech.com
5b33765a8c
discount handling
2019-12-26 12:13:27 +05:30
hello@openetech.com
90f170c376
code improvement
2019-12-26 12:13:27 +05:30
hello@openetech.com
c8e64235c0
codacy fixes
2019-12-26 12:13:27 +05:30
hello@openetech.com
309913bbdf
fix codacy issues
2019-12-26 12:13:27 +05:30
hello@openetech.com
5fadd355df
add naming series option
2019-12-26 12:13:27 +05:30
hello@openetech.com
fa8159efa3
mop options fix
2019-12-26 12:13:27 +05:30
hello@openetech.com
9964ad7870
python 2.7 fixes
2019-12-26 12:13:27 +05:30
hello@openetech.com
7021402a45
[feat] #19334
2019-12-26 12:13:27 +05:30
rohitwaghchaure
9c1d3f2f54
Merge pull request #20024 from deepeshgarg007/gstr_2_report_fix
...
fix: Tax amount not visible for some invoices
2019-12-20 13:34:53 +05:30
deepeshgarg007
ad9eb9b72c
fix: Tax amount not visible for some invoices
2019-12-19 20:57:40 +05:30
deepeshgarg007
c58dc873d5
fix: Get regional address details fix
2019-12-12 14:55:57 +05:30
Raffael Meyer
9e32f587f5
fix: remove contact info, use international format ( #19828 )
...
- for international letters, city and country should be upper case: https://www.deutschepost.de/content/dam/dpag/images/B_b/Briefe_ins_Ausland/downloads/dp-brief-international-handlingbroschuere-072019.pdf#page=15
- it is not customary, to use contact information such as phone number in the address
2019-12-10 21:41:05 +05:30
Deepesh Garg
6e2c13f4c8
feat(regional): Auto state wise taxation for GST India ( #19469 )
...
* feat(regional): Auto state wise taxation for GST India
* fix: Update gst category on addition of GSTIN
* fix: Codacy and travis fixes
* fix: Travis
* fix(test): Update GST category only if GSTIN field available
* fix: Test Cases
* fix: Do not skip accounts if place of supply is not present
* fix: Auto GST taxation for SEZ Party types
* fix: Automatic taxation for multi state
* fix: Codacy and travis fixes
* fix: Auto GST template selection in Sales Order
* fix: Move inter state check and source state to tax category
* fix: Remove unique check from tax template
* fix: Remove unique check from tax template
* fix: Address fetching logic in Sales
* fix: fecth tax template on company address change
* fix: fetch company gstin on address change
* fix: company_gstin set value fix
* fix: Mutiple fixes and code refactor
* fix: Add missing semicolon
* fix: Company address fetching in sales invoice
* fix: Remove print statement
* fix: Import functools
* fix: Naming fixes and code cleanup
* fix: Iteritems compatibility for python 3
2019-12-10 15:55:05 +05:30
deepeshgarg007
99309229bc
fix: Add missing semicolon
2019-12-06 19:59:54 +05:30
deepeshgarg007
ad53649f41
fix: Validation msg fix in GSTR-1 report
2019-12-06 19:34:49 +05:30
Anurag Mishra
10017c14f3
feat: HSN Code wise Item Tax ( #19478 )
...
* feat: HSN Code wise Item Tax
* feat: enqueued task of updating all items
2019-11-29 17:33:10 +05:30
Raffael Meyer
0de066c3b1
feat(regional): Add master data to DATEV Export ( #18755 )
...
* Add master data to export
* add SQL statements to get customers and suppliers
* make data category a string
* fix SQL error
* fix SQL errors
* unique column names
* add encoding of constants
* get customer primary address and contact
* fix typo
* fix typo
* binary response
* add filename
* add filecontent
* rename account columns
* exclude account groups
* use compression, close file before transfer
* fix StringIO
* add basic tests
* fix assertion, merge test methods
* fix indentation
* relative import of constants
* fix path
* import os
* Add default currency to test company
* root accounts with parent = null
* move account-related things to setup()
* add: test headers
* company and filters become class properties
* add: test csv creation
* (fix): add missing account
* (fix): remove wrong space
* add items to sales invoice
* refactor: create test data
* fix: create cost center
* fix: doctype Accoutn
* fix: make sure account belongs to company
* fix: remove customer group and territory, save on a new line
* create default warehouses
* fix: make Item myself
* fix: item defaults are a list
* fix: use my own warehouse
* fix: use my own expense account
* fix: let you take care of the Sales Invoice Item
* fix: import zipfile
* add TODOs
* fix: workaround for pandas bug
* SQL: utf-8 everywhere to make conversion in tests unnecessary
* tests: zipfile must be encoded string
* fix(tests): invalid start byte
* fix(test): give is_zipfile() the file-like object it expects
* fix(test): fix encoding of colums
* fix(get_transactions): as_dict is 1 by default
* fix(tests): allow empty data
* refactor: rename columns in get_account_names
* fix(pandas): keep sorting columns
* fix: "lineterminator" must be a string
* fix(test): check if cost center exists
* fix: credit limit became a child table
* fix: save company after creation
* insert instead of save
* tests: setup_fiscal_year
* fix(test): import cstr
* fix(tests): fiscal year
* fix: can't concat str to bytes
* fix: make csv-encoding work for py2 and py3
* fix(test): use frappe.as_unicode instead of unicode
* fix: use BytesIO instead of StringIO for py3 compatibility
* fix(tests): use BytesIO instead of StringIO for py3 compatibility
2019-11-29 17:32:17 +05:30
Prasad Ramesh
750b3a5946
fix: Button label case ( #19706 )
...
Json -> JSON
2019-11-29 17:30:46 +05:30
Rohit Waghchaure
c4e6c42950
fix: e-invoice issue
2019-11-21 11:20:49 +05:30
Tufan Kaynak
06c6f7cfd3
fix: Currency Exchange for_selling and for_buying on the same day ( #19339 )
...
* fix: test data of Currency Exchange to incluse buying and selling
test data of Currency Exchange to incluse buying and selling
* fix: Currency Exchange Test corrected to include selling and buying exchange_rate
Currency Exchange Test corrected to include selling and buying exchange_rate
* fix: Currency Exchange for_selling and for_buying fields test and functionality restored
In this fix:
* You can now add a separate exchange_rate in date for_selling and for_buying. You could not before because the unique field name was only calculated to allow a single name for a date
* tests did not account for for_selling and for_buying fields and thier uniqueness
* Update test_currency_exchange.py
* Update test_records.json
* fix: update test_records.json
* Update test_records.json
* The basic package for turkey is defined. It is empty now but applications specific to Turkey will be created under that package.
* fix: update code with scapes vs.tabs
updated the code regarding spaces issue
* Update currency_exchange.py
2019-11-11 17:11:16 +05:30
Deepesh Garg
a839510b33
Merge pull request #19528 from deepeshgarg007/gst_check_digit_msg
...
fix: GSTIN validation msg fix
2019-11-07 23:05:23 +05:30
deepeshgarg007
62fbf37eb4
fix: GSTIN validation msg fix
2019-11-07 21:54:25 +05:30
deepeshgarg007
015285c42f
fix: Exception handling in GSTR-1 Report
2019-11-07 19:38:52 +05:30
Raffael Meyer
edba06038e
feat(regional): enable transaction log for germany ( #19198 )
2019-11-06 19:07:04 +05:30
Deepesh Garg
dcb9c2031b
Merge branch 'develop' into datev_report_headers
2019-10-19 11:34:57 +05:30
Kenneth Sequeira
a54b7542f1
fix: sales invoice labels ( #19267 )
2019-10-10 18:50:39 +05:30
Rohit Waghchaure
c10064ae2c
fix: ImponibileImporto not getting calculated properly
2019-10-09 13:50:16 +05:30
Chinmay D. Pai
01aca675ef
chore: check if discount_percentage exists
...
fixes TypeError: '>' not supported between instances of 'NoneType' and 'float'
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2019-10-05 10:18:21 +05:30
Mangesh-Khairnar
5dcf2c669f
chore: remove unlinked letter head references ( #19138 )
2019-09-24 09:53:06 +05:30
rohitwaghchaure
76df782006
fix: Decimal point issue for e-invoice ( #19068 )
2019-09-16 19:43:17 +05:30
barredterra
5bd8562b5a
Merge branch 'develop' into datev_report_headers
2019-09-14 20:09:39 +02:00
marination
3d433efdfe
fix[minor]: Changed error message in GSTR-1 Report
...
Error message didn't prompt where the user has to add the missing value(GSTIN No.)
2019-09-13 16:28:11 +05:30
rohitwaghchaure
cdcff6c26d
Multiple port from v11 hotfix ( #18954 )
...
* fix: circular dependency during asset cancellation
* fix: ImponibileImporto for On Previous Row Total
* fix: PrezzoUnitario decimal issue
2019-09-09 10:15:01 +05:30
deepeshgarg007
366451fc62
fix: Minor fix in GSTR-1
2019-09-08 09:51:15 +05:30
Mangesh-Khairnar
d94a389dd3
chore: remove unwanted code ( #18645 )
2019-08-23 16:31:09 +05:30
Deepesh Garg
e9e0c0e7d4
fix: Minor fix in GSTR-1 report ( #18797 )
2019-08-21 14:40:35 +05:30
Raffael Meyer
17166a5662
fix typo
2019-08-14 01:22:29 +02:00
Raffael Meyer
e6013fb02d
improve error messages
2019-08-14 01:15:23 +02:00
Raffael Meyer
c29f594fc1
Check existance of DATEV Settings
2019-08-14 00:39:59 +02:00
Raffael Meyer
5fe44f906d
Add fiscal year
2019-08-14 00:31:00 +02:00
Raffael Meyer
df4edaa0fd
Use values from DATEV Settings
2019-08-14 00:13:31 +02:00
alyf-de
02522a0df5
Add DATEV Settings
2019-08-14 00:06:21 +02:00
Raffael Meyer
e4e7468972
Merge branch 'develop' into datev_report_headers
2019-08-13 23:17:28 +02:00
deepeshgarg007
9db6471fae
fix: Test Case
2019-08-11 17:29:09 +05:30
deepeshgarg007
4b28b3216b
fix: Test Cases
2019-08-11 17:28:55 +05:30
deepeshgarg007
c36abbcda3
fix: GSTR 3B report fixes
2019-08-11 11:01:02 +05:30
deepeshgarg007
b1f3e0224c
fix: GSTR-1 query fix
2019-07-24 21:36:56 +05:30
deepeshgarg007
a85db66146
fix: Usability fixes in accounting dimensions
2019-07-14 18:15:19 +05:30
