Deepesh Garg
8fd2d8b5d0
fix: Ignore validations for Tax Setup
2021-07-13 16:47:38 +05:30
Deepesh Garg
e166c264b4
fix: Update country-wise-tax JSON and tax setup
2021-07-13 16:47:38 +05:30
Deepesh Garg
3031535a24
fix: Add tax categories on company setup
2021-07-13 16:47:36 +05:30
Deepesh Garg
de8c6eb0da
fix: Item Tax templates for GST
2021-07-13 16:46:30 +05:30
Deepesh Garg
2a9726b09f
feat(India): Separate Input and Output GST tax accounts
2021-07-13 16:46:30 +05:30
Saqib
9e1819d366
fix: move the rename abbreviation job to long queue ( #26434 )
2021-07-12 14:31:57 +05:30
Ankush Menat
22cb642831
chore: update test company FY
2021-07-12 10:09:50 +05:30
Saqib
0b320b5909
Merge pull request #25798 from GangaManoj/asset-repair-refactor
...
refactor: Asset Repair
2021-07-07 12:44:50 +05:30
Mohammad Hasnain Mohsin Rajan
290350c86f
chore: add product listing link in settings ( #26026 )
...
* chore: add product listing link in settings
* chore: add icon in workspace card
Co-authored-by: Ankush <ankush@iwebnotes.com>
2021-07-07 12:10:02 +05:30
Saqib
4b69563a56
Merge branch 'develop' into asset-repair-refactor
2021-06-28 11:07:58 +05:30
Saqib
64c6b34b94
fix: too many writes while renaming company abbreviation ( #26142 )
2021-06-24 19:29:56 +05:30
Nabin Hait
5b462ad11a
fix: merge conflict
2021-06-24 15:36:51 +05:30
marination
ea2408744a
fix: Consider Website Item Groups in Item group page product listing
...
- Passed an argument to query engine to know when query is for item group page
- If for item group page, get data with regards to website item group table
- This query should be fast since there's one filter and that shortens the table beforehand
- This data is merged with the results from the Item master (results only considering item attributes and field filters)
- The combined data is then sorted as per weightage
Co-authored-by: Gavin D'souza <gavin18d@gmail.com>
2021-06-24 13:56:15 +05:30
Saqib
4b4eb990a9
Merge branch 'develop' into asset-repair-refactor
2021-06-22 16:21:13 +05:30
Suraj Shetty
6894cc2832
Merge pull request #26088 from surajshetty3416/refactor-website-routing
2021-06-17 20:43:23 +05:30
Deepesh Garg
ceb9d9e870
Merge branch 'develop' into patch-3
2021-06-17 18:26:42 +05:30
Suraj Shetty
00332d1834
Merge branch 'develop' of github.com:frappe/erpnext into refactor-website-routing
2021-06-17 09:47:16 +05:30
Nabin Hait
0950481253
fix: merge conflict
2021-06-15 20:18:06 +05:30
Suraj Shetty
d1902dfadb
Merge branch 'develop' of github.com:frappe/erpnext into refactor-website-routing
2021-06-14 12:25:49 +05:30
Ankush Menat
9891780f5a
perf(minor): remove unnecessary comprehensions (port #25645 )
2021-06-11 18:40:22 +05:30
Nabin Hait
42d72b55b8
Merge branch 'version-13-hotfix' into version-13-pre-release
2021-06-10 20:26:31 +05:30
Nabin Hait
27299cfcc5
Merge branch 'version-13-hotfix' into version-13-pre-release
2021-06-10 19:45:38 +05:30
Deepesh Garg
758db793be
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into tds_advance_payment_v13
2021-06-09 13:39:07 +05:30
Deepesh Garg
9a282aa593
Merge pull request #25858 from alyf-de/item-tax-templates
...
feat: Item Tax Templates for Germany
2021-06-09 12:50:27 +05:30
Saqib
6eeaf9b933
Merge branch 'version-13-hotfix' into asset-repair-refactor
2021-06-08 17:26:50 +05:30
Ganga Manoj
0ea4d850e1
fix: Allow all System Managers to delete company transactions ( #25834 )
2021-06-08 17:23:44 +05:30
Deepesh Garg
6f2dacc60c
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into tds_advance_payment_v13
2021-06-06 19:31:50 +05:30
Raffael Meyer
f6627550d1
fix: remove wrong tax_category
2021-06-02 15:17:00 +02:00
barredterra
3c748efae3
feat: add Item Tax Templates for german COAs "SKR03" and "SKR04"
2021-06-02 13:27:15 +02:00
barredterra
b6f27a4cae
feat: set is_default for german tax templates
2021-06-02 13:20:33 +02:00
barredterra
f259bf48aa
refactor: make tax category
2021-06-02 13:20:03 +02:00
barredterra
e3557ff131
Merge branch 'version-13-hotfix' into item-tax-templates
2021-06-02 12:17:27 +02:00
Eben van Deventer
7f2ae23dbf
Correct South Africa VAT Rate
...
On 1 April 2018 South Africa increased the VAT rate from 14% to 15%, this proposed change seeks to update the default parameters for a fresh ERPNext installation.
This was already done with a commit to version-13 branch under #25894 , this proposed change is to ensure that the update is pulled through to future versions.
2021-05-31 12:24:29 +02:00
Raffael Meyer
80540d38ba
fix: add_deduct_tax in Purchase Taxes setup ( #25871 )
2021-05-31 15:36:20 +05:30
Nabin Hait
a3d1b6973a
fix: merge conflict
2021-05-31 11:21:33 +05:30
Raffael Meyer
6038663bf8
fix: add_deduct_tax in Purchase Taxes setup ( #25757 )
2021-05-28 16:29:28 +05:30
Suraj Shetty
113a6f3d80
fix: Use frappe.safe_eval instead of eval
2021-05-28 09:10:34 +05:30
Suraj Shetty
c26d41acf9
chore: Remove unnecessary print statements
2021-05-28 09:09:36 +05:30
barredterra
50794407b4
feat: Item Tax Templates for Germany
2021-05-27 14:17:53 +02:00
barredterra
86ee3ebb09
feat: create tax category during taxes setup
2021-05-27 14:16:26 +02:00
barredterra
46d39d27aa
fix: validate company in taxes setup
2021-05-27 14:16:01 +02:00
GangaManoj
e5ab5d8963
feat(Asset Repair): Create GL Entries
2021-05-25 21:26:40 +05:30
GangaManoj
11594f870e
fix(Company): Add 'Repair and Maintenance Account' field
2021-05-25 21:26:38 +05:30
GangaManoj
88ac9b2ec9
fix(Company): Rename 'Fixed Asset Depreciation Settings' to 'Fixed Asset Deafults'
2021-05-25 21:26:38 +05:30
Ankush Menat
ff96bdf0c1
fix(ux): fix unstranslated text in msgprint/throw
2021-05-25 20:59:20 +05:30
Nabin Hait
db95db892c
fix: merge conflict
2021-05-25 19:33:23 +05:30
Ganga Manoj
99636c6aca
fix: rearrange buttons for company doctype ( #25617 )
2021-05-25 19:17:01 +05:30
Deepesh Garg
79b422c0a9
fix: Advance TDS in TDS payable monthly report
2021-05-25 17:33:59 +05:30
Suraj Shetty
b14a935c5d
Merge branch 'develop' of github.com:frappe/erpnext into refactor-website-routing
2021-05-25 11:02:03 +05:30
Suraj Shetty
2f8a742aa8
refactor: Replace render imports
2021-05-25 10:28:32 +05:30
