nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-13 18:21:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
47,172 Commits 463 Branches 1,750 Tags
d7709cf4e4a11733acfcc79183492f1844e7b0fd
Commit Graph

649 Commits

Author SHA1 Message Date
mergify[bot]
9d0c1dc46f fix: validate uom is integer for PR item (backport #41074) (#41076) 
* fix: validate uom is integer for PR item

(cherry picked from commit 9a290fdfc9)

# Conflicts:
#	erpnext/controllers/subcontracting_controller.py

* chore: `conflicts`

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2024-04-18 07:53:33 +05:30
Akhil Narang
4d34b1ead7 refactor(treewide): formatting and ruff fixes, + manually enabled F401 
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
 2024-04-10 17:13:31 +05:30
David
99faafb5be fix: permissions during bulk transaction logs 
(cherry picked from commit 49dd4c1ef3)
 2024-03-22 04:38:17 +00:00
Ankush Menat
4c629d31c6 style: format js files 2024-03-11 11:03:58 +05:30
rohitwaghchaure
64099b0bf7 fix: webpages are not showing (#39988) 2024-02-21 09:26:58 +05:30
Babuuu
e3591270c6 refactor: Clean up code used to fetch website item stock details 2024-02-07 13:12:14 +00:00
Rohit Waghchaure
b310a55727 fix: not able to edit address through portal 
(cherry picked from commit b046d980ad)
 2024-01-24 06:20:29 +00:00
s-aga-r
d42db1174d feat: provision to select the qty field for Product Page (#39292) 
feat: provision to select the qty field to be shown as `In Stock` in product page
 2024-01-10 21:31:03 +05:30
ruthra kumar
f236a2c081 refactor: prevent permissions by always processing in background 
(cherry picked from commit 15dc5c7e99)
 2024-01-08 04:42:49 +00:00
mergify[bot]
fe9acc898e fix(DX): capture tracebacks with context (backport #39060) (#39062) 
* fix(DX): capture tracebacks with context (#39060)

(cherry picked from commit 510fdf7bf6)

# Conflicts:
#	erpnext/manufacturing/doctype/bom_creator/bom_creator.py

* Delete erpnext/manufacturing/doctype/bom_creator/bom_creator.py

---------

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2024-01-01 15:38:22 +05:30
Devin Slauenwhite
226d0e0196 fix: display all item rate stop messages 2023-12-18 14:14:29 -05:00
rohitwaghchaure
3929cc30ca fix: stock availability not showing (#38382) 
fix: stock availability now showing
 2023-11-28 15:16:35 +05:30
ruthra kumar
562a55122b refactor: update scheduled job for bulk transaction 
(cherry picked from commit fb06ad7330)
 2023-11-20 08:51:08 +00:00
ruthra kumar
8dbe753a25 refactor: update traceback on retry 
(cherry picked from commit a52a1b49af)
 2023-11-17 10:56:24 +00:00
ruthra kumar
32b6eed691 refactor: rollback for retries and UI alerts 
(cherry picked from commit c320288690)
 2023-11-17 10:56:23 +00:00
ruthra kumar
ad03008a1a refactor: barebones retry functionality 
(cherry picked from commit 0aa1636d04)
 2023-11-17 10:56:23 +00:00
ruthra kumar
eda9800c93 refactor: simplify logging logic bulk_transaction 
(cherry picked from commit ebd74a4e5b)
 2023-11-17 10:56:22 +00:00
ruthra kumar
e58604a90f refactor: optimize for speed 
(cherry picked from commit 416bd400bb)
 2023-11-08 01:03:28 +00:00
mergify[bot]
56657b6122 fix: allow to select parent warehouse in the website item (backport #37047) (#37173) 
fix: allow to select parent warehouse in the website item (#37047)

(cherry picked from commit e6199dc802)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-09-20 18:06:30 +05:30
Sagar Vora
73e9b38cda fix(regional): set frappe.flags.company temporarily, where required 
(cherry picked from commit 4205f564a0)
 2023-07-24 14:05:34 +00:00
mergify[bot]
841d2e4b2c refactor: Workspace cleanup (backport #35409) (#35505) 
* refactor: Workspace cleanup

(cherry picked from commit 243c49c550)

# Conflicts:
#	erpnext/accounts/workspace/accounting/accounting.json
#	erpnext/assets/workspace/assets/assets.json

* fix: Delete Retail and Utilities worspaces amd hide default Settings and Integration workspaces

(cherry picked from commit 0b28f641ad)

* fix: Added pos links in Selling workspace

(cherry picked from commit 86f88817a9)

* fix: removed duplicate links of manufacturing workspace

(cherry picked from commit 5cf4c8c8b7)

* fix: Rearranged accounting module links

(cherry picked from commit e78a7de1e5)

# Conflicts:
#	erpnext/accounts/workspace/accounting/accounting.json

* chore: typo

(cherry picked from commit bb67cc03df)

* chore: conflicts

---------

Co-authored-by: Nabin Hait <nabinhait@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 f1acc5fabb)

Co-authored-by: Solufy Solution <34390782+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 22290c2694)

Co-authored-by: HarryPaulo <paulo_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 4c61ee30bb)

Co-authored-by: Deepesh Garg <deepeshgarg6@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 502a37a864)

Co-authored-by: barredterra <14891507+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 0b86b1baca)

Co-authored-by: Ankush Menat <ankush@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 e543dca6a0)

Co-authored-by: Raffael Meyer <14891507+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 91055151ce)

Co-authored-by: Dany Robert <danyrt@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