Deepesh Garg
779d2afa60
fix: Update account heads in GST test cases
2021-07-13 16:50:04 +05:30
Deepesh Garg
2908f2ee20
fix: Revert Changes
2021-07-13 16:49:21 +05:30
Deepesh Garg
0dfea4d134
fix: Test Cases
2021-07-13 16:49:21 +05:30
Deepesh Garg
22683cf19b
fix: Tests
2021-07-13 16:49:21 +05:30
Deepesh Garg
b71497067d
chore: Add comments
2021-07-13 16:49:21 +05:30
Deepesh Garg
87f4df80ea
fix: Move tax categories up in country wise json
2021-07-13 16:49:21 +05:30
Deepesh Garg
ed54e4e276
fix: Check for tax category
2021-07-13 16:48:44 +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
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
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
Deepesh Garg
1298956482
fix: Use update flag for company dependant fixtures
2021-07-12 18:29:52 +05:30
Saqib
b75b556bbb
fix: move the rename abbreviation job to long queue ( #26435 )
2021-07-12 14:32:37 +05:30
Saqib
9e1819d366
fix: move the rename abbreviation job to long queue ( #26434 )
2021-07-12 14:31:57 +05:30
Nabin Hait
470c7e773f
fix: merge conflict
2021-07-12 12:45:49 +05:30
Ankush Menat
22cb642831
chore: update test company FY
2021-07-12 10:09:50 +05:30
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
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
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
Dany Robert
31afc61190
fix: Update test cases to suit values from exchangerate.host
2021-06-28 19:05:51 +05:30
Dany Robert
e9bc2f354b
feat: Increase number of supported currency exchanges
...
Switch from frankfurter.app to exchange rate.host to accommodate more currency usage.
2021-06-28 19:01:52 +05:30
Saqib
4b69563a56
Merge branch 'develop' into asset-repair-refactor
2021-06-28 11:07:58 +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
Nabin Hait
67768faaef
Merge branch 'version-13-hotfix' into version-13-pre-release
2021-06-24 20:16:04 +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
a57976660a
fix: merge conflict
2021-06-24 19:14:33 +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
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
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
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
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
Ankush Menat
a9c84f749a
perf(minor): remove unnecessary comprehensions ( #25645 )
2021-06-11 16:00:48 +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
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
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
Deepesh Garg
48b1a82fa1
fix: Add accounts and templates for reverse charge
2021-05-29 23:54:51 +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
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
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
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
Nabin Hait
8b2fef11b1
fix: merge conflict
2021-05-17 11:37:14 +05:30
Nabin Hait
e38192cb6d
fix: merge conflict
2021-05-11 11:15:09 +05:30
Suraj Shetty
b76ebb3f4b
fix: Use frappe.safe_eval instead of eval
2021-05-11 10:59:16 +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
Suraj Shetty
80aa8a3149
Merge branch 'develop' of github.com:frappe/erpnext into parallel-distributed-testing
2021-05-08 11:28:27 +05:30
Nabin Hait
7481f54e0c
Merge branch 'version-13' into develop
2021-05-06 19:18:18 +05:30
Nabin Hait
0e41295c0e
perf: Performance enhancement on setup wizard ( #25606 )
...
* perf: Performance enhancement on setup wizard
* fix: create departments without updating nsm
2021-05-06 19:14:06 +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
c702408f99
chore: Remove unnecessary print statements
2021-05-06 18:37:45 +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
Deepesh Garg
2acc66db2c
fix: Add tax categories on company setup
2021-04-21 11:49:02 +05:30
Deepesh Garg
3130ed52ff
fix: Item Tax templates for GST
2021-04-20 23:23:07 +05:30
Deepesh Garg
e379f083bb
feat(India): Separate Input and Output GST tax accounts
2021-04-20 23:04:39 +05:30
Rucha Mahabal
923fb008c7
fix: remove non-standard module cards from Home Workspace ( #25391 )
2021-04-19 21:09:47 +05:30
barredterra
80d44cada4
fix: remove is_default from country wise tax
2021-04-18 18:33:34 +02:00
barredterra
476fff149b
Merge branch 'develop' into improve_taxes_setup
2021-04-17 18:41:31 +02:00
Ganga Manoj
c4565651ff
fix: Let Administrator delete company transactions ( #25300 )
...
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-04-14 17:11:36 +05:30
Rohit Waghchaure
a8f78fabfd
fix: patch failing while migrating from v7 to v13
2021-04-13 18:51:21 +05:30
Rohit Waghchaure
610ccd4c03
fix: modified permission
2021-04-13 18:51:21 +05:30
Rohit Waghchaure
03635fb0c4
feat: ESS User
2021-04-13 18:51:21 +05:30
Rushabh Mehta
65f25c27b3
fix(minor): fix dynamically changing grid properties
2021-04-13 11:58:16 +05:30
Anupam Kumar
9f73bd8040
fix: don't delete mode of payment account details while deleting company transactions ( #25217 )
2021-04-12 10:31:36 +05:30
Anupam Kumar
f52f2b2f17
Merge branch 'develop' into email-digest
2021-04-09 17:24:43 +05:30
HENRY Florian
e286750a0f
fix: UOM length unit in global setup list is empty ( #24855 )
...
* When ERPNext is installed in localized language the category of UOM Conversion Factor is tranlasted into installed languaes. Filter must be locallized
* fix
* fix
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2021-04-08 13:56:29 +05:30
Anupam
e711b30f66
fix: resolved conflicts
2021-04-05 17:06:59 +05:30
Saqib
0586b7db79
feat: discount configuration on early payments ( #24586 )
...
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-03-31 15:03:53 +05:30
Walstan Baptista
d6360755b9
chore: frappe.whitelist for doc methods ( #25068 )
...
* chore: frappe.whitelist for doc methods
* fix: incorrect spelling
* fix: sider issue
Co-authored-by: Sagar Vora <sagar@resilient.tech>
2021-03-31 12:30:32 +05:30
Prssanna Desai
3da2df55f4
Merge branch 'develop' into help-links-fix
2021-03-26 15:35:17 +05:30
prssanna
194dd12882
fix: re-execute add_standard_navbar_items patch
...
- check that same items aren't appended again
2021-03-24 16:45:32 +05:30
Anupam Kumar
5ce0569f80
fix: validate_series ( #24984 )
2021-03-23 21:13:41 +05:30
Rushabh Mehta
14c3c5172d
fix(minor): rearrange the cards on home workspace
2021-03-18 10:45:38 +05:30
Rushabh Mehta
45735b35c4
fix(minor): login: set as Login to ERPNext
2021-03-16 12:22:31 +05:30
Raffael Meyer
db24b13a7d
Merge branch 'develop' into improve_taxes_setup
2021-03-15 13:27:56 +01:00
Anurag Mishra
5e475f85b9
Merge branch 'develop' into suplier_portal_fixes
2021-03-15 16:21:55 +05:30
Raffael Meyer
fb68aba30d
Merge branch 'develop' into improve_taxes_setup
2021-03-11 13:17:44 +01:00
Rucha Mahabal
be2c1fca7b
feat(Non Profit): 80G Certificates and Donations ( #24657 )
...
* feat: 80G Certificates
* feat: add non-profit custom fields for India
* feat: 80G Certificate print format for memberships
* feat: Donation doctype and API endpoint to capture donations via razorpay
* chore: Rename Membership Settings to Non Profit Settings
* chore: clean up Non Profit Settings
- Rename fields, better labels
- patch for renaming
* feat: Webhook secret generation for Razorpay donations in Non-Profit Settings
* feat: Payment Entry for donations
- added Donor as Party Type
- setting for automating payment entries for donations created via web form
* fix: linter and sider issues
* fix: translation syntax
* feat: PAN Details custom field for Indian donors
* feat: 80G certificates for Donations with Print Format
* fix: sider
* feat: validations for donor and donation
- create donor for website user from donations
- validate donor email
* feat: extract member name from subscription notes
* test: Donation
* test: Tax Exemption 80G Certificate
* chore: styling fixes
* fix: tests
* fix: sider
* feat: extract PAN number from additional subscription notes
* feat: Add creation user field in Non Profit Settings
fix: Payment Entry not generating for memberships and donations
* feat: update desk page
* fix: tests
2021-03-11 13:19:44 +05:30
Raffael Meyer
fbd810c2ae
Merge branch 'develop' into improve_taxes_setup
2021-03-10 11:38:52 +01:00
Raffael Meyer
20cc2bb0d8
fix: autoname for Item Tax Template
...
* fix: autoname for Item Tax Template
Use title + company abbreviation instead of just title.
* fix: test records of Item Tax Template
* fix: rename item tax templates in test records
* Revert "fix: test records of Item Tax Template"
This reverts commit 53875c54ffe059c32d52b9ee60795d56f95473b1.
* fix: rename hardcoded item tax templates in tests
* fix: rename hardcoded Item Tax Templates in tests
(2)
* fix: delete Item Tax Template with company
2021-03-10 10:24:43 +05:30
Anupam Kumar
832098f042
fix: In-Transit Feature enhancements ( #24652 )
2021-03-09 21:14:25 +05:30
walstanb
be98ee26cd
fix: breadcrumbs for company
2021-03-09 13:03:52 +05:30
barredterra
ebd1d08e55
refactor: taxes setup
...
Better structure of input data.
2021-03-08 19:53:50 +01:00
barredterra
25afad3dc1
refactor: extend taxes and charges setup
...
Add option to specify taxes and charges template depending on the CoA used. Differentiate between purchase, sales and item taxes. Maintain flexibility by using wildcards.
2021-03-04 21:11:31 +01:00
barredterra
dcfc3d7d12
fix: remove redundant calls to create_sales_tax
2021-03-04 19:29:55 +01:00
Florian HENRY
e11ce57f3c
fix: add item taxes at the same times as sales and purchase taxes
2021-02-24 21:45:29 +01:00
Deepesh Garg
7efbbcf3aa
fix: Do not delete GST Accounts from GST Settings on clearing transactions from Company Master
2021-02-19 10:53:58 +05:30
Anurag Mishra
5ec592d09c
fix: supplier was not able to Submit RFQ due to in sufficient permission
2021-02-18 13:42:04 +05:30
Marica
052a2767f0
Merge branch 'develop' into email-digest
2021-02-17 11:21:14 +05:30
Anupam Kumar
e816ed89e6
fix: portal permission issue ( #24577 )
2021-02-11 11:12:13 +05:30
Nabin Hait
7177579051
fix: Dependant sle logic fixes ( #24489 )
...
* fix: Dependant sle logic fixes
* fix: negative qty validation
* fix: Travis fixes
2021-02-02 22:03:07 +05:30
Suraj Shetty
f57efd1150
style: Fix invalid translation syntax usages
2021-02-01 20:09:20 +05:30
prssanna
2aa1efb70e
fix: broken image style
2021-01-22 15:31:38 +05:30
prssanna
9f1a156307
Merge branch 'shopping-cart' of https://github.com/frappe/erpnext into rebrand-ui
2021-01-21 13:04:58 +05:30
prssanna
599322871a
fix: product query issues
2021-01-20 17:44:08 +05:30
Suraj Shetty
bbc6bfd3c3
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2021-01-19 09:34:06 +05:30
Anupam
5abb997a27
fix: resolved conflicts
2021-01-13 11:11:22 +05:30
Rushabh Mehta
7619d3d6d6
fix(merge): develop
2021-01-12 09:16:21 +05:30
Rushabh Mehta
f8a6dde8d8
fix(minor): routing
2021-01-08 14:37:38 +05:30
Nabin Hait
517fd8b9e6
fix: Ignore customer and supplier while deleting company transactions ( #24279 )
...
* fix: Ignore customer and supplier while deleting company transactions
* fix: Test cases fixed based on Travis
2021-01-05 09:23:39 +05:30
Shivam Mishra
31a651365d
feat: update item group website slider
2020-12-30 15:51:34 +05:30
Shivam Mishra
425bae8bf6
feat: use ProductQuery and ProductFiltersBuilder to build item group page
2020-12-29 17:18:22 +05:30
Shivam Mishra
b06ed4908f
feat: add filter tables in item group
2020-12-29 17:16:29 +05:30
Nabin Hait
a77b8c9fcc
Repost item valuation ( #24031 )
...
* feat: Reposting logic for future finished/transferred item
* feat: added fields to identify needs to recalculate rate while reposting
* refactor: Set rate for outgoing and finished items
* refactor: Arranged fields in Stock Entry item table and added fields to identify finished and scrap item
* refactor: Arranged fields in Stock Entry item table and added fields to identify finished and scrap item
* refactor: Get outgoing rate for purchase return
* refactor: Get incoming rate for sales return
* test: Added tests for reposting valuation of transferred/finished/returned items
* feat: added incoming rate field in DN, SI and Packed Item table
* feat: get incoming rate for returned item
* fix: no error while getting valuation rate in stock entry
* fix: update stock ledger for DN and SI
* feat: update item valuation rate in PR and PI based on supplied items cost
* feat: SLE reposting logic for sales return and subcontracted item with test cases
* feat: update qty in future sle
* feat: repost future sle and gle via Repost Item Valuation
* fix: Skip unwanted function calling while reposting
* fix: repost sle for specific item and warehouse
* test: Modified tests for backdated stock reco
* fix: ignore cancelled sle in few methods
* feat: role allowed to do backdated entry
* feat: Show reposting status on stock valuation related reports
* fix: minor fixes
* fix: fixed sider issues
* fix: serial no fix related to immutable ledger
* fix: Test cases fixes related to perpetual inventory
* fix: Test cases fixed
* fix: Fixed reposting on cancel and test cases
* feat: Restart reposting item valuation
* refactor: Code cleanup using small functions and test case fixes
* fix: minor fixes
* fix: Raise on error while reposting item valuation
* fix: minor fix
* fix: Tests fixed
* fix: skip some validation ig gle made from reposting
* fix: test fixes
* fix: debugging stock and account validation
* fix: debugging stock and account validation
* fix: debugging travis for stock and account sync validation
* fix: debugging travis
* fix: debugging travis
* fix: debugging travis
2020-12-21 14:45:50 +05:30
Suraj Shetty
70cfc4df15
fix: Remove dashboard page from home
2020-12-16 20:55:47 +05:30
Shivam Mishra
fd044b032f
Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into desk-enhancements
2020-12-16 13:21:10 +05:30
Suraj Shetty
f2511c84b5
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2020-12-14 09:05:48 +05:30
Deepesh Garg
f17ea2ccab
fix: Accounting for internal transfer invoices within same company ( #24021 )
...
* fix: Accounting for internal transfer invoices within same company
* fix: warehouse fetching
* fix: Linting issues
* fix: GL entry fixes and validation for intercompany account
* fix: Account naming changes and other fixes
* fix: Add test for internal transfer
* fix: Test Case
* fix: Add description for fields
* fix: Commonfied code
* fix: Map warehouse and serial no
2020-12-11 21:30:39 +05:30
Rushabh Mehta
39154e5296
fix(minor): add debounce to calls
2020-12-10 12:37:16 +05:30
Rushabh Mehta
fec8dba16c
fix(merge): merge develop
2020-12-08 16:23:09 +05:30
Anuja Pawar
d369710c65
fix: fixed home desk page ( #24075 )
...
* fix: fixed home desk page
* fix: suggested changes
Co-authored-by: Marica <maricadsouza221197@gmail.com>
* fix: suggested changes
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-12-08 09:40:08 +05:30
Shivam Mishra
2fa3cac814
feat: update workspace folders
2020-12-03 15:48:57 +05:30
Shivam Mishra
2895645f86
feat: rename desk page to workspace
2020-12-03 15:39:53 +05:30
Shivam Mishra
9aaca25edb
feat: update desk page json
2020-12-01 13:39:54 +05:30
Shivam Mishra
de68f74b4c
chore: update all desk pages
2020-12-01 12:51:38 +05:30
Shivam Mishra
27e7c264f2
fix: link type
2020-11-30 14:58:16 +05:30
Shivam Mishra
61388d412b
feat: update desk pages
2020-11-30 14:58:00 +05:30
Mohammad Hasnain Mohsin Rajan
90e33e53fd
refactor: Format translation strings ( #24004 )
...
* fix: translation strings
* fix: linting
2020-11-25 15:37:54 +05:30
rohitwaghchaure
6e974bf246
Merge pull request #23949 from pateljannat/email-digest-user-not-found-issue
...
fix: email digest user not found
2020-11-18 23:54:34 +05:30
pateljannat
188657d05a
fix: email digest user not found
2020-11-18 17:15:54 +05:30
Rushabh Mehta
542bc01718
fix(minor): update routes
2020-11-18 15:00:34 +05:30
Shivam Mishra
bed717b442
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2020-11-12 11:32:59 +05:30
Shivam Mishra
f38a1c305e
refactor: show form buttons only if permissions exist ( #23851 )
...
* refactor: show form buttons only if permissions exist
* style: add semicolon
* fix: typo in conditions
2020-11-09 20:16:28 +05:30
Deepesh Garg
8cfb210dc4
fix: Ignore doctypes on company transaction deleted ( #23864 )
2020-11-09 20:14:53 +05:30
Shivam Mishra
9d468a8daf
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2020-10-21 11:38:31 +05:30
Raffael Meyer
d1863e6f9e
fix: Chart of Accounts ( #23530 )
...
* fix: Chart of Accounts
* fix: Chart of Accounts with lower case "of"
Co-authored-by: Marica <maricadsouza221197@gmail.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-10-14 10:29:53 +05:30
Deepesh Garg
06268e5f57
Merge pull request #23623 from kennethsequeira/italy-fy
...
fix: Fiscal Year and Tax Rates for Italy
2020-10-13 20:29:51 +05:30
Shivam Mishra
55f52e8135
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2020-10-13 20:09:22 +05:30
Kenneth Sequeira
3eec4e61ab
fix: GST rates for Australia
2020-10-13 19:23:48 +05:30
Kenneth Sequeira
1b329aaa7b
fix: json format fixes
2020-10-13 19:10:09 +05:30
Anupam
d4e2a3324f
fix: review fixes
2020-10-13 12:26:25 +05:30
Kenneth Sequeira
968f61d8ba
fix: add multiple VAT rates for Italy
2020-10-13 00:25:46 +05:30
Marica
6d935d4e48
Merge branch 'develop' into company-issue
2020-10-12 17:25:12 +05:30
Anupam
22dc42efb9
fix: error log while creating company
2020-10-09 14:58:39 +05:30
Saqib
2016a34e30
fix: naming series - cannot reset current value to zero ( #23504 )
2020-10-04 18:13:24 +05:30
Shivam Mishra
1323a9a990
feat: set app name for ERPNext in install and patch
2020-09-30 16:33:14 +05:30
Shivam Mishra
9a4d603403
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2020-09-25 11:44:37 +05:30
Anupam Kumar
3775324441
Merge branch 'develop' into email-digest
2020-09-06 21:49:43 +05:30
Frappe ERPnext
f28bef868d
feat: Checkbox for activation of printing UOM after quantity
...
Checkbox will be added to Frappe after installation of ERPNext.
(Print Settings docType is part of frappe app, not erpnext app)
2020-09-02 21:42:52 +02:00
Anupam K
8d0de8c311
Merge branch 'develop' of https://github.com/frappe/erpnext into email-digest
2020-08-31 16:54:36 +05:30
Deepesh Garg
ecc282930a
Merge branch 'develop' into navbar_links
2020-08-28 12:48:46 +05:30