nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-18 09:05:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,534 Commits 399 Branches 1,700 Tags
c121ab8ef4fd85db3300b60b741b45ad9ed7a67a
Commit Graph

38534 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
marination
a868fd7df9 fix: Allow multiple fg in repack entry 
(cherry picked from commit eac7b5d5aa)
 2022-01-13 09:57:50 +00:00
mergify[bot]
21c194495c fix: filter for leave period in Bulk Leave Policy Assignment (backport #29272) (#29273) 
* fix: filter for leave period in Bulk Leave Policy Assignment

* fix: set title for Leave Policy Assignment

(cherry picked from commit 3a18e62a9b)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2022-01-13 14:28:56 +05:30
Deepesh Garg
884edb45b3 Merge pull request #29240 from frappe/mergify/bp/version-13-hotfix/pr-29193 
fix: deferred report division by zero exception (backport #29193)
 2022-01-13 12:56:27 +05:30
Devin Slauenwhite
81f1b7dfeb fix(Payroll): Cannot submit salary slips from amended payroll entry. (#29228) 
* fix: salary slip transaction state after payroll entry cancel

* fix: use db_set in on_cancel method

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2022-01-13 10:29:52 +05:30
mergify[bot]
dcea4f4c96 fix: autoname generated for Job Applicant is too long (backport #29260) (#29263) 
* fix: autoname generated for Job Applicant is too long (#29260)

* fix: autoname generated for Job Applicant is too long

- autoname based on email and append number if exists instead of concatenating name, email, title

- add more search fields for context during selection

* test: Job applicant naming and fix related tests

(cherry picked from commit 5cda4ea39f)

# Conflicts:
#	erpnext/hr/doctype/employee_onboarding/test_employee_onboarding.py

* fix: conflicts

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2022-01-12 19:54:59 +05:30
Marica
a4210a7c85 Merge pull request #29257 from marination/fix-reset-wh-defaults (#29259) 
fix: Avoid resetting Default wh fields for Manufacture Entry
(cherry picked from commit efcfb825d7)

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2022-01-12 17:09:13 +05:30
Marica
d01e794558 Merge pull request #29257 from marination/fix-reset-wh-defaults 
fix: Avoid resetting Default wh fields for Manufacture Entry
(cherry picked from commit efcfb825d7)
 2022-01-12 11:15:35 +00:00
rohitwaghchaure
464f813677 Merge pull request #29255 from frappe/mergify/bp/version-13-hotfix/pr-29179 
fix: incorrect scrap item qty (backport #29179)
 2022-01-12 14:00:36 +05:30
mergify[bot]
366f663c5a fix(asset): check if fixed asset account is set against company (#29256) 2022-01-12 13:45:37 +05:30
rohitwaghchaure
b4fee6d065 fix: conflicts 2022-01-12 13:31:34 +05:30
mergify[bot]
f4a031d94b fix: description not fetched in sales order analytics report (#29254) 2022-01-12 13:31:07 +05:30
rohitwaghchaure
fa66d1d87d fix: conflicts 2022-01-12 13:30:05 +05:30
Rohit Waghchaure
d71d769c7a fix: incorrect scrap item qty 
(cherry picked from commit 8f0b2fa90e)

# Conflicts:
#	erpnext/manufacturing/doctype/work_order/test_work_order.py
 2022-01-12 07:44:38 +00:00
Marica
e05ad8ed10 Merge pull request #29219 from marination/item-variant-config-backend-cleanup 
fix: Behaviour of Item Variants Cache generation
 2022-01-12 02:12:03 +05:30
Marica
f8761dc5ca Merge branch 'version-13-hotfix' into item-variant-config-backend-cleanup 2022-01-12 01:52:55 +05:30