Commit Graph

471 Commits

Author SHA1 Message Date
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