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

feat: Tick on checkbox to include draft timesheets #36577

Merged
merged 1 commit into from
Aug 14, 2023
Merged

feat: Tick on checkbox to include draft timesheets #36577

merged 1 commit into from
Aug 14, 2023

Conversation

viralkansodiya
Copy link
Contributor

feat: Tick on checkbox to include draft timesheets

@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label Aug 10, 2023
@codecov
Copy link

codecov bot commented Aug 14, 2023

Codecov Report

Merging #36577 (335d5d9) into develop (ad33cd7) will decrease coverage by 0.01%.
Report is 59 commits behind head on develop.
The diff coverage is 0.00%.

Additional details and impacted files
@@             Coverage Diff             @@
##           develop   #36577      +/-   ##
===========================================
- Coverage    64.71%   64.71%   -0.01%     
===========================================
  Files          791      791              
  Lines        61621    61624       +3     
===========================================
  Hits         39880    39880              
- Misses       21741    21744       +3     
Files Changed Coverage Δ
erpnext/projects/report/billing_summary.py 0.00% <0.00%> (ø)
...eport/item_shortage_report/item_shortage_report.py 93.54% <ø> (ø)

@anandbaburajan anandbaburajan merged commit 7565279 into frappe:develop Aug 14, 2023
13 of 14 checks passed
@anandbaburajan
Copy link
Contributor

Thanks @viralkansodiya. Do you want this to be backported to v14?

@viralkansodiya
Copy link
Contributor Author

Thanks @anandbaburajan
Yes Please backported to v14

@anandbaburajan
Copy link
Contributor

@mergify backport version-14-hotfix

@mergify
Copy link
Contributor

mergify bot commented Aug 14, 2023

backport version-14-hotfix

✅ Backports have been created

mergify bot pushed a commit that referenced this pull request Aug 14, 2023
feat: Tick on Check box to include Draft Timesheets
(cherry picked from commit 7565279)
@viralkansodiya
Copy link
Contributor Author

viralkansodiya commented Aug 17, 2023

@anandbaburajan I have Run this test manually in my local system , it runs successfully, can you please merge this Request

TestCustomer which is fail in mergify

anandbaburajan pushed a commit that referenced this pull request Aug 17, 2023
…36640)

feat: Tick on checkbox to include draft timesheets (#36577)

feat: Tick on Check box to include Draft Timesheets
(cherry picked from commit 7565279)

Co-authored-by: ViralKansodiya <141210323+viralkansodiya@users.noreply.github.com>
frappe-pr-bot pushed a commit that referenced this pull request Aug 23, 2023
# [14.36.0](v14.35.2...v14.36.0) (2023-08-23)

### Bug Fixes

* Accounts Payable Currency bug ([94612b9](94612b9))
* Add company filters for account ([e62ffa9](e62ffa9))
* add missing items labels back ([#36737](#36737)) ([3634e80](3634e80))
* broken advance field in Accounts Receivable summary rpt ([296a4d7](296a4d7))
* broken consolidated report due to finance book filter ([5bd2a09](5bd2a09))
* check tax and charges if it is passed ([1f76c69](1f76c69))
* clear dimension defaults after test ([2a467a9](2a467a9))
* dict value for dimension for gl entries defined without the dimension ([11ba553](11ba553))
* dimension name in remark ([01ae513](01ae513))
* divide offsetting amount for multiple dimensions ([1269f2d](1269f2d))
* divide offsetting amount only when account exists ([2c8c3a0](2c8c3a0))
* Document Name link validation in Bank Reconciliation Tool ([#36495](#36495)) ([83cbc1b](83cbc1b)), closes [#35540](#35540) [#35540](#35540)
* don't throw if item does not have default BOM (backport [#36709](#36709)) ([#36734](#36734)) ([e1bd9a7](e1bd9a7))
* duplicate acc dimension in test ([cdb66bf](cdb66bf))
* fetch acc dimensions correctly when fieldname is different from name ([7ac35b4](7ac35b4))
* fetch accounting dimension details specific to company ([c1f1a21](c1f1a21))
* include gain/loss journal in AR/AP reports ([4606079](4606079))
* incorrect gl balance on multi company setup ([cb9aad3](cb9aad3))
* incorrect schedule in asset value adjustment ([#36725](#36725)) ([a0575ed](a0575ed))
* make offsetting entry for acc dimensions ([3198f26](3198f26))
* make offsetting entry for all doctypes ([f578c32](f578c32))
* mode of payment fetched from pos profile company in POS ([c74a414](c74a414))
* not able to make stock entry ([#36759](#36759)) ([873ee38](873ee38))
* Procurement Tracker report not showing material request items ([#36768](#36768)) ([6a9935c](6a9935c))
* reset dimension defaults when company changedin test ([37ef6e9](37ef6e9))
* **RFQ:** make "update password" and "submit quotation" buttons the same size (backport [#36667](#36667)) ([#36686](#36686)) ([36147ec](36147ec))
* timeout error coming during reposting ([#36715](#36715)) ([620b21f](620b21f))
* **ux:** change batch selection message to alert (backport [#36500](#36500)) ([#36697](#36697)) ([0a4947a](0a4947a))
* **UX:** Ignore prepared report ([3e23e1f](3e23e1f))

### Features

* **RFQ:** make email message fully configurable (backport [#36353](#36353)) ([#36531](#36531)) ([c308bd5](c308bd5))
* Tick on checkbox to include draft timesheets (backport [#36577](#36577)) ([#36640](#36640)) ([9668615](9668615))
* utility to repost accounting ledgers without cancellation ([#36469](#36469)) ([f8d6fe6](f8d6fe6))

### Performance Improvements

* pull latest details only for referenced vouchers ([47345e8](47345e8))
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 6, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
needs-tests This PR needs automated unit-tests.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants