schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
38,553 Commits 322 Branches 1,581 Tags
d190ea4ad3b2ed378222894d169fa49f66ecddc8
Commit Graph

38553 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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]
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
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
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
Deepesh Garg
5da7e28d20 fix: Linting issues 
(cherry picked from commit 09172002e7)
 2022-01-17 09:34:58 +00:00
ruthra
7f5415177e refactor: get project from basic transactions 
- sales order, sales invoice, purchase order and purchase order
- if project not found in transaction, get from items

(cherry picked from commit 8026f86548)
 2022-01-17 09:34:57 +00:00
ruthra
ea9756da8f fix: get project from PO into payment entry 
(cherry picked from commit ca17c7226c)
 2022-01-17 09:34:57 +00:00
Ankush Menat
a0c2c94cff test: make sure zero incoming rate is maintained while consuming 
(cherry picked from commit 0272397e54)
 2022-01-17 13:21:48 +05:30
Ankush Menat
3b0f80b865 fix: dont update sle values from get_gl_entries 
(cherry picked from commit 8f5772463c)
 2022-01-17 13:21:48 +05:30
mergify[bot]
83ca2422f6 fix: show work order progress bar even it is closed (#29312) (#29313) 
(cherry picked from commit 4d48035828)

Co-authored-by: Anupam Kumar <anupamvns0099@gmail.com>
 2022-01-17 12:08:21 +05:30
mergify[bot]
de9a0d6a7f fix: ignore cancelled SLEs (#29303) (#29307) 
(cherry picked from commit 82ea958730)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-01-16 21:44:07 +05:30
mergify[bot]
5db8af8cee fix(patch): sle.serial_no = "\n" causes incorrect queue (#29306) (#29309) 
This happens due to old data.

(cherry picked from commit 66bf21f143)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-01-16 20:59:19 +05:30
mergify[bot]
42d3b0c063 fix: only add stock queue if FIFO (#29302) (#29305) 
(cherry picked from commit b0cf6195e9)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-01-16 14:05:09 +05:30
mergify[bot]
ecbd885aad fix: exclude existing serial numbers while auto creating new #29292 (#29300) 
fix: exclude existing serial numbers while auto creating new
(cherry picked from commit 2b681f04fd)

Co-authored-by: Dany Robert <danyrt@wahni.com>
 2022-01-16 12:33:55 +05:30
Deepesh Garg
cfb43d159d Merge pull request #29298 from frappe/mergify/bp/version-13-hotfix/pr-29208 
fix(India): NIL Rated, Exempted and non gst invoices in GSTR-1 report (backport #29208)
 2022-01-15 19:18:25 +05:30
Deepesh Garg
f3ddf53d39 Merge pull request #29299 from frappe/mergify/bp/version-13-hotfix/pr-29115 
fix: Deferred revenue booking for multi currency invoices via JV (backport #29115)
 2022-01-15 19:18:11 +05:30
Deepesh Garg
ef3e4ee61f fix: Remove unwanted test 
(cherry picked from commit fd922f1617)
 2022-01-15 13:26:21 +00:00
Deepesh Garg
045a505a38 fix: Remove comment 
(cherry picked from commit 08f26de3df)
 2022-01-15 13:26:21 +00:00
Deepesh Garg
eff48299e4 fix: Test case 
(cherry picked from commit 24bb1e8987)
 2022-01-15 13:26:21 +00:00
Deepesh Garg
8ed138e373 fix: Test case 
(cherry picked from commit 18c4ddadf1)
 2022-01-15 13:26:20 +00:00
Deepesh Garg
a4e897d30b fix: Handle frozen books while handling 
(cherry picked from commit 30a647ff80)
 2022-01-15 13:26:20 +00:00
Deepesh Garg
38a330b55e fix: Test case 
(cherry picked from commit e311667a25)
 2022-01-15 13:26:19 +00:00
Deepesh Garg
a08b10d5cf fix: Add test case for multicurrency invoice 
(cherry picked from commit 094158f287)
 2022-01-15 13:26:19 +00:00
Deepesh Garg
eb3d28fcc0 fix: Deferred revenue booking for multi currency invoices via JV 
(cherry picked from commit 98f294a8ae)
 2022-01-15 13:26:19 +00:00
Deepesh Garg
103bf19700 fix: JSON for nil/exempt and non gst 
(cherry picked from commit 55c445cd37)
 2022-01-15 13:24:14 +00:00
Deepesh Garg
835448c9e5 fix(India): NIL Rated, Exempted and non gst invoices in GSTR-1 report 
(cherry picked from commit 7d85755595)
 2022-01-15 13:24:14 +00:00