Dany Robert
2833a02e0e
Merge branch 'develop' into patch-5
2021-07-29 16:47:28 +05:30
Nabin Hait
11475487fb
fix: merge conflict
2021-07-16 15:58:50 +05:30
18alantom
b24c0bfbf9
fix: show child item group items on portal
2021-07-14 17:41:32 +05:30
Marica
3f599b049c
Merge branch 'develop' into fix-item-group-portal-issues
2021-07-14 17:15:18 +05:30
Saqib
be773f4052
Merge branch 'develop' into bootstrapped_gst_setup_develop
2021-07-14 13:55:00 +05:30
Ganga Manoj
05d7c69aa2
fix: delete child docs when parent doc is deleted ( #26239 )
2021-07-14 11:54:27 +05:30
Deepesh Garg
269510b98f
fix: Regional settings setup
2021-07-13 16:48:22 +05:30
Deepesh Garg
a72589cb7e
fix: Add accounts and templates for reverse charge
2021-07-13 16:48:06 +05:30
Deepesh Garg
0380cca3b7
fix: Add GST accounts to GST Settings
2021-07-13 16:47:38 +05:30
Deepesh Garg
8ed1afd93d
fix: Remove redundant get_doc
2021-07-13 16:47:38 +05:30
Deepesh Garg
8fd2d8b5d0
fix: Ignore validations for Tax Setup
2021-07-13 16:47:38 +05:30
Deepesh Garg
fea29ae8cb
fix: Use update flag for company dependant fixtures
2021-07-13 16:05:05 +05:30
18alantom
a4eba7a409
fix: show child item group items on portal
2021-07-13 15:34:25 +05:30
Saqib
621927d9f9
fix: move the rename abbreviation job to long queue ( #26462 )
2021-07-13 14:13:39 +05:30
Saqib
9e1819d366
fix: move the rename abbreviation job to long queue ( #26434 )
2021-07-12 14:31:57 +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
Dany Robert
31afc61190
fix: Update test cases to suit values from exchangerate.host
2021-06-28 19:05:51 +05:30
Saqib
4b69563a56
Merge branch 'develop' into asset-repair-refactor
2021-06-28 11:07:58 +05:30
Saqib
b3a0a7b432
fix: too many writes while renaming company abbreviation ( #26203 )
2021-06-24 19:30:10 +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
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
673470705b
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into bootstraped_gst_setup
2021-06-23 11:33:15 +05:30
Saqib
4b4eb990a9
Merge branch 'develop' into asset-repair-refactor
2021-06-22 16:21:13 +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
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
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
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
Nabin Hait
a3d1b6973a
fix: merge conflict
2021-05-31 11:21:33 +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
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
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
Saqib
dd5b31f8c4
fix: set disable rounded total if it is globally enabled ( #25789 )
2021-05-24 18:23:03 +05:30
Suraj Shetty
81d49e9c71
fix: Use extend_cscript function to properly extend class methods to cscript
2021-05-21 17:03:09 +05:30