Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "fix: journals as invoice throwing validation error" #1192

Merged

Conversation

ruthra-kumar
Copy link
Member

Reverts #1185

@codecov-commenter
Copy link

Codecov Report

Merging #1192 (7571dc1) into develop (50eaaca) will decrease coverage by 0.01%.
The diff coverage is 100.00%.

Additional details and impacted files
@@             Coverage Diff             @@
##           develop    #1192      +/-   ##
===========================================
- Coverage    72.55%   72.54%   -0.01%     
===========================================
  Files          200      200              
  Lines        10908    10908              
===========================================
- Hits          7914     7913       -1     
- Misses        2994     2995       +1     
Files Coverage Δ
hrms/overrides/employee_payment_entry.py 78.57% <100.00%> (-0.65%) ⬇️

@ruchamahabal ruchamahabal merged commit 1bcc636 into develop Dec 19, 2023
8 checks passed
mergify bot pushed a commit that referenced this pull request Dec 19, 2023
mergify bot pushed a commit that referenced this pull request Dec 19, 2023
ruchamahabal pushed a commit that referenced this pull request Dec 19, 2023
…1192) (#1194)

This reverts commit 50eaaca.

(cherry picked from commit 1bcc636)

Co-authored-by: ruthra kumar <[email protected]>
ruchamahabal pushed a commit that referenced this pull request Dec 19, 2023
…1192) (#1193)

This reverts commit 50eaaca.

(cherry picked from commit 1bcc636)

Co-authored-by: ruthra kumar <[email protected]>
frappe-pr-bot pushed a commit that referenced this pull request Dec 23, 2023
# [14.20.0](v14.19.0...v14.20.0) (2023-12-23)

### Bug Fixes

* consider previous Leave Applications while enforcing Maximum Consecutive Leaves Allowed ([d42500b](d42500b))
* dont consider holidays while checking for consecutive leaves ([baf4236](baf4236))
* Half Day Leave Application Link To Half Day Attendance (backport [#1147](#1147)) ([#1201](#1201)) ([28a840b](28a840b))
* journals as invoice throwing validation error (backport [#1185](#1185)) ([#1186](#1186)) ([71d134f](71d134f))
* permission sensitivity ([dad51de](dad51de))
* rewrite attendance query in qb ([75cec25](75cec25))
* translations ([93a5d36](93a5d36))

### Features

* better error msg ([4b0a0c7](4b0a0c7))

### Reverts

* Revert "fix: journals as invoice throwing validation error" (backport #1192) (#1193) ([177d957](177d957)), closes [#1192](#1192) [#1193](#1193)
frappe-pr-bot pushed a commit that referenced this pull request Dec 23, 2023
# [15.7.0](v15.6.0...v15.7.0) (2023-12-23)

### Bug Fixes

* .format instead of f strings for translations ([aa21c5e](aa21c5e))
* card footer alignment ([4d7d614](4d7d614))
* card height ([727ae77](727ae77))
* checkbox and icon alignment ([6dfb7b0](6dfb7b0))
* consider previous Leave Applications while enforcing Maximum Consecutive Leaves Allowed ([9c717ec](9c717ec))
* dirty bg color on clicking order item ([48fcac0](48fcac0))
* disable previous/next button on first/last page ([28c745e](28c745e))
* dont consider holidays while checking for consecutive leaves ([d602ba7](d602ba7))
* Half Day Leave Application Link To Half Day Attendance (backport [#1147](#1147)) ([#1202](#1202)) ([b2af5a4](b2af5a4))
* handle empty filter values and simplify `get_all_filters` ([4d0eb7e](4d0eb7e))
* icon stroke color ([ae61dbd](ae61dbd))
* inclusion of unpublished openings ([57ea95a](57ea95a))
* journals as invoice throwing validation error (backport [#1185](#1185)) ([#1187](#1187)) ([ed63f5a](ed63f5a))
* losing sort from the params while using input fields ([535b42d](535b42d))
* move closes on down ([a537aad](a537aad))
* permission sensitivity ([b4ff696](b4ff696))
* picking up of openings without closing dates ([d6ceb61](d6ceb61))
* realtime updates failing in lists ([7ccae18](7ccae18))
* reload session employee info on employee update ([2494883](2494883))
* reset page flag for infinite scroll whenever document list is fetched ([995f0bd](995f0bd))
* rewrite attendance query in qb ([97372d0](97372d0))
* salary slip realtime update ([4309634](4309634))
* search bar icon placement ([9087c28](9087c28))
* selection of filters with meta-characters ([d334b9d](d334b9d))
* single value for salary range ([db1f3b1](db1f3b1))
* sort buttons ui ([2c69e49](2c69e49))
* spacing ([2e27dcc](2e27dcc))
* spacing between groups of filters ([dd74bfd](dd74bfd))
* transaltion string ([4da0954](4da0954))
* translations ([efd6f02](efd6f02))
* update closing dates on validate ([a6c28bc](a6c28bc))
* use the standard search icon & fix translation ([fafedba](fafedba))

### Features

* add branch and employment type to portal page ([5060bf4](5060bf4))
* add Closed On field ([e786814](e786814))
* add closes on and company to portal page ([2d4eb3b](2d4eb3b))
* add color to footer ([f9ab5fa](f9ab5fa))
* add description to Closes On field ([a20b806](a20b806))
* add employment_type badge ([ed29c27](ed29c27))
* add filters ui ([f6d19f0](f6d19f0))
* add link to job route ([9558158](9558158))
* add no. of applications received ([bea8789](bea8789))
* add pagination functionality ([d09bda5](d09bda5))
* add portal page ([0f6c47d](0f6c47d))
* add Posted On, Closes On, Employment Type, and Location fields ([aa2105d](aa2105d))
* add Salary Type field ([cff5dbf](cff5dbf))
* add scheduler event to close expired job openings ([78299f1](78299f1))
* add search box ([d91c165](d91c165))
* add search functionality ([a3fa7c5](a3fa7c5))
* add sort by ([a1624e7](a1624e7))
* add sorting functionality ([b745e97](b745e97))
* add validation for dates ([59c1a8f](59c1a8f))
* add validation for Posted On date ([88f6422](88f6422))
* better error msg ([85af3d5](85af3d5))
* better spacing and other ui changes ([0a1e5da](0a1e5da))
* better ui(?) ([05be798](05be798))
* company name smaller and in blue ([a598211](a598211))
* filter functionality ([586ac61](586ac61))
* handle view for closed openings ([84056fd](84056fd))
* improve filters ui ([a1cabe1](a1cabe1))
* improve footer spacing ([f749375](f749375))
* improve ui ([58c00a7](58c00a7))
* improve ui ([ee84d3c](ee84d3c))
* **Job Portal:** add Location ([2bae21f](2bae21f))
* make card directly clickable ([8031fb8](8031fb8))
* more ui changes ([08b5d05](08b5d05))
* pagination ui ([8b7e418](8b7e418))
* **PWA:** socket setup - add `refetch_resource` listener ([3dfb395](3dfb395))
* render fields conditionally ([7bf0766](7bf0766))
* set company in job opening route ([5ed1f68](5ed1f68))
* **ui:** update search bar and bg color ([a6de8de](a6de8de))
* **ui:** use circles for everything ([ffe6d48](ffe6d48))
* update params with pagination buttons ([de6209e](de6209e))
* use grid view with two cards per row ([deb0322](deb0322))
* **ux:** scroll up before updating filters ([afcb0cc](afcb0cc))

### Performance Improvements

* index Job Opening in Job Applicant for faster reads ([04af024](04af024))

### Reverts

* Revert "fix: journals as invoice throwing validation error" (backport #1192) (#1194) ([71913e8](71913e8)), closes [#1192](#1192) [#1194](#1194)
@ruchamahabal ruchamahabal deleted the revert-1185-journals_as_invoice_gain_loss_issue branch December 28, 2023 11:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants