mergify[bot]
841d2e4b2c
refactor: Workspace cleanup (backport #35409 ) ( #35505 )
...
* refactor: Workspace cleanup
(cherry picked from commit 243c49c5500b28f641ad86f88817a95cf4c8c8b7e78a7de1e5bb67cc03dfnabinhait@gmail.com >
Co-authored-by: Ankush Menat <ankushmenat@gmail.com >
Co-authored-by: Ankush Menat <ankush@frappe.io >
2023-05-31 16:51:54 +05:30
mergify[bot]
878d7477bc
fix: Bulk Payment Entry from PO/SO ( #34942 )
...
fix: Bulk Payment Entry from PO/SO (#34942 )
Co-authored-by: Nihantra Patel <n.patel.serpentcs@gmail.com >
(cherry picked from commit f1acc5fabb34390782+Solufyin@users.noreply.github.com >
2023-04-25 20:05:34 +05:30
mergify[bot]
29aa4a0222
fix: respect title_field from doctype to bulk transactions ( #34928 )
...
fix: respect title_field from doctype to bulk transactions (#34928 )
(cherry picked from commit 22290c2694paulo_fabris@hotmail.com >
2023-04-25 20:05:13 +05:30
s-aga-r
2c54e763e4
fix: consider qty field precision
...
(cherry picked from commit 6ec7590c21
2023-04-03 10:07:42 +00:00
mergify[bot]
5677f25215
fix: Multiple issues in purchase invoice submission ( #34600 )
...
fix: Multiple issues in purchase invoice submission (#34600 )
* fix: Multiple issues in purchase invoice submission
* fix: Base grand total calculation
* chore: Calculate base grand total separately only in multi currency docs
* fix: Add gl entry for round off
(cherry picked from commit 4c61ee30bbdeepeshgarg6@gmail.com >
2023-04-02 12:56:58 +05:30
Deepesh Garg
a2e001a2da
Revert "refactor: use renamed timezone utils ( #34301 )"
...
Revert "refactor: use renamed timezone utils (#34301 )"
This reverts commit 164933aae8
2023-03-07 17:56:57 +05:30
mergify[bot]
164933aae8
refactor: use renamed timezone utils ( #34301 )
...
refactor: use renamed timezone utils
https://github.com/frappe/frappe/pull/20253
(cherry picked from commit 502a37a86414891507+barredterra@users.noreply.github.com >
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com >
2023-03-07 16:52:56 +05:30
mergify[bot]
9bc2675493
refactor: make payments app a soft dependency (backport #33245 ) ( #33677 )
...
refactor: make payments app a soft dependency (#33245 )
refactor: make payment app a soft dependency
(cherry picked from commit 0b86b1bacaankush@frappe.io >
2023-01-18 21:11:37 +05:30
Deepesh Garg
ad03355333
chore: Update tests
...
(cherry picked from commit 6192af5cf0
2022-12-08 13:12:32 +00:00
Deepesh Garg
57b00e3b16
fix: Bulk payment generation against invoices
...
(cherry picked from commit 2dfe849c7d
2022-11-18 09:41:01 +00:00
mergify[bot]
ed85683fea
fix: don't try to update youtube data if disabled in settings (backport #32588 ) ( #32589 )
...
fix: don't try to update youtube data if disabled in settings (#32588 )
fix: cast value from db
[skip ci]
(cherry picked from commit e543dca6a014891507+barredterra@users.noreply.github.com >
2022-10-13 11:55:36 +05:30
mergify[bot]
7a8038500d
fix: (bulk transaction) key error and better error logging (backport #32445 ) ( #32463 )
...
fix: (bulk transaction) key error and better error logging (#32445 )
* fix: (bulk transaction) key error and better error logging
* chore: pre-commit
* chore: linter - missing comma
(cherry picked from commit 91055151cedanyrt@wahni.com >
2022-10-03 17:45:51 +05:30
Rohit Waghchaure
4bac0daf9b
fix: internal transfer flow
2022-09-07 14:29:15 +05:30
Rucha Mahabal
7442a886a6
test: fix Employee and Activation test
2022-07-01 10:34:32 +05:30
Ankush Menat
bedb11ee67
fix: youtube stats background sync failures
2022-06-28 10:50:44 +05:30
Nabin Hait
f904ac599e
fix: merge conflicts and sider issues
2022-06-25 11:40:23 +05:30
Ankush Menat
883598d59a
chore: delete BOT
...
RIP
2022-06-13 16:24:48 +05:30
Ankush Menat
a1b7a7983a
refactor!: drop naming series tool ( #31183 )
2022-05-31 15:35:40 +05:30
Aditya Hase
912c1d0a1b
chore: Remove reference to Instructor doctype ( #30903 )
...
References:
https://github.com/frappe/erpnext/pull/30830
44c54f69f8
2022-05-05 10:40:42 +05:30
Rushabh Mehta
548afba8bb
fix(minor): update frappe.error_log to new API ( #30864 )
...
* fix(minor): update frappe.error_log to new API
* refactor: changes for updated log_error api
Co-authored-by: Ankush Menat <ankush@frappe.io >
2022-05-02 15:04:26 +05:30
Deepesh Garg
44c54f69f8
chore: Remove references for Student doctype
2022-04-28 16:16:47 +05:30
Deepesh Garg
60b693f84f
chore: clean up hooks
2022-04-28 12:02:54 +05:30
Ankush Menat
a896895a9e
fix: bulk fix (~330) missing translations
2022-04-04 13:59:51 +05:30
Ankush Menat
494bd9ef78
style: format code with black
2022-03-28 18:52:46 +05:30
Saqib Ansari
597bb2c7e8
feat: safely parse exception
2022-03-16 10:53:39 +05:30
Devin Slauenwhite
a1ae7fcbc8
fix: show fail message
2022-02-24 16:36:30 -05:00
Ankush Menat
c371b52d27
fix: restrict filetypes to csv for rename tool
2022-02-10 10:26:00 +05:30
Mohammed Yusuf Shaikh
a3e69cf75d
feat: Bulk Transaction Processing ( #28580 )
...
* feat: Bulk Transaction Processing
* fix: add flags to ignore validations and exception handling correction
* fix: remove duplicate code, added logger functionality and improved notifications
* fix: linting and sider issues
* test: added tests
* fix: linter issues
* fix: failing test case
* fix: sider issues and test cases
* refactor: mapping function calls to create order/invoice
* fix: added more test cases to increase coverage
* fix: test cases
* fix: sider issue
* fix: rename doctype, improve formatting and minor refactor
* fix: update doctype name in hooks and sider issues
* fix: entry log test case
* fix: typos, translations and company name in tests
* fix: linter issues and translations
* fix: linter issue
* fix: split into separate function for marking failed transaction
* fix: typos, retry failed transaction logic and make log read only
* fix: hide retry button when no failed transactions and remove test cases not rrelevant
* fix: sider issues and indentation to tabs
Co-authored-by: Ankush Menat <ankush@frappe.io >
2022-02-08 01:00:37 +05:30
Devin Slauenwhite
282fbf4b07
fix: fetch correct selling price.
2022-02-01 10:59:57 +05:30
marination
9fb61efba8
chore: Fix imports and formatting (linter) & Sider (unused import)
2022-02-01 00:54:54 +05:30
Ankush Menat
6cd7c47409
Merge branch 'develop' into e-commerce-refactor-develop
2022-01-31 17:14:36 +05:30
Shariq Ansari
bc187c121a
fix: updated standard workspace json files
2022-01-13 19:24:11 +05:30
Marica
efcfb825d7
Merge pull request #29257 from marination/fix-reset-wh-defaults
...
fix: Avoid resetting Default wh fields for Manufacture Entry
2022-01-12 16:44:33 +05:30
Marica
b5abf68b0d
Merge branch 'develop' into e-commerce-refactor-develop
2022-01-12 02:52:03 +05:30
Sagar Sharma
6485ac4e59
fix: misleading "Set Default X" fields after saving ( #28798 )
...
* fix: misleading "Set Default X" fields after saving
* refactor: remove unncessary code and minor formatting
* fix: extend to more doctypes and correct fieldnames
Co-authored-by: Ankush Menat <ankush@frappe.io >
2021-12-09 17:04:00 +05:30
marination
6b2b9dcee2
refactor: Cache Item Reviews and other review feedback
...
- `get_doc` -> `get_values` and `db.sql` -> `db.delete` in Wishlist Item deletion
- cache first page of Item Reviews and burst cache on addition and deletion of reviews
- Update redisearch docs link in E Commerce Settings
- Removed unused cint import
- Broke setting attribute context into smaller functions and code cleanup
- Minor recommended items padding tweak
- Item reviews form dict now uses website item as key
- Customer reviews rendered from UI style consistency
- Stock status consistency in listing and full page
- Handle no price in variant dialog for matched item
2021-11-16 17:22:57 +05:30
marination
f9929ed8a6
Merge branch 'develop' of https://github.com/frappe/erpnext into e-commerce-refactor-develop
2021-11-16 16:06:07 +05:30
Ankush Menat
8fe5feb6a4
chore: remove all six compat code
2021-11-05 11:16:29 +05:30
Ankush Menat
6098e92ba9
chore: remove utf-8 compat code
2021-11-05 11:16:29 +05:30
Shariq Ansari
790c1cda6f
fix: Removing unused fields from workspace JSON files #27612
...
fix: Removing unused fields from workspace JSON files
2021-10-13 16:18:20 +05:30
marination
1d94914102
feat: Discount Filters
...
- Discount filters in filters section
- Code cleanup
2021-10-12 17:46:03 +05:30
marination
60261852b2
feat: Slashed Prices and Discount display
...
- Registered mrp and price after discounts
- slashed price with discount in listing, item page and wishlist
- removed redundant imports
- renamed method to `get_web_item_qty_in_stock` to get Website Item stock
- adjusted styles for resizing
- made add to cart button full width on cards
2021-10-12 17:38:36 +05:30
Chillar Anand
915b34391c
chore: Clean up imports ( #27302 )
...
* chore: Added isort to pre-commit config
* chore: Sort imports with isort
* chore: Clean up imports with pycln
* chore: Sort imports with isort
* chore: Fix import issues
* chore: Clean up sider issues
* chore: Remove import errors from flake8 ignore list
* chore: Clean up lint issues
2021-09-02 16:44:59 +05:30
Rucha Mahabal
f828d853e3
fix: Org Chart fixes ( #27290 )
...
* fix(org chart): multiple root nodes not expanding on clicking Expand All
* fix: unstable filter inserts duplicate nodes
2021-09-01 23:07:26 +05:30
Ankush Menat
010060d92e
chore: correct indentation
2021-09-01 15:02:29 +05:30
Ankush Menat
4551d7d602
chore: mass trailing whitespace and EOF fixes
2021-08-19 13:43:28 +05:30
Rucha Mahabal
4981746b9a
Merge branch 'develop' into org-chart-develop
2021-08-15 20:50:56 +05:30
Shariq Ansari
b32c2fa561
fix: updated erpnext wspace json files ( #26380 )
...
* fix: updated erpnext wspace json files
* fix: updated wspace json files
* fix: updated wspace json files
* fix: removed padding code from wspace json files
* fix: Updated restrict_to_domain in wspace json
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com >
2021-08-13 12:19:16 +05:30
Rucha Mahabal
c1bb4eec9c
fix: remove unnecessary imports
2021-08-10 18:02:31 +05:30
Rucha Mahabal
78f50a9809
feat: Export chart option in desktop view
2021-08-10 18:02:05 +05:30
