nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-19 09:35:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
39,388 Commits 402 Branches 1,702 Tags
c0cf18d2d6c44ee234d3d95762f41001663a568e
Commit Graph

39388 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mergify[bot]
c0cf18d2d6 Merge pull request #30624 from frappe/mergify/bp/version-13-hotfix/pr-30499 
feat: 'customer' column and more filter to Payment terms status report (backport #30499)
 2022-04-07 13:47:58 +00:00
Ankush Menat
d62928ed65 Merge branch 'version-13-hotfix' into mergify/bp/version-13-hotfix/pr-30499 2022-04-07 19:02:47 +05:30
mergify[bot]
4a7ae5c4a7 fix: dont reassign mutable (list) to a different field (backport #30634) (#30635) 
This is an automatic backport of pull request #30634 done by [Mergify](https://mergify.com).
Conflicts fixed.
 2022-04-07 13:30:24 +00:00
mergify[bot]
560c55935f fix: warehouse naming when suffix is present (#30621) (#30629) 
(cherry picked from commit be04eaf723)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-04-07 15:37:33 +05:30
Chillar Anand
30a86951c3 test: Fix failing tests for healthcare service unit (#30625) 2022-04-07 14:58:38 +05:30
mergify[bot]
4b77a4de28 fix: update translation (backport #30474) (#30593) 
* fix: update translation (#30474)

* fix: update translation

* fix: update translation

* fix: update translation

* fix: update translation

* fix: update translation

* fix: update translation

* fix: update translation

* fix: update translation

* fix: update translation

* fix: update translation

(cherry picked from commit 4895761d89)

* chore: fix translation csv file

Co-authored-by: HENRY Florian <florian.henry@open-concept.pro>
Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-04-07 13:24:48 +05:30
Rucha Mahabal
8932d7040f fix: conflicts 2022-04-07 13:21:06 +05:30
Rucha Mahabal
07ff2cb1d3 fix: conflicts 2022-04-07 13:21:06 +05:30
Rucha Mahabal
8393d113d4 fix: show allocation history for earned leaves allocated via scheduler 
(cherry picked from commit ec65af5f38)
 2022-04-07 13:21:06 +05:30
Rucha Mahabal
c68a38eb5b fix: make New Leaves Allocated read-only if policy assignment is linked to the allocation and leave type is earned leave 
(cherry picked from commit 6203ffc8fa)
 2022-04-07 13:21:06 +05:30
Rucha Mahabal
0c163eef23 fix: enable Track Changes in Leave Allocation 
(cherry picked from commit f8f1c3d8b5)

# Conflicts:
#	erpnext/hr/doctype/leave_allocation/leave_allocation.json
 2022-04-07 13:21:06 +05:30
mergify[bot]
af039be03e fix: fallback to item_name if description is not found (backport #30619) (#30622) 
* fix: strip html tags before checking for empty description (#30619)

(cherry picked from commit e4c6d6a1a6)

# Conflicts:
#	erpnext/stock/doctype/item/test_item.py

* fix: resolve conflicts

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-04-07 13:20:36 +05:30
ruthra kumar
39f8ee2ea6 test: added test cases for group filters 
(cherry picked from commit 16bfb930f8)
 2022-04-07 07:32:04 +00:00
ruthra kumar
a9d5000eab refactor: use group fields from Sales Order and Sales Order Items 
(cherry picked from commit b2ed9fd3fe)
 2022-04-07 07:32:03 +00:00
ruthra kumar
00acb000dc refactor: item filters are linked with group filters 
(cherry picked from commit e324d668d3)
 2022-04-07 07:32:02 +00:00
ruthra kumar
9336a3413f refactor: adding new filters and column to test cases 
(cherry picked from commit 7558f1b078)
 2022-04-07 07:32:02 +00:00
ruthra kumar
c6f946e3e8 feat: additional filters in payment terms status report 
(cherry picked from commit eaeadbc422)
 2022-04-07 07:32:01 +00:00
Saqib Ansari
d720d15e3d fix(pos): reload doc before set value (#30610) 2022-04-06 22:32:23 +05:30
Ankush Menat
f89c1b2c0c fix: dont trigger closed WO check on new Job card 2022-04-06 18:28:54 +05:30
mergify[bot]
52aa3561e3 fix: hide pending qty only if original item is assigned (#30599) (#30600) 
(cherry picked from commit 8b090a9f7d)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-04-06 16:38:25 +05:30
mergify[bot]
14f46a3e26 fix: check null values in is_cancelled patch (#30594) (#30595) 
(cherry picked from commit bb875fe217)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-04-06 15:14:37 +05:30
Marica
50e753330f Merge pull request #30520 from frappe/mergify/bp/version-13-hotfix/pr-30146 
refactor: Add exception handling in background job within BOM Update Tool (backport #30146)
 2022-04-06 13:50:08 +05:30
Deepesh Garg
ff142f8809 Merge pull request #30589 from frappe/mergify/bp/version-13-hotfix/pr-30557 
fix: Issues on loan repayment (backport #30557)
 2022-04-06 13:38:39 +05:30
Deepesh Garg
d7af8e1dfe fix: Issues on loan repayment 
(cherry picked from commit 194605823e)
 2022-04-06 06:07:34 +00:00
Deepesh Garg
08bb18ae8a Merge pull request #30586 from frappe/mergify/bp/version-13-hotfix/pr-30555 
fix: Ignore user perm for party account company (backport #30555)
 2022-04-06 11:35:56 +05:30
Deepesh Garg
ae11562611 test: Ignore parent company account creation 
(cherry picked from commit dec0c1b5bb)
 2022-04-06 05:27:32 +00:00
Deepesh Garg
027b7e7de1 fix: Ignore user perm for party account company 
(cherry picked from commit 18a3c5d536)
 2022-04-06 05:27:32 +00:00
Deepesh Garg
3a55cad05f Merge pull request #30575 from deepeshgarg007/pos_shipping 
fix: Do not apply shipping rule for POS transactions
 2022-04-06 10:00:21 +05:30
Deepesh Garg
95298f0400 fix: Use get instead of dot 2022-04-06 09:27:40 +05:30
marination
e186d76337 fix: Linter 2022-04-05 19:05:30 +05:30
marination
ec646a1a44 fix: User Literal from typing_extensions as its not supported in typing in py 3.7 
- https://mypy.readthedocs.io/en/stable/literal_types.html
 2022-04-05 18:45:55 +05:30
Marica
c5c578d7b4 Merge pull request #30582 from frappe/mergify/bp/version-13-hotfix/pr-30578 
chore: Accessibility for E-commerce Doctypes (backport #30578)
 2022-04-05 18:32:02 +05:30
marination
e8f3e23008 fix: Merge Conflicts 2022-04-05 18:22:35 +05:30
marination
c636b366d5 chore: Add Prices, Stock and E-com Settings access from Website Item 
(cherry picked from commit 065623ce25)
 2022-04-05 12:42:40 +00:00
marination
732b302be0 chore: Accessibility for E-commerce Doctypes 
- Add Website Item routing button and dashboard link in Item master
- Group Item variant buttons together

(cherry picked from commit d4301d6d2f)
 2022-04-05 12:42:40 +00:00
Saqib Ansari
e5db8c57f9 Merge pull request #30581 from frappe/mergify/bp/version-13-hotfix/pr-30579 
fix: fetch from fields not working in eway bill dialog (backport #30579)
 2022-04-05 17:07:34 +05:30
Saqib Ansari
072c3d22b1 Merge pull request #30580 from frappe/mergify/bp/version-13-hotfix/pr-30553 
fix(india): minor e-invoicing fixes (backport #30553)
 2022-04-05 17:07:22 +05:30
Saqib Ansari
0700ee8a06 fix: fetch from fields not working in eway bill dialog 
(cherry picked from commit c8779aa446)
 2022-04-05 10:22:59 +00:00
Saqib Ansari
e1bd156f40 fix: server error while viewing gst e-invoice 
(cherry picked from commit b91bf40f1b)
 2022-04-05 10:22:23 +00:00
Saqib Ansari
01404b2b5b fix(india): cannot generate e-invoice for is_pos invoices 
* If mode of payment > 18 characters, the e-invoice portal throws error

(cherry picked from commit 0c26f9a8c8)
 2022-04-05 10:22:23 +00:00
Rucha Mahabal
6b1a27a641 Merge pull request #30576 from frappe/mergify/bp/version-13-hotfix/pr-30569 2022-04-04 20:40:49 +05:30
Rucha Mahabal
cb2a8aab31 fix(test): set company for employee in leave allocation test setup 
(cherry picked from commit 793164ac2e)
 2022-04-04 14:49:20 +00:00
Rucha Mahabal
e41f35aa82 test: leave allocation validations and total value for updates done before and after submission 
(cherry picked from commit 5499cecffd)
 2022-04-04 14:49:20 +00:00
Rucha Mahabal
1093307dcc fix: total leaves allocated not validated and recalculated on updates post submission 
(cherry picked from commit 3538656a7d)
 2022-04-04 14:49:19 +00:00
rohitwaghchaure
3f13ce5620 Merge pull request #30570 from frappe/mergify/bp/version-13-hotfix/pr-30564 
fix: if accepted warehouse not selected during rejection then stock ledger not created (backport #30564)
 2022-04-04 20:15:15 +05:30
Deepesh Garg
c0ebcfb393 fix: Do not apply shipping rule for POS transactions 2022-04-04 20:05:10 +05:30
Marica
761f8e0b1c Merge pull request #30539 from marination/redisearch-app-install-v13 
feat: Redisearch with consent (bp)
 2022-04-04 19:25:29 +05:30
Sherin KR
0a2c72c594 fix: Validation for single threshold in Tax With Holding Category (#30382) 2022-04-04 19:07:51 +05:30
Rohit Waghchaure
3038a5cd5a test: test case to validate rejected qty without accepted warehouse 
(cherry picked from commit ac5df1abbe)
 2022-04-04 12:57:04 +00:00
Rohit Waghchaure
157461ed02 fix: if accepted warehouse not selected during rejection then stock ledger not created 
(cherry picked from commit 0a71cabab1)
 2022-04-04 12:57:04 +00:00