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: v12 migrate error - unknown column ‘mandatory_depends_on’ #27897

Merged
merged 7 commits into from
Oct 11, 2021

Conversation

rtdany10
Copy link
Contributor

v12 doesn't have mandatory_depends_on field.
Removed a patch that referenced to the said field on v12.

Closes frappe/frappe#14335 (comment)

@rtdany10
Copy link
Contributor Author

@Mergifyio backport version-12-hotfix version-13-hotfix

@mergify
Copy link
Contributor

mergify bot commented Oct 11, 2021

Command backport version-12-hotfix version-13-hotfix: pending

backport version-12-hotfix version-13-hotfix is pending

@codecov
Copy link

codecov bot commented Oct 11, 2021

Codecov Report

Merging #27897 (0ab07bb) into develop (3f99a87) will increase coverage by 0.01%.
The diff coverage is 0.00%.

@@             Coverage Diff             @@
##           develop   #27897      +/-   ##
===========================================
+ Coverage    54.39%   54.41%   +0.01%     
===========================================
  Files         1254     1254              
  Lines        67717    67717              
===========================================
+ Hits         36838    36845       +7     
+ Misses       30879    30872       -7     
Impacted Files Coverage Δ
...cial_statement/consolidated_financial_statement.py 0.00% <0.00%> (ø)
erpnext/utilities/product.py 15.94% <0.00%> (-34.79%) ⬇️
erpnext/shopping_cart/product_info.py 32.35% <0.00%> (-20.59%) ⬇️
...t/payroll/doctype/payroll_period/payroll_period.py 65.45% <0.00%> (-5.46%) ⬇️
...eorder_level/itemwise_recommended_reorder_level.py 90.56% <0.00%> (-3.78%) ⬇️
...vs_serial_no_count/stock_qty_vs_serial_no_count.py 93.10% <0.00%> (-3.45%) ⬇️
...e/shopping_cart_settings/shopping_cart_settings.py 66.03% <0.00%> (-1.89%) ⬇️
erpnext/shopping_cart/product_query.py 61.19% <0.00%> (-1.50%) ⬇️
erpnext/portal/utils.py 30.00% <0.00%> (-1.43%) ⬇️
erpnext/accounts/deferred_revenue.py 75.22% <0.00%> (-0.89%) ⬇️
... and 20 more

@rtdany10 rtdany10 requested a review from ankush October 11, 2021 08:35
ankush
ankush previously approved these changes Oct 11, 2021
@ankush ankush enabled auto-merge (squash) October 11, 2021 08:38
auto-merge was automatically disabled October 11, 2021 08:52

Head branch was pushed to by a user without write access

@rtdany10
Copy link
Contributor Author

rtdany10 commented Oct 11, 2021

@ankush Linters failing due to another piece of code.
image

@rtdany10 rtdany10 requested a review from ankush October 11, 2021 08:52
@rtdany10
Copy link
Contributor Author

@ankush Linters failing due to another piece of code.

Have fixed this. Can merge now :)

@ankush ankush merged commit 7acdcc7 into frappe:develop Oct 11, 2021
mergify bot pushed a commit that referenced this pull request Oct 11, 2021
* fix: v12 doesn't have mandatory_depends_on field

* fix: move update_vehicle_no_reqd_condition to v13

* fix: move update_vehicle_no_reqd_condition to v13

* fix: file name missing .py

* refactor!: add back empty line

* fix: linters issue

(cherry picked from commit 7acdcc7)

# Conflicts:
#	erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py
#	erpnext/patches.txt
#	erpnext/patches/v13_0/update_vehicle_no_reqd_condition.py
mergify bot pushed a commit that referenced this pull request Oct 11, 2021
* fix: v12 doesn't have mandatory_depends_on field

* fix: move update_vehicle_no_reqd_condition to v13

* fix: move update_vehicle_no_reqd_condition to v13

* fix: file name missing .py

* refactor!: add back empty line

* fix: linters issue

(cherry picked from commit 7acdcc7)

# Conflicts:
#	erpnext/patches.txt
@mergify
Copy link
Contributor

mergify bot commented Oct 11, 2021

Command backport version-12-hotfix version-13-hotfix: success

Backports have been created

ankush added a commit that referenced this pull request Oct 11, 2021
…ort #27897) (#27900)

* fix: v12 migrate error - unknown column ‘mandatory_depends_on’ (#27897)

* fix: v12 doesn't have mandatory_depends_on field

* fix: move update_vehicle_no_reqd_condition to v13

* fix: move update_vehicle_no_reqd_condition to v13

* fix: file name missing .py

* refactor!: add back empty line

* fix: linters issue

(cherry picked from commit 7acdcc7)

# Conflicts:
#	erpnext/patches.txt

* fix: resolve conflicts

Co-authored-by: Dany Robert <rtdany10@gmail.com>
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
asoral pushed a commit to asoral/erpnext that referenced this pull request Nov 12, 2021
…e#27897)

* fix: v12 doesn't have mandatory_depends_on field

* fix: move update_vehicle_no_reqd_condition to v13

* fix: move update_vehicle_no_reqd_condition to v13

* fix: file name missing .py

* refactor!: add back empty line

* fix: linters issue
@rtdany10 rtdany10 deleted the patch-6 branch December 7, 2021 17:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

ERPNext v13 Upgrade from v12 broken - Temporary Workaround
2 participants