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

fix: change project's actual_start_date fieldtype from Data to Date #31085

Merged
merged 2 commits into from
May 26, 2022

Conversation

sersaber
Copy link
Contributor

I have noticed that project's “actual_start_date” is not shown with the same format that other start/end dates in some reports. See image below.

project_report

This is because the field actual_start_date is defined as "Data" instead of "Date" in the doctype. I have looked through the code and the fields actual_start_date and actual_end_date are managed in the same way, but actual_end_date is defined as "Date" while actual_start_date is defined as "Data". I think this could be a typo.

@codecov
Copy link

codecov bot commented May 21, 2022

Codecov Report

Merging #31085 (62e4241) into develop (3019f93) will increase coverage by 0.01%.
The diff coverage is n/a.

@@             Coverage Diff             @@
##           develop   #31085      +/-   ##
===========================================
+ Coverage    63.04%   63.06%   +0.01%     
===========================================
  Files          986      986              
  Lines        67343    67389      +46     
===========================================
+ Hits         42457    42499      +42     
- Misses       24886    24890       +4     
Impacted Files Coverage Δ
...em_wise_sales_register/item_wise_sales_register.py 51.58% <0.00%> (-11.77%) ⬇️
...rpnext/accounts/doctype/shareholder/shareholder.py 80.00% <0.00%> (-10.00%) ⬇️
...saction/incorrect_balance_qty_after_transaction.py 88.37% <0.00%> (-9.31%) ⬇️
...t/accounts/report/sales_register/sales_register.py 70.76% <0.00%> (-7.02%) ⬇️
...unts/report/purchase_register/purchase_register.py 71.71% <0.00%> (-6.58%) ⬇️
erpnext/hr/doctype/job_offer/job_offer.py 82.92% <0.00%> (-4.88%) ⬇️
...e_purchase_register/item_wise_purchase_register.py 74.25% <0.00%> (-3.97%) ⬇️
...value/warehouse_wise_item_balance_age_and_value.py 89.02% <0.00%> (-2.44%) ⬇️
.../report/bom_operations_time/bom_operations_time.py 89.13% <0.00%> (-2.18%) ⬇️
erpnext/stock/reorder_item.py 74.16% <0.00%> (-1.05%) ⬇️
... and 32 more

Copy link
Member

@ruchamahabal ruchamahabal left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sersaber You also need to update the modified timestamp to sync the changes on migrate.

@sersaber
Copy link
Contributor Author

I think I have made the change suggested by @ruchamahabal, but I'm not sure if it's correct.

@ruchamahabal ruchamahabal merged commit e5d2c1b into frappe:develop May 26, 2022
mergify bot pushed a commit that referenced this pull request May 26, 2022
…31085)

* Update project.json

* Update project.json

(cherry picked from commit e5d2c1b)

# Conflicts:
#	erpnext/projects/doctype/project/project.json
@ruchamahabal
Copy link
Member

@sersaber A note for future contributions: Commit messages must follow the conventional commit specifications:
https://www.conventionalcommits.org/en/v1.0.0-beta.2/

ruchamahabal added a commit that referenced this pull request May 26, 2022
…backport #31085) (#31135)

Co-authored-by: sersaber <93864988+sersaber@users.noreply.github.com>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
@ankush
Copy link
Member

ankush commented May 26, 2022

This will likely require a patch in case some bad data is present in this column that can't be converted.

@ruchamahabal
Copy link
Member

This will likely require a patch in case some bad data is present in this column that can't be converted.

This field is read-only and is set from timesheets, so only dates would be present in it. No open-ended data

frappe-pr-bot pushed a commit that referenced this pull request May 26, 2022
# [13.31.0](v13.30.0...v13.31.0) (2022-05-26)

### Bug Fixes

* Account currency validation for first transaction ([228f10b](228f10b))
* Add party account validation for journal entry ([7f853b1](7f853b1))
* always update item_name for stock entry (backport [#31068](#31068)) ([#31071](#31071)) ([f519dc6](f519dc6))
* change project's actual_start_date fieldtype from Data to Date (backport [#31085](#31085)) ([#31135](#31135)) ([8c2f203](8c2f203))
* Chart data for monthly periodicity in Cash Flow report ([#31039](#31039)) ([f14e9b7](f14e9b7))
* corrective job card creation (backport [#31083](#31083)) ([#31084](#31084)) ([c17c260](c17c260))
* don't capture payments with invoice_id as donations ([168a9d4](168a9d4))
* employee advance status update on return via additional salary ([d59c3d2](d59c3d2))
* Handle missing HSN Codes ([ce3a21e](ce3a21e))
* Healthcare module accounting test cases ([09a42a1](09a42a1))
* **India:** Async issue in company address trigger ([2ea3318](2ea3318))
* **india:** error while parsing e-invoice ([#31061](#31061)) ([1461d66](1461d66))
* **india:** eway bill cancel api is disabled ([#31060](#31060)) ([95491e1](95491e1))
* Job Card excess transfer behaviour (backport [#31054](#31054)) ([#31096](#31096)) ([3984f04](3984f04))
* Leave Encashment calculations (backport [#31062](#31062)) ([#31091](#31091)) ([ba76b64](ba76b64))
* Loan Doc query in Bank Reconciliation Statement ([611d1af](611d1af))
* Loan repayment entries for payroll payable account ([ea6d754](ea6d754))
* multiple entries for same payment term ([90b1147](90b1147))
* Party account validation in JV ([d10c2e5](d10c2e5))
* payments duplicate on pos closing entry (backport [#30976](#30976)) ([#31005](#31005)) ([0efbabe](0efbabe))
* **pos:** paid amount calculation for multicurrency invoice ([#31122](#31122)) ([98eb7da](98eb7da))
* remove bad default for Membership From Date ([34928d2](34928d2))
* Remove validation from Journal Entry ([4ca6cdc](4ca6cdc))
* replace document states with list settings ([78e9e66](78e9e66))
* timesheet fetching in sales invoice ([216c32f](216c32f))
* Use directly <a> and style it as button instead of using button ([0ab9fc0](0ab9fc0))

### Features

* **Employee Advance:** add 'Returned' and 'Partly Claimed and Returned' status ([42e7a86](42e7a86))

### Reverts

* Revert "fix: Add party account validation for journal entry" ([9d43a90](9d43a90))
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Nov 9, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants