CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-14 15:57:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,515 Commits 416 Branches 1,717 Tags
cfb43d159da8027ef66fcf770516660512c21bf8
Commit Graph

38515 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
marination
a0bd82e99f fix: Server Side test - teardown correctly 2022-01-11 22:43:39 +05:30
mergify[bot]
00ad0dd24d feat: early payment discount on sales & purchase orders (#29238) 2022-01-11 21:11:42 +05:30
Marica
c773051a3e Merge branch 'version-13-hotfix' into item-variant-config-backend-cleanup 2022-01-11 20:16:41 +05:30
marination
746bb6277f test: Variant Selector - Fetch next valid Attribute values fetching after selection of one 2022-01-11 20:15:24 +05:30
Ankush Menat
d9f31770c6 fix(patch): enable all uoms on recently created sites 
(cherry picked from commit f8119563ca)
 2022-01-11 18:56:50 +05:30
Ankush Menat
c1fbd2308c fix: UOM autocomplete broken 
All new recent sites seem to have all UOMs as disabled by default. The
desired behaviour is exact opposite of this.

(cherry picked from commit 33aad4b950)
 2022-01-11 18:56:50 +05:30
marination
577de39ca6 test: Variant Selector - Attribute Value fetching 2022-01-11 18:19:29 +05:30
ruthra
de9429b585 fix: deferred report division by zero exception 
(cherry picked from commit fe4d7f86ee)
 2022-01-11 11:50:18 +00:00
mergify[bot]
819346f69f fix: "update cost" should ignore overridden routing times #29154 (#29235) 
fix: "update cost" should ignore overridden routing times
(cherry picked from commit 754596dfc1)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-01-11 09:02:57 +00:00
mergify[bot]
8bb72dece4 fix(pos): cannot ignore pricing rule for one particular invoice (#29232) 2022-01-11 14:26:39 +05:30
mergify[bot]
4343eddd46 fix(gl-report): group by cost center only if include_dimensions is checked (#28883) (#29231) 2022-01-11 13:24:21 +05:30
Ankush Menat
f35ef60262 Merge pull request #29224 from frappe/mergify/bp/version-13-hotfix/pr-29131 
fix(patch): serial no whitespace trimming (backport #29131)
 2022-01-10 22:33:15 +05:30
Ankush Menat
d0c7d4fc98 refactor: convert query to ORM 
(cherry picked from commit cbaa8fdade)
 2022-01-10 14:22:46 +00:00
Ankush Menat
fbe0442e89 fix(patch): serial no whitespace trimming 
old data can contain trailing/leading whitespace which doesn't work well
with code to find last SLE for serial no.

(cherry picked from commit 0faa116f97)
 2022-01-10 14:22:45 +00:00
mergify[bot]
055d620ef3 fix: pos invoices consolidation case with permlevel (#29220) 2022-01-10 19:48:28 +05:30
Marica
495c5126f8 fix: Exclude unpublished items while fetching items from other item groups (#29211) 2022-01-10 19:47:50 +05:30
marination
23f4b51e3e fix: Behaviour if Item Variants Cache generation 
- Revert to old behaviour where variant doesnt need to be published
- Delete unused functions
 2022-01-10 18:04:03 +05:30