nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-14 18:51:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
39,869 Commits 462 Branches 1,752 Tags
d8b7693ea9fa5267bf4fa28e6d35e97795e95c92
Commit Graph

39869 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anupam Kumar
29241070c1 Merge branch 'version-13-hotfix' into crm-contact-duplication-v13 2022-01-20 17:30:21 +05:30
Ankush Menat
d32f229483 ci: fail on merge conflict label 2022-01-20 15:39:32 +05:30
Ankush Menat
8a9a13cb96 ci: concurrency control on v13 branches 2022-01-20 15:39:32 +05:30
Ankush Menat
d190ea4ad3 ci: disable coverage on v13 branch 2022-01-20 15:39:32 +05:30
Marica
eb44b16e31 Merge pull request #29378 from frappe/mergify/bp/version-13-hotfix/pr-29375 
fix: (enhance) BOM Operations Report (backport #29375)
 2022-01-20 15:34:20 +05:30
mergify[bot]
b9a42807f8 fix: show stock UOM for material transfers (#29376) (#29377) 
(cherry picked from commit 7e407bcc42)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-01-20 15:06:11 +05:30
marination
655d8980dc fix: Allow only BOM with ops in BOM ID filter & add total row to report 
(cherry picked from commit af734298c8)
 2022-01-20 09:25:05 +00:00
marination
e963d0e8e0 fix: Sider (unused imports) and Linter(add extra empty line) 
(cherry picked from commit 3c7b772112)
 2022-01-20 09:25:05 +00:00
marination
77cb7ebd40 fix: (enhance) BOM Operations Report 
- Added filters in the Report for BOM ID, Item Code and Workstation
- Converted Raw SQL to frappe.qb and added method to get filtered data
- Changed fieldtype of 'Time in mins' from Int to Float
- Get BOM wise grouped data to  keep order and accurate grouping in report

(cherry picked from commit a9ff1fc52e)
 2022-01-20 09:25:04 +00:00
Deepesh Garg
84803f8f21 Merge pull request #29370 from frappe/mergify/bp/version-13-pre-release/pr-29366 
fix: Cleanup empty rows on bank statement import (backport #29366)
 2022-01-20 12:14:51 +05:30
Deepesh Garg
6a53cfea00 fix: Cleanup empty rows on bank statement import 
(cherry picked from commit 25398d017b)
 2022-01-20 05:56:08 +00:00
Deepesh Garg
829ea71ae1 Merge pull request #29366 from deepeshgarg007/bank_statement_import_template 
fix: Cleanup empty rows on bank statement import
 2022-01-20 11:24:48 +05:30
Deepesh Garg
25398d017b fix: Cleanup empty rows on bank statement import 2022-01-20 10:51:59 +05:30
mergify[bot]
f75d36dcb4 fix: from time and to time not updated in drag and drop action #29114 (#29361) 
fix: from time and to time not updated in drag and drop action
(cherry picked from commit 8b5827ed6d)

Co-authored-by: Mohammed Yusuf Shaikh <49878143+mohammedyusufshaikh@users.noreply.github.com>
 2022-01-19 19:30:21 +05:30
Marica
56dd25355d Merge pull request #29357 from frappe/mergify/bp/version-13-pre-release/pr-29352 
refactor: update_serial_no function for old Maintenance Visits (backport #28843) (backport #29352)
 2022-01-19 16:40:44 +05:30
marination
fa7f5d745e fix: Patch (reload doc) 
(cherry picked from commit 93d665b38a)
 2022-01-19 09:19:06 +00:00
marination
dd81d622dd fix: Conflicts 
(cherry picked from commit 3023757a60)
 2022-01-19 09:19:06 +00:00
Noah Jacob
4086f4f8d1 fix: Serial No. filters for unscheduled visits 
(cherry picked from commit dec7513773)
(cherry picked from commit add36363ab)
 2022-01-19 09:19:05 +00:00
Noah Jacob
311b2dd1a9 refactor: moved purpose table mandatory check to server 
(cherry picked from commit b98c61f2a7)

# Conflicts:
#	erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js
(cherry picked from commit 93325c72f0)
 2022-01-19 09:19:05 +00:00
Noah Jacob
0783b36ba0 fix(test): fixed test case not creating serials 
(cherry picked from commit 90d32006f4)
(cherry picked from commit 0bb0a9d032)
 2022-01-19 09:19:04 +00:00
Noah Jacob
f491cc92cd test: added test for serial no. filters 
(cherry picked from commit 9109660a69)
(cherry picked from commit f541b5c780)
 2022-01-19 09:19:04 +00:00
Noah Jacob
824eef9354 fix(patch): updates maintenance schedule field for old docs 
(cherry picked from commit c872aa43f8)

# Conflicts:
#	erpnext/patches.txt
(cherry picked from commit dc0d974144)
 2022-01-19 09:19:04 +00:00
Noah Jacob
216f45ce11 refactor: update_serial_no function and code cleanup 
(cherry picked from commit 4f52b86d7e)

# Conflicts:
#	erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js
(cherry picked from commit 8775154fa0)
 2022-01-19 09:19:03 +00:00
Marica
6c45223606 Merge pull request #29352 from frappe/mergify/bp/version-13-hotfix/pr-28843 
refactor: update_serial_no function for old Maintenance Visits (backport #28843)
 2022-01-19 14:48:24 +05:30
marination
93d665b38a fix: Patch (reload doc) 2022-01-19 13:53:18 +05:30
Anupam
44d2098530 fix: changed function name 2022-01-19 13:10:23 +05:30
marination
3023757a60 fix: Conflicts 2022-01-19 13:06:52 +05:30
Noah Jacob
add36363ab fix: Serial No. filters for unscheduled visits 
(cherry picked from commit dec7513773)
 2022-01-19 07:19:51 +00:00
Noah Jacob
93325c72f0 refactor: moved purpose table mandatory check to server 
(cherry picked from commit b98c61f2a7)

# Conflicts:
#	erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js
 2022-01-19 07:19:50 +00:00
Noah Jacob
0bb0a9d032 fix(test): fixed test case not creating serials 
(cherry picked from commit 90d32006f4)
 2022-01-19 07:19:49 +00:00
Noah Jacob
f541b5c780 test: added test for serial no. filters 
(cherry picked from commit 9109660a69)
 2022-01-19 07:19:49 +00:00
Noah Jacob
dc0d974144 fix(patch): updates maintenance schedule field for old docs 
(cherry picked from commit c872aa43f8)

# Conflicts:
#	erpnext/patches.txt
 2022-01-19 07:19:48 +00:00
Noah Jacob
8775154fa0 refactor: update_serial_no function and code cleanup 
(cherry picked from commit 4f52b86d7e)

# Conflicts:
#	erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js
 2022-01-19 07:19:47 +00:00
Anupam Kumar
b917f33399 Merge branch 'version-13-hotfix' into crm-contact-duplication-v13 2022-01-18 16:38:04 +05:30
Anupam
79ce36c19f fix: sider issue 2022-01-18 16:36:40 +05:30
Anupam
c8eae9dcef fix: contact duplication on converting lead to customer 2022-01-18 16:14:45 +05:30
mergify[bot]
69fded250c fix: enable allow negative stock by default in reposts (#29331) (#29333) 
Negative stock validation is done BEFORE reposting as such it's not
required to be performed again and most likely this fails on old
intermediate data where user has no clue why it failed.

(cherry picked from commit fabe0bce15)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-01-18 13:33:29 +05:30
mergify[bot]
3064d95889 refactor: convert CTE validation to python (#29324) (#29332) 
Some old servers running on mariadb <10.2 can't work with CTEs hence
reverting to basic python code

Co-authored-by: Ankush Menat <ankush@frappe.io>
(cherry picked from commit d7f16c4924)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
 2022-01-18 11:48:01 +05:30
mergify[bot]
d7f16c4924 refactor: convert CTE validation to python (#29324) 
Some old servers running on mariadb <10.2 can't work with CTEs hence
reverting to basic python code

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-01-18 11:17:32 +05:30
rohitwaghchaure
ac2d1a9acc Merge pull request #29329 from rohitwaghchaure/merge-hotfix-to-pre-release-for-13-19 
chore: Merge branch 'version-13-hotfix' into 'version-13-pre-release'
 2022-01-18 00:23:29 +05:30
Rohit Waghchaure
8d3f8619cf chore: Merge branch 'version-13-hotfix' into 'version-13-pre-release' 2022-01-18 00:01:14 +05:30
mergify[bot]
d5d7f67ac2 fix: cover case when all material needs to be bought (#29326) (#29327) 
When material request is to be made for purchase qty should be converted
to purchase UOM

(cherry picked from commit 48f3d53556)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-01-17 22:16:41 +05:30
mergify[bot]
5e3f5d8bcc fix: purchase to Stock UOM conversion on Production Plan #28570 (#29325) 
fix: purchase to Stock UOM conversion on Production Plan
(cherry picked from commit 9cd26fbb6a)

Co-authored-by: Maxwell Morais <MaxMorais@users.noreply.github.com>
 2022-01-17 22:15:12 +05:30
Devin Slauenwhite
c121ab8ef4 Merge remote-tracking branch 'upstream/version-13-hotfix' into fix-ecommerce-cart-badge 2022-01-17 09:15:14 -05:00
Ankush Menat
0b4b60a6c3 Merge pull request #29322 from frappe/mergify/bp/version-13-hotfix/pr-28987 
fix: incorrect serial no valuation (backport #28987)
 2022-01-17 18:02:57 +05:30
Deepesh Garg
7542dd3f15 Merge pull request #29318 from frappe/mergify/bp/version-13-hotfix/pr-29182 
fix: get project from PO into payment entry (backport #29182)
 2022-01-17 17:28:24 +05:30
Ankush Menat
0411bcbd5c test: serial no valuation test case 
(cherry picked from commit 5d27a7672e)
 2022-01-17 11:26:05 +00:00
Ankush Menat
9a3a679628 fix: get incoming rate only if not return 
(cherry picked from commit fcc885bc16)
 2022-01-17 11:26:04 +00:00
Ankush Menat
a3a9920771 fix: incorrect incoming rate computation for sr no 
(cherry picked from commit b9642a1036)
 2022-01-17 11:26:03 +00:00
mergify[bot]
c2d58ba796 feat(UX): Option to exclude holidays while marking monthly attendance (backport #29185) (#29321) 
(cherry picked from commit 6aac8de53e)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2022-01-17 16:48:04 +05:30