CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-19 10:14:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
39,126 Commits 423 Branches 1,723 Tags
84803f8f21d2b3a54f33dfbebc2407572736f167
Commit Graph

39126 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
mergify[bot]
94a30674df fix: threshold fields shows incorrect currency (#29289) 2022-01-14 15:29:46 +05:30
Deepesh Garg
2524be6386 Merge pull request #29281 from frappe/mergify/bp/version-13-hotfix/pr-29280 
fix: accounts are coming from different company in the dropdown (backport #29280)
 2022-01-13 22:41:26 +05:30
Rohit Waghchaure
e28b046cf9 fix: accounts are coming from different company in the dropdown 
(cherry picked from commit dabe5981bb)
 2022-01-13 15:42:50 +00:00
Marica
f1c08f9b8c Merge pull request #29274 from frappe/mergify/bp/version-13-hotfix/pr-29271 
fix: Don't validate FG in repack entry (backport #29271)
 2022-01-13 16:50:02 +05:30
marination
80b037ed13 test: Check for FinishedGoodError if 0 FG in repack entry 
(cherry picked from commit c49dff385a)
 2022-01-13 09:57:50 +00:00
marination
61681e73ef test: Basic test one item repacked into two 
- Also run fg validation and fg marking after checking purpose, avoid unnecessary calls

(cherry picked from commit 3922a39591)
 2022-01-13 09:57:50 +00:00