CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-16 00:37:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
43,462 Commits 417 Branches 1,718 Tags
b403c7fdca573722458a2be52005c8adffbf8e36
Commit Graph

43462 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sagar Sharma
b403c7fdca Merge branch 'version-14-hotfix' into mergify/bp/version-14-hotfix/pr-32986 2022-11-18 16:11:51 +05:30
Sagar Sharma
59c35d9f88 Merge pull request #33029 from frappe/mergify/bp/version-14-hotfix/pr-32905 
fix: Internal Transfer Material Request cycle and tracking fixed till purchase receipt (backport #32905)
 2022-11-18 15:12:28 +05:30
Deepesh Garg
a30747b723 Merge pull request #33017 from frappe/mergify/bp/version-14-hotfix/pr-33009 
fix(pos): item selector image border radius (backport #33009)
 2022-11-18 15:09:47 +05:30
Deepesh Garg
6d22305b9f Merge pull request #33018 from frappe/mergify/bp/version-14-hotfix/pr-33003 
fix: precision in asset tests (backport #33003)
 2022-11-18 15:09:04 +05:30
s-aga-r
71d6f2a490 fix: hide reject-fields in return SCR 
(cherry picked from commit 7dd7617ec7)
 2022-11-18 09:31:11 +00:00
s-aga-r
4de02dc258 fix: don't set rejected-qty in return SCR 
(cherry picked from commit 8a73e963ce)
 2022-11-18 09:31:11 +00:00
s-aga-r
0c73280a9b chore: linters 
(cherry picked from commit 12d7b7e9c2)
 2022-11-18 07:46:49 +00:00
Vishal
660e3fa081 chore: minor fix 
(cherry picked from commit e5dfd53e6f)
 2022-11-18 07:46:49 +00:00
Vishal
ac3120b6f9 fix: minor change 
(cherry picked from commit ba6189d054)
 2022-11-18 07:46:49 +00:00
Vishal
6ddf27380f fix: test case updated for mr 
(cherry picked from commit 343b414b40)
 2022-11-18 07:46:48 +00:00
Vishal
2a892f5c52 fix: test case added for MR internal Transfer 
(cherry picked from commit 89aabdaaaa)
 2022-11-18 07:46:48 +00:00
Vishal
c356d2cabd fix: minor issue fixed 
(cherry picked from commit d86afddb60)
 2022-11-18 07:46:48 +00:00
Vishal
eaf09503a9 fix: Internal Transfer Material Request cycle and tracking fixed till purchase receipt 
(cherry picked from commit 71412f6877)
 2022-11-18 07:46:47 +00:00
Anand Baburajan
d0ccc858ad Merge branch 'version-14-hotfix' into mergify/bp/version-14-hotfix/pr-33003 2022-11-18 12:05:22 +05:30
Sagar Sharma
f10d6105c5 Merge pull request #33023 from frappe/mergify/bp/version-14-hotfix/pr-33019 
fix: use `list()` on self mutating iteration (backport #33019)
 2022-11-18 10:59:58 +05:30
Sabu Siyad
eb968d7f02 fix: use list() on self mutating iteration 
https://github.com/frappe/erpnext/issues/30325

Signed-off-by: Sabu Siyad <hello@ssiyad.com>
(cherry picked from commit 546c809cbe)
 2022-11-18 04:55:43 +00:00
anandbaburajan
ecd4eab2da fix: add missing commas and brackets 
(cherry picked from commit 218da1217a)
 2022-11-17 12:22:41 +00:00
anandbaburajan
444f241263 fix: precision in asset tests 
(cherry picked from commit b5e5d3b3af)
 2022-11-17 12:22:41 +00:00
Sabu Siyad
aaed4ab958 fix(pos): item selector image border radius 
Signed-off-by: Sabu Siyad <hello@ssiyad.com>
(cherry picked from commit 2f4940cc26)
 2022-11-17 12:03:22 +00:00
Ankush Menat
00558af873 chore: typo 2022-11-17 14:24:59 +05:30
Sagar Sharma
0378bb9702 Merge pull request #33010 from frappe/mergify/bp/version-14-hotfix/pr-33006 
fix: make `is_internal_supplier` read-only in PO (backport #33006)
 2022-11-17 14:23:17 +05:30
s-aga-r
caef140a9b fix: make is_internal_supplier read-only 
(cherry picked from commit 5efbc2cbf8)
 2022-11-17 08:40:41 +00:00
mergify[bot]
4c0b5ceb9e refactor: search queries (backport #33004) (#33007) 
refactor: search queries (#33004)

- guard clauses for readability
- use values or format

(cherry picked from commit 34e4903ed7)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-11-17 13:06:46 +05:30
Ankush Menat
1db83247ce chore: hardcode doctype 2022-11-17 12:01:11 +05:30
Deepesh Garg
4a86b20e62 Merge pull request #32996 from frappe/mergify/bp/version-14-hotfix/pr-32983 
fix: Opening journal entry templates (backport #32983)
 2022-11-17 11:16:34 +05:30
Sagar Sharma
f70a028970 Merge pull request #32997 from frappe/mergify/bp/version-14-hotfix/pr-32911 
feat: Workstation Type for BOM (backport #32911)
 2022-11-17 10:59:45 +05:30
Rohit Waghchaure
24aafb3866 fix: linters failing 
(cherry picked from commit ffa30127e7)
 2022-11-16 18:31:29 +00:00
Rohit Waghchaure
bb337455b9 test: test case to check workstation type 
(cherry picked from commit 7bd06e6fbc)
 2022-11-16 18:31:28 +00:00
Rohit Waghchaure
8323775282 feat: Workstation Type for BOM 
(cherry picked from commit 105c272816)
 2022-11-16 18:31:25 +00:00
Deepesh Garg
6aada76297 fix: Opening journal entry templates 
(cherry picked from commit 33b61aef5a)
 2022-11-16 15:13:08 +00:00
Deepesh Garg
2d8332e004 Merge pull request #32990 from frappe/mergify/bp/version-14-hotfix/pr-32989 
ci: fix flake8 URL (backport #32989)
 2022-11-16 17:05:11 +05:30
Deepesh Garg
b473da8f66 ci: fix flake8 URL 
(cherry picked from commit e81bec5fc9)
 2022-11-16 10:56:22 +00:00
mergify[bot]
55e1592b70 fix: cast POS query inputs to integers (backport #32975) (#32977) 
fix: cast POS query inputs to integers  (#32975)

fix: cast POS query inputs to integers
(cherry picked from commit c013db6ea1)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-11-15 18:50:51 +05:30
Deepesh Garg
d7340f54cf Merge pull request #32969 from frappe/mergify/bp/version-14-hotfix/pr-32953 
chore(payment_entry): Remove dead validations (backport #32953)
 2022-11-15 16:32:54 +05:30
Deepesh Garg
19f3d86a12 Merge pull request #32966 from frappe/mergify/bp/version-14-hotfix/pr-32962 
fix: Write Off section visibility for non POS Invoices (backport #32962)
 2022-11-15 16:31:49 +05:30
Sagar Sharma
48dbf47e76 Merge pull request #32974 from frappe/mergify/bp/version-14-hotfix/pr-32971 
Revert "fix: get `consumed_qty` based on `received_qty` in SCR" (backport #32971)
 2022-11-15 15:59:45 +05:30
s-aga-r
f10cceb261 test: fix test cases for supplied-items consumed_qty 
(cherry picked from commit 369db4eacc)
 2022-11-15 09:48:02 +00:00
s-aga-r
7fd6c43752 Revert "fix: get consumed_qty based on received_qty in SCR" 
This reverts commit 70c9b8dc50.

(cherry picked from commit 01f56c621c)
 2022-11-15 09:48:02 +00:00
s-aga-r
0ecb44d40c Revert "fix: set received_qty before_validate SCR" 
This reverts commit c447dfaa9c.

(cherry picked from commit 3706a9b4dc)
 2022-11-15 09:48:02 +00:00
Gavin D'souza
30d1491257 chore(payment_entry): Remove dead validations 
(cherry picked from commit e1ecc9a819)
 2022-11-15 08:34:35 +00:00
Deepesh Garg
ca96c24c8d chore: Resolve conflicts 2022-11-15 13:57:44 +05:30
Deepesh Garg
07badbc0f2 fix: Write Off section visibility for non POS Invoices 
(cherry picked from commit 9f5d613c78)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.json
 2022-11-15 07:31:58 +00:00
Deepesh Garg
51b3fda2b6 Merge pull request #32960 from frappe/mergify/bp/version-14-hotfix/pr-32956 
fix: Label for applicable dimension table (backport #32956)
 2022-11-15 13:01:23 +05:30
rohitwaghchaure
d9820af4f0 Merge pull request #32963 from frappe/mergify/bp/version-14-hotfix/pr-32947 
fix: incorrect fix of conversion factor in PP (backport #32947)
 2022-11-15 11:38:07 +05:30
Rohit Waghchaure
c48d00ad77 fix: incorrect fix of conversion factor in PP 
(cherry picked from commit 490b0e3cdf)
 2022-11-15 05:01:36 +00:00
Deepesh Garg
eb4f8e4bd8 fix: Label for applicable dimension table 
(cherry picked from commit 8c13f70fc5)
 2022-11-15 03:55:20 +00:00
Sagar Sharma
5c5cd7bff5 Merge pull request #32948 from frappe/mergify/bp/version-14-hotfix/pr-32937 
refactor: rewrite `job_card.py` queries in QB (backport #32937)
 2022-11-14 12:22:56 +05:30
s-aga-r
f886577abb refactor: rewrite job_card.py queries in QB 
(cherry picked from commit 7df2921d38)
 2022-11-14 05:56:38 +00:00
Deepesh Garg
bad4dccf88 Merge pull request #32944 from frappe/mergify/bp/version-14-hotfix/pr-32938 
chore: Remove raw SQL query (backport #32938)
 2022-11-14 10:43:50 +05:30
Sagar Vora
a30579393e fix: check type for reference name 
(cherry picked from commit b06345af46)
 2022-11-13 15:12:10 +00:00