Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
36,619 Commits 3 Branches 0 Tags 1 GiB
794807ecc3
Commit Graph

1810 Commits

Author SHA1 Message Date
GangaManoj
42c70fba3c fix: Modify depreciation schedule when increase_in_asset_life is not a multiple of frequency_of_depreciation) 2021-07-09 22:11:50 +05:30
GangaManoj
58bc967073 fix: Rename 'Fixed Asset Depreciation Settings' to 'Fixed Asset Deafults' 2021-07-09 22:10:35 +05:30
Mohammad Hasnain Mohsin Rajan
00f90c50c0 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 18:21:12 +05:30
Deepesh Garg
9b6d9a41f4 fix: Test Cases 2021-07-05 17:08:27 +05:30
Deepesh Garg
63096014a7 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into bootstraped_gst_setup 2021-07-02 20:30:18 +05:30
Deepesh Garg
ebc46c1e09 fix: Update account heads in GST test cases 2021-06-28 10:52:38 +05:30
Deepesh Garg
1e5482cedd fix: Revert Changes 2021-06-26 23:49:32 +05:30
Saqib
b3a0a7b432
fix: too many writes while renaming company abbreviation (#26203) 2021-06-24 19:30:10 +05:30
Deepesh Garg
0bfffddac4 fix: Test Cases 2021-06-23 15:37:17 +05:30
marination
d802d73973 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-23 14:24:13 +05:30
Deepesh Garg
35e11fbea6 fix: Tests 2021-06-23 13:17:01 +05:30
Deepesh Garg
208b5f9e73 chore: Add comments 2021-06-23 12:44:56 +05:30
Deepesh Garg
40a4330ec1 fix: Move tax categories up in country wise json 2021-06-23 12:38:37 +05:30
Deepesh Garg
673470705b Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into bootstraped_gst_setup 2021-06-23 11:33:15 +05:30
Eben van Deventer
ddef85ae97
fix: Correct South Africa VAT Rate (#25894) 
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.
 2021-06-17 18:43:30 +05:30
Ankush Menat
a9c84f749a
perf(minor): remove unnecessary comprehensions (#25645) 2021-06-11 16:00:48 +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
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
Deepesh Garg
7c7c084159 fix: Check for tax category 2021-06-02 14:12:28 +05:30
Deepesh Garg
ca34eec2d6 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into bootstraped_gst_setup 2021-06-02 13:26:27 +05:30
Deepesh Garg
b3ed807b70 fix: Regional settings setup 2021-06-02 13:26:21 +05:30
Raffael Meyer
80540d38ba
fix: add_deduct_tax in Purchase Taxes setup (#25871) 2021-05-31 15:36:20 +05:30
Deepesh Garg
48b1a82fa1 fix: Add accounts and templates for reverse charge 2021-05-29 23:54:51 +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
Deepesh Garg
4311fdc3a1 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into bootstraped_gst_setup 2021-05-27 17:49:23 +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
Ankush Menat
ff96bdf0c1
fix(ux): fix unstranslated text in msgprint/throw 2021-05-25 20:59:20 +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
Saqib
dd5b31f8c4
fix: set disable rounded total if it is globally enabled (#25789) 2021-05-24 18:23:03 +05:30
Ganga Manoj
f2eb8dd1d5
feat: Transaction Deletion Record (#25354) 
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2021-05-10 14:02:58 +05:30
Nabin Hait
134eaa5786
perf: Performance enhancement on setup wizard (#25605) 
* perf: Performance enhancement on setup wizard

* fix: create departments without updating nsm
 2021-05-06 19:13:54 +05:30
Suraj Shetty
ca37380d2e Merge branch 'develop' of github.com:frappe/erpnext into develop 2021-05-03 19:44:22 +05:30
Deepesh Garg
0ae702aab9 Merge branch 'develop' of https://github.com/frappe/erpnext into bootstraped_gst_setup 2021-05-02 22:37:04 +05:30
Deepesh Garg
1bac72b74d fix: Add GST accounts to GST Settings 2021-05-02 22:29:48 +05:30
Deepesh Garg
a66184fe3c fix: Remove redundant get_doc 2021-05-02 12:22:16 +05:30
Deepesh Garg
204ea1027f fix: Ignore validations for Tax Setup 2021-04-30 16:35:52 +05:30
Walstan Baptista
4a805b5622
chore: frappe.whitelist for doc methods (#25465) 2021-04-24 14:23:08 +05:30
Suraj Shetty
52ea6b126b Revert "fix: email digest user not found" 
This reverts commit 188657d05a.
 2021-04-23 14:14:47 +05:30
Deepesh Garg
50997709d5 fix: Update country-wise-tax JSON and tax setup 2021-04-21 20:41:57 +05:30