nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-29 18:04:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: Merge Conflicts

Browse Source
This commit is contained in:
Marica
2022-07-27 15:51:01 +05:30
committed by GitHub
parent 9b1544aa14
commit e310347ca4
1 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
erpnext/e_commerce/doctype/website_item/website_item.py
View File

@@ -1,9 +1,4 @@
<<<<<<< HEAD
# Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and contributors
=======
# -*- coding: utf-8 -*-
# Copyright (c) 2022, Frappe Technologies Pvt. Ltd. and contributors # Copyright (c) 2022, Frappe Technologies Pvt. Ltd. and contributors
>>>>>>> af38baeb3b (fix: Map `Item` image to `Website Item` website_image only if published via UI (v13))
# For license information, please see license.txt # For license information, please see license.txt
import json import json
@@ -125,15 +120,6 @@ class WebsiteItem(WebsiteGenerator):
if frappe.flags.in_import: if frappe.flags.in_import:
return return
<<<<<<< HEAD
auto_set_website_image = False
if not self.website_image and self.image:
auto_set_website_image = True
self.website_image = self.image
=======
"""Validate if the website image is a public file"""
>>>>>>> 9541354ec7 (chore: Make `image` field obsolete in Website Item (redundant))
if not self.website_image: if not self.website_image:
return return