CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-05 19:42:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,531 Commits 412 Branches 1,712 Tags
ab564701711657698e56e5480bb9eb0c698dffdf
Commit Graph

44531 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rohit Waghchaure
ab56470171 fix: incorrect packing items 
(cherry picked from commit a686b8c337)
 2023-05-12 09:13:52 +00:00
rohitwaghchaure
8af1e49e96 Merge pull request #35269 from frappe/mergify/bp/version-14-hotfix/pr-35268 
fix: BOM item filter issue (backport #35268)
 2023-05-12 13:12:11 +05:30
rohitwaghchaure
19f0676592 Merge pull request #35266 from frappe/mergify/bp/version-14-hotfix/pr-35261 
fix: enqueue submit/cancel action for stock entry to avoid time out error (backport #35261)
 2023-05-12 13:10:48 +05:30
Rohit Waghchaure
098603dd35 fix: bom item filter issue 
(cherry picked from commit 2879cb7c28)
 2023-05-12 07:40:38 +00:00
Rohit Waghchaure
9b2b46737e fix: test case 
(cherry picked from commit 2d6f112727)
 2023-05-12 07:03:22 +00:00
Rohit Waghchaure
457846e34c fix: enqueue submit/cancel action for stock entry to avoid time out error 
(cherry picked from commit 7a3801578c)
 2023-05-12 07:03:21 +00:00
Saqib Ansari
c8e3ce48e1 Merge pull request #35257 from frappe/mergify/bp/version-14-hotfix/pr-32132 
fix: validate for active sla (backport #32132)
 2023-05-11 17:50:00 +05:30
Shadrak Gurupnor
38e27a68d5 fix: validate for active sla (#32132) 
(cherry picked from commit f2b7c9ee66)
 2023-05-11 12:18:49 +00:00
ruthra kumar
1145149f0e Merge pull request #35228 from frappe/mergify/bp/version-14-hotfix/pr-35216 
fix: broken save on empty row existance (backport #35216)
 2023-05-10 10:11:32 +05:30
rohitwaghchaure
dd20bf931b Merge pull request #35234 from frappe/mergify/bp/version-14-hotfix/pr-35230 
fix: Changed type of column 'serial_no' in Stock Reconciliation to fix Data too Long error (backport #35230)
 2023-05-09 21:06:14 +05:30
Rohit Waghchaure
709f94c8d3 fix: Changed type of column 'serial_no' in Stock Reconciliation to fix Data too long error 
(cherry picked from commit 1a673fd424)
 2023-05-09 14:26:13 +00:00
rohitwaghchaure
2933c4f1c5 Merge pull request #35231 from frappe/mergify/bp/version-14-hotfix/pr-35227 
fix: non manufacturing items/fixed asset items in BOM (backport #35227)
 2023-05-09 19:53:53 +05:30
Rohit Waghchaure
8133be4868 fix: non manufacturing items/fixed asset items in BOM 
(cherry picked from commit aba8431d70)
 2023-05-09 13:18:47 +00:00
Dany Robert
c0f9ff4995 fix: broken save on empty row existance 
(cherry picked from commit d9b231aa16)
 2023-05-09 13:02:54 +00:00
rohitwaghchaure
7b6a1e5184 Merge pull request #35221 from frappe/mergify/bp/version-14-hotfix/pr-35220 
fix: added search index to improve performance (backport #35220)
 2023-05-09 16:04:36 +05:30
Rohit Waghchaure
362003ec5f fix: added search index to improve performance 
(cherry picked from commit 80ea22b56c)
 2023-05-09 09:05:43 +00:00
ruthra kumar
30e137e9f2 Merge pull request #35214 from frappe/mergify/bp/version-14-hotfix/pr-35212 
chore: convert throw to msgprint in payment reconciliation job hook (backport #35212)
 2023-05-08 19:07:41 +05:30
ruthra kumar
08a4781de7 chore: convert throw to msgprint 
(cherry picked from commit 73134d57bf)
 2023-05-08 12:28:01 +00:00
ruthra kumar
14706d4326 Merge pull request #35209 from frappe/mergify/bp/version-14-hotfix/pr-35153 
fix: fetch default sales team on Quotation -> Sales Order creation (backport #35153)
 2023-05-08 14:51:45 +05:30
ruthra kumar
fd09d1c4c3 Merge pull request #35208 from frappe/mergify/bp/version-14-hotfix/pr-35142 
fix: ineffective bypass flag for Credit Limit in Customer Group (backport #35142)
 2023-05-08 14:51:29 +05:30
rohitwaghchaure
afbbf26f15 Merge pull request #35202 from frappe/mergify/bp/version-14-hotfix/pr-35196 
fix: pick the in progress reposting entries first (backport #35196)
 2023-05-08 14:40:10 +05:30
rohitwaghchaure
f83fcf5261 Merge pull request #35203 from frappe/mergify/bp/version-14-hotfix/pr-35200 
fix: error regarding accepted and supplier warehouse (backport #35200)
 2023-05-08 14:39:52 +05:30
ruthra kumar
5879475a00 Merge pull request #35207 from frappe/mergify/bp/version-14-hotfix/pr-35186 
fix: child acc will inherit acc currency if explicitly specified (backport #35186)
 2023-05-08 14:35:26 +05:30
ruthra kumar
f42225bc82 fix: fetch default sales team on Quotation -> Sales Order creation 
(cherry picked from commit 4d31436917)
 2023-05-08 08:50:09 +00:00
ruthra kumar
c73b76fdb6 fix: bypass flag in Customer Group wasn't effective 
(cherry picked from commit f9a4972cb6)
 2023-05-08 08:41:51 +00:00
ruthra kumar
e451916803 test: currency inheritance on child accounts 
(cherry picked from commit f6ea8fd8d7)
 2023-05-08 08:40:28 +00:00
ruthra kumar
72255fae80 fix: child acc will inherit acc currency if explicitly specified 
(cherry picked from commit abe691c03d)
 2023-05-08 08:40:28 +00:00
Rohit Waghchaure
42f5888426 fix: error regarding accepted and supplier warehouse 
(cherry picked from commit 15f5f98858)
 2023-05-08 03:54:40 +00:00
Rohit Waghchaure
545f956160 fix: pick the in progress reposting entries first 
(cherry picked from commit c8a4791d9b)
 2023-05-08 03:54:22 +00:00
rohitwaghchaure
1226f3294f Merge pull request #35198 from frappe/mergify/bp/version-14-hotfix/pr-35197 
fix: incorrect fg item quantity in subcontracted PO (backport #35197)
 2023-05-07 17:05:13 +05:30
Rohit Waghchaure
5c38645560 fix: incorrect fg item quantity in subcontracted PO 
(cherry picked from commit af16fbb0a3)
 2023-05-06 20:09:31 +00:00
Anand Baburajan
ed5f39c2c2 fix: handle empty FBs properly in TB and GL [v14] (#35189) 
fix: handle empty FBs properly in TB and GL
 2023-05-06 16:38:59 +05:30
rohitwaghchaure
816ce879f9 Merge pull request #35169 from frappe/mergify/bp/version-14-hotfix/pr-35167 
fix: not allow to transfer excess materials against the job card (backport #35167)
 2023-05-04 22:41:07 +05:30
rohitwaghchaure
f4858fbf8a Merge pull request #35163 from frappe/mergify/bp/version-14-hotfix/pr-35158 
fix: internal transfer condition (backport #35158)
 2023-05-04 22:39:55 +05:30
Rohit Waghchaure
b0c042de1b fix: not allow to transfer excess materials against the job card 
(cherry picked from commit 8167b24219)
 2023-05-04 13:41:34 +00:00
rohitwaghchaure
c463df4fd1 Merge pull request #35166 from frappe/mergify/bp/version-14-hotfix/pr-35161 
feat: configuration to notify reposting errors to specific role (backport #35161)
 2023-05-04 18:46:05 +05:30
Rohit Waghchaure
33cd14f859 feat: configuration to notify reposting errors to specific role 
(cherry picked from commit c7b62011db)
 2023-05-04 12:06:35 +00:00
Rohit Waghchaure
f5f4902494 fix: internal transfer condition 
(cherry picked from commit b5a2ccf21d)
 2023-05-04 11:32:45 +00:00
rohitwaghchaure
a01e2ca9ac Merge pull request #35149 from frappe/mergify/bp/version-14-hotfix/pr-35148 
fix: over production percentage not considered in validation (backport #35148)
 2023-05-04 09:58:43 +05:30
Rohit Waghchaure
bf6e1b67a5 fix: over production percentage not considered in validation 
(cherry picked from commit a84d0af81e)
 2023-05-03 18:44:32 +00:00
rohitwaghchaure
148342a132 Merge pull request #35147 from frappe/mergify/bp/version-14-hotfix/pr-35144 
feat: reserve qty against production plan raw materials in BIN (backport #35144)
 2023-05-04 00:00:04 +05:30
Rohit Waghchaure
d1a91177e5 feat: reserve qty against production plan raw materials in BIN 
(cherry picked from commit 06e91e758f)
 2023-05-03 16:54:53 +00:00
Nabin Hait
8d6034de16 Merge pull request #34647 from frappe/mergify/bp/version-14-hotfix/pr-34627 
fix: enabling lead even after "Opportunity" created against it (backport #34627)
 2023-05-03 13:27:07 +05:30
Nabin Hait
d306bb080a Update patches.txt 2023-05-03 12:42:36 +05:30
Nabin Hait
eb3e6ff145 Update patches.txt 2023-05-03 12:21:23 +05:30
Nabin Hait
82c3d862ce Merge branch 'version-14-hotfix' into mergify/bp/version-14-hotfix/pr-34627 2023-05-03 11:21:48 +05:30
Anand Baburajan
344c339484 fix: handle finance book properly in trial balance and general ledger [v14] (#35136) 
fix: handle FBs properly in general ledger and trial balance
 2023-05-03 07:11:01 +05:30
mergify[bot]
bef9dd79e7 fix: Updates in process statement of Accounts (#35064) 
* fix: Updates in process statement of Accounts (#35064)

(cherry picked from commit ea0b03ae9e)

# Conflicts:
#	erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json

* chore: resolve conflicts

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-05-02 23:06:52 +05:30
rohitwaghchaure
815696964a Merge pull request #35121 from frappe/mergify/bp/version-14-hotfix/pr-35118 
fix: don't allow to make reposting for the closed period (backport #35118)
 2023-05-02 18:02:23 +05:30
ruthra kumar
f0ae02e921 Merge pull request #35132 from frappe/mergify/bp/version-14-hotfix/pr-35107 
fix: incorrect paid_amount and exchange rate in Payment Entry (backport #35107)
 2023-05-02 15:43:08 +05:30