commit
fb8c0bd664
@ -14,7 +14,7 @@ from frappe.contacts.doctype.address.address import (get_address_display,
|
|||||||
from frappe.contacts.doctype.contact.contact import get_contact_details, get_default_contact
|
from frappe.contacts.doctype.contact.contact import get_contact_details, get_default_contact
|
||||||
from erpnext.exceptions import PartyFrozen, PartyDisabled, InvalidAccountCurrency
|
from erpnext.exceptions import PartyFrozen, PartyDisabled, InvalidAccountCurrency
|
||||||
from erpnext.accounts.utils import get_fiscal_year
|
from erpnext.accounts.utils import get_fiscal_year
|
||||||
from erpnext import get_default_currency, get_company_currency
|
from erpnext import get_company_currency
|
||||||
|
|
||||||
from six import iteritems
|
from six import iteritems
|
||||||
|
|
||||||
|
@ -260,8 +260,6 @@ def generate_keyed_value_combinations(args):
|
|||||||
return results
|
return results
|
||||||
|
|
||||||
def copy_attributes_to_variant(item, variant):
|
def copy_attributes_to_variant(item, variant):
|
||||||
from frappe.model import no_value_fields
|
|
||||||
|
|
||||||
# copy non no-copy fields
|
# copy non no-copy fields
|
||||||
|
|
||||||
exclude_fields = ["naming_series", "item_code", "item_name", "show_in_website",
|
exclude_fields = ["naming_series", "item_code", "item_name", "show_in_website",
|
||||||
|
@ -8,7 +8,7 @@ from frappe import _, throw
|
|||||||
from erpnext.stock.get_item_details import get_bin_details
|
from erpnext.stock.get_item_details import get_bin_details
|
||||||
from erpnext.stock.utils import get_incoming_rate
|
from erpnext.stock.utils import get_incoming_rate
|
||||||
from erpnext.stock.get_item_details import get_conversion_factor
|
from erpnext.stock.get_item_details import get_conversion_factor
|
||||||
from erpnext.stock.doctype.item.item import get_item_defaults, set_item_default
|
from erpnext.stock.doctype.item.item import set_item_default
|
||||||
from frappe.contacts.doctype.address.address import get_address_display
|
from frappe.contacts.doctype.address.address import get_address_display
|
||||||
|
|
||||||
from erpnext.controllers.stock_controller import StockController
|
from erpnext.controllers.stock_controller import StockController
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
from __future__ import unicode_literals
|
from __future__ import unicode_literals
|
||||||
import frappe, erpnext
|
import frappe, erpnext
|
||||||
from frappe.utils import cint, flt, cstr
|
from frappe.utils import cint, flt, cstr
|
||||||
from frappe import msgprint, _
|
from frappe import _
|
||||||
import frappe.defaults
|
import frappe.defaults
|
||||||
from erpnext.accounts.utils import get_fiscal_year
|
from erpnext.accounts.utils import get_fiscal_year
|
||||||
from erpnext.accounts.general_ledger import make_gl_entries, delete_gl_entries, process_gl_map
|
from erpnext.accounts.general_ledger import make_gl_entries, delete_gl_entries, process_gl_map
|
||||||
|
@ -2,10 +2,6 @@ from __future__ import unicode_literals
|
|||||||
|
|
||||||
import frappe
|
import frappe
|
||||||
import json
|
import json
|
||||||
import io
|
|
||||||
import base64
|
|
||||||
import os
|
|
||||||
import requests
|
|
||||||
|
|
||||||
from frappe import _
|
from frappe import _
|
||||||
from frappe.frappeclient import FrappeClient
|
from frappe.frappeclient import FrappeClient
|
||||||
|
@ -6,7 +6,7 @@ from __future__ import unicode_literals
|
|||||||
import frappe
|
import frappe
|
||||||
from erpnext.shopping_cart.cart import _get_cart_quotation
|
from erpnext.shopping_cart.cart import _get_cart_quotation
|
||||||
from erpnext.shopping_cart.doctype.shopping_cart_settings.shopping_cart_settings \
|
from erpnext.shopping_cart.doctype.shopping_cart_settings.shopping_cart_settings \
|
||||||
import is_cart_enabled, get_shopping_cart_settings, show_quantity_in_website
|
import get_shopping_cart_settings, show_quantity_in_website
|
||||||
from erpnext.utilities.product import get_price, get_qty_in_stock
|
from erpnext.utilities.product import get_price, get_qty_in_stock
|
||||||
|
|
||||||
@frappe.whitelist(allow_guest=True)
|
@frappe.whitelist(allow_guest=True)
|
||||||
|
@ -19,7 +19,6 @@
|
|||||||
# default settings that can be made for a user.
|
# default settings that can be made for a user.
|
||||||
from __future__ import unicode_literals
|
from __future__ import unicode_literals
|
||||||
|
|
||||||
import frappe
|
|
||||||
|
|
||||||
product_name = "ERPNext"
|
product_name = "ERPNext"
|
||||||
user_defaults = {
|
user_defaults = {
|
||||||
|
@ -257,7 +257,7 @@ def repost_all_stock_vouchers():
|
|||||||
doc.update_stock_ledger()
|
doc.update_stock_ledger()
|
||||||
doc.make_gl_entries(repost_future_gle=False)
|
doc.make_gl_entries(repost_future_gle=False)
|
||||||
frappe.db.commit()
|
frappe.db.commit()
|
||||||
except Exception as e:
|
except Exception:
|
||||||
print(frappe.get_traceback())
|
print(frappe.get_traceback())
|
||||||
rejected.append([voucher_type, voucher_no])
|
rejected.append([voucher_type, voucher_no])
|
||||||
frappe.db.rollback()
|
frappe.db.rollback()
|
||||||
|
@ -3,9 +3,8 @@
|
|||||||
|
|
||||||
from __future__ import unicode_literals
|
from __future__ import unicode_literals
|
||||||
|
|
||||||
import frappe, json
|
import frappe
|
||||||
from frappe import _
|
|
||||||
from frappe.utils import cint, formatdate
|
|
||||||
|
|
||||||
@frappe.whitelist(allow_guest=True)
|
@frappe.whitelist(allow_guest=True)
|
||||||
def send_message(subject="Website Query", message="", sender="", status="Open"):
|
def send_message(subject="Website Query", message="", sender="", status="Open"):
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
import unittest, frappe, requests, os, time, erpnext
|
import unittest, frappe, requests, os, time
|
||||||
from erpnext.erpnext_integrations.connectors.woocommerce_connection import order
|
from erpnext.erpnext_integrations.connectors.woocommerce_connection import order
|
||||||
|
|
||||||
class TestWoocommerce(unittest.TestCase):
|
class TestWoocommerce(unittest.TestCase):
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
import frappe
|
import frappe
|
||||||
import foundation
|
|
||||||
|
|
||||||
no_cache = 1
|
no_cache = 1
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user