Merge with 3.3.8
diff --git a/.gitignore b/.gitignore
index 2b5e3d6..a23a9a7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,5 @@
locale
latest_updates.json
.wnf-lang-status
+*.egg-info
+dist/
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..ee64b6d
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,30 @@
+anguage: python
+
+python:
+ - "2.7"
+
+services:
+ - mysql
+
+install:
+ - pip install https://github.com/webnotes/wnframework/archive/4.0.0-wip.tar.gz &&
+ - pip install --editable .
+
+script:
+ cd ./test_sites/ &&
+ webnotes --reinstall -v test_site &&
+ webnotes --install_app erpnext -v test_site &&
+ webnotes --run_tests -v test_site --app erpnext
+
+branches:
+ except:
+ - develop
+ - master
+ - 3.x.x
+ - slow
+ - webshop_refactor
+
+before_script:
+ - mysql -e 'create database travis' &&
+ - echo "USE mysql;\nUPDATE user SET password=PASSWORD('travis') WHERE user='travis';\nFLUSH PRIVILEGES;\n" | mysql -u root
+
diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 0000000..7bf6b4d
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,18 @@
+include MANIFEST.in
+include requirements.txt
+include *.json
+include *.md
+include *.py
+include *.txt
+recursive-include erpnext *.css
+recursive-include erpnext *.csv
+recursive-include erpnext *.html
+recursive-include erpnext *.ico
+recursive-include erpnext *.js
+recursive-include erpnext *.json
+recursive-include erpnext *.md
+recursive-include erpnext *.png
+recursive-include erpnext *.py
+recursive-include erpnext *.svg
+recursive-include erpnext *.txt
+recursive-exclude * *.pyc
\ No newline at end of file
diff --git a/accounts/doctype/sales_invoice/templates/__init__.py b/accounts/doctype/sales_invoice/templates/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/accounts/doctype/sales_invoice/templates/__init__.py
+++ /dev/null
diff --git a/accounts/doctype/sales_invoice/templates/pages/__init__.py b/accounts/doctype/sales_invoice/templates/pages/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/accounts/doctype/sales_invoice/templates/pages/__init__.py
+++ /dev/null
diff --git a/accounts/doctype/sales_invoice/templates/pages/invoices.html b/accounts/doctype/sales_invoice/templates/pages/invoices.html
deleted file mode 100644
index f108683..0000000
--- a/accounts/doctype/sales_invoice/templates/pages/invoices.html
+++ /dev/null
@@ -1 +0,0 @@
-{% extends "app/portal/templates/sales_transactions.html" %}
\ No newline at end of file
diff --git a/accounts/report/general_ledger/__init__.py b/accounts/report/general_ledger/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/accounts/report/general_ledger/__init__.py
+++ /dev/null
diff --git a/accounts/report/general_ledger/general_ledger.js b/accounts/report/general_ledger/general_ledger.js
deleted file mode 100644
index 7985277..0000000
--- a/accounts/report/general_ledger/general_ledger.js
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
-// License: GNU General Public License v3. See license.txt
-
-wn.query_reports["General Ledger"] = {
- "filters": [
- {
- "fieldname":"company",
- "label": wn._("Company"),
- "fieldtype": "Link",
- "options": "Company",
- "default": wn.defaults.get_user_default("company"),
- "reqd": 1
- },
- {
- "fieldname":"account",
- "label": wn._("Account"),
- "fieldtype": "Link",
- "options": "Account"
- },
- {
- "fieldname":"voucher_no",
- "label": wn._("Voucher No"),
- "fieldtype": "Data",
- },
- {
- "fieldname":"group_by",
- "label": wn._("Group by"),
- "fieldtype": "Select",
- "options": "\nGroup by Account\nGroup by Voucher"
- },
- {
- "fieldtype": "Break",
- },
- {
- "fieldname":"from_date",
- "label": wn._("From Date"),
- "fieldtype": "Date",
- "default": wn.datetime.add_months(wn.datetime.get_today(), -1),
- "reqd": 1,
- "width": "60px"
- },
- {
- "fieldname":"to_date",
- "label": wn._("To Date"),
- "fieldtype": "Date",
- "default": wn.datetime.get_today(),
- "reqd": 1,
- "width": "60px"
- }
- ]
-}
\ No newline at end of file
diff --git a/accounts/report/general_ledger/general_ledger.py b/accounts/report/general_ledger/general_ledger.py
deleted file mode 100644
index b88d5bc..0000000
--- a/accounts/report/general_ledger/general_ledger.py
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import webnotes
-from webnotes.utils import flt, add_days
-from webnotes import _
-from accounts.utils import get_balance_on
-
-def execute(filters=None):
- account_details = webnotes.conn.get_value("Account", filters["account"],
- ["debit_or_credit", "group_or_ledger"], as_dict=True) if filters.get("account") else None
- validate_filters(filters, account_details)
-
- columns = get_columns()
- data = []
- if filters.get("group_by"):
- data += get_grouped_gle(filters)
- else:
- data += get_gl_entries(filters)
- if data:
- data.append(get_total_row(data))
-
- if account_details:
- data = [get_opening_balance_row(filters, account_details.debit_or_credit)] + data + \
- [get_closing_balance_row(filters, account_details.debit_or_credit)]
-
- return columns, data
-
-def validate_filters(filters, account_details):
- if account_details and account_details.group_or_ledger == "Ledger" \
- and filters.get("group_by") == "Group by Account":
- webnotes.throw(_("Can not filter based on Account, if grouped by Account"))
-
- if filters.get("voucher_no") and filters.get("group_by") == "Group by Voucher":
- webnotes.throw(_("Can not filter based on Voucher No, if grouped by Voucher"))
-
-def get_columns():
- return ["Posting Date:Date:100", "Account:Link/Account:200", "Debit:Float:100",
- "Credit:Float:100", "Voucher Type::120", "Voucher No::160", "Link::20",
- "Cost Center:Link/Cost Center:100", "Remarks::200"]
-
-def get_opening_balance_row(filters, debit_or_credit):
- opening_balance = get_balance_on(filters["account"], add_days(filters["from_date"], -1))
- return get_balance_row(opening_balance, debit_or_credit, "Opening Balance")
-
-def get_closing_balance_row(filters, debit_or_credit):
- closing_balance = get_balance_on(filters["account"], filters["to_date"])
- return get_balance_row(closing_balance, debit_or_credit, "Closing Balance")
-
-def get_balance_row(balance, debit_or_credit, balance_label):
- if debit_or_credit == "Debit":
- return ["", balance_label, balance, 0.0, "", "", ""]
- else:
- return ["", balance_label, 0.0, balance, "", "", ""]
-
-def get_gl_entries(filters):
- gl_entries = webnotes.conn.sql("""select
- posting_date, account, debit, credit, voucher_type, voucher_no, cost_center, remarks
- from `tabGL Entry`
- where company=%(company)s
- and posting_date between %(from_date)s and %(to_date)s
- {conditions}
- order by posting_date, account"""\
- .format(conditions=get_conditions(filters)), filters, as_list=1)
-
- for d in gl_entries:
- icon = """<a href="%s"><i class="icon icon-share" style="cursor: pointer;"></i></a>""" \
- % ("/".join(["#Form", d[4], d[5]]),)
- d.insert(6, icon)
-
- return gl_entries
-
-def get_conditions(filters):
- conditions = []
- if filters.get("account"):
- lft, rgt = webnotes.conn.get_value("Account", filters["account"], ["lft", "rgt"])
- conditions.append("""account in (select name from tabAccount
- where lft>=%s and rgt<=%s and docstatus<2)""" % (lft, rgt))
- if filters.get("voucher_no"):
- conditions.append("voucher_no=%(voucher_no)s")
-
- return "and {}".format(" and ".join(conditions)) if conditions else ""
-
-def get_grouped_gle(filters):
- gle_map = {}
- gle = get_gl_entries(filters)
- for d in gle:
- gle_map.setdefault(d[1 if filters["group_by"]=="Group by Account" else 5], []).append(d)
-
- data = []
- for entries in gle_map.values():
- subtotal_debit = subtotal_credit = 0.0
- for entry in entries:
- data.append(entry)
- subtotal_debit += flt(entry[2])
- subtotal_credit += flt(entry[3])
-
- data.append(["", "Total", subtotal_debit, subtotal_credit, "", "", ""])
-
- if data:
- data.append(get_total_row(gle))
- return data
-
-def get_total_row(gle):
- total_debit = total_credit = 0.0
- for d in gle:
- total_debit += flt(d[2])
- total_credit += flt(d[3])
-
- return ["", "Total Debit/Credit", total_debit, total_credit, "", "", ""]
\ No newline at end of file
diff --git a/accounts/report/general_ledger/general_ledger.txt b/accounts/report/general_ledger/general_ledger.txt
deleted file mode 100644
index ef169db..0000000
--- a/accounts/report/general_ledger/general_ledger.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-[
- {
- "creation": "2013-12-06 13:22:23",
- "docstatus": 0,
- "modified": "2013-12-06 13:22:23",
- "modified_by": "Administrator",
- "owner": "Administrator"
- },
- {
- "doctype": "Report",
- "is_standard": "Yes",
- "name": "__common__",
- "ref_doctype": "GL Entry",
- "report_name": "General Ledger",
- "report_type": "Script Report"
- },
- {
- "doctype": "Report",
- "name": "General Ledger"
- }
-]
\ No newline at end of file
diff --git a/config.json b/config.json
deleted file mode 100644
index b57ba61..0000000
--- a/config.json
+++ /dev/null
@@ -1,78 +0,0 @@
-{
- "app_name": "ERPNext",
- "app_version": "3.3.8",
- "base_template": "app/portal/templates/base.html",
- "modules": {
- "Accounts": {
- "color": "#3498db",
- "icon": "icon-money",
- "link": "accounts-home",
- "type": "module"
- },
- "Activity": {
- "color": "#e67e22",
- "icon": "icon-play",
- "label": "Activity",
- "link": "activity",
- "type": "page"
- },
- "Buying": {
- "color": "#c0392b",
- "icon": "icon-shopping-cart",
- "link": "buying-home",
- "type": "module"
- },
- "HR": {
- "color": "#2ecc71",
- "icon": "icon-group",
- "label": "Human Resources",
- "link": "hr-home",
- "type": "module"
- },
- "Manufacturing": {
- "color": "#7f8c8d",
- "icon": "icon-cogs",
- "link": "manufacturing-home",
- "type": "module"
- },
- "Notes": {
- "color": "#95a5a6",
- "doctype": "Note",
- "icon": "icon-file-alt",
- "label": "Notes",
- "link": "List/Note",
- "type": "list"
- },
- "Projects": {
- "color": "#8e44ad",
- "icon": "icon-puzzle-piece",
- "link": "projects-home",
- "type": "module"
- },
- "Selling": {
- "color": "#1abc9c",
- "icon": "icon-tag",
- "link": "selling-home",
- "type": "module"
- },
- "Setup": {
- "color": "#bdc3c7",
- "icon": "icon-wrench",
- "link": "Setup",
- "type": "setup"
- },
- "Stock": {
- "color": "#f39c12",
- "icon": "icon-truck",
- "link": "stock-home",
- "type": "module"
- },
- "Support": {
- "color": "#2c3e50",
- "icon": "icon-phone",
- "link": "support-home",
- "type": "module"
- }
- },
- "requires_framework_version": "==3.3.2"
-}
\ No newline at end of file
diff --git a/hr/report/__init__.py b/erpnext/__init__.py
similarity index 100%
copy from hr/report/__init__.py
copy to erpnext/__init__.py
diff --git a/accounts/Print Format/Cheque Printing Format/Cheque Printing Format.txt b/erpnext/accounts/Print Format/Cheque Printing Format/Cheque Printing Format.txt
similarity index 100%
rename from accounts/Print Format/Cheque Printing Format/Cheque Printing Format.txt
rename to erpnext/accounts/Print Format/Cheque Printing Format/Cheque Printing Format.txt
diff --git a/accounts/Print Format/POS Invoice/POS Invoice.txt b/erpnext/accounts/Print Format/POS Invoice/POS Invoice.txt
similarity index 100%
rename from accounts/Print Format/POS Invoice/POS Invoice.txt
rename to erpnext/accounts/Print Format/POS Invoice/POS Invoice.txt
diff --git a/accounts/Print Format/Payment Receipt Voucher/Payment Receipt Voucher.txt b/erpnext/accounts/Print Format/Payment Receipt Voucher/Payment Receipt Voucher.txt
similarity index 100%
rename from accounts/Print Format/Payment Receipt Voucher/Payment Receipt Voucher.txt
rename to erpnext/accounts/Print Format/Payment Receipt Voucher/Payment Receipt Voucher.txt
diff --git a/accounts/Print Format/Sales Invoice Classic/Sales Invoice Classic.txt b/erpnext/accounts/Print Format/Sales Invoice Classic/Sales Invoice Classic.txt
similarity index 100%
rename from accounts/Print Format/Sales Invoice Classic/Sales Invoice Classic.txt
rename to erpnext/accounts/Print Format/Sales Invoice Classic/Sales Invoice Classic.txt
diff --git a/accounts/Print Format/Sales Invoice Modern/Sales Invoice Modern.txt b/erpnext/accounts/Print Format/Sales Invoice Modern/Sales Invoice Modern.txt
similarity index 100%
rename from accounts/Print Format/Sales Invoice Modern/Sales Invoice Modern.txt
rename to erpnext/accounts/Print Format/Sales Invoice Modern/Sales Invoice Modern.txt
diff --git a/accounts/Print Format/Sales Invoice Spartan/Sales Invoice Spartan.txt b/erpnext/accounts/Print Format/Sales Invoice Spartan/Sales Invoice Spartan.txt
similarity index 100%
rename from accounts/Print Format/Sales Invoice Spartan/Sales Invoice Spartan.txt
rename to erpnext/accounts/Print Format/Sales Invoice Spartan/Sales Invoice Spartan.txt
diff --git a/accounts/Print Format/SalesInvoice/SalesInvoice.html b/erpnext/accounts/Print Format/SalesInvoice/SalesInvoice.html
similarity index 100%
rename from accounts/Print Format/SalesInvoice/SalesInvoice.html
rename to erpnext/accounts/Print Format/SalesInvoice/SalesInvoice.html
diff --git a/accounts/Print Format/SalesInvoice/SalesInvoice.txt b/erpnext/accounts/Print Format/SalesInvoice/SalesInvoice.txt
similarity index 100%
rename from accounts/Print Format/SalesInvoice/SalesInvoice.txt
rename to erpnext/accounts/Print Format/SalesInvoice/SalesInvoice.txt
diff --git a/accounts/README.md b/erpnext/accounts/README.md
similarity index 100%
rename from accounts/README.md
rename to erpnext/accounts/README.md
diff --git a/accounts/__init__.py b/erpnext/accounts/__init__.py
similarity index 100%
rename from accounts/__init__.py
rename to erpnext/accounts/__init__.py
diff --git a/accounts/doctype/__init__.py b/erpnext/accounts/doctype/__init__.py
similarity index 100%
rename from accounts/doctype/__init__.py
rename to erpnext/accounts/doctype/__init__.py
diff --git a/accounts/doctype/account/README.md b/erpnext/accounts/doctype/account/README.md
similarity index 100%
rename from accounts/doctype/account/README.md
rename to erpnext/accounts/doctype/account/README.md
diff --git a/accounts/doctype/account/__init__.py b/erpnext/accounts/doctype/account/__init__.py
similarity index 100%
rename from accounts/doctype/account/__init__.py
rename to erpnext/accounts/doctype/account/__init__.py
diff --git a/accounts/doctype/account/account.js b/erpnext/accounts/doctype/account/account.js
similarity index 100%
rename from accounts/doctype/account/account.js
rename to erpnext/accounts/doctype/account/account.js
diff --git a/accounts/doctype/account/account.py b/erpnext/accounts/doctype/account/account.py
similarity index 98%
rename from accounts/doctype/account/account.py
rename to erpnext/accounts/doctype/account/account.py
index 0640ad9..99d4f24 100644
--- a/accounts/doctype/account/account.py
+++ b/erpnext/accounts/doctype/account/account.py
@@ -206,7 +206,7 @@
def before_rename(self, old, new, merge=False):
# Add company abbr if not provided
- from setup.doctype.company.company import get_name_with_abbr
+ from erpnext.setup.doctype.company.company import get_name_with_abbr
new_account = get_name_with_abbr(new, self.doc.company)
# Validate properties before merging
diff --git a/accounts/doctype/account/account.txt b/erpnext/accounts/doctype/account/account.txt
similarity index 100%
rename from accounts/doctype/account/account.txt
rename to erpnext/accounts/doctype/account/account.txt
diff --git a/accounts/doctype/account/test_account.py b/erpnext/accounts/doctype/account/test_account.py
similarity index 100%
rename from accounts/doctype/account/test_account.py
rename to erpnext/accounts/doctype/account/test_account.py
diff --git a/accounts/doctype/accounts_settings/__init__.py b/erpnext/accounts/doctype/accounts_settings/__init__.py
similarity index 100%
rename from accounts/doctype/accounts_settings/__init__.py
rename to erpnext/accounts/doctype/accounts_settings/__init__.py
diff --git a/accounts/doctype/accounts_settings/accounts_settings.py b/erpnext/accounts/doctype/accounts_settings/accounts_settings.py
similarity index 100%
rename from accounts/doctype/accounts_settings/accounts_settings.py
rename to erpnext/accounts/doctype/accounts_settings/accounts_settings.py
diff --git a/accounts/doctype/accounts_settings/accounts_settings.txt b/erpnext/accounts/doctype/accounts_settings/accounts_settings.txt
similarity index 100%
rename from accounts/doctype/accounts_settings/accounts_settings.txt
rename to erpnext/accounts/doctype/accounts_settings/accounts_settings.txt
diff --git a/accounts/doctype/bank_reconciliation/README.md b/erpnext/accounts/doctype/bank_reconciliation/README.md
similarity index 100%
rename from accounts/doctype/bank_reconciliation/README.md
rename to erpnext/accounts/doctype/bank_reconciliation/README.md
diff --git a/accounts/doctype/bank_reconciliation/__init__.py b/erpnext/accounts/doctype/bank_reconciliation/__init__.py
similarity index 100%
rename from accounts/doctype/bank_reconciliation/__init__.py
rename to erpnext/accounts/doctype/bank_reconciliation/__init__.py
diff --git a/accounts/doctype/bank_reconciliation/bank_reconciliation.js b/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.js
similarity index 100%
rename from accounts/doctype/bank_reconciliation/bank_reconciliation.js
rename to erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.js
diff --git a/accounts/doctype/bank_reconciliation/bank_reconciliation.py b/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py
similarity index 100%
rename from accounts/doctype/bank_reconciliation/bank_reconciliation.py
rename to erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py
diff --git a/accounts/doctype/bank_reconciliation/bank_reconciliation.txt b/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.txt
similarity index 100%
rename from accounts/doctype/bank_reconciliation/bank_reconciliation.txt
rename to erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.txt
diff --git a/accounts/doctype/bank_reconciliation_detail/README.md b/erpnext/accounts/doctype/bank_reconciliation_detail/README.md
similarity index 100%
rename from accounts/doctype/bank_reconciliation_detail/README.md
rename to erpnext/accounts/doctype/bank_reconciliation_detail/README.md
diff --git a/accounts/doctype/bank_reconciliation_detail/__init__.py b/erpnext/accounts/doctype/bank_reconciliation_detail/__init__.py
similarity index 100%
rename from accounts/doctype/bank_reconciliation_detail/__init__.py
rename to erpnext/accounts/doctype/bank_reconciliation_detail/__init__.py
diff --git a/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.py b/erpnext/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.py
similarity index 100%
rename from accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.py
rename to erpnext/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.py
diff --git a/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.txt b/erpnext/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.txt
similarity index 100%
rename from accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.txt
rename to erpnext/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.txt
diff --git a/accounts/doctype/budget_detail/README.md b/erpnext/accounts/doctype/budget_detail/README.md
similarity index 100%
rename from accounts/doctype/budget_detail/README.md
rename to erpnext/accounts/doctype/budget_detail/README.md
diff --git a/accounts/doctype/budget_detail/__init__.py b/erpnext/accounts/doctype/budget_detail/__init__.py
similarity index 100%
rename from accounts/doctype/budget_detail/__init__.py
rename to erpnext/accounts/doctype/budget_detail/__init__.py
diff --git a/accounts/doctype/budget_detail/budget_detail.py b/erpnext/accounts/doctype/budget_detail/budget_detail.py
similarity index 100%
rename from accounts/doctype/budget_detail/budget_detail.py
rename to erpnext/accounts/doctype/budget_detail/budget_detail.py
diff --git a/accounts/doctype/budget_detail/budget_detail.txt b/erpnext/accounts/doctype/budget_detail/budget_detail.txt
similarity index 100%
rename from accounts/doctype/budget_detail/budget_detail.txt
rename to erpnext/accounts/doctype/budget_detail/budget_detail.txt
diff --git a/accounts/doctype/budget_distribution/README.md b/erpnext/accounts/doctype/budget_distribution/README.md
similarity index 100%
rename from accounts/doctype/budget_distribution/README.md
rename to erpnext/accounts/doctype/budget_distribution/README.md
diff --git a/accounts/doctype/budget_distribution/__init__.py b/erpnext/accounts/doctype/budget_distribution/__init__.py
similarity index 100%
rename from accounts/doctype/budget_distribution/__init__.py
rename to erpnext/accounts/doctype/budget_distribution/__init__.py
diff --git a/accounts/doctype/budget_distribution/budget_distribution.js b/erpnext/accounts/doctype/budget_distribution/budget_distribution.js
similarity index 100%
rename from accounts/doctype/budget_distribution/budget_distribution.js
rename to erpnext/accounts/doctype/budget_distribution/budget_distribution.js
diff --git a/accounts/doctype/budget_distribution/budget_distribution.py b/erpnext/accounts/doctype/budget_distribution/budget_distribution.py
similarity index 100%
rename from accounts/doctype/budget_distribution/budget_distribution.py
rename to erpnext/accounts/doctype/budget_distribution/budget_distribution.py
diff --git a/accounts/doctype/budget_distribution/budget_distribution.txt b/erpnext/accounts/doctype/budget_distribution/budget_distribution.txt
similarity index 100%
rename from accounts/doctype/budget_distribution/budget_distribution.txt
rename to erpnext/accounts/doctype/budget_distribution/budget_distribution.txt
diff --git a/accounts/doctype/budget_distribution/test_budget_distribution.py b/erpnext/accounts/doctype/budget_distribution/test_budget_distribution.py
similarity index 100%
rename from accounts/doctype/budget_distribution/test_budget_distribution.py
rename to erpnext/accounts/doctype/budget_distribution/test_budget_distribution.py
diff --git a/accounts/doctype/budget_distribution_detail/README.md b/erpnext/accounts/doctype/budget_distribution_detail/README.md
similarity index 100%
rename from accounts/doctype/budget_distribution_detail/README.md
rename to erpnext/accounts/doctype/budget_distribution_detail/README.md
diff --git a/accounts/doctype/budget_distribution_detail/__init__.py b/erpnext/accounts/doctype/budget_distribution_detail/__init__.py
similarity index 100%
rename from accounts/doctype/budget_distribution_detail/__init__.py
rename to erpnext/accounts/doctype/budget_distribution_detail/__init__.py
diff --git a/accounts/doctype/budget_distribution_detail/budget_distribution_detail.py b/erpnext/accounts/doctype/budget_distribution_detail/budget_distribution_detail.py
similarity index 100%
rename from accounts/doctype/budget_distribution_detail/budget_distribution_detail.py
rename to erpnext/accounts/doctype/budget_distribution_detail/budget_distribution_detail.py
diff --git a/accounts/doctype/budget_distribution_detail/budget_distribution_detail.txt b/erpnext/accounts/doctype/budget_distribution_detail/budget_distribution_detail.txt
similarity index 100%
rename from accounts/doctype/budget_distribution_detail/budget_distribution_detail.txt
rename to erpnext/accounts/doctype/budget_distribution_detail/budget_distribution_detail.txt
diff --git a/accounts/doctype/c_form/README.md b/erpnext/accounts/doctype/c_form/README.md
similarity index 100%
rename from accounts/doctype/c_form/README.md
rename to erpnext/accounts/doctype/c_form/README.md
diff --git a/accounts/doctype/c_form/__init__.py b/erpnext/accounts/doctype/c_form/__init__.py
similarity index 100%
rename from accounts/doctype/c_form/__init__.py
rename to erpnext/accounts/doctype/c_form/__init__.py
diff --git a/accounts/doctype/c_form/c_form.js b/erpnext/accounts/doctype/c_form/c_form.js
similarity index 100%
rename from accounts/doctype/c_form/c_form.js
rename to erpnext/accounts/doctype/c_form/c_form.js
diff --git a/accounts/doctype/c_form/c_form.py b/erpnext/accounts/doctype/c_form/c_form.py
similarity index 98%
rename from accounts/doctype/c_form/c_form.py
rename to erpnext/accounts/doctype/c_form/c_form.py
index 81d5a15..80a9f44 100644
--- a/accounts/doctype/c_form/c_form.py
+++ b/erpnext/accounts/doctype/c_form/c_form.py
@@ -76,7 +76,7 @@
}
def get_invoice_nos(doctype, txt, searchfield, start, page_len, filters):
- from utilities import build_filter_conditions
+ from erpnext.utilities import build_filter_conditions
conditions, filter_values = build_filter_conditions(filters)
return webnotes.conn.sql("""select name from `tabSales Invoice` where docstatus = 1
diff --git a/accounts/doctype/c_form/c_form.txt b/erpnext/accounts/doctype/c_form/c_form.txt
similarity index 100%
rename from accounts/doctype/c_form/c_form.txt
rename to erpnext/accounts/doctype/c_form/c_form.txt
diff --git a/accounts/doctype/c_form_invoice_detail/README.md b/erpnext/accounts/doctype/c_form_invoice_detail/README.md
similarity index 100%
rename from accounts/doctype/c_form_invoice_detail/README.md
rename to erpnext/accounts/doctype/c_form_invoice_detail/README.md
diff --git a/accounts/doctype/c_form_invoice_detail/__init__.py b/erpnext/accounts/doctype/c_form_invoice_detail/__init__.py
similarity index 100%
rename from accounts/doctype/c_form_invoice_detail/__init__.py
rename to erpnext/accounts/doctype/c_form_invoice_detail/__init__.py
diff --git a/accounts/doctype/c_form_invoice_detail/c_form_invoice_detail.py b/erpnext/accounts/doctype/c_form_invoice_detail/c_form_invoice_detail.py
similarity index 100%
rename from accounts/doctype/c_form_invoice_detail/c_form_invoice_detail.py
rename to erpnext/accounts/doctype/c_form_invoice_detail/c_form_invoice_detail.py
diff --git a/accounts/doctype/c_form_invoice_detail/c_form_invoice_detail.txt b/erpnext/accounts/doctype/c_form_invoice_detail/c_form_invoice_detail.txt
similarity index 100%
rename from accounts/doctype/c_form_invoice_detail/c_form_invoice_detail.txt
rename to erpnext/accounts/doctype/c_form_invoice_detail/c_form_invoice_detail.txt
diff --git a/accounts/doctype/cost_center/README.md b/erpnext/accounts/doctype/cost_center/README.md
similarity index 100%
rename from accounts/doctype/cost_center/README.md
rename to erpnext/accounts/doctype/cost_center/README.md
diff --git a/accounts/doctype/cost_center/__init__.py b/erpnext/accounts/doctype/cost_center/__init__.py
similarity index 100%
rename from accounts/doctype/cost_center/__init__.py
rename to erpnext/accounts/doctype/cost_center/__init__.py
diff --git a/accounts/doctype/cost_center/cost_center.js b/erpnext/accounts/doctype/cost_center/cost_center.js
similarity index 100%
rename from accounts/doctype/cost_center/cost_center.js
rename to erpnext/accounts/doctype/cost_center/cost_center.js
diff --git a/accounts/doctype/cost_center/cost_center.py b/erpnext/accounts/doctype/cost_center/cost_center.py
similarity index 97%
rename from accounts/doctype/cost_center/cost_center.py
rename to erpnext/accounts/doctype/cost_center/cost_center.py
index 692d47e..0d38cc8 100644
--- a/accounts/doctype/cost_center/cost_center.py
+++ b/erpnext/accounts/doctype/cost_center/cost_center.py
@@ -75,7 +75,7 @@
def before_rename(self, olddn, newdn, merge=False):
# Add company abbr if not provided
- from setup.doctype.company.company import get_name_with_abbr
+ from erpnext.setup.doctype.company.company import get_name_with_abbr
new_cost_center = get_name_with_abbr(newdn, self.doc.company)
# Validate properties before merging
diff --git a/accounts/doctype/cost_center/cost_center.txt b/erpnext/accounts/doctype/cost_center/cost_center.txt
similarity index 100%
rename from accounts/doctype/cost_center/cost_center.txt
rename to erpnext/accounts/doctype/cost_center/cost_center.txt
diff --git a/accounts/doctype/cost_center/test_cost_center.py b/erpnext/accounts/doctype/cost_center/test_cost_center.py
similarity index 100%
rename from accounts/doctype/cost_center/test_cost_center.py
rename to erpnext/accounts/doctype/cost_center/test_cost_center.py
diff --git a/accounts/doctype/fiscal_year/README.md b/erpnext/accounts/doctype/fiscal_year/README.md
similarity index 100%
rename from accounts/doctype/fiscal_year/README.md
rename to erpnext/accounts/doctype/fiscal_year/README.md
diff --git a/accounts/doctype/fiscal_year/__init__.py b/erpnext/accounts/doctype/fiscal_year/__init__.py
similarity index 100%
rename from accounts/doctype/fiscal_year/__init__.py
rename to erpnext/accounts/doctype/fiscal_year/__init__.py
diff --git a/accounts/doctype/fiscal_year/fiscal_year.js b/erpnext/accounts/doctype/fiscal_year/fiscal_year.js
similarity index 100%
rename from accounts/doctype/fiscal_year/fiscal_year.js
rename to erpnext/accounts/doctype/fiscal_year/fiscal_year.js
diff --git a/accounts/doctype/fiscal_year/fiscal_year.py b/erpnext/accounts/doctype/fiscal_year/fiscal_year.py
similarity index 94%
rename from accounts/doctype/fiscal_year/fiscal_year.py
rename to erpnext/accounts/doctype/fiscal_year/fiscal_year.py
index 55e414c..a09e973 100644
--- a/accounts/doctype/fiscal_year/fiscal_year.py
+++ b/erpnext/accounts/doctype/fiscal_year/fiscal_year.py
@@ -26,8 +26,7 @@
if year_start_end_dates:
if getdate(self.doc.year_start_date) != year_start_end_dates[0][0] or getdate(self.doc.year_end_date) != year_start_end_dates[0][1]:
- webnotes.throw(_("Cannot change Year Start Date and Year End Date \
- once the Fiscal Year is saved."))
+ webnotes.throw(_("Cannot change Year Start Date and Year End Date once the Fiscal Year is saved."))
def on_update(self):
# validate year start date and year end date
@@ -43,5 +42,4 @@
for fiscal_year, ysd, yed in year_start_end_dates:
if (getdate(self.doc.year_start_date) == ysd and getdate(self.doc.year_end_date) == yed) \
and (not webnotes.flags.in_test):
- webnotes.throw(_("Year Start Date and Year End Date are already \
- set in Fiscal Year: ") + fiscal_year)
\ No newline at end of file
+ webnotes.throw(_("Year Start Date and Year End Date are already set in Fiscal Year: ") + fiscal_year)
\ No newline at end of file
diff --git a/accounts/doctype/fiscal_year/fiscal_year.txt b/erpnext/accounts/doctype/fiscal_year/fiscal_year.txt
similarity index 100%
rename from accounts/doctype/fiscal_year/fiscal_year.txt
rename to erpnext/accounts/doctype/fiscal_year/fiscal_year.txt
diff --git a/accounts/doctype/fiscal_year/test_fiscal_year.py b/erpnext/accounts/doctype/fiscal_year/test_fiscal_year.py
similarity index 100%
rename from accounts/doctype/fiscal_year/test_fiscal_year.py
rename to erpnext/accounts/doctype/fiscal_year/test_fiscal_year.py
diff --git a/accounts/doctype/gl_entry/README.md b/erpnext/accounts/doctype/gl_entry/README.md
similarity index 100%
rename from accounts/doctype/gl_entry/README.md
rename to erpnext/accounts/doctype/gl_entry/README.md
diff --git a/accounts/doctype/gl_entry/__init__.py b/erpnext/accounts/doctype/gl_entry/__init__.py
similarity index 100%
rename from accounts/doctype/gl_entry/__init__.py
rename to erpnext/accounts/doctype/gl_entry/__init__.py
diff --git a/accounts/doctype/gl_entry/gl_entry.py b/erpnext/accounts/doctype/gl_entry/gl_entry.py
similarity index 93%
rename from accounts/doctype/gl_entry/gl_entry.py
rename to erpnext/accounts/doctype/gl_entry/gl_entry.py
index d3c6317..ff44d55 100644
--- a/accounts/doctype/gl_entry/gl_entry.py
+++ b/erpnext/accounts/doctype/gl_entry/gl_entry.py
@@ -50,7 +50,7 @@
self.doc.cost_center = None
def validate_posting_date(self):
- from accounts.utils import validate_fiscal_year
+ from erpnext.accounts.utils import validate_fiscal_year
validate_fiscal_year(self.doc.posting_date, self.doc.fiscal_year, "Posting Date")
def check_pl_account(self):
@@ -152,10 +152,7 @@
frozen_accounts_modifier = webnotes.conn.get_value( 'Accounts Settings', None,
'frozen_accounts_modifier')
if not frozen_accounts_modifier:
- webnotes.throw(account + _(" is a frozen account. \
- Either make the account active or assign role in Accounts Settings \
- who can create / modify entries against this account"))
+ webnotes.throw(account + _(" is a frozen account. Either make the account active or assign role in Accounts Settings who can create / modify entries against this account"))
elif frozen_accounts_modifier not in webnotes.user.get_roles():
- webnotes.throw(account + _(" is a frozen account. ") +
- _("To create / edit transactions against this account, you need role") + ": " +
- frozen_accounts_modifier)
\ No newline at end of file
+ webnotes.throw(account + _(" is a frozen account. To create / edit transactions against this account, you need role") \
+ + ": " + frozen_accounts_modifier)
diff --git a/accounts/doctype/gl_entry/gl_entry.txt b/erpnext/accounts/doctype/gl_entry/gl_entry.txt
similarity index 100%
rename from accounts/doctype/gl_entry/gl_entry.txt
rename to erpnext/accounts/doctype/gl_entry/gl_entry.txt
diff --git a/accounts/doctype/journal_voucher/README.md b/erpnext/accounts/doctype/journal_voucher/README.md
similarity index 100%
rename from accounts/doctype/journal_voucher/README.md
rename to erpnext/accounts/doctype/journal_voucher/README.md
diff --git a/accounts/doctype/journal_voucher/__init__.py b/erpnext/accounts/doctype/journal_voucher/__init__.py
similarity index 100%
rename from accounts/doctype/journal_voucher/__init__.py
rename to erpnext/accounts/doctype/journal_voucher/__init__.py
diff --git a/accounts/doctype/journal_voucher/journal_voucher.js b/erpnext/accounts/doctype/journal_voucher/journal_voucher.js
similarity index 95%
rename from accounts/doctype/journal_voucher/journal_voucher.js
rename to erpnext/accounts/doctype/journal_voucher/journal_voucher.js
index 6b94ba1..1eb8b1d 100644
--- a/accounts/doctype/journal_voucher/journal_voucher.js
+++ b/erpnext/accounts/doctype/journal_voucher/journal_voucher.js
@@ -166,7 +166,7 @@
var d = locals[dt][dn];
if(d.account) {
return wn.call({
- method: "accounts.utils.get_balance_on",
+ method: "erpnext.accounts.utils.get_balance_on",
args: {account: d.account, date: doc.posting_date},
callback: function(r) {
d.balance = r.message;
@@ -209,7 +209,7 @@
if(in_list(["Bank Voucher", "Cash Voucher"], doc.voucher_type)) {
return wn.call({
type: "GET",
- method: "accounts.doctype.journal_voucher.journal_voucher.get_default_bank_cash_account",
+ method: "erpnext.accounts.doctype.journal_voucher.journal_voucher.get_default_bank_cash_account",
args: {
"voucher_type": doc.voucher_type,
"company": doc.company
@@ -223,7 +223,7 @@
} else if(doc.voucher_type=="Opening Entry") {
return wn.call({
type:"GET",
- method: "accounts.doctype.journal_voucher.journal_voucher.get_opening_accounts",
+ method: "erpnext.accounts.doctype.journal_voucher.journal_voucher.get_opening_accounts",
args: {
"company": doc.company
},
diff --git a/accounts/doctype/journal_voucher/journal_voucher.py b/erpnext/accounts/doctype/journal_voucher/journal_voucher.py
similarity index 96%
rename from accounts/doctype/journal_voucher/journal_voucher.py
rename to erpnext/accounts/doctype/journal_voucher/journal_voucher.py
index 00cbc03..4d00dfd 100644
--- a/accounts/doctype/journal_voucher/journal_voucher.py
+++ b/erpnext/accounts/doctype/journal_voucher/journal_voucher.py
@@ -8,9 +8,9 @@
from webnotes.model.doc import addchild
from webnotes.model.bean import getlist
from webnotes import msgprint, _
-from setup.utils import get_company_currency
+from erpnext.setup.utils import get_company_currency
-from controllers.accounts_controller import AccountsController
+from erpnext.controllers.accounts_controller import AccountsController
class DocType(AccountsController):
def __init__(self,d,dl):
@@ -47,7 +47,7 @@
self.check_credit_limit()
def on_cancel(self):
- from accounts.utils import remove_against_link_from_jv
+ from erpnext.accounts.utils import remove_against_link_from_jv
remove_against_link_from_jv(self.doc.doctype, self.doc.name, "against_jv")
self.make_gl_entries(1)
@@ -236,11 +236,10 @@
if d.against_voucher and webnotes.conn.get_value("Purchase Invoice",
d.against_voucher, "credit_to") != d.account:
- webnotes.throw(_("Debited account (Supplier) is not matching with \
- Purchase Invoice"))
+ webnotes.throw(_("Debited account (Supplier) is not matching with Purchase Invoice"))
def make_gl_entries(self, cancel=0, adv_adj=0):
- from accounts.general_ledger import make_gl_entries
+ from erpnext.accounts.general_ledger import make_gl_entries
gl_map = []
for d in self.doclist.get({"parentfield": "entries"}):
if d.debit or d.credit:
@@ -334,7 +333,7 @@
@webnotes.whitelist()
def get_default_bank_cash_account(company, voucher_type):
- from accounts.utils import get_balance_on
+ from erpnext.accounts.utils import get_balance_on
account = webnotes.conn.get_value("Company", company,
voucher_type=="Bank Voucher" and "default_bank_account" or "default_cash_account")
if account:
@@ -345,7 +344,7 @@
@webnotes.whitelist()
def get_payment_entry_from_sales_invoice(sales_invoice):
- from accounts.utils import get_balance_on
+ from erpnext.accounts.utils import get_balance_on
si = webnotes.bean("Sales Invoice", sales_invoice)
jv = get_payment_entry(si.doc)
jv.doc.remark = 'Payment received against Sales Invoice %(name)s. %(remarks)s' % si.doc.fields
@@ -363,7 +362,7 @@
@webnotes.whitelist()
def get_payment_entry_from_purchase_invoice(purchase_invoice):
- from accounts.utils import get_balance_on
+ from erpnext.accounts.utils import get_balance_on
pi = webnotes.bean("Purchase Invoice", purchase_invoice)
jv = get_payment_entry(pi.doc)
jv.doc.remark = 'Payment against Purchase Invoice %(name)s. %(remarks)s' % pi.doc.fields
@@ -407,7 +406,7 @@
@webnotes.whitelist()
def get_opening_accounts(company):
"""get all balance sheet accounts for opening entry"""
- from accounts.utils import get_balance_on
+ from erpnext.accounts.utils import get_balance_on
accounts = webnotes.conn.sql_list("""select name from tabAccount
where group_or_ledger='Ledger' and is_pl_account='No' and company=%s""", company)
diff --git a/accounts/doctype/journal_voucher/journal_voucher.txt b/erpnext/accounts/doctype/journal_voucher/journal_voucher.txt
similarity index 100%
rename from accounts/doctype/journal_voucher/journal_voucher.txt
rename to erpnext/accounts/doctype/journal_voucher/journal_voucher.txt
diff --git a/accounts/doctype/journal_voucher/test_journal_voucher.py b/erpnext/accounts/doctype/journal_voucher/test_journal_voucher.py
similarity index 94%
rename from accounts/doctype/journal_voucher/test_journal_voucher.py
rename to erpnext/accounts/doctype/journal_voucher/test_journal_voucher.py
index 70fb4e2..587445f 100644
--- a/accounts/doctype/journal_voucher/test_journal_voucher.py
+++ b/erpnext/accounts/doctype/journal_voucher/test_journal_voucher.py
@@ -34,14 +34,14 @@
where against_jv=%s""", jv_invoice.doc.name))
def test_jv_against_stock_account(self):
- from stock.doctype.purchase_receipt.test_purchase_receipt import set_perpetual_inventory
+ from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import set_perpetual_inventory
set_perpetual_inventory()
jv = webnotes.bean(copy=test_records[0])
jv.doclist[1].account = "_Test Warehouse - _TC"
jv.insert()
- from accounts.general_ledger import StockAccountInvalidTransaction
+ from erpnext.accounts.general_ledger import StockAccountInvalidTransaction
self.assertRaises(StockAccountInvalidTransaction, jv.submit)
set_perpetual_inventory(0)
@@ -61,7 +61,7 @@
{"voucher_type": "Journal Voucher", "voucher_no": jv.doc.name}))
def test_monthly_budget_crossed_stop(self):
- from accounts.utils import BudgetError
+ from erpnext.accounts.utils import BudgetError
webnotes.conn.set_value("Company", "_Test Company", "monthly_bgt_flag", "Stop")
self.clear_account_balance()
@@ -77,7 +77,7 @@
webnotes.conn.set_value("Company", "_Test Company", "monthly_bgt_flag", "Ignore")
def test_yearly_budget_crossed_stop(self):
- from accounts.utils import BudgetError
+ from erpnext.accounts.utils import BudgetError
self.clear_account_balance()
self.test_monthly_budget_crossed_ignore()
@@ -96,7 +96,7 @@
webnotes.conn.set_value("Company", "_Test Company", "yearly_bgt_flag", "Ignore")
def test_monthly_budget_on_cancellation(self):
- from accounts.utils import BudgetError
+ from erpnext.accounts.utils import BudgetError
webnotes.conn.set_value("Company", "_Test Company", "monthly_bgt_flag", "Stop")
self.clear_account_balance()
diff --git a/accounts/doctype/journal_voucher_detail/README.md b/erpnext/accounts/doctype/journal_voucher_detail/README.md
similarity index 100%
rename from accounts/doctype/journal_voucher_detail/README.md
rename to erpnext/accounts/doctype/journal_voucher_detail/README.md
diff --git a/accounts/doctype/journal_voucher_detail/__init__.py b/erpnext/accounts/doctype/journal_voucher_detail/__init__.py
similarity index 100%
rename from accounts/doctype/journal_voucher_detail/__init__.py
rename to erpnext/accounts/doctype/journal_voucher_detail/__init__.py
diff --git a/accounts/doctype/journal_voucher_detail/journal_voucher_detail.py b/erpnext/accounts/doctype/journal_voucher_detail/journal_voucher_detail.py
similarity index 100%
rename from accounts/doctype/journal_voucher_detail/journal_voucher_detail.py
rename to erpnext/accounts/doctype/journal_voucher_detail/journal_voucher_detail.py
diff --git a/accounts/doctype/journal_voucher_detail/journal_voucher_detail.txt b/erpnext/accounts/doctype/journal_voucher_detail/journal_voucher_detail.txt
similarity index 100%
rename from accounts/doctype/journal_voucher_detail/journal_voucher_detail.txt
rename to erpnext/accounts/doctype/journal_voucher_detail/journal_voucher_detail.txt
diff --git a/accounts/doctype/mis_control/README.md b/erpnext/accounts/doctype/mis_control/README.md
similarity index 100%
rename from accounts/doctype/mis_control/README.md
rename to erpnext/accounts/doctype/mis_control/README.md
diff --git a/accounts/doctype/mis_control/__init__.py b/erpnext/accounts/doctype/mis_control/__init__.py
similarity index 100%
rename from accounts/doctype/mis_control/__init__.py
rename to erpnext/accounts/doctype/mis_control/__init__.py
diff --git a/accounts/doctype/mis_control/mis_control.py b/erpnext/accounts/doctype/mis_control/mis_control.py
similarity index 97%
rename from accounts/doctype/mis_control/mis_control.py
rename to erpnext/accounts/doctype/mis_control/mis_control.py
index 3a0483f..d2c0961 100644
--- a/accounts/doctype/mis_control/mis_control.py
+++ b/erpnext/accounts/doctype/mis_control/mis_control.py
@@ -5,7 +5,7 @@
import webnotes
from webnotes.utils import flt, get_first_day, get_last_day, has_common
import webnotes.defaults
-from accounts.utils import get_balance_on
+from erpnext.accounts.utils import get_balance_on
class DocType:
def __init__(self, doc, doclist):
@@ -29,7 +29,7 @@
ret['period'] = ['Annual','Half Yearly','Quarterly','Monthly']
- from accounts.page.accounts_browser.accounts_browser import get_companies
+ from erpnext.accounts.page.accounts_browser.accounts_browser import get_companies
ret['company'] = get_companies()
#--- to get fiscal year and start_date of that fiscal year -----
diff --git a/accounts/doctype/mis_control/mis_control.txt b/erpnext/accounts/doctype/mis_control/mis_control.txt
similarity index 100%
rename from accounts/doctype/mis_control/mis_control.txt
rename to erpnext/accounts/doctype/mis_control/mis_control.txt
diff --git a/accounts/doctype/mode_of_payment/README.md b/erpnext/accounts/doctype/mode_of_payment/README.md
similarity index 100%
rename from accounts/doctype/mode_of_payment/README.md
rename to erpnext/accounts/doctype/mode_of_payment/README.md
diff --git a/accounts/doctype/mode_of_payment/__init__.py b/erpnext/accounts/doctype/mode_of_payment/__init__.py
similarity index 100%
rename from accounts/doctype/mode_of_payment/__init__.py
rename to erpnext/accounts/doctype/mode_of_payment/__init__.py
diff --git a/accounts/doctype/mode_of_payment/mode_of_payment.js b/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.js
similarity index 100%
rename from accounts/doctype/mode_of_payment/mode_of_payment.js
rename to erpnext/accounts/doctype/mode_of_payment/mode_of_payment.js
diff --git a/accounts/doctype/mode_of_payment/mode_of_payment.py b/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py
similarity index 100%
rename from accounts/doctype/mode_of_payment/mode_of_payment.py
rename to erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py
diff --git a/accounts/doctype/mode_of_payment/mode_of_payment.txt b/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.txt
similarity index 100%
rename from accounts/doctype/mode_of_payment/mode_of_payment.txt
rename to erpnext/accounts/doctype/mode_of_payment/mode_of_payment.txt
diff --git a/accounts/doctype/payment_to_invoice_matching_tool/README.md b/erpnext/accounts/doctype/payment_to_invoice_matching_tool/README.md
similarity index 100%
rename from accounts/doctype/payment_to_invoice_matching_tool/README.md
rename to erpnext/accounts/doctype/payment_to_invoice_matching_tool/README.md
diff --git a/accounts/doctype/payment_to_invoice_matching_tool/__init__.py b/erpnext/accounts/doctype/payment_to_invoice_matching_tool/__init__.py
similarity index 100%
rename from accounts/doctype/payment_to_invoice_matching_tool/__init__.py
rename to erpnext/accounts/doctype/payment_to_invoice_matching_tool/__init__.py
diff --git a/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.js b/erpnext/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.js
similarity index 100%
rename from accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.js
rename to erpnext/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.js
diff --git a/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.py b/erpnext/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.py
similarity index 97%
rename from accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.py
rename to erpnext/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.py
index dea5fb5..0c6cdb6 100644
--- a/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.py
+++ b/erpnext/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.py
@@ -121,14 +121,14 @@
lst.append(args)
if lst:
- from accounts.utils import reconcile_against_document
+ from erpnext.accounts.utils import reconcile_against_document
reconcile_against_document(lst)
msgprint("Successfully allocated.")
else:
msgprint("No amount allocated.", raise_exception=1)
def gl_entry_details(doctype, txt, searchfield, start, page_len, filters):
- from controllers.queries import get_match_cond
+ from erpnext.controllers.queries import get_match_cond
return webnotes.conn.sql("""select gle.voucher_no, gle.posting_date,
gle.%(account_type)s from `tabGL Entry` gle
diff --git a/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.txt b/erpnext/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.txt
similarity index 100%
rename from accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.txt
rename to erpnext/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.txt
diff --git a/accounts/doctype/payment_to_invoice_matching_tool/test_payment_to_invoice_matching_tool.py b/erpnext/accounts/doctype/payment_to_invoice_matching_tool/test_payment_to_invoice_matching_tool.py
similarity index 100%
rename from accounts/doctype/payment_to_invoice_matching_tool/test_payment_to_invoice_matching_tool.py
rename to erpnext/accounts/doctype/payment_to_invoice_matching_tool/test_payment_to_invoice_matching_tool.py
diff --git a/accounts/doctype/payment_to_invoice_matching_tool_detail/README.md b/erpnext/accounts/doctype/payment_to_invoice_matching_tool_detail/README.md
similarity index 100%
rename from accounts/doctype/payment_to_invoice_matching_tool_detail/README.md
rename to erpnext/accounts/doctype/payment_to_invoice_matching_tool_detail/README.md
diff --git a/accounts/doctype/payment_to_invoice_matching_tool_detail/__init__.py b/erpnext/accounts/doctype/payment_to_invoice_matching_tool_detail/__init__.py
similarity index 100%
rename from accounts/doctype/payment_to_invoice_matching_tool_detail/__init__.py
rename to erpnext/accounts/doctype/payment_to_invoice_matching_tool_detail/__init__.py
diff --git a/accounts/doctype/payment_to_invoice_matching_tool_detail/payment_to_invoice_matching_tool_detail.py b/erpnext/accounts/doctype/payment_to_invoice_matching_tool_detail/payment_to_invoice_matching_tool_detail.py
similarity index 100%
rename from accounts/doctype/payment_to_invoice_matching_tool_detail/payment_to_invoice_matching_tool_detail.py
rename to erpnext/accounts/doctype/payment_to_invoice_matching_tool_detail/payment_to_invoice_matching_tool_detail.py
diff --git a/accounts/doctype/payment_to_invoice_matching_tool_detail/payment_to_invoice_matching_tool_detail.txt b/erpnext/accounts/doctype/payment_to_invoice_matching_tool_detail/payment_to_invoice_matching_tool_detail.txt
similarity index 100%
rename from accounts/doctype/payment_to_invoice_matching_tool_detail/payment_to_invoice_matching_tool_detail.txt
rename to erpnext/accounts/doctype/payment_to_invoice_matching_tool_detail/payment_to_invoice_matching_tool_detail.txt
diff --git a/accounts/doctype/period_closing_voucher/README.md b/erpnext/accounts/doctype/period_closing_voucher/README.md
similarity index 100%
rename from accounts/doctype/period_closing_voucher/README.md
rename to erpnext/accounts/doctype/period_closing_voucher/README.md
diff --git a/accounts/doctype/period_closing_voucher/__init__.py b/erpnext/accounts/doctype/period_closing_voucher/__init__.py
similarity index 100%
rename from accounts/doctype/period_closing_voucher/__init__.py
rename to erpnext/accounts/doctype/period_closing_voucher/__init__.py
diff --git a/accounts/doctype/period_closing_voucher/period_closing_voucher.js b/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.js
similarity index 100%
rename from accounts/doctype/period_closing_voucher/period_closing_voucher.js
rename to erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.js
diff --git a/accounts/doctype/period_closing_voucher/period_closing_voucher.py b/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py
similarity index 94%
rename from accounts/doctype/period_closing_voucher/period_closing_voucher.py
rename to erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py
index 5d7fc1e..5a37d84 100644
--- a/accounts/doctype/period_closing_voucher/period_closing_voucher.py
+++ b/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py
@@ -5,7 +5,7 @@
import webnotes
from webnotes.utils import cstr, flt, getdate
from webnotes import msgprint, _
-from controllers.accounts_controller import AccountsController
+from erpnext.controllers.accounts_controller import AccountsController
class DocType(AccountsController):
def __init__(self,d,dl):
@@ -33,7 +33,7 @@
_("must be a Liability account"))
def validate_posting_date(self):
- from accounts.utils import get_fiscal_year
+ from erpnext.accounts.utils import get_fiscal_year
self.year_start_date = get_fiscal_year(self.doc.posting_date, self.doc.fiscal_year)[1]
pce = webnotes.conn.sql("""select name from `tabPeriod Closing Voucher`
@@ -64,8 +64,7 @@
expense_bal = expense_bal and expense_bal[0][0] or 0
if not income_bal and not expense_bal:
- webnotes.throw(_("Both Income and Expense balances are zero. \
- No Need to make Period Closing Entry."))
+ webnotes.throw(_("Both Income and Expense balances are zero. No Need to make Period Closing Entry."))
def get_pl_balances(self):
"""Get balance for pl accounts"""
@@ -99,5 +98,5 @@
"credit": abs(net_pl_balance) if net_pl_balance < 0 else 0
}))
- from accounts.general_ledger import make_gl_entries
+ from erpnext.accounts.general_ledger import make_gl_entries
make_gl_entries(gl_entries)
diff --git a/accounts/doctype/period_closing_voucher/period_closing_voucher.txt b/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.txt
similarity index 100%
rename from accounts/doctype/period_closing_voucher/period_closing_voucher.txt
rename to erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.txt
diff --git a/accounts/doctype/period_closing_voucher/test_period_closing_voucher.py b/erpnext/accounts/doctype/period_closing_voucher/test_period_closing_voucher.py
similarity index 93%
rename from accounts/doctype/period_closing_voucher/test_period_closing_voucher.py
rename to erpnext/accounts/doctype/period_closing_voucher/test_period_closing_voucher.py
index 97e49ae..c779d9b 100644
--- a/accounts/doctype/period_closing_voucher/test_period_closing_voucher.py
+++ b/erpnext/accounts/doctype/period_closing_voucher/test_period_closing_voucher.py
@@ -11,7 +11,7 @@
# clear GL Entries
webnotes.conn.sql("""delete from `tabGL Entry`""")
- from accounts.doctype.journal_voucher.test_journal_voucher import test_records as jv_records
+ from erpnext.accounts.doctype.journal_voucher.test_journal_voucher import test_records as jv_records
jv = webnotes.bean(copy=jv_records[2])
jv.insert()
jv.submit()
diff --git a/accounts/doctype/pos_setting/README.md b/erpnext/accounts/doctype/pos_setting/README.md
similarity index 100%
rename from accounts/doctype/pos_setting/README.md
rename to erpnext/accounts/doctype/pos_setting/README.md
diff --git a/accounts/doctype/pos_setting/__init__.py b/erpnext/accounts/doctype/pos_setting/__init__.py
similarity index 100%
rename from accounts/doctype/pos_setting/__init__.py
rename to erpnext/accounts/doctype/pos_setting/__init__.py
diff --git a/accounts/doctype/pos_setting/pos_setting.js b/erpnext/accounts/doctype/pos_setting/pos_setting.js
similarity index 100%
rename from accounts/doctype/pos_setting/pos_setting.js
rename to erpnext/accounts/doctype/pos_setting/pos_setting.js
diff --git a/accounts/doctype/pos_setting/pos_setting.py b/erpnext/accounts/doctype/pos_setting/pos_setting.py
similarity index 100%
rename from accounts/doctype/pos_setting/pos_setting.py
rename to erpnext/accounts/doctype/pos_setting/pos_setting.py
diff --git a/accounts/doctype/pos_setting/pos_setting.txt b/erpnext/accounts/doctype/pos_setting/pos_setting.txt
similarity index 100%
rename from accounts/doctype/pos_setting/pos_setting.txt
rename to erpnext/accounts/doctype/pos_setting/pos_setting.txt
diff --git a/accounts/doctype/pos_setting/test_pos_setting.py b/erpnext/accounts/doctype/pos_setting/test_pos_setting.py
similarity index 100%
rename from accounts/doctype/pos_setting/test_pos_setting.py
rename to erpnext/accounts/doctype/pos_setting/test_pos_setting.py
diff --git a/accounts/doctype/purchase_invoice/README.md b/erpnext/accounts/doctype/purchase_invoice/README.md
similarity index 100%
rename from accounts/doctype/purchase_invoice/README.md
rename to erpnext/accounts/doctype/purchase_invoice/README.md
diff --git a/accounts/doctype/purchase_invoice/__init__.py b/erpnext/accounts/doctype/purchase_invoice/__init__.py
similarity index 100%
rename from accounts/doctype/purchase_invoice/__init__.py
rename to erpnext/accounts/doctype/purchase_invoice/__init__.py
diff --git a/accounts/doctype/purchase_invoice/purchase_invoice.js b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
similarity index 89%
rename from accounts/doctype/purchase_invoice/purchase_invoice.js
rename to erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
index 0bdc70e..aa3b45f 100644
--- a/accounts/doctype/purchase_invoice/purchase_invoice.js
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
@@ -6,9 +6,9 @@
cur_frm.cscript.other_fname = "purchase_tax_details";
wn.provide("erpnext.accounts");
-wn.require('app/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.js');
-wn.require('app/buying/doctype/purchase_common/purchase_common.js');
-wn.require('app/accounts/doctype/sales_invoice/pos.js');
+{% include 'buying/doctype/purchase_common/purchase_common.js' %};
+{% include 'accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.js' %}
+{% include 'accounts/doctype/sales_invoice/pos.js' %}
erpnext.accounts.PurchaseInvoice = erpnext.buying.BuyingController.extend({
onload: function() {
@@ -45,7 +45,7 @@
cur_frm.add_custom_button(wn._('From Purchase Order'),
function() {
wn.model.map_current_doc({
- method: "buying.doctype.purchase_order.purchase_order.make_purchase_invoice",
+ method: "erpnext.buying.doctype.purchase_order.purchase_order.make_purchase_invoice",
source_doctype: "Purchase Order",
get_query_filters: {
supplier: cur_frm.doc.supplier || undefined,
@@ -60,7 +60,7 @@
cur_frm.add_custom_button(wn._('From Purchase Receipt'),
function() {
wn.model.map_current_doc({
- method: "stock.doctype.purchase_receipt.purchase_receipt.make_purchase_invoice",
+ method: "erpnext.stock.doctype.purchase_receipt.purchase_receipt.make_purchase_invoice",
source_doctype: "Purchase Receipt",
get_query_filters: {
supplier: cur_frm.doc.supplier || undefined,
@@ -108,7 +108,7 @@
cur_frm.cscript.make_bank_voucher = function() {
return wn.call({
- method: "accounts.doctype.journal_voucher.journal_voucher.get_payment_entry_from_purchase_invoice",
+ method: "erpnext.accounts.doctype.journal_voucher.journal_voucher.get_payment_entry_from_purchase_invoice",
args: {
"purchase_invoice": cur_frm.doc.name,
},
@@ -134,7 +134,7 @@
cur_frm.fields_dict['entries'].grid.get_field("item_code").get_query = function(doc, cdt, cdn) {
return {
- query:"controllers.queries.item_query",
+ query: "erpnext.controllers.queries.item_query",
filters:{
'is_purchase_item': 'Yes'
}
diff --git a/accounts/doctype/purchase_invoice/purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
similarity index 97%
rename from accounts/doctype/purchase_invoice/purchase_invoice.py
rename to erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
index 404627a..f6b6ef4 100644
--- a/accounts/doctype/purchase_invoice/purchase_invoice.py
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
@@ -8,12 +8,12 @@
from webnotes.model.bean import getlist
from webnotes.model.code import get_obj
from webnotes import msgprint, _
-from setup.utils import get_company_currency
+from erpnext.setup.utils import get_company_currency
import webnotes.defaults
-from controllers.buying_controller import BuyingController
+from erpnext.controllers.buying_controller import BuyingController
class DocType(BuyingController):
def __init__(self,d,dl):
self.doc, self.doclist = d, dl
@@ -289,7 +289,7 @@
lst.append(args)
if lst:
- from accounts.utils import reconcile_against_document
+ from erpnext.accounts.utils import reconcile_against_document
reconcile_against_document(lst)
def on_submit(self):
@@ -424,11 +424,11 @@
)
if gl_entries:
- from accounts.general_ledger import make_gl_entries
+ from erpnext.accounts.general_ledger import make_gl_entries
make_gl_entries(gl_entries, cancel=(self.doc.docstatus == 2))
def on_cancel(self):
- from accounts.utils import remove_against_link_from_jv
+ from erpnext.accounts.utils import remove_against_link_from_jv
remove_against_link_from_jv(self.doc.doctype, self.doc.name, "against_voucher")
self.update_prevdoc_status()
@@ -454,7 +454,7 @@
@webnotes.whitelist()
def get_expense_account(doctype, txt, searchfield, start, page_len, filters):
- from controllers.queries import get_match_cond
+ from erpnext.controllers.queries import get_match_cond
# expense account can be any Debit account,
# but can also be a Liability account with account_type='Expense Account' in special circumstances.
diff --git a/accounts/doctype/purchase_invoice/purchase_invoice.txt b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.txt
similarity index 100%
rename from accounts/doctype/purchase_invoice/purchase_invoice.txt
rename to erpnext/accounts/doctype/purchase_invoice/purchase_invoice.txt
diff --git a/accounts/doctype/purchase_invoice/purchase_invoice_list.js b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js
similarity index 100%
rename from accounts/doctype/purchase_invoice/purchase_invoice_list.js
rename to erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js
diff --git a/accounts/doctype/purchase_invoice/test_purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
similarity index 98%
rename from accounts/doctype/purchase_invoice/test_purchase_invoice.py
rename to erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
index 9d82ca7..8a8b4a7 100644
--- a/accounts/doctype/purchase_invoice/test_purchase_invoice.py
+++ b/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
@@ -9,7 +9,7 @@
import json
from webnotes.utils import cint
import webnotes.defaults
-from stock.doctype.purchase_receipt.test_purchase_receipt import set_perpetual_inventory
+from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import set_perpetual_inventory
test_dependencies = ["Item", "Cost Center"]
test_ignore = ["Serial No"]
@@ -171,7 +171,7 @@
self.assertEqual(tax.total, expected_values[i][2])
def test_purchase_invoice_with_advance(self):
- from accounts.doctype.journal_voucher.test_journal_voucher \
+ from erpnext.accounts.doctype.journal_voucher.test_journal_voucher \
import test_records as jv_test_records
jv = webnotes.bean(copy=jv_test_records[1])
diff --git a/accounts/doctype/purchase_invoice_advance/README.md b/erpnext/accounts/doctype/purchase_invoice_advance/README.md
similarity index 100%
rename from accounts/doctype/purchase_invoice_advance/README.md
rename to erpnext/accounts/doctype/purchase_invoice_advance/README.md
diff --git a/accounts/doctype/purchase_invoice_advance/__init__.py b/erpnext/accounts/doctype/purchase_invoice_advance/__init__.py
similarity index 100%
rename from accounts/doctype/purchase_invoice_advance/__init__.py
rename to erpnext/accounts/doctype/purchase_invoice_advance/__init__.py
diff --git a/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.py b/erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.py
similarity index 100%
rename from accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.py
rename to erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.py
diff --git a/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.txt b/erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.txt
similarity index 100%
rename from accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.txt
rename to erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.txt
diff --git a/accounts/doctype/purchase_invoice_item/README.md b/erpnext/accounts/doctype/purchase_invoice_item/README.md
similarity index 100%
rename from accounts/doctype/purchase_invoice_item/README.md
rename to erpnext/accounts/doctype/purchase_invoice_item/README.md
diff --git a/accounts/doctype/purchase_invoice_item/__init__.py b/erpnext/accounts/doctype/purchase_invoice_item/__init__.py
similarity index 100%
rename from accounts/doctype/purchase_invoice_item/__init__.py
rename to erpnext/accounts/doctype/purchase_invoice_item/__init__.py
diff --git a/accounts/doctype/purchase_invoice_item/purchase_invoice_item.py b/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.py
similarity index 100%
rename from accounts/doctype/purchase_invoice_item/purchase_invoice_item.py
rename to erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.py
diff --git a/accounts/doctype/purchase_invoice_item/purchase_invoice_item.txt b/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.txt
similarity index 100%
rename from accounts/doctype/purchase_invoice_item/purchase_invoice_item.txt
rename to erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.txt
diff --git a/accounts/doctype/purchase_taxes_and_charges/README.md b/erpnext/accounts/doctype/purchase_taxes_and_charges/README.md
similarity index 100%
rename from accounts/doctype/purchase_taxes_and_charges/README.md
rename to erpnext/accounts/doctype/purchase_taxes_and_charges/README.md
diff --git a/accounts/doctype/purchase_taxes_and_charges/__init__.py b/erpnext/accounts/doctype/purchase_taxes_and_charges/__init__.py
similarity index 100%
rename from accounts/doctype/purchase_taxes_and_charges/__init__.py
rename to erpnext/accounts/doctype/purchase_taxes_and_charges/__init__.py
diff --git a/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.py b/erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.py
similarity index 100%
rename from accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.py
rename to erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.py
diff --git a/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.txt b/erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.txt
similarity index 100%
rename from accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.txt
rename to erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.txt
diff --git a/accounts/doctype/purchase_taxes_and_charges_master/README.md b/erpnext/accounts/doctype/purchase_taxes_and_charges_master/README.md
similarity index 100%
rename from accounts/doctype/purchase_taxes_and_charges_master/README.md
rename to erpnext/accounts/doctype/purchase_taxes_and_charges_master/README.md
diff --git a/accounts/doctype/purchase_taxes_and_charges_master/__init__.py b/erpnext/accounts/doctype/purchase_taxes_and_charges_master/__init__.py
similarity index 100%
rename from accounts/doctype/purchase_taxes_and_charges_master/__init__.py
rename to erpnext/accounts/doctype/purchase_taxes_and_charges_master/__init__.py
diff --git a/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.js b/erpnext/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.js
similarity index 97%
rename from accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.js
rename to erpnext/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.js
index 84521ed..b589651 100644
--- a/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.js
+++ b/erpnext/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.js
@@ -4,7 +4,7 @@
//
//--------- ONLOAD -------------
-wn.require("app/js/controllers/accounts.js");
+{% include "public/js/controllers/accounts.js" %}
cur_frm.cscript.onload = function(doc, cdt, cdn) {
@@ -139,7 +139,7 @@
cur_frm.set_query("account_head", "purchase_tax_details", function(doc) {
return {
- query: "controllers.queries.tax_account_query",
+ query: "erpnext.controllers.queries.tax_account_query",
filters: {
"account_type": ["Tax", "Chargeable", "Expense Account"],
"debit_or_credit": "Debit",
diff --git a/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.py b/erpnext/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.py
similarity index 100%
rename from accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.py
rename to erpnext/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.py
diff --git a/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.txt b/erpnext/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.txt
similarity index 100%
rename from accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.txt
rename to erpnext/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.txt
diff --git a/accounts/doctype/sales_invoice/README.md b/erpnext/accounts/doctype/sales_invoice/README.md
similarity index 100%
rename from accounts/doctype/sales_invoice/README.md
rename to erpnext/accounts/doctype/sales_invoice/README.md
diff --git a/accounts/doctype/sales_invoice/__init__.py b/erpnext/accounts/doctype/sales_invoice/__init__.py
similarity index 100%
rename from accounts/doctype/sales_invoice/__init__.py
rename to erpnext/accounts/doctype/sales_invoice/__init__.py
diff --git a/accounts/doctype/sales_invoice/pos.js b/erpnext/accounts/doctype/sales_invoice/pos.js
similarity index 98%
rename from accounts/doctype/sales_invoice/pos.js
rename to erpnext/accounts/doctype/sales_invoice/pos.js
index adbdca1..c432765 100644
--- a/accounts/doctype/sales_invoice/pos.js
+++ b/erpnext/accounts/doctype/sales_invoice/pos.js
@@ -199,7 +199,7 @@
var me = this;
me.item_timeout = null;
wn.call({
- method: 'accounts.doctype.sales_invoice.pos.get_items',
+ method: 'erpnext.accounts.doctype.sales_invoice.pos.get_items',
args: {
sales_or_purchase: this.sales_or_purchase,
price_list: this.price_list,
@@ -450,7 +450,7 @@
var me = this;
me.barcode_timeout = null;
wn.call({
- method: 'accounts.doctype.sales_invoice.pos.get_item_code',
+ method: 'erpnext.accounts.doctype.sales_invoice.pos.get_item_code',
args: {barcode_serial_no: this.barcode.$input.val()},
callback: function(r) {
if (r.message) {
@@ -503,7 +503,7 @@
msgprint(wn._("Payment cannot be made for empty cart"));
else {
wn.call({
- method: 'accounts.doctype.sales_invoice.pos.get_mode_of_payment',
+ method: 'erpnext.accounts.doctype.sales_invoice.pos.get_mode_of_payment',
callback: function(r) {
for (x=0; x<=r.message.length - 1; x++) {
mode_of_payment.push(r.message[x].name);
diff --git a/accounts/doctype/sales_invoice/pos.py b/erpnext/accounts/doctype/sales_invoice/pos.py
similarity index 100%
rename from accounts/doctype/sales_invoice/pos.py
rename to erpnext/accounts/doctype/sales_invoice/pos.py
diff --git a/accounts/doctype/sales_invoice/sales_invoice.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
similarity index 93%
rename from accounts/doctype/sales_invoice/sales_invoice.js
rename to erpnext/accounts/doctype/sales_invoice/sales_invoice.js
index a390fb4..9c6a9b2 100644
--- a/accounts/doctype/sales_invoice/sales_invoice.js
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
@@ -9,10 +9,10 @@
// print heading
cur_frm.pformat.print_heading = 'Invoice';
-wn.require('app/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js');
-wn.require('app/utilities/doctype/sms_control/sms_control.js');
-wn.require('app/selling/sales_common.js');
-wn.require('app/accounts/doctype/sales_invoice/pos.js');
+{% include 'selling/sales_common.js' %};
+{% include 'accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js' %}
+{% include 'utilities/doctype/sms_control/sms_control.js' %}
+{% include 'accounts/doctype/sales_invoice/pos.js' %}
wn.provide("erpnext.accounts");
erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.extend({
@@ -91,7 +91,7 @@
this.$sales_order_btn = cur_frm.appframe.add_primary_action(wn._('From Sales Order'),
function() {
wn.model.map_current_doc({
- method: "selling.doctype.sales_order.sales_order.make_sales_invoice",
+ method: "erpnext.selling.doctype.sales_order.sales_order.make_sales_invoice",
source_doctype: "Sales Order",
get_query_filters: {
docstatus: 1,
@@ -108,7 +108,7 @@
this.$delivery_note_btn = cur_frm.appframe.add_primary_action(wn._('From Delivery Note'),
function() {
wn.model.map_current_doc({
- method: "stock.doctype.delivery_note.delivery_note.make_sales_invoice",
+ method: "erpnext.stock.doctype.delivery_note.delivery_note.make_sales_invoice",
source_doctype: "Delivery Note",
get_query: function() {
var filters = {
@@ -116,7 +116,7 @@
};
if(cur_frm.doc.customer) filters["customer"] = cur_frm.doc.customer;
return {
- query: "controllers.queries.get_delivery_notes_to_be_billed",
+ query: "erpnext.controllers.queries.get_delivery_notes_to_be_billed",
filters: filters
};
}
@@ -259,14 +259,14 @@
cur_frm.cscript['Make Delivery Note'] = function() {
wn.model.open_mapped_doc({
- method: "accounts.doctype.sales_invoice.sales_invoice.make_delivery_note",
+ method: "erpnext.accounts.doctype.sales_invoice.sales_invoice.make_delivery_note",
source_name: cur_frm.doc.name
})
}
cur_frm.cscript.make_bank_voucher = function() {
return wn.call({
- method: "accounts.doctype.journal_voucher.journal_voucher.get_payment_entry_from_sales_invoice",
+ method: "erpnext.accounts.doctype.journal_voucher.journal_voucher.get_payment_entry_from_sales_invoice",
args: {
"sales_invoice": cur_frm.doc.name
},
@@ -325,7 +325,7 @@
//--------------------------
cur_frm.fields_dict['project_name'].get_query = function(doc, cdt, cdn) {
return{
- query: "controllers.queries.get_project_name",
+ query: "erpnext.controllers.queries.get_project_name",
filters: {'customer': doc.customer}
}
}
diff --git a/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
similarity index 97%
rename from accounts/doctype/sales_invoice/sales_invoice.py
rename to erpnext/accounts/doctype/sales_invoice/sales_invoice.py
index bfba30f..f77abfe 100644
--- a/accounts/doctype/sales_invoice/sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
@@ -17,7 +17,7 @@
month_map = {'Monthly': 1, 'Quarterly': 3, 'Half-yearly': 6, 'Yearly': 12}
-from controllers.selling_controller import SellingController
+from erpnext.controllers.selling_controller import SellingController
class DocType(SellingController):
def __init__(self,d,dl):
@@ -109,7 +109,7 @@
self.check_stop_sales_order("sales_order")
- from accounts.utils import remove_against_link_from_jv
+ from erpnext.accounts.utils import remove_against_link_from_jv
remove_against_link_from_jv(self.doc.doctype, self.doc.name, "against_invoice")
self.update_status_updater_args()
@@ -184,7 +184,7 @@
if cint(self.doc.is_pos) != 1:
return
- from selling.utils import get_pos_settings, apply_pos_settings
+ from erpnext.selling.utils import get_pos_settings, apply_pos_settings
pos = get_pos_settings(self.doc.company)
if pos:
@@ -285,7 +285,7 @@
lst.append(args)
if lst:
- from accounts.utils import reconcile_against_document
+ from erpnext.accounts.utils import reconcile_against_document
reconcile_against_document(lst)
def validate_customer_account(self):
@@ -465,7 +465,7 @@
if not d.warehouse:
d.warehouse = cstr(w)
- from stock.doctype.packed_item.packed_item import make_packing_list
+ from erpnext.stock.doctype.packed_item.packed_item import make_packing_list
make_packing_list(self, 'entries')
else:
self.doclist = self.doc.clear_table(self.doclist, 'packing_details')
@@ -512,7 +512,7 @@
gl_entries = self.get_gl_entries()
if gl_entries:
- from accounts.general_ledger import make_gl_entries
+ from erpnext.accounts.general_ledger import make_gl_entries
update_outstanding = cint(self.doc.is_pos) and self.doc.write_off_account \
and 'No' or 'Yes'
@@ -524,7 +524,7 @@
self.update_gl_entries_after()
def get_gl_entries(self, warehouse_account=None):
- from accounts.general_ledger import merge_similar_entries
+ from erpnext.accounts.general_ledger import merge_similar_entries
gl_entries = []
@@ -739,7 +739,7 @@
notify_errors(ref_invoice, ref_wrapper.doc.owner)
webnotes.conn.commit()
- exception_list.append(webnotes.getTraceback())
+ exception_list.append(webnotes.get_traceback())
finally:
if commit:
webnotes.conn.begin()
@@ -750,7 +750,7 @@
def make_new_invoice(ref_wrapper, posting_date):
from webnotes.model.bean import clone
- from accounts.utils import get_fiscal_year
+ from erpnext.accounts.utils import get_fiscal_year
new_invoice = clone(ref_wrapper)
mcount = month_map[ref_wrapper.doc.recurring_type]
@@ -904,7 +904,7 @@
@webnotes.whitelist()
def get_income_account(doctype, txt, searchfield, start, page_len, filters):
- from controllers.queries import get_match_cond
+ from erpnext.controllers.queries import get_match_cond
# income account can be any Credit account,
# but can also be a Asset account with account_type='Income Account' in special circumstances.
diff --git a/accounts/doctype/sales_invoice/sales_invoice.txt b/erpnext/accounts/doctype/sales_invoice/sales_invoice.txt
similarity index 100%
rename from accounts/doctype/sales_invoice/sales_invoice.txt
rename to erpnext/accounts/doctype/sales_invoice/sales_invoice.txt
diff --git a/accounts/doctype/sales_invoice/sales_invoice_list.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js
similarity index 100%
rename from accounts/doctype/sales_invoice/sales_invoice_list.js
rename to erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js
diff --git a/accounts/doctype/sales_invoice/sales_invoice_map.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice_map.js
similarity index 100%
rename from accounts/doctype/sales_invoice/sales_invoice_map.js
rename to erpnext/accounts/doctype/sales_invoice/sales_invoice_map.js
diff --git a/accounts/doctype/sales_invoice/test_sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
similarity index 96%
rename from accounts/doctype/sales_invoice/test_sales_invoice.py
rename to erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
index 9b740d1..478ed3c 100644
--- a/accounts/doctype/sales_invoice/test_sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
@@ -5,8 +5,8 @@
import unittest, json
from webnotes.utils import flt
from webnotes.model.bean import DocstatusTransitionError, TimestampMismatchError
-from accounts.utils import get_stock_and_account_difference
-from stock.doctype.purchase_receipt.test_purchase_receipt import set_perpetual_inventory
+from erpnext.accounts.utils import get_stock_and_account_difference
+from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import set_perpetual_inventory
class TestSalesInvoice(unittest.TestCase):
def make(self):
@@ -262,7 +262,7 @@
webnotes.conn.sql("""delete from `tabGL Entry`""")
w = self.make()
- from accounts.doctype.journal_voucher.test_journal_voucher \
+ from erpnext.accounts.doctype.journal_voucher.test_journal_voucher \
import test_records as jv_test_records
jv = webnotes.bean(webnotes.copy_doclist(jv_test_records[0]))
@@ -399,7 +399,7 @@
webnotes.delete_doc("Account", "_Test Warehouse No Account - _TC")
# insert purchase receipt
- from stock.doctype.purchase_receipt.test_purchase_receipt import test_records \
+ from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import test_records \
as pr_test_records
pr = webnotes.bean(copy=pr_test_records[0])
pr.doc.naming_series = "_T-Purchase Receipt-"
@@ -505,7 +505,7 @@
set_perpetual_inventory(0)
def _insert_purchase_receipt(self):
- from stock.doctype.purchase_receipt.test_purchase_receipt import test_records \
+ from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import test_records \
as pr_test_records
pr = webnotes.bean(copy=pr_test_records[0])
pr.doc.naming_series = "_T-Purchase Receipt-"
@@ -514,7 +514,7 @@
pr.submit()
def _insert_delivery_note(self):
- from stock.doctype.delivery_note.test_delivery_note import test_records \
+ from erpnext.stock.doctype.delivery_note.test_delivery_note import test_records \
as dn_test_records
dn = webnotes.bean(copy=dn_test_records[0])
dn.doc.naming_series = "_T-Delivery Note-"
@@ -523,7 +523,7 @@
return dn
def _insert_pos_settings(self):
- from accounts.doctype.pos_setting.test_pos_setting \
+ from erpnext.accounts.doctype.pos_setting.test_pos_setting \
import test_records as pos_setting_test_records
webnotes.conn.sql("""delete from `tabPOS Setting`""")
@@ -531,7 +531,7 @@
ps.insert()
def test_sales_invoice_with_advance(self):
- from accounts.doctype.journal_voucher.test_journal_voucher \
+ from erpnext.accounts.doctype.journal_voucher.test_journal_voucher \
import test_records as jv_test_records
jv = webnotes.bean(copy=jv_test_records[0])
@@ -654,7 +654,7 @@
def _test_recurring_invoice(self, base_si, first_and_last_day):
from webnotes.utils import add_months, get_last_day
- from accounts.doctype.sales_invoice.sales_invoice import manage_recurring_invoices
+ from erpnext.accounts.doctype.sales_invoice.sales_invoice import manage_recurring_invoices
no_of_months = ({"Monthly": 1, "Quarterly": 3, "Yearly": 12})[base_si.doc.recurring_type]
@@ -706,8 +706,8 @@
webnotes.conn.sql("delete from `tabGL Entry`")
def test_serialized(self):
- from stock.doctype.stock_entry.test_stock_entry import make_serialized_item
- from stock.doctype.serial_no.serial_no import get_serial_nos
+ from erpnext.stock.doctype.stock_entry.test_stock_entry import make_serialized_item
+ from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos
se = make_serialized_item()
serial_nos = get_serial_nos(se.doclist[1].serial_no)
@@ -728,7 +728,7 @@
return si
def test_serialized_cancel(self):
- from stock.doctype.serial_no.serial_no import get_serial_nos
+ from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos
si = self.test_serialized()
si.cancel()
@@ -740,8 +740,8 @@
"delivery_document_no"))
def test_serialize_status(self):
- from stock.doctype.serial_no.serial_no import SerialNoStatusError, get_serial_nos
- from stock.doctype.stock_entry.test_stock_entry import make_serialized_item
+ from erpnext.stock.doctype.serial_no.serial_no import SerialNoStatusError, get_serial_nos
+ from erpnext.stock.doctype.stock_entry.test_stock_entry import make_serialized_item
se = make_serialized_item()
serial_nos = get_serial_nos(se.doclist[1].serial_no)
diff --git a/accounts/doctype/sales_invoice_advance/README.md b/erpnext/accounts/doctype/sales_invoice_advance/README.md
similarity index 100%
rename from accounts/doctype/sales_invoice_advance/README.md
rename to erpnext/accounts/doctype/sales_invoice_advance/README.md
diff --git a/accounts/doctype/sales_invoice_advance/__init__.py b/erpnext/accounts/doctype/sales_invoice_advance/__init__.py
similarity index 100%
rename from accounts/doctype/sales_invoice_advance/__init__.py
rename to erpnext/accounts/doctype/sales_invoice_advance/__init__.py
diff --git a/accounts/doctype/sales_invoice_advance/sales_invoice_advance.py b/erpnext/accounts/doctype/sales_invoice_advance/sales_invoice_advance.py
similarity index 100%
rename from accounts/doctype/sales_invoice_advance/sales_invoice_advance.py
rename to erpnext/accounts/doctype/sales_invoice_advance/sales_invoice_advance.py
diff --git a/accounts/doctype/sales_invoice_advance/sales_invoice_advance.txt b/erpnext/accounts/doctype/sales_invoice_advance/sales_invoice_advance.txt
similarity index 100%
rename from accounts/doctype/sales_invoice_advance/sales_invoice_advance.txt
rename to erpnext/accounts/doctype/sales_invoice_advance/sales_invoice_advance.txt
diff --git a/accounts/doctype/sales_invoice_item/README.md b/erpnext/accounts/doctype/sales_invoice_item/README.md
similarity index 100%
rename from accounts/doctype/sales_invoice_item/README.md
rename to erpnext/accounts/doctype/sales_invoice_item/README.md
diff --git a/accounts/doctype/sales_invoice_item/__init__.py b/erpnext/accounts/doctype/sales_invoice_item/__init__.py
similarity index 100%
rename from accounts/doctype/sales_invoice_item/__init__.py
rename to erpnext/accounts/doctype/sales_invoice_item/__init__.py
diff --git a/accounts/doctype/sales_invoice_item/sales_invoice_item.py b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.py
similarity index 100%
rename from accounts/doctype/sales_invoice_item/sales_invoice_item.py
rename to erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.py
diff --git a/accounts/doctype/sales_invoice_item/sales_invoice_item.txt b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.txt
similarity index 100%
rename from accounts/doctype/sales_invoice_item/sales_invoice_item.txt
rename to erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.txt
diff --git a/accounts/doctype/sales_taxes_and_charges/README.md b/erpnext/accounts/doctype/sales_taxes_and_charges/README.md
similarity index 100%
rename from accounts/doctype/sales_taxes_and_charges/README.md
rename to erpnext/accounts/doctype/sales_taxes_and_charges/README.md
diff --git a/accounts/doctype/sales_taxes_and_charges/__init__.py b/erpnext/accounts/doctype/sales_taxes_and_charges/__init__.py
similarity index 100%
rename from accounts/doctype/sales_taxes_and_charges/__init__.py
rename to erpnext/accounts/doctype/sales_taxes_and_charges/__init__.py
diff --git a/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.py b/erpnext/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.py
similarity index 100%
rename from accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.py
rename to erpnext/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.py
diff --git a/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.txt b/erpnext/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.txt
similarity index 100%
rename from accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.txt
rename to erpnext/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.txt
diff --git a/accounts/doctype/sales_taxes_and_charges_master/README.md b/erpnext/accounts/doctype/sales_taxes_and_charges_master/README.md
similarity index 100%
rename from accounts/doctype/sales_taxes_and_charges_master/README.md
rename to erpnext/accounts/doctype/sales_taxes_and_charges_master/README.md
diff --git a/accounts/doctype/sales_taxes_and_charges_master/__init__.py b/erpnext/accounts/doctype/sales_taxes_and_charges_master/__init__.py
similarity index 100%
rename from accounts/doctype/sales_taxes_and_charges_master/__init__.py
rename to erpnext/accounts/doctype/sales_taxes_and_charges_master/__init__.py
diff --git a/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js b/erpnext/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js
similarity index 97%
rename from accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js
rename to erpnext/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js
index e2e5047..0cdead9 100644
--- a/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js
+++ b/erpnext/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js
@@ -3,7 +3,7 @@
//--------- ONLOAD -------------
-wn.require("app/js/controllers/accounts.js");
+{% include "public/js/controllers/accounts.js" %}
cur_frm.cscript.onload = function(doc, cdt, cdn) {
if(doc.doctype === "Sales Taxes and Charges Master")
@@ -129,7 +129,7 @@
cur_frm.fields_dict['other_charges'].grid.get_field("account_head").get_query = function(doc,cdt,cdn) {
return{
- query: "controllers.queries.tax_account_query",
+ query: "erpnext.controllers.queries.tax_account_query",
filters: {
"account_type": ["Tax", "Chargeable", "Income Account"],
"debit_or_credit": "Credit",
diff --git a/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.py b/erpnext/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.py
similarity index 100%
rename from accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.py
rename to erpnext/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.py
diff --git a/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.txt b/erpnext/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.txt
similarity index 100%
rename from accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.txt
rename to erpnext/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.txt
diff --git a/accounts/doctype/sales_taxes_and_charges_master/test_sales_taxes_and_charges_master.py b/erpnext/accounts/doctype/sales_taxes_and_charges_master/test_sales_taxes_and_charges_master.py
similarity index 100%
rename from accounts/doctype/sales_taxes_and_charges_master/test_sales_taxes_and_charges_master.py
rename to erpnext/accounts/doctype/sales_taxes_and_charges_master/test_sales_taxes_and_charges_master.py
diff --git a/accounts/doctype/shipping_rule/__init__.py b/erpnext/accounts/doctype/shipping_rule/__init__.py
similarity index 100%
rename from accounts/doctype/shipping_rule/__init__.py
rename to erpnext/accounts/doctype/shipping_rule/__init__.py
diff --git a/accounts/doctype/shipping_rule/shipping_rule.js b/erpnext/accounts/doctype/shipping_rule/shipping_rule.js
similarity index 100%
rename from accounts/doctype/shipping_rule/shipping_rule.js
rename to erpnext/accounts/doctype/shipping_rule/shipping_rule.js
diff --git a/accounts/doctype/shipping_rule/shipping_rule.py b/erpnext/accounts/doctype/shipping_rule/shipping_rule.py
similarity index 98%
rename from accounts/doctype/shipping_rule/shipping_rule.py
rename to erpnext/accounts/doctype/shipping_rule/shipping_rule.py
index dd4db5f..5c084f3 100644
--- a/accounts/doctype/shipping_rule/shipping_rule.py
+++ b/erpnext/accounts/doctype/shipping_rule/shipping_rule.py
@@ -8,7 +8,7 @@
from webnotes import _, msgprint
from webnotes.utils import flt, fmt_money
from webnotes.model.controller import DocListController
-from setup.utils import get_company_currency
+from erpnext.setup.utils import get_company_currency
class OverlappingConditionError(webnotes.ValidationError): pass
class FromGreaterThanToError(webnotes.ValidationError): pass
diff --git a/accounts/doctype/shipping_rule/shipping_rule.txt b/erpnext/accounts/doctype/shipping_rule/shipping_rule.txt
similarity index 100%
rename from accounts/doctype/shipping_rule/shipping_rule.txt
rename to erpnext/accounts/doctype/shipping_rule/shipping_rule.txt
diff --git a/accounts/doctype/shipping_rule/test_shipping_rule.py b/erpnext/accounts/doctype/shipping_rule/test_shipping_rule.py
similarity index 93%
rename from accounts/doctype/shipping_rule/test_shipping_rule.py
rename to erpnext/accounts/doctype/shipping_rule/test_shipping_rule.py
index 8bac02b..6bf6bd3 100644
--- a/accounts/doctype/shipping_rule/test_shipping_rule.py
+++ b/erpnext/accounts/doctype/shipping_rule/test_shipping_rule.py
@@ -3,7 +3,7 @@
import webnotes
import unittest
-from accounts.doctype.shipping_rule.shipping_rule import FromGreaterThanToError, ManyBlankToValuesError, OverlappingConditionError
+from erpnext.accounts.doctype.shipping_rule.shipping_rule import FromGreaterThanToError, ManyBlankToValuesError, OverlappingConditionError
class TestShippingRule(unittest.TestCase):
def test_from_greater_than_to(self):
diff --git a/accounts/doctype/shipping_rule_condition/__init__.py b/erpnext/accounts/doctype/shipping_rule_condition/__init__.py
similarity index 100%
rename from accounts/doctype/shipping_rule_condition/__init__.py
rename to erpnext/accounts/doctype/shipping_rule_condition/__init__.py
diff --git a/accounts/doctype/shipping_rule_condition/shipping_rule_condition.py b/erpnext/accounts/doctype/shipping_rule_condition/shipping_rule_condition.py
similarity index 100%
rename from accounts/doctype/shipping_rule_condition/shipping_rule_condition.py
rename to erpnext/accounts/doctype/shipping_rule_condition/shipping_rule_condition.py
diff --git a/accounts/doctype/shipping_rule_condition/shipping_rule_condition.txt b/erpnext/accounts/doctype/shipping_rule_condition/shipping_rule_condition.txt
similarity index 100%
rename from accounts/doctype/shipping_rule_condition/shipping_rule_condition.txt
rename to erpnext/accounts/doctype/shipping_rule_condition/shipping_rule_condition.txt
diff --git a/accounts/general_ledger.py b/erpnext/accounts/general_ledger.py
similarity index 96%
rename from accounts/general_ledger.py
rename to erpnext/accounts/general_ledger.py
index 575a2b0..5451642 100644
--- a/accounts/general_ledger.py
+++ b/erpnext/accounts/general_ledger.py
@@ -5,7 +5,7 @@
import webnotes
from webnotes.utils import flt, cstr
from webnotes import _
-from accounts.utils import validate_expense_against_budget
+from erpnext.accounts.utils import validate_expense_against_budget
class StockAccountInvalidTransaction(webnotes.ValidationError): pass
@@ -103,7 +103,7 @@
def delete_gl_entries(gl_entries=None, voucher_type=None, voucher_no=None,
adv_adj=False, update_outstanding="Yes"):
- from accounts.doctype.gl_entry.gl_entry import check_negative_balance, \
+ from erpnext.accounts.doctype.gl_entry.gl_entry import check_negative_balance, \
check_freezing_date, update_outstanding_amt, validate_frozen_account
if not gl_entries:
diff --git a/accounts/page/__init__.py b/erpnext/accounts/page/__init__.py
similarity index 100%
rename from accounts/page/__init__.py
rename to erpnext/accounts/page/__init__.py
diff --git a/accounts/page/accounts_browser/README.md b/erpnext/accounts/page/accounts_browser/README.md
similarity index 100%
rename from accounts/page/accounts_browser/README.md
rename to erpnext/accounts/page/accounts_browser/README.md
diff --git a/accounts/page/accounts_browser/__init__.py b/erpnext/accounts/page/accounts_browser/__init__.py
similarity index 100%
rename from accounts/page/accounts_browser/__init__.py
rename to erpnext/accounts/page/accounts_browser/__init__.py
diff --git a/accounts/page/accounts_browser/accounts_browser.css b/erpnext/accounts/page/accounts_browser/accounts_browser.css
similarity index 100%
rename from accounts/page/accounts_browser/accounts_browser.css
rename to erpnext/accounts/page/accounts_browser/accounts_browser.css
diff --git a/accounts/page/accounts_browser/accounts_browser.js b/erpnext/accounts/page/accounts_browser/accounts_browser.js
similarity index 97%
rename from accounts/page/accounts_browser/accounts_browser.js
rename to erpnext/accounts/page/accounts_browser/accounts_browser.js
index 235e6ab..fe7f06c 100644
--- a/accounts/page/accounts_browser/accounts_browser.js
+++ b/erpnext/accounts/page/accounts_browser/accounts_browser.js
@@ -63,7 +63,7 @@
// load up companies
return wn.call({
- method:'accounts.page.accounts_browser.accounts_browser.get_companies',
+ method: 'erpnext.accounts.page.accounts_browser.accounts_browser.get_companies',
callback: function(r) {
wrapper.$company_select.empty();
$.each(r.message, function(i, v) {
@@ -108,7 +108,7 @@
parent: $(wrapper),
label: ctype==="Account" ? "Accounts" : "Cost Centers",
args: {ctype: ctype, comp: company},
- method: 'accounts.page.accounts_browser.accounts_browser.get_children',
+ method: 'erpnext.accounts.page.accounts_browser.accounts_browser.get_children',
click: function(link) {
if(me.cur_toolbar)
$(me.cur_toolbar).toggle(false);
@@ -262,7 +262,7 @@
return wn.call({
args: v,
- method:'accounts.utils.add_ac',
+ method: 'erpnext.accounts.utils.add_ac',
callback: function(r) {
$(btn).done_working();
d.hide();
@@ -309,7 +309,7 @@
return wn.call({
args: v,
- method:'accounts.utils.add_cc',
+ method: 'erpnext.accounts.utils.add_cc',
callback: function(r) {
$(btn).done_working();
d.hide();
diff --git a/accounts/page/accounts_browser/accounts_browser.py b/erpnext/accounts/page/accounts_browser/accounts_browser.py
similarity index 96%
rename from accounts/page/accounts_browser/accounts_browser.py
rename to erpnext/accounts/page/accounts_browser/accounts_browser.py
index 68a53b2..6dfbf4a 100644
--- a/accounts/page/accounts_browser/accounts_browser.py
+++ b/erpnext/accounts/page/accounts_browser/accounts_browser.py
@@ -5,7 +5,7 @@
import webnotes
import webnotes.defaults
from webnotes.utils import flt
-from accounts.utils import get_balance_on
+from erpnext.accounts.utils import get_balance_on
@webnotes.whitelist()
def get_companies():
diff --git a/accounts/page/accounts_browser/accounts_browser.txt b/erpnext/accounts/page/accounts_browser/accounts_browser.txt
similarity index 100%
rename from accounts/page/accounts_browser/accounts_browser.txt
rename to erpnext/accounts/page/accounts_browser/accounts_browser.txt
diff --git a/accounts/page/accounts_home/__init__.py b/erpnext/accounts/page/accounts_home/__init__.py
similarity index 100%
rename from accounts/page/accounts_home/__init__.py
rename to erpnext/accounts/page/accounts_home/__init__.py
diff --git a/accounts/page/accounts_home/accounts_home.js b/erpnext/accounts/page/accounts_home/accounts_home.js
similarity index 100%
rename from accounts/page/accounts_home/accounts_home.js
rename to erpnext/accounts/page/accounts_home/accounts_home.js
diff --git a/accounts/page/accounts_home/accounts_home.txt b/erpnext/accounts/page/accounts_home/accounts_home.txt
similarity index 100%
rename from accounts/page/accounts_home/accounts_home.txt
rename to erpnext/accounts/page/accounts_home/accounts_home.txt
diff --git a/accounts/page/financial_analytics/README.md b/erpnext/accounts/page/financial_analytics/README.md
similarity index 100%
rename from accounts/page/financial_analytics/README.md
rename to erpnext/accounts/page/financial_analytics/README.md
diff --git a/accounts/page/financial_analytics/__init__.py b/erpnext/accounts/page/financial_analytics/__init__.py
similarity index 100%
rename from accounts/page/financial_analytics/__init__.py
rename to erpnext/accounts/page/financial_analytics/__init__.py
diff --git a/accounts/page/financial_analytics/financial_analytics.js b/erpnext/accounts/page/financial_analytics/financial_analytics.js
similarity index 98%
rename from accounts/page/financial_analytics/financial_analytics.js
rename to erpnext/accounts/page/financial_analytics/financial_analytics.js
index 7fe0507..4c7c644 100644
--- a/accounts/page/financial_analytics/financial_analytics.js
+++ b/erpnext/accounts/page/financial_analytics/financial_analytics.js
@@ -1,7 +1,7 @@
// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
-wn.require("app/js/account_tree_grid.js");
+wn.require("assets/erpnext/js/account_tree_grid.js");
wn.pages['financial-analytics'].onload = function(wrapper) {
wn.ui.make_app_page({
diff --git a/accounts/page/financial_analytics/financial_analytics.txt b/erpnext/accounts/page/financial_analytics/financial_analytics.txt
similarity index 100%
rename from accounts/page/financial_analytics/financial_analytics.txt
rename to erpnext/accounts/page/financial_analytics/financial_analytics.txt
diff --git a/accounts/page/financial_statements/README.md b/erpnext/accounts/page/financial_statements/README.md
similarity index 100%
rename from accounts/page/financial_statements/README.md
rename to erpnext/accounts/page/financial_statements/README.md
diff --git a/accounts/page/financial_statements/__init__.py b/erpnext/accounts/page/financial_statements/__init__.py
similarity index 100%
rename from accounts/page/financial_statements/__init__.py
rename to erpnext/accounts/page/financial_statements/__init__.py
diff --git a/accounts/page/financial_statements/financial_statements.js b/erpnext/accounts/page/financial_statements/financial_statements.js
similarity index 100%
rename from accounts/page/financial_statements/financial_statements.js
rename to erpnext/accounts/page/financial_statements/financial_statements.js
diff --git a/accounts/page/financial_statements/financial_statements.txt b/erpnext/accounts/page/financial_statements/financial_statements.txt
similarity index 100%
rename from accounts/page/financial_statements/financial_statements.txt
rename to erpnext/accounts/page/financial_statements/financial_statements.txt
diff --git a/accounts/page/trial_balance/README.md b/erpnext/accounts/page/trial_balance/README.md
similarity index 100%
rename from accounts/page/trial_balance/README.md
rename to erpnext/accounts/page/trial_balance/README.md
diff --git a/accounts/page/trial_balance/__init__.py b/erpnext/accounts/page/trial_balance/__init__.py
similarity index 100%
rename from accounts/page/trial_balance/__init__.py
rename to erpnext/accounts/page/trial_balance/__init__.py
diff --git a/accounts/page/trial_balance/trial_balance.js b/erpnext/accounts/page/trial_balance/trial_balance.js
similarity index 96%
rename from accounts/page/trial_balance/trial_balance.js
rename to erpnext/accounts/page/trial_balance/trial_balance.js
index 83f56eb..34a0695 100644
--- a/accounts/page/trial_balance/trial_balance.js
+++ b/erpnext/accounts/page/trial_balance/trial_balance.js
@@ -1,7 +1,7 @@
// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
-wn.require("app/js/account_tree_grid.js");
+wn.require("assets/erpnext/js/account_tree_grid.js");
wn.pages['trial-balance'].onload = function(wrapper) {
wn.ui.make_app_page({
diff --git a/accounts/page/trial_balance/trial_balance.txt b/erpnext/accounts/page/trial_balance/trial_balance.txt
similarity index 100%
rename from accounts/page/trial_balance/trial_balance.txt
rename to erpnext/accounts/page/trial_balance/trial_balance.txt
diff --git a/accounts/report/__init__.py b/erpnext/accounts/report/__init__.py
similarity index 100%
rename from accounts/report/__init__.py
rename to erpnext/accounts/report/__init__.py
diff --git a/accounts/report/accounts_payable/__init__.py b/erpnext/accounts/report/accounts_payable/__init__.py
similarity index 100%
rename from accounts/report/accounts_payable/__init__.py
rename to erpnext/accounts/report/accounts_payable/__init__.py
diff --git a/accounts/report/accounts_payable/accounts_payable.js b/erpnext/accounts/report/accounts_payable/accounts_payable.js
similarity index 100%
rename from accounts/report/accounts_payable/accounts_payable.js
rename to erpnext/accounts/report/accounts_payable/accounts_payable.js
diff --git a/accounts/report/accounts_payable/accounts_payable.py b/erpnext/accounts/report/accounts_payable/accounts_payable.py
similarity index 96%
rename from accounts/report/accounts_payable/accounts_payable.py
rename to erpnext/accounts/report/accounts_payable/accounts_payable.py
index e5489d1..070148b 100644
--- a/accounts/report/accounts_payable/accounts_payable.py
+++ b/erpnext/accounts/report/accounts_payable/accounts_payable.py
@@ -5,7 +5,7 @@
import webnotes
from webnotes.utils import getdate, nowdate, flt, cstr
from webnotes import msgprint, _
-from accounts.report.accounts_receivable.accounts_receivable import get_ageing_data
+from erpnext.accounts.report.accounts_receivable.accounts_receivable import get_ageing_data
def execute(filters=None):
if not filters: filters = {}
@@ -93,8 +93,7 @@
if supplier_accounts:
conditions += " and account in (%s)" % (", ".join(['%s']*len(supplier_accounts)))
else:
- msgprint(_("No Supplier Accounts found. Supplier Accounts are identified based on \
- 'Master Type' value in account record."), raise_exception=1)
+ msgprint(_("No Supplier Accounts found. Supplier Accounts are identified based on 'Master Type' value in account record."), raise_exception=1)
if filters.get("report_date"):
if before_report_date:
diff --git a/accounts/report/accounts_payable/accounts_payable.txt b/erpnext/accounts/report/accounts_payable/accounts_payable.txt
similarity index 100%
rename from accounts/report/accounts_payable/accounts_payable.txt
rename to erpnext/accounts/report/accounts_payable/accounts_payable.txt
diff --git a/accounts/report/accounts_receivable/__init__.py b/erpnext/accounts/report/accounts_receivable/__init__.py
similarity index 100%
rename from accounts/report/accounts_receivable/__init__.py
rename to erpnext/accounts/report/accounts_receivable/__init__.py
diff --git a/accounts/report/accounts_receivable/accounts_receivable.js b/erpnext/accounts/report/accounts_receivable/accounts_receivable.js
similarity index 100%
rename from accounts/report/accounts_receivable/accounts_receivable.js
rename to erpnext/accounts/report/accounts_receivable/accounts_receivable.js
diff --git a/accounts/report/accounts_receivable/accounts_receivable.py b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
similarity index 100%
rename from accounts/report/accounts_receivable/accounts_receivable.py
rename to erpnext/accounts/report/accounts_receivable/accounts_receivable.py
diff --git a/accounts/report/accounts_receivable/accounts_receivable.txt b/erpnext/accounts/report/accounts_receivable/accounts_receivable.txt
similarity index 100%
rename from accounts/report/accounts_receivable/accounts_receivable.txt
rename to erpnext/accounts/report/accounts_receivable/accounts_receivable.txt
diff --git a/accounts/report/bank_clearance_summary/__init__.py b/erpnext/accounts/report/bank_clearance_summary/__init__.py
similarity index 100%
rename from accounts/report/bank_clearance_summary/__init__.py
rename to erpnext/accounts/report/bank_clearance_summary/__init__.py
diff --git a/accounts/report/bank_clearance_summary/bank_clearance_summary.js b/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.js
similarity index 100%
rename from accounts/report/bank_clearance_summary/bank_clearance_summary.js
rename to erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.js
diff --git a/accounts/report/bank_clearance_summary/bank_clearance_summary.py b/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py
similarity index 100%
rename from accounts/report/bank_clearance_summary/bank_clearance_summary.py
rename to erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py
diff --git a/accounts/report/bank_clearance_summary/bank_clearance_summary.txt b/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.txt
similarity index 100%
rename from accounts/report/bank_clearance_summary/bank_clearance_summary.txt
rename to erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.txt
diff --git a/accounts/report/bank_reconciliation_statement/__init__.py b/erpnext/accounts/report/bank_reconciliation_statement/__init__.py
similarity index 100%
rename from accounts/report/bank_reconciliation_statement/__init__.py
rename to erpnext/accounts/report/bank_reconciliation_statement/__init__.py
diff --git a/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.js b/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.js
similarity index 100%
rename from accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.js
rename to erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.js
diff --git a/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py b/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py
similarity index 97%
rename from accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py
rename to erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py
index 431a649..f2a1edd 100644
--- a/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py
+++ b/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py
@@ -12,7 +12,7 @@
columns = get_columns()
data = get_entries(filters)
- from accounts.utils import get_balance_on
+ from erpnext.accounts.utils import get_balance_on
balance_as_per_company = get_balance_on(filters["account"], filters["report_date"])
total_debit, total_credit = 0,0
diff --git a/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.txt b/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.txt
similarity index 100%
rename from accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.txt
rename to erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.txt
diff --git a/accounts/report/budget_variance_report/__init__.py b/erpnext/accounts/report/budget_variance_report/__init__.py
similarity index 100%
rename from accounts/report/budget_variance_report/__init__.py
rename to erpnext/accounts/report/budget_variance_report/__init__.py
diff --git a/accounts/report/budget_variance_report/budget_variance_report.js b/erpnext/accounts/report/budget_variance_report/budget_variance_report.js
similarity index 100%
rename from accounts/report/budget_variance_report/budget_variance_report.js
rename to erpnext/accounts/report/budget_variance_report/budget_variance_report.js
diff --git a/accounts/report/budget_variance_report/budget_variance_report.py b/erpnext/accounts/report/budget_variance_report/budget_variance_report.py
similarity index 96%
rename from accounts/report/budget_variance_report/budget_variance_report.py
rename to erpnext/accounts/report/budget_variance_report/budget_variance_report.py
index a5860c8..8d164f8 100644
--- a/accounts/report/budget_variance_report/budget_variance_report.py
+++ b/erpnext/accounts/report/budget_variance_report/budget_variance_report.py
@@ -6,8 +6,8 @@
from webnotes import _, msgprint
from webnotes.utils import flt
import time
-from accounts.utils import get_fiscal_year
-from controllers.trends import get_period_date_ranges, get_period_month_ranges
+from erpnext.accounts.utils import get_fiscal_year
+from erpnext.controllers.trends import get_period_date_ranges, get_period_month_ranges
def execute(filters=None):
if not filters: filters = {}
diff --git a/accounts/report/budget_variance_report/budget_variance_report.txt b/erpnext/accounts/report/budget_variance_report/budget_variance_report.txt
similarity index 100%
rename from accounts/report/budget_variance_report/budget_variance_report.txt
rename to erpnext/accounts/report/budget_variance_report/budget_variance_report.txt
diff --git a/accounts/report/customer_account_head/__init__.py b/erpnext/accounts/report/customer_account_head/__init__.py
similarity index 100%
rename from accounts/report/customer_account_head/__init__.py
rename to erpnext/accounts/report/customer_account_head/__init__.py
diff --git a/accounts/report/customer_account_head/customer_account_head.py b/erpnext/accounts/report/customer_account_head/customer_account_head.py
similarity index 100%
rename from accounts/report/customer_account_head/customer_account_head.py
rename to erpnext/accounts/report/customer_account_head/customer_account_head.py
diff --git a/accounts/report/customer_account_head/customer_account_head.txt b/erpnext/accounts/report/customer_account_head/customer_account_head.txt
similarity index 100%
rename from accounts/report/customer_account_head/customer_account_head.txt
rename to erpnext/accounts/report/customer_account_head/customer_account_head.txt
diff --git a/accounts/report/delivered_items_to_be_billed/__init__.py b/erpnext/accounts/report/delivered_items_to_be_billed/__init__.py
similarity index 100%
rename from accounts/report/delivered_items_to_be_billed/__init__.py
rename to erpnext/accounts/report/delivered_items_to_be_billed/__init__.py
diff --git a/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.txt b/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.txt
similarity index 100%
rename from accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.txt
rename to erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.txt
diff --git a/accounts/report/gross_profit/__init__.py b/erpnext/accounts/report/gross_profit/__init__.py
similarity index 100%
rename from accounts/report/gross_profit/__init__.py
rename to erpnext/accounts/report/gross_profit/__init__.py
diff --git a/accounts/report/gross_profit/gross_profit.js b/erpnext/accounts/report/gross_profit/gross_profit.js
similarity index 100%
rename from accounts/report/gross_profit/gross_profit.js
rename to erpnext/accounts/report/gross_profit/gross_profit.js
diff --git a/accounts/report/gross_profit/gross_profit.py b/erpnext/accounts/report/gross_profit/gross_profit.py
similarity index 98%
rename from accounts/report/gross_profit/gross_profit.py
rename to erpnext/accounts/report/gross_profit/gross_profit.py
index 8e73062..4f7a1e4 100644
--- a/accounts/report/gross_profit/gross_profit.py
+++ b/erpnext/accounts/report/gross_profit/gross_profit.py
@@ -4,7 +4,7 @@
from __future__ import unicode_literals
import webnotes
from webnotes.utils import flt
-from stock.utils import get_buying_amount, get_sales_bom_buying_amount
+from erpnext.stock.utils import get_buying_amount, get_sales_bom_buying_amount
def execute(filters=None):
if not filters: filters = {}
diff --git a/accounts/report/gross_profit/gross_profit.txt b/erpnext/accounts/report/gross_profit/gross_profit.txt
similarity index 100%
rename from accounts/report/gross_profit/gross_profit.txt
rename to erpnext/accounts/report/gross_profit/gross_profit.txt
diff --git a/accounts/report/item_wise_purchase_register/__init__.py b/erpnext/accounts/report/item_wise_purchase_register/__init__.py
similarity index 100%
rename from accounts/report/item_wise_purchase_register/__init__.py
rename to erpnext/accounts/report/item_wise_purchase_register/__init__.py
diff --git a/accounts/report/item_wise_purchase_register/item_wise_purchase_register.js b/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.js
similarity index 100%
rename from accounts/report/item_wise_purchase_register/item_wise_purchase_register.js
rename to erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.js
diff --git a/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py b/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py
similarity index 100%
rename from accounts/report/item_wise_purchase_register/item_wise_purchase_register.py
rename to erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py
diff --git a/accounts/report/item_wise_purchase_register/item_wise_purchase_register.txt b/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.txt
similarity index 100%
rename from accounts/report/item_wise_purchase_register/item_wise_purchase_register.txt
rename to erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.txt
diff --git a/accounts/report/item_wise_sales_register/__init__.py b/erpnext/accounts/report/item_wise_sales_register/__init__.py
similarity index 100%
rename from accounts/report/item_wise_sales_register/__init__.py
rename to erpnext/accounts/report/item_wise_sales_register/__init__.py
diff --git a/accounts/report/item_wise_sales_register/item_wise_sales_register.js b/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.js
similarity index 100%
rename from accounts/report/item_wise_sales_register/item_wise_sales_register.js
rename to erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.js
diff --git a/accounts/report/item_wise_sales_register/item_wise_sales_register.py b/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py
similarity index 100%
rename from accounts/report/item_wise_sales_register/item_wise_sales_register.py
rename to erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py
diff --git a/accounts/report/item_wise_sales_register/item_wise_sales_register.txt b/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.txt
similarity index 100%
rename from accounts/report/item_wise_sales_register/item_wise_sales_register.txt
rename to erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.txt
diff --git a/accounts/report/ordered_items_to_be_billed/__init__.py b/erpnext/accounts/report/ordered_items_to_be_billed/__init__.py
similarity index 100%
rename from accounts/report/ordered_items_to_be_billed/__init__.py
rename to erpnext/accounts/report/ordered_items_to_be_billed/__init__.py
diff --git a/accounts/report/ordered_items_to_be_billed/ordered_items_to_be_billed.txt b/erpnext/accounts/report/ordered_items_to_be_billed/ordered_items_to_be_billed.txt
similarity index 100%
rename from accounts/report/ordered_items_to_be_billed/ordered_items_to_be_billed.txt
rename to erpnext/accounts/report/ordered_items_to_be_billed/ordered_items_to_be_billed.txt
diff --git a/accounts/report/payment_period_based_on_invoice_date/__init__.py b/erpnext/accounts/report/payment_period_based_on_invoice_date/__init__.py
similarity index 100%
rename from accounts/report/payment_period_based_on_invoice_date/__init__.py
rename to erpnext/accounts/report/payment_period_based_on_invoice_date/__init__.py
diff --git a/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js b/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js
similarity index 100%
rename from accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js
rename to erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js
diff --git a/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py b/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py
similarity index 97%
rename from accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py
rename to erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py
index 1273360..4662462 100644
--- a/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py
+++ b/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py
@@ -4,7 +4,7 @@
from __future__ import unicode_literals
import webnotes
from webnotes import msgprint, _
-from accounts.report.accounts_receivable.accounts_receivable import get_ageing_data
+from erpnext.accounts.report.accounts_receivable.accounts_receivable import get_ageing_data
def execute(filters=None):
if not filters: filters = {}
diff --git a/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.txt b/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.txt
similarity index 100%
rename from accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.txt
rename to erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.txt
diff --git a/accounts/report/purchase_invoice_trends/__init__.py b/erpnext/accounts/report/purchase_invoice_trends/__init__.py
similarity index 100%
rename from accounts/report/purchase_invoice_trends/__init__.py
rename to erpnext/accounts/report/purchase_invoice_trends/__init__.py
diff --git a/accounts/report/purchase_invoice_trends/purchase_invoice_trends.js b/erpnext/accounts/report/purchase_invoice_trends/purchase_invoice_trends.js
similarity index 77%
rename from accounts/report/purchase_invoice_trends/purchase_invoice_trends.js
rename to erpnext/accounts/report/purchase_invoice_trends/purchase_invoice_trends.js
index 183e16a..7ab4ffa 100644
--- a/accounts/report/purchase_invoice_trends/purchase_invoice_trends.js
+++ b/erpnext/accounts/report/purchase_invoice_trends/purchase_invoice_trends.js
@@ -1,7 +1,7 @@
// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
-wn.require("app/js/purchase_trends_filters.js");
+wn.require("assets/erpnext/js/purchase_trends_filters.js");
wn.query_reports["Purchase Invoice Trends"] = {
filters: get_filters()
diff --git a/accounts/report/purchase_invoice_trends/purchase_invoice_trends.py b/erpnext/accounts/report/purchase_invoice_trends/purchase_invoice_trends.py
similarity index 86%
rename from accounts/report/purchase_invoice_trends/purchase_invoice_trends.py
rename to erpnext/accounts/report/purchase_invoice_trends/purchase_invoice_trends.py
index 4c38bed..4587618 100644
--- a/accounts/report/purchase_invoice_trends/purchase_invoice_trends.py
+++ b/erpnext/accounts/report/purchase_invoice_trends/purchase_invoice_trends.py
@@ -3,7 +3,7 @@
from __future__ import unicode_literals
import webnotes
-from controllers.trends import get_columns,get_data
+from erpnext.controllers.trends import get_columns,get_data
def execute(filters=None):
if not filters: filters ={}
diff --git a/accounts/report/purchase_invoice_trends/purchase_invoice_trends.txt b/erpnext/accounts/report/purchase_invoice_trends/purchase_invoice_trends.txt
similarity index 100%
rename from accounts/report/purchase_invoice_trends/purchase_invoice_trends.txt
rename to erpnext/accounts/report/purchase_invoice_trends/purchase_invoice_trends.txt
diff --git a/accounts/report/purchase_order_items_to_be_billed/__init__.py b/erpnext/accounts/report/purchase_order_items_to_be_billed/__init__.py
similarity index 100%
rename from accounts/report/purchase_order_items_to_be_billed/__init__.py
rename to erpnext/accounts/report/purchase_order_items_to_be_billed/__init__.py
diff --git a/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.txt b/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.txt
similarity index 100%
rename from accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.txt
rename to erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.txt
diff --git a/accounts/report/purchase_register/__init__.py b/erpnext/accounts/report/purchase_register/__init__.py
similarity index 100%
rename from accounts/report/purchase_register/__init__.py
rename to erpnext/accounts/report/purchase_register/__init__.py
diff --git a/accounts/report/purchase_register/purchase_register.js b/erpnext/accounts/report/purchase_register/purchase_register.js
similarity index 100%
rename from accounts/report/purchase_register/purchase_register.js
rename to erpnext/accounts/report/purchase_register/purchase_register.js
diff --git a/accounts/report/purchase_register/purchase_register.py b/erpnext/accounts/report/purchase_register/purchase_register.py
similarity index 100%
rename from accounts/report/purchase_register/purchase_register.py
rename to erpnext/accounts/report/purchase_register/purchase_register.py
diff --git a/accounts/report/purchase_register/purchase_register.txt b/erpnext/accounts/report/purchase_register/purchase_register.txt
similarity index 100%
rename from accounts/report/purchase_register/purchase_register.txt
rename to erpnext/accounts/report/purchase_register/purchase_register.txt
diff --git a/accounts/report/received_items_to_be_billed/__init__.py b/erpnext/accounts/report/received_items_to_be_billed/__init__.py
similarity index 100%
rename from accounts/report/received_items_to_be_billed/__init__.py
rename to erpnext/accounts/report/received_items_to_be_billed/__init__.py
diff --git a/accounts/report/received_items_to_be_billed/received_items_to_be_billed.txt b/erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.txt
similarity index 100%
rename from accounts/report/received_items_to_be_billed/received_items_to_be_billed.txt
rename to erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.txt
diff --git a/accounts/report/sales_invoice_trends/__init__.py b/erpnext/accounts/report/sales_invoice_trends/__init__.py
similarity index 100%
rename from accounts/report/sales_invoice_trends/__init__.py
rename to erpnext/accounts/report/sales_invoice_trends/__init__.py
diff --git a/accounts/report/sales_invoice_trends/sales_invoice_trends.js b/erpnext/accounts/report/sales_invoice_trends/sales_invoice_trends.js
similarity index 78%
rename from accounts/report/sales_invoice_trends/sales_invoice_trends.js
rename to erpnext/accounts/report/sales_invoice_trends/sales_invoice_trends.js
index 3b004ab..0ffb6e0 100644
--- a/accounts/report/sales_invoice_trends/sales_invoice_trends.js
+++ b/erpnext/accounts/report/sales_invoice_trends/sales_invoice_trends.js
@@ -1,7 +1,7 @@
// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
-wn.require("app/js/sales_trends_filters.js");
+wn.require("assets/erpnext/js/sales_trends_filters.js");
wn.query_reports["Sales Invoice Trends"] = {
filters: get_filters()
diff --git a/accounts/report/sales_invoice_trends/sales_invoice_trends.py b/erpnext/accounts/report/sales_invoice_trends/sales_invoice_trends.py
similarity index 86%
rename from accounts/report/sales_invoice_trends/sales_invoice_trends.py
rename to erpnext/accounts/report/sales_invoice_trends/sales_invoice_trends.py
index 70c61d7..da70623 100644
--- a/accounts/report/sales_invoice_trends/sales_invoice_trends.py
+++ b/erpnext/accounts/report/sales_invoice_trends/sales_invoice_trends.py
@@ -3,7 +3,7 @@
from __future__ import unicode_literals
import webnotes
-from controllers.trends import get_columns,get_data
+from erpnext.controllers.trends import get_columns,get_data
def execute(filters=None):
if not filters: filters ={}
diff --git a/accounts/report/sales_invoice_trends/sales_invoice_trends.txt b/erpnext/accounts/report/sales_invoice_trends/sales_invoice_trends.txt
similarity index 100%
rename from accounts/report/sales_invoice_trends/sales_invoice_trends.txt
rename to erpnext/accounts/report/sales_invoice_trends/sales_invoice_trends.txt
diff --git a/accounts/report/sales_partners_commission/__init__.py b/erpnext/accounts/report/sales_partners_commission/__init__.py
similarity index 100%
rename from accounts/report/sales_partners_commission/__init__.py
rename to erpnext/accounts/report/sales_partners_commission/__init__.py
diff --git a/accounts/report/sales_partners_commission/sales_partners_commission.txt b/erpnext/accounts/report/sales_partners_commission/sales_partners_commission.txt
similarity index 100%
rename from accounts/report/sales_partners_commission/sales_partners_commission.txt
rename to erpnext/accounts/report/sales_partners_commission/sales_partners_commission.txt
diff --git a/accounts/report/sales_register/__init__.py b/erpnext/accounts/report/sales_register/__init__.py
similarity index 100%
rename from accounts/report/sales_register/__init__.py
rename to erpnext/accounts/report/sales_register/__init__.py
diff --git a/accounts/report/sales_register/sales_register.js b/erpnext/accounts/report/sales_register/sales_register.js
similarity index 100%
rename from accounts/report/sales_register/sales_register.js
rename to erpnext/accounts/report/sales_register/sales_register.js
diff --git a/accounts/report/sales_register/sales_register.py b/erpnext/accounts/report/sales_register/sales_register.py
similarity index 100%
rename from accounts/report/sales_register/sales_register.py
rename to erpnext/accounts/report/sales_register/sales_register.py
diff --git a/accounts/report/sales_register/sales_register.txt b/erpnext/accounts/report/sales_register/sales_register.txt
similarity index 100%
rename from accounts/report/sales_register/sales_register.txt
rename to erpnext/accounts/report/sales_register/sales_register.txt
diff --git a/accounts/report/supplier_account_head/__init__.py b/erpnext/accounts/report/supplier_account_head/__init__.py
similarity index 100%
rename from accounts/report/supplier_account_head/__init__.py
rename to erpnext/accounts/report/supplier_account_head/__init__.py
diff --git a/accounts/report/supplier_account_head/supplier_account_head.py b/erpnext/accounts/report/supplier_account_head/supplier_account_head.py
similarity index 100%
rename from accounts/report/supplier_account_head/supplier_account_head.py
rename to erpnext/accounts/report/supplier_account_head/supplier_account_head.py
diff --git a/accounts/report/supplier_account_head/supplier_account_head.txt b/erpnext/accounts/report/supplier_account_head/supplier_account_head.txt
similarity index 100%
rename from accounts/report/supplier_account_head/supplier_account_head.txt
rename to erpnext/accounts/report/supplier_account_head/supplier_account_head.txt
diff --git a/accounts/utils.py b/erpnext/accounts/utils.py
similarity index 98%
rename from accounts/utils.py
rename to erpnext/accounts/utils.py
index 8971c80..6d74abd 100644
--- a/accounts/utils.py
+++ b/erpnext/accounts/utils.py
@@ -8,7 +8,7 @@
from webnotes.model.doc import addchild
from webnotes import msgprint, _
from webnotes.utils import formatdate
-from utilities import build_filter_conditions
+from erpnext.utilities import build_filter_conditions
class FiscalYearError(webnotes.ValidationError): pass
@@ -260,7 +260,7 @@
(d.diff, d.voucher_type, d.voucher_no))
def get_stock_and_account_difference(account_list=None, posting_date=None):
- from stock.utils import get_stock_balance_on
+ from erpnext.stock.utils import get_stock_balance_on
if not posting_date: posting_date = nowdate()
diff --git a/buying/Print Format/Purchase Order Classic/Purchase Order Classic.txt b/erpnext/buying/Print Format/Purchase Order Classic/Purchase Order Classic.txt
similarity index 100%
rename from buying/Print Format/Purchase Order Classic/Purchase Order Classic.txt
rename to erpnext/buying/Print Format/Purchase Order Classic/Purchase Order Classic.txt
diff --git a/buying/Print Format/Purchase Order Modern/Purchase Order Modern.txt b/erpnext/buying/Print Format/Purchase Order Modern/Purchase Order Modern.txt
similarity index 100%
rename from buying/Print Format/Purchase Order Modern/Purchase Order Modern.txt
rename to erpnext/buying/Print Format/Purchase Order Modern/Purchase Order Modern.txt
diff --git a/buying/Print Format/Purchase Order Spartan/Purchase Order Spartan.txt b/erpnext/buying/Print Format/Purchase Order Spartan/Purchase Order Spartan.txt
similarity index 100%
rename from buying/Print Format/Purchase Order Spartan/Purchase Order Spartan.txt
rename to erpnext/buying/Print Format/Purchase Order Spartan/Purchase Order Spartan.txt
diff --git a/buying/README.md b/erpnext/buying/README.md
similarity index 100%
rename from buying/README.md
rename to erpnext/buying/README.md
diff --git a/buying/__init__.py b/erpnext/buying/__init__.py
similarity index 100%
rename from buying/__init__.py
rename to erpnext/buying/__init__.py
diff --git a/buying/doctype/__init__.py b/erpnext/buying/doctype/__init__.py
similarity index 100%
rename from buying/doctype/__init__.py
rename to erpnext/buying/doctype/__init__.py
diff --git a/buying/doctype/buying_settings/__init__.py b/erpnext/buying/doctype/buying_settings/__init__.py
similarity index 100%
rename from buying/doctype/buying_settings/__init__.py
rename to erpnext/buying/doctype/buying_settings/__init__.py
diff --git a/buying/doctype/buying_settings/buying_settings.py b/erpnext/buying/doctype/buying_settings/buying_settings.py
similarity index 87%
rename from buying/doctype/buying_settings/buying_settings.py
rename to erpnext/buying/doctype/buying_settings/buying_settings.py
index 53e4479..25d0f72 100644
--- a/buying/doctype/buying_settings/buying_settings.py
+++ b/erpnext/buying/doctype/buying_settings/buying_settings.py
@@ -14,6 +14,6 @@
for key in ["supplier_type", "supp_master_name", "maintain_same_rate", "buying_price_list"]:
webnotes.conn.set_default(key, self.doc.fields.get(key, ""))
- from setup.doctype.naming_series.naming_series import set_by_naming_series
+ from erpnext.setup.doctype.naming_series.naming_series import set_by_naming_series
set_by_naming_series("Supplier", "supplier_name",
self.doc.get("supp_master_name")=="Naming Series", hide_name_field=False)
diff --git a/buying/doctype/buying_settings/buying_settings.txt b/erpnext/buying/doctype/buying_settings/buying_settings.txt
similarity index 100%
rename from buying/doctype/buying_settings/buying_settings.txt
rename to erpnext/buying/doctype/buying_settings/buying_settings.txt
diff --git a/buying/doctype/purchase_common/README.md b/erpnext/buying/doctype/purchase_common/README.md
similarity index 100%
rename from buying/doctype/purchase_common/README.md
rename to erpnext/buying/doctype/purchase_common/README.md
diff --git a/buying/doctype/purchase_common/__init__.py b/erpnext/buying/doctype/purchase_common/__init__.py
similarity index 100%
rename from buying/doctype/purchase_common/__init__.py
rename to erpnext/buying/doctype/purchase_common/__init__.py
diff --git a/buying/doctype/purchase_common/purchase_common.js b/erpnext/buying/doctype/purchase_common/purchase_common.js
similarity index 96%
rename from buying/doctype/purchase_common/purchase_common.js
rename to erpnext/buying/doctype/purchase_common/purchase_common.js
index 9661f6e..cc24925 100644
--- a/buying/doctype/purchase_common/purchase_common.js
+++ b/erpnext/buying/doctype/purchase_common/purchase_common.js
@@ -7,8 +7,8 @@
// cur_frm.cscript.fname - Details fieldname
wn.provide("erpnext.buying");
-wn.require("app/js/transaction.js");
-wn.require("app/js/controllers/accounts.js");
+wn.require("assets/erpnext/js/transaction.js");
+{% include "public/js/controllers/accounts.js" %}
erpnext.buying.BuyingController = erpnext.TransactionController.extend({
onload: function() {
@@ -37,18 +37,18 @@
if(this.frm.fields_dict.supplier) {
this.frm.set_query("supplier", function() {
- return{ query:"controllers.queries.supplier_query" }});
+ return{ query: "erpnext.controllers.queries.supplier_query" }});
}
this.frm.set_query("item_code", this.frm.cscript.fname, function() {
if(me.frm.doc.is_subcontracted == "Yes") {
return{
- query:"controllers.queries.item_query",
+ query: "erpnext.controllers.queries.item_query",
filters:{ 'is_sub_contracted_item': 'Yes' }
}
} else {
return{
- query: "controllers.queries.item_query",
+ query: "erpnext.controllers.queries.item_query",
filters: { 'is_purchase_item': 'Yes' }
}
}
@@ -112,7 +112,7 @@
cur_frm.fields_dict[me.frm.cscript.fname].grid.grid_rows[item.idx - 1].remove();
} else {
return this.frm.call({
- method: "buying.utils.get_item_details",
+ method: "erpnext.buying.utils.get_item_details",
child: item,
args: {
args: {
@@ -178,7 +178,7 @@
var item = wn.model.get_doc(cdt, cdn);
if(item.item_code && item.uom) {
return this.frm.call({
- method: "buying.utils.get_conversion_factor",
+ method: "erpnext.buying.utils.get_conversion_factor",
child: item,
args: {
item_code: item.item_code,
@@ -211,7 +211,7 @@
var item = wn.model.get_doc(cdt, cdn);
if(item.item_code && item.warehouse) {
return this.frm.call({
- method: "buying.utils.get_projected_qty",
+ method: "erpnext.buying.utils.get_projected_qty",
child: item,
args: {
item_code: item.item_code,
diff --git a/buying/doctype/purchase_common/purchase_common.py b/erpnext/buying/doctype/purchase_common/purchase_common.py
similarity index 97%
rename from buying/doctype/purchase_common/purchase_common.py
rename to erpnext/buying/doctype/purchase_common/purchase_common.py
index 8c4fbff..d967b24 100644
--- a/buying/doctype/purchase_common/purchase_common.py
+++ b/erpnext/buying/doctype/purchase_common/purchase_common.py
@@ -7,8 +7,9 @@
from webnotes.utils import cstr, flt
from webnotes.model.utils import getlist
from webnotes import msgprint, _
-from buying.utils import get_last_purchase_details
-from controllers.buying_controller import BuyingController
+
+from erpnext.buying.utils import get_last_purchase_details
+from erpnext.controllers.buying_controller import BuyingController
class DocType(BuyingController):
def __init__(self, doc, doclist=None):
@@ -92,7 +93,7 @@
if not item:
webnotes.throw("Item %s does not exist in Item Master." % cstr(d.item_code))
- from stock.utils import validate_end_of_life
+ from erpnext.stock.utils import validate_end_of_life
validate_end_of_life(d.item_code, item[0][3])
# validate stock item
diff --git a/buying/doctype/purchase_common/purchase_common.txt b/erpnext/buying/doctype/purchase_common/purchase_common.txt
similarity index 100%
rename from buying/doctype/purchase_common/purchase_common.txt
rename to erpnext/buying/doctype/purchase_common/purchase_common.txt
diff --git a/buying/doctype/purchase_order/README.md b/erpnext/buying/doctype/purchase_order/README.md
similarity index 100%
rename from buying/doctype/purchase_order/README.md
rename to erpnext/buying/doctype/purchase_order/README.md
diff --git a/buying/doctype/purchase_order/__init__.py b/erpnext/buying/doctype/purchase_order/__init__.py
similarity index 100%
rename from buying/doctype/purchase_order/__init__.py
rename to erpnext/buying/doctype/purchase_order/__init__.py
diff --git a/buying/doctype/purchase_order/purchase_order.js b/erpnext/buying/doctype/purchase_order/purchase_order.js
similarity index 87%
rename from buying/doctype/purchase_order/purchase_order.js
rename to erpnext/buying/doctype/purchase_order/purchase_order.js
index dad2864..edf7c82 100644
--- a/buying/doctype/purchase_order/purchase_order.js
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.js
@@ -7,10 +7,10 @@
cur_frm.cscript.fname = "po_details";
cur_frm.cscript.other_fname = "purchase_tax_details";
-wn.require('app/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.js');
-wn.require('app/utilities/doctype/sms_control/sms_control.js');
-wn.require('app/buying/doctype/purchase_common/purchase_common.js');
-wn.require('app/accounts/doctype/sales_invoice/pos.js');
+{% include 'buying/doctype/purchase_common/purchase_common.js' %};
+{% include 'accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.js' %}
+{% include 'utilities/doctype/sms_control/sms_control.js' %}
+{% include 'accounts/doctype/sales_invoice/pos.js' %}
erpnext.buying.PurchaseOrderController = erpnext.buying.BuyingController.extend({
refresh: function(doc, cdt, cdn) {
@@ -42,14 +42,14 @@
make_purchase_receipt: function() {
wn.model.open_mapped_doc({
- method: "buying.doctype.purchase_order.purchase_order.make_purchase_receipt",
+ method: "erpnext.buying.doctype.purchase_order.purchase_order.make_purchase_receipt",
source_name: cur_frm.doc.name
})
},
make_purchase_invoice: function() {
wn.model.open_mapped_doc({
- method: "buying.doctype.purchase_order.purchase_order.make_purchase_invoice",
+ method: "erpnext.buying.doctype.purchase_order.purchase_order.make_purchase_invoice",
source_name: cur_frm.doc.name
})
},
@@ -58,7 +58,7 @@
cur_frm.add_custom_button(wn._('From Material Request'),
function() {
wn.model.map_current_doc({
- method: "stock.doctype.material_request.material_request.make_purchase_order",
+ method: "erpnext.stock.doctype.material_request.material_request.make_purchase_order",
source_doctype: "Material Request",
get_query_filters: {
material_request_type: "Purchase",
@@ -74,7 +74,7 @@
cur_frm.add_custom_button(wn._('From Supplier Quotation'),
function() {
wn.model.map_current_doc({
- method: "buying.doctype.supplier_quotation.supplier_quotation.make_purchase_order",
+ method: "erpnext.buying.doctype.supplier_quotation.supplier_quotation.make_purchase_order",
source_doctype: "Supplier Quotation",
get_query_filters: {
docstatus: 1,
@@ -88,7 +88,7 @@
cur_frm.add_custom_button(wn._('For Supplier'),
function() {
wn.model.map_current_doc({
- method: "stock.doctype.material_request.material_request.make_purchase_order_based_on_supplier",
+ method: "erpnext.stock.doctype.material_request.material_request.make_purchase_order_based_on_supplier",
source_doctype: "Supplier",
get_query_filters: {
docstatus: ["!=", 2],
diff --git a/buying/doctype/purchase_order/purchase_order.py b/erpnext/buying/doctype/purchase_order/purchase_order.py
similarity index 97%
rename from buying/doctype/purchase_order/purchase_order.py
rename to erpnext/buying/doctype/purchase_order/purchase_order.py
index 33d8b48..ebfda85 100644
--- a/buying/doctype/purchase_order/purchase_order.py
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.py
@@ -10,7 +10,7 @@
from webnotes import msgprint
-from controllers.buying_controller import BuyingController
+from erpnext.controllers.buying_controller import BuyingController
class DocType(BuyingController):
def __init__(self, doc, doclist=[]):
self.doc = doc
@@ -35,8 +35,8 @@
if not self.doc.status:
self.doc.status = "Draft"
- import utilities
- utilities.validate_status(self.doc.status, ["Draft", "Submitted", "Stopped",
+ from erpnext.utilities import validate_status
+ validate_status(self.doc.status, ["Draft", "Submitted", "Stopped",
"Cancelled"])
pc_obj = get_obj(dt='Purchase Common')
@@ -83,7 +83,7 @@
def update_bin(self, is_submit, is_stopped = 0):
- from stock.utils import update_bin
+ from erpnext.stock.utils import update_bin
pc_obj = get_obj('Purchase Common')
for d in getlist(self.doclist, 'po_details'):
#1. Check if is_stock_item == 'Yes'
diff --git a/buying/doctype/purchase_order/purchase_order.txt b/erpnext/buying/doctype/purchase_order/purchase_order.txt
similarity index 100%
rename from buying/doctype/purchase_order/purchase_order.txt
rename to erpnext/buying/doctype/purchase_order/purchase_order.txt
diff --git a/buying/doctype/purchase_order/test_purchase_order.py b/erpnext/buying/doctype/purchase_order/test_purchase_order.py
similarity index 91%
rename from buying/doctype/purchase_order/test_purchase_order.py
rename to erpnext/buying/doctype/purchase_order/test_purchase_order.py
index f6c435c..3659f6d 100644
--- a/buying/doctype/purchase_order/test_purchase_order.py
+++ b/erpnext/buying/doctype/purchase_order/test_purchase_order.py
@@ -10,7 +10,7 @@
class TestPurchaseOrder(unittest.TestCase):
def test_make_purchase_receipt(self):
- from buying.doctype.purchase_order.purchase_order import make_purchase_receipt
+ from erpnext.buying.doctype.purchase_order.purchase_order import make_purchase_receipt
po = webnotes.bean(copy=test_records[0]).insert()
@@ -33,7 +33,7 @@
def test_ordered_qty(self):
webnotes.conn.sql("delete from tabBin")
- from buying.doctype.purchase_order.purchase_order import make_purchase_receipt
+ from erpnext.buying.doctype.purchase_order.purchase_order import make_purchase_receipt
po = webnotes.bean(copy=test_records[0]).insert()
@@ -75,7 +75,7 @@
"warehouse": "_Test Warehouse - _TC"}, "ordered_qty")), 0.0)
def test_make_purchase_invocie(self):
- from buying.doctype.purchase_order.purchase_order import make_purchase_invoice
+ from erpnext.buying.doctype.purchase_order.purchase_order import make_purchase_invoice
po = webnotes.bean(copy=test_records[0]).insert()
@@ -98,14 +98,14 @@
self.assertEquals(len(po.doclist.get({"parentfield": "po_raw_material_details"})), 2)
def test_warehouse_company_validation(self):
- from stock.utils import InvalidWarehouseCompany
+ from erpnext.stock.utils import InvalidWarehouseCompany
po = webnotes.bean(copy=test_records[0])
po.doc.company = "_Test Company 1"
po.doc.conversion_rate = 0.0167
self.assertRaises(InvalidWarehouseCompany, po.insert)
def test_uom_integer_validation(self):
- from utilities.transaction_base import UOMMustBeIntegerError
+ from erpnext.utilities.transaction_base import UOMMustBeIntegerError
po = webnotes.bean(copy=test_records[0])
po.doclist[1].qty = 3.4
self.assertRaises(UOMMustBeIntegerError, po.insert)
diff --git a/buying/doctype/purchase_order_item/README.md b/erpnext/buying/doctype/purchase_order_item/README.md
similarity index 100%
rename from buying/doctype/purchase_order_item/README.md
rename to erpnext/buying/doctype/purchase_order_item/README.md
diff --git a/buying/doctype/purchase_order_item/__init__.py b/erpnext/buying/doctype/purchase_order_item/__init__.py
similarity index 100%
rename from buying/doctype/purchase_order_item/__init__.py
rename to erpnext/buying/doctype/purchase_order_item/__init__.py
diff --git a/buying/doctype/purchase_order_item/purchase_order_item.py b/erpnext/buying/doctype/purchase_order_item/purchase_order_item.py
similarity index 100%
rename from buying/doctype/purchase_order_item/purchase_order_item.py
rename to erpnext/buying/doctype/purchase_order_item/purchase_order_item.py
diff --git a/buying/doctype/purchase_order_item/purchase_order_item.txt b/erpnext/buying/doctype/purchase_order_item/purchase_order_item.txt
similarity index 100%
rename from buying/doctype/purchase_order_item/purchase_order_item.txt
rename to erpnext/buying/doctype/purchase_order_item/purchase_order_item.txt
diff --git a/buying/doctype/purchase_order_item_supplied/README.md b/erpnext/buying/doctype/purchase_order_item_supplied/README.md
similarity index 100%
rename from buying/doctype/purchase_order_item_supplied/README.md
rename to erpnext/buying/doctype/purchase_order_item_supplied/README.md
diff --git a/buying/doctype/purchase_order_item_supplied/__init__.py b/erpnext/buying/doctype/purchase_order_item_supplied/__init__.py
similarity index 100%
rename from buying/doctype/purchase_order_item_supplied/__init__.py
rename to erpnext/buying/doctype/purchase_order_item_supplied/__init__.py
diff --git a/buying/doctype/purchase_order_item_supplied/purchase_order_item_supplied.py b/erpnext/buying/doctype/purchase_order_item_supplied/purchase_order_item_supplied.py
similarity index 100%
rename from buying/doctype/purchase_order_item_supplied/purchase_order_item_supplied.py
rename to erpnext/buying/doctype/purchase_order_item_supplied/purchase_order_item_supplied.py
diff --git a/buying/doctype/purchase_order_item_supplied/purchase_order_item_supplied.txt b/erpnext/buying/doctype/purchase_order_item_supplied/purchase_order_item_supplied.txt
similarity index 100%
rename from buying/doctype/purchase_order_item_supplied/purchase_order_item_supplied.txt
rename to erpnext/buying/doctype/purchase_order_item_supplied/purchase_order_item_supplied.txt
diff --git a/buying/doctype/purchase_receipt_item_supplied/README.md b/erpnext/buying/doctype/purchase_receipt_item_supplied/README.md
similarity index 100%
rename from buying/doctype/purchase_receipt_item_supplied/README.md
rename to erpnext/buying/doctype/purchase_receipt_item_supplied/README.md
diff --git a/buying/doctype/purchase_receipt_item_supplied/__init__.py b/erpnext/buying/doctype/purchase_receipt_item_supplied/__init__.py
similarity index 100%
rename from buying/doctype/purchase_receipt_item_supplied/__init__.py
rename to erpnext/buying/doctype/purchase_receipt_item_supplied/__init__.py
diff --git a/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.py b/erpnext/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.py
similarity index 100%
rename from buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.py
rename to erpnext/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.py
diff --git a/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.txt b/erpnext/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.txt
similarity index 100%
rename from buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.txt
rename to erpnext/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.txt
diff --git a/buying/doctype/quality_inspection/README.md b/erpnext/buying/doctype/quality_inspection/README.md
similarity index 100%
rename from buying/doctype/quality_inspection/README.md
rename to erpnext/buying/doctype/quality_inspection/README.md
diff --git a/buying/doctype/quality_inspection/__init__.py b/erpnext/buying/doctype/quality_inspection/__init__.py
similarity index 100%
rename from buying/doctype/quality_inspection/__init__.py
rename to erpnext/buying/doctype/quality_inspection/__init__.py
diff --git a/buying/doctype/quality_inspection/quality_inspection.js b/erpnext/buying/doctype/quality_inspection/quality_inspection.js
similarity index 100%
rename from buying/doctype/quality_inspection/quality_inspection.js
rename to erpnext/buying/doctype/quality_inspection/quality_inspection.js
diff --git a/buying/doctype/quality_inspection/quality_inspection.py b/erpnext/buying/doctype/quality_inspection/quality_inspection.py
similarity index 100%
rename from buying/doctype/quality_inspection/quality_inspection.py
rename to erpnext/buying/doctype/quality_inspection/quality_inspection.py
diff --git a/buying/doctype/quality_inspection/quality_inspection.txt b/erpnext/buying/doctype/quality_inspection/quality_inspection.txt
similarity index 100%
rename from buying/doctype/quality_inspection/quality_inspection.txt
rename to erpnext/buying/doctype/quality_inspection/quality_inspection.txt
diff --git a/buying/doctype/quality_inspection_reading/README.md b/erpnext/buying/doctype/quality_inspection_reading/README.md
similarity index 100%
rename from buying/doctype/quality_inspection_reading/README.md
rename to erpnext/buying/doctype/quality_inspection_reading/README.md
diff --git a/buying/doctype/quality_inspection_reading/__init__.py b/erpnext/buying/doctype/quality_inspection_reading/__init__.py
similarity index 100%
rename from buying/doctype/quality_inspection_reading/__init__.py
rename to erpnext/buying/doctype/quality_inspection_reading/__init__.py
diff --git a/buying/doctype/quality_inspection_reading/quality_inspection_reading.py b/erpnext/buying/doctype/quality_inspection_reading/quality_inspection_reading.py
similarity index 100%
rename from buying/doctype/quality_inspection_reading/quality_inspection_reading.py
rename to erpnext/buying/doctype/quality_inspection_reading/quality_inspection_reading.py
diff --git a/buying/doctype/quality_inspection_reading/quality_inspection_reading.txt b/erpnext/buying/doctype/quality_inspection_reading/quality_inspection_reading.txt
similarity index 100%
rename from buying/doctype/quality_inspection_reading/quality_inspection_reading.txt
rename to erpnext/buying/doctype/quality_inspection_reading/quality_inspection_reading.txt
diff --git a/buying/doctype/supplier/README.md b/erpnext/buying/doctype/supplier/README.md
similarity index 100%
rename from buying/doctype/supplier/README.md
rename to erpnext/buying/doctype/supplier/README.md
diff --git a/buying/doctype/supplier/__init__.py b/erpnext/buying/doctype/supplier/__init__.py
similarity index 100%
rename from buying/doctype/supplier/__init__.py
rename to erpnext/buying/doctype/supplier/__init__.py
diff --git a/buying/doctype/supplier/supplier.js b/erpnext/buying/doctype/supplier/supplier.js
similarity index 95%
rename from buying/doctype/supplier/supplier.js
rename to erpnext/buying/doctype/supplier/supplier.js
index 0618616..e1780ab 100644
--- a/buying/doctype/supplier/supplier.js
+++ b/erpnext/buying/doctype/supplier/supplier.js
@@ -1,7 +1,7 @@
// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
-wn.require('app/setup/doctype/contact_control/contact_control.js');
+{% include 'setup/doctype/contact_control/contact_control.js' %};
cur_frm.cscript.refresh = function(doc,dt,dn) {
cur_frm.cscript.make_dashboard(doc);
@@ -38,7 +38,7 @@
return wn.call({
type: "GET",
- method:"buying.doctype.supplier.supplier.get_dashboard_info",
+ method: "erpnext.buying.doctype.supplier.supplier.get_dashboard_info",
args: {
supplier: cur_frm.doc.name
},
diff --git a/buying/doctype/supplier/supplier.py b/erpnext/buying/doctype/supplier/supplier.py
similarity index 97%
rename from buying/doctype/supplier/supplier.py
rename to erpnext/buying/doctype/supplier/supplier.py
index 2435d0c..00eaf90 100644
--- a/buying/doctype/supplier/supplier.py
+++ b/erpnext/buying/doctype/supplier/supplier.py
@@ -10,7 +10,7 @@
from webnotes.model.doc import make_autoname
-from utilities.transaction_base import TransactionBase
+from erpnext.utilities.transaction_base import TransactionBase
class DocType(TransactionBase):
def __init__(self, doc, doclist=[]):
@@ -160,7 +160,7 @@
self.delete_supplier_account()
def before_rename(self, olddn, newdn, merge=False):
- from accounts.utils import rename_account_for
+ from erpnext.accounts.utils import rename_account_for
rename_account_for("Supplier", olddn, newdn, merge)
def after_rename(self, olddn, newdn, merge=False):
diff --git a/buying/doctype/supplier/supplier.txt b/erpnext/buying/doctype/supplier/supplier.txt
similarity index 100%
rename from buying/doctype/supplier/supplier.txt
rename to erpnext/buying/doctype/supplier/supplier.txt
diff --git a/buying/doctype/supplier/test_supplier.py b/erpnext/buying/doctype/supplier/test_supplier.py
similarity index 100%
rename from buying/doctype/supplier/test_supplier.py
rename to erpnext/buying/doctype/supplier/test_supplier.py
diff --git a/buying/doctype/supplier_quotation/README.md b/erpnext/buying/doctype/supplier_quotation/README.md
similarity index 100%
rename from buying/doctype/supplier_quotation/README.md
rename to erpnext/buying/doctype/supplier_quotation/README.md
diff --git a/buying/doctype/supplier_quotation/__init__.py b/erpnext/buying/doctype/supplier_quotation/__init__.py
similarity index 100%
rename from buying/doctype/supplier_quotation/__init__.py
rename to erpnext/buying/doctype/supplier_quotation/__init__.py
diff --git a/buying/doctype/supplier_quotation/supplier_quotation.js b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js
similarity index 81%
rename from buying/doctype/supplier_quotation/supplier_quotation.js
rename to erpnext/buying/doctype/supplier_quotation/supplier_quotation.js
index 92bf7a1..bc56abd 100644
--- a/buying/doctype/supplier_quotation/supplier_quotation.js
+++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js
@@ -7,9 +7,9 @@
cur_frm.cscript.other_fname = "purchase_tax_details";
// attach required files
-wn.require('app/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.js');
-wn.require('app/buying/doctype/purchase_common/purchase_common.js');
-wn.require('app/accounts/doctype/sales_invoice/pos.js');
+{% include 'buying/doctype/purchase_common/purchase_common.js' %};
+{% include 'accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.js' %}
+{% include 'accounts/doctype/sales_invoice/pos.js' %}
erpnext.buying.SupplierQuotationController = erpnext.buying.BuyingController.extend({
refresh: function() {
@@ -22,7 +22,7 @@
cur_frm.add_custom_button(wn._('From Material Request'),
function() {
wn.model.map_current_doc({
- method: "stock.doctype.material_request.material_request.make_supplier_quotation",
+ method: "erpnext.stock.doctype.material_request.material_request.make_supplier_quotation",
source_doctype: "Material Request",
get_query_filters: {
material_request_type: "Purchase",
@@ -38,7 +38,7 @@
make_purchase_order: function() {
wn.model.open_mapped_doc({
- method: "buying.doctype.supplier_quotation.supplier_quotation.make_purchase_order",
+ method: "erpnext.buying.doctype.supplier_quotation.supplier_quotation.make_purchase_order",
source_name: cur_frm.doc.name
})
}
diff --git a/buying/doctype/supplier_quotation/supplier_quotation.py b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py
similarity index 92%
rename from buying/doctype/supplier_quotation/supplier_quotation.py
rename to erpnext/buying/doctype/supplier_quotation/supplier_quotation.py
index dc564b9..b4562e0 100644
--- a/buying/doctype/supplier_quotation/supplier_quotation.py
+++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py
@@ -5,7 +5,7 @@
import webnotes
from webnotes.model.code import get_obj
-from controllers.buying_controller import BuyingController
+from erpnext.controllers.buying_controller import BuyingController
class DocType(BuyingController):
def __init__(self, doc, doclist=None):
self.doc, self.doclist = doc, doclist or []
@@ -17,8 +17,8 @@
if not self.doc.status:
self.doc.status = "Draft"
- import utilities
- utilities.validate_status(self.doc.status, ["Draft", "Submitted", "Stopped",
+ from erpnext.utilities import validate_status
+ validate_status(self.doc.status, ["Draft", "Submitted", "Stopped",
"Cancelled"])
self.validate_common()
diff --git a/buying/doctype/supplier_quotation/supplier_quotation.txt b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.txt
similarity index 100%
rename from buying/doctype/supplier_quotation/supplier_quotation.txt
rename to erpnext/buying/doctype/supplier_quotation/supplier_quotation.txt
diff --git a/buying/doctype/supplier_quotation/test_supplier_quotation.py b/erpnext/buying/doctype/supplier_quotation/test_supplier_quotation.py
similarity index 94%
rename from buying/doctype/supplier_quotation/test_supplier_quotation.py
rename to erpnext/buying/doctype/supplier_quotation/test_supplier_quotation.py
index 82ad42a..82444ea 100644
--- a/buying/doctype/supplier_quotation/test_supplier_quotation.py
+++ b/erpnext/buying/doctype/supplier_quotation/test_supplier_quotation.py
@@ -9,7 +9,7 @@
class TestPurchaseOrder(unittest.TestCase):
def test_make_purchase_order(self):
- from buying.doctype.supplier_quotation.supplier_quotation import make_purchase_order
+ from erpnext.buying.doctype.supplier_quotation.supplier_quotation import make_purchase_order
sq = webnotes.bean(copy=test_records[0]).insert()
diff --git a/buying/doctype/supplier_quotation_item/README.md b/erpnext/buying/doctype/supplier_quotation_item/README.md
similarity index 100%
rename from buying/doctype/supplier_quotation_item/README.md
rename to erpnext/buying/doctype/supplier_quotation_item/README.md
diff --git a/buying/doctype/supplier_quotation_item/__init__.py b/erpnext/buying/doctype/supplier_quotation_item/__init__.py
similarity index 100%
rename from buying/doctype/supplier_quotation_item/__init__.py
rename to erpnext/buying/doctype/supplier_quotation_item/__init__.py
diff --git a/buying/doctype/supplier_quotation_item/supplier_quotation_item.py b/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.py
similarity index 100%
rename from buying/doctype/supplier_quotation_item/supplier_quotation_item.py
rename to erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.py
diff --git a/buying/doctype/supplier_quotation_item/supplier_quotation_item.txt b/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.txt
similarity index 100%
rename from buying/doctype/supplier_quotation_item/supplier_quotation_item.txt
rename to erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.txt
diff --git a/buying/page/__init__.py b/erpnext/buying/page/__init__.py
similarity index 100%
rename from buying/page/__init__.py
rename to erpnext/buying/page/__init__.py
diff --git a/buying/page/buying_home/__init__.py b/erpnext/buying/page/buying_home/__init__.py
similarity index 100%
rename from buying/page/buying_home/__init__.py
rename to erpnext/buying/page/buying_home/__init__.py
diff --git a/buying/page/buying_home/buying_home.js b/erpnext/buying/page/buying_home/buying_home.js
similarity index 100%
rename from buying/page/buying_home/buying_home.js
rename to erpnext/buying/page/buying_home/buying_home.js
diff --git a/buying/page/buying_home/buying_home.txt b/erpnext/buying/page/buying_home/buying_home.txt
similarity index 100%
rename from buying/page/buying_home/buying_home.txt
rename to erpnext/buying/page/buying_home/buying_home.txt
diff --git a/buying/page/purchase_analytics/README.md b/erpnext/buying/page/purchase_analytics/README.md
similarity index 100%
rename from buying/page/purchase_analytics/README.md
rename to erpnext/buying/page/purchase_analytics/README.md
diff --git a/buying/page/purchase_analytics/__init__.py b/erpnext/buying/page/purchase_analytics/__init__.py
similarity index 100%
rename from buying/page/purchase_analytics/__init__.py
rename to erpnext/buying/page/purchase_analytics/__init__.py
diff --git a/buying/page/purchase_analytics/purchase_analytics.js b/erpnext/buying/page/purchase_analytics/purchase_analytics.js
similarity index 100%
rename from buying/page/purchase_analytics/purchase_analytics.js
rename to erpnext/buying/page/purchase_analytics/purchase_analytics.js
diff --git a/buying/page/purchase_analytics/purchase_analytics.txt b/erpnext/buying/page/purchase_analytics/purchase_analytics.txt
similarity index 100%
rename from buying/page/purchase_analytics/purchase_analytics.txt
rename to erpnext/buying/page/purchase_analytics/purchase_analytics.txt
diff --git a/buying/report/__init__.py b/erpnext/buying/report/__init__.py
similarity index 100%
rename from buying/report/__init__.py
rename to erpnext/buying/report/__init__.py
diff --git a/buying/report/item_wise_purchase_history/__init__.py b/erpnext/buying/report/item_wise_purchase_history/__init__.py
similarity index 100%
rename from buying/report/item_wise_purchase_history/__init__.py
rename to erpnext/buying/report/item_wise_purchase_history/__init__.py
diff --git a/buying/report/item_wise_purchase_history/item_wise_purchase_history.txt b/erpnext/buying/report/item_wise_purchase_history/item_wise_purchase_history.txt
similarity index 100%
rename from buying/report/item_wise_purchase_history/item_wise_purchase_history.txt
rename to erpnext/buying/report/item_wise_purchase_history/item_wise_purchase_history.txt
diff --git a/buying/report/purchase_order_trends/__init__.py b/erpnext/buying/report/purchase_order_trends/__init__.py
similarity index 100%
rename from buying/report/purchase_order_trends/__init__.py
rename to erpnext/buying/report/purchase_order_trends/__init__.py
diff --git a/buying/report/purchase_order_trends/purchase_order_trends.js b/erpnext/buying/report/purchase_order_trends/purchase_order_trends.js
similarity index 77%
rename from buying/report/purchase_order_trends/purchase_order_trends.js
rename to erpnext/buying/report/purchase_order_trends/purchase_order_trends.js
index 2c7ffc0..d5371d3 100644
--- a/buying/report/purchase_order_trends/purchase_order_trends.js
+++ b/erpnext/buying/report/purchase_order_trends/purchase_order_trends.js
@@ -1,7 +1,7 @@
// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
-wn.require("app/js/purchase_trends_filters.js");
+wn.require("assets/erpnext/js/purchase_trends_filters.js");
wn.query_reports["Purchase Order Trends"] = {
filters: get_filters()
diff --git a/buying/report/purchase_order_trends/purchase_order_trends.py b/erpnext/buying/report/purchase_order_trends/purchase_order_trends.py
similarity index 86%
rename from buying/report/purchase_order_trends/purchase_order_trends.py
rename to erpnext/buying/report/purchase_order_trends/purchase_order_trends.py
index df8d7cf..1ecdab2 100644
--- a/buying/report/purchase_order_trends/purchase_order_trends.py
+++ b/erpnext/buying/report/purchase_order_trends/purchase_order_trends.py
@@ -3,7 +3,7 @@
from __future__ import unicode_literals
import webnotes
-from controllers.trends import get_columns,get_data
+from erpnext.controllers.trends import get_columns,get_data
def execute(filters=None):
if not filters: filters ={}
diff --git a/buying/report/purchase_order_trends/purchase_order_trends.txt b/erpnext/buying/report/purchase_order_trends/purchase_order_trends.txt
similarity index 100%
rename from buying/report/purchase_order_trends/purchase_order_trends.txt
rename to erpnext/buying/report/purchase_order_trends/purchase_order_trends.txt
diff --git a/buying/report/requested_items_to_be_ordered/__init__.py b/erpnext/buying/report/requested_items_to_be_ordered/__init__.py
similarity index 100%
rename from buying/report/requested_items_to_be_ordered/__init__.py
rename to erpnext/buying/report/requested_items_to_be_ordered/__init__.py
diff --git a/buying/report/requested_items_to_be_ordered/requested_items_to_be_ordered.txt b/erpnext/buying/report/requested_items_to_be_ordered/requested_items_to_be_ordered.txt
similarity index 100%
rename from buying/report/requested_items_to_be_ordered/requested_items_to_be_ordered.txt
rename to erpnext/buying/report/requested_items_to_be_ordered/requested_items_to_be_ordered.txt
diff --git a/buying/report/supplier_addresses_and_contacts/__init__.py b/erpnext/buying/report/supplier_addresses_and_contacts/__init__.py
similarity index 100%
rename from buying/report/supplier_addresses_and_contacts/__init__.py
rename to erpnext/buying/report/supplier_addresses_and_contacts/__init__.py
diff --git a/buying/report/supplier_addresses_and_contacts/supplier_addresses_and_contacts.txt b/erpnext/buying/report/supplier_addresses_and_contacts/supplier_addresses_and_contacts.txt
similarity index 100%
rename from buying/report/supplier_addresses_and_contacts/supplier_addresses_and_contacts.txt
rename to erpnext/buying/report/supplier_addresses_and_contacts/supplier_addresses_and_contacts.txt
diff --git a/buying/utils.py b/erpnext/buying/utils.py
similarity index 97%
rename from buying/utils.py
rename to erpnext/buying/utils.py
index 0d9c8fa..8a4ae3f 100644
--- a/buying/utils.py
+++ b/erpnext/buying/utils.py
@@ -83,7 +83,7 @@
return out
def _get_price_list_rate(args, item_bean, meta):
- from utilities.transaction_base import validate_currency
+ from erpnext.utilities.transaction_base import validate_currency
item = item_bean.doc
out = webnotes._dict()
@@ -117,7 +117,7 @@
return item_supplier and item_supplier[0].supplier_part_no or None
def _validate_item_details(args, item):
- from utilities.transaction_base import validate_item_fetch
+ from erpnext.utilities.transaction_base import validate_item_fetch
validate_item_fetch(args, item)
# validate if purchase item or subcontracted item
diff --git a/controllers/__init__.py b/erpnext/controllers/__init__.py
similarity index 100%
rename from controllers/__init__.py
rename to erpnext/controllers/__init__.py
diff --git a/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py
similarity index 98%
rename from controllers/accounts_controller.py
rename to erpnext/controllers/accounts_controller.py
index 5388ee1..d48a7a6 100644
--- a/controllers/accounts_controller.py
+++ b/erpnext/controllers/accounts_controller.py
@@ -6,9 +6,9 @@
from webnotes import _, msgprint
from webnotes.utils import flt, cint, today, cstr
from webnotes.model.code import get_obj
-from setup.utils import get_company_currency
-from accounts.utils import get_fiscal_year, validate_fiscal_year
-from utilities.transaction_base import TransactionBase, validate_conversion_rate
+from erpnext.setup.utils import get_company_currency
+from erpnext.accounts.utils import get_fiscal_year, validate_fiscal_year
+from erpnext.utilities.transaction_base import TransactionBase, validate_conversion_rate
import json
class AccountsController(TransactionBase):
@@ -403,7 +403,7 @@
raise_exception=1)
def get_company_default(self, fieldname):
- from accounts.utils import get_company_default
+ from erpnext.accounts.utils import get_company_default
return get_company_default(self.doc.company, fieldname)
def get_stock_items(self):
diff --git a/controllers/buying_controller.py b/erpnext/controllers/buying_controller.py
similarity index 96%
rename from controllers/buying_controller.py
rename to erpnext/controllers/buying_controller.py
index 35b9d25..6382e0d 100644
--- a/controllers/buying_controller.py
+++ b/erpnext/controllers/buying_controller.py
@@ -6,10 +6,10 @@
from webnotes import _, msgprint
from webnotes.utils import flt, _round
-from buying.utils import get_item_details
-from setup.utils import get_company_currency
+from erpnext.buying.utils import get_item_details
+from erpnext.setup.utils import get_company_currency
-from controllers.stock_controller import StockController
+from erpnext.controllers.stock_controller import StockController
class BuyingController(StockController):
def onload_post_render(self):
@@ -50,7 +50,7 @@
break
def validate_warehouse(self):
- from stock.utils import validate_warehouse_user, validate_warehouse_company
+ from erpnext.stock.utils import validate_warehouse_user, validate_warehouse_company
warehouses = list(set([d.warehouse for d in
self.doclist.get({"doctype": self.tname}) if d.warehouse]))
@@ -69,8 +69,7 @@
self.doclist.get({"parentfield": "purchase_tax_details"})
if d.category in ["Valuation", "Valuation and Total"]]
if tax_for_valuation:
- webnotes.msgprint(_("""Tax Category can not be 'Valuation' or 'Valuation and Total'
- as all items are non-stock items"""), raise_exception=1)
+ webnotes.msgprint(_("""Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items"""), raise_exception=1)
def set_total_in_words(self):
from webnotes.utils import money_in_words
diff --git a/controllers/js/contact_address_common.js b/erpnext/controllers/js/contact_address_common.js
similarity index 100%
rename from controllers/js/contact_address_common.js
rename to erpnext/controllers/js/contact_address_common.js
diff --git a/controllers/queries.py b/erpnext/controllers/queries.py
similarity index 99%
rename from controllers/queries.py
rename to erpnext/controllers/queries.py
index 9d64d16..535ca3b 100644
--- a/controllers/queries.py
+++ b/erpnext/controllers/queries.py
@@ -186,7 +186,7 @@
}, { "start": start, "page_len": page_len, "txt": ("%%%s%%" % txt) })
def get_batch_no(doctype, txt, searchfield, start, page_len, filters):
- from controllers.queries import get_match_cond
+ from erpnext.controllers.queries import get_match_cond
if filters.has_key('warehouse'):
return webnotes.conn.sql("""select batch_no from `tabStock Ledger Entry` sle
diff --git a/controllers/selling_controller.py b/erpnext/controllers/selling_controller.py
similarity index 98%
rename from controllers/selling_controller.py
rename to erpnext/controllers/selling_controller.py
index 67c1462..f950f28 100644
--- a/controllers/selling_controller.py
+++ b/erpnext/controllers/selling_controller.py
@@ -4,11 +4,11 @@
from __future__ import unicode_literals
import webnotes
from webnotes.utils import cint, flt, comma_or, _round, cstr
-from setup.utils import get_company_currency
-from selling.utils import get_item_details
+from erpnext.setup.utils import get_company_currency
+from erpnext.selling.utils import get_item_details
from webnotes import msgprint, _
-from controllers.stock_controller import StockController
+from erpnext.controllers.stock_controller import StockController
class SellingController(StockController):
def onload_post_render(self):
diff --git a/controllers/status_updater.py b/erpnext/controllers/status_updater.py
similarity index 100%
rename from controllers/status_updater.py
rename to erpnext/controllers/status_updater.py
diff --git a/controllers/stock_controller.py b/erpnext/controllers/stock_controller.py
similarity index 95%
rename from controllers/stock_controller.py
rename to erpnext/controllers/stock_controller.py
index 8a4a402..eff6491 100644
--- a/controllers/stock_controller.py
+++ b/erpnext/controllers/stock_controller.py
@@ -7,8 +7,8 @@
from webnotes import msgprint, _
import webnotes.defaults
-from controllers.accounts_controller import AccountsController
-from accounts.general_ledger import make_gl_entries, delete_gl_entries
+from erpnext.controllers.accounts_controller import AccountsController
+from erpnext.accounts.general_ledger import make_gl_entries, delete_gl_entries
class StockController(AccountsController):
def make_gl_entries(self, update_gl_entries_after=True):
@@ -27,7 +27,7 @@
def get_gl_entries(self, warehouse_account=None, default_expense_account=None,
default_cost_center=None):
- from accounts.general_ledger import process_gl_map
+ from erpnext.accounts.general_ledger import process_gl_map
if not warehouse_account:
warehouse_account = self.get_warehouse_account()
@@ -160,7 +160,7 @@
where voucher_type=%s and voucher_no=%s""", (voucher_type, voucher_no))
def make_adjustment_entry(self, expected_gle, voucher_obj):
- from accounts.utils import get_stock_and_account_difference
+ from erpnext.accounts.utils import get_stock_and_account_difference
account_list = [d.account for d in expected_gle]
acc_diff = get_stock_and_account_difference(account_list, expected_gle[0].posting_date)
@@ -190,7 +190,7 @@
])
if gl_entries:
- from accounts.general_ledger import make_gl_entries
+ from erpnext.accounts.general_ledger import make_gl_entries
make_gl_entries(gl_entries)
def check_expense_account(self, item):
@@ -226,7 +226,7 @@
return sl_dict
def make_sl_entries(self, sl_entries, is_amended=None):
- from stock.stock_ledger import make_sl_entries
+ from erpnext.stock.stock_ledger import make_sl_entries
make_sl_entries(sl_entries, is_amended)
def get_stock_ledger_entries(self, item_list=None, warehouse_list=None):
diff --git a/controllers/trends.py b/erpnext/controllers/trends.py
similarity index 100%
rename from controllers/trends.py
rename to erpnext/controllers/trends.py
diff --git a/erpnext/desktop.json b/erpnext/desktop.json
new file mode 100644
index 0000000..67c4f99
--- /dev/null
+++ b/erpnext/desktop.json
@@ -0,0 +1,72 @@
+{
+ "Accounts": {
+ "color": "#3498db",
+ "icon": "icon-money",
+ "link": "accounts-home",
+ "type": "module"
+ },
+ "Activity": {
+ "color": "#e67e22",
+ "icon": "icon-play",
+ "label": "Activity",
+ "link": "activity",
+ "type": "page"
+ },
+ "Buying": {
+ "color": "#c0392b",
+ "icon": "icon-shopping-cart",
+ "link": "buying-home",
+ "type": "module"
+ },
+ "HR": {
+ "color": "#2ecc71",
+ "icon": "icon-group",
+ "label": "Human Resources",
+ "link": "hr-home",
+ "type": "module"
+ },
+ "Manufacturing": {
+ "color": "#7f8c8d",
+ "icon": "icon-cogs",
+ "link": "manufacturing-home",
+ "type": "module"
+ },
+ "Notes": {
+ "color": "#95a5a6",
+ "doctype": "Note",
+ "icon": "icon-file-alt",
+ "label": "Notes",
+ "link": "List/Note",
+ "type": "list"
+ },
+ "Projects": {
+ "color": "#8e44ad",
+ "icon": "icon-puzzle-piece",
+ "link": "projects-home",
+ "type": "module"
+ },
+ "Selling": {
+ "color": "#1abc9c",
+ "icon": "icon-tag",
+ "link": "selling-home",
+ "type": "module"
+ },
+ "Setup": {
+ "color": "#bdc3c7",
+ "icon": "icon-wrench",
+ "link": "Setup",
+ "type": "setup"
+ },
+ "Stock": {
+ "color": "#f39c12",
+ "icon": "icon-truck",
+ "link": "stock-home",
+ "type": "module"
+ },
+ "Support": {
+ "color": "#2c3e50",
+ "icon": "icon-phone",
+ "link": "support-home",
+ "type": "module"
+ }
+}
\ No newline at end of file
diff --git a/home/__init__.py b/erpnext/home/__init__.py
similarity index 88%
rename from home/__init__.py
rename to erpnext/home/__init__.py
index 9667efd..e092a71 100644
--- a/home/__init__.py
+++ b/erpnext/home/__init__.py
@@ -29,8 +29,8 @@
'Sales Order': ['[%(status)s] To %(customer_name)s worth %(currency)s %(grand_total_export)s', '#4169E1'],
# Purchase
- 'Supplier': ['%(supplier_name)s, %(supplier_type)s', '#6495ED'],
- 'Purchase Order': ['[%(status)s] %(name)s To %(supplier_name)s for %(currency)s %(grand_total_import)s', '#4169E1'],
+ 'Supplier': ['%(supplier_name)s, %(supplier_type)s', '#6495ED'],
+ 'Purchase Order': ['[%(status)s] %(name)s To %(supplier_name)s for %(currency)s %(grand_total_import)s', '#4169E1'],
# Stock
'Delivery Note': ['[%(status)s] To %(customer_name)s', '#4169E1'],
@@ -89,3 +89,9 @@
subject, color = feed_dict.get(doc.doctype, [None, None])
if subject:
make_feed('', doc.doctype, doc.name, doc.owner, subject % doc.fields, color)
+
+def make_comment_feed(bean, method):
+ """add comment to feed"""
+ doc = bean.doc
+ make_feed('Comment', doc.comment_doctype, doc.comment_docname, doc.comment_by,
+ '<i>"' + doc.comment + '"</i>', '#6B24B3')
\ No newline at end of file
diff --git a/home/doctype/__init__.py b/erpnext/home/doctype/__init__.py
similarity index 100%
rename from home/doctype/__init__.py
rename to erpnext/home/doctype/__init__.py
diff --git a/home/doctype/feed/README.md b/erpnext/home/doctype/feed/README.md
similarity index 100%
rename from home/doctype/feed/README.md
rename to erpnext/home/doctype/feed/README.md
diff --git a/home/doctype/feed/__init__.py b/erpnext/home/doctype/feed/__init__.py
similarity index 100%
rename from home/doctype/feed/__init__.py
rename to erpnext/home/doctype/feed/__init__.py
diff --git a/home/doctype/feed/feed.py b/erpnext/home/doctype/feed/feed.py
similarity index 100%
rename from home/doctype/feed/feed.py
rename to erpnext/home/doctype/feed/feed.py
diff --git a/home/doctype/feed/feed.txt b/erpnext/home/doctype/feed/feed.txt
similarity index 100%
rename from home/doctype/feed/feed.txt
rename to erpnext/home/doctype/feed/feed.txt
diff --git a/home/page/__init__.py b/erpnext/home/page/__init__.py
similarity index 100%
rename from home/page/__init__.py
rename to erpnext/home/page/__init__.py
diff --git a/home/page/activity/README.md b/erpnext/home/page/activity/README.md
similarity index 100%
rename from home/page/activity/README.md
rename to erpnext/home/page/activity/README.md
diff --git a/home/page/activity/__init__.py b/erpnext/home/page/activity/__init__.py
similarity index 100%
rename from home/page/activity/__init__.py
rename to erpnext/home/page/activity/__init__.py
diff --git a/home/page/activity/activity.css b/erpnext/home/page/activity/activity.css
similarity index 100%
rename from home/page/activity/activity.css
rename to erpnext/home/page/activity/activity.css
diff --git a/home/page/activity/activity.js b/erpnext/home/page/activity/activity.js
similarity index 97%
rename from home/page/activity/activity.js
rename to erpnext/home/page/activity/activity.js
index c4b0cf3..91b8184 100644
--- a/home/page/activity/activity.js
+++ b/erpnext/home/page/activity/activity.js
@@ -12,7 +12,7 @@
var list = new wn.ui.Listing({
hide_refresh: true,
appframe: wrapper.appframe,
- method: 'home.page.activity.activity.get_feed',
+ method: 'erpnext.home.page.activity.activity.get_feed',
parent: $(wrapper).find(".layout-main"),
render_row: function(row, data) {
new erpnext.ActivityFeed(row, data);
diff --git a/home/page/activity/activity.py b/erpnext/home/page/activity/activity.py
similarity index 100%
rename from home/page/activity/activity.py
rename to erpnext/home/page/activity/activity.py
diff --git a/home/page/activity/activity.txt b/erpnext/home/page/activity/activity.txt
similarity index 100%
rename from home/page/activity/activity.txt
rename to erpnext/home/page/activity/activity.txt
diff --git a/home/page/latest_updates/README.md b/erpnext/home/page/latest_updates/README.md
similarity index 100%
rename from home/page/latest_updates/README.md
rename to erpnext/home/page/latest_updates/README.md
diff --git a/home/page/latest_updates/__init__.py b/erpnext/home/page/latest_updates/__init__.py
similarity index 100%
rename from home/page/latest_updates/__init__.py
rename to erpnext/home/page/latest_updates/__init__.py
diff --git a/home/page/latest_updates/latest_updates.js b/erpnext/home/page/latest_updates/latest_updates.js
similarity index 96%
rename from home/page/latest_updates/latest_updates.js
rename to erpnext/home/page/latest_updates/latest_updates.js
index 80ba85e..06c34ef 100644
--- a/home/page/latest_updates/latest_updates.js
+++ b/erpnext/home/page/latest_updates/latest_updates.js
@@ -13,7 +13,7 @@
<div class="progress-bar" style="width: 100%;"></div></div>')
return wn.call({
- method:"home.page.latest_updates.latest_updates.get",
+ method: "erpnext.home.page.latest_updates.latest_updates.get",
callback: function(r) {
parent.empty();
$("<p class='help'>"+wn._("Report issues at")+
diff --git a/home/page/latest_updates/latest_updates.py b/erpnext/home/page/latest_updates/latest_updates.py
similarity index 100%
rename from home/page/latest_updates/latest_updates.py
rename to erpnext/home/page/latest_updates/latest_updates.py
diff --git a/home/page/latest_updates/latest_updates.txt b/erpnext/home/page/latest_updates/latest_updates.txt
similarity index 100%
rename from home/page/latest_updates/latest_updates.txt
rename to erpnext/home/page/latest_updates/latest_updates.txt
diff --git a/erpnext/hooks.txt b/erpnext/hooks.txt
new file mode 100644
index 0000000..af11df9
--- /dev/null
+++ b/erpnext/hooks.txt
@@ -0,0 +1,64 @@
+app_name ERPNext
+app_publisher Web Notes Technologies
+app_description Open Source Enterprise Resource Planning for Small and Midsized Organizations
+app_icon icon-th
+app_color #e74c3c
+app_version 4.0.0-wip
+
+app_include_js assets/js/erpnext.min.js
+app_include_css assets/css/erpnext.css
+web_include_js assets/js/erpnext-web.min.js
+
+after_install erpnext.setup.install.after_install
+
+boot_session erpnext.startup.boot.boot_session
+notification_config erpnext.startup.notifications.get_notification_config
+
+dump_report_map erpnext.startup.report_data_map.data_map
+update_website_context erpnext.startup.webutils.update_website_context
+
+mail_footer erpnext.startup.mail_footer
+
+on_session_creation erpnext.startup.event_handlers.on_session_creation
+on_logout erpnext.startup.event_handlers.on_logut
+
+# Bean Events
+# -----------
+
+bean_event *:on_update:erpnext.home.update_feed
+bean_event *:on_submit:erpnext.home.update_feed
+bean_event Comment:on_update:erpnext.home.make_comment_feed
+
+bean_event *:on_update:webnotes.core.doctype.notification_count.notification_count.clear_doctype_notifications
+bean_event *:on_cancel:webnotes.core.doctype.notification_count.notification_count.clear_doctype_notifications
+bean_event *:on_trash:webnotes.core.doctype.notification_count.notification_count.clear_doctype_notifications
+
+bean_event Stock Entry:on_submit:erpnext.stock.doctype.material_request.material_request.update_completed_qty
+bean_event Stock Entry:on_cancel:erpnext.stock.doctype.material_request.material_request.update_completed_qty
+
+standard_queries Warehouse:erpnext.stock.utils.get_warehouse_list
+standard_queries Customer:erpnext.selling.utils.get_customer_list
+
+# Schedulers
+# ----------
+
+#### Frequently
+
+scheduler_event all:erpnext.support.doctype.support_ticket.get_support_mails.get_support_mails
+scheduler_event all:erpnext.hr.doctype.job_applicant.get_job_applications.get_job_applications
+scheduler_event all:erpnext.selling.doctype.lead.get_leads.get_leads
+scheduler_event all:webnotes.utils.email_lib.bulk.flush
+
+#### Daily
+
+scheduler_event daily:webnotes.core.doctype.event.event.send_event_digest
+scheduler_event daily:webnotes.core.doctype.notification_count.notification_count.delete_event_notification_count
+scheduler_event daily:webnotes.utils.email_lib.bulk.clear_outbox
+scheduler_event daily:erpnext.accounts.doctype.sales_invoice.sales_invoice.manage_recurring_invoices
+scheduler_event daily:erpnext.setup.doctype.backup_manager.backup_manager.take_backups_daily
+scheduler_event daily:erpnext.stock.utils.reorder_item
+scheduler_event daily:erpnext.setup.doctype.email_digest.email_digest.send
+
+#### Weekly
+
+scheduler_event weekly:erpnext.setup.doctype.backup_manager.backup_manager.take_backups_weekly
diff --git a/hr/README.md b/erpnext/hr/README.md
similarity index 100%
rename from hr/README.md
rename to erpnext/hr/README.md
diff --git a/hr/__init__.py b/erpnext/hr/__init__.py
similarity index 100%
rename from hr/__init__.py
rename to erpnext/hr/__init__.py
diff --git a/hr/doctype/__init__.py b/erpnext/hr/doctype/__init__.py
similarity index 100%
rename from hr/doctype/__init__.py
rename to erpnext/hr/doctype/__init__.py
diff --git a/hr/doctype/appraisal/README.md b/erpnext/hr/doctype/appraisal/README.md
similarity index 100%
rename from hr/doctype/appraisal/README.md
rename to erpnext/hr/doctype/appraisal/README.md
diff --git a/hr/doctype/appraisal/__init__.py b/erpnext/hr/doctype/appraisal/__init__.py
similarity index 100%
rename from hr/doctype/appraisal/__init__.py
rename to erpnext/hr/doctype/appraisal/__init__.py
diff --git a/hr/doctype/appraisal/appraisal.js b/erpnext/hr/doctype/appraisal/appraisal.js
similarity index 93%
rename from hr/doctype/appraisal/appraisal.js
rename to erpnext/hr/doctype/appraisal/appraisal.js
index fd2856c..29157d0 100644
--- a/hr/doctype/appraisal/appraisal.js
+++ b/erpnext/hr/doctype/appraisal/appraisal.js
@@ -25,7 +25,7 @@
cur_frm.cscript.kra_template = function(doc, dt, dn) {
wn.model.map_current_doc({
- method: "hr.doctype.appraisal.appraisal.fetch_appraisal_template",
+ method: "erpnext.hr.doctype.appraisal.appraisal.fetch_appraisal_template",
source_name: cur_frm.doc.kra_template,
});
}
@@ -71,5 +71,5 @@
}
cur_frm.fields_dict.employee.get_query = function(doc,cdt,cdn) {
- return{ query:"controllers.queries.employee_query" }
+ return{ query: "erpnext.controllers.queries.employee_query" }
}
\ No newline at end of file
diff --git a/hr/doctype/appraisal/appraisal.py b/erpnext/hr/doctype/appraisal/appraisal.py
similarity index 100%
rename from hr/doctype/appraisal/appraisal.py
rename to erpnext/hr/doctype/appraisal/appraisal.py
diff --git a/hr/doctype/appraisal/appraisal.txt b/erpnext/hr/doctype/appraisal/appraisal.txt
similarity index 100%
rename from hr/doctype/appraisal/appraisal.txt
rename to erpnext/hr/doctype/appraisal/appraisal.txt
diff --git a/hr/doctype/appraisal_goal/README.md b/erpnext/hr/doctype/appraisal_goal/README.md
similarity index 100%
rename from hr/doctype/appraisal_goal/README.md
rename to erpnext/hr/doctype/appraisal_goal/README.md
diff --git a/hr/doctype/appraisal_goal/__init__.py b/erpnext/hr/doctype/appraisal_goal/__init__.py
similarity index 100%
rename from hr/doctype/appraisal_goal/__init__.py
rename to erpnext/hr/doctype/appraisal_goal/__init__.py
diff --git a/hr/doctype/appraisal_goal/appraisal_goal.py b/erpnext/hr/doctype/appraisal_goal/appraisal_goal.py
similarity index 100%
rename from hr/doctype/appraisal_goal/appraisal_goal.py
rename to erpnext/hr/doctype/appraisal_goal/appraisal_goal.py
diff --git a/hr/doctype/appraisal_goal/appraisal_goal.txt b/erpnext/hr/doctype/appraisal_goal/appraisal_goal.txt
similarity index 100%
rename from hr/doctype/appraisal_goal/appraisal_goal.txt
rename to erpnext/hr/doctype/appraisal_goal/appraisal_goal.txt
diff --git a/hr/doctype/appraisal_template/README.md b/erpnext/hr/doctype/appraisal_template/README.md
similarity index 100%
rename from hr/doctype/appraisal_template/README.md
rename to erpnext/hr/doctype/appraisal_template/README.md
diff --git a/hr/doctype/appraisal_template/__init__.py b/erpnext/hr/doctype/appraisal_template/__init__.py
similarity index 100%
rename from hr/doctype/appraisal_template/__init__.py
rename to erpnext/hr/doctype/appraisal_template/__init__.py
diff --git a/hr/doctype/appraisal_template/appraisal_template.py b/erpnext/hr/doctype/appraisal_template/appraisal_template.py
similarity index 100%
rename from hr/doctype/appraisal_template/appraisal_template.py
rename to erpnext/hr/doctype/appraisal_template/appraisal_template.py
diff --git a/hr/doctype/appraisal_template/appraisal_template.txt b/erpnext/hr/doctype/appraisal_template/appraisal_template.txt
similarity index 100%
rename from hr/doctype/appraisal_template/appraisal_template.txt
rename to erpnext/hr/doctype/appraisal_template/appraisal_template.txt
diff --git a/hr/doctype/appraisal_template_goal/README.md b/erpnext/hr/doctype/appraisal_template_goal/README.md
similarity index 100%
rename from hr/doctype/appraisal_template_goal/README.md
rename to erpnext/hr/doctype/appraisal_template_goal/README.md
diff --git a/hr/doctype/appraisal_template_goal/__init__.py b/erpnext/hr/doctype/appraisal_template_goal/__init__.py
similarity index 100%
rename from hr/doctype/appraisal_template_goal/__init__.py
rename to erpnext/hr/doctype/appraisal_template_goal/__init__.py
diff --git a/hr/doctype/appraisal_template_goal/appraisal_template_goal.py b/erpnext/hr/doctype/appraisal_template_goal/appraisal_template_goal.py
similarity index 100%
rename from hr/doctype/appraisal_template_goal/appraisal_template_goal.py
rename to erpnext/hr/doctype/appraisal_template_goal/appraisal_template_goal.py
diff --git a/hr/doctype/appraisal_template_goal/appraisal_template_goal.txt b/erpnext/hr/doctype/appraisal_template_goal/appraisal_template_goal.txt
similarity index 100%
rename from hr/doctype/appraisal_template_goal/appraisal_template_goal.txt
rename to erpnext/hr/doctype/appraisal_template_goal/appraisal_template_goal.txt
diff --git a/hr/doctype/attendance/README.md b/erpnext/hr/doctype/attendance/README.md
similarity index 100%
rename from hr/doctype/attendance/README.md
rename to erpnext/hr/doctype/attendance/README.md
diff --git a/hr/doctype/attendance/__init__.py b/erpnext/hr/doctype/attendance/__init__.py
similarity index 100%
rename from hr/doctype/attendance/__init__.py
rename to erpnext/hr/doctype/attendance/__init__.py
diff --git a/hr/doctype/attendance/attendance.js b/erpnext/hr/doctype/attendance/attendance.js
similarity index 89%
rename from hr/doctype/attendance/attendance.js
rename to erpnext/hr/doctype/attendance/attendance.js
index be2b39d..ff7d7dd 100644
--- a/hr/doctype/attendance/attendance.js
+++ b/erpnext/hr/doctype/attendance/attendance.js
@@ -10,6 +10,6 @@
cur_frm.fields_dict.employee.get_query = function(doc,cdt,cdn) {
return{
- query:"controllers.queries.employee_query"
+ query: "erpnext.controllers.queries.employee_query"
}
}
diff --git a/hr/doctype/attendance/attendance.py b/erpnext/hr/doctype/attendance/attendance.py
similarity index 92%
rename from hr/doctype/attendance/attendance.py
rename to erpnext/hr/doctype/attendance/attendance.py
index 3abc1ae..10d4222 100644
--- a/hr/doctype/attendance/attendance.py
+++ b/erpnext/hr/doctype/attendance/attendance.py
@@ -33,7 +33,7 @@
raise_exception=1)
def validate_fiscal_year(self):
- from accounts.utils import validate_fiscal_year
+ from erpnext.accounts.utils import validate_fiscal_year
validate_fiscal_year(self.doc.att_date, self.doc.fiscal_year)
def validate_att_date(self):
@@ -48,8 +48,8 @@
_(" not active or does not exists in the system"), raise_exception=1)
def validate(self):
- import utilities
- utilities.validate_status(self.doc.status, ["Present", "Absent", "Half Day"])
+ from erpnext.utilities import validate_status
+ validate_status(self.doc.status, ["Present", "Absent", "Half Day"])
self.validate_fiscal_year()
self.validate_att_date()
self.validate_duplicate_record()
diff --git a/hr/doctype/attendance/attendance.txt b/erpnext/hr/doctype/attendance/attendance.txt
similarity index 100%
rename from hr/doctype/attendance/attendance.txt
rename to erpnext/hr/doctype/attendance/attendance.txt
diff --git a/hr/doctype/branch/README.md b/erpnext/hr/doctype/branch/README.md
similarity index 100%
rename from hr/doctype/branch/README.md
rename to erpnext/hr/doctype/branch/README.md
diff --git a/hr/doctype/branch/__init__.py b/erpnext/hr/doctype/branch/__init__.py
similarity index 100%
rename from hr/doctype/branch/__init__.py
rename to erpnext/hr/doctype/branch/__init__.py
diff --git a/hr/doctype/branch/branch.py b/erpnext/hr/doctype/branch/branch.py
similarity index 100%
rename from hr/doctype/branch/branch.py
rename to erpnext/hr/doctype/branch/branch.py
diff --git a/hr/doctype/branch/branch.txt b/erpnext/hr/doctype/branch/branch.txt
similarity index 100%
rename from hr/doctype/branch/branch.txt
rename to erpnext/hr/doctype/branch/branch.txt
diff --git a/hr/doctype/branch/test_branch.py b/erpnext/hr/doctype/branch/test_branch.py
similarity index 100%
rename from hr/doctype/branch/test_branch.py
rename to erpnext/hr/doctype/branch/test_branch.py
diff --git a/hr/doctype/deduction_type/README.md b/erpnext/hr/doctype/deduction_type/README.md
similarity index 100%
rename from hr/doctype/deduction_type/README.md
rename to erpnext/hr/doctype/deduction_type/README.md
diff --git a/hr/doctype/deduction_type/__init__.py b/erpnext/hr/doctype/deduction_type/__init__.py
similarity index 100%
rename from hr/doctype/deduction_type/__init__.py
rename to erpnext/hr/doctype/deduction_type/__init__.py
diff --git a/hr/doctype/deduction_type/deduction_type.py b/erpnext/hr/doctype/deduction_type/deduction_type.py
similarity index 100%
rename from hr/doctype/deduction_type/deduction_type.py
rename to erpnext/hr/doctype/deduction_type/deduction_type.py
diff --git a/hr/doctype/deduction_type/deduction_type.txt b/erpnext/hr/doctype/deduction_type/deduction_type.txt
similarity index 100%
rename from hr/doctype/deduction_type/deduction_type.txt
rename to erpnext/hr/doctype/deduction_type/deduction_type.txt
diff --git a/hr/doctype/deduction_type/test_deduction_type.py b/erpnext/hr/doctype/deduction_type/test_deduction_type.py
similarity index 100%
rename from hr/doctype/deduction_type/test_deduction_type.py
rename to erpnext/hr/doctype/deduction_type/test_deduction_type.py
diff --git a/hr/doctype/department/README.md b/erpnext/hr/doctype/department/README.md
similarity index 100%
rename from hr/doctype/department/README.md
rename to erpnext/hr/doctype/department/README.md
diff --git a/hr/doctype/department/__init__.py b/erpnext/hr/doctype/department/__init__.py
similarity index 100%
rename from hr/doctype/department/__init__.py
rename to erpnext/hr/doctype/department/__init__.py
diff --git a/hr/doctype/department/department.py b/erpnext/hr/doctype/department/department.py
similarity index 100%
rename from hr/doctype/department/department.py
rename to erpnext/hr/doctype/department/department.py
diff --git a/hr/doctype/department/department.txt b/erpnext/hr/doctype/department/department.txt
similarity index 100%
rename from hr/doctype/department/department.txt
rename to erpnext/hr/doctype/department/department.txt
diff --git a/hr/doctype/department/test_department.py b/erpnext/hr/doctype/department/test_department.py
similarity index 100%
rename from hr/doctype/department/test_department.py
rename to erpnext/hr/doctype/department/test_department.py
diff --git a/hr/doctype/designation/README.md b/erpnext/hr/doctype/designation/README.md
similarity index 100%
rename from hr/doctype/designation/README.md
rename to erpnext/hr/doctype/designation/README.md
diff --git a/hr/doctype/designation/__init__.py b/erpnext/hr/doctype/designation/__init__.py
similarity index 100%
rename from hr/doctype/designation/__init__.py
rename to erpnext/hr/doctype/designation/__init__.py
diff --git a/hr/doctype/designation/designation.py b/erpnext/hr/doctype/designation/designation.py
similarity index 100%
rename from hr/doctype/designation/designation.py
rename to erpnext/hr/doctype/designation/designation.py
diff --git a/hr/doctype/designation/designation.txt b/erpnext/hr/doctype/designation/designation.txt
similarity index 100%
rename from hr/doctype/designation/designation.txt
rename to erpnext/hr/doctype/designation/designation.txt
diff --git a/hr/doctype/designation/test_designation.py b/erpnext/hr/doctype/designation/test_designation.py
similarity index 100%
rename from hr/doctype/designation/test_designation.py
rename to erpnext/hr/doctype/designation/test_designation.py
diff --git a/hr/doctype/earning_type/README.md b/erpnext/hr/doctype/earning_type/README.md
similarity index 100%
rename from hr/doctype/earning_type/README.md
rename to erpnext/hr/doctype/earning_type/README.md
diff --git a/hr/doctype/earning_type/__init__.py b/erpnext/hr/doctype/earning_type/__init__.py
similarity index 100%
rename from hr/doctype/earning_type/__init__.py
rename to erpnext/hr/doctype/earning_type/__init__.py
diff --git a/hr/doctype/earning_type/earning_type.py b/erpnext/hr/doctype/earning_type/earning_type.py
similarity index 100%
rename from hr/doctype/earning_type/earning_type.py
rename to erpnext/hr/doctype/earning_type/earning_type.py
diff --git a/hr/doctype/earning_type/earning_type.txt b/erpnext/hr/doctype/earning_type/earning_type.txt
similarity index 100%
rename from hr/doctype/earning_type/earning_type.txt
rename to erpnext/hr/doctype/earning_type/earning_type.txt
diff --git a/hr/doctype/earning_type/test_earning_type.py b/erpnext/hr/doctype/earning_type/test_earning_type.py
similarity index 100%
rename from hr/doctype/earning_type/test_earning_type.py
rename to erpnext/hr/doctype/earning_type/test_earning_type.py
diff --git a/hr/doctype/employee/README.md b/erpnext/hr/doctype/employee/README.md
similarity index 100%
rename from hr/doctype/employee/README.md
rename to erpnext/hr/doctype/employee/README.md
diff --git a/hr/doctype/employee/__init__.py b/erpnext/hr/doctype/employee/__init__.py
similarity index 100%
rename from hr/doctype/employee/__init__.py
rename to erpnext/hr/doctype/employee/__init__.py
diff --git a/hr/doctype/employee/employee.js b/erpnext/hr/doctype/employee/employee.js
similarity index 95%
rename from hr/doctype/employee/employee.js
rename to erpnext/hr/doctype/employee/employee.js
index 08cadbd..1df6175 100644
--- a/hr/doctype/employee/employee.js
+++ b/erpnext/hr/doctype/employee/employee.js
@@ -7,7 +7,7 @@
this.frm.fields_dict.user_id.get_query = function(doc,cdt,cdn) {
return { query:"core.doctype.profile.profile.profile_query"} }
this.frm.fields_dict.reports_to.get_query = function(doc,cdt,cdn) {
- return{ query:"controllers.queries.employee_query"} }
+ return{ query: "erpnext.controllers.queries.employee_query"} }
},
onload: function() {
@@ -29,7 +29,7 @@
setup_leave_approver_select: function() {
var me = this;
return this.frm.call({
- method:"hr.utils.get_leave_approver_list",
+ method: "erpnext.hr.utils.get_leave_approver_list",
callback: function(r) {
var df = wn.meta.get_docfield("Employee Leave Approver", "leave_approver",
me.frm.doc.name);
diff --git a/hr/doctype/employee/employee.py b/erpnext/hr/doctype/employee/employee.py
similarity index 97%
rename from hr/doctype/employee/employee.py
rename to erpnext/hr/doctype/employee/employee.py
index 7129739..c185963 100644
--- a/hr/doctype/employee/employee.py
+++ b/erpnext/hr/doctype/employee/employee.py
@@ -27,8 +27,8 @@
self.doc.employee = self.doc.name
def validate(self):
- import utilities
- utilities.validate_status(self.doc.status, ["Active", "Left"])
+ from erpnext.utilities import validate_status
+ validate_status(self.doc.status, ["Active", "Left"])
self.doc.employee = self.doc.name
self.validate_date()
@@ -143,7 +143,7 @@
def validate_employee_leave_approver(self):
from webnotes.profile import Profile
- from hr.doctype.leave_application.leave_application import InvalidLeaveApproverError
+ from erpnext.hr.doctype.leave_application.leave_application import InvalidLeaveApproverError
for l in self.doclist.get({"parentfield": "employee_leave_approvers"}):
if "Leave Approver" not in Profile(l.leave_approver).get_roles():
diff --git a/hr/doctype/employee/employee.txt b/erpnext/hr/doctype/employee/employee.txt
similarity index 100%
rename from hr/doctype/employee/employee.txt
rename to erpnext/hr/doctype/employee/employee.txt
diff --git a/hr/doctype/employee/test_employee.py b/erpnext/hr/doctype/employee/test_employee.py
similarity index 100%
rename from hr/doctype/employee/test_employee.py
rename to erpnext/hr/doctype/employee/test_employee.py
diff --git a/hr/doctype/employee_education/README.md b/erpnext/hr/doctype/employee_education/README.md
similarity index 100%
rename from hr/doctype/employee_education/README.md
rename to erpnext/hr/doctype/employee_education/README.md
diff --git a/hr/doctype/employee_education/__init__.py b/erpnext/hr/doctype/employee_education/__init__.py
similarity index 100%
rename from hr/doctype/employee_education/__init__.py
rename to erpnext/hr/doctype/employee_education/__init__.py
diff --git a/hr/doctype/employee_education/employee_education.py b/erpnext/hr/doctype/employee_education/employee_education.py
similarity index 100%
rename from hr/doctype/employee_education/employee_education.py
rename to erpnext/hr/doctype/employee_education/employee_education.py
diff --git a/hr/doctype/employee_education/employee_education.txt b/erpnext/hr/doctype/employee_education/employee_education.txt
similarity index 100%
rename from hr/doctype/employee_education/employee_education.txt
rename to erpnext/hr/doctype/employee_education/employee_education.txt
diff --git a/hr/doctype/employee_external_work_history/README.md b/erpnext/hr/doctype/employee_external_work_history/README.md
similarity index 100%
rename from hr/doctype/employee_external_work_history/README.md
rename to erpnext/hr/doctype/employee_external_work_history/README.md
diff --git a/hr/doctype/employee_external_work_history/__init__.py b/erpnext/hr/doctype/employee_external_work_history/__init__.py
similarity index 100%
rename from hr/doctype/employee_external_work_history/__init__.py
rename to erpnext/hr/doctype/employee_external_work_history/__init__.py
diff --git a/hr/doctype/employee_external_work_history/employee_external_work_history.py b/erpnext/hr/doctype/employee_external_work_history/employee_external_work_history.py
similarity index 100%
rename from hr/doctype/employee_external_work_history/employee_external_work_history.py
rename to erpnext/hr/doctype/employee_external_work_history/employee_external_work_history.py
diff --git a/hr/doctype/employee_external_work_history/employee_external_work_history.txt b/erpnext/hr/doctype/employee_external_work_history/employee_external_work_history.txt
similarity index 100%
rename from hr/doctype/employee_external_work_history/employee_external_work_history.txt
rename to erpnext/hr/doctype/employee_external_work_history/employee_external_work_history.txt
diff --git a/hr/doctype/employee_internal_work_history/README.md b/erpnext/hr/doctype/employee_internal_work_history/README.md
similarity index 100%
rename from hr/doctype/employee_internal_work_history/README.md
rename to erpnext/hr/doctype/employee_internal_work_history/README.md
diff --git a/hr/doctype/employee_internal_work_history/__init__.py b/erpnext/hr/doctype/employee_internal_work_history/__init__.py
similarity index 100%
rename from hr/doctype/employee_internal_work_history/__init__.py
rename to erpnext/hr/doctype/employee_internal_work_history/__init__.py
diff --git a/hr/doctype/employee_internal_work_history/employee_internal_work_history.py b/erpnext/hr/doctype/employee_internal_work_history/employee_internal_work_history.py
similarity index 100%
rename from hr/doctype/employee_internal_work_history/employee_internal_work_history.py
rename to erpnext/hr/doctype/employee_internal_work_history/employee_internal_work_history.py
diff --git a/hr/doctype/employee_internal_work_history/employee_internal_work_history.txt b/erpnext/hr/doctype/employee_internal_work_history/employee_internal_work_history.txt
similarity index 100%
rename from hr/doctype/employee_internal_work_history/employee_internal_work_history.txt
rename to erpnext/hr/doctype/employee_internal_work_history/employee_internal_work_history.txt
diff --git a/hr/doctype/employee_leave_approver/README.md b/erpnext/hr/doctype/employee_leave_approver/README.md
similarity index 100%
rename from hr/doctype/employee_leave_approver/README.md
rename to erpnext/hr/doctype/employee_leave_approver/README.md
diff --git a/hr/doctype/employee_leave_approver/__init__.py b/erpnext/hr/doctype/employee_leave_approver/__init__.py
similarity index 100%
rename from hr/doctype/employee_leave_approver/__init__.py
rename to erpnext/hr/doctype/employee_leave_approver/__init__.py
diff --git a/hr/doctype/employee_leave_approver/employee_leave_approver.py b/erpnext/hr/doctype/employee_leave_approver/employee_leave_approver.py
similarity index 100%
rename from hr/doctype/employee_leave_approver/employee_leave_approver.py
rename to erpnext/hr/doctype/employee_leave_approver/employee_leave_approver.py
diff --git a/hr/doctype/employee_leave_approver/employee_leave_approver.txt b/erpnext/hr/doctype/employee_leave_approver/employee_leave_approver.txt
similarity index 100%
rename from hr/doctype/employee_leave_approver/employee_leave_approver.txt
rename to erpnext/hr/doctype/employee_leave_approver/employee_leave_approver.txt
diff --git a/hr/doctype/employment_type/README.md b/erpnext/hr/doctype/employment_type/README.md
similarity index 100%
rename from hr/doctype/employment_type/README.md
rename to erpnext/hr/doctype/employment_type/README.md
diff --git a/hr/doctype/employment_type/__init__.py b/erpnext/hr/doctype/employment_type/__init__.py
similarity index 100%
rename from hr/doctype/employment_type/__init__.py
rename to erpnext/hr/doctype/employment_type/__init__.py
diff --git a/hr/doctype/employment_type/employment_type.py b/erpnext/hr/doctype/employment_type/employment_type.py
similarity index 100%
rename from hr/doctype/employment_type/employment_type.py
rename to erpnext/hr/doctype/employment_type/employment_type.py
diff --git a/hr/doctype/employment_type/employment_type.txt b/erpnext/hr/doctype/employment_type/employment_type.txt
similarity index 100%
rename from hr/doctype/employment_type/employment_type.txt
rename to erpnext/hr/doctype/employment_type/employment_type.txt
diff --git a/hr/doctype/employment_type/test_employment_type.py b/erpnext/hr/doctype/employment_type/test_employment_type.py
similarity index 100%
rename from hr/doctype/employment_type/test_employment_type.py
rename to erpnext/hr/doctype/employment_type/test_employment_type.py
diff --git a/hr/doctype/expense_claim/README.md b/erpnext/hr/doctype/expense_claim/README.md
similarity index 100%
rename from hr/doctype/expense_claim/README.md
rename to erpnext/hr/doctype/expense_claim/README.md
diff --git a/hr/doctype/expense_claim/__init__.py b/erpnext/hr/doctype/expense_claim/__init__.py
similarity index 100%
rename from hr/doctype/expense_claim/__init__.py
rename to erpnext/hr/doctype/expense_claim/__init__.py
diff --git a/hr/doctype/expense_claim/expense_claim.js b/erpnext/hr/doctype/expense_claim/expense_claim.js
similarity index 92%
rename from hr/doctype/expense_claim/expense_claim.js
rename to erpnext/hr/doctype/expense_claim/expense_claim.js
index c32df80..716afd3 100644
--- a/hr/doctype/expense_claim/expense_claim.js
+++ b/erpnext/hr/doctype/expense_claim/expense_claim.js
@@ -7,7 +7,7 @@
make_bank_voucher: function() {
var me = this;
return wn.call({
- method: "accounts.doctype.journal_voucher.journal_voucher.get_default_bank_cash_account",
+ method: "erpnext.accounts.doctype.journal_voucher.journal_voucher.get_default_bank_cash_account",
args: {
"company": cur_frm.doc.company,
"voucher_type": "Bank Voucher"
@@ -55,12 +55,12 @@
cur_frm.fields_dict.employee.get_query = function(doc,cdt,cdn) {
return{
- query:"controllers.queries.employee_query"
+ query: "erpnext.controllers.queries.employee_query"
}
}
var exp_approver = doc.exp_approver;
return cur_frm.call({
- method:"hr.utils.get_expense_approver_list",
+ method: "erpnext.hr.utils.get_expense_approver_list",
callback: function(r) {
cur_frm.set_df_property("exp_approver", "options", r.message);
if(exp_approver) cur_frm.set_value("exp_approver", exp_approver);
@@ -104,11 +104,9 @@
} else {
if(doc.docstatus==0 && doc.approval_status=="Draft") {
if(user==doc.exp_approver) {
- cur_frm.set_intro(wn._("You are the Expense Approver for this record. \
- Please Update the 'Status' and Save"));
+ cur_frm.set_intro(wn._("You are the Expense Approver for this record. Please Update the 'Status' and Save"));
} else {
- cur_frm.set_intro(wn._("Expense Claim is pending approval. \
- Only the Expense Approver can update status."));
+ cur_frm.set_intro(wn._("Expense Claim is pending approval. Only the Expense Approver can update status."));
}
} else {
if(doc.approval_status=="Approved") {
diff --git a/hr/doctype/expense_claim/expense_claim.py b/erpnext/hr/doctype/expense_claim/expense_claim.py
similarity index 93%
rename from hr/doctype/expense_claim/expense_claim.py
rename to erpnext/hr/doctype/expense_claim/expense_claim.py
index 6b792c8..521195f 100644
--- a/hr/doctype/expense_claim/expense_claim.py
+++ b/erpnext/hr/doctype/expense_claim/expense_claim.py
@@ -22,7 +22,7 @@
'Rejected' before submitting""", raise_exception=1)
def validate_fiscal_year(self):
- from accounts.utils import validate_fiscal_year
+ from erpnext.accounts.utils import validate_fiscal_year
validate_fiscal_year(self.doc.posting_date, self.doc.fiscal_year, "Posting Date")
def validate_exp_details(self):
diff --git a/hr/doctype/expense_claim/expense_claim.txt b/erpnext/hr/doctype/expense_claim/expense_claim.txt
similarity index 100%
rename from hr/doctype/expense_claim/expense_claim.txt
rename to erpnext/hr/doctype/expense_claim/expense_claim.txt
diff --git a/hr/doctype/expense_claim_detail/README.md b/erpnext/hr/doctype/expense_claim_detail/README.md
similarity index 100%
rename from hr/doctype/expense_claim_detail/README.md
rename to erpnext/hr/doctype/expense_claim_detail/README.md
diff --git a/hr/doctype/expense_claim_detail/__init__.py b/erpnext/hr/doctype/expense_claim_detail/__init__.py
similarity index 100%
rename from hr/doctype/expense_claim_detail/__init__.py
rename to erpnext/hr/doctype/expense_claim_detail/__init__.py
diff --git a/hr/doctype/expense_claim_detail/expense_claim_detail.py b/erpnext/hr/doctype/expense_claim_detail/expense_claim_detail.py
similarity index 100%
rename from hr/doctype/expense_claim_detail/expense_claim_detail.py
rename to erpnext/hr/doctype/expense_claim_detail/expense_claim_detail.py
diff --git a/hr/doctype/expense_claim_detail/expense_claim_detail.txt b/erpnext/hr/doctype/expense_claim_detail/expense_claim_detail.txt
similarity index 100%
rename from hr/doctype/expense_claim_detail/expense_claim_detail.txt
rename to erpnext/hr/doctype/expense_claim_detail/expense_claim_detail.txt
diff --git a/hr/doctype/expense_claim_type/README.md b/erpnext/hr/doctype/expense_claim_type/README.md
similarity index 100%
rename from hr/doctype/expense_claim_type/README.md
rename to erpnext/hr/doctype/expense_claim_type/README.md
diff --git a/hr/doctype/expense_claim_type/__init__.py b/erpnext/hr/doctype/expense_claim_type/__init__.py
similarity index 100%
rename from hr/doctype/expense_claim_type/__init__.py
rename to erpnext/hr/doctype/expense_claim_type/__init__.py
diff --git a/hr/doctype/expense_claim_type/expense_claim_type.py b/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py
similarity index 100%
rename from hr/doctype/expense_claim_type/expense_claim_type.py
rename to erpnext/hr/doctype/expense_claim_type/expense_claim_type.py
diff --git a/hr/doctype/expense_claim_type/expense_claim_type.txt b/erpnext/hr/doctype/expense_claim_type/expense_claim_type.txt
similarity index 100%
rename from hr/doctype/expense_claim_type/expense_claim_type.txt
rename to erpnext/hr/doctype/expense_claim_type/expense_claim_type.txt
diff --git a/hr/doctype/grade/README.md b/erpnext/hr/doctype/grade/README.md
similarity index 100%
rename from hr/doctype/grade/README.md
rename to erpnext/hr/doctype/grade/README.md
diff --git a/hr/doctype/grade/__init__.py b/erpnext/hr/doctype/grade/__init__.py
similarity index 100%
rename from hr/doctype/grade/__init__.py
rename to erpnext/hr/doctype/grade/__init__.py
diff --git a/hr/doctype/grade/grade.py b/erpnext/hr/doctype/grade/grade.py
similarity index 100%
rename from hr/doctype/grade/grade.py
rename to erpnext/hr/doctype/grade/grade.py
diff --git a/hr/doctype/grade/grade.txt b/erpnext/hr/doctype/grade/grade.txt
similarity index 100%
rename from hr/doctype/grade/grade.txt
rename to erpnext/hr/doctype/grade/grade.txt
diff --git a/hr/doctype/grade/test_grade.py b/erpnext/hr/doctype/grade/test_grade.py
similarity index 100%
rename from hr/doctype/grade/test_grade.py
rename to erpnext/hr/doctype/grade/test_grade.py
diff --git a/hr/doctype/holiday/README.md b/erpnext/hr/doctype/holiday/README.md
similarity index 100%
rename from hr/doctype/holiday/README.md
rename to erpnext/hr/doctype/holiday/README.md
diff --git a/hr/doctype/holiday/__init__.py b/erpnext/hr/doctype/holiday/__init__.py
similarity index 100%
rename from hr/doctype/holiday/__init__.py
rename to erpnext/hr/doctype/holiday/__init__.py
diff --git a/hr/doctype/holiday/holiday.py b/erpnext/hr/doctype/holiday/holiday.py
similarity index 100%
rename from hr/doctype/holiday/holiday.py
rename to erpnext/hr/doctype/holiday/holiday.py
diff --git a/hr/doctype/holiday/holiday.txt b/erpnext/hr/doctype/holiday/holiday.txt
similarity index 100%
rename from hr/doctype/holiday/holiday.txt
rename to erpnext/hr/doctype/holiday/holiday.txt
diff --git a/hr/doctype/holiday_list/README.md b/erpnext/hr/doctype/holiday_list/README.md
similarity index 100%
rename from hr/doctype/holiday_list/README.md
rename to erpnext/hr/doctype/holiday_list/README.md
diff --git a/hr/doctype/holiday_list/__init__.py b/erpnext/hr/doctype/holiday_list/__init__.py
similarity index 100%
rename from hr/doctype/holiday_list/__init__.py
rename to erpnext/hr/doctype/holiday_list/__init__.py
diff --git a/hr/doctype/holiday_list/holiday_list.py b/erpnext/hr/doctype/holiday_list/holiday_list.py
similarity index 100%
rename from hr/doctype/holiday_list/holiday_list.py
rename to erpnext/hr/doctype/holiday_list/holiday_list.py
diff --git a/hr/doctype/holiday_list/holiday_list.txt b/erpnext/hr/doctype/holiday_list/holiday_list.txt
similarity index 100%
rename from hr/doctype/holiday_list/holiday_list.txt
rename to erpnext/hr/doctype/holiday_list/holiday_list.txt
diff --git a/hr/doctype/holiday_list/test_holiday_list.py b/erpnext/hr/doctype/holiday_list/test_holiday_list.py
similarity index 100%
rename from hr/doctype/holiday_list/test_holiday_list.py
rename to erpnext/hr/doctype/holiday_list/test_holiday_list.py
diff --git a/hr/doctype/hr_settings/__init__.py b/erpnext/hr/doctype/hr_settings/__init__.py
similarity index 100%
rename from hr/doctype/hr_settings/__init__.py
rename to erpnext/hr/doctype/hr_settings/__init__.py
diff --git a/hr/doctype/hr_settings/hr_settings.py b/erpnext/hr/doctype/hr_settings/hr_settings.py
similarity index 93%
rename from hr/doctype/hr_settings/hr_settings.py
rename to erpnext/hr/doctype/hr_settings/hr_settings.py
index 2abd7c6..e7e5d3e 100644
--- a/hr/doctype/hr_settings/hr_settings.py
+++ b/erpnext/hr/doctype/hr_settings/hr_settings.py
@@ -15,7 +15,7 @@
def validate(self):
self.update_birthday_reminders()
- from setup.doctype.naming_series.naming_series import set_by_naming_series
+ from erpnext.setup.doctype.naming_series.naming_series import set_by_naming_series
set_by_naming_series("Employee", "employee_number",
self.doc.get("emp_created_by")=="Naming Series", hide_name_field=True)
diff --git a/hr/doctype/hr_settings/hr_settings.txt b/erpnext/hr/doctype/hr_settings/hr_settings.txt
similarity index 100%
rename from hr/doctype/hr_settings/hr_settings.txt
rename to erpnext/hr/doctype/hr_settings/hr_settings.txt
diff --git a/hr/doctype/job_applicant/README.md b/erpnext/hr/doctype/job_applicant/README.md
similarity index 100%
rename from hr/doctype/job_applicant/README.md
rename to erpnext/hr/doctype/job_applicant/README.md
diff --git a/hr/doctype/job_applicant/__init__.py b/erpnext/hr/doctype/job_applicant/__init__.py
similarity index 100%
rename from hr/doctype/job_applicant/__init__.py
rename to erpnext/hr/doctype/job_applicant/__init__.py
diff --git a/hr/doctype/job_applicant/get_job_applications.py b/erpnext/hr/doctype/job_applicant/get_job_applications.py
similarity index 95%
rename from hr/doctype/job_applicant/get_job_applications.py
rename to erpnext/hr/doctype/job_applicant/get_job_applications.py
index 33e1261..05bd46f 100644
--- a/hr/doctype/job_applicant/get_job_applications.py
+++ b/erpnext/hr/doctype/job_applicant/get_job_applications.py
@@ -5,7 +5,7 @@
import webnotes
from webnotes.utils import cstr, cint
from webnotes.utils.email_lib.receive import POP3Mailbox
-from core.doctype.communication.communication import make
+from webnotes.core.doctype.communication.communication import make
class JobsMailbox(POP3Mailbox):
def setup(self, args=None):
diff --git a/hr/doctype/job_applicant/job_applicant.js b/erpnext/hr/doctype/job_applicant/job_applicant.js
similarity index 100%
rename from hr/doctype/job_applicant/job_applicant.js
rename to erpnext/hr/doctype/job_applicant/job_applicant.js
diff --git a/hr/doctype/job_applicant/job_applicant.py b/erpnext/hr/doctype/job_applicant/job_applicant.py
similarity index 89%
rename from hr/doctype/job_applicant/job_applicant.py
rename to erpnext/hr/doctype/job_applicant/job_applicant.py
index 887e789..0262568 100644
--- a/hr/doctype/job_applicant/job_applicant.py
+++ b/erpnext/hr/doctype/job_applicant/job_applicant.py
@@ -5,7 +5,7 @@
from __future__ import unicode_literals
import webnotes
-from utilities.transaction_base import TransactionBase
+from erpnext.utilities.transaction_base import TransactionBase
from webnotes.utils import extract_email_id
class DocType(TransactionBase):
diff --git a/hr/doctype/job_applicant/job_applicant.txt b/erpnext/hr/doctype/job_applicant/job_applicant.txt
similarity index 100%
rename from hr/doctype/job_applicant/job_applicant.txt
rename to erpnext/hr/doctype/job_applicant/job_applicant.txt
diff --git a/hr/doctype/job_opening/README.md b/erpnext/hr/doctype/job_opening/README.md
similarity index 100%
rename from hr/doctype/job_opening/README.md
rename to erpnext/hr/doctype/job_opening/README.md
diff --git a/hr/doctype/job_opening/__init__.py b/erpnext/hr/doctype/job_opening/__init__.py
similarity index 100%
rename from hr/doctype/job_opening/__init__.py
rename to erpnext/hr/doctype/job_opening/__init__.py
diff --git a/hr/doctype/job_opening/job_opening.py b/erpnext/hr/doctype/job_opening/job_opening.py
similarity index 100%
rename from hr/doctype/job_opening/job_opening.py
rename to erpnext/hr/doctype/job_opening/job_opening.py
diff --git a/hr/doctype/job_opening/job_opening.txt b/erpnext/hr/doctype/job_opening/job_opening.txt
similarity index 100%
rename from hr/doctype/job_opening/job_opening.txt
rename to erpnext/hr/doctype/job_opening/job_opening.txt
diff --git a/hr/doctype/leave_allocation/README.md b/erpnext/hr/doctype/leave_allocation/README.md
similarity index 100%
rename from hr/doctype/leave_allocation/README.md
rename to erpnext/hr/doctype/leave_allocation/README.md
diff --git a/hr/doctype/leave_allocation/__init__.py b/erpnext/hr/doctype/leave_allocation/__init__.py
similarity index 100%
rename from hr/doctype/leave_allocation/__init__.py
rename to erpnext/hr/doctype/leave_allocation/__init__.py
diff --git a/hr/doctype/leave_allocation/leave_allocation.js b/erpnext/hr/doctype/leave_allocation/leave_allocation.js
similarity index 97%
rename from hr/doctype/leave_allocation/leave_allocation.js
rename to erpnext/hr/doctype/leave_allocation/leave_allocation.js
index 4bc3c49..1e376da 100755
--- a/hr/doctype/leave_allocation/leave_allocation.js
+++ b/erpnext/hr/doctype/leave_allocation/leave_allocation.js
@@ -68,6 +68,6 @@
cur_frm.fields_dict.employee.get_query = function(doc,cdt,cdn) {
return{
- query:"controllers.queries.employee_query"
+ query: "erpnext.controllers.queries.employee_query"
}
}
\ No newline at end of file
diff --git a/hr/doctype/leave_allocation/leave_allocation.py b/erpnext/hr/doctype/leave_allocation/leave_allocation.py
similarity index 100%
rename from hr/doctype/leave_allocation/leave_allocation.py
rename to erpnext/hr/doctype/leave_allocation/leave_allocation.py
diff --git a/hr/doctype/leave_allocation/leave_allocation.txt b/erpnext/hr/doctype/leave_allocation/leave_allocation.txt
similarity index 100%
rename from hr/doctype/leave_allocation/leave_allocation.txt
rename to erpnext/hr/doctype/leave_allocation/leave_allocation.txt
diff --git a/hr/doctype/leave_application/README.md b/erpnext/hr/doctype/leave_application/README.md
similarity index 100%
rename from hr/doctype/leave_application/README.md
rename to erpnext/hr/doctype/leave_application/README.md
diff --git a/hr/doctype/leave_application/__init__.py b/erpnext/hr/doctype/leave_application/__init__.py
similarity index 100%
rename from hr/doctype/leave_application/__init__.py
rename to erpnext/hr/doctype/leave_application/__init__.py
diff --git a/hr/doctype/leave_application/leave_application.js b/erpnext/hr/doctype/leave_application/leave_application.js
similarity index 98%
rename from hr/doctype/leave_application/leave_application.js
rename to erpnext/hr/doctype/leave_application/leave_application.js
index a3b62ca..cd04384 100755
--- a/hr/doctype/leave_application/leave_application.js
+++ b/erpnext/hr/doctype/leave_application/leave_application.js
@@ -13,7 +13,7 @@
var leave_approver = doc.leave_approver;
return cur_frm.call({
- method:"hr.utils.get_leave_approver_list",
+ method: "erpnext.hr.utils.get_leave_approver_list",
callback: function(r) {
cur_frm.set_df_property("leave_approver", "options", $.map(r.message,
function(profile) {
diff --git a/hr/doctype/leave_application/leave_application.py b/erpnext/hr/doctype/leave_application/leave_application.py
similarity index 96%
rename from hr/doctype/leave_application/leave_application.py
rename to erpnext/hr/doctype/leave_application/leave_application.py
index 38ca306..c87c36a 100755
--- a/hr/doctype/leave_application/leave_application.py
+++ b/erpnext/hr/doctype/leave_application/leave_application.py
@@ -53,7 +53,7 @@
self.notify_employee("cancelled")
def show_block_day_warning(self):
- from hr.doctype.leave_block_list.leave_block_list import get_applicable_block_dates
+ from erpnext.hr.doctype.leave_block_list.leave_block_list import get_applicable_block_dates
block_dates = get_applicable_block_dates(self.doc.from_date, self.doc.to_date,
self.doc.employee, self.doc.company, all_lists=True)
@@ -64,7 +64,7 @@
webnotes.msgprint(formatdate(d.block_date) + ": " + d.reason)
def validate_block_days(self):
- from hr.doctype.leave_block_list.leave_block_list import get_applicable_block_dates
+ from erpnext.hr.doctype.leave_block_list.leave_block_list import get_applicable_block_dates
block_dates = get_applicable_block_dates(self.doc.from_date, self.doc.to_date,
self.doc.employee, self.doc.company)
@@ -107,8 +107,7 @@
self.doc.total_leave_days = self.get_total_leave_days()["total_leave_days"]
if self.doc.total_leave_days == 0:
- msgprint(_("Hurray! The day(s) on which you are applying for leave \
- coincide with holiday(s). You need not apply for leave."),
+ msgprint(_("The day(s) on which you are applying for leave coincide with holiday(s). You need not apply for leave."),
raise_exception=1)
if not is_lwp(self.doc.leave_type):
@@ -205,7 +204,7 @@
def notify(self, args):
args = webnotes._dict(args)
- from core.page.messages.messages import post
+ from webnotes.core.page.messages.messages import post
post({"txt": args.message, "contact": args.message_to, "subject": args.subject,
"notify": cint(self.doc.follow_via_email)})
@@ -290,7 +289,7 @@
def add_block_dates(events, start, end, employee, company):
# block days
- from hr.doctype.leave_block_list.leave_block_list import get_applicable_block_dates
+ from erpnext.hr.doctype.leave_block_list.leave_block_list import get_applicable_block_dates
cnt = 0
block_dates = get_applicable_block_dates(start, end, employee, company, all_lists=True)
diff --git a/hr/doctype/leave_application/leave_application.txt b/erpnext/hr/doctype/leave_application/leave_application.txt
similarity index 100%
rename from hr/doctype/leave_application/leave_application.txt
rename to erpnext/hr/doctype/leave_application/leave_application.txt
diff --git a/hr/doctype/leave_application/leave_application_calendar.js b/erpnext/hr/doctype/leave_application/leave_application_calendar.js
similarity index 81%
rename from hr/doctype/leave_application/leave_application_calendar.js
rename to erpnext/hr/doctype/leave_application/leave_application_calendar.js
index a258c8f..ba09a39 100644
--- a/hr/doctype/leave_application/leave_application_calendar.js
+++ b/erpnext/hr/doctype/leave_application/leave_application_calendar.js
@@ -16,5 +16,5 @@
right: 'month'
}
},
- get_events_method: "hr.doctype.leave_application.leave_application.get_events"
+ get_events_method: "erpnext.hr.doctype.leave_application.leave_application.get_events"
}
\ No newline at end of file
diff --git a/hr/doctype/leave_application/test_leave_application.py b/erpnext/hr/doctype/leave_application/test_leave_application.py
similarity index 97%
rename from hr/doctype/leave_application/test_leave_application.py
rename to erpnext/hr/doctype/leave_application/test_leave_application.py
index 9f8a8e1..44e818d 100644
--- a/hr/doctype/leave_application/test_leave_application.py
+++ b/erpnext/hr/doctype/leave_application/test_leave_application.py
@@ -4,7 +4,7 @@
import webnotes
import unittest
-from hr.doctype.leave_application.leave_application import LeaveDayBlockedError, OverlapError
+from erpnext.hr.doctype.leave_application.leave_application import LeaveDayBlockedError, OverlapError
class TestLeaveApplication(unittest.TestCase):
def tearDown(self):
@@ -129,7 +129,7 @@
"docstatus"), 1)
def _test_leave_approval_invalid_leave_approver_insert(self):
- from hr.doctype.leave_application.leave_application import InvalidLeaveApproverError
+ from erpnext.hr.doctype.leave_application.leave_application import InvalidLeaveApproverError
self._clear_applications()
diff --git a/hr/doctype/leave_block_list/README.md b/erpnext/hr/doctype/leave_block_list/README.md
similarity index 100%
rename from hr/doctype/leave_block_list/README.md
rename to erpnext/hr/doctype/leave_block_list/README.md
diff --git a/hr/doctype/leave_block_list/__init__.py b/erpnext/hr/doctype/leave_block_list/__init__.py
similarity index 100%
rename from hr/doctype/leave_block_list/__init__.py
rename to erpnext/hr/doctype/leave_block_list/__init__.py
diff --git a/hr/doctype/leave_block_list/leave_block_list.py b/erpnext/hr/doctype/leave_block_list/leave_block_list.py
similarity index 97%
rename from hr/doctype/leave_block_list/leave_block_list.py
rename to erpnext/hr/doctype/leave_block_list/leave_block_list.py
index 973436e..4585e90 100644
--- a/hr/doctype/leave_block_list/leave_block_list.py
+++ b/erpnext/hr/doctype/leave_block_list/leave_block_list.py
@@ -5,7 +5,7 @@
from __future__ import unicode_literals
import webnotes
-from accounts.utils import validate_fiscal_year
+from erpnext.accounts.utils import validate_fiscal_year
from webnotes import _
class DocType:
diff --git a/hr/doctype/leave_block_list/leave_block_list.txt b/erpnext/hr/doctype/leave_block_list/leave_block_list.txt
similarity index 100%
rename from hr/doctype/leave_block_list/leave_block_list.txt
rename to erpnext/hr/doctype/leave_block_list/leave_block_list.txt
diff --git a/hr/doctype/leave_block_list/test_leave_block_list.py b/erpnext/hr/doctype/leave_block_list/test_leave_block_list.py
similarity index 95%
rename from hr/doctype/leave_block_list/test_leave_block_list.py
rename to erpnext/hr/doctype/leave_block_list/test_leave_block_list.py
index 0f0da65..13fa42c 100644
--- a/hr/doctype/leave_block_list/test_leave_block_list.py
+++ b/erpnext/hr/doctype/leave_block_list/test_leave_block_list.py
@@ -4,7 +4,7 @@
import webnotes
import unittest
-from hr.doctype.leave_block_list.leave_block_list import get_applicable_block_dates
+from erpnext.hr.doctype.leave_block_list.leave_block_list import get_applicable_block_dates
class TestLeaveBlockList(unittest.TestCase):
def tearDown(self):
diff --git a/hr/doctype/leave_block_list_allow/README.md b/erpnext/hr/doctype/leave_block_list_allow/README.md
similarity index 100%
rename from hr/doctype/leave_block_list_allow/README.md
rename to erpnext/hr/doctype/leave_block_list_allow/README.md
diff --git a/hr/doctype/leave_block_list_allow/__init__.py b/erpnext/hr/doctype/leave_block_list_allow/__init__.py
similarity index 100%
rename from hr/doctype/leave_block_list_allow/__init__.py
rename to erpnext/hr/doctype/leave_block_list_allow/__init__.py
diff --git a/hr/doctype/leave_block_list_allow/leave_block_list_allow.py b/erpnext/hr/doctype/leave_block_list_allow/leave_block_list_allow.py
similarity index 100%
rename from hr/doctype/leave_block_list_allow/leave_block_list_allow.py
rename to erpnext/hr/doctype/leave_block_list_allow/leave_block_list_allow.py
diff --git a/hr/doctype/leave_block_list_allow/leave_block_list_allow.txt b/erpnext/hr/doctype/leave_block_list_allow/leave_block_list_allow.txt
similarity index 100%
rename from hr/doctype/leave_block_list_allow/leave_block_list_allow.txt
rename to erpnext/hr/doctype/leave_block_list_allow/leave_block_list_allow.txt
diff --git a/hr/doctype/leave_block_list_date/README.md b/erpnext/hr/doctype/leave_block_list_date/README.md
similarity index 100%
rename from hr/doctype/leave_block_list_date/README.md
rename to erpnext/hr/doctype/leave_block_list_date/README.md
diff --git a/hr/doctype/leave_block_list_date/__init__.py b/erpnext/hr/doctype/leave_block_list_date/__init__.py
similarity index 100%
rename from hr/doctype/leave_block_list_date/__init__.py
rename to erpnext/hr/doctype/leave_block_list_date/__init__.py
diff --git a/hr/doctype/leave_block_list_date/leave_block_list_date.py b/erpnext/hr/doctype/leave_block_list_date/leave_block_list_date.py
similarity index 100%
rename from hr/doctype/leave_block_list_date/leave_block_list_date.py
rename to erpnext/hr/doctype/leave_block_list_date/leave_block_list_date.py
diff --git a/hr/doctype/leave_block_list_date/leave_block_list_date.txt b/erpnext/hr/doctype/leave_block_list_date/leave_block_list_date.txt
similarity index 100%
rename from hr/doctype/leave_block_list_date/leave_block_list_date.txt
rename to erpnext/hr/doctype/leave_block_list_date/leave_block_list_date.txt
diff --git a/hr/doctype/leave_control_panel/README.md b/erpnext/hr/doctype/leave_control_panel/README.md
similarity index 100%
rename from hr/doctype/leave_control_panel/README.md
rename to erpnext/hr/doctype/leave_control_panel/README.md
diff --git a/hr/doctype/leave_control_panel/__init__.py b/erpnext/hr/doctype/leave_control_panel/__init__.py
similarity index 100%
rename from hr/doctype/leave_control_panel/__init__.py
rename to erpnext/hr/doctype/leave_control_panel/__init__.py
diff --git a/hr/doctype/leave_control_panel/leave_control_panel.js b/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js
similarity index 100%
rename from hr/doctype/leave_control_panel/leave_control_panel.js
rename to erpnext/hr/doctype/leave_control_panel/leave_control_panel.js
diff --git a/hr/doctype/leave_control_panel/leave_control_panel.py b/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py
similarity index 100%
rename from hr/doctype/leave_control_panel/leave_control_panel.py
rename to erpnext/hr/doctype/leave_control_panel/leave_control_panel.py
diff --git a/hr/doctype/leave_control_panel/leave_control_panel.txt b/erpnext/hr/doctype/leave_control_panel/leave_control_panel.txt
similarity index 100%
rename from hr/doctype/leave_control_panel/leave_control_panel.txt
rename to erpnext/hr/doctype/leave_control_panel/leave_control_panel.txt
diff --git a/hr/doctype/leave_type/README.md b/erpnext/hr/doctype/leave_type/README.md
similarity index 100%
rename from hr/doctype/leave_type/README.md
rename to erpnext/hr/doctype/leave_type/README.md
diff --git a/hr/doctype/leave_type/__init__.py b/erpnext/hr/doctype/leave_type/__init__.py
similarity index 100%
rename from hr/doctype/leave_type/__init__.py
rename to erpnext/hr/doctype/leave_type/__init__.py
diff --git a/hr/doctype/leave_type/leave_type.py b/erpnext/hr/doctype/leave_type/leave_type.py
similarity index 100%
rename from hr/doctype/leave_type/leave_type.py
rename to erpnext/hr/doctype/leave_type/leave_type.py
diff --git a/hr/doctype/leave_type/leave_type.txt b/erpnext/hr/doctype/leave_type/leave_type.txt
similarity index 100%
rename from hr/doctype/leave_type/leave_type.txt
rename to erpnext/hr/doctype/leave_type/leave_type.txt
diff --git a/hr/doctype/leave_type/test_leave_type.py b/erpnext/hr/doctype/leave_type/test_leave_type.py
similarity index 100%
rename from hr/doctype/leave_type/test_leave_type.py
rename to erpnext/hr/doctype/leave_type/test_leave_type.py
diff --git a/hr/doctype/salary_manager/README.md b/erpnext/hr/doctype/salary_manager/README.md
similarity index 100%
rename from hr/doctype/salary_manager/README.md
rename to erpnext/hr/doctype/salary_manager/README.md
diff --git a/hr/doctype/salary_manager/__init__.py b/erpnext/hr/doctype/salary_manager/__init__.py
similarity index 100%
rename from hr/doctype/salary_manager/__init__.py
rename to erpnext/hr/doctype/salary_manager/__init__.py
diff --git a/hr/doctype/salary_manager/salary_manager.js b/erpnext/hr/doctype/salary_manager/salary_manager.js
similarity index 100%
rename from hr/doctype/salary_manager/salary_manager.js
rename to erpnext/hr/doctype/salary_manager/salary_manager.js
diff --git a/hr/doctype/salary_manager/salary_manager.py b/erpnext/hr/doctype/salary_manager/salary_manager.py
similarity index 100%
rename from hr/doctype/salary_manager/salary_manager.py
rename to erpnext/hr/doctype/salary_manager/salary_manager.py
diff --git a/hr/doctype/salary_manager/salary_manager.txt b/erpnext/hr/doctype/salary_manager/salary_manager.txt
similarity index 100%
rename from hr/doctype/salary_manager/salary_manager.txt
rename to erpnext/hr/doctype/salary_manager/salary_manager.txt
diff --git a/hr/doctype/salary_manager/test_salary_manager.py b/erpnext/hr/doctype/salary_manager/test_salary_manager.py
similarity index 100%
rename from hr/doctype/salary_manager/test_salary_manager.py
rename to erpnext/hr/doctype/salary_manager/test_salary_manager.py
diff --git a/hr/doctype/salary_slip/README.md b/erpnext/hr/doctype/salary_slip/README.md
similarity index 100%
rename from hr/doctype/salary_slip/README.md
rename to erpnext/hr/doctype/salary_slip/README.md
diff --git a/hr/doctype/salary_slip/__init__.py b/erpnext/hr/doctype/salary_slip/__init__.py
similarity index 100%
rename from hr/doctype/salary_slip/__init__.py
rename to erpnext/hr/doctype/salary_slip/__init__.py
diff --git a/hr/doctype/salary_slip/salary_slip.js b/erpnext/hr/doctype/salary_slip/salary_slip.js
similarity index 98%
rename from hr/doctype/salary_slip/salary_slip.js
rename to erpnext/hr/doctype/salary_slip/salary_slip.js
index 3716953..ceab148 100644
--- a/hr/doctype/salary_slip/salary_slip.js
+++ b/erpnext/hr/doctype/salary_slip/salary_slip.js
@@ -123,6 +123,6 @@
cur_frm.fields_dict.employee.get_query = function(doc,cdt,cdn) {
return{
- query:"controllers.queries.employee_query"
+ query: "erpnext.controllers.queries.employee_query"
}
}
diff --git a/hr/doctype/salary_slip/salary_slip.py b/erpnext/hr/doctype/salary_slip/salary_slip.py
similarity index 97%
rename from hr/doctype/salary_slip/salary_slip.py
rename to erpnext/hr/doctype/salary_slip/salary_slip.py
index 94660d0..f799592 100644
--- a/hr/doctype/salary_slip/salary_slip.py
+++ b/erpnext/hr/doctype/salary_slip/salary_slip.py
@@ -9,10 +9,10 @@
from webnotes.model.bean import getlist
from webnotes.model.code import get_obj
from webnotes import msgprint, _
-from setup.utils import get_company_currency
+from erpnext.setup.utils import get_company_currency
-from utilities.transaction_base import TransactionBase
+from erpnext.utilities.transaction_base import TransactionBase
class DocType(TransactionBase):
def __init__(self,doc,doclist=[]):
@@ -38,7 +38,7 @@
return struct and struct[0][0] or ''
def pull_sal_struct(self, struct):
- from hr.doctype.salary_structure.salary_structure import get_mapped_doclist
+ from erpnext.hr.doctype.salary_structure.salary_structure import get_mapped_doclist
self.doclist = get_mapped_doclist(struct, self.doclist)
def pull_emp_details(self):
diff --git a/hr/doctype/salary_slip/salary_slip.txt b/erpnext/hr/doctype/salary_slip/salary_slip.txt
similarity index 100%
rename from hr/doctype/salary_slip/salary_slip.txt
rename to erpnext/hr/doctype/salary_slip/salary_slip.txt
diff --git a/hr/doctype/salary_slip/test_salary_slip.py b/erpnext/hr/doctype/salary_slip/test_salary_slip.py
similarity index 95%
rename from hr/doctype/salary_slip/test_salary_slip.py
rename to erpnext/hr/doctype/salary_slip/test_salary_slip.py
index 29e9407..372a858 100644
--- a/hr/doctype/salary_slip/test_salary_slip.py
+++ b/erpnext/hr/doctype/salary_slip/test_salary_slip.py
@@ -8,7 +8,7 @@
def setUp(self):
webnotes.conn.sql("""delete from `tabLeave Application`""")
webnotes.conn.sql("""delete from `tabSalary Slip`""")
- from hr.doctype.leave_application.test_leave_application import test_records as leave_applications
+ from erpnext.hr.doctype.leave_application.test_leave_application import test_records as leave_applications
la = webnotes.bean(copy=leave_applications[4])
la.insert()
la.doc.status = "Approved"
diff --git a/hr/doctype/salary_slip_deduction/README.md b/erpnext/hr/doctype/salary_slip_deduction/README.md
similarity index 100%
rename from hr/doctype/salary_slip_deduction/README.md
rename to erpnext/hr/doctype/salary_slip_deduction/README.md
diff --git a/hr/doctype/salary_slip_deduction/__init__.py b/erpnext/hr/doctype/salary_slip_deduction/__init__.py
similarity index 100%
rename from hr/doctype/salary_slip_deduction/__init__.py
rename to erpnext/hr/doctype/salary_slip_deduction/__init__.py
diff --git a/hr/doctype/salary_slip_deduction/salary_slip_deduction.py b/erpnext/hr/doctype/salary_slip_deduction/salary_slip_deduction.py
similarity index 100%
rename from hr/doctype/salary_slip_deduction/salary_slip_deduction.py
rename to erpnext/hr/doctype/salary_slip_deduction/salary_slip_deduction.py
diff --git a/hr/doctype/salary_slip_deduction/salary_slip_deduction.txt b/erpnext/hr/doctype/salary_slip_deduction/salary_slip_deduction.txt
similarity index 100%
rename from hr/doctype/salary_slip_deduction/salary_slip_deduction.txt
rename to erpnext/hr/doctype/salary_slip_deduction/salary_slip_deduction.txt
diff --git a/hr/doctype/salary_slip_earning/README.md b/erpnext/hr/doctype/salary_slip_earning/README.md
similarity index 100%
rename from hr/doctype/salary_slip_earning/README.md
rename to erpnext/hr/doctype/salary_slip_earning/README.md
diff --git a/hr/doctype/salary_slip_earning/__init__.py b/erpnext/hr/doctype/salary_slip_earning/__init__.py
similarity index 100%
rename from hr/doctype/salary_slip_earning/__init__.py
rename to erpnext/hr/doctype/salary_slip_earning/__init__.py
diff --git a/hr/doctype/salary_slip_earning/salary_slip_earning.py b/erpnext/hr/doctype/salary_slip_earning/salary_slip_earning.py
similarity index 100%
rename from hr/doctype/salary_slip_earning/salary_slip_earning.py
rename to erpnext/hr/doctype/salary_slip_earning/salary_slip_earning.py
diff --git a/hr/doctype/salary_slip_earning/salary_slip_earning.txt b/erpnext/hr/doctype/salary_slip_earning/salary_slip_earning.txt
similarity index 100%
rename from hr/doctype/salary_slip_earning/salary_slip_earning.txt
rename to erpnext/hr/doctype/salary_slip_earning/salary_slip_earning.txt
diff --git a/hr/doctype/salary_structure/README.md b/erpnext/hr/doctype/salary_structure/README.md
similarity index 100%
rename from hr/doctype/salary_structure/README.md
rename to erpnext/hr/doctype/salary_structure/README.md
diff --git a/hr/doctype/salary_structure/__init__.py b/erpnext/hr/doctype/salary_structure/__init__.py
similarity index 100%
rename from hr/doctype/salary_structure/__init__.py
rename to erpnext/hr/doctype/salary_structure/__init__.py
diff --git a/hr/doctype/salary_structure/salary_structure.js b/erpnext/hr/doctype/salary_structure/salary_structure.js
similarity index 93%
rename from hr/doctype/salary_structure/salary_structure.js
rename to erpnext/hr/doctype/salary_structure/salary_structure.js
index 8e36dbd..24da8a0 100644
--- a/hr/doctype/salary_structure/salary_structure.js
+++ b/erpnext/hr/doctype/salary_structure/salary_structure.js
@@ -20,7 +20,7 @@
cur_frm.cscript['Make Salary Slip'] = function() {
wn.model.open_mapped_doc({
- method: "hr.doctype.salary_structure.salary_structure.make_salary_slip",
+ method: "erpnext.hr.doctype.salary_structure.salary_structure.make_salary_slip",
source_name: cur_frm.doc.name
});
}
@@ -60,5 +60,5 @@
}
cur_frm.fields_dict.employee.get_query = function(doc,cdt,cdn) {
- return{ query:"controllers.queries.employee_query" }
+ return{ query: "erpnext.controllers.queries.employee_query" }
}
\ No newline at end of file
diff --git a/hr/doctype/salary_structure/salary_structure.py b/erpnext/hr/doctype/salary_structure/salary_structure.py
similarity index 97%
rename from hr/doctype/salary_structure/salary_structure.py
rename to erpnext/hr/doctype/salary_structure/salary_structure.py
index a034b90..67771e6 100644
--- a/hr/doctype/salary_structure/salary_structure.py
+++ b/erpnext/hr/doctype/salary_structure/salary_structure.py
@@ -60,8 +60,7 @@
ret = webnotes.conn.sql("""select name from `tabSalary Structure` where is_active = 'Yes'
and employee = %s and name!=%s""", (self.doc.employee,self.doc.name))
if ret and self.doc.is_active=='Yes':
- msgprint(_("""Another Salary Structure '%s' is active for employee '%s'.
- Please make its status 'Inactive' to proceed.""") %
+ msgprint(_("""Another Salary Structure '%s' is active for employee '%s'. Please make its status 'Inactive' to proceed.""") %
(cstr(ret), self.doc.employee), raise_exception=1)
def validate_amount(self):
@@ -112,4 +111,4 @@
}
}, target_doclist, postprocess)
- return doclist
\ No newline at end of file
+ return doclist
diff --git a/hr/doctype/salary_structure/salary_structure.txt b/erpnext/hr/doctype/salary_structure/salary_structure.txt
similarity index 100%
rename from hr/doctype/salary_structure/salary_structure.txt
rename to erpnext/hr/doctype/salary_structure/salary_structure.txt
diff --git a/hr/doctype/salary_structure_deduction/README.md b/erpnext/hr/doctype/salary_structure_deduction/README.md
similarity index 100%
rename from hr/doctype/salary_structure_deduction/README.md
rename to erpnext/hr/doctype/salary_structure_deduction/README.md
diff --git a/hr/doctype/salary_structure_deduction/__init__.py b/erpnext/hr/doctype/salary_structure_deduction/__init__.py
similarity index 100%
rename from hr/doctype/salary_structure_deduction/__init__.py
rename to erpnext/hr/doctype/salary_structure_deduction/__init__.py
diff --git a/hr/doctype/salary_structure_deduction/salary_structure_deduction.py b/erpnext/hr/doctype/salary_structure_deduction/salary_structure_deduction.py
similarity index 100%
rename from hr/doctype/salary_structure_deduction/salary_structure_deduction.py
rename to erpnext/hr/doctype/salary_structure_deduction/salary_structure_deduction.py
diff --git a/hr/doctype/salary_structure_deduction/salary_structure_deduction.txt b/erpnext/hr/doctype/salary_structure_deduction/salary_structure_deduction.txt
similarity index 100%
rename from hr/doctype/salary_structure_deduction/salary_structure_deduction.txt
rename to erpnext/hr/doctype/salary_structure_deduction/salary_structure_deduction.txt
diff --git a/hr/doctype/salary_structure_earning/README.md b/erpnext/hr/doctype/salary_structure_earning/README.md
similarity index 100%
rename from hr/doctype/salary_structure_earning/README.md
rename to erpnext/hr/doctype/salary_structure_earning/README.md
diff --git a/hr/doctype/salary_structure_earning/__init__.py b/erpnext/hr/doctype/salary_structure_earning/__init__.py
similarity index 100%
rename from hr/doctype/salary_structure_earning/__init__.py
rename to erpnext/hr/doctype/salary_structure_earning/__init__.py
diff --git a/hr/doctype/salary_structure_earning/salary_structure_earning.py b/erpnext/hr/doctype/salary_structure_earning/salary_structure_earning.py
similarity index 100%
rename from hr/doctype/salary_structure_earning/salary_structure_earning.py
rename to erpnext/hr/doctype/salary_structure_earning/salary_structure_earning.py
diff --git a/hr/doctype/salary_structure_earning/salary_structure_earning.txt b/erpnext/hr/doctype/salary_structure_earning/salary_structure_earning.txt
similarity index 100%
rename from hr/doctype/salary_structure_earning/salary_structure_earning.txt
rename to erpnext/hr/doctype/salary_structure_earning/salary_structure_earning.txt
diff --git a/hr/doctype/upload_attendance/README.md b/erpnext/hr/doctype/upload_attendance/README.md
similarity index 100%
rename from hr/doctype/upload_attendance/README.md
rename to erpnext/hr/doctype/upload_attendance/README.md
diff --git a/hr/doctype/upload_attendance/__init__.py b/erpnext/hr/doctype/upload_attendance/__init__.py
similarity index 100%
rename from hr/doctype/upload_attendance/__init__.py
rename to erpnext/hr/doctype/upload_attendance/__init__.py
diff --git a/hr/doctype/upload_attendance/upload_attendance.js b/erpnext/hr/doctype/upload_attendance/upload_attendance.js
similarity index 92%
rename from hr/doctype/upload_attendance/upload_attendance.js
rename to erpnext/hr/doctype/upload_attendance/upload_attendance.js
index 9f86dfe..ee58945 100644
--- a/hr/doctype/upload_attendance/upload_attendance.js
+++ b/erpnext/hr/doctype/upload_attendance/upload_attendance.js
@@ -2,7 +2,7 @@
// License: GNU General Public License v3. See license.txt
-wn.require("public/app/js/utils.js");
+wn.require("assets/erpnext/js/utils.js");
wn.provide("erpnext.hr");
erpnext.hr.AttendanceControlPanel = wn.ui.form.Controller.extend({
@@ -22,7 +22,7 @@
}
window.location.href = repl(wn.request.url +
'?cmd=%(cmd)s&from_date=%(from_date)s&to_date=%(to_date)s', {
- cmd: "hr.doctype.upload_attendance.upload_attendance.get_template",
+ cmd: "erpnext.hr.doctype.upload_attendance.upload_attendance.get_template",
from_date: this.frm.doc.att_fr_date,
to_date: this.frm.doc.att_to_date,
});
@@ -36,7 +36,7 @@
wn.upload.make({
parent: $wrapper,
args: {
- method: 'hr.doctype.upload_attendance.upload_attendance.upload'
+ method: 'erpnext.hr.doctype.upload_attendance.upload_attendance.upload'
},
sample_url: "e.g. http://example.com/somefile.csv",
callback: function(fid, filename, r) {
diff --git a/hr/doctype/upload_attendance/upload_attendance.py b/erpnext/hr/doctype/upload_attendance/upload_attendance.py
similarity index 97%
rename from hr/doctype/upload_attendance/upload_attendance.py
rename to erpnext/hr/doctype/upload_attendance/upload_attendance.py
index 7bd1fd0..53b88f7 100644
--- a/hr/doctype/upload_attendance/upload_attendance.py
+++ b/erpnext/hr/doctype/upload_attendance/upload_attendance.py
@@ -51,7 +51,7 @@
return w
def add_data(w, args):
- from accounts.utils import get_fiscal_year
+ from erpnext.accounts.utils import get_fiscal_year
dates = get_dates(args)
employees = get_active_employees()
@@ -138,7 +138,7 @@
error = True
ret.append('Error for row (#%d) %s : %s' % (row_idx,
len(row)>1 and row[1] or "", cstr(e)))
- webnotes.errprint(webnotes.getTraceback())
+ webnotes.errprint(webnotes.get_traceback())
if error:
webnotes.conn.rollback()
diff --git a/hr/doctype/upload_attendance/upload_attendance.txt b/erpnext/hr/doctype/upload_attendance/upload_attendance.txt
similarity index 100%
rename from hr/doctype/upload_attendance/upload_attendance.txt
rename to erpnext/hr/doctype/upload_attendance/upload_attendance.txt
diff --git a/hr/page/__init__.py b/erpnext/hr/page/__init__.py
similarity index 100%
rename from hr/page/__init__.py
rename to erpnext/hr/page/__init__.py
diff --git a/hr/page/hr_home/__init__.py b/erpnext/hr/page/hr_home/__init__.py
similarity index 100%
rename from hr/page/hr_home/__init__.py
rename to erpnext/hr/page/hr_home/__init__.py
diff --git a/hr/page/hr_home/hr_home.js b/erpnext/hr/page/hr_home/hr_home.js
similarity index 100%
rename from hr/page/hr_home/hr_home.js
rename to erpnext/hr/page/hr_home/hr_home.js
diff --git a/hr/page/hr_home/hr_home.txt b/erpnext/hr/page/hr_home/hr_home.txt
similarity index 100%
rename from hr/page/hr_home/hr_home.txt
rename to erpnext/hr/page/hr_home/hr_home.txt
diff --git a/hr/report/__init__.py b/erpnext/hr/report/__init__.py
similarity index 100%
rename from hr/report/__init__.py
rename to erpnext/hr/report/__init__.py
diff --git a/hr/report/employee_birthday/__init__.py b/erpnext/hr/report/employee_birthday/__init__.py
similarity index 100%
rename from hr/report/employee_birthday/__init__.py
rename to erpnext/hr/report/employee_birthday/__init__.py
diff --git a/hr/report/employee_birthday/employee_birthday.js b/erpnext/hr/report/employee_birthday/employee_birthday.js
similarity index 100%
rename from hr/report/employee_birthday/employee_birthday.js
rename to erpnext/hr/report/employee_birthday/employee_birthday.js
diff --git a/hr/report/employee_birthday/employee_birthday.py b/erpnext/hr/report/employee_birthday/employee_birthday.py
similarity index 100%
rename from hr/report/employee_birthday/employee_birthday.py
rename to erpnext/hr/report/employee_birthday/employee_birthday.py
diff --git a/hr/report/employee_birthday/employee_birthday.txt b/erpnext/hr/report/employee_birthday/employee_birthday.txt
similarity index 100%
rename from hr/report/employee_birthday/employee_birthday.txt
rename to erpnext/hr/report/employee_birthday/employee_birthday.txt
diff --git a/hr/report/employee_information/__init__.py b/erpnext/hr/report/employee_information/__init__.py
similarity index 100%
rename from hr/report/employee_information/__init__.py
rename to erpnext/hr/report/employee_information/__init__.py
diff --git a/hr/report/employee_information/employee_information.txt b/erpnext/hr/report/employee_information/employee_information.txt
similarity index 100%
rename from hr/report/employee_information/employee_information.txt
rename to erpnext/hr/report/employee_information/employee_information.txt
diff --git a/hr/report/employee_leave_balance/__init__.py b/erpnext/hr/report/employee_leave_balance/__init__.py
similarity index 100%
rename from hr/report/employee_leave_balance/__init__.py
rename to erpnext/hr/report/employee_leave_balance/__init__.py
diff --git a/hr/report/employee_leave_balance/employee_leave_balance.js b/erpnext/hr/report/employee_leave_balance/employee_leave_balance.js
similarity index 100%
rename from hr/report/employee_leave_balance/employee_leave_balance.js
rename to erpnext/hr/report/employee_leave_balance/employee_leave_balance.js
diff --git a/hr/report/employee_leave_balance/employee_leave_balance.py b/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py
similarity index 100%
rename from hr/report/employee_leave_balance/employee_leave_balance.py
rename to erpnext/hr/report/employee_leave_balance/employee_leave_balance.py
diff --git a/hr/report/employee_leave_balance/employee_leave_balance.txt b/erpnext/hr/report/employee_leave_balance/employee_leave_balance.txt
similarity index 100%
rename from hr/report/employee_leave_balance/employee_leave_balance.txt
rename to erpnext/hr/report/employee_leave_balance/employee_leave_balance.txt
diff --git a/hr/report/monthly_attendance_sheet/__init__.py b/erpnext/hr/report/monthly_attendance_sheet/__init__.py
similarity index 100%
rename from hr/report/monthly_attendance_sheet/__init__.py
rename to erpnext/hr/report/monthly_attendance_sheet/__init__.py
diff --git a/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.js b/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.js
similarity index 100%
rename from hr/report/monthly_attendance_sheet/monthly_attendance_sheet.js
rename to erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.js
diff --git a/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py b/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py
similarity index 100%
rename from hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py
rename to erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py
diff --git a/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.txt b/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.txt
similarity index 100%
rename from hr/report/monthly_attendance_sheet/monthly_attendance_sheet.txt
rename to erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.txt
diff --git a/hr/report/monthly_salary_register/__init__.py b/erpnext/hr/report/monthly_salary_register/__init__.py
similarity index 100%
rename from hr/report/monthly_salary_register/__init__.py
rename to erpnext/hr/report/monthly_salary_register/__init__.py
diff --git a/hr/report/monthly_salary_register/monthly_salary_register.js b/erpnext/hr/report/monthly_salary_register/monthly_salary_register.js
similarity index 100%
rename from hr/report/monthly_salary_register/monthly_salary_register.js
rename to erpnext/hr/report/monthly_salary_register/monthly_salary_register.js
diff --git a/hr/report/monthly_salary_register/monthly_salary_register.py b/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py
similarity index 100%
rename from hr/report/monthly_salary_register/monthly_salary_register.py
rename to erpnext/hr/report/monthly_salary_register/monthly_salary_register.py
diff --git a/hr/report/monthly_salary_register/monthly_salary_register.txt b/erpnext/hr/report/monthly_salary_register/monthly_salary_register.txt
similarity index 100%
rename from hr/report/monthly_salary_register/monthly_salary_register.txt
rename to erpnext/hr/report/monthly_salary_register/monthly_salary_register.txt
diff --git a/hr/utils.py b/erpnext/hr/utils.py
similarity index 100%
rename from hr/utils.py
rename to erpnext/hr/utils.py
diff --git a/manufacturing/README.md b/erpnext/manufacturing/README.md
similarity index 100%
rename from manufacturing/README.md
rename to erpnext/manufacturing/README.md
diff --git a/manufacturing/__init__.py b/erpnext/manufacturing/__init__.py
similarity index 100%
rename from manufacturing/__init__.py
rename to erpnext/manufacturing/__init__.py
diff --git a/manufacturing/doctype/__init__.py b/erpnext/manufacturing/doctype/__init__.py
similarity index 100%
rename from manufacturing/doctype/__init__.py
rename to erpnext/manufacturing/doctype/__init__.py
diff --git a/manufacturing/doctype/bom/README.md b/erpnext/manufacturing/doctype/bom/README.md
similarity index 100%
rename from manufacturing/doctype/bom/README.md
rename to erpnext/manufacturing/doctype/bom/README.md
diff --git a/manufacturing/doctype/bom/__init__.py b/erpnext/manufacturing/doctype/bom/__init__.py
similarity index 100%
rename from manufacturing/doctype/bom/__init__.py
rename to erpnext/manufacturing/doctype/bom/__init__.py
diff --git a/manufacturing/doctype/bom/bom.js b/erpnext/manufacturing/doctype/bom/bom.js
similarity index 97%
rename from manufacturing/doctype/bom/bom.js
rename to erpnext/manufacturing/doctype/bom/bom.js
index a43e5da..c0dcdfc 100644
--- a/manufacturing/doctype/bom/bom.js
+++ b/erpnext/manufacturing/doctype/bom/bom.js
@@ -167,7 +167,7 @@
cur_frm.fields_dict['item'].get_query = function(doc) {
return{
- query:"controllers.queries.item_query",
+ query: "erpnext.controllers.queries.item_query",
filters:{
'is_manufactured_item': 'Yes'
}
@@ -184,7 +184,7 @@
cur_frm.fields_dict['bom_materials'].grid.get_field('item_code').get_query = function(doc) {
return{
- query:"controllers.queries.item_query"
+ query: "erpnext.controllers.queries.item_query"
}
}
diff --git a/manufacturing/doctype/bom/bom.py b/erpnext/manufacturing/doctype/bom/bom.py
similarity index 98%
rename from manufacturing/doctype/bom/bom.py
rename to erpnext/manufacturing/doctype/bom/bom.py
index 7b647a7..45e96f7 100644
--- a/manufacturing/doctype/bom/bom.py
+++ b/erpnext/manufacturing/doctype/bom/bom.py
@@ -30,7 +30,7 @@
self.clear_operations()
self.validate_main_item()
- from utilities.transaction_base import validate_uom_is_integer
+ from erpnext.utilities.transaction_base import validate_uom_is_integer
validate_uom_is_integer(self.doclist, "stock_uom", "qty")
self.validate_operations()
@@ -152,7 +152,7 @@
as per valuation method (MAR/FIFO)
as on costing date
"""
- from stock.utils import get_incoming_rate
+ from erpnext.stock.utils import get_incoming_rate
dt = self.doc.costing_date or nowdate()
time = self.doc.costing_date == nowdate() and now().split()[1] or '23:59'
warehouse = webnotes.conn.sql("select warehouse from `tabBin` where item_code = %s", args['item_code'])
diff --git a/manufacturing/doctype/bom/bom.txt b/erpnext/manufacturing/doctype/bom/bom.txt
similarity index 100%
rename from manufacturing/doctype/bom/bom.txt
rename to erpnext/manufacturing/doctype/bom/bom.txt
diff --git a/manufacturing/doctype/bom/test_bom.py b/erpnext/manufacturing/doctype/bom/test_bom.py
similarity index 92%
rename from manufacturing/doctype/bom/test_bom.py
rename to erpnext/manufacturing/doctype/bom/test_bom.py
index 7917ab3..5f9186a 100644
--- a/manufacturing/doctype/bom/test_bom.py
+++ b/erpnext/manufacturing/doctype/bom/test_bom.py
@@ -98,14 +98,14 @@
class TestBOM(unittest.TestCase):
def test_get_items(self):
- from manufacturing.doctype.bom.bom import get_bom_items_as_dict
+ from erpnext.manufacturing.doctype.bom.bom import get_bom_items_as_dict
items_dict = get_bom_items_as_dict(bom="BOM/_Test FG Item 2/001", qty=1, fetch_exploded=0)
self.assertTrue(test_records[2][1]["item_code"] in items_dict)
self.assertTrue(test_records[2][2]["item_code"] in items_dict)
self.assertEquals(len(items_dict.values()), 2)
def test_get_items_exploded(self):
- from manufacturing.doctype.bom.bom import get_bom_items_as_dict
+ from erpnext.manufacturing.doctype.bom.bom import get_bom_items_as_dict
items_dict = get_bom_items_as_dict(bom="BOM/_Test FG Item 2/001", qty=1, fetch_exploded=1)
self.assertTrue(test_records[2][1]["item_code"] in items_dict)
self.assertFalse(test_records[2][2]["item_code"] in items_dict)
@@ -114,6 +114,6 @@
self.assertEquals(len(items_dict.values()), 3)
def test_get_items_list(self):
- from manufacturing.doctype.bom.bom import get_bom_items
+ from erpnext.manufacturing.doctype.bom.bom import get_bom_items
self.assertEquals(len(get_bom_items(bom="BOM/_Test FG Item 2/001", qty=1, fetch_exploded=1)), 3)
diff --git a/manufacturing/doctype/bom_explosion_item/README.md b/erpnext/manufacturing/doctype/bom_explosion_item/README.md
similarity index 100%
rename from manufacturing/doctype/bom_explosion_item/README.md
rename to erpnext/manufacturing/doctype/bom_explosion_item/README.md
diff --git a/manufacturing/doctype/bom_explosion_item/__init__.py b/erpnext/manufacturing/doctype/bom_explosion_item/__init__.py
similarity index 100%
rename from manufacturing/doctype/bom_explosion_item/__init__.py
rename to erpnext/manufacturing/doctype/bom_explosion_item/__init__.py
diff --git a/manufacturing/doctype/bom_explosion_item/bom_explosion_item.py b/erpnext/manufacturing/doctype/bom_explosion_item/bom_explosion_item.py
similarity index 100%
rename from manufacturing/doctype/bom_explosion_item/bom_explosion_item.py
rename to erpnext/manufacturing/doctype/bom_explosion_item/bom_explosion_item.py
diff --git a/manufacturing/doctype/bom_explosion_item/bom_explosion_item.txt b/erpnext/manufacturing/doctype/bom_explosion_item/bom_explosion_item.txt
similarity index 100%
rename from manufacturing/doctype/bom_explosion_item/bom_explosion_item.txt
rename to erpnext/manufacturing/doctype/bom_explosion_item/bom_explosion_item.txt
diff --git a/manufacturing/doctype/bom_item/README.md b/erpnext/manufacturing/doctype/bom_item/README.md
similarity index 100%
rename from manufacturing/doctype/bom_item/README.md
rename to erpnext/manufacturing/doctype/bom_item/README.md
diff --git a/manufacturing/doctype/bom_item/__init__.py b/erpnext/manufacturing/doctype/bom_item/__init__.py
similarity index 100%
rename from manufacturing/doctype/bom_item/__init__.py
rename to erpnext/manufacturing/doctype/bom_item/__init__.py
diff --git a/manufacturing/doctype/bom_item/bom_item.py b/erpnext/manufacturing/doctype/bom_item/bom_item.py
similarity index 100%
rename from manufacturing/doctype/bom_item/bom_item.py
rename to erpnext/manufacturing/doctype/bom_item/bom_item.py
diff --git a/manufacturing/doctype/bom_item/bom_item.txt b/erpnext/manufacturing/doctype/bom_item/bom_item.txt
similarity index 100%
rename from manufacturing/doctype/bom_item/bom_item.txt
rename to erpnext/manufacturing/doctype/bom_item/bom_item.txt
diff --git a/manufacturing/doctype/bom_operation/README.md b/erpnext/manufacturing/doctype/bom_operation/README.md
similarity index 100%
rename from manufacturing/doctype/bom_operation/README.md
rename to erpnext/manufacturing/doctype/bom_operation/README.md
diff --git a/manufacturing/doctype/bom_operation/__init__.py b/erpnext/manufacturing/doctype/bom_operation/__init__.py
similarity index 100%
rename from manufacturing/doctype/bom_operation/__init__.py
rename to erpnext/manufacturing/doctype/bom_operation/__init__.py
diff --git a/manufacturing/doctype/bom_operation/bom_operation.py b/erpnext/manufacturing/doctype/bom_operation/bom_operation.py
similarity index 100%
rename from manufacturing/doctype/bom_operation/bom_operation.py
rename to erpnext/manufacturing/doctype/bom_operation/bom_operation.py
diff --git a/manufacturing/doctype/bom_operation/bom_operation.txt b/erpnext/manufacturing/doctype/bom_operation/bom_operation.txt
similarity index 100%
rename from manufacturing/doctype/bom_operation/bom_operation.txt
rename to erpnext/manufacturing/doctype/bom_operation/bom_operation.txt
diff --git a/manufacturing/doctype/bom_replace_tool/README.md b/erpnext/manufacturing/doctype/bom_replace_tool/README.md
similarity index 100%
rename from manufacturing/doctype/bom_replace_tool/README.md
rename to erpnext/manufacturing/doctype/bom_replace_tool/README.md
diff --git a/manufacturing/doctype/bom_replace_tool/__init__.py b/erpnext/manufacturing/doctype/bom_replace_tool/__init__.py
similarity index 100%
rename from manufacturing/doctype/bom_replace_tool/__init__.py
rename to erpnext/manufacturing/doctype/bom_replace_tool/__init__.py
diff --git a/manufacturing/doctype/bom_replace_tool/bom_replace_tool.js b/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.js
similarity index 82%
rename from manufacturing/doctype/bom_replace_tool/bom_replace_tool.js
rename to erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.js
index 3bf31f9..e5415ad 100644
--- a/manufacturing/doctype/bom_replace_tool/bom_replace_tool.js
+++ b/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.js
@@ -8,7 +8,7 @@
cur_frm.set_query("current_bom", function(doc) {
return{
- query:"controllers.queries.bom",
+ query: "erpnext.controllers.queries.bom",
filters: {name: "!" + doc.new_bom}
}
});
@@ -16,7 +16,7 @@
cur_frm.set_query("new_bom", function(doc) {
return{
- query:"controllers.queries.bom",
+ query: "erpnext.controllers.queries.bom",
filters: {name: "!" + doc.current_bom}
}
});
\ No newline at end of file
diff --git a/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py b/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py
similarity index 100%
rename from manufacturing/doctype/bom_replace_tool/bom_replace_tool.py
rename to erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py
diff --git a/manufacturing/doctype/bom_replace_tool/bom_replace_tool.txt b/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.txt
similarity index 100%
rename from manufacturing/doctype/bom_replace_tool/bom_replace_tool.txt
rename to erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.txt
diff --git a/manufacturing/doctype/production_order/README.md b/erpnext/manufacturing/doctype/production_order/README.md
similarity index 100%
rename from manufacturing/doctype/production_order/README.md
rename to erpnext/manufacturing/doctype/production_order/README.md
diff --git a/manufacturing/doctype/production_order/__init__.py b/erpnext/manufacturing/doctype/production_order/__init__.py
similarity index 100%
rename from manufacturing/doctype/production_order/__init__.py
rename to erpnext/manufacturing/doctype/production_order/__init__.py
diff --git a/manufacturing/doctype/production_order/production_order.js b/erpnext/manufacturing/doctype/production_order/production_order.js
similarity index 95%
rename from manufacturing/doctype/production_order/production_order.js
rename to erpnext/manufacturing/doctype/production_order/production_order.js
index 31900ea..480f1a6 100644
--- a/manufacturing/doctype/production_order/production_order.js
+++ b/erpnext/manufacturing/doctype/production_order/production_order.js
@@ -39,7 +39,7 @@
var me = this;
wn.call({
- method:"manufacturing.doctype.production_order.production_order.make_stock_entry",
+ method:"erpnext.manufacturing.doctype.production_order.production_order.make_stock_entry",
args: {
"production_order_id": me.frm.doc.name,
"purpose": purpose
@@ -108,7 +108,7 @@
cur_frm.set_query("bom_no", function(doc) {
if (doc.production_item) {
return{
- query:"controllers.queries.bom",
+ query: "erpnext.controllers.queries.bom",
filters: {item: cstr(doc.production_item)}
}
} else msgprint(wn._("Please enter Production Item first"));
diff --git a/manufacturing/doctype/production_order/production_order.py b/erpnext/manufacturing/doctype/production_order/production_order.py
similarity index 94%
rename from manufacturing/doctype/production_order/production_order.py
rename to erpnext/manufacturing/doctype/production_order/production_order.py
index bcb13f8..8d0223e 100644
--- a/manufacturing/doctype/production_order/production_order.py
+++ b/erpnext/manufacturing/doctype/production_order/production_order.py
@@ -19,15 +19,15 @@
if self.doc.docstatus == 0:
self.doc.status = "Draft"
- import utilities
- utilities.validate_status(self.doc.status, ["Draft", "Submitted", "Stopped",
+ from erpnext.utilities import validate_status
+ validate_status(self.doc.status, ["Draft", "Submitted", "Stopped",
"In Process", "Completed", "Cancelled"])
self.validate_bom_no()
self.validate_sales_order()
self.validate_warehouse()
- from utilities.transaction_base import validate_uom_is_integer
+ from erpnext.utilities.transaction_base import validate_uom_is_integer
validate_uom_is_integer(self.doclist, "stock_uom", ["qty", "produced_qty"])
def validate_bom_no(self):
@@ -54,7 +54,7 @@
self.validate_production_order_against_so()
def validate_warehouse(self):
- from stock.utils import validate_warehouse_user, validate_warehouse_company
+ from erpnext.stock.utils import validate_warehouse_user, validate_warehouse_company
for w in [self.doc.fg_warehouse, self.doc.wip_warehouse]:
validate_warehouse_user(w)
@@ -132,7 +132,7 @@
"posting_date": nowdate(),
"planned_qty": flt(qty)
}
- from stock.utils import update_bin
+ from erpnext.stock.utils import update_bin
update_bin(args)
@webnotes.whitelist()
diff --git a/manufacturing/doctype/production_order/production_order.txt b/erpnext/manufacturing/doctype/production_order/production_order.txt
similarity index 100%
rename from manufacturing/doctype/production_order/production_order.txt
rename to erpnext/manufacturing/doctype/production_order/production_order.txt
diff --git a/manufacturing/doctype/production_order/test_production_order.py b/erpnext/manufacturing/doctype/production_order/test_production_order.py
similarity index 83%
rename from manufacturing/doctype/production_order/test_production_order.py
rename to erpnext/manufacturing/doctype/production_order/test_production_order.py
index 5269729..62bb26e 100644
--- a/manufacturing/doctype/production_order/test_production_order.py
+++ b/erpnext/manufacturing/doctype/production_order/test_production_order.py
@@ -5,8 +5,8 @@
from __future__ import unicode_literals
import unittest
import webnotes
-from stock.doctype.purchase_receipt.test_purchase_receipt import set_perpetual_inventory
-from manufacturing.doctype.production_order.production_order import make_stock_entry
+from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import set_perpetual_inventory
+from erpnext.manufacturing.doctype.production_order.production_order import make_stock_entry
class TestProductionOrder(unittest.TestCase):
@@ -20,7 +20,7 @@
pro_bean.insert()
pro_bean.submit()
- from stock.doctype.stock_entry.test_stock_entry import test_records as se_test_records
+ from erpnext.stock.doctype.stock_entry.test_stock_entry import test_records as se_test_records
mr1 = webnotes.bean(copy = se_test_records[0])
mr1.insert()
mr1.submit()
@@ -45,7 +45,7 @@
return pro_bean.doc.name
def test_over_production(self):
- from stock.doctype.stock_entry.stock_entry import StockOverProductionError
+ from erpnext.stock.doctype.stock_entry.stock_entry import StockOverProductionError
pro_order = self.test_planned_qty()
stock_entry = make_stock_entry(pro_order, "Manufacture/Repack")
diff --git a/manufacturing/doctype/production_plan_item/README.md b/erpnext/manufacturing/doctype/production_plan_item/README.md
similarity index 100%
rename from manufacturing/doctype/production_plan_item/README.md
rename to erpnext/manufacturing/doctype/production_plan_item/README.md
diff --git a/manufacturing/doctype/production_plan_item/__init__.py b/erpnext/manufacturing/doctype/production_plan_item/__init__.py
similarity index 100%
rename from manufacturing/doctype/production_plan_item/__init__.py
rename to erpnext/manufacturing/doctype/production_plan_item/__init__.py
diff --git a/manufacturing/doctype/production_plan_item/production_plan_item.py b/erpnext/manufacturing/doctype/production_plan_item/production_plan_item.py
similarity index 100%
rename from manufacturing/doctype/production_plan_item/production_plan_item.py
rename to erpnext/manufacturing/doctype/production_plan_item/production_plan_item.py
diff --git a/manufacturing/doctype/production_plan_item/production_plan_item.txt b/erpnext/manufacturing/doctype/production_plan_item/production_plan_item.txt
similarity index 100%
rename from manufacturing/doctype/production_plan_item/production_plan_item.txt
rename to erpnext/manufacturing/doctype/production_plan_item/production_plan_item.txt
diff --git a/manufacturing/doctype/production_plan_sales_order/README.md b/erpnext/manufacturing/doctype/production_plan_sales_order/README.md
similarity index 100%
rename from manufacturing/doctype/production_plan_sales_order/README.md
rename to erpnext/manufacturing/doctype/production_plan_sales_order/README.md
diff --git a/manufacturing/doctype/production_plan_sales_order/__init__.py b/erpnext/manufacturing/doctype/production_plan_sales_order/__init__.py
similarity index 100%
rename from manufacturing/doctype/production_plan_sales_order/__init__.py
rename to erpnext/manufacturing/doctype/production_plan_sales_order/__init__.py
diff --git a/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.py b/erpnext/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.py
similarity index 100%
rename from manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.py
rename to erpnext/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.py
diff --git a/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.txt b/erpnext/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.txt
similarity index 100%
rename from manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.txt
rename to erpnext/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.txt
diff --git a/manufacturing/doctype/production_planning_tool/README.md b/erpnext/manufacturing/doctype/production_planning_tool/README.md
similarity index 100%
rename from manufacturing/doctype/production_planning_tool/README.md
rename to erpnext/manufacturing/doctype/production_planning_tool/README.md
diff --git a/manufacturing/doctype/production_planning_tool/__init__.py b/erpnext/manufacturing/doctype/production_planning_tool/__init__.py
similarity index 100%
rename from manufacturing/doctype/production_planning_tool/__init__.py
rename to erpnext/manufacturing/doctype/production_planning_tool/__init__.py
diff --git a/manufacturing/doctype/production_planning_tool/production_planning_tool.js b/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js
similarity index 94%
rename from manufacturing/doctype/production_planning_tool/production_planning_tool.js
rename to erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js
index 870f01f..f52fb8d 100644
--- a/manufacturing/doctype/production_planning_tool/production_planning_tool.js
+++ b/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js
@@ -41,7 +41,7 @@
var d = locals[this.doctype][this.docname];
if (d.item_code) {
return {
- query:"controllers.queries.bom",
+ query: "erpnext.controllers.queries.bom",
filters:{'item': cstr(d.item_code)}
}
} else msgprint(wn._("Please enter Item first"));
@@ -49,7 +49,7 @@
cur_frm.fields_dict.customer.get_query = function(doc,cdt,cdn) {
return{
- query:"controllers.queries.customer_query"
+ query: "erpnext.controllers.queries.customer_query"
}
}
diff --git a/manufacturing/doctype/production_planning_tool/production_planning_tool.py b/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py
similarity index 98%
rename from manufacturing/doctype/production_planning_tool/production_planning_tool.py
rename to erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py
index 29232f5..3b529cb 100644
--- a/manufacturing/doctype/production_planning_tool/production_planning_tool.py
+++ b/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py
@@ -174,7 +174,7 @@
"""It will raise production order (Draft) for all distinct FG items"""
self.validate_data()
- from utilities.transaction_base import validate_uom_is_integer
+ from erpnext.utilities.transaction_base import validate_uom_is_integer
validate_uom_is_integer(self.doclist, "stock_uom", "planned_qty")
items = self.get_distinct_items_and_boms()[1]
@@ -212,7 +212,7 @@
def create_production_order(self, items):
"""Create production order. Called from Production Planning Tool"""
- from manufacturing.doctype.production_order.production_order import OverProductionError
+ from erpnext.manufacturing.doctype.production_order.production_order import OverProductionError
pro_list = []
for key in items:
@@ -362,7 +362,7 @@
def insert_purchase_request(self):
items_to_be_requested = self.get_requested_items()
- from accounts.utils import get_fiscal_year
+ from erpnext.accounts.utils import get_fiscal_year
fiscal_year = get_fiscal_year(nowdate())[0]
purchase_request_list = []
@@ -408,4 +408,4 @@
msgprint("Material Request(s) created: \n%s" %
"\n".join(pur_req))
else:
- msgprint(_("Nothing to request"))
\ No newline at end of file
+ msgprint(_("Nothing to request"))
diff --git a/manufacturing/doctype/production_planning_tool/production_planning_tool.txt b/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.txt
similarity index 100%
rename from manufacturing/doctype/production_planning_tool/production_planning_tool.txt
rename to erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.txt
diff --git a/manufacturing/doctype/workstation/README.md b/erpnext/manufacturing/doctype/workstation/README.md
similarity index 100%
rename from manufacturing/doctype/workstation/README.md
rename to erpnext/manufacturing/doctype/workstation/README.md
diff --git a/manufacturing/doctype/workstation/__init__.py b/erpnext/manufacturing/doctype/workstation/__init__.py
similarity index 100%
rename from manufacturing/doctype/workstation/__init__.py
rename to erpnext/manufacturing/doctype/workstation/__init__.py
diff --git a/manufacturing/doctype/workstation/workstation.js b/erpnext/manufacturing/doctype/workstation/workstation.js
similarity index 100%
rename from manufacturing/doctype/workstation/workstation.js
rename to erpnext/manufacturing/doctype/workstation/workstation.js
diff --git a/manufacturing/doctype/workstation/workstation.py b/erpnext/manufacturing/doctype/workstation/workstation.py
similarity index 100%
rename from manufacturing/doctype/workstation/workstation.py
rename to erpnext/manufacturing/doctype/workstation/workstation.py
diff --git a/manufacturing/doctype/workstation/workstation.txt b/erpnext/manufacturing/doctype/workstation/workstation.txt
similarity index 100%
rename from manufacturing/doctype/workstation/workstation.txt
rename to erpnext/manufacturing/doctype/workstation/workstation.txt
diff --git a/manufacturing/page/__init__.py b/erpnext/manufacturing/page/__init__.py
similarity index 100%
rename from manufacturing/page/__init__.py
rename to erpnext/manufacturing/page/__init__.py
diff --git a/manufacturing/page/manufacturing_home/__init__.py b/erpnext/manufacturing/page/manufacturing_home/__init__.py
similarity index 100%
rename from manufacturing/page/manufacturing_home/__init__.py
rename to erpnext/manufacturing/page/manufacturing_home/__init__.py
diff --git a/manufacturing/page/manufacturing_home/manufacturing_home.js b/erpnext/manufacturing/page/manufacturing_home/manufacturing_home.js
similarity index 100%
rename from manufacturing/page/manufacturing_home/manufacturing_home.js
rename to erpnext/manufacturing/page/manufacturing_home/manufacturing_home.js
diff --git a/manufacturing/page/manufacturing_home/manufacturing_home.txt b/erpnext/manufacturing/page/manufacturing_home/manufacturing_home.txt
similarity index 100%
rename from manufacturing/page/manufacturing_home/manufacturing_home.txt
rename to erpnext/manufacturing/page/manufacturing_home/manufacturing_home.txt
diff --git a/manufacturing/report/__init__.py b/erpnext/manufacturing/report/__init__.py
similarity index 100%
rename from manufacturing/report/__init__.py
rename to erpnext/manufacturing/report/__init__.py
diff --git a/manufacturing/report/completed_production_orders/__init__.py b/erpnext/manufacturing/report/completed_production_orders/__init__.py
similarity index 100%
rename from manufacturing/report/completed_production_orders/__init__.py
rename to erpnext/manufacturing/report/completed_production_orders/__init__.py
diff --git a/manufacturing/report/completed_production_orders/completed_production_orders.txt b/erpnext/manufacturing/report/completed_production_orders/completed_production_orders.txt
similarity index 100%
rename from manufacturing/report/completed_production_orders/completed_production_orders.txt
rename to erpnext/manufacturing/report/completed_production_orders/completed_production_orders.txt
diff --git a/manufacturing/report/issued_items_against_production_order/__init__.py b/erpnext/manufacturing/report/issued_items_against_production_order/__init__.py
similarity index 100%
rename from manufacturing/report/issued_items_against_production_order/__init__.py
rename to erpnext/manufacturing/report/issued_items_against_production_order/__init__.py
diff --git a/manufacturing/report/issued_items_against_production_order/issued_items_against_production_order.txt b/erpnext/manufacturing/report/issued_items_against_production_order/issued_items_against_production_order.txt
similarity index 100%
rename from manufacturing/report/issued_items_against_production_order/issued_items_against_production_order.txt
rename to erpnext/manufacturing/report/issued_items_against_production_order/issued_items_against_production_order.txt
diff --git a/manufacturing/report/open_production_orders/__init__.py b/erpnext/manufacturing/report/open_production_orders/__init__.py
similarity index 100%
rename from manufacturing/report/open_production_orders/__init__.py
rename to erpnext/manufacturing/report/open_production_orders/__init__.py
diff --git a/manufacturing/report/open_production_orders/open_production_orders.txt b/erpnext/manufacturing/report/open_production_orders/open_production_orders.txt
similarity index 100%
rename from manufacturing/report/open_production_orders/open_production_orders.txt
rename to erpnext/manufacturing/report/open_production_orders/open_production_orders.txt
diff --git a/manufacturing/report/production_orders_in_progress/__init__.py b/erpnext/manufacturing/report/production_orders_in_progress/__init__.py
similarity index 100%
rename from manufacturing/report/production_orders_in_progress/__init__.py
rename to erpnext/manufacturing/report/production_orders_in_progress/__init__.py
diff --git a/manufacturing/report/production_orders_in_progress/production_orders_in_progress.txt b/erpnext/manufacturing/report/production_orders_in_progress/production_orders_in_progress.txt
similarity index 100%
rename from manufacturing/report/production_orders_in_progress/production_orders_in_progress.txt
rename to erpnext/manufacturing/report/production_orders_in_progress/production_orders_in_progress.txt
diff --git a/erpnext/modules.txt b/erpnext/modules.txt
new file mode 100644
index 0000000..f7857e4
--- /dev/null
+++ b/erpnext/modules.txt
@@ -0,0 +1,11 @@
+accounts
+buying
+home
+hr
+manufacturing
+projects
+selling
+setup
+stock
+support
+utilities
\ No newline at end of file
diff --git a/hr/report/__init__.py b/erpnext/patches.txt
similarity index 100%
copy from hr/report/__init__.py
copy to erpnext/patches.txt
diff --git a/patches/1311/__init__.py b/erpnext/patches/1311/__init__.py
similarity index 100%
rename from patches/1311/__init__.py
rename to erpnext/patches/1311/__init__.py
diff --git a/patches/1311/p01_cleanup.py b/erpnext/patches/1311/p01_cleanup.py
similarity index 91%
rename from patches/1311/p01_cleanup.py
rename to erpnext/patches/1311/p01_cleanup.py
index 04d8f6a..23f6576 100644
--- a/patches/1311/p01_cleanup.py
+++ b/erpnext/patches/1311/p01_cleanup.py
@@ -9,7 +9,7 @@
webnotes.reload_doc("buying", "doctype", "purchase_order")
webnotes.reload_doc("selling", "doctype", "lead")
- from core.doctype.custom_field.custom_field import create_custom_field_if_values_exist
+ from webnotes.core.doctype.custom_field.custom_field import create_custom_field_if_values_exist
create_custom_field_if_values_exist("Material Request",
{"fieldtype":"Text", "fieldname":"remark", "label":"Remarks","insert_after":"Fiscal Year"})
diff --git a/patches/1311/p01_make_gl_entries_for_si.py b/erpnext/patches/1311/p01_make_gl_entries_for_si.py
similarity index 100%
rename from patches/1311/p01_make_gl_entries_for_si.py
rename to erpnext/patches/1311/p01_make_gl_entries_for_si.py
diff --git a/patches/1311/p02_index_singles.py b/erpnext/patches/1311/p02_index_singles.py
similarity index 100%
rename from patches/1311/p02_index_singles.py
rename to erpnext/patches/1311/p02_index_singles.py
diff --git a/patches/1311/p03_update_reqd_report_fields.py b/erpnext/patches/1311/p03_update_reqd_report_fields.py
similarity index 100%
rename from patches/1311/p03_update_reqd_report_fields.py
rename to erpnext/patches/1311/p03_update_reqd_report_fields.py
diff --git a/patches/1311/p04_update_comments.py b/erpnext/patches/1311/p04_update_comments.py
similarity index 100%
rename from patches/1311/p04_update_comments.py
rename to erpnext/patches/1311/p04_update_comments.py
diff --git a/patches/1311/p04_update_year_end_date_of_fiscal_year.py b/erpnext/patches/1311/p04_update_year_end_date_of_fiscal_year.py
similarity index 100%
rename from patches/1311/p04_update_year_end_date_of_fiscal_year.py
rename to erpnext/patches/1311/p04_update_year_end_date_of_fiscal_year.py
diff --git a/patches/1311/p05_website_brand_html.py b/erpnext/patches/1311/p05_website_brand_html.py
similarity index 100%
rename from patches/1311/p05_website_brand_html.py
rename to erpnext/patches/1311/p05_website_brand_html.py
diff --git a/patches/1311/p06_fix_report_columns.py b/erpnext/patches/1311/p06_fix_report_columns.py
similarity index 100%
rename from patches/1311/p06_fix_report_columns.py
rename to erpnext/patches/1311/p06_fix_report_columns.py
diff --git a/patches/__init__.py b/erpnext/patches/__init__.py
similarity index 100%
rename from patches/__init__.py
rename to erpnext/patches/__init__.py
diff --git a/patches/april_2013/__init__.py b/erpnext/patches/april_2013/__init__.py
similarity index 100%
rename from patches/april_2013/__init__.py
rename to erpnext/patches/april_2013/__init__.py
diff --git a/patches/april_2013/p01_update_serial_no_valuation_rate.py b/erpnext/patches/april_2013/p01_update_serial_no_valuation_rate.py
similarity index 95%
rename from patches/april_2013/p01_update_serial_no_valuation_rate.py
rename to erpnext/patches/april_2013/p01_update_serial_no_valuation_rate.py
index 18fe9b5..c6f0612 100644
--- a/patches/april_2013/p01_update_serial_no_valuation_rate.py
+++ b/erpnext/patches/april_2013/p01_update_serial_no_valuation_rate.py
@@ -3,7 +3,7 @@
import webnotes
from webnotes.utils import cstr
-from stock.stock_ledger import update_entries_after
+from erpnext.stock.stock_ledger import update_entries_after
def execute():
webnotes.conn.auto_commit_on_many_writes = 1
diff --git a/patches/april_2013/p02_add_country_and_currency.py b/erpnext/patches/april_2013/p02_add_country_and_currency.py
similarity index 100%
rename from patches/april_2013/p02_add_country_and_currency.py
rename to erpnext/patches/april_2013/p02_add_country_and_currency.py
diff --git a/patches/april_2013/p03_fixes_for_lead_in_quotation.py b/erpnext/patches/april_2013/p03_fixes_for_lead_in_quotation.py
similarity index 100%
rename from patches/april_2013/p03_fixes_for_lead_in_quotation.py
rename to erpnext/patches/april_2013/p03_fixes_for_lead_in_quotation.py
diff --git a/patches/april_2013/p04_reverse_modules_list.py b/erpnext/patches/april_2013/p04_reverse_modules_list.py
similarity index 100%
rename from patches/april_2013/p04_reverse_modules_list.py
rename to erpnext/patches/april_2013/p04_reverse_modules_list.py
diff --git a/patches/april_2013/p04_update_role_in_pages.py b/erpnext/patches/april_2013/p04_update_role_in_pages.py
similarity index 100%
rename from patches/april_2013/p04_update_role_in_pages.py
rename to erpnext/patches/april_2013/p04_update_role_in_pages.py
diff --git a/patches/april_2013/p05_fixes_in_reverse_modules.py b/erpnext/patches/april_2013/p05_fixes_in_reverse_modules.py
similarity index 100%
rename from patches/april_2013/p05_fixes_in_reverse_modules.py
rename to erpnext/patches/april_2013/p05_fixes_in_reverse_modules.py
diff --git a/patches/april_2013/p05_update_file_data.py b/erpnext/patches/april_2013/p05_update_file_data.py
similarity index 98%
rename from patches/april_2013/p05_update_file_data.py
rename to erpnext/patches/april_2013/p05_update_file_data.py
index b41019d..1403dff 100644
--- a/patches/april_2013/p05_update_file_data.py
+++ b/erpnext/patches/april_2013/p05_update_file_data.py
@@ -35,7 +35,7 @@
webnotes.conn.commit()
webnotes.conn.sql("""alter table `tab%s` drop column `file_list`""" % doctype)
except Exception, e:
- print webnotes.getTraceback()
+ print webnotes.get_traceback()
if (e.args and e.args[0]!=1054) or not e.args:
raise
diff --git a/patches/april_2013/p06_default_cost_center.py b/erpnext/patches/april_2013/p06_default_cost_center.py
similarity index 100%
rename from patches/april_2013/p06_default_cost_center.py
rename to erpnext/patches/april_2013/p06_default_cost_center.py
diff --git a/patches/april_2013/p06_update_file_size.py b/erpnext/patches/april_2013/p06_update_file_size.py
similarity index 100%
rename from patches/april_2013/p06_update_file_size.py
rename to erpnext/patches/april_2013/p06_update_file_size.py
diff --git a/patches/april_2013/p07_rename_cost_center_other_charges.py b/erpnext/patches/april_2013/p07_rename_cost_center_other_charges.py
similarity index 100%
rename from patches/april_2013/p07_rename_cost_center_other_charges.py
rename to erpnext/patches/april_2013/p07_rename_cost_center_other_charges.py
diff --git a/patches/april_2013/p07_update_file_data_2.py b/erpnext/patches/april_2013/p07_update_file_data_2.py
similarity index 100%
rename from patches/april_2013/p07_update_file_data_2.py
rename to erpnext/patches/april_2013/p07_update_file_data_2.py
diff --git a/patches/april_2013/rebuild_sales_browser.py b/erpnext/patches/april_2013/rebuild_sales_browser.py
similarity index 100%
rename from patches/april_2013/rebuild_sales_browser.py
rename to erpnext/patches/april_2013/rebuild_sales_browser.py
diff --git a/patches/august_2013/__init__.py b/erpnext/patches/august_2013/__init__.py
similarity index 100%
rename from patches/august_2013/__init__.py
rename to erpnext/patches/august_2013/__init__.py
diff --git a/patches/august_2013/fix_fiscal_year.py b/erpnext/patches/august_2013/fix_fiscal_year.py
similarity index 100%
rename from patches/august_2013/fix_fiscal_year.py
rename to erpnext/patches/august_2013/fix_fiscal_year.py
diff --git a/patches/august_2013/p01_auto_accounting_for_stock_patch.py b/erpnext/patches/august_2013/p01_auto_accounting_for_stock_patch.py
similarity index 100%
rename from patches/august_2013/p01_auto_accounting_for_stock_patch.py
rename to erpnext/patches/august_2013/p01_auto_accounting_for_stock_patch.py
diff --git a/patches/august_2013/p01_hr_settings.py b/erpnext/patches/august_2013/p01_hr_settings.py
similarity index 100%
rename from patches/august_2013/p01_hr_settings.py
rename to erpnext/patches/august_2013/p01_hr_settings.py
diff --git a/patches/august_2013/p02_rename_price_list.py b/erpnext/patches/august_2013/p02_rename_price_list.py
similarity index 100%
rename from patches/august_2013/p02_rename_price_list.py
rename to erpnext/patches/august_2013/p02_rename_price_list.py
diff --git a/patches/august_2013/p03_pos_setting_replace_customer_account.py b/erpnext/patches/august_2013/p03_pos_setting_replace_customer_account.py
similarity index 100%
rename from patches/august_2013/p03_pos_setting_replace_customer_account.py
rename to erpnext/patches/august_2013/p03_pos_setting_replace_customer_account.py
diff --git a/patches/august_2013/p05_employee_birthdays.py b/erpnext/patches/august_2013/p05_employee_birthdays.py
similarity index 100%
rename from patches/august_2013/p05_employee_birthdays.py
rename to erpnext/patches/august_2013/p05_employee_birthdays.py
diff --git a/patches/august_2013/p05_update_serial_no_status.py b/erpnext/patches/august_2013/p05_update_serial_no_status.py
similarity index 100%
rename from patches/august_2013/p05_update_serial_no_status.py
rename to erpnext/patches/august_2013/p05_update_serial_no_status.py
diff --git a/patches/august_2013/p06_deprecate_is_cancelled.py b/erpnext/patches/august_2013/p06_deprecate_is_cancelled.py
similarity index 100%
rename from patches/august_2013/p06_deprecate_is_cancelled.py
rename to erpnext/patches/august_2013/p06_deprecate_is_cancelled.py
diff --git a/patches/august_2013/p06_fix_sle_against_stock_entry.py b/erpnext/patches/august_2013/p06_fix_sle_against_stock_entry.py
similarity index 100%
rename from patches/august_2013/p06_fix_sle_against_stock_entry.py
rename to erpnext/patches/august_2013/p06_fix_sle_against_stock_entry.py
diff --git a/patches/december_2012/__init__.py b/erpnext/patches/december_2012/__init__.py
similarity index 100%
rename from patches/december_2012/__init__.py
rename to erpnext/patches/december_2012/__init__.py
diff --git a/patches/december_2012/address_title.py b/erpnext/patches/december_2012/address_title.py
similarity index 100%
rename from patches/december_2012/address_title.py
rename to erpnext/patches/december_2012/address_title.py
diff --git a/patches/december_2012/delete_form16_print_format.py b/erpnext/patches/december_2012/delete_form16_print_format.py
similarity index 100%
rename from patches/december_2012/delete_form16_print_format.py
rename to erpnext/patches/december_2012/delete_form16_print_format.py
diff --git a/patches/december_2012/deleted_contact_address_patch.py b/erpnext/patches/december_2012/deleted_contact_address_patch.py
similarity index 100%
rename from patches/december_2012/deleted_contact_address_patch.py
rename to erpnext/patches/december_2012/deleted_contact_address_patch.py
diff --git a/patches/december_2012/deprecate_tds.py b/erpnext/patches/december_2012/deprecate_tds.py
similarity index 100%
rename from patches/december_2012/deprecate_tds.py
rename to erpnext/patches/december_2012/deprecate_tds.py
diff --git a/patches/december_2012/expense_leave_reload.py b/erpnext/patches/december_2012/expense_leave_reload.py
similarity index 100%
rename from patches/december_2012/expense_leave_reload.py
rename to erpnext/patches/december_2012/expense_leave_reload.py
diff --git a/patches/december_2012/file_list_rename.py b/erpnext/patches/december_2012/file_list_rename.py
similarity index 100%
rename from patches/december_2012/file_list_rename.py
rename to erpnext/patches/december_2012/file_list_rename.py
diff --git a/patches/december_2012/fix_default_print_format.py b/erpnext/patches/december_2012/fix_default_print_format.py
similarity index 100%
rename from patches/december_2012/fix_default_print_format.py
rename to erpnext/patches/december_2012/fix_default_print_format.py
diff --git a/patches/december_2012/move_recent_to_memcache.py b/erpnext/patches/december_2012/move_recent_to_memcache.py
similarity index 100%
rename from patches/december_2012/move_recent_to_memcache.py
rename to erpnext/patches/december_2012/move_recent_to_memcache.py
diff --git a/patches/december_2012/production_cleanup.py b/erpnext/patches/december_2012/production_cleanup.py
similarity index 100%
rename from patches/december_2012/production_cleanup.py
rename to erpnext/patches/december_2012/production_cleanup.py
diff --git a/patches/december_2012/production_order_naming_series.py b/erpnext/patches/december_2012/production_order_naming_series.py
similarity index 100%
rename from patches/december_2012/production_order_naming_series.py
rename to erpnext/patches/december_2012/production_order_naming_series.py
diff --git a/patches/december_2012/rebuild_item_group_tree.py b/erpnext/patches/december_2012/rebuild_item_group_tree.py
similarity index 100%
rename from patches/december_2012/rebuild_item_group_tree.py
rename to erpnext/patches/december_2012/rebuild_item_group_tree.py
diff --git a/patches/december_2012/remove_quotation_next_contact.py b/erpnext/patches/december_2012/remove_quotation_next_contact.py
similarity index 100%
rename from patches/december_2012/remove_quotation_next_contact.py
rename to erpnext/patches/december_2012/remove_quotation_next_contact.py
diff --git a/patches/december_2012/replace_createlocal.py b/erpnext/patches/december_2012/replace_createlocal.py
similarity index 100%
rename from patches/december_2012/replace_createlocal.py
rename to erpnext/patches/december_2012/replace_createlocal.py
diff --git a/patches/december_2012/repost_ordered_qty.py b/erpnext/patches/december_2012/repost_ordered_qty.py
similarity index 81%
rename from patches/december_2012/repost_ordered_qty.py
rename to erpnext/patches/december_2012/repost_ordered_qty.py
index 05cbb64..5b24fdf 100644
--- a/patches/december_2012/repost_ordered_qty.py
+++ b/erpnext/patches/december_2012/repost_ordered_qty.py
@@ -3,7 +3,7 @@
def execute():
import webnotes
- from utilities.repost_stock import get_ordered_qty, update_bin
+ from erpnext.utilities.repost_stock import get_ordered_qty, update_bin
for d in webnotes.conn.sql("select item_code, warehouse from tabBin"):
update_bin(d[0], d[1], {
diff --git a/patches/december_2012/repost_projected_qty.py b/erpnext/patches/december_2012/repost_projected_qty.py
similarity index 100%
rename from patches/december_2012/repost_projected_qty.py
rename to erpnext/patches/december_2012/repost_projected_qty.py
diff --git a/patches/december_2012/stock_entry_cleanup.py b/erpnext/patches/december_2012/stock_entry_cleanup.py
similarity index 100%
rename from patches/december_2012/stock_entry_cleanup.py
rename to erpnext/patches/december_2012/stock_entry_cleanup.py
diff --git a/patches/december_2012/update_print_width.py b/erpnext/patches/december_2012/update_print_width.py
similarity index 100%
rename from patches/december_2012/update_print_width.py
rename to erpnext/patches/december_2012/update_print_width.py
diff --git a/patches/december_2012/website_cache_refactor.py b/erpnext/patches/december_2012/website_cache_refactor.py
similarity index 100%
rename from patches/december_2012/website_cache_refactor.py
rename to erpnext/patches/december_2012/website_cache_refactor.py
diff --git a/patches/february_2013/__init__.py b/erpnext/patches/february_2013/__init__.py
similarity index 100%
rename from patches/february_2013/__init__.py
rename to erpnext/patches/february_2013/__init__.py
diff --git a/patches/february_2013/account_negative_balance.py b/erpnext/patches/february_2013/account_negative_balance.py
similarity index 100%
rename from patches/february_2013/account_negative_balance.py
rename to erpnext/patches/february_2013/account_negative_balance.py
diff --git a/patches/february_2013/fix_outstanding.py b/erpnext/patches/february_2013/fix_outstanding.py
similarity index 100%
rename from patches/february_2013/fix_outstanding.py
rename to erpnext/patches/february_2013/fix_outstanding.py
diff --git a/patches/february_2013/gle_floating_point_issue_revisited.py b/erpnext/patches/february_2013/gle_floating_point_issue_revisited.py
similarity index 100%
rename from patches/february_2013/gle_floating_point_issue_revisited.py
rename to erpnext/patches/february_2013/gle_floating_point_issue_revisited.py
diff --git a/patches/february_2013/p01_event.py b/erpnext/patches/february_2013/p01_event.py
similarity index 100%
rename from patches/february_2013/p01_event.py
rename to erpnext/patches/february_2013/p01_event.py
diff --git a/patches/february_2013/p02_email_digest.py b/erpnext/patches/february_2013/p02_email_digest.py
similarity index 100%
rename from patches/february_2013/p02_email_digest.py
rename to erpnext/patches/february_2013/p02_email_digest.py
diff --git a/patches/february_2013/p03_material_request.py b/erpnext/patches/february_2013/p03_material_request.py
similarity index 100%
rename from patches/february_2013/p03_material_request.py
rename to erpnext/patches/february_2013/p03_material_request.py
diff --git a/patches/february_2013/p04_remove_old_doctypes.py b/erpnext/patches/february_2013/p04_remove_old_doctypes.py
similarity index 100%
rename from patches/february_2013/p04_remove_old_doctypes.py
rename to erpnext/patches/february_2013/p04_remove_old_doctypes.py
diff --git a/patches/february_2013/p05_leave_application.py b/erpnext/patches/february_2013/p05_leave_application.py
similarity index 100%
rename from patches/february_2013/p05_leave_application.py
rename to erpnext/patches/february_2013/p05_leave_application.py
diff --git a/patches/february_2013/p08_todo_query_report.py b/erpnext/patches/february_2013/p08_todo_query_report.py
similarity index 100%
rename from patches/february_2013/p08_todo_query_report.py
rename to erpnext/patches/february_2013/p08_todo_query_report.py
diff --git a/patches/february_2013/p09_remove_cancelled_warehouses.py b/erpnext/patches/february_2013/p09_remove_cancelled_warehouses.py
similarity index 100%
rename from patches/february_2013/p09_remove_cancelled_warehouses.py
rename to erpnext/patches/february_2013/p09_remove_cancelled_warehouses.py
diff --git a/patches/february_2013/p09_timesheets.py b/erpnext/patches/february_2013/p09_timesheets.py
similarity index 100%
rename from patches/february_2013/p09_timesheets.py
rename to erpnext/patches/february_2013/p09_timesheets.py
diff --git a/patches/february_2013/payment_reconciliation_reset_values.py b/erpnext/patches/february_2013/payment_reconciliation_reset_values.py
similarity index 100%
rename from patches/february_2013/payment_reconciliation_reset_values.py
rename to erpnext/patches/february_2013/payment_reconciliation_reset_values.py
diff --git a/patches/february_2013/reload_bom_replace_tool_permission.py b/erpnext/patches/february_2013/reload_bom_replace_tool_permission.py
similarity index 100%
rename from patches/february_2013/reload_bom_replace_tool_permission.py
rename to erpnext/patches/february_2013/reload_bom_replace_tool_permission.py
diff --git a/patches/february_2013/remove_account_utils_folder.py b/erpnext/patches/february_2013/remove_account_utils_folder.py
similarity index 100%
rename from patches/february_2013/remove_account_utils_folder.py
rename to erpnext/patches/february_2013/remove_account_utils_folder.py
diff --git a/patches/february_2013/remove_gl_mapper.py b/erpnext/patches/february_2013/remove_gl_mapper.py
similarity index 100%
rename from patches/february_2013/remove_gl_mapper.py
rename to erpnext/patches/february_2013/remove_gl_mapper.py
diff --git a/patches/february_2013/repost_reserved_qty.py b/erpnext/patches/february_2013/repost_reserved_qty.py
similarity index 84%
rename from patches/february_2013/repost_reserved_qty.py
rename to erpnext/patches/february_2013/repost_reserved_qty.py
index 442a81b..fbc6f1a 100644
--- a/patches/february_2013/repost_reserved_qty.py
+++ b/erpnext/patches/february_2013/repost_reserved_qty.py
@@ -4,7 +4,7 @@
import webnotes
def execute():
webnotes.conn.auto_commit_on_many_writes = 1
- from utilities.repost_stock import get_reserved_qty, update_bin
+ from erpnext.utilities.repost_stock import get_reserved_qty, update_bin
for d in webnotes.conn.sql("select item_code, warehouse from tabBin"):
update_bin(d[0], d[1], {
diff --git a/patches/february_2013/update_company_in_leave_application.py b/erpnext/patches/february_2013/update_company_in_leave_application.py
similarity index 100%
rename from patches/february_2013/update_company_in_leave_application.py
rename to erpnext/patches/february_2013/update_company_in_leave_application.py
diff --git a/patches/january_2013/__init__.py b/erpnext/patches/january_2013/__init__.py
similarity index 100%
rename from patches/january_2013/__init__.py
rename to erpnext/patches/january_2013/__init__.py
diff --git a/patches/january_2013/change_patch_structure.py b/erpnext/patches/january_2013/change_patch_structure.py
similarity index 100%
rename from patches/january_2013/change_patch_structure.py
rename to erpnext/patches/january_2013/change_patch_structure.py
diff --git a/patches/january_2013/enable_currencies.py b/erpnext/patches/january_2013/enable_currencies.py
similarity index 100%
rename from patches/january_2013/enable_currencies.py
rename to erpnext/patches/january_2013/enable_currencies.py
diff --git a/patches/january_2013/file_list_rename_returns.py b/erpnext/patches/january_2013/file_list_rename_returns.py
similarity index 100%
rename from patches/january_2013/file_list_rename_returns.py
rename to erpnext/patches/january_2013/file_list_rename_returns.py
diff --git a/patches/january_2013/give_report_permission_on_read.py b/erpnext/patches/january_2013/give_report_permission_on_read.py
similarity index 100%
rename from patches/january_2013/give_report_permission_on_read.py
rename to erpnext/patches/january_2013/give_report_permission_on_read.py
diff --git a/patches/january_2013/holiday_list_patch.py b/erpnext/patches/january_2013/holiday_list_patch.py
similarity index 100%
rename from patches/january_2013/holiday_list_patch.py
rename to erpnext/patches/january_2013/holiday_list_patch.py
diff --git a/patches/january_2013/rebuild_tree.py b/erpnext/patches/january_2013/rebuild_tree.py
similarity index 100%
rename from patches/january_2013/rebuild_tree.py
rename to erpnext/patches/january_2013/rebuild_tree.py
diff --git a/patches/january_2013/reload_print_format.py b/erpnext/patches/january_2013/reload_print_format.py
similarity index 100%
rename from patches/january_2013/reload_print_format.py
rename to erpnext/patches/january_2013/reload_print_format.py
diff --git a/patches/january_2013/remove_bad_permissions.py b/erpnext/patches/january_2013/remove_bad_permissions.py
similarity index 100%
rename from patches/january_2013/remove_bad_permissions.py
rename to erpnext/patches/january_2013/remove_bad_permissions.py
diff --git a/patches/january_2013/remove_landed_cost_master.py b/erpnext/patches/january_2013/remove_landed_cost_master.py
similarity index 100%
rename from patches/january_2013/remove_landed_cost_master.py
rename to erpnext/patches/january_2013/remove_landed_cost_master.py
diff --git a/patches/january_2013/remove_tds_entry_from_gl_mapper.py b/erpnext/patches/january_2013/remove_tds_entry_from_gl_mapper.py
similarity index 100%
rename from patches/january_2013/remove_tds_entry_from_gl_mapper.py
rename to erpnext/patches/january_2013/remove_tds_entry_from_gl_mapper.py
diff --git a/patches/january_2013/remove_unwanted_permission.py b/erpnext/patches/january_2013/remove_unwanted_permission.py
similarity index 100%
rename from patches/january_2013/remove_unwanted_permission.py
rename to erpnext/patches/january_2013/remove_unwanted_permission.py
diff --git a/patches/january_2013/report_permission.py b/erpnext/patches/january_2013/report_permission.py
similarity index 100%
rename from patches/january_2013/report_permission.py
rename to erpnext/patches/january_2013/report_permission.py
diff --git a/patches/january_2013/stock_reconciliation_patch.py b/erpnext/patches/january_2013/stock_reconciliation_patch.py
similarity index 100%
rename from patches/january_2013/stock_reconciliation_patch.py
rename to erpnext/patches/january_2013/stock_reconciliation_patch.py
diff --git a/patches/january_2013/tabsessions_to_myisam.py b/erpnext/patches/january_2013/tabsessions_to_myisam.py
similarity index 100%
rename from patches/january_2013/tabsessions_to_myisam.py
rename to erpnext/patches/january_2013/tabsessions_to_myisam.py
diff --git a/patches/january_2013/update_closed_on.py b/erpnext/patches/january_2013/update_closed_on.py
similarity index 100%
rename from patches/january_2013/update_closed_on.py
rename to erpnext/patches/january_2013/update_closed_on.py
diff --git a/patches/january_2013/update_country_info.py b/erpnext/patches/january_2013/update_country_info.py
similarity index 100%
rename from patches/january_2013/update_country_info.py
rename to erpnext/patches/january_2013/update_country_info.py
diff --git a/patches/january_2013/update_fraction_for_usd.py b/erpnext/patches/january_2013/update_fraction_for_usd.py
similarity index 100%
rename from patches/january_2013/update_fraction_for_usd.py
rename to erpnext/patches/january_2013/update_fraction_for_usd.py
diff --git a/patches/january_2013/update_number_format.py b/erpnext/patches/january_2013/update_number_format.py
similarity index 100%
rename from patches/january_2013/update_number_format.py
rename to erpnext/patches/january_2013/update_number_format.py
diff --git a/patches/july_2013/__init__.py b/erpnext/patches/july_2013/__init__.py
similarity index 100%
rename from patches/july_2013/__init__.py
rename to erpnext/patches/july_2013/__init__.py
diff --git a/patches/july_2013/p01_remove_doctype_mappers.py b/erpnext/patches/july_2013/p01_remove_doctype_mappers.py
similarity index 100%
rename from patches/july_2013/p01_remove_doctype_mappers.py
rename to erpnext/patches/july_2013/p01_remove_doctype_mappers.py
diff --git a/patches/july_2013/p01_same_sales_rate_patch.py b/erpnext/patches/july_2013/p01_same_sales_rate_patch.py
similarity index 100%
rename from patches/july_2013/p01_same_sales_rate_patch.py
rename to erpnext/patches/july_2013/p01_same_sales_rate_patch.py
diff --git a/patches/july_2013/p02_copy_shipping_address.py b/erpnext/patches/july_2013/p02_copy_shipping_address.py
similarity index 100%
rename from patches/july_2013/p02_copy_shipping_address.py
rename to erpnext/patches/july_2013/p02_copy_shipping_address.py
diff --git a/patches/july_2013/p03_cost_center_company.py b/erpnext/patches/july_2013/p03_cost_center_company.py
similarity index 100%
rename from patches/july_2013/p03_cost_center_company.py
rename to erpnext/patches/july_2013/p03_cost_center_company.py
diff --git a/patches/july_2013/p04_merge_duplicate_leads.py b/erpnext/patches/july_2013/p04_merge_duplicate_leads.py
similarity index 100%
rename from patches/july_2013/p04_merge_duplicate_leads.py
rename to erpnext/patches/july_2013/p04_merge_duplicate_leads.py
diff --git a/patches/july_2013/p05_custom_doctypes_in_list_view.py b/erpnext/patches/july_2013/p05_custom_doctypes_in_list_view.py
similarity index 100%
rename from patches/july_2013/p05_custom_doctypes_in_list_view.py
rename to erpnext/patches/july_2013/p05_custom_doctypes_in_list_view.py
diff --git a/patches/july_2013/p06_same_sales_rate.py b/erpnext/patches/july_2013/p06_same_sales_rate.py
similarity index 100%
rename from patches/july_2013/p06_same_sales_rate.py
rename to erpnext/patches/july_2013/p06_same_sales_rate.py
diff --git a/patches/july_2013/p07_repost_billed_amt_in_sales_cycle.py b/erpnext/patches/july_2013/p07_repost_billed_amt_in_sales_cycle.py
similarity index 100%
rename from patches/july_2013/p07_repost_billed_amt_in_sales_cycle.py
rename to erpnext/patches/july_2013/p07_repost_billed_amt_in_sales_cycle.py
diff --git a/patches/july_2013/p08_custom_print_format_net_total_export.py b/erpnext/patches/july_2013/p08_custom_print_format_net_total_export.py
similarity index 100%
rename from patches/july_2013/p08_custom_print_format_net_total_export.py
rename to erpnext/patches/july_2013/p08_custom_print_format_net_total_export.py
diff --git a/patches/july_2013/p09_remove_website_pyc.py b/erpnext/patches/july_2013/p09_remove_website_pyc.py
similarity index 100%
rename from patches/july_2013/p09_remove_website_pyc.py
rename to erpnext/patches/july_2013/p09_remove_website_pyc.py
diff --git a/patches/july_2013/p10_change_partner_user_to_website_user.py b/erpnext/patches/july_2013/p10_change_partner_user_to_website_user.py
similarity index 100%
rename from patches/july_2013/p10_change_partner_user_to_website_user.py
rename to erpnext/patches/july_2013/p10_change_partner_user_to_website_user.py
diff --git a/patches/july_2013/p11_update_price_list_currency.py b/erpnext/patches/july_2013/p11_update_price_list_currency.py
similarity index 100%
rename from patches/july_2013/p11_update_price_list_currency.py
rename to erpnext/patches/july_2013/p11_update_price_list_currency.py
diff --git a/patches/july_2013/restore_tree_roots.py b/erpnext/patches/july_2013/restore_tree_roots.py
similarity index 75%
rename from patches/july_2013/restore_tree_roots.py
rename to erpnext/patches/july_2013/restore_tree_roots.py
index b6a988f..91b328c 100644
--- a/patches/july_2013/restore_tree_roots.py
+++ b/erpnext/patches/july_2013/restore_tree_roots.py
@@ -2,5 +2,5 @@
# License: GNU General Public License v3. See license.txt
def execute():
- from startup.install import import_defaults
+ from erpnext.startup.install import import_defaults
import_defaults()
\ No newline at end of file
diff --git a/patches/june_2013/__init__.py b/erpnext/patches/june_2013/__init__.py
similarity index 100%
rename from patches/june_2013/__init__.py
rename to erpnext/patches/june_2013/__init__.py
diff --git a/patches/june_2013/p01_update_bom_exploded_items.py b/erpnext/patches/june_2013/p01_update_bom_exploded_items.py
similarity index 100%
rename from patches/june_2013/p01_update_bom_exploded_items.py
rename to erpnext/patches/june_2013/p01_update_bom_exploded_items.py
diff --git a/patches/june_2013/p02_update_project_completed.py b/erpnext/patches/june_2013/p02_update_project_completed.py
similarity index 100%
rename from patches/june_2013/p02_update_project_completed.py
rename to erpnext/patches/june_2013/p02_update_project_completed.py
diff --git a/patches/june_2013/p03_buying_selling_for_price_list.py b/erpnext/patches/june_2013/p03_buying_selling_for_price_list.py
similarity index 100%
rename from patches/june_2013/p03_buying_selling_for_price_list.py
rename to erpnext/patches/june_2013/p03_buying_selling_for_price_list.py
diff --git a/patches/june_2013/p04_fix_event_for_lead_oppty_project.py b/erpnext/patches/june_2013/p04_fix_event_for_lead_oppty_project.py
similarity index 92%
rename from patches/june_2013/p04_fix_event_for_lead_oppty_project.py
rename to erpnext/patches/june_2013/p04_fix_event_for_lead_oppty_project.py
index 735a28a..f80209f 100644
--- a/patches/june_2013/p04_fix_event_for_lead_oppty_project.py
+++ b/erpnext/patches/june_2013/p04_fix_event_for_lead_oppty_project.py
@@ -4,7 +4,7 @@
import webnotes
def execute():
- from utilities.transaction_base import delete_events
+ from erpnext.utilities.transaction_base import delete_events
# delete orphaned Event User
webnotes.conn.sql("""delete from `tabEvent User`
diff --git a/patches/june_2013/p05_remove_search_criteria_reports.py b/erpnext/patches/june_2013/p05_remove_search_criteria_reports.py
similarity index 100%
rename from patches/june_2013/p05_remove_search_criteria_reports.py
rename to erpnext/patches/june_2013/p05_remove_search_criteria_reports.py
diff --git a/patches/june_2013/p05_remove_unused_doctypes.py b/erpnext/patches/june_2013/p05_remove_unused_doctypes.py
similarity index 100%
rename from patches/june_2013/p05_remove_unused_doctypes.py
rename to erpnext/patches/june_2013/p05_remove_unused_doctypes.py
diff --git a/patches/june_2013/p06_drop_unused_tables.py b/erpnext/patches/june_2013/p06_drop_unused_tables.py
similarity index 100%
rename from patches/june_2013/p06_drop_unused_tables.py
rename to erpnext/patches/june_2013/p06_drop_unused_tables.py
diff --git a/patches/june_2013/p07_taxes_price_list_for_territory.py b/erpnext/patches/june_2013/p07_taxes_price_list_for_territory.py
similarity index 95%
rename from patches/june_2013/p07_taxes_price_list_for_territory.py
rename to erpnext/patches/june_2013/p07_taxes_price_list_for_territory.py
index 1cdb783..4a224e3 100644
--- a/patches/june_2013/p07_taxes_price_list_for_territory.py
+++ b/erpnext/patches/june_2013/p07_taxes_price_list_for_territory.py
@@ -9,7 +9,7 @@
webnotes.reload_doc("accounts", "doctype", "sales_taxes_and_charges_master")
webnotes.reload_doc("accounts", "doctype", "shipping_rule")
- from setup.utils import get_root_of
+ from erpnext.setup.utils import get_root_of
root_territory = get_root_of("Territory")
for parenttype in ["Sales Taxes and Charges Master", "Price List", "Shipping Rule"]:
diff --git a/patches/june_2013/p08_shopping_cart_settings.py b/erpnext/patches/june_2013/p08_shopping_cart_settings.py
similarity index 85%
rename from patches/june_2013/p08_shopping_cart_settings.py
rename to erpnext/patches/june_2013/p08_shopping_cart_settings.py
index 6af7eb8..45028c8 100644
--- a/patches/june_2013/p08_shopping_cart_settings.py
+++ b/erpnext/patches/june_2013/p08_shopping_cart_settings.py
@@ -7,7 +7,7 @@
webnotes.reload_doc("selling", "doctype", "shopping_cart_settings")
# create two default territories, one for home country and one named Rest of the World
- from setup.page.setup_wizard.setup_wizard import create_territories
+ from erpnext.setup.page.setup_wizard.setup_wizard import create_territories
create_territories()
webnotes.conn.set_value("Shopping Cart Settings", None, "default_territory", "Rest of the World")
diff --git a/patches/june_2013/p09_update_global_defaults.py b/erpnext/patches/june_2013/p09_update_global_defaults.py
similarity index 100%
rename from patches/june_2013/p09_update_global_defaults.py
rename to erpnext/patches/june_2013/p09_update_global_defaults.py
diff --git a/patches/june_2013/p10_lead_address.py b/erpnext/patches/june_2013/p10_lead_address.py
similarity index 100%
rename from patches/june_2013/p10_lead_address.py
rename to erpnext/patches/june_2013/p10_lead_address.py
diff --git a/patches/march_2013/__init__.py b/erpnext/patches/march_2013/__init__.py
similarity index 100%
rename from patches/march_2013/__init__.py
rename to erpnext/patches/march_2013/__init__.py
diff --git a/patches/march_2013/p01_c_form.py b/erpnext/patches/march_2013/p01_c_form.py
similarity index 100%
rename from patches/march_2013/p01_c_form.py
rename to erpnext/patches/march_2013/p01_c_form.py
diff --git a/patches/march_2013/p02_get_global_default.py b/erpnext/patches/march_2013/p02_get_global_default.py
similarity index 100%
rename from patches/march_2013/p02_get_global_default.py
rename to erpnext/patches/march_2013/p02_get_global_default.py
diff --git a/patches/march_2013/p03_rename_blog_to_blog_post.py b/erpnext/patches/march_2013/p03_rename_blog_to_blog_post.py
similarity index 100%
rename from patches/march_2013/p03_rename_blog_to_blog_post.py
rename to erpnext/patches/march_2013/p03_rename_blog_to_blog_post.py
diff --git a/patches/march_2013/p04_pos_update_stock_check.py b/erpnext/patches/march_2013/p04_pos_update_stock_check.py
similarity index 100%
rename from patches/march_2013/p04_pos_update_stock_check.py
rename to erpnext/patches/march_2013/p04_pos_update_stock_check.py
diff --git a/patches/march_2013/p05_payment_reconciliation.py b/erpnext/patches/march_2013/p05_payment_reconciliation.py
similarity index 100%
rename from patches/march_2013/p05_payment_reconciliation.py
rename to erpnext/patches/march_2013/p05_payment_reconciliation.py
diff --git a/patches/march_2013/p06_remove_sales_purchase_return_tool.py b/erpnext/patches/march_2013/p06_remove_sales_purchase_return_tool.py
similarity index 100%
rename from patches/march_2013/p06_remove_sales_purchase_return_tool.py
rename to erpnext/patches/march_2013/p06_remove_sales_purchase_return_tool.py
diff --git a/patches/march_2013/p07_update_project_in_stock_ledger.py b/erpnext/patches/march_2013/p07_update_project_in_stock_ledger.py
similarity index 100%
rename from patches/march_2013/p07_update_project_in_stock_ledger.py
rename to erpnext/patches/march_2013/p07_update_project_in_stock_ledger.py
diff --git a/patches/march_2013/p07_update_valuation_rate.py b/erpnext/patches/march_2013/p07_update_valuation_rate.py
similarity index 100%
rename from patches/march_2013/p07_update_valuation_rate.py
rename to erpnext/patches/march_2013/p07_update_valuation_rate.py
diff --git a/patches/march_2013/p08_create_aii_accounts.py b/erpnext/patches/march_2013/p08_create_aii_accounts.py
similarity index 100%
rename from patches/march_2013/p08_create_aii_accounts.py
rename to erpnext/patches/march_2013/p08_create_aii_accounts.py
diff --git a/patches/march_2013/p10_set_fiscal_year_for_stock.py b/erpnext/patches/march_2013/p10_set_fiscal_year_for_stock.py
similarity index 91%
rename from patches/march_2013/p10_set_fiscal_year_for_stock.py
rename to erpnext/patches/march_2013/p10_set_fiscal_year_for_stock.py
index 1f5adf6..97510c7 100644
--- a/patches/march_2013/p10_set_fiscal_year_for_stock.py
+++ b/erpnext/patches/march_2013/p10_set_fiscal_year_for_stock.py
@@ -2,7 +2,7 @@
# License: GNU General Public License v3. See license.txt
import webnotes
-from accounts.utils import get_fiscal_year, FiscalYearError
+from erpnext.accounts.utils import get_fiscal_year, FiscalYearError
def execute():
webnotes.reload_doc("stock", "doctype", "stock_entry")
diff --git a/patches/march_2013/p10_update_against_expense_account.py b/erpnext/patches/march_2013/p10_update_against_expense_account.py
similarity index 100%
rename from patches/march_2013/p10_update_against_expense_account.py
rename to erpnext/patches/march_2013/p10_update_against_expense_account.py
diff --git a/patches/march_2013/p11_update_attach_files.py b/erpnext/patches/march_2013/p11_update_attach_files.py
similarity index 100%
rename from patches/march_2013/p11_update_attach_files.py
rename to erpnext/patches/march_2013/p11_update_attach_files.py
diff --git a/patches/march_2013/p12_set_item_tax_rate_in_json.py b/erpnext/patches/march_2013/p12_set_item_tax_rate_in_json.py
similarity index 100%
rename from patches/march_2013/p12_set_item_tax_rate_in_json.py
rename to erpnext/patches/march_2013/p12_set_item_tax_rate_in_json.py
diff --git a/patches/march_2013/update_po_prevdoc_doctype.py b/erpnext/patches/march_2013/update_po_prevdoc_doctype.py
similarity index 100%
rename from patches/march_2013/update_po_prevdoc_doctype.py
rename to erpnext/patches/march_2013/update_po_prevdoc_doctype.py
diff --git a/patches/may_2013/__init__.py b/erpnext/patches/may_2013/__init__.py
similarity index 100%
rename from patches/may_2013/__init__.py
rename to erpnext/patches/may_2013/__init__.py
diff --git a/patches/may_2013/p01_selling_net_total_export.py b/erpnext/patches/may_2013/p01_selling_net_total_export.py
similarity index 100%
rename from patches/may_2013/p01_selling_net_total_export.py
rename to erpnext/patches/may_2013/p01_selling_net_total_export.py
diff --git a/patches/may_2013/p02_update_valuation_rate.py b/erpnext/patches/may_2013/p02_update_valuation_rate.py
similarity index 95%
rename from patches/may_2013/p02_update_valuation_rate.py
rename to erpnext/patches/may_2013/p02_update_valuation_rate.py
index b521734..1419ebf 100644
--- a/patches/may_2013/p02_update_valuation_rate.py
+++ b/erpnext/patches/may_2013/p02_update_valuation_rate.py
@@ -4,7 +4,7 @@
from __future__ import unicode_literals
import webnotes
def execute():
- from stock.stock_ledger import update_entries_after
+ from erpnext.stock.stock_ledger import update_entries_after
item_warehouse = []
# update valuation_rate in transaction
doctypes = {"Purchase Receipt": "purchase_receipt_details", "Purchase Invoice": "entries"}
diff --git a/patches/may_2013/p03_update_support_ticket.py b/erpnext/patches/may_2013/p03_update_support_ticket.py
similarity index 100%
rename from patches/may_2013/p03_update_support_ticket.py
rename to erpnext/patches/may_2013/p03_update_support_ticket.py
diff --git a/patches/may_2013/p04_reorder_level.py b/erpnext/patches/may_2013/p04_reorder_level.py
similarity index 100%
rename from patches/may_2013/p04_reorder_level.py
rename to erpnext/patches/may_2013/p04_reorder_level.py
diff --git a/patches/may_2013/p05_update_cancelled_gl_entries.py b/erpnext/patches/may_2013/p05_update_cancelled_gl_entries.py
similarity index 100%
rename from patches/may_2013/p05_update_cancelled_gl_entries.py
rename to erpnext/patches/may_2013/p05_update_cancelled_gl_entries.py
diff --git a/patches/may_2013/p06_make_notes.py b/erpnext/patches/may_2013/p06_make_notes.py
similarity index 100%
rename from patches/may_2013/p06_make_notes.py
rename to erpnext/patches/may_2013/p06_make_notes.py
diff --git a/patches/may_2013/p06_update_billed_amt_po_pr.py b/erpnext/patches/may_2013/p06_update_billed_amt_po_pr.py
similarity index 100%
rename from patches/may_2013/p06_update_billed_amt_po_pr.py
rename to erpnext/patches/may_2013/p06_update_billed_amt_po_pr.py
diff --git a/patches/may_2013/p07_move_update_stock_to_pos.py b/erpnext/patches/may_2013/p07_move_update_stock_to_pos.py
similarity index 100%
rename from patches/may_2013/p07_move_update_stock_to_pos.py
rename to erpnext/patches/may_2013/p07_move_update_stock_to_pos.py
diff --git a/patches/may_2013/p08_change_item_wise_tax.py b/erpnext/patches/may_2013/p08_change_item_wise_tax.py
similarity index 100%
rename from patches/may_2013/p08_change_item_wise_tax.py
rename to erpnext/patches/may_2013/p08_change_item_wise_tax.py
diff --git a/patches/may_2013/repost_stock_for_no_posting_time.py b/erpnext/patches/may_2013/repost_stock_for_no_posting_time.py
similarity index 90%
rename from patches/may_2013/repost_stock_for_no_posting_time.py
rename to erpnext/patches/may_2013/repost_stock_for_no_posting_time.py
index db03992..b36ccf3 100644
--- a/patches/may_2013/repost_stock_for_no_posting_time.py
+++ b/erpnext/patches/may_2013/repost_stock_for_no_posting_time.py
@@ -4,7 +4,7 @@
from __future__ import unicode_literals
def execute():
import webnotes
- from stock.stock_ledger import update_entries_after
+ from erpnext.stock.stock_ledger import update_entries_after
res = webnotes.conn.sql("""select distinct item_code, warehouse from `tabStock Ledger Entry`
where posting_time = '00:00'""")
diff --git a/patches/november_2012/__init__.py b/erpnext/patches/november_2012/__init__.py
similarity index 100%
rename from patches/november_2012/__init__.py
rename to erpnext/patches/november_2012/__init__.py
diff --git a/patches/november_2012/add_employee_field_in_employee.py b/erpnext/patches/november_2012/add_employee_field_in_employee.py
similarity index 100%
rename from patches/november_2012/add_employee_field_in_employee.py
rename to erpnext/patches/november_2012/add_employee_field_in_employee.py
diff --git a/patches/november_2012/add_theme_to_profile.py b/erpnext/patches/november_2012/add_theme_to_profile.py
similarity index 100%
rename from patches/november_2012/add_theme_to_profile.py
rename to erpnext/patches/november_2012/add_theme_to_profile.py
diff --git a/patches/november_2012/cancelled_bom_patch.py b/erpnext/patches/november_2012/cancelled_bom_patch.py
similarity index 100%
rename from patches/november_2012/cancelled_bom_patch.py
rename to erpnext/patches/november_2012/cancelled_bom_patch.py
diff --git a/patches/november_2012/communication_sender_and_recipient.py b/erpnext/patches/november_2012/communication_sender_and_recipient.py
similarity index 100%
rename from patches/november_2012/communication_sender_and_recipient.py
rename to erpnext/patches/november_2012/communication_sender_and_recipient.py
diff --git a/patches/november_2012/custom_field_insert_after.py b/erpnext/patches/november_2012/custom_field_insert_after.py
similarity index 100%
rename from patches/november_2012/custom_field_insert_after.py
rename to erpnext/patches/november_2012/custom_field_insert_after.py
diff --git a/patches/november_2012/customer_issue_allocated_to_assigned.py b/erpnext/patches/november_2012/customer_issue_allocated_to_assigned.py
similarity index 100%
rename from patches/november_2012/customer_issue_allocated_to_assigned.py
rename to erpnext/patches/november_2012/customer_issue_allocated_to_assigned.py
diff --git a/patches/november_2012/disable_cancelled_profiles.py b/erpnext/patches/november_2012/disable_cancelled_profiles.py
similarity index 100%
rename from patches/november_2012/disable_cancelled_profiles.py
rename to erpnext/patches/november_2012/disable_cancelled_profiles.py
diff --git a/patches/november_2012/gle_floating_point_issue.py b/erpnext/patches/november_2012/gle_floating_point_issue.py
similarity index 100%
rename from patches/november_2012/gle_floating_point_issue.py
rename to erpnext/patches/november_2012/gle_floating_point_issue.py
diff --git a/patches/november_2012/leave_application_cleanup.py b/erpnext/patches/november_2012/leave_application_cleanup.py
similarity index 100%
rename from patches/november_2012/leave_application_cleanup.py
rename to erpnext/patches/november_2012/leave_application_cleanup.py
diff --git a/patches/november_2012/production_order_patch.py b/erpnext/patches/november_2012/production_order_patch.py
similarity index 100%
rename from patches/november_2012/production_order_patch.py
rename to erpnext/patches/november_2012/production_order_patch.py
diff --git a/patches/november_2012/report_permissions.py b/erpnext/patches/november_2012/report_permissions.py
similarity index 100%
rename from patches/november_2012/report_permissions.py
rename to erpnext/patches/november_2012/report_permissions.py
diff --git a/patches/november_2012/reset_appraisal_permissions.py b/erpnext/patches/november_2012/reset_appraisal_permissions.py
similarity index 100%
rename from patches/november_2012/reset_appraisal_permissions.py
rename to erpnext/patches/november_2012/reset_appraisal_permissions.py
diff --git a/patches/november_2012/support_ticket_response_to_communication.py b/erpnext/patches/november_2012/support_ticket_response_to_communication.py
similarity index 100%
rename from patches/november_2012/support_ticket_response_to_communication.py
rename to erpnext/patches/november_2012/support_ticket_response_to_communication.py
diff --git a/patches/november_2012/update_delivered_billed_percentage_for_pos.py b/erpnext/patches/november_2012/update_delivered_billed_percentage_for_pos.py
similarity index 100%
rename from patches/november_2012/update_delivered_billed_percentage_for_pos.py
rename to erpnext/patches/november_2012/update_delivered_billed_percentage_for_pos.py
diff --git a/patches/october_2012/__init__.py b/erpnext/patches/october_2012/__init__.py
similarity index 100%
rename from patches/october_2012/__init__.py
rename to erpnext/patches/october_2012/__init__.py
diff --git a/patches/october_2012/company_fiscal_year_docstatus_patch.py b/erpnext/patches/october_2012/company_fiscal_year_docstatus_patch.py
similarity index 100%
rename from patches/october_2012/company_fiscal_year_docstatus_patch.py
rename to erpnext/patches/october_2012/company_fiscal_year_docstatus_patch.py
diff --git a/patches/october_2012/custom_script_delete_permission.py b/erpnext/patches/october_2012/custom_script_delete_permission.py
similarity index 100%
rename from patches/october_2012/custom_script_delete_permission.py
rename to erpnext/patches/october_2012/custom_script_delete_permission.py
diff --git a/patches/october_2012/fix_cancelled_gl_entries.py b/erpnext/patches/october_2012/fix_cancelled_gl_entries.py
similarity index 100%
rename from patches/october_2012/fix_cancelled_gl_entries.py
rename to erpnext/patches/october_2012/fix_cancelled_gl_entries.py
diff --git a/patches/october_2012/fix_wrong_vouchers.py b/erpnext/patches/october_2012/fix_wrong_vouchers.py
similarity index 100%
rename from patches/october_2012/fix_wrong_vouchers.py
rename to erpnext/patches/october_2012/fix_wrong_vouchers.py
diff --git a/patches/october_2012/update_account_property.py b/erpnext/patches/october_2012/update_account_property.py
similarity index 100%
rename from patches/october_2012/update_account_property.py
rename to erpnext/patches/october_2012/update_account_property.py
diff --git a/patches/october_2012/update_permission.py b/erpnext/patches/october_2012/update_permission.py
similarity index 100%
rename from patches/october_2012/update_permission.py
rename to erpnext/patches/october_2012/update_permission.py
diff --git a/patches/october_2013/__init__.py b/erpnext/patches/october_2013/__init__.py
similarity index 100%
rename from patches/october_2013/__init__.py
rename to erpnext/patches/october_2013/__init__.py
diff --git a/patches/october_2013/fix_is_cancelled_in_sle.py b/erpnext/patches/october_2013/fix_is_cancelled_in_sle.py
similarity index 100%
rename from patches/october_2013/fix_is_cancelled_in_sle.py
rename to erpnext/patches/october_2013/fix_is_cancelled_in_sle.py
diff --git a/patches/october_2013/p01_fix_serial_no_status.py b/erpnext/patches/october_2013/p01_fix_serial_no_status.py
similarity index 100%
rename from patches/october_2013/p01_fix_serial_no_status.py
rename to erpnext/patches/october_2013/p01_fix_serial_no_status.py
diff --git a/patches/october_2013/p01_update_delivery_note_prevdocs.py b/erpnext/patches/october_2013/p01_update_delivery_note_prevdocs.py
similarity index 100%
rename from patches/october_2013/p01_update_delivery_note_prevdocs.py
rename to erpnext/patches/october_2013/p01_update_delivery_note_prevdocs.py
diff --git a/patches/october_2013/p02_set_communication_status.py b/erpnext/patches/october_2013/p02_set_communication_status.py
similarity index 100%
rename from patches/october_2013/p02_set_communication_status.py
rename to erpnext/patches/october_2013/p02_set_communication_status.py
diff --git a/patches/october_2013/p02_update_price_list_and_item_details_in_item_price.py b/erpnext/patches/october_2013/p02_update_price_list_and_item_details_in_item_price.py
similarity index 100%
rename from patches/october_2013/p02_update_price_list_and_item_details_in_item_price.py
rename to erpnext/patches/october_2013/p02_update_price_list_and_item_details_in_item_price.py
diff --git a/patches/october_2013/p03_crm_update_status.py b/erpnext/patches/october_2013/p03_crm_update_status.py
similarity index 100%
rename from patches/october_2013/p03_crm_update_status.py
rename to erpnext/patches/october_2013/p03_crm_update_status.py
diff --git a/patches/october_2013/p03_remove_sales_and_purchase_return_tool.py b/erpnext/patches/october_2013/p03_remove_sales_and_purchase_return_tool.py
similarity index 100%
rename from patches/october_2013/p03_remove_sales_and_purchase_return_tool.py
rename to erpnext/patches/october_2013/p03_remove_sales_and_purchase_return_tool.py
diff --git a/patches/october_2013/p04_update_report_permission.py b/erpnext/patches/october_2013/p04_update_report_permission.py
similarity index 100%
rename from patches/october_2013/p04_update_report_permission.py
rename to erpnext/patches/october_2013/p04_update_report_permission.py
diff --git a/patches/october_2013/p04_wsgi_migration.py b/erpnext/patches/october_2013/p04_wsgi_migration.py
similarity index 100%
rename from patches/october_2013/p04_wsgi_migration.py
rename to erpnext/patches/october_2013/p04_wsgi_migration.py
diff --git a/patches/october_2013/p05_delete_gl_entries_for_cancelled_vouchers.py b/erpnext/patches/october_2013/p05_delete_gl_entries_for_cancelled_vouchers.py
similarity index 100%
rename from patches/october_2013/p05_delete_gl_entries_for_cancelled_vouchers.py
rename to erpnext/patches/october_2013/p05_delete_gl_entries_for_cancelled_vouchers.py
diff --git a/patches/october_2013/p05_server_custom_script_to_file.py b/erpnext/patches/october_2013/p05_server_custom_script_to_file.py
similarity index 91%
rename from patches/october_2013/p05_server_custom_script_to_file.py
rename to erpnext/patches/october_2013/p05_server_custom_script_to_file.py
index 76ec56c..5cffed6 100644
--- a/patches/october_2013/p05_server_custom_script_to_file.py
+++ b/erpnext/patches/october_2013/p05_server_custom_script_to_file.py
@@ -17,7 +17,7 @@
"""
import os
from webnotes.utils import get_site_base_path
- from core.doctype.custom_script.custom_script import make_custom_server_script_file
+ from webnotes.core.doctype.custom_script.custom_script import make_custom_server_script_file
for name, dt, script in webnotes.conn.sql("""select name, dt, script from `tabCustom Script`
where script_type='Server'"""):
if script and script.strip():
diff --git a/patches/october_2013/p06_rename_packing_list_doctype.py b/erpnext/patches/october_2013/p06_rename_packing_list_doctype.py
similarity index 100%
rename from patches/october_2013/p06_rename_packing_list_doctype.py
rename to erpnext/patches/october_2013/p06_rename_packing_list_doctype.py
diff --git a/patches/october_2013/p06_update_control_panel_and_global_defaults.py b/erpnext/patches/october_2013/p06_update_control_panel_and_global_defaults.py
similarity index 100%
rename from patches/october_2013/p06_update_control_panel_and_global_defaults.py
rename to erpnext/patches/october_2013/p06_update_control_panel_and_global_defaults.py
diff --git a/patches/october_2013/p07_rename_for_territory.py b/erpnext/patches/october_2013/p07_rename_for_territory.py
similarity index 100%
rename from patches/october_2013/p07_rename_for_territory.py
rename to erpnext/patches/october_2013/p07_rename_for_territory.py
diff --git a/patches/october_2013/p08_cleanup_after_item_price_module_change.py b/erpnext/patches/october_2013/p08_cleanup_after_item_price_module_change.py
similarity index 100%
rename from patches/october_2013/p08_cleanup_after_item_price_module_change.py
rename to erpnext/patches/october_2013/p08_cleanup_after_item_price_module_change.py
diff --git a/patches/october_2013/p09_update_naming_series_settings.py b/erpnext/patches/october_2013/p09_update_naming_series_settings.py
similarity index 100%
rename from patches/october_2013/p09_update_naming_series_settings.py
rename to erpnext/patches/october_2013/p09_update_naming_series_settings.py
diff --git a/patches/october_2013/p10_plugins_refactor.py b/erpnext/patches/october_2013/p10_plugins_refactor.py
similarity index 98%
rename from patches/october_2013/p10_plugins_refactor.py
rename to erpnext/patches/october_2013/p10_plugins_refactor.py
index 47d9d09..851c8af 100644
--- a/patches/october_2013/p10_plugins_refactor.py
+++ b/erpnext/patches/october_2013/p10_plugins_refactor.py
@@ -6,6 +6,8 @@
def execute():
# changed cache key for plugin code files
+ return
+
for doctype in webnotes.conn.sql_list("""select name from `tabDocType`"""):
webnotes.cache().delete_value("_server_script:"+doctype)
diff --git a/patches/october_2013/perpetual_inventory_stock_transfer_utility.py b/erpnext/patches/october_2013/perpetual_inventory_stock_transfer_utility.py
similarity index 97%
rename from patches/october_2013/perpetual_inventory_stock_transfer_utility.py
rename to erpnext/patches/october_2013/perpetual_inventory_stock_transfer_utility.py
index 5937422..889f5e2 100644
--- a/patches/october_2013/perpetual_inventory_stock_transfer_utility.py
+++ b/erpnext/patches/october_2013/perpetual_inventory_stock_transfer_utility.py
@@ -4,7 +4,7 @@
from __future__ import unicode_literals
import webnotes
from webnotes.utils import nowdate, nowtime, cstr
-from accounts.utils import get_fiscal_year
+from erpnext.accounts.utils import get_fiscal_year
def execute():
item_map = {}
diff --git a/patches/october_2013/repost_ordered_qty.py b/erpnext/patches/october_2013/repost_ordered_qty.py
similarity index 100%
rename from patches/october_2013/repost_ordered_qty.py
rename to erpnext/patches/october_2013/repost_ordered_qty.py
diff --git a/patches/october_2013/repost_planned_qty.py b/erpnext/patches/october_2013/repost_planned_qty.py
similarity index 81%
rename from patches/october_2013/repost_planned_qty.py
rename to erpnext/patches/october_2013/repost_planned_qty.py
index 6a78d33..1e9da30 100644
--- a/patches/october_2013/repost_planned_qty.py
+++ b/erpnext/patches/october_2013/repost_planned_qty.py
@@ -3,7 +3,7 @@
def execute():
import webnotes
- from utilities.repost_stock import get_planned_qty, update_bin
+ from erpnext.utilities.repost_stock import get_planned_qty, update_bin
for d in webnotes.conn.sql("select item_code, warehouse from tabBin"):
update_bin(d[0], d[1], {
diff --git a/patches/october_2013/set_stock_value_diff_in_sle.py b/erpnext/patches/october_2013/set_stock_value_diff_in_sle.py
similarity index 100%
rename from patches/october_2013/set_stock_value_diff_in_sle.py
rename to erpnext/patches/october_2013/set_stock_value_diff_in_sle.py
diff --git a/patches/patch_list.py b/erpnext/patches/patch_list.py
similarity index 100%
rename from patches/patch_list.py
rename to erpnext/patches/patch_list.py
diff --git a/patches/september_2012/__init__.py b/erpnext/patches/september_2012/__init__.py
similarity index 100%
rename from patches/september_2012/__init__.py
rename to erpnext/patches/september_2012/__init__.py
diff --git a/patches/september_2012/add_stock_ledger_entry_index.py b/erpnext/patches/september_2012/add_stock_ledger_entry_index.py
similarity index 100%
rename from patches/september_2012/add_stock_ledger_entry_index.py
rename to erpnext/patches/september_2012/add_stock_ledger_entry_index.py
diff --git a/patches/september_2012/all_permissions_patch.py b/erpnext/patches/september_2012/all_permissions_patch.py
similarity index 100%
rename from patches/september_2012/all_permissions_patch.py
rename to erpnext/patches/september_2012/all_permissions_patch.py
diff --git a/patches/september_2012/communication_delete_permission.py b/erpnext/patches/september_2012/communication_delete_permission.py
similarity index 100%
rename from patches/september_2012/communication_delete_permission.py
rename to erpnext/patches/september_2012/communication_delete_permission.py
diff --git a/patches/september_2012/customer_permission_patch.py b/erpnext/patches/september_2012/customer_permission_patch.py
similarity index 100%
rename from patches/september_2012/customer_permission_patch.py
rename to erpnext/patches/september_2012/customer_permission_patch.py
diff --git a/patches/september_2012/deprecate_account_balance.py b/erpnext/patches/september_2012/deprecate_account_balance.py
similarity index 100%
rename from patches/september_2012/deprecate_account_balance.py
rename to erpnext/patches/september_2012/deprecate_account_balance.py
diff --git a/patches/september_2012/event_permission.py b/erpnext/patches/september_2012/event_permission.py
similarity index 100%
rename from patches/september_2012/event_permission.py
rename to erpnext/patches/september_2012/event_permission.py
diff --git a/patches/september_2012/plot_patch.py b/erpnext/patches/september_2012/plot_patch.py
similarity index 100%
rename from patches/september_2012/plot_patch.py
rename to erpnext/patches/september_2012/plot_patch.py
diff --git a/patches/september_2012/profile_delete_permission.py b/erpnext/patches/september_2012/profile_delete_permission.py
similarity index 100%
rename from patches/september_2012/profile_delete_permission.py
rename to erpnext/patches/september_2012/profile_delete_permission.py
diff --git a/patches/september_2012/rebuild_trees.py b/erpnext/patches/september_2012/rebuild_trees.py
similarity index 100%
rename from patches/september_2012/rebuild_trees.py
rename to erpnext/patches/september_2012/rebuild_trees.py
diff --git a/patches/september_2012/repost_stock.py b/erpnext/patches/september_2012/repost_stock.py
similarity index 89%
rename from patches/september_2012/repost_stock.py
rename to erpnext/patches/september_2012/repost_stock.py
index 5df65a2..11c8747 100644
--- a/patches/september_2012/repost_stock.py
+++ b/erpnext/patches/september_2012/repost_stock.py
@@ -4,7 +4,7 @@
from __future__ import unicode_literals
def execute():
import webnotes
- from stock.stock_ledger import update_entries_after
+ from erpnext.stock.stock_ledger import update_entries_after
res = webnotes.conn.sql("select distinct item_code, warehouse from `tabStock Ledger Entry`")
i=0
for d in res:
diff --git a/patches/september_2012/stock_report_permissions_for_accounts.py b/erpnext/patches/september_2012/stock_report_permissions_for_accounts.py
similarity index 100%
rename from patches/september_2012/stock_report_permissions_for_accounts.py
rename to erpnext/patches/september_2012/stock_report_permissions_for_accounts.py
diff --git a/patches/september_2013/__init__.py b/erpnext/patches/september_2013/__init__.py
similarity index 100%
rename from patches/september_2013/__init__.py
rename to erpnext/patches/september_2013/__init__.py
diff --git a/patches/september_2013/p01_add_user_defaults_from_pos_setting.py b/erpnext/patches/september_2013/p01_add_user_defaults_from_pos_setting.py
similarity index 100%
rename from patches/september_2013/p01_add_user_defaults_from_pos_setting.py
rename to erpnext/patches/september_2013/p01_add_user_defaults_from_pos_setting.py
diff --git a/patches/september_2013/p01_fix_buying_amount_gl_entries.py b/erpnext/patches/september_2013/p01_fix_buying_amount_gl_entries.py
similarity index 100%
rename from patches/september_2013/p01_fix_buying_amount_gl_entries.py
rename to erpnext/patches/september_2013/p01_fix_buying_amount_gl_entries.py
diff --git a/patches/september_2013/p01_update_communication.py b/erpnext/patches/september_2013/p01_update_communication.py
similarity index 100%
rename from patches/september_2013/p01_update_communication.py
rename to erpnext/patches/september_2013/p01_update_communication.py
diff --git a/patches/september_2013/p02_fix_serial_no_status.py b/erpnext/patches/september_2013/p02_fix_serial_no_status.py
similarity index 100%
rename from patches/september_2013/p02_fix_serial_no_status.py
rename to erpnext/patches/september_2013/p02_fix_serial_no_status.py
diff --git a/patches/september_2013/p03_modify_item_price_include_in_price_list.py b/erpnext/patches/september_2013/p03_modify_item_price_include_in_price_list.py
similarity index 100%
rename from patches/september_2013/p03_modify_item_price_include_in_price_list.py
rename to erpnext/patches/september_2013/p03_modify_item_price_include_in_price_list.py
diff --git a/patches/september_2013/p03_move_website_to_framework.py b/erpnext/patches/september_2013/p03_move_website_to_framework.py
similarity index 100%
rename from patches/september_2013/p03_move_website_to_framework.py
rename to erpnext/patches/september_2013/p03_move_website_to_framework.py
diff --git a/patches/september_2013/p03_update_stock_uom_in_sle.py b/erpnext/patches/september_2013/p03_update_stock_uom_in_sle.py
similarity index 100%
rename from patches/september_2013/p03_update_stock_uom_in_sle.py
rename to erpnext/patches/september_2013/p03_update_stock_uom_in_sle.py
diff --git a/patches/september_2013/p04_unsubmit_serial_nos.py b/erpnext/patches/september_2013/p04_unsubmit_serial_nos.py
similarity index 100%
rename from patches/september_2013/p04_unsubmit_serial_nos.py
rename to erpnext/patches/september_2013/p04_unsubmit_serial_nos.py
diff --git a/patches/september_2013/p05_fix_customer_in_pos.py b/erpnext/patches/september_2013/p05_fix_customer_in_pos.py
similarity index 100%
rename from patches/september_2013/p05_fix_customer_in_pos.py
rename to erpnext/patches/september_2013/p05_fix_customer_in_pos.py
diff --git a/projects/__init__.py b/erpnext/projects/__init__.py
similarity index 100%
rename from projects/__init__.py
rename to erpnext/projects/__init__.py
diff --git a/projects/doctype/__init__.py b/erpnext/projects/doctype/__init__.py
similarity index 100%
rename from projects/doctype/__init__.py
rename to erpnext/projects/doctype/__init__.py
diff --git a/projects/doctype/activity_type/README.md b/erpnext/projects/doctype/activity_type/README.md
similarity index 100%
rename from projects/doctype/activity_type/README.md
rename to erpnext/projects/doctype/activity_type/README.md
diff --git a/projects/doctype/activity_type/__init__.py b/erpnext/projects/doctype/activity_type/__init__.py
similarity index 100%
rename from projects/doctype/activity_type/__init__.py
rename to erpnext/projects/doctype/activity_type/__init__.py
diff --git a/projects/doctype/activity_type/activity_type.py b/erpnext/projects/doctype/activity_type/activity_type.py
similarity index 100%
rename from projects/doctype/activity_type/activity_type.py
rename to erpnext/projects/doctype/activity_type/activity_type.py
diff --git a/projects/doctype/activity_type/activity_type.txt b/erpnext/projects/doctype/activity_type/activity_type.txt
similarity index 100%
rename from projects/doctype/activity_type/activity_type.txt
rename to erpnext/projects/doctype/activity_type/activity_type.txt
diff --git a/projects/doctype/activity_type/test_activity_type.py b/erpnext/projects/doctype/activity_type/test_activity_type.py
similarity index 100%
rename from projects/doctype/activity_type/test_activity_type.py
rename to erpnext/projects/doctype/activity_type/test_activity_type.py
diff --git a/projects/doctype/project/README.md b/erpnext/projects/doctype/project/README.md
similarity index 100%
rename from projects/doctype/project/README.md
rename to erpnext/projects/doctype/project/README.md
diff --git a/projects/doctype/project/__init__.py b/erpnext/projects/doctype/project/__init__.py
similarity index 100%
rename from projects/doctype/project/__init__.py
rename to erpnext/projects/doctype/project/__init__.py
diff --git a/projects/doctype/project/help.md b/erpnext/projects/doctype/project/help.md
similarity index 100%
rename from projects/doctype/project/help.md
rename to erpnext/projects/doctype/project/help.md
diff --git a/projects/doctype/project/project.js b/erpnext/projects/doctype/project/project.js
similarity index 91%
rename from projects/doctype/project/project.js
rename to erpnext/projects/doctype/project/project.js
index 30873b5..a77866e 100644
--- a/projects/doctype/project/project.js
+++ b/erpnext/projects/doctype/project/project.js
@@ -17,6 +17,6 @@
cur_frm.fields_dict.customer.get_query = function(doc,cdt,cdn) {
return{
- query:"controllers.queries.customer_query"
+ query: "erpnext.controllers.queries.customer_query"
}
}
\ No newline at end of file
diff --git a/projects/doctype/project/project.py b/erpnext/projects/doctype/project/project.py
similarity index 96%
rename from projects/doctype/project/project.py
rename to erpnext/projects/doctype/project/project.py
index 5b20c5b..f159452 100644
--- a/projects/doctype/project/project.py
+++ b/erpnext/projects/doctype/project/project.py
@@ -6,7 +6,7 @@
from webnotes.utils import flt, getdate
from webnotes import msgprint
-from utilities.transaction_base import delete_events
+from erpnext.utilities.transaction_base import delete_events
class DocType:
def __init__(self, doc, doclist=None):
diff --git a/projects/doctype/project/project.txt b/erpnext/projects/doctype/project/project.txt
similarity index 100%
rename from projects/doctype/project/project.txt
rename to erpnext/projects/doctype/project/project.txt
diff --git a/projects/doctype/project/test_project.py b/erpnext/projects/doctype/project/test_project.py
similarity index 100%
rename from projects/doctype/project/test_project.py
rename to erpnext/projects/doctype/project/test_project.py
diff --git a/projects/doctype/project_milestone/README.md b/erpnext/projects/doctype/project_milestone/README.md
similarity index 100%
rename from projects/doctype/project_milestone/README.md
rename to erpnext/projects/doctype/project_milestone/README.md
diff --git a/projects/doctype/project_milestone/__init__.py b/erpnext/projects/doctype/project_milestone/__init__.py
similarity index 100%
rename from projects/doctype/project_milestone/__init__.py
rename to erpnext/projects/doctype/project_milestone/__init__.py
diff --git a/projects/doctype/project_milestone/project_milestone.py b/erpnext/projects/doctype/project_milestone/project_milestone.py
similarity index 100%
rename from projects/doctype/project_milestone/project_milestone.py
rename to erpnext/projects/doctype/project_milestone/project_milestone.py
diff --git a/projects/doctype/project_milestone/project_milestone.txt b/erpnext/projects/doctype/project_milestone/project_milestone.txt
similarity index 100%
rename from projects/doctype/project_milestone/project_milestone.txt
rename to erpnext/projects/doctype/project_milestone/project_milestone.txt
diff --git a/projects/doctype/task/README.md b/erpnext/projects/doctype/task/README.md
similarity index 100%
rename from projects/doctype/task/README.md
rename to erpnext/projects/doctype/task/README.md
diff --git a/projects/doctype/task/__init__.py b/erpnext/projects/doctype/task/__init__.py
similarity index 100%
rename from projects/doctype/task/__init__.py
rename to erpnext/projects/doctype/task/__init__.py
diff --git a/projects/doctype/task/task.js b/erpnext/projects/doctype/task/task.js
similarity index 100%
rename from projects/doctype/task/task.js
rename to erpnext/projects/doctype/task/task.js
diff --git a/projects/doctype/task/task.py b/erpnext/projects/doctype/task/task.py
similarity index 97%
rename from projects/doctype/task/task.py
rename to erpnext/projects/doctype/task/task.py
index 227119e..85d8a49 100644
--- a/projects/doctype/task/task.py
+++ b/erpnext/projects/doctype/task/task.py
@@ -80,7 +80,7 @@
return data
def get_project(doctype, txt, searchfield, start, page_len, filters):
- from controllers.queries import get_match_cond
+ from erpnext.controllers.queries import get_match_cond
return webnotes.conn.sql(""" select name from `tabProject`
where %(key)s like "%(txt)s"
%(mcond)s
diff --git a/projects/doctype/task/task.txt b/erpnext/projects/doctype/task/task.txt
similarity index 100%
rename from projects/doctype/task/task.txt
rename to erpnext/projects/doctype/task/task.txt
diff --git a/projects/doctype/task/task_calendar.js b/erpnext/projects/doctype/task/task_calendar.js
similarity index 86%
rename from projects/doctype/task/task_calendar.js
rename to erpnext/projects/doctype/task/task_calendar.js
index 62d9757..f6adf58 100644
--- a/projects/doctype/task/task_calendar.js
+++ b/erpnext/projects/doctype/task/task_calendar.js
@@ -18,5 +18,5 @@
"label": wn._("Project")
}
],
- get_events_method: "projects.doctype.task.task.get_events"
+ get_events_method: "erpnext.projects.doctype.task.task.get_events"
}
\ No newline at end of file
diff --git a/projects/doctype/task/test_task.py b/erpnext/projects/doctype/task/test_task.py
similarity index 100%
rename from projects/doctype/task/test_task.py
rename to erpnext/projects/doctype/task/test_task.py
diff --git a/projects/doctype/time_log/README.md b/erpnext/projects/doctype/time_log/README.md
similarity index 100%
rename from projects/doctype/time_log/README.md
rename to erpnext/projects/doctype/time_log/README.md
diff --git a/projects/doctype/time_log/__init__.py b/erpnext/projects/doctype/time_log/__init__.py
similarity index 100%
rename from projects/doctype/time_log/__init__.py
rename to erpnext/projects/doctype/time_log/__init__.py
diff --git a/projects/doctype/time_log/test_time_log.py b/erpnext/projects/doctype/time_log/test_time_log.py
similarity index 89%
rename from projects/doctype/time_log/test_time_log.py
rename to erpnext/projects/doctype/time_log/test_time_log.py
index c62bee1..23206d6 100644
--- a/projects/doctype/time_log/test_time_log.py
+++ b/erpnext/projects/doctype/time_log/test_time_log.py
@@ -4,7 +4,7 @@
import webnotes
import unittest
-from projects.doctype.time_log.time_log import OverlapError
+from erpnext.projects.doctype.time_log.time_log import OverlapError
class TestTimeLog(unittest.TestCase):
def test_duplication(self):
diff --git a/projects/doctype/time_log/time_log.js b/erpnext/projects/doctype/time_log/time_log.js
similarity index 100%
rename from projects/doctype/time_log/time_log.js
rename to erpnext/projects/doctype/time_log/time_log.js
diff --git a/projects/doctype/time_log/time_log.py b/erpnext/projects/doctype/time_log/time_log.py
similarity index 100%
rename from projects/doctype/time_log/time_log.py
rename to erpnext/projects/doctype/time_log/time_log.py
diff --git a/projects/doctype/time_log/time_log.txt b/erpnext/projects/doctype/time_log/time_log.txt
similarity index 100%
rename from projects/doctype/time_log/time_log.txt
rename to erpnext/projects/doctype/time_log/time_log.txt
diff --git a/projects/doctype/time_log/time_log_calendar.js b/erpnext/projects/doctype/time_log/time_log_calendar.js
similarity index 78%
rename from projects/doctype/time_log/time_log_calendar.js
rename to erpnext/projects/doctype/time_log/time_log_calendar.js
index 2451de1..ea14074 100644
--- a/projects/doctype/time_log/time_log_calendar.js
+++ b/erpnext/projects/doctype/time_log/time_log_calendar.js
@@ -9,5 +9,5 @@
"title": "title",
"allDay": "allDay"
},
- get_events_method: "projects.doctype.time_log.time_log.get_events"
+ get_events_method: "erpnext.projects.doctype.time_log.time_log.get_events"
}
\ No newline at end of file
diff --git a/projects/doctype/time_log/time_log_list.js b/erpnext/projects/doctype/time_log/time_log_list.js
similarity index 100%
rename from projects/doctype/time_log/time_log_list.js
rename to erpnext/projects/doctype/time_log/time_log_list.js
diff --git a/projects/doctype/time_log_batch/README.md b/erpnext/projects/doctype/time_log_batch/README.md
similarity index 100%
rename from projects/doctype/time_log_batch/README.md
rename to erpnext/projects/doctype/time_log_batch/README.md
diff --git a/projects/doctype/time_log_batch/__init__.py b/erpnext/projects/doctype/time_log_batch/__init__.py
similarity index 100%
rename from projects/doctype/time_log_batch/__init__.py
rename to erpnext/projects/doctype/time_log_batch/__init__.py
diff --git a/projects/doctype/time_log_batch/test_time_log_batch.py b/erpnext/projects/doctype/time_log_batch/test_time_log_batch.py
similarity index 92%
rename from projects/doctype/time_log_batch/test_time_log_batch.py
rename to erpnext/projects/doctype/time_log_batch/test_time_log_batch.py
index 8a7e6f5..9fbf709 100644
--- a/projects/doctype/time_log_batch/test_time_log_batch.py
+++ b/erpnext/projects/doctype/time_log_batch/test_time_log_batch.py
@@ -5,7 +5,7 @@
class TimeLogBatchTest(unittest.TestCase):
def test_time_log_status(self):
- from projects.doctype.time_log.test_time_log import test_records as time_log_records
+ from erpnext.projects.doctype.time_log.test_time_log import test_records as time_log_records
time_log = webnotes.bean(copy=time_log_records[0])
time_log.doc.fields.update({
"from_time": "2013-01-02 10:00:00",
diff --git a/projects/doctype/time_log_batch/time_log_batch.js b/erpnext/projects/doctype/time_log_batch/time_log_batch.js
similarity index 100%
rename from projects/doctype/time_log_batch/time_log_batch.js
rename to erpnext/projects/doctype/time_log_batch/time_log_batch.js
diff --git a/projects/doctype/time_log_batch/time_log_batch.py b/erpnext/projects/doctype/time_log_batch/time_log_batch.py
similarity index 100%
rename from projects/doctype/time_log_batch/time_log_batch.py
rename to erpnext/projects/doctype/time_log_batch/time_log_batch.py
diff --git a/projects/doctype/time_log_batch/time_log_batch.txt b/erpnext/projects/doctype/time_log_batch/time_log_batch.txt
similarity index 100%
rename from projects/doctype/time_log_batch/time_log_batch.txt
rename to erpnext/projects/doctype/time_log_batch/time_log_batch.txt
diff --git a/projects/doctype/time_log_batch_detail/README.md b/erpnext/projects/doctype/time_log_batch_detail/README.md
similarity index 100%
rename from projects/doctype/time_log_batch_detail/README.md
rename to erpnext/projects/doctype/time_log_batch_detail/README.md
diff --git a/projects/doctype/time_log_batch_detail/__init__.py b/erpnext/projects/doctype/time_log_batch_detail/__init__.py
similarity index 100%
rename from projects/doctype/time_log_batch_detail/__init__.py
rename to erpnext/projects/doctype/time_log_batch_detail/__init__.py
diff --git a/projects/doctype/time_log_batch_detail/time_log_batch_detail.py b/erpnext/projects/doctype/time_log_batch_detail/time_log_batch_detail.py
similarity index 100%
rename from projects/doctype/time_log_batch_detail/time_log_batch_detail.py
rename to erpnext/projects/doctype/time_log_batch_detail/time_log_batch_detail.py
diff --git a/projects/doctype/time_log_batch_detail/time_log_batch_detail.txt b/erpnext/projects/doctype/time_log_batch_detail/time_log_batch_detail.txt
similarity index 100%
rename from projects/doctype/time_log_batch_detail/time_log_batch_detail.txt
rename to erpnext/projects/doctype/time_log_batch_detail/time_log_batch_detail.txt
diff --git a/projects/page/__init__.py b/erpnext/projects/page/__init__.py
similarity index 100%
rename from projects/page/__init__.py
rename to erpnext/projects/page/__init__.py
diff --git a/projects/page/projects_home/__init__.py b/erpnext/projects/page/projects_home/__init__.py
similarity index 100%
rename from projects/page/projects_home/__init__.py
rename to erpnext/projects/page/projects_home/__init__.py
diff --git a/projects/page/projects_home/projects_home.js b/erpnext/projects/page/projects_home/projects_home.js
similarity index 100%
rename from projects/page/projects_home/projects_home.js
rename to erpnext/projects/page/projects_home/projects_home.js
diff --git a/projects/page/projects_home/projects_home.txt b/erpnext/projects/page/projects_home/projects_home.txt
similarity index 100%
rename from projects/page/projects_home/projects_home.txt
rename to erpnext/projects/page/projects_home/projects_home.txt
diff --git a/projects/report/__init__.py b/erpnext/projects/report/__init__.py
similarity index 100%
rename from projects/report/__init__.py
rename to erpnext/projects/report/__init__.py
diff --git a/projects/report/daily_time_log_summary/__init__.py b/erpnext/projects/report/daily_time_log_summary/__init__.py
similarity index 100%
rename from projects/report/daily_time_log_summary/__init__.py
rename to erpnext/projects/report/daily_time_log_summary/__init__.py
diff --git a/projects/report/daily_time_log_summary/daily_time_log_summary.js b/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.js
similarity index 100%
rename from projects/report/daily_time_log_summary/daily_time_log_summary.js
rename to erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.js
diff --git a/projects/report/daily_time_log_summary/daily_time_log_summary.py b/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py
similarity index 100%
rename from projects/report/daily_time_log_summary/daily_time_log_summary.py
rename to erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py
diff --git a/projects/report/daily_time_log_summary/daily_time_log_summary.txt b/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.txt
similarity index 100%
rename from projects/report/daily_time_log_summary/daily_time_log_summary.txt
rename to erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.txt
diff --git a/projects/report/project_wise_stock_tracking/__init__.py b/erpnext/projects/report/project_wise_stock_tracking/__init__.py
similarity index 100%
rename from projects/report/project_wise_stock_tracking/__init__.py
rename to erpnext/projects/report/project_wise_stock_tracking/__init__.py
diff --git a/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py b/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py
similarity index 100%
rename from projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py
rename to erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py
diff --git a/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.txt b/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.txt
similarity index 100%
rename from projects/report/project_wise_stock_tracking/project_wise_stock_tracking.txt
rename to erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.txt
diff --git a/projects/utils.py b/erpnext/projects/utils.py
similarity index 100%
rename from projects/utils.py
rename to erpnext/projects/utils.py
diff --git a/erpnext/public/build.json b/erpnext/public/build.json
new file mode 100644
index 0000000..ea9808a
--- /dev/null
+++ b/erpnext/public/build.json
@@ -0,0 +1,16 @@
+{
+ "css/erpnext.css": [
+ "public/js/startup.css"
+ ],
+ "js/erpnext-web.min.js": [
+ "public/js/website_utils.js"
+ ],
+ "js/erpnext.min.js": [
+ "public/js/startup.js",
+ "public/js/conf.js",
+ "public/js/toolbar.js",
+ "public/js/feature_setup.js",
+ "public/js/utils.js",
+ "public/js/queries.js"
+ ]
+}
\ No newline at end of file
diff --git a/public/css/splash.css b/erpnext/public/css/splash.css
similarity index 100%
rename from public/css/splash.css
rename to erpnext/public/css/splash.css
diff --git a/public/images/erpnext-fade.png b/erpnext/public/images/erpnext-fade.png
similarity index 100%
rename from public/images/erpnext-fade.png
rename to erpnext/public/images/erpnext-fade.png
Binary files differ
diff --git a/public/images/erpnext1.png b/erpnext/public/images/erpnext1.png
similarity index 100%
rename from public/images/erpnext1.png
rename to erpnext/public/images/erpnext1.png
Binary files differ
diff --git a/public/images/favicon.ico b/erpnext/public/images/favicon.ico
similarity index 100%
rename from public/images/favicon.ico
rename to erpnext/public/images/favicon.ico
Binary files differ
diff --git a/public/images/feed.png b/erpnext/public/images/feed.png
similarity index 100%
rename from public/images/feed.png
rename to erpnext/public/images/feed.png
Binary files differ
diff --git a/public/images/splash.svg b/erpnext/public/images/splash.svg
similarity index 100%
rename from public/images/splash.svg
rename to erpnext/public/images/splash.svg
diff --git a/public/js/account_tree_grid.js b/erpnext/public/js/account_tree_grid.js
similarity index 100%
rename from public/js/account_tree_grid.js
rename to erpnext/public/js/account_tree_grid.js
diff --git a/public/js/conf.js b/erpnext/public/js/conf.js
similarity index 80%
rename from public/js/conf.js
rename to erpnext/public/js/conf.js
index 929bfca..d902fe1 100644
--- a/public/js/conf.js
+++ b/erpnext/public/js/conf.js
@@ -9,7 +9,7 @@
var brand = ($("<div></div>").append(wn.boot.website_settings.brand_html).text() || 'erpnext');
$('.navbar-brand').html('<div style="display: inline-block;">\
- <object type="image/svg+xml" data="app/images/splash.svg" class="toolbar-splash"></object>\
+ <object type="image/svg+xml" data="assets/erpnext/images/splash.svg" class="toolbar-splash"></object>\
</div>' + brand)
.attr("title", brand)
.addClass("navbar-icon-home")
@@ -27,9 +27,7 @@
var d = new wn.ui.Dialog({title: wn._('About ERPNext')})
$(d.body).html(repl("<div>\
- <p>"+wn._("ERPNext is an open-source web based ERP made by Web Notes Technologies Pvt Ltd.\
- to provide an integrated tool to manage most processes in a small organization.\
- For more information about Web Notes, or to buy hosting servies, go to ")+
+ <p>"+wn._("ERPNext is an open-source web based ERP made by Web Notes Technologies Pvt Ltd. to provide an integrated tool to manage most processes in a small organization. For more information about Web Notes, or to buy hosting servies, go to ")+
"<a href='https://erpnext.com'>https://erpnext.com</a>.</p>\
<p>"+wn._("To report an issue, go to ")+"<a href='https://github.com/webnotes/erpnext/issues'>GitHub Issues</a></p>\
<hr>\
diff --git a/public/js/controllers/accounts.js b/erpnext/public/js/controllers/accounts.js
similarity index 100%
rename from public/js/controllers/accounts.js
rename to erpnext/public/js/controllers/accounts.js
diff --git a/public/js/controllers/stock_controller.js b/erpnext/public/js/controllers/stock_controller.js
similarity index 100%
rename from public/js/controllers/stock_controller.js
rename to erpnext/public/js/controllers/stock_controller.js
diff --git a/public/js/feature_setup.js b/erpnext/public/js/feature_setup.js
similarity index 100%
rename from public/js/feature_setup.js
rename to erpnext/public/js/feature_setup.js
diff --git a/public/js/purchase_trends_filters.js b/erpnext/public/js/purchase_trends_filters.js
similarity index 100%
rename from public/js/purchase_trends_filters.js
rename to erpnext/public/js/purchase_trends_filters.js
diff --git a/public/js/queries.js b/erpnext/public/js/queries.js
similarity index 74%
rename from public/js/queries.js
rename to erpnext/public/js/queries.js
index 3c60a91..621e340 100644
--- a/public/js/queries.js
+++ b/erpnext/public/js/queries.js
@@ -9,27 +9,27 @@
},
lead: function() {
- return { query: "controllers.queries.lead_query" };
+ return { query: "erpnext.controllers.queries.lead_query" };
},
customer: function() {
- return { query: "controllers.queries.customer_query" };
+ return { query: "erpnext.controllers.queries.customer_query" };
},
supplier: function() {
- return { query: "controllers.queries.supplier_query" };
+ return { query: "erpnext.controllers.queries.supplier_query" };
},
account: function() {
- return { query: "controllers.queries.account_query" };
+ return { query: "erpnext.controllers.queries.account_query" };
},
item: function() {
- return { query: "controllers.queries.item_query" };
+ return { query: "erpnext.controllers.queries.item_query" };
},
bom: function() {
- return { query: "controllers.queries.bom" };
+ return { query: "erpnext.controllers.queries.bom" };
},
task: function() {
diff --git a/public/js/sales_trends_filters.js b/erpnext/public/js/sales_trends_filters.js
similarity index 100%
rename from public/js/sales_trends_filters.js
rename to erpnext/public/js/sales_trends_filters.js
diff --git a/public/js/startup.css b/erpnext/public/js/startup.css
similarity index 100%
rename from public/js/startup.css
rename to erpnext/public/js/startup.css
diff --git a/public/js/startup.js b/erpnext/public/js/startup.js
similarity index 100%
rename from public/js/startup.js
rename to erpnext/public/js/startup.js
diff --git a/public/js/stock_analytics.js b/erpnext/public/js/stock_analytics.js
similarity index 98%
rename from public/js/stock_analytics.js
rename to erpnext/public/js/stock_analytics.js
index 8b68d39..48deeb4 100644
--- a/public/js/stock_analytics.js
+++ b/erpnext/public/js/stock_analytics.js
@@ -1,7 +1,7 @@
// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
-wn.require("app/js/stock_grid_report.js");
+wn.require("assets/erpnext/js/stock_grid_report.js");
erpnext.StockAnalytics = erpnext.StockGridReport.extend({
init: function(wrapper, opts) {
diff --git a/public/js/stock_grid_report.js b/erpnext/public/js/stock_grid_report.js
similarity index 100%
rename from public/js/stock_grid_report.js
rename to erpnext/public/js/stock_grid_report.js
diff --git a/public/js/toolbar.js b/erpnext/public/js/toolbar.js
similarity index 100%
rename from public/js/toolbar.js
rename to erpnext/public/js/toolbar.js
diff --git a/public/js/transaction.js b/erpnext/public/js/transaction.js
similarity index 99%
rename from public/js/transaction.js
rename to erpnext/public/js/transaction.js
index 4c4a810..5b48820 100644
--- a/public/js/transaction.js
+++ b/erpnext/public/js/transaction.js
@@ -2,7 +2,7 @@
// License: GNU General Public License v3. See license.txt
wn.provide("erpnext");
-wn.require("app/js/controllers/stock_controller.js");
+wn.require("assets/erpnext/js/controllers/stock_controller.js");
erpnext.TransactionController = erpnext.stock.StockController.extend({
onload: function() {
@@ -214,7 +214,7 @@
var fieldname = buying_or_selling.toLowerCase() + "_price_list";
if(this.frm.doc[fieldname]) {
return this.frm.call({
- method: "setup.utils.get_price_list_currency",
+ method: "erpnext.setup.utils.get_price_list_currency",
args: {
price_list: this.frm.doc[fieldname],
},
diff --git a/public/js/utils.js b/erpnext/public/js/utils.js
similarity index 100%
rename from public/js/utils.js
rename to erpnext/public/js/utils.js
diff --git a/public/js/website_utils.js b/erpnext/public/js/website_utils.js
similarity index 95%
rename from public/js/website_utils.js
rename to erpnext/public/js/website_utils.js
index e752812..fda30b8 100644
--- a/public/js/website_utils.js
+++ b/erpnext/public/js/website_utils.js
@@ -8,7 +8,7 @@
wn.send_message = function(opts, btn) {
return wn.call({
type: "POST",
- method: "portal.utils.send_message",
+ method: "erpnext.portal.utils.send_message",
btn: btn,
args: opts,
callback: opts.callback
@@ -46,7 +46,7 @@
} else {
return wn.call({
type: "POST",
- method: "selling.utils.cart.update_cart",
+ method: "erpnext.selling.utils.cart.update_cart",
args: {
item_code: opts.item_code,
qty: opts.qty,
diff --git a/selling/Print Format/Quotation Classic/Quotation Classic.txt b/erpnext/selling/Print Format/Quotation Classic/Quotation Classic.txt
similarity index 100%
rename from selling/Print Format/Quotation Classic/Quotation Classic.txt
rename to erpnext/selling/Print Format/Quotation Classic/Quotation Classic.txt
diff --git a/selling/Print Format/Quotation Modern/Quotation Modern.txt b/erpnext/selling/Print Format/Quotation Modern/Quotation Modern.txt
similarity index 100%
rename from selling/Print Format/Quotation Modern/Quotation Modern.txt
rename to erpnext/selling/Print Format/Quotation Modern/Quotation Modern.txt
diff --git a/selling/Print Format/Quotation Spartan/Quotation Spartan.txt b/erpnext/selling/Print Format/Quotation Spartan/Quotation Spartan.txt
similarity index 100%
rename from selling/Print Format/Quotation Spartan/Quotation Spartan.txt
rename to erpnext/selling/Print Format/Quotation Spartan/Quotation Spartan.txt
diff --git a/selling/Print Format/Sales Order Classic/Sales Order Classic.txt b/erpnext/selling/Print Format/Sales Order Classic/Sales Order Classic.txt
similarity index 100%
rename from selling/Print Format/Sales Order Classic/Sales Order Classic.txt
rename to erpnext/selling/Print Format/Sales Order Classic/Sales Order Classic.txt
diff --git a/selling/Print Format/Sales Order Modern/Sales Order Modern.txt b/erpnext/selling/Print Format/Sales Order Modern/Sales Order Modern.txt
similarity index 100%
rename from selling/Print Format/Sales Order Modern/Sales Order Modern.txt
rename to erpnext/selling/Print Format/Sales Order Modern/Sales Order Modern.txt
diff --git a/selling/Print Format/Sales Order Spartan/Sales Order Spartan.txt b/erpnext/selling/Print Format/Sales Order Spartan/Sales Order Spartan.txt
similarity index 100%
rename from selling/Print Format/Sales Order Spartan/Sales Order Spartan.txt
rename to erpnext/selling/Print Format/Sales Order Spartan/Sales Order Spartan.txt
diff --git a/selling/README.md b/erpnext/selling/README.md
similarity index 100%
rename from selling/README.md
rename to erpnext/selling/README.md
diff --git a/selling/__init__.py b/erpnext/selling/__init__.py
similarity index 100%
rename from selling/__init__.py
rename to erpnext/selling/__init__.py
diff --git a/selling/doctype/__init__.py b/erpnext/selling/doctype/__init__.py
similarity index 100%
rename from selling/doctype/__init__.py
rename to erpnext/selling/doctype/__init__.py
diff --git a/selling/doctype/campaign/README.md b/erpnext/selling/doctype/campaign/README.md
similarity index 100%
rename from selling/doctype/campaign/README.md
rename to erpnext/selling/doctype/campaign/README.md
diff --git a/selling/doctype/campaign/__init__.py b/erpnext/selling/doctype/campaign/__init__.py
similarity index 100%
rename from selling/doctype/campaign/__init__.py
rename to erpnext/selling/doctype/campaign/__init__.py
diff --git a/selling/doctype/campaign/campaign.js b/erpnext/selling/doctype/campaign/campaign.js
similarity index 100%
rename from selling/doctype/campaign/campaign.js
rename to erpnext/selling/doctype/campaign/campaign.js
diff --git a/selling/doctype/campaign/campaign.py b/erpnext/selling/doctype/campaign/campaign.py
similarity index 100%
rename from selling/doctype/campaign/campaign.py
rename to erpnext/selling/doctype/campaign/campaign.py
diff --git a/selling/doctype/campaign/campaign.txt b/erpnext/selling/doctype/campaign/campaign.txt
similarity index 100%
rename from selling/doctype/campaign/campaign.txt
rename to erpnext/selling/doctype/campaign/campaign.txt
diff --git a/selling/doctype/campaign/test_campaign.py b/erpnext/selling/doctype/campaign/test_campaign.py
similarity index 100%
rename from selling/doctype/campaign/test_campaign.py
rename to erpnext/selling/doctype/campaign/test_campaign.py
diff --git a/selling/doctype/customer/README.md b/erpnext/selling/doctype/customer/README.md
similarity index 100%
rename from selling/doctype/customer/README.md
rename to erpnext/selling/doctype/customer/README.md
diff --git a/selling/doctype/customer/__init__.py b/erpnext/selling/doctype/customer/__init__.py
similarity index 100%
rename from selling/doctype/customer/__init__.py
rename to erpnext/selling/doctype/customer/__init__.py
diff --git a/selling/doctype/customer/customer.js b/erpnext/selling/doctype/customer/customer.js
similarity index 95%
rename from selling/doctype/customer/customer.js
rename to erpnext/selling/doctype/customer/customer.js
index 5e0ccc9..e8130ae 100644
--- a/selling/doctype/customer/customer.js
+++ b/erpnext/selling/doctype/customer/customer.js
@@ -1,7 +1,7 @@
// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
-wn.require('app/setup/doctype/contact_control/contact_control.js');
+{% include 'setup/doctype/contact_control/contact_control.js' %};
cur_frm.cscript.onload = function(doc,dt,dn){
cur_frm.cscript.load_defaults(doc, dt, dn);
@@ -52,7 +52,7 @@
return wn.call({
type: "GET",
- method:"selling.doctype.customer.customer.get_dashboard_info",
+ method: "erpnext.selling.doctype.customer.customer.get_dashboard_info",
args: {
customer: cur_frm.doc.name
},
@@ -116,7 +116,7 @@
cur_frm.fields_dict.lead_name.get_query = function(doc,cdt,cdn) {
return{
- query:"controllers.queries.lead_query"
+ query: "erpnext.controllers.queries.lead_query"
}
}
diff --git a/selling/doctype/customer/customer.py b/erpnext/selling/doctype/customer/customer.py
similarity index 98%
rename from selling/doctype/customer/customer.py
rename to erpnext/selling/doctype/customer/customer.py
index 49296b0..a54f23d 100644
--- a/selling/doctype/customer/customer.py
+++ b/erpnext/selling/doctype/customer/customer.py
@@ -9,7 +9,7 @@
import webnotes.defaults
-from utilities.transaction_base import TransactionBase
+from erpnext.utilities.transaction_base import TransactionBase
class DocType(TransactionBase):
def __init__(self, doc, doclist=[]):
@@ -155,7 +155,7 @@
webnotes.conn.sql("update `tabLead` set status='Interested' where name=%s",self.doc.lead_name)
def before_rename(self, olddn, newdn, merge=False):
- from accounts.utils import rename_account_for
+ from erpnext.accounts.utils import rename_account_for
rename_account_for("Customer", olddn, newdn, merge)
def after_rename(self, olddn, newdn, merge=False):
diff --git a/selling/doctype/customer/customer.txt b/erpnext/selling/doctype/customer/customer.txt
similarity index 100%
rename from selling/doctype/customer/customer.txt
rename to erpnext/selling/doctype/customer/customer.txt
diff --git a/selling/doctype/customer/test_customer.py b/erpnext/selling/doctype/customer/test_customer.py
similarity index 100%
rename from selling/doctype/customer/test_customer.py
rename to erpnext/selling/doctype/customer/test_customer.py
diff --git a/selling/doctype/customer_discount/__init__.py b/erpnext/selling/doctype/customer_discount/__init__.py
similarity index 100%
rename from selling/doctype/customer_discount/__init__.py
rename to erpnext/selling/doctype/customer_discount/__init__.py
diff --git a/selling/doctype/customer_discount/customer_discount.py b/erpnext/selling/doctype/customer_discount/customer_discount.py
similarity index 100%
rename from selling/doctype/customer_discount/customer_discount.py
rename to erpnext/selling/doctype/customer_discount/customer_discount.py
diff --git a/selling/doctype/customer_discount/customer_discount.txt b/erpnext/selling/doctype/customer_discount/customer_discount.txt
similarity index 100%
rename from selling/doctype/customer_discount/customer_discount.txt
rename to erpnext/selling/doctype/customer_discount/customer_discount.txt
diff --git a/selling/doctype/industry_type/README.md b/erpnext/selling/doctype/industry_type/README.md
similarity index 100%
rename from selling/doctype/industry_type/README.md
rename to erpnext/selling/doctype/industry_type/README.md
diff --git a/selling/doctype/industry_type/__init__.py b/erpnext/selling/doctype/industry_type/__init__.py
similarity index 100%
rename from selling/doctype/industry_type/__init__.py
rename to erpnext/selling/doctype/industry_type/__init__.py
diff --git a/selling/doctype/industry_type/industry_type.js b/erpnext/selling/doctype/industry_type/industry_type.js
similarity index 100%
rename from selling/doctype/industry_type/industry_type.js
rename to erpnext/selling/doctype/industry_type/industry_type.js
diff --git a/selling/doctype/industry_type/industry_type.py b/erpnext/selling/doctype/industry_type/industry_type.py
similarity index 100%
rename from selling/doctype/industry_type/industry_type.py
rename to erpnext/selling/doctype/industry_type/industry_type.py
diff --git a/selling/doctype/industry_type/industry_type.txt b/erpnext/selling/doctype/industry_type/industry_type.txt
similarity index 100%
rename from selling/doctype/industry_type/industry_type.txt
rename to erpnext/selling/doctype/industry_type/industry_type.txt
diff --git a/selling/doctype/industry_type/test_industry_type.py b/erpnext/selling/doctype/industry_type/test_industry_type.py
similarity index 100%
rename from selling/doctype/industry_type/test_industry_type.py
rename to erpnext/selling/doctype/industry_type/test_industry_type.py
diff --git a/selling/doctype/installation_note/README.md b/erpnext/selling/doctype/installation_note/README.md
similarity index 100%
rename from selling/doctype/installation_note/README.md
rename to erpnext/selling/doctype/installation_note/README.md
diff --git a/selling/doctype/installation_note/__init__.py b/erpnext/selling/doctype/installation_note/__init__.py
similarity index 100%
rename from selling/doctype/installation_note/__init__.py
rename to erpnext/selling/doctype/installation_note/__init__.py
diff --git a/selling/doctype/installation_note/installation_note.js b/erpnext/selling/doctype/installation_note/installation_note.js
similarity index 94%
rename from selling/doctype/installation_note/installation_note.js
rename to erpnext/selling/doctype/installation_note/installation_note.js
index ea777e0..223bd8d 100644
--- a/selling/doctype/installation_note/installation_note.js
+++ b/erpnext/selling/doctype/installation_note/installation_note.js
@@ -37,7 +37,7 @@
this.frm.set_query("customer", function() {
return {
- query: "controllers.queries.customer_query"
+ query: "erpnext.controllers.queries.customer_query"
}
});
},
@@ -47,7 +47,7 @@
cur_frm.add_custom_button(wn._('From Delivery Note'),
function() {
wn.model.map_current_doc({
- method: "stock.doctype.delivery_note.delivery_note.make_installation_note",
+ method: "erpnext.stock.doctype.delivery_note.delivery_note.make_installation_note",
source_doctype: "Delivery Note",
get_query_filters: {
docstatus: 1,
diff --git a/selling/doctype/installation_note/installation_note.py b/erpnext/selling/doctype/installation_note/installation_note.py
similarity index 94%
rename from selling/doctype/installation_note/installation_note.py
rename to erpnext/selling/doctype/installation_note/installation_note.py
index 026d7e1..253e43e 100644
--- a/selling/doctype/installation_note/installation_note.py
+++ b/erpnext/selling/doctype/installation_note/installation_note.py
@@ -7,9 +7,9 @@
from webnotes.utils import cstr, getdate
from webnotes.model.bean import getlist
from webnotes import msgprint
-from stock.utils import get_valid_serial_nos
+from erpnext.stock.utils import get_valid_serial_nos
-from utilities.transaction_base import TransactionBase
+from erpnext.utilities.transaction_base import TransactionBase
class DocType(TransactionBase):
def __init__(self, doc, doclist=[]):
@@ -36,11 +36,11 @@
self.validate_installation_date()
self.check_item_table()
- from controllers.selling_controller import check_active_sales_items
+ from erpnext.controllers.selling_controller import check_active_sales_items
check_active_sales_items(self)
def validate_fiscal_year(self):
- from accounts.utils import validate_fiscal_year
+ from erpnext.accounts.utils import validate_fiscal_year
validate_fiscal_year(self.doc.inst_date, self.doc.fiscal_year, "Installation Date")
def is_serial_no_added(self, item_code, serial_no):
diff --git a/selling/doctype/installation_note/installation_note.txt b/erpnext/selling/doctype/installation_note/installation_note.txt
similarity index 100%
rename from selling/doctype/installation_note/installation_note.txt
rename to erpnext/selling/doctype/installation_note/installation_note.txt
diff --git a/selling/doctype/installation_note_item/README.md b/erpnext/selling/doctype/installation_note_item/README.md
similarity index 100%
rename from selling/doctype/installation_note_item/README.md
rename to erpnext/selling/doctype/installation_note_item/README.md
diff --git a/selling/doctype/installation_note_item/__init__.py b/erpnext/selling/doctype/installation_note_item/__init__.py
similarity index 100%
rename from selling/doctype/installation_note_item/__init__.py
rename to erpnext/selling/doctype/installation_note_item/__init__.py
diff --git a/selling/doctype/installation_note_item/installation_note_item.py b/erpnext/selling/doctype/installation_note_item/installation_note_item.py
similarity index 100%
rename from selling/doctype/installation_note_item/installation_note_item.py
rename to erpnext/selling/doctype/installation_note_item/installation_note_item.py
diff --git a/selling/doctype/installation_note_item/installation_note_item.txt b/erpnext/selling/doctype/installation_note_item/installation_note_item.txt
similarity index 100%
rename from selling/doctype/installation_note_item/installation_note_item.txt
rename to erpnext/selling/doctype/installation_note_item/installation_note_item.txt
diff --git a/selling/doctype/lead/README.md b/erpnext/selling/doctype/lead/README.md
similarity index 100%
rename from selling/doctype/lead/README.md
rename to erpnext/selling/doctype/lead/README.md
diff --git a/selling/doctype/lead/__init__.py b/erpnext/selling/doctype/lead/__init__.py
similarity index 100%
rename from selling/doctype/lead/__init__.py
rename to erpnext/selling/doctype/lead/__init__.py
diff --git a/selling/doctype/lead/get_leads.py b/erpnext/selling/doctype/lead/get_leads.py
similarity index 95%
rename from selling/doctype/lead/get_leads.py
rename to erpnext/selling/doctype/lead/get_leads.py
index 7bc691f..898ee0e 100644
--- a/selling/doctype/lead/get_leads.py
+++ b/erpnext/selling/doctype/lead/get_leads.py
@@ -5,7 +5,7 @@
import webnotes
from webnotes.utils import cstr, cint
from webnotes.utils.email_lib.receive import POP3Mailbox
-from core.doctype.communication.communication import make
+from webnotes.core.doctype.communication.communication import make
def add_sales_communication(subject, content, sender, real_name, mail=None,
status="Open", date=None):
diff --git a/selling/doctype/lead/lead.js b/erpnext/selling/doctype/lead/lead.js
similarity index 90%
rename from selling/doctype/lead/lead.js
rename to erpnext/selling/doctype/lead/lead.js
index 54a249f..4ab1067 100644
--- a/selling/doctype/lead/lead.js
+++ b/erpnext/selling/doctype/lead/lead.js
@@ -1,14 +1,14 @@
// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
-wn.require('app/utilities/doctype/sms_control/sms_control.js');
-wn.require('app/setup/doctype/contact_control/contact_control.js');
+{% include 'setup/doctype/contact_control/contact_control.js' %};
+{% include 'utilities/doctype/sms_control/sms_control.js' %}
wn.provide("erpnext");
erpnext.LeadController = wn.ui.form.Controller.extend({
setup: function() {
this.frm.fields_dict.customer.get_query = function(doc,cdt,cdn) {
- return { query:"controllers.queries.customer_query" } }
+ return { query: "erpnext.controllers.queries.customer_query" } }
},
onload: function() {
@@ -77,14 +77,14 @@
create_customer: function() {
wn.model.open_mapped_doc({
- method: "selling.doctype.lead.lead.make_customer",
+ method: "erpnext.selling.doctype.lead.lead.make_customer",
source_name: cur_frm.doc.name
})
},
create_opportunity: function() {
wn.model.open_mapped_doc({
- method: "selling.doctype.lead.lead.make_opportunity",
+ method: "erpnext.selling.doctype.lead.lead.make_opportunity",
source_name: cur_frm.doc.name
})
}
diff --git a/selling/doctype/lead/lead.py b/erpnext/selling/doctype/lead/lead.py
similarity index 98%
rename from selling/doctype/lead/lead.py
rename to erpnext/selling/doctype/lead/lead.py
index 26c06bb..e5f2b62 100644
--- a/selling/doctype/lead/lead.py
+++ b/erpnext/selling/doctype/lead/lead.py
@@ -8,7 +8,7 @@
from webnotes import session, msgprint
-from controllers.selling_controller import SellingController
+from erpnext.controllers.selling_controller import SellingController
class DocType(SellingController):
def __init__(self, doc, doclist):
diff --git a/selling/doctype/lead/lead.txt b/erpnext/selling/doctype/lead/lead.txt
similarity index 100%
rename from selling/doctype/lead/lead.txt
rename to erpnext/selling/doctype/lead/lead.txt
diff --git a/selling/doctype/lead/test_lead.py b/erpnext/selling/doctype/lead/test_lead.py
similarity index 94%
rename from selling/doctype/lead/test_lead.py
rename to erpnext/selling/doctype/lead/test_lead.py
index ec18ff7..d3f6f03 100644
--- a/selling/doctype/lead/test_lead.py
+++ b/erpnext/selling/doctype/lead/test_lead.py
@@ -19,7 +19,7 @@
class TestLead(unittest.TestCase):
def test_make_customer(self):
- from selling.doctype.lead.lead import make_customer
+ from erpnext.selling.doctype.lead.lead import make_customer
customer = make_customer("_T-Lead-00001")
self.assertEquals(customer[0]["doctype"], "Customer")
diff --git a/selling/doctype/opportunity/README.md b/erpnext/selling/doctype/opportunity/README.md
similarity index 100%
rename from selling/doctype/opportunity/README.md
rename to erpnext/selling/doctype/opportunity/README.md
diff --git a/selling/doctype/opportunity/__init__.py b/erpnext/selling/doctype/opportunity/__init__.py
similarity index 100%
rename from selling/doctype/opportunity/__init__.py
rename to erpnext/selling/doctype/opportunity/__init__.py
diff --git a/selling/doctype/opportunity/opportunity.js b/erpnext/selling/doctype/opportunity/opportunity.js
similarity index 96%
rename from selling/doctype/opportunity/opportunity.js
rename to erpnext/selling/doctype/opportunity/opportunity.js
index 05970fc..396def8 100644
--- a/selling/doctype/opportunity/opportunity.js
+++ b/erpnext/selling/doctype/opportunity/opportunity.js
@@ -1,7 +1,7 @@
// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
-wn.require('app/utilities/doctype/sms_control/sms_control.js');
+{% include 'utilities/doctype/sms_control/sms_control.js' %};
wn.provide("erpnext.selling");
// TODO commonify this code
@@ -60,7 +60,7 @@
this.frm.set_query("item_code", "enquiry_details", function() {
return {
- query: "controllers.queries.item_query",
+ query: "erpnext.controllers.queries.item_query",
filters: me.frm.doc.enquiry_type === "Maintenance" ?
{"is_service_item": "Yes"} : {"is_sales_item": "Yes"}
};
@@ -91,7 +91,7 @@
create_quotation: function() {
wn.model.open_mapped_doc({
- method: "selling.doctype.opportunity.opportunity.make_quotation",
+ method: "erpnext.selling.doctype.opportunity.opportunity.make_quotation",
source_name: cur_frm.doc.name
})
}
@@ -162,7 +162,7 @@
cur_frm.toggle_display("contact_info", doc.customer || doc.lead);
wn.model.map_current_doc({
- method: "selling.doctype.lead.lead.make_opportunity",
+ method: "erpnext.selling.doctype.lead.lead.make_opportunity",
source_name: cur_frm.doc.lead
})
diff --git a/selling/doctype/opportunity/opportunity.py b/erpnext/selling/doctype/opportunity/opportunity.py
similarity index 97%
rename from selling/doctype/opportunity/opportunity.py
rename to erpnext/selling/doctype/opportunity/opportunity.py
index e6c0afe..00a447f 100644
--- a/selling/doctype/opportunity/opportunity.py
+++ b/erpnext/selling/doctype/opportunity/opportunity.py
@@ -9,7 +9,7 @@
from webnotes import msgprint, _
-from utilities.transaction_base import TransactionBase
+from erpnext.utilities.transaction_base import TransactionBase
class DocType(TransactionBase):
def __init__(self,doc,doclist):
@@ -104,7 +104,7 @@
self.validate_uom_is_integer("uom", "qty")
self.validate_lead_cust()
- from accounts.utils import validate_fiscal_year
+ from erpnext.accounts.utils import validate_fiscal_year
validate_fiscal_year(self.doc.transaction_date, self.doc.fiscal_year, "Opportunity Date")
def on_submit(self):
diff --git a/selling/doctype/opportunity/opportunity.txt b/erpnext/selling/doctype/opportunity/opportunity.txt
similarity index 100%
rename from selling/doctype/opportunity/opportunity.txt
rename to erpnext/selling/doctype/opportunity/opportunity.txt
diff --git a/selling/doctype/opportunity_item/README.md b/erpnext/selling/doctype/opportunity_item/README.md
similarity index 100%
rename from selling/doctype/opportunity_item/README.md
rename to erpnext/selling/doctype/opportunity_item/README.md
diff --git a/selling/doctype/opportunity_item/__init__.py b/erpnext/selling/doctype/opportunity_item/__init__.py
similarity index 100%
rename from selling/doctype/opportunity_item/__init__.py
rename to erpnext/selling/doctype/opportunity_item/__init__.py
diff --git a/selling/doctype/opportunity_item/opportunity_item.py b/erpnext/selling/doctype/opportunity_item/opportunity_item.py
similarity index 100%
rename from selling/doctype/opportunity_item/opportunity_item.py
rename to erpnext/selling/doctype/opportunity_item/opportunity_item.py
diff --git a/selling/doctype/opportunity_item/opportunity_item.txt b/erpnext/selling/doctype/opportunity_item/opportunity_item.txt
similarity index 100%
rename from selling/doctype/opportunity_item/opportunity_item.txt
rename to erpnext/selling/doctype/opportunity_item/opportunity_item.txt
diff --git a/selling/doctype/quotation/README.md b/erpnext/selling/doctype/quotation/README.md
similarity index 100%
rename from selling/doctype/quotation/README.md
rename to erpnext/selling/doctype/quotation/README.md
diff --git a/selling/doctype/quotation/__init__.py b/erpnext/selling/doctype/quotation/__init__.py
similarity index 100%
rename from selling/doctype/quotation/__init__.py
rename to erpnext/selling/doctype/quotation/__init__.py
diff --git a/selling/doctype/quotation/quotation.js b/erpnext/selling/doctype/quotation/quotation.js
similarity index 89%
rename from selling/doctype/quotation/quotation.js
rename to erpnext/selling/doctype/quotation/quotation.js
index c7bf447..bb2ce8c 100644
--- a/selling/doctype/quotation/quotation.js
+++ b/erpnext/selling/doctype/quotation/quotation.js
@@ -8,10 +8,10 @@
cur_frm.cscript.other_fname = "other_charges";
cur_frm.cscript.sales_team_fname = "sales_team";
-wn.require('app/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js');
-wn.require('app/utilities/doctype/sms_control/sms_control.js');
-wn.require('app/selling/sales_common.js');
-wn.require('app/accounts/doctype/sales_invoice/pos.js');
+{% include 'selling/sales_common.js' %}
+{% include 'accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js' %}
+{% include 'utilities/doctype/sms_control/sms_control.js' %}
+{% include 'accounts/doctype/sales_invoice/pos.js' %}
erpnext.selling.QuotationController = erpnext.selling.SellingController.extend({
onload: function(doc, dt, dn) {
@@ -39,7 +39,7 @@
cur_frm.add_custom_button(wn._('From Opportunity'),
function() {
wn.model.map_current_doc({
- method: "selling.doctype.opportunity.opportunity.make_quotation",
+ method: "erpnext.selling.doctype.opportunity.opportunity.make_quotation",
source_doctype: "Opportunity",
get_query_filters: {
docstatus: 1,
@@ -90,7 +90,7 @@
cur_frm.script_manager.make(erpnext.selling.QuotationController);
cur_frm.fields_dict.lead.get_query = function(doc,cdt,cdn) {
- return{ query:"controllers.queries.lead_query" } }
+ return{ query: "erpnext.controllers.queries.lead_query" } }
cur_frm.cscript.lead = function(doc, cdt, cdn) {
if(doc.lead) {
@@ -112,7 +112,7 @@
// =====================================================================================
cur_frm.cscript['Make Sales Order'] = function() {
wn.model.open_mapped_doc({
- method: "selling.doctype.quotation.quotation.make_sales_order",
+ method: "erpnext.selling.doctype.quotation.quotation.make_sales_order",
source_name: cur_frm.doc.name
})
}
diff --git a/selling/doctype/quotation/quotation.py b/erpnext/selling/doctype/quotation/quotation.py
similarity index 97%
rename from selling/doctype/quotation/quotation.py
rename to erpnext/selling/doctype/quotation/quotation.py
index f2546b9..6a030b9 100644
--- a/selling/doctype/quotation/quotation.py
+++ b/erpnext/selling/doctype/quotation/quotation.py
@@ -11,7 +11,7 @@
-from controllers.selling_controller import SellingController
+from erpnext.controllers.selling_controller import SellingController
class DocType(SellingController):
def __init__(self, doc, doclist=[]):
@@ -150,7 +150,7 @@
lead_name = quotation[0]
customer_name = webnotes.conn.get_value("Customer", {"lead_name": lead_name})
if not customer_name:
- from selling.doctype.lead.lead import _make_customer
+ from erpnext.selling.doctype.lead.lead import _make_customer
customer_doclist = _make_customer(lead_name, ignore_permissions=ignore_permissions)
customer = webnotes.bean(customer_doclist)
customer.ignore_permissions = ignore_permissions
diff --git a/selling/doctype/quotation/quotation.txt b/erpnext/selling/doctype/quotation/quotation.txt
similarity index 100%
rename from selling/doctype/quotation/quotation.txt
rename to erpnext/selling/doctype/quotation/quotation.txt
diff --git a/selling/doctype/quotation/test_quotation.py b/erpnext/selling/doctype/quotation/test_quotation.py
similarity index 95%
rename from selling/doctype/quotation/test_quotation.py
rename to erpnext/selling/doctype/quotation/test_quotation.py
index 8f0e644..00cbd6c 100644
--- a/selling/doctype/quotation/test_quotation.py
+++ b/erpnext/selling/doctype/quotation/test_quotation.py
@@ -9,7 +9,7 @@
class TestQuotation(unittest.TestCase):
def test_make_sales_order(self):
- from selling.doctype.quotation.quotation import make_sales_order
+ from erpnext.selling.doctype.quotation.quotation import make_sales_order
quotation = webnotes.bean(copy=test_records[0])
quotation.insert()
diff --git a/selling/doctype/quotation_item/README.md b/erpnext/selling/doctype/quotation_item/README.md
similarity index 100%
rename from selling/doctype/quotation_item/README.md
rename to erpnext/selling/doctype/quotation_item/README.md
diff --git a/selling/doctype/quotation_item/__init__.py b/erpnext/selling/doctype/quotation_item/__init__.py
similarity index 100%
rename from selling/doctype/quotation_item/__init__.py
rename to erpnext/selling/doctype/quotation_item/__init__.py
diff --git a/selling/doctype/quotation_item/quotation_item.py b/erpnext/selling/doctype/quotation_item/quotation_item.py
similarity index 100%
rename from selling/doctype/quotation_item/quotation_item.py
rename to erpnext/selling/doctype/quotation_item/quotation_item.py
diff --git a/selling/doctype/quotation_item/quotation_item.txt b/erpnext/selling/doctype/quotation_item/quotation_item.txt
similarity index 100%
rename from selling/doctype/quotation_item/quotation_item.txt
rename to erpnext/selling/doctype/quotation_item/quotation_item.txt
diff --git a/selling/doctype/sales_bom/__init__.py b/erpnext/selling/doctype/sales_bom/__init__.py
similarity index 100%
rename from selling/doctype/sales_bom/__init__.py
rename to erpnext/selling/doctype/sales_bom/__init__.py
diff --git a/selling/doctype/sales_bom/sales_bom.js b/erpnext/selling/doctype/sales_bom/sales_bom.js
similarity index 100%
rename from selling/doctype/sales_bom/sales_bom.js
rename to erpnext/selling/doctype/sales_bom/sales_bom.js
diff --git a/selling/doctype/sales_bom/sales_bom.py b/erpnext/selling/doctype/sales_bom/sales_bom.py
similarity index 91%
rename from selling/doctype/sales_bom/sales_bom.py
rename to erpnext/selling/doctype/sales_bom/sales_bom.py
index f6cfafa..2f47be3 100644
--- a/selling/doctype/sales_bom/sales_bom.py
+++ b/erpnext/selling/doctype/sales_bom/sales_bom.py
@@ -14,7 +14,7 @@
def validate(self):
self.validate_main_item()
- from utilities.transaction_base import validate_uom_is_integer
+ from erpnext.utilities.transaction_base import validate_uom_is_integer
validate_uom_is_integer(self.doclist, "uom", "qty")
def validate_main_item(self):
@@ -33,7 +33,7 @@
}
def get_new_item_code(doctype, txt, searchfield, start, page_len, filters):
- from controllers.queries import get_match_cond
+ from erpnext.controllers.queries import get_match_cond
return webnotes.conn.sql("""select name, item_name, description from tabItem
where is_stock_item="No" and is_sales_item="Yes"
diff --git a/selling/doctype/sales_bom/sales_bom.txt b/erpnext/selling/doctype/sales_bom/sales_bom.txt
similarity index 100%
rename from selling/doctype/sales_bom/sales_bom.txt
rename to erpnext/selling/doctype/sales_bom/sales_bom.txt
diff --git a/selling/doctype/sales_bom/test_sales_bom.py b/erpnext/selling/doctype/sales_bom/test_sales_bom.py
similarity index 100%
rename from selling/doctype/sales_bom/test_sales_bom.py
rename to erpnext/selling/doctype/sales_bom/test_sales_bom.py
diff --git a/selling/doctype/sales_bom_item/__init__.py b/erpnext/selling/doctype/sales_bom_item/__init__.py
similarity index 100%
rename from selling/doctype/sales_bom_item/__init__.py
rename to erpnext/selling/doctype/sales_bom_item/__init__.py
diff --git a/selling/doctype/sales_bom_item/sales_bom_item.py b/erpnext/selling/doctype/sales_bom_item/sales_bom_item.py
similarity index 100%
rename from selling/doctype/sales_bom_item/sales_bom_item.py
rename to erpnext/selling/doctype/sales_bom_item/sales_bom_item.py
diff --git a/selling/doctype/sales_bom_item/sales_bom_item.txt b/erpnext/selling/doctype/sales_bom_item/sales_bom_item.txt
similarity index 100%
rename from selling/doctype/sales_bom_item/sales_bom_item.txt
rename to erpnext/selling/doctype/sales_bom_item/sales_bom_item.txt
diff --git a/selling/doctype/sales_order/README.md b/erpnext/selling/doctype/sales_order/README.md
similarity index 100%
rename from selling/doctype/sales_order/README.md
rename to erpnext/selling/doctype/sales_order/README.md
diff --git a/selling/doctype/sales_order/__init__.py b/erpnext/selling/doctype/sales_order/__init__.py
similarity index 100%
rename from selling/doctype/sales_order/__init__.py
rename to erpnext/selling/doctype/sales_order/__init__.py
diff --git a/selling/doctype/sales_order/sales_order.js b/erpnext/selling/doctype/sales_order/sales_order.js
similarity index 84%
rename from selling/doctype/sales_order/sales_order.js
rename to erpnext/selling/doctype/sales_order/sales_order.js
index e4b3caf..f393945 100644
--- a/selling/doctype/sales_order/sales_order.js
+++ b/erpnext/selling/doctype/sales_order/sales_order.js
@@ -8,11 +8,10 @@
cur_frm.cscript.other_fname = "other_charges";
cur_frm.cscript.sales_team_fname = "sales_team";
-
-wn.require('app/selling/sales_common.js');
-wn.require('app/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js');
-wn.require('app/utilities/doctype/sms_control/sms_control.js');
-wn.require('app/accounts/doctype/sales_invoice/pos.js');
+{% include 'selling/sales_common.js' %}
+{% include 'accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js' %}
+{% include 'utilities/doctype/sms_control/sms_control.js' %}
+{% include 'accounts/doctype/sales_invoice/pos.js' %}
erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend({
refresh: function(doc, dt, dn) {
@@ -62,7 +61,7 @@
cur_frm.add_custom_button(wn._('From Quotation'),
function() {
wn.model.map_current_doc({
- method: "selling.doctype.quotation.quotation.make_sales_order",
+ method: "erpnext.selling.doctype.quotation.quotation.make_sales_order",
source_doctype: "Quotation",
get_query_filters: {
docstatus: 1,
@@ -90,7 +89,7 @@
var item = wn.model.get_doc(cdt, cdn);
if(item.item_code && item.reserved_warehouse) {
return this.frm.call({
- method: "selling.utils.get_available_qty",
+ method: "erpnext.selling.utils.get_available_qty",
child: item,
args: {
item_code: item.item_code,
@@ -102,35 +101,35 @@
make_material_request: function() {
wn.model.open_mapped_doc({
- method: "selling.doctype.sales_order.sales_order.make_material_request",
+ method: "erpnext.selling.doctype.sales_order.sales_order.make_material_request",
source_name: cur_frm.doc.name
})
},
make_delivery_note: function() {
wn.model.open_mapped_doc({
- method: "selling.doctype.sales_order.sales_order.make_delivery_note",
+ method: "erpnext.selling.doctype.sales_order.sales_order.make_delivery_note",
source_name: cur_frm.doc.name
})
},
make_sales_invoice: function() {
wn.model.open_mapped_doc({
- method: "selling.doctype.sales_order.sales_order.make_sales_invoice",
+ method: "erpnext.selling.doctype.sales_order.sales_order.make_sales_invoice",
source_name: cur_frm.doc.name
})
},
make_maintenance_schedule: function() {
wn.model.open_mapped_doc({
- method: "selling.doctype.sales_order.sales_order.make_maintenance_schedule",
+ method: "erpnext.selling.doctype.sales_order.sales_order.make_maintenance_schedule",
source_name: cur_frm.doc.name
})
},
make_maintenance_visit: function() {
wn.model.open_mapped_doc({
- method: "selling.doctype.sales_order.sales_order.make_maintenance_visit",
+ method: "erpnext.selling.doctype.sales_order.sales_order.make_maintenance_visit",
source_name: cur_frm.doc.name
})
},
@@ -148,7 +147,7 @@
cur_frm.fields_dict['project_name'].get_query = function(doc, cdt, cdn) {
return {
- query: "controllers.queries.get_project_name",
+ query: "erpnext.controllers.queries.get_project_name",
filters: {
'customer': doc.customer
}
diff --git a/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py
similarity index 97%
rename from selling/doctype/sales_order/sales_order.py
rename to erpnext/selling/doctype/sales_order/sales_order.py
index a66c446..4527574 100644
--- a/selling/doctype/sales_order/sales_order.py
+++ b/erpnext/selling/doctype/sales_order/sales_order.py
@@ -11,7 +11,7 @@
from webnotes import msgprint
from webnotes.model.mapper import get_mapped_doclist
-from controllers.selling_controller import SellingController
+from erpnext.controllers.selling_controller import SellingController
class DocType(SellingController):
def __init__(self, doc, doclist=None):
@@ -110,8 +110,9 @@
self.validate_uom_is_integer("stock_uom", "qty")
self.validate_for_items()
self.validate_warehouse()
-
- from stock.doctype.packed_item.packed_item import make_packing_list
+
+ from erpnext.stock.doctype.packed_item.packed_item import make_packing_list
+
self.doclist = make_packing_list(self,'sales_order_details')
self.validate_with_previous_doc()
@@ -119,15 +120,15 @@
if not self.doc.status:
self.doc.status = "Draft"
- import utilities
- utilities.validate_status(self.doc.status, ["Draft", "Submitted", "Stopped",
+ from erpnext.utilities import validate_status
+ validate_status(self.doc.status, ["Draft", "Submitted", "Stopped",
"Cancelled"])
if not self.doc.billing_status: self.doc.billing_status = 'Not Billed'
if not self.doc.delivery_status: self.doc.delivery_status = 'Not Delivered'
def validate_warehouse(self):
- from stock.utils import validate_warehouse_user, validate_warehouse_company
+ from erpnext.stock.utils import validate_warehouse_user, validate_warehouse_company
warehouses = list(set([d.reserved_warehouse for d in
self.doclist.get({"doctype": self.tname}) if d.reserved_warehouse]))
@@ -230,7 +231,7 @@
def update_stock_ledger(self, update_stock):
- from stock.utils import update_bin
+ from erpnext.stock.utils import update_bin
for d in self.get_item_list():
if webnotes.conn.get_value("Item", d['item_code'], "is_stock_item") == "Yes":
args = {
diff --git a/selling/doctype/sales_order/sales_order.txt b/erpnext/selling/doctype/sales_order/sales_order.txt
similarity index 100%
rename from selling/doctype/sales_order/sales_order.txt
rename to erpnext/selling/doctype/sales_order/sales_order.txt
diff --git a/selling/doctype/sales_order/templates/__init__.py b/erpnext/selling/doctype/sales_order/templates/__init__.py
similarity index 100%
rename from selling/doctype/sales_order/templates/__init__.py
rename to erpnext/selling/doctype/sales_order/templates/__init__.py
diff --git a/selling/doctype/sales_order/templates/pages/__init__.py b/erpnext/selling/doctype/sales_order/templates/pages/__init__.py
similarity index 100%
rename from selling/doctype/sales_order/templates/pages/__init__.py
rename to erpnext/selling/doctype/sales_order/templates/pages/__init__.py
diff --git a/selling/doctype/sales_order/templates/pages/order.html b/erpnext/selling/doctype/sales_order/templates/pages/order.html
similarity index 64%
rename from selling/doctype/sales_order/templates/pages/order.html
rename to erpnext/selling/doctype/sales_order/templates/pages/order.html
index db6e009..45867ea 100644
--- a/selling/doctype/sales_order/templates/pages/order.html
+++ b/erpnext/selling/doctype/sales_order/templates/pages/order.html
@@ -1,4 +1,4 @@
-{% extends "app/portal/templates/sale.html" %}
+{% extends "templates/sale.html" %}
{% block status -%}
{% if doc.status %}{{ doc.status }}{% endif %}
diff --git a/selling/doctype/sales_order/templates/pages/order.py b/erpnext/selling/doctype/sales_order/templates/pages/order.py
similarity index 94%
rename from selling/doctype/sales_order/templates/pages/order.py
rename to erpnext/selling/doctype/sales_order/templates/pages/order.py
index d53a8b0..e172c09 100644
--- a/selling/doctype/sales_order/templates/pages/order.py
+++ b/erpnext/selling/doctype/sales_order/templates/pages/order.py
@@ -8,7 +8,7 @@
no_cache = True
def get_context():
- from portal.utils import get_transaction_context
+ from erpnext.templates.utils import get_transaction_context
context = get_transaction_context("Sales Order", webnotes.form_dict.name)
modify_status(context.get("doc"))
context.update({
diff --git a/erpnext/selling/doctype/sales_order/templates/pages/orders.html b/erpnext/selling/doctype/sales_order/templates/pages/orders.html
new file mode 100644
index 0000000..0467f34
--- /dev/null
+++ b/erpnext/selling/doctype/sales_order/templates/pages/orders.html
@@ -0,0 +1 @@
+{% extends "templates/sales_transactions.html" %}
\ No newline at end of file
diff --git a/selling/doctype/sales_order/templates/pages/orders.py b/erpnext/selling/doctype/sales_order/templates/pages/orders.py
similarity index 76%
rename from selling/doctype/sales_order/templates/pages/orders.py
rename to erpnext/selling/doctype/sales_order/templates/pages/orders.py
index d7f83dc..5d28d5b 100644
--- a/selling/doctype/sales_order/templates/pages/orders.py
+++ b/erpnext/selling/doctype/sales_order/templates/pages/orders.py
@@ -7,7 +7,7 @@
no_cache = True
def get_context():
- from portal.utils import get_currency_context
+ from erpnext.templates.utils import get_currency_context
context = get_currency_context()
context.update({
"title": "My Orders",
@@ -20,8 +20,8 @@
@webnotes.whitelist()
def get_orders(start=0):
- from portal.utils import get_transaction_list
- from selling.doctype.sales_order.templates.pages.order import modify_status
+ from erpnext.templates.utils import get_transaction_list
+ from erpnext.selling.doctype.sales_order.templates.pages.order import modify_status
orders = get_transaction_list("Sales Order", start, ["per_billed", "per_delivered"])
for d in orders:
modify_status(d)
diff --git a/selling/doctype/sales_order/test_sales_order.py b/erpnext/selling/doctype/sales_order/test_sales_order.py
similarity index 92%
rename from selling/doctype/sales_order/test_sales_order.py
rename to erpnext/selling/doctype/sales_order/test_sales_order.py
index 1549b24..31c7cbc 100644
--- a/selling/doctype/sales_order/test_sales_order.py
+++ b/erpnext/selling/doctype/sales_order/test_sales_order.py
@@ -7,7 +7,7 @@
class TestSalesOrder(unittest.TestCase):
def test_make_material_request(self):
- from selling.doctype.sales_order.sales_order import make_material_request
+ from erpnext.selling.doctype.sales_order.sales_order import make_material_request
so = webnotes.bean(copy=test_records[0]).insert()
@@ -22,7 +22,7 @@
self.assertEquals(len(mr), len(sales_order.doclist))
def test_make_delivery_note(self):
- from selling.doctype.sales_order.sales_order import make_delivery_note
+ from erpnext.selling.doctype.sales_order.sales_order import make_delivery_note
so = webnotes.bean(copy=test_records[0]).insert()
@@ -37,7 +37,7 @@
self.assertEquals(len(dn), len(sales_order.doclist))
def test_make_sales_invoice(self):
- from selling.doctype.sales_order.sales_order import make_sales_invoice
+ from erpnext.selling.doctype.sales_order.sales_order import make_sales_invoice
so = webnotes.bean(copy=test_records[0]).insert()
@@ -71,8 +71,8 @@
return w
def create_dn_against_so(self, so, delivered_qty=0):
- from stock.doctype.delivery_note.test_delivery_note import test_records as dn_test_records
- from stock.doctype.delivery_note.test_delivery_note import _insert_purchase_receipt
+ from erpnext.stock.doctype.delivery_note.test_delivery_note import test_records as dn_test_records
+ from erpnext.stock.doctype.delivery_note.test_delivery_note import _insert_purchase_receipt
_insert_purchase_receipt(so.doclist[1].item_code)
@@ -164,7 +164,7 @@
self.check_reserved_qty(so.doclist[1].item_code, so.doclist[1].reserved_warehouse, 10.0)
def test_reserved_qty_for_so_with_packing_list(self):
- from selling.doctype.sales_bom.test_sales_bom import test_records as sbom_test_records
+ from erpnext.selling.doctype.sales_bom.test_sales_bom import test_records as sbom_test_records
# change item in test so record
test_record = test_records[0][:]
@@ -191,7 +191,7 @@
so.doclist[1].reserved_warehouse, 0.0)
def test_reserved_qty_for_partial_delivery_with_packing_list(self):
- from selling.doctype.sales_bom.test_sales_bom import test_records as sbom_test_records
+ from erpnext.selling.doctype.sales_bom.test_sales_bom import test_records as sbom_test_records
# change item in test so record
@@ -241,7 +241,7 @@
so.doclist[1].reserved_warehouse, 20.0)
def test_reserved_qty_for_over_delivery_with_packing_list(self):
- from selling.doctype.sales_bom.test_sales_bom import test_records as sbom_test_records
+ from erpnext.selling.doctype.sales_bom.test_sales_bom import test_records as sbom_test_records
# change item in test so record
test_record = webnotes.copy_doclist(test_records[0])
@@ -284,7 +284,7 @@
webnotes.session.user = "test@example.com"
- from stock.utils import UserNotAllowedForWarehouse
+ from erpnext.stock.utils import UserNotAllowedForWarehouse
so = webnotes.bean(copy = test_records[0])
so.doc.company = "_Test Company 1"
so.doc.conversion_rate = 0.02
diff --git a/selling/doctype/sales_order_item/README.md b/erpnext/selling/doctype/sales_order_item/README.md
similarity index 100%
rename from selling/doctype/sales_order_item/README.md
rename to erpnext/selling/doctype/sales_order_item/README.md
diff --git a/selling/doctype/sales_order_item/__init__.py b/erpnext/selling/doctype/sales_order_item/__init__.py
similarity index 100%
rename from selling/doctype/sales_order_item/__init__.py
rename to erpnext/selling/doctype/sales_order_item/__init__.py
diff --git a/selling/doctype/sales_order_item/sales_order_item.py b/erpnext/selling/doctype/sales_order_item/sales_order_item.py
similarity index 100%
rename from selling/doctype/sales_order_item/sales_order_item.py
rename to erpnext/selling/doctype/sales_order_item/sales_order_item.py
diff --git a/selling/doctype/sales_order_item/sales_order_item.txt b/erpnext/selling/doctype/sales_order_item/sales_order_item.txt
similarity index 100%
rename from selling/doctype/sales_order_item/sales_order_item.txt
rename to erpnext/selling/doctype/sales_order_item/sales_order_item.txt
diff --git a/selling/doctype/sales_team/README.md b/erpnext/selling/doctype/sales_team/README.md
similarity index 100%
rename from selling/doctype/sales_team/README.md
rename to erpnext/selling/doctype/sales_team/README.md
diff --git a/selling/doctype/sales_team/__init__.py b/erpnext/selling/doctype/sales_team/__init__.py
similarity index 100%
rename from selling/doctype/sales_team/__init__.py
rename to erpnext/selling/doctype/sales_team/__init__.py
diff --git a/selling/doctype/sales_team/sales_team.py b/erpnext/selling/doctype/sales_team/sales_team.py
similarity index 100%
rename from selling/doctype/sales_team/sales_team.py
rename to erpnext/selling/doctype/sales_team/sales_team.py
diff --git a/selling/doctype/sales_team/sales_team.txt b/erpnext/selling/doctype/sales_team/sales_team.txt
similarity index 100%
rename from selling/doctype/sales_team/sales_team.txt
rename to erpnext/selling/doctype/sales_team/sales_team.txt
diff --git a/selling/doctype/selling_settings/__init__.py b/erpnext/selling/doctype/selling_settings/__init__.py
similarity index 100%
rename from selling/doctype/selling_settings/__init__.py
rename to erpnext/selling/doctype/selling_settings/__init__.py
diff --git a/selling/doctype/selling_settings/selling_settings.py b/erpnext/selling/doctype/selling_settings/selling_settings.py
similarity index 88%
rename from selling/doctype/selling_settings/selling_settings.py
rename to erpnext/selling/doctype/selling_settings/selling_settings.py
index 0895e3f..c280619 100644
--- a/selling/doctype/selling_settings/selling_settings.py
+++ b/erpnext/selling/doctype/selling_settings/selling_settings.py
@@ -15,6 +15,6 @@
"editable_price_list_rate", "selling_price_list"]:
webnotes.conn.set_default(key, self.doc.fields.get(key, ""))
- from setup.doctype.naming_series.naming_series import set_by_naming_series
+ from erpnext.setup.doctype.naming_series.naming_series import set_by_naming_series
set_by_naming_series("Customer", "customer_name",
self.doc.get("cust_master_name")=="Naming Series", hide_name_field=False)
diff --git a/selling/doctype/selling_settings/selling_settings.txt b/erpnext/selling/doctype/selling_settings/selling_settings.txt
similarity index 100%
rename from selling/doctype/selling_settings/selling_settings.txt
rename to erpnext/selling/doctype/selling_settings/selling_settings.txt
diff --git a/selling/doctype/shopping_cart_price_list/__init__.py b/erpnext/selling/doctype/shopping_cart_price_list/__init__.py
similarity index 100%
rename from selling/doctype/shopping_cart_price_list/__init__.py
rename to erpnext/selling/doctype/shopping_cart_price_list/__init__.py
diff --git a/selling/doctype/shopping_cart_price_list/shopping_cart_price_list.py b/erpnext/selling/doctype/shopping_cart_price_list/shopping_cart_price_list.py
similarity index 100%
rename from selling/doctype/shopping_cart_price_list/shopping_cart_price_list.py
rename to erpnext/selling/doctype/shopping_cart_price_list/shopping_cart_price_list.py
diff --git a/selling/doctype/shopping_cart_price_list/shopping_cart_price_list.txt b/erpnext/selling/doctype/shopping_cart_price_list/shopping_cart_price_list.txt
similarity index 100%
rename from selling/doctype/shopping_cart_price_list/shopping_cart_price_list.txt
rename to erpnext/selling/doctype/shopping_cart_price_list/shopping_cart_price_list.txt
diff --git a/selling/doctype/shopping_cart_settings/__init__.py b/erpnext/selling/doctype/shopping_cart_settings/__init__.py
similarity index 100%
rename from selling/doctype/shopping_cart_settings/__init__.py
rename to erpnext/selling/doctype/shopping_cart_settings/__init__.py
diff --git a/selling/doctype/shopping_cart_settings/shopping_cart_settings.js b/erpnext/selling/doctype/shopping_cart_settings/shopping_cart_settings.js
similarity index 100%
rename from selling/doctype/shopping_cart_settings/shopping_cart_settings.js
rename to erpnext/selling/doctype/shopping_cart_settings/shopping_cart_settings.js
diff --git a/selling/doctype/shopping_cart_settings/shopping_cart_settings.py b/erpnext/selling/doctype/shopping_cart_settings/shopping_cart_settings.py
similarity index 98%
rename from selling/doctype/shopping_cart_settings/shopping_cart_settings.py
rename to erpnext/selling/doctype/shopping_cart_settings/shopping_cart_settings.py
index 6912ac5..923936e 100644
--- a/selling/doctype/shopping_cart_settings/shopping_cart_settings.py
+++ b/erpnext/selling/doctype/shopping_cart_settings/shopping_cart_settings.py
@@ -47,7 +47,7 @@
# validate that a Shopping Cart Price List exists for the root territory
# as a catch all!
- from setup.utils import get_root_of
+ from erpnext.setup.utils import get_root_of
root_territory = get_root_of("Territory")
if root_territory not in territory_name_map.keys():
@@ -143,7 +143,7 @@
return self.get_name_from_territory(shipping_territory, "shipping_rules", "shipping_rule")
def get_territory_ancestry(self, territory):
- from setup.utils import get_ancestors_of
+ from erpnext.setup.utils import get_ancestors_of
if not hasattr(self, "_territory_ancestry"):
self._territory_ancestry = {}
diff --git a/selling/doctype/shopping_cart_settings/shopping_cart_settings.txt b/erpnext/selling/doctype/shopping_cart_settings/shopping_cart_settings.txt
similarity index 100%
rename from selling/doctype/shopping_cart_settings/shopping_cart_settings.txt
rename to erpnext/selling/doctype/shopping_cart_settings/shopping_cart_settings.txt
diff --git a/selling/doctype/shopping_cart_settings/test_shopping_cart_settings.py b/erpnext/selling/doctype/shopping_cart_settings/test_shopping_cart_settings.py
similarity index 93%
rename from selling/doctype/shopping_cart_settings/test_shopping_cart_settings.py
rename to erpnext/selling/doctype/shopping_cart_settings/test_shopping_cart_settings.py
index 6055c61..be67f6f 100644
--- a/selling/doctype/shopping_cart_settings/test_shopping_cart_settings.py
+++ b/erpnext/selling/doctype/shopping_cart_settings/test_shopping_cart_settings.py
@@ -6,7 +6,7 @@
from __future__ import unicode_literals
import webnotes
import unittest
-from selling.doctype.shopping_cart_settings.shopping_cart_settings import ShoppingCartSetupError
+from erpnext.selling.doctype.shopping_cart_settings.shopping_cart_settings import ShoppingCartSetupError
class TestShoppingCartSettings(unittest.TestCase):
def setUp(self):
@@ -74,7 +74,7 @@
controller = cart_settings.make_controller()
self.assertRaises(ShoppingCartSetupError, controller.validate_exchange_rates_exist)
- from setup.doctype.currency_exchange.test_currency_exchange import test_records as \
+ from erpnext.setup.doctype.currency_exchange.test_currency_exchange import test_records as \
currency_exchange_records
webnotes.bean(currency_exchange_records[0]).insert()
controller.validate_exchange_rates_exist()
diff --git a/selling/doctype/shopping_cart_shipping_rule/__init__.py b/erpnext/selling/doctype/shopping_cart_shipping_rule/__init__.py
similarity index 100%
rename from selling/doctype/shopping_cart_shipping_rule/__init__.py
rename to erpnext/selling/doctype/shopping_cart_shipping_rule/__init__.py
diff --git a/selling/doctype/shopping_cart_shipping_rule/shopping_cart_shipping_rule.py b/erpnext/selling/doctype/shopping_cart_shipping_rule/shopping_cart_shipping_rule.py
similarity index 100%
rename from selling/doctype/shopping_cart_shipping_rule/shopping_cart_shipping_rule.py
rename to erpnext/selling/doctype/shopping_cart_shipping_rule/shopping_cart_shipping_rule.py
diff --git a/selling/doctype/shopping_cart_shipping_rule/shopping_cart_shipping_rule.txt b/erpnext/selling/doctype/shopping_cart_shipping_rule/shopping_cart_shipping_rule.txt
similarity index 100%
rename from selling/doctype/shopping_cart_shipping_rule/shopping_cart_shipping_rule.txt
rename to erpnext/selling/doctype/shopping_cart_shipping_rule/shopping_cart_shipping_rule.txt
diff --git a/selling/doctype/shopping_cart_taxes_and_charges_master/__init__.py b/erpnext/selling/doctype/shopping_cart_taxes_and_charges_master/__init__.py
similarity index 100%
rename from selling/doctype/shopping_cart_taxes_and_charges_master/__init__.py
rename to erpnext/selling/doctype/shopping_cart_taxes_and_charges_master/__init__.py
diff --git a/selling/doctype/shopping_cart_taxes_and_charges_master/shopping_cart_taxes_and_charges_master.py b/erpnext/selling/doctype/shopping_cart_taxes_and_charges_master/shopping_cart_taxes_and_charges_master.py
similarity index 100%
rename from selling/doctype/shopping_cart_taxes_and_charges_master/shopping_cart_taxes_and_charges_master.py
rename to erpnext/selling/doctype/shopping_cart_taxes_and_charges_master/shopping_cart_taxes_and_charges_master.py
diff --git a/selling/doctype/shopping_cart_taxes_and_charges_master/shopping_cart_taxes_and_charges_master.txt b/erpnext/selling/doctype/shopping_cart_taxes_and_charges_master/shopping_cart_taxes_and_charges_master.txt
similarity index 100%
rename from selling/doctype/shopping_cart_taxes_and_charges_master/shopping_cart_taxes_and_charges_master.txt
rename to erpnext/selling/doctype/shopping_cart_taxes_and_charges_master/shopping_cart_taxes_and_charges_master.txt
diff --git a/selling/doctype/sms_center/README.md b/erpnext/selling/doctype/sms_center/README.md
similarity index 100%
rename from selling/doctype/sms_center/README.md
rename to erpnext/selling/doctype/sms_center/README.md
diff --git a/selling/doctype/sms_center/__init__.py b/erpnext/selling/doctype/sms_center/__init__.py
similarity index 100%
rename from selling/doctype/sms_center/__init__.py
rename to erpnext/selling/doctype/sms_center/__init__.py
diff --git a/selling/doctype/sms_center/sms_center.py b/erpnext/selling/doctype/sms_center/sms_center.py
similarity index 100%
rename from selling/doctype/sms_center/sms_center.py
rename to erpnext/selling/doctype/sms_center/sms_center.py
diff --git a/selling/doctype/sms_center/sms_center.txt b/erpnext/selling/doctype/sms_center/sms_center.txt
similarity index 100%
rename from selling/doctype/sms_center/sms_center.txt
rename to erpnext/selling/doctype/sms_center/sms_center.txt
diff --git a/selling/page/__init__.py b/erpnext/selling/page/__init__.py
similarity index 100%
rename from selling/page/__init__.py
rename to erpnext/selling/page/__init__.py
diff --git a/selling/page/sales_analytics/README.md b/erpnext/selling/page/sales_analytics/README.md
similarity index 100%
rename from selling/page/sales_analytics/README.md
rename to erpnext/selling/page/sales_analytics/README.md
diff --git a/selling/page/sales_analytics/__init__.py b/erpnext/selling/page/sales_analytics/__init__.py
similarity index 100%
rename from selling/page/sales_analytics/__init__.py
rename to erpnext/selling/page/sales_analytics/__init__.py
diff --git a/selling/page/sales_analytics/sales_analytics.js b/erpnext/selling/page/sales_analytics/sales_analytics.js
similarity index 100%
rename from selling/page/sales_analytics/sales_analytics.js
rename to erpnext/selling/page/sales_analytics/sales_analytics.js
diff --git a/selling/page/sales_analytics/sales_analytics.txt b/erpnext/selling/page/sales_analytics/sales_analytics.txt
similarity index 100%
rename from selling/page/sales_analytics/sales_analytics.txt
rename to erpnext/selling/page/sales_analytics/sales_analytics.txt
diff --git a/selling/page/sales_browser/README.md b/erpnext/selling/page/sales_browser/README.md
similarity index 100%
rename from selling/page/sales_browser/README.md
rename to erpnext/selling/page/sales_browser/README.md
diff --git a/selling/page/sales_browser/__init__.py b/erpnext/selling/page/sales_browser/__init__.py
similarity index 100%
rename from selling/page/sales_browser/__init__.py
rename to erpnext/selling/page/sales_browser/__init__.py
diff --git a/selling/page/sales_browser/sales_browser.css b/erpnext/selling/page/sales_browser/sales_browser.css
similarity index 100%
rename from selling/page/sales_browser/sales_browser.css
rename to erpnext/selling/page/sales_browser/sales_browser.css
diff --git a/selling/page/sales_browser/sales_browser.js b/erpnext/selling/page/sales_browser/sales_browser.js
similarity index 95%
rename from selling/page/sales_browser/sales_browser.js
rename to erpnext/selling/page/sales_browser/sales_browser.js
index 58a3b1f..1b7d9aa 100644
--- a/selling/page/sales_browser/sales_browser.js
+++ b/erpnext/selling/page/sales_browser/sales_browser.js
@@ -22,7 +22,7 @@
wrapper.make_tree = function() {
var ctype = wn.get_route()[1] || 'Territory';
return wn.call({
- method: 'selling.page.sales_browser.sales_browser.get_children',
+ method: 'erpnext.selling.page.sales_browser.sales_browser.get_children',
args: {ctype: ctype},
callback: function(r) {
var root = r.message[0]["value"];
@@ -60,7 +60,7 @@
parent: $(parent),
label: root,
args: {ctype: ctype},
- method: 'selling.page.sales_browser.sales_browser.get_children',
+ method: 'erpnext.selling.page.sales_browser.sales_browser.get_children',
click: function(link) {
if(me.cur_toolbar)
$(me.cur_toolbar).toggle(false);
@@ -144,7 +144,7 @@
v.ctype = me.ctype;
return wn.call({
- method: 'selling.page.sales_browser.sales_browser.add_node',
+ method: 'erpnext.selling.page.sales_browser.sales_browser.add_node',
args: v,
callback: function() {
$(btn).done_working();
diff --git a/selling/page/sales_browser/sales_browser.py b/erpnext/selling/page/sales_browser/sales_browser.py
similarity index 100%
rename from selling/page/sales_browser/sales_browser.py
rename to erpnext/selling/page/sales_browser/sales_browser.py
diff --git a/selling/page/sales_browser/sales_browser.txt b/erpnext/selling/page/sales_browser/sales_browser.txt
similarity index 100%
rename from selling/page/sales_browser/sales_browser.txt
rename to erpnext/selling/page/sales_browser/sales_browser.txt
diff --git a/selling/page/sales_funnel/__init__.py b/erpnext/selling/page/sales_funnel/__init__.py
similarity index 100%
rename from selling/page/sales_funnel/__init__.py
rename to erpnext/selling/page/sales_funnel/__init__.py
diff --git a/selling/page/sales_funnel/sales_funnel.css b/erpnext/selling/page/sales_funnel/sales_funnel.css
similarity index 100%
rename from selling/page/sales_funnel/sales_funnel.css
rename to erpnext/selling/page/sales_funnel/sales_funnel.css
diff --git a/selling/page/sales_funnel/sales_funnel.js b/erpnext/selling/page/sales_funnel/sales_funnel.js
similarity index 100%
rename from selling/page/sales_funnel/sales_funnel.js
rename to erpnext/selling/page/sales_funnel/sales_funnel.js
diff --git a/selling/page/sales_funnel/sales_funnel.py b/erpnext/selling/page/sales_funnel/sales_funnel.py
similarity index 100%
rename from selling/page/sales_funnel/sales_funnel.py
rename to erpnext/selling/page/sales_funnel/sales_funnel.py
diff --git a/selling/page/sales_funnel/sales_funnel.txt b/erpnext/selling/page/sales_funnel/sales_funnel.txt
similarity index 100%
rename from selling/page/sales_funnel/sales_funnel.txt
rename to erpnext/selling/page/sales_funnel/sales_funnel.txt
diff --git a/selling/page/selling_home/__init__.py b/erpnext/selling/page/selling_home/__init__.py
similarity index 100%
rename from selling/page/selling_home/__init__.py
rename to erpnext/selling/page/selling_home/__init__.py
diff --git a/selling/page/selling_home/selling_home.js b/erpnext/selling/page/selling_home/selling_home.js
similarity index 100%
rename from selling/page/selling_home/selling_home.js
rename to erpnext/selling/page/selling_home/selling_home.js
diff --git a/selling/page/selling_home/selling_home.txt b/erpnext/selling/page/selling_home/selling_home.txt
similarity index 100%
rename from selling/page/selling_home/selling_home.txt
rename to erpnext/selling/page/selling_home/selling_home.txt
diff --git a/selling/report/__init__.py b/erpnext/selling/report/__init__.py
similarity index 100%
rename from selling/report/__init__.py
rename to erpnext/selling/report/__init__.py
diff --git a/selling/report/available_stock_for_packing_items/__init__.py b/erpnext/selling/report/available_stock_for_packing_items/__init__.py
similarity index 100%
rename from selling/report/available_stock_for_packing_items/__init__.py
rename to erpnext/selling/report/available_stock_for_packing_items/__init__.py
diff --git a/selling/report/available_stock_for_packing_items/available_stock_for_packing_items.py b/erpnext/selling/report/available_stock_for_packing_items/available_stock_for_packing_items.py
similarity index 100%
rename from selling/report/available_stock_for_packing_items/available_stock_for_packing_items.py
rename to erpnext/selling/report/available_stock_for_packing_items/available_stock_for_packing_items.py
diff --git a/selling/report/available_stock_for_packing_items/available_stock_for_packing_items.txt b/erpnext/selling/report/available_stock_for_packing_items/available_stock_for_packing_items.txt
similarity index 100%
rename from selling/report/available_stock_for_packing_items/available_stock_for_packing_items.txt
rename to erpnext/selling/report/available_stock_for_packing_items/available_stock_for_packing_items.txt
diff --git a/selling/report/customer_acquisition_and_loyalty/__init__.py b/erpnext/selling/report/customer_acquisition_and_loyalty/__init__.py
similarity index 100%
rename from selling/report/customer_acquisition_and_loyalty/__init__.py
rename to erpnext/selling/report/customer_acquisition_and_loyalty/__init__.py
diff --git a/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.js b/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.js
similarity index 100%
rename from selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.js
rename to erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.js
diff --git a/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py b/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py
similarity index 100%
rename from selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py
rename to erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py
diff --git a/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.txt b/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.txt
similarity index 100%
rename from selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.txt
rename to erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.txt
diff --git a/selling/report/customer_addresses_and_contacts/__init__.py b/erpnext/selling/report/customer_addresses_and_contacts/__init__.py
similarity index 100%
rename from selling/report/customer_addresses_and_contacts/__init__.py
rename to erpnext/selling/report/customer_addresses_and_contacts/__init__.py
diff --git a/selling/report/customer_addresses_and_contacts/customer_addresses_and_contacts.txt b/erpnext/selling/report/customer_addresses_and_contacts/customer_addresses_and_contacts.txt
similarity index 100%
rename from selling/report/customer_addresses_and_contacts/customer_addresses_and_contacts.txt
rename to erpnext/selling/report/customer_addresses_and_contacts/customer_addresses_and_contacts.txt
diff --git a/selling/report/customers_not_buying_since_long_time/__init__.py b/erpnext/selling/report/customers_not_buying_since_long_time/__init__.py
similarity index 100%
rename from selling/report/customers_not_buying_since_long_time/__init__.py
rename to erpnext/selling/report/customers_not_buying_since_long_time/__init__.py
diff --git a/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js b/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js
similarity index 100%
rename from selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js
rename to erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js
diff --git a/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py b/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py
similarity index 100%
rename from selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py
rename to erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py
diff --git a/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.txt b/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.txt
similarity index 100%
rename from selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.txt
rename to erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.txt
diff --git a/selling/report/item_wise_sales_history/__init__.py b/erpnext/selling/report/item_wise_sales_history/__init__.py
similarity index 100%
rename from selling/report/item_wise_sales_history/__init__.py
rename to erpnext/selling/report/item_wise_sales_history/__init__.py
diff --git a/selling/report/item_wise_sales_history/item_wise_sales_history.txt b/erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.txt
similarity index 100%
rename from selling/report/item_wise_sales_history/item_wise_sales_history.txt
rename to erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.txt
diff --git a/selling/report/lead_details/__init__.py b/erpnext/selling/report/lead_details/__init__.py
similarity index 100%
rename from selling/report/lead_details/__init__.py
rename to erpnext/selling/report/lead_details/__init__.py
diff --git a/selling/report/lead_details/lead_details.txt b/erpnext/selling/report/lead_details/lead_details.txt
similarity index 100%
rename from selling/report/lead_details/lead_details.txt
rename to erpnext/selling/report/lead_details/lead_details.txt
diff --git a/selling/report/pending_so_items_for_purchase_request/__init__.py b/erpnext/selling/report/pending_so_items_for_purchase_request/__init__.py
similarity index 100%
rename from selling/report/pending_so_items_for_purchase_request/__init__.py
rename to erpnext/selling/report/pending_so_items_for_purchase_request/__init__.py
diff --git a/selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.txt b/erpnext/selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.txt
similarity index 100%
rename from selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.txt
rename to erpnext/selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.txt
diff --git a/selling/report/quotation_trends/__init__.py b/erpnext/selling/report/quotation_trends/__init__.py
similarity index 100%
rename from selling/report/quotation_trends/__init__.py
rename to erpnext/selling/report/quotation_trends/__init__.py
diff --git a/selling/report/quotation_trends/quotation_trends.js b/erpnext/selling/report/quotation_trends/quotation_trends.js
similarity index 77%
rename from selling/report/quotation_trends/quotation_trends.js
rename to erpnext/selling/report/quotation_trends/quotation_trends.js
index f26e873..59f8b46 100644
--- a/selling/report/quotation_trends/quotation_trends.js
+++ b/erpnext/selling/report/quotation_trends/quotation_trends.js
@@ -1,7 +1,7 @@
// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
-wn.require("app/js/sales_trends_filters.js");
+wn.require("assets/erpnext/js/sales_trends_filters.js");
wn.query_reports["Quotation Trends"] = {
filters: get_filters()
diff --git a/selling/report/quotation_trends/quotation_trends.py b/erpnext/selling/report/quotation_trends/quotation_trends.py
similarity index 85%
rename from selling/report/quotation_trends/quotation_trends.py
rename to erpnext/selling/report/quotation_trends/quotation_trends.py
index f7c023f..ea0d3db 100644
--- a/selling/report/quotation_trends/quotation_trends.py
+++ b/erpnext/selling/report/quotation_trends/quotation_trends.py
@@ -3,7 +3,7 @@
from __future__ import unicode_literals
import webnotes
-from controllers.trends import get_columns, get_data
+from erpnext.controllers.trends import get_columns, get_data
def execute(filters=None):
if not filters: filters ={}
diff --git a/selling/report/quotation_trends/quotation_trends.txt b/erpnext/selling/report/quotation_trends/quotation_trends.txt
similarity index 100%
rename from selling/report/quotation_trends/quotation_trends.txt
rename to erpnext/selling/report/quotation_trends/quotation_trends.txt
diff --git a/selling/report/sales_order_trends/__init__.py b/erpnext/selling/report/sales_order_trends/__init__.py
similarity index 100%
rename from selling/report/sales_order_trends/__init__.py
rename to erpnext/selling/report/sales_order_trends/__init__.py
diff --git a/selling/report/sales_order_trends/sales_order_trends.js b/erpnext/selling/report/sales_order_trends/sales_order_trends.js
similarity index 77%
rename from selling/report/sales_order_trends/sales_order_trends.js
rename to erpnext/selling/report/sales_order_trends/sales_order_trends.js
index 6268400..6ff31a2 100644
--- a/selling/report/sales_order_trends/sales_order_trends.js
+++ b/erpnext/selling/report/sales_order_trends/sales_order_trends.js
@@ -1,7 +1,7 @@
// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
-wn.require("app/js/sales_trends_filters.js");
+wn.require("assets/erpnext/js/sales_trends_filters.js");
wn.query_reports["Sales Order Trends"] = {
filters: get_filters()
diff --git a/selling/report/sales_order_trends/sales_order_trends.py b/erpnext/selling/report/sales_order_trends/sales_order_trends.py
similarity index 86%
rename from selling/report/sales_order_trends/sales_order_trends.py
rename to erpnext/selling/report/sales_order_trends/sales_order_trends.py
index d407be0..e9354e6 100644
--- a/selling/report/sales_order_trends/sales_order_trends.py
+++ b/erpnext/selling/report/sales_order_trends/sales_order_trends.py
@@ -3,7 +3,7 @@
from __future__ import unicode_literals
import webnotes
-from controllers.trends import get_columns,get_data
+from erpnext.controllers.trends import get_columns,get_data
def execute(filters=None):
if not filters: filters ={}
diff --git a/selling/report/sales_order_trends/sales_order_trends.txt b/erpnext/selling/report/sales_order_trends/sales_order_trends.txt
similarity index 100%
rename from selling/report/sales_order_trends/sales_order_trends.txt
rename to erpnext/selling/report/sales_order_trends/sales_order_trends.txt
diff --git a/selling/report/sales_person_target_variance_item_group_wise/__init__.py b/erpnext/selling/report/sales_person_target_variance_item_group_wise/__init__.py
similarity index 100%
rename from selling/report/sales_person_target_variance_item_group_wise/__init__.py
rename to erpnext/selling/report/sales_person_target_variance_item_group_wise/__init__.py
diff --git a/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js b/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js
similarity index 100%
rename from selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js
rename to erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js
diff --git a/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py b/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py
similarity index 97%
rename from selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py
rename to erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py
index ca18936..3e500dc 100644
--- a/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py
+++ b/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py
@@ -6,8 +6,8 @@
from webnotes import _, msgprint
from webnotes.utils import flt
import time
-from accounts.utils import get_fiscal_year
-from controllers.trends import get_period_date_ranges, get_period_month_ranges
+from erpnext.accounts.utils import get_fiscal_year
+from erpnext.controllers.trends import get_period_date_ranges, get_period_month_ranges
from webnotes.model.meta import get_field_precision
def execute(filters=None):
diff --git a/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.txt b/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.txt
similarity index 100%
rename from selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.txt
rename to erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.txt
diff --git a/selling/report/sales_person_wise_transaction_summary/__init__.py b/erpnext/selling/report/sales_person_wise_transaction_summary/__init__.py
similarity index 100%
rename from selling/report/sales_person_wise_transaction_summary/__init__.py
rename to erpnext/selling/report/sales_person_wise_transaction_summary/__init__.py
diff --git a/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js b/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js
similarity index 100%
rename from selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js
rename to erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js
diff --git a/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py b/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py
similarity index 100%
rename from selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py
rename to erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py
diff --git a/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.txt b/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.txt
similarity index 100%
rename from selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.txt
rename to erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.txt
diff --git a/selling/report/territory_target_variance_item_group_wise/__init__.py b/erpnext/selling/report/territory_target_variance_item_group_wise/__init__.py
similarity index 100%
rename from selling/report/territory_target_variance_item_group_wise/__init__.py
rename to erpnext/selling/report/territory_target_variance_item_group_wise/__init__.py
diff --git a/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.js b/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.js
similarity index 100%
rename from selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.js
rename to erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.js
diff --git a/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py b/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py
similarity index 96%
rename from selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py
rename to erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py
index 08240a7..d55e210 100644
--- a/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py
+++ b/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py
@@ -6,8 +6,8 @@
from webnotes import _, msgprint
from webnotes.utils import flt
import time
-from accounts.utils import get_fiscal_year
-from controllers.trends import get_period_date_ranges, get_period_month_ranges
+from erpnext.accounts.utils import get_fiscal_year
+from erpnext.controllers.trends import get_period_date_ranges, get_period_month_ranges
def execute(filters=None):
if not filters: filters = {}
diff --git a/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.txt b/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.txt
similarity index 100%
rename from selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.txt
rename to erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.txt
diff --git a/selling/sales_common.js b/erpnext/selling/sales_common.js
similarity index 97%
rename from selling/sales_common.js
rename to erpnext/selling/sales_common.js
index dddc2b5..1c8aed3 100644
--- a/selling/sales_common.js
+++ b/erpnext/selling/sales_common.js
@@ -5,12 +5,12 @@
// ------
// cur_frm.cscript.tname - Details table name
// cur_frm.cscript.fname - Details fieldname
-// cur_frm.cscript.other_fname - wn.require('app/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js'); fieldname
+// cur_frm.cscript.other_fname - fieldname
// cur_frm.cscript.sales_team_fname - Sales Team fieldname
wn.provide("erpnext.selling");
-wn.require("app/js/transaction.js");
-wn.require("app/js/controllers/accounts.js");
+wn.require("assets/erpnext/js/transaction.js");
+{% include "public/js/controllers/accounts.js" %}
erpnext.selling.SellingController = erpnext.TransactionController.extend({
onload: function() {
@@ -59,7 +59,7 @@
if(this.frm.fields_dict[this.fname].grid.get_field('item_code')) {
this.frm.set_query("item_code", this.fname, function() {
return {
- query: "controllers.queries.item_query",
+ query: "erpnext.controllers.queries.item_query",
filters: (me.frm.doc.order_type === "Maintenance" ?
{'is_service_item': 'Yes'}:
{'is_sales_item': 'Yes' })
@@ -158,7 +158,7 @@
cur_frm.fields_dict[me.frm.cscript.fname].grid.grid_rows[item.idx - 1].remove();
} else {
return this.frm.call({
- method: "selling.utils.get_item_details",
+ method: "erpnext.selling.utils.get_item_details",
child: item,
args: {
args: {
@@ -268,7 +268,7 @@
var item = wn.model.get_doc(cdt, cdn);
if(item.item_code && item.warehouse) {
return this.frm.call({
- method: "selling.utils.get_available_qty",
+ method: "erpnext.selling.utils.get_available_qty",
child: item,
args: {
item_code: item.item_code,
diff --git a/selling/utils/__init__.py b/erpnext/selling/utils/__init__.py
similarity index 97%
rename from selling/utils/__init__.py
rename to erpnext/selling/utils/__init__.py
index 5974da7..c73d76e 100644
--- a/selling/utils/__init__.py
+++ b/erpnext/selling/utils/__init__.py
@@ -105,7 +105,7 @@
return item_code[0]
def _validate_item_details(args, item):
- from utilities.transaction_base import validate_item_fetch
+ from erpnext.utilities.transaction_base import validate_item_fetch
validate_item_fetch(args, item)
# validate if sales item or service item
@@ -154,7 +154,7 @@
return {}
# found price list rate - now we can validate
- from utilities.transaction_base import validate_currency
+ from erpnext.utilities.transaction_base import validate_currency
validate_currency(args, item_bean.doc, meta)
return {"ref_rate": flt(ref_rate[0].ref_rate) * flt(args.plc_conversion_rate) / flt(args.conversion_rate)}
diff --git a/selling/utils/cart.py b/erpnext/selling/utils/cart.py
similarity index 97%
rename from selling/utils/cart.py
rename to erpnext/selling/utils/cart.py
index 3cd7b3c..f23a571 100644
--- a/selling/utils/cart.py
+++ b/erpnext/selling/utils/cart.py
@@ -2,7 +2,7 @@
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
-import webnotes
+import webnotes, json
from webnotes import msgprint, _
import webnotes.defaults
from webnotes.utils import flt, get_fullname, fmt_money, cstr
@@ -42,7 +42,7 @@
quotation.ignore_permissions = True
quotation.submit()
- from selling.doctype.quotation.quotation import _make_sales_order
+ from erpnext.selling.doctype.quotation.quotation import _make_sales_order
sales_order = webnotes.bean(_make_sales_order(quotation.doc.name, ignore_permissions=True))
sales_order.ignore_permissions = True
sales_order.insert()
@@ -92,7 +92,7 @@
@webnotes.whitelist()
def update_cart_address(address_fieldname, address_name):
- from utilities.transaction_base import get_address_display
+ from erpnext.utilities.transaction_base import get_address_display
quotation = _get_cart_quotation()
address_display = get_address_display(webnotes.doc("Address", address_name).fields)
@@ -123,7 +123,7 @@
@webnotes.whitelist()
def save_address(fields, address_fieldname=None):
party = get_lead_or_customer()
- fields = webnotes.load_json(fields)
+ fields = json.loads(fields)
if fields.get("name"):
bean = webnotes.bean("Address", fields.get("name"))
@@ -147,7 +147,7 @@
def get_address_docs(party=None):
from webnotes.model.doclist import objectify
- from utilities.transaction_base import get_address_display
+ from erpnext.utilities.transaction_base import get_address_display
if not party:
party = get_lead_or_customer()
diff --git a/selling/utils/product.py b/erpnext/selling/utils/product.py
similarity index 92%
rename from selling/utils/product.py
rename to erpnext/selling/utils/product.py
index 32ff85a..dda56e5 100644
--- a/selling/utils/product.py
+++ b/erpnext/selling/utils/product.py
@@ -6,7 +6,7 @@
import webnotes
from webnotes.utils import cstr, cint, fmt_money, get_base_path
from webnotes.webutils import delete_page_cache
-from selling.utils.cart import _get_cart_quotation
+from erpnext.selling.utils.cart import _get_cart_quotation
@webnotes.whitelist(allow_guest=True)
def get_product_info(item_code):
@@ -107,11 +107,7 @@
where item_group in (%s))) """ % (child_groups, child_groups))[0][0]
def get_item_for_list_in_html(context):
- from jinja2 import Environment, FileSystemLoader
- scrub_item_for_list(context)
- jenv = Environment(loader = FileSystemLoader(get_base_path()))
- template = jenv.get_template("app/stock/doctype/item/templates/includes/product_in_grid.html")
- return template.render(context)
+ return webnotes.get_template("templates/includes/product_in_grid.html").render(context)
def scrub_item_for_list(r):
if not r.website_description:
diff --git a/setup/__init__.py b/erpnext/setup/__init__.py
similarity index 100%
rename from setup/__init__.py
rename to erpnext/setup/__init__.py
diff --git a/setup/doctype/__init__.py b/erpnext/setup/doctype/__init__.py
similarity index 100%
rename from setup/doctype/__init__.py
rename to erpnext/setup/doctype/__init__.py
diff --git a/setup/doctype/applicable_territory/__init__.py b/erpnext/setup/doctype/applicable_territory/__init__.py
similarity index 100%
rename from setup/doctype/applicable_territory/__init__.py
rename to erpnext/setup/doctype/applicable_territory/__init__.py
diff --git a/setup/doctype/applicable_territory/applicable_territory.py b/erpnext/setup/doctype/applicable_territory/applicable_territory.py
similarity index 100%
rename from setup/doctype/applicable_territory/applicable_territory.py
rename to erpnext/setup/doctype/applicable_territory/applicable_territory.py
diff --git a/setup/doctype/applicable_territory/applicable_territory.txt b/erpnext/setup/doctype/applicable_territory/applicable_territory.txt
similarity index 100%
rename from setup/doctype/applicable_territory/applicable_territory.txt
rename to erpnext/setup/doctype/applicable_territory/applicable_territory.txt
diff --git a/setup/doctype/authorization_control/README.md b/erpnext/setup/doctype/authorization_control/README.md
similarity index 100%
rename from setup/doctype/authorization_control/README.md
rename to erpnext/setup/doctype/authorization_control/README.md
diff --git a/setup/doctype/authorization_control/__init__.py b/erpnext/setup/doctype/authorization_control/__init__.py
similarity index 100%
rename from setup/doctype/authorization_control/__init__.py
rename to erpnext/setup/doctype/authorization_control/__init__.py
diff --git a/setup/doctype/authorization_control/authorization_control.py b/erpnext/setup/doctype/authorization_control/authorization_control.py
similarity index 98%
rename from setup/doctype/authorization_control/authorization_control.py
rename to erpnext/setup/doctype/authorization_control/authorization_control.py
index 8c8900a..6df0915 100644
--- a/setup/doctype/authorization_control/authorization_control.py
+++ b/erpnext/setup/doctype/authorization_control/authorization_control.py
@@ -7,10 +7,10 @@
from webnotes.utils import cstr, flt, has_common, make_esc
from webnotes.model.bean import getlist
from webnotes import session, msgprint
-from setup.utils import get_company_currency
+from erpnext.setup.utils import get_company_currency
-from utilities.transaction_base import TransactionBase
+from erpnext.utilities.transaction_base import TransactionBase
class DocType(TransactionBase):
def __init__(self, d, dl):
diff --git a/setup/doctype/authorization_control/authorization_control.txt b/erpnext/setup/doctype/authorization_control/authorization_control.txt
similarity index 100%
rename from setup/doctype/authorization_control/authorization_control.txt
rename to erpnext/setup/doctype/authorization_control/authorization_control.txt
diff --git a/setup/doctype/authorization_rule/README.md b/erpnext/setup/doctype/authorization_rule/README.md
similarity index 100%
rename from setup/doctype/authorization_rule/README.md
rename to erpnext/setup/doctype/authorization_rule/README.md
diff --git a/setup/doctype/authorization_rule/__init__.py b/erpnext/setup/doctype/authorization_rule/__init__.py
similarity index 100%
rename from setup/doctype/authorization_rule/__init__.py
rename to erpnext/setup/doctype/authorization_rule/__init__.py
diff --git a/setup/doctype/authorization_rule/authorization_rule.js b/erpnext/setup/doctype/authorization_rule/authorization_rule.js
similarity index 96%
rename from setup/doctype/authorization_rule/authorization_rule.js
rename to erpnext/setup/doctype/authorization_rule/authorization_rule.js
index cdf8ef0..bd42618 100644
--- a/setup/doctype/authorization_rule/authorization_rule.js
+++ b/erpnext/setup/doctype/authorization_rule/authorization_rule.js
@@ -100,7 +100,7 @@
else if(doc.based_on == 'Itemwise Discount')
return {
doctype: "Item",
- query: "controllers.queries.item_query"
+ query: "erpnext.controllers.queries.item_query"
}
else
return {
@@ -111,4 +111,4 @@
}
cur_frm.fields_dict.to_emp.get_query = function(doc,cdt,cdn) {
- return{ query:"controllers.queries.employee_query" } }
\ No newline at end of file
+ return{ query: "erpnext.controllers.queries.employee_query" } }
\ No newline at end of file
diff --git a/setup/doctype/authorization_rule/authorization_rule.py b/erpnext/setup/doctype/authorization_rule/authorization_rule.py
similarity index 100%
rename from setup/doctype/authorization_rule/authorization_rule.py
rename to erpnext/setup/doctype/authorization_rule/authorization_rule.py
diff --git a/setup/doctype/authorization_rule/authorization_rule.txt b/erpnext/setup/doctype/authorization_rule/authorization_rule.txt
similarity index 100%
rename from setup/doctype/authorization_rule/authorization_rule.txt
rename to erpnext/setup/doctype/authorization_rule/authorization_rule.txt
diff --git a/setup/doctype/backup_manager/README.md b/erpnext/setup/doctype/backup_manager/README.md
similarity index 100%
rename from setup/doctype/backup_manager/README.md
rename to erpnext/setup/doctype/backup_manager/README.md
diff --git a/setup/doctype/backup_manager/__init__.py b/erpnext/setup/doctype/backup_manager/__init__.py
similarity index 100%
rename from setup/doctype/backup_manager/__init__.py
rename to erpnext/setup/doctype/backup_manager/__init__.py
diff --git a/setup/doctype/backup_manager/backup_dropbox.py b/erpnext/setup/doctype/backup_manager/backup_dropbox.py
similarity index 98%
rename from setup/doctype/backup_manager/backup_dropbox.py
rename to erpnext/setup/doctype/backup_manager/backup_dropbox.py
index 1583f7e..9c1decf 100644
--- a/setup/doctype/backup_manager/backup_dropbox.py
+++ b/erpnext/setup/doctype/backup_manager/backup_dropbox.py
@@ -110,7 +110,7 @@
upload_file_to_dropbox(filepath, "/files", dropbox_client)
except Exception:
did_not_upload.append(filename)
- error_log.append(webnotes.getTraceback())
+ error_log.append(webnotes.get_traceback())
webnotes.connect()
return did_not_upload, list(set(error_log))
diff --git a/setup/doctype/backup_manager/backup_googledrive.py b/erpnext/setup/doctype/backup_manager/backup_googledrive.py
similarity index 100%
rename from setup/doctype/backup_manager/backup_googledrive.py
rename to erpnext/setup/doctype/backup_manager/backup_googledrive.py
diff --git a/setup/doctype/backup_manager/backup_manager.js b/erpnext/setup/doctype/backup_manager/backup_manager.js
similarity index 88%
rename from setup/doctype/backup_manager/backup_manager.js
rename to erpnext/setup/doctype/backup_manager/backup_manager.js
index 6fdb9e4..dfe6bd5 100644
--- a/setup/doctype/backup_manager/backup_manager.js
+++ b/erpnext/setup/doctype/backup_manager/backup_manager.js
@@ -47,7 +47,7 @@
allow_dropbox_access: function() {
if(cur_frm.cscript.validate_send_notifications_to()) {
return wn.call({
- method: "setup.doctype.backup_manager.backup_dropbox.get_dropbox_authorize_url",
+ method: "erpnext.setup.doctype.backup_manager.backup_dropbox.get_dropbox_authorize_url",
callback: function(r) {
if(!r.exc) {
cur_frm.set_value("dropbox_access_secret", r.message.secret);
@@ -64,7 +64,7 @@
allow_gdrive_access: function() {
if(cur_frm.cscript.validate_send_notifications_to()) {
return wn.call({
- method: "setup.doctype.backup_manager.backup_googledrive.get_gdrive_authorize_url",
+ method: "erpnext.setup.doctype.backup_manager.backup_googledrive.get_gdrive_authorize_url",
callback: function(r) {
if(!r.exc) {
window.open(r.message.authorize_url);
@@ -76,7 +76,7 @@
validate_gdrive: function() {
return wn.call({
- method: "setup.doctype.backup_manager.backup_googledrive.gdrive_callback",
+ method: "erpnext.setup.doctype.backup_manager.backup_googledrive.gdrive_callback",
args: {
verification_code: cur_frm.doc.verification_code
},
diff --git a/setup/doctype/backup_manager/backup_manager.py b/erpnext/setup/doctype/backup_manager/backup_manager.py
similarity index 92%
rename from setup/doctype/backup_manager/backup_manager.py
rename to erpnext/setup/doctype/backup_manager/backup_manager.py
index b094464..b6a5ace 100644
--- a/setup/doctype/backup_manager/backup_manager.py
+++ b/erpnext/setup/doctype/backup_manager/backup_manager.py
@@ -28,14 +28,14 @@
def take_backups_dropbox():
did_not_upload, error_log = [], []
try:
- from setup.doctype.backup_manager.backup_dropbox import backup_to_dropbox
+ from erpnext.setup.doctype.backup_manager.backup_dropbox import backup_to_dropbox
did_not_upload, error_log = backup_to_dropbox()
if did_not_upload: raise Exception
send_email(True, "Dropbox")
except Exception:
file_and_error = [" - ".join(f) for f in zip(did_not_upload, error_log)]
- error_message = ("\n".join(file_and_error) + "\n" + webnotes.getTraceback())
+ error_message = ("\n".join(file_and_error) + "\n" + webnotes.get_traceback())
webnotes.errprint(error_message)
send_email(False, "Dropbox", error_message)
@@ -44,14 +44,14 @@
def take_backups_gdrive():
did_not_upload, error_log = [], []
try:
- from setup.doctype.backup_manager.backup_googledrive import backup_to_gdrive
+ from erpnext.setup.doctype.backup_manager.backup_googledrive import backup_to_gdrive
did_not_upload, error_log = backup_to_gdrive()
if did_not_upload: raise Exception
send_email(True, "Google Drive")
except Exception:
file_and_error = [" - ".join(f) for f in zip(did_not_upload, error_log)]
- error_message = ("\n".join(file_and_error) + "\n" + webnotes.getTraceback())
+ error_message = ("\n".join(file_and_error) + "\n" + webnotes.get_traceback())
webnotes.errprint(error_message)
send_email(False, "Google Drive", error_message)
diff --git a/setup/doctype/backup_manager/backup_manager.txt b/erpnext/setup/doctype/backup_manager/backup_manager.txt
similarity index 100%
rename from setup/doctype/backup_manager/backup_manager.txt
rename to erpnext/setup/doctype/backup_manager/backup_manager.txt
diff --git a/setup/doctype/brand/README.md b/erpnext/setup/doctype/brand/README.md
similarity index 100%
rename from setup/doctype/brand/README.md
rename to erpnext/setup/doctype/brand/README.md
diff --git a/setup/doctype/brand/__init__.py b/erpnext/setup/doctype/brand/__init__.py
similarity index 100%
rename from setup/doctype/brand/__init__.py
rename to erpnext/setup/doctype/brand/__init__.py
diff --git a/setup/doctype/brand/brand.js b/erpnext/setup/doctype/brand/brand.js
similarity index 100%
rename from setup/doctype/brand/brand.js
rename to erpnext/setup/doctype/brand/brand.js
diff --git a/setup/doctype/brand/brand.py b/erpnext/setup/doctype/brand/brand.py
similarity index 100%
rename from setup/doctype/brand/brand.py
rename to erpnext/setup/doctype/brand/brand.py
diff --git a/setup/doctype/brand/brand.txt b/erpnext/setup/doctype/brand/brand.txt
similarity index 100%
rename from setup/doctype/brand/brand.txt
rename to erpnext/setup/doctype/brand/brand.txt
diff --git a/setup/doctype/brand/test_brand.py b/erpnext/setup/doctype/brand/test_brand.py
similarity index 100%
rename from setup/doctype/brand/test_brand.py
rename to erpnext/setup/doctype/brand/test_brand.py
diff --git a/setup/doctype/company/README.md b/erpnext/setup/doctype/company/README.md
similarity index 100%
rename from setup/doctype/company/README.md
rename to erpnext/setup/doctype/company/README.md
diff --git a/setup/doctype/company/__init__.py b/erpnext/setup/doctype/company/__init__.py
similarity index 100%
rename from setup/doctype/company/__init__.py
rename to erpnext/setup/doctype/company/__init__.py
diff --git a/setup/doctype/company/charts/__init__.py b/erpnext/setup/doctype/company/charts/__init__.py
similarity index 100%
rename from setup/doctype/company/charts/__init__.py
rename to erpnext/setup/doctype/company/charts/__init__.py
diff --git a/setup/doctype/company/charts/ar_ar_chart_template.json b/erpnext/setup/doctype/company/charts/ar_ar_chart_template.json
similarity index 100%
rename from setup/doctype/company/charts/ar_ar_chart_template.json
rename to erpnext/setup/doctype/company/charts/ar_ar_chart_template.json
diff --git a/setup/doctype/company/charts/at_austria_chart_template.json b/erpnext/setup/doctype/company/charts/at_austria_chart_template.json
similarity index 100%
rename from setup/doctype/company/charts/at_austria_chart_template.json
rename to erpnext/setup/doctype/company/charts/at_austria_chart_template.json
diff --git a/setup/doctype/company/charts/be_l10nbe_chart_template.json b/erpnext/setup/doctype/company/charts/be_l10nbe_chart_template.json
similarity index 100%
rename from setup/doctype/company/charts/be_l10nbe_chart_template.json
rename to erpnext/setup/doctype/company/charts/be_l10nbe_chart_template.json
diff --git a/setup/doctype/company/charts/bo_bo_chart_template.json b/erpnext/setup/doctype/company/charts/bo_bo_chart_template.json
similarity index 100%
rename from setup/doctype/company/charts/bo_bo_chart_template.json
rename to erpnext/setup/doctype/company/charts/bo_bo_chart_template.json
diff --git a/setup/doctype/company/charts/ca_ca_en_chart_template_en.json b/erpnext/setup/doctype/company/charts/ca_ca_en_chart_template_en.json
similarity index 100%
rename from setup/doctype/company/charts/ca_ca_en_chart_template_en.json
rename to erpnext/setup/doctype/company/charts/ca_ca_en_chart_template_en.json
diff --git a/setup/doctype/company/charts/ca_ca_fr_chart_template_fr.json b/erpnext/setup/doctype/company/charts/ca_ca_fr_chart_template_fr.json
similarity index 100%
rename from setup/doctype/company/charts/ca_ca_fr_chart_template_fr.json
rename to erpnext/setup/doctype/company/charts/ca_ca_fr_chart_template_fr.json
diff --git a/setup/doctype/company/charts/cl_cl_chart_template.json b/erpnext/setup/doctype/company/charts/cl_cl_chart_template.json
similarity index 100%
rename from setup/doctype/company/charts/cl_cl_chart_template.json
rename to erpnext/setup/doctype/company/charts/cl_cl_chart_template.json
diff --git a/setup/doctype/company/charts/cn_l10n_chart_china.json b/erpnext/setup/doctype/company/charts/cn_l10n_chart_china.json
similarity index 100%
rename from setup/doctype/company/charts/cn_l10n_chart_china.json
rename to erpnext/setup/doctype/company/charts/cn_l10n_chart_china.json
diff --git a/setup/doctype/company/charts/de_l10n_chart_de_skr04.json b/erpnext/setup/doctype/company/charts/de_l10n_chart_de_skr04.json
similarity index 100%
rename from setup/doctype/company/charts/de_l10n_chart_de_skr04.json
rename to erpnext/setup/doctype/company/charts/de_l10n_chart_de_skr04.json
diff --git a/setup/doctype/company/charts/de_l10n_de_chart_template.json b/erpnext/setup/doctype/company/charts/de_l10n_de_chart_template.json
similarity index 100%
rename from setup/doctype/company/charts/de_l10n_de_chart_template.json
rename to erpnext/setup/doctype/company/charts/de_l10n_de_chart_template.json
diff --git a/setup/doctype/company/charts/ec_ec_chart_template.json b/erpnext/setup/doctype/company/charts/ec_ec_chart_template.json
similarity index 100%
rename from setup/doctype/company/charts/ec_ec_chart_template.json
rename to erpnext/setup/doctype/company/charts/ec_ec_chart_template.json
diff --git a/setup/doctype/company/charts/es_l10nES_chart_template.json b/erpnext/setup/doctype/company/charts/es_l10nES_chart_template.json
similarity index 100%
rename from setup/doctype/company/charts/es_l10nES_chart_template.json
rename to erpnext/setup/doctype/company/charts/es_l10nES_chart_template.json
diff --git a/setup/doctype/company/charts/es_l10nES_chart_template_assoc.json b/erpnext/setup/doctype/company/charts/es_l10nES_chart_template_assoc.json
similarity index 100%
rename from setup/doctype/company/charts/es_l10nES_chart_template_assoc.json
rename to erpnext/setup/doctype/company/charts/es_l10nES_chart_template_assoc.json
diff --git a/setup/doctype/company/charts/es_l10nES_chart_template_pymes.json b/erpnext/setup/doctype/company/charts/es_l10nES_chart_template_pymes.json
similarity index 100%
rename from setup/doctype/company/charts/es_l10nES_chart_template_pymes.json
rename to erpnext/setup/doctype/company/charts/es_l10nES_chart_template_pymes.json
diff --git a/setup/doctype/company/charts/fr_l10n_fr_pcg_chart_template.json b/erpnext/setup/doctype/company/charts/fr_l10n_fr_pcg_chart_template.json
similarity index 100%
rename from setup/doctype/company/charts/fr_l10n_fr_pcg_chart_template.json
rename to erpnext/setup/doctype/company/charts/fr_l10n_fr_pcg_chart_template.json
diff --git a/setup/doctype/company/charts/gr_l10n_gr_chart_template.json b/erpnext/setup/doctype/company/charts/gr_l10n_gr_chart_template.json
similarity index 100%
rename from setup/doctype/company/charts/gr_l10n_gr_chart_template.json
rename to erpnext/setup/doctype/company/charts/gr_l10n_gr_chart_template.json
diff --git a/setup/doctype/company/charts/hn_cuentas_plantilla.json b/erpnext/setup/doctype/company/charts/hn_cuentas_plantilla.json
similarity index 100%
rename from setup/doctype/company/charts/hn_cuentas_plantilla.json
rename to erpnext/setup/doctype/company/charts/hn_cuentas_plantilla.json
diff --git a/setup/doctype/company/charts/import_from_openerp.py b/erpnext/setup/doctype/company/charts/import_from_openerp.py
similarity index 100%
rename from setup/doctype/company/charts/import_from_openerp.py
rename to erpnext/setup/doctype/company/charts/import_from_openerp.py
diff --git a/setup/doctype/company/charts/in_indian_chart_template_private.json b/erpnext/setup/doctype/company/charts/in_indian_chart_template_private.json
similarity index 100%
rename from setup/doctype/company/charts/in_indian_chart_template_private.json
rename to erpnext/setup/doctype/company/charts/in_indian_chart_template_private.json
diff --git a/setup/doctype/company/charts/in_indian_chart_template_public.json b/erpnext/setup/doctype/company/charts/in_indian_chart_template_public.json
similarity index 100%
rename from setup/doctype/company/charts/in_indian_chart_template_public.json
rename to erpnext/setup/doctype/company/charts/in_indian_chart_template_public.json
diff --git a/setup/doctype/company/charts/it_l10n_it_chart_template_generic.json b/erpnext/setup/doctype/company/charts/it_l10n_it_chart_template_generic.json
similarity index 100%
rename from setup/doctype/company/charts/it_l10n_it_chart_template_generic.json
rename to erpnext/setup/doctype/company/charts/it_l10n_it_chart_template_generic.json
diff --git a/setup/doctype/company/charts/lu_lu_2011_chart_1.json b/erpnext/setup/doctype/company/charts/lu_lu_2011_chart_1.json
similarity index 100%
rename from setup/doctype/company/charts/lu_lu_2011_chart_1.json
rename to erpnext/setup/doctype/company/charts/lu_lu_2011_chart_1.json
diff --git a/setup/doctype/company/charts/ma_l10n_kzc_temp_chart.json b/erpnext/setup/doctype/company/charts/ma_l10n_kzc_temp_chart.json
similarity index 100%
rename from setup/doctype/company/charts/ma_l10n_kzc_temp_chart.json
rename to erpnext/setup/doctype/company/charts/ma_l10n_kzc_temp_chart.json
diff --git a/setup/doctype/company/charts/nl_l10nnl_chart_template.json b/erpnext/setup/doctype/company/charts/nl_l10nnl_chart_template.json
similarity index 100%
rename from setup/doctype/company/charts/nl_l10nnl_chart_template.json
rename to erpnext/setup/doctype/company/charts/nl_l10nnl_chart_template.json
diff --git a/setup/doctype/company/charts/pa_l10npa_chart_template.json b/erpnext/setup/doctype/company/charts/pa_l10npa_chart_template.json
similarity index 100%
rename from setup/doctype/company/charts/pa_l10npa_chart_template.json
rename to erpnext/setup/doctype/company/charts/pa_l10npa_chart_template.json
diff --git a/setup/doctype/company/charts/pe_pe_chart_template.json b/erpnext/setup/doctype/company/charts/pe_pe_chart_template.json
similarity index 100%
rename from setup/doctype/company/charts/pe_pe_chart_template.json
rename to erpnext/setup/doctype/company/charts/pe_pe_chart_template.json
diff --git a/setup/doctype/company/charts/pl_pl_chart_template.json b/erpnext/setup/doctype/company/charts/pl_pl_chart_template.json
similarity index 100%
rename from setup/doctype/company/charts/pl_pl_chart_template.json
rename to erpnext/setup/doctype/company/charts/pl_pl_chart_template.json
diff --git a/setup/doctype/company/charts/pt_pt_chart_template.json b/erpnext/setup/doctype/company/charts/pt_pt_chart_template.json
similarity index 100%
rename from setup/doctype/company/charts/pt_pt_chart_template.json
rename to erpnext/setup/doctype/company/charts/pt_pt_chart_template.json
diff --git a/setup/doctype/company/charts/ro_romania_chart_template.json b/erpnext/setup/doctype/company/charts/ro_romania_chart_template.json
similarity index 100%
rename from setup/doctype/company/charts/ro_romania_chart_template.json
rename to erpnext/setup/doctype/company/charts/ro_romania_chart_template.json
diff --git a/setup/doctype/company/charts/syscohada_syscohada_chart_template.json b/erpnext/setup/doctype/company/charts/syscohada_syscohada_chart_template.json
similarity index 100%
rename from setup/doctype/company/charts/syscohada_syscohada_chart_template.json
rename to erpnext/setup/doctype/company/charts/syscohada_syscohada_chart_template.json
diff --git a/setup/doctype/company/charts/th_chart.json b/erpnext/setup/doctype/company/charts/th_chart.json
similarity index 100%
rename from setup/doctype/company/charts/th_chart.json
rename to erpnext/setup/doctype/company/charts/th_chart.json
diff --git a/setup/doctype/company/charts/tr_l10ntr_tek_duzen_hesap.json b/erpnext/setup/doctype/company/charts/tr_l10ntr_tek_duzen_hesap.json
similarity index 100%
rename from setup/doctype/company/charts/tr_l10ntr_tek_duzen_hesap.json
rename to erpnext/setup/doctype/company/charts/tr_l10ntr_tek_duzen_hesap.json
diff --git a/setup/doctype/company/charts/us_account_chart_template_basic.json b/erpnext/setup/doctype/company/charts/us_account_chart_template_basic.json
similarity index 100%
rename from setup/doctype/company/charts/us_account_chart_template_basic.json
rename to erpnext/setup/doctype/company/charts/us_account_chart_template_basic.json
diff --git a/setup/doctype/company/charts/uy_uy_chart_template.json b/erpnext/setup/doctype/company/charts/uy_uy_chart_template.json
similarity index 100%
rename from setup/doctype/company/charts/uy_uy_chart_template.json
rename to erpnext/setup/doctype/company/charts/uy_uy_chart_template.json
diff --git a/setup/doctype/company/company.js b/erpnext/setup/doctype/company/company.js
similarity index 98%
rename from setup/doctype/company/company.js
rename to erpnext/setup/doctype/company/company.js
index 856d5e1..e047c97 100644
--- a/setup/doctype/company/company.js
+++ b/erpnext/setup/doctype/company/company.js
@@ -27,7 +27,7 @@
args = dialog.get_values();
if(!args) return;
return wn.call({
- method: "setup.doctype.company.company.replace_abbr",
+ method: "erpnext.setup.doctype.company.company.replace_abbr",
args: {
"company": cur_frm.doc.name,
"old": cur_frm.doc.abbr,
diff --git a/setup/doctype/company/company.py b/erpnext/setup/doctype/company/company.py
similarity index 100%
rename from setup/doctype/company/company.py
rename to erpnext/setup/doctype/company/company.py
diff --git a/setup/doctype/company/company.txt b/erpnext/setup/doctype/company/company.txt
similarity index 100%
rename from setup/doctype/company/company.txt
rename to erpnext/setup/doctype/company/company.txt
diff --git a/setup/doctype/company/sample_home_page.html b/erpnext/setup/doctype/company/sample_home_page.html
similarity index 100%
rename from setup/doctype/company/sample_home_page.html
rename to erpnext/setup/doctype/company/sample_home_page.html
diff --git a/setup/doctype/company/test_company.py b/erpnext/setup/doctype/company/test_company.py
similarity index 100%
rename from setup/doctype/company/test_company.py
rename to erpnext/setup/doctype/company/test_company.py
diff --git a/setup/doctype/contact_control/README.md b/erpnext/setup/doctype/contact_control/README.md
similarity index 100%
rename from setup/doctype/contact_control/README.md
rename to erpnext/setup/doctype/contact_control/README.md
diff --git a/setup/doctype/contact_control/__init__.py b/erpnext/setup/doctype/contact_control/__init__.py
similarity index 100%
rename from setup/doctype/contact_control/__init__.py
rename to erpnext/setup/doctype/contact_control/__init__.py
diff --git a/setup/doctype/contact_control/contact_control.js b/erpnext/setup/doctype/contact_control/contact_control.js
similarity index 100%
rename from setup/doctype/contact_control/contact_control.js
rename to erpnext/setup/doctype/contact_control/contact_control.js
diff --git a/setup/doctype/contact_control/contact_control.py b/erpnext/setup/doctype/contact_control/contact_control.py
similarity index 100%
rename from setup/doctype/contact_control/contact_control.py
rename to erpnext/setup/doctype/contact_control/contact_control.py
diff --git a/setup/doctype/contact_control/contact_control.txt b/erpnext/setup/doctype/contact_control/contact_control.txt
similarity index 100%
rename from setup/doctype/contact_control/contact_control.txt
rename to erpnext/setup/doctype/contact_control/contact_control.txt
diff --git a/setup/doctype/country/README.md b/erpnext/setup/doctype/country/README.md
similarity index 100%
rename from setup/doctype/country/README.md
rename to erpnext/setup/doctype/country/README.md
diff --git a/setup/doctype/country/__init__.py b/erpnext/setup/doctype/country/__init__.py
similarity index 100%
rename from setup/doctype/country/__init__.py
rename to erpnext/setup/doctype/country/__init__.py
diff --git a/setup/doctype/country/country.py b/erpnext/setup/doctype/country/country.py
similarity index 100%
rename from setup/doctype/country/country.py
rename to erpnext/setup/doctype/country/country.py
diff --git a/setup/doctype/country/country.txt b/erpnext/setup/doctype/country/country.txt
similarity index 100%
rename from setup/doctype/country/country.txt
rename to erpnext/setup/doctype/country/country.txt
diff --git a/setup/doctype/country/test_country.py b/erpnext/setup/doctype/country/test_country.py
similarity index 100%
rename from setup/doctype/country/test_country.py
rename to erpnext/setup/doctype/country/test_country.py
diff --git a/setup/doctype/currency/README.md b/erpnext/setup/doctype/currency/README.md
similarity index 100%
rename from setup/doctype/currency/README.md
rename to erpnext/setup/doctype/currency/README.md
diff --git a/setup/doctype/currency/__init__.py b/erpnext/setup/doctype/currency/__init__.py
similarity index 100%
rename from setup/doctype/currency/__init__.py
rename to erpnext/setup/doctype/currency/__init__.py
diff --git a/setup/doctype/currency/currency.js b/erpnext/setup/doctype/currency/currency.js
similarity index 100%
rename from setup/doctype/currency/currency.js
rename to erpnext/setup/doctype/currency/currency.js
diff --git a/setup/doctype/currency/currency.py b/erpnext/setup/doctype/currency/currency.py
similarity index 100%
rename from setup/doctype/currency/currency.py
rename to erpnext/setup/doctype/currency/currency.py
diff --git a/setup/doctype/currency/currency.txt b/erpnext/setup/doctype/currency/currency.txt
similarity index 100%
rename from setup/doctype/currency/currency.txt
rename to erpnext/setup/doctype/currency/currency.txt
diff --git a/setup/doctype/currency/test_currency.py b/erpnext/setup/doctype/currency/test_currency.py
similarity index 100%
rename from setup/doctype/currency/test_currency.py
rename to erpnext/setup/doctype/currency/test_currency.py
diff --git a/setup/doctype/currency_exchange/__init__.py b/erpnext/setup/doctype/currency_exchange/__init__.py
similarity index 100%
rename from setup/doctype/currency_exchange/__init__.py
rename to erpnext/setup/doctype/currency_exchange/__init__.py
diff --git a/setup/doctype/currency_exchange/currency_exchange.js b/erpnext/setup/doctype/currency_exchange/currency_exchange.js
similarity index 100%
rename from setup/doctype/currency_exchange/currency_exchange.js
rename to erpnext/setup/doctype/currency_exchange/currency_exchange.js
diff --git a/setup/doctype/currency_exchange/currency_exchange.py b/erpnext/setup/doctype/currency_exchange/currency_exchange.py
similarity index 100%
rename from setup/doctype/currency_exchange/currency_exchange.py
rename to erpnext/setup/doctype/currency_exchange/currency_exchange.py
diff --git a/setup/doctype/currency_exchange/currency_exchange.txt b/erpnext/setup/doctype/currency_exchange/currency_exchange.txt
similarity index 100%
rename from setup/doctype/currency_exchange/currency_exchange.txt
rename to erpnext/setup/doctype/currency_exchange/currency_exchange.txt
diff --git a/setup/doctype/currency_exchange/test_currency_exchange.py b/erpnext/setup/doctype/currency_exchange/test_currency_exchange.py
similarity index 100%
rename from setup/doctype/currency_exchange/test_currency_exchange.py
rename to erpnext/setup/doctype/currency_exchange/test_currency_exchange.py
diff --git a/setup/doctype/customer_group/README.md b/erpnext/setup/doctype/customer_group/README.md
similarity index 100%
rename from setup/doctype/customer_group/README.md
rename to erpnext/setup/doctype/customer_group/README.md
diff --git a/setup/doctype/customer_group/__init__.py b/erpnext/setup/doctype/customer_group/__init__.py
similarity index 100%
rename from setup/doctype/customer_group/__init__.py
rename to erpnext/setup/doctype/customer_group/__init__.py
diff --git a/setup/doctype/customer_group/customer_group.js b/erpnext/setup/doctype/customer_group/customer_group.js
similarity index 100%
rename from setup/doctype/customer_group/customer_group.js
rename to erpnext/setup/doctype/customer_group/customer_group.js
diff --git a/setup/doctype/customer_group/customer_group.py b/erpnext/setup/doctype/customer_group/customer_group.py
similarity index 100%
rename from setup/doctype/customer_group/customer_group.py
rename to erpnext/setup/doctype/customer_group/customer_group.py
diff --git a/setup/doctype/customer_group/customer_group.txt b/erpnext/setup/doctype/customer_group/customer_group.txt
similarity index 100%
rename from setup/doctype/customer_group/customer_group.txt
rename to erpnext/setup/doctype/customer_group/customer_group.txt
diff --git a/setup/doctype/customer_group/test_customer_group.py b/erpnext/setup/doctype/customer_group/test_customer_group.py
similarity index 100%
rename from setup/doctype/customer_group/test_customer_group.py
rename to erpnext/setup/doctype/customer_group/test_customer_group.py
diff --git a/setup/doctype/email_digest/README.md b/erpnext/setup/doctype/email_digest/README.md
similarity index 100%
rename from setup/doctype/email_digest/README.md
rename to erpnext/setup/doctype/email_digest/README.md
diff --git a/setup/doctype/email_digest/__init__.py b/erpnext/setup/doctype/email_digest/__init__.py
similarity index 100%
rename from setup/doctype/email_digest/__init__.py
rename to erpnext/setup/doctype/email_digest/__init__.py
diff --git a/setup/doctype/email_digest/email_digest.css b/erpnext/setup/doctype/email_digest/email_digest.css
similarity index 100%
rename from setup/doctype/email_digest/email_digest.css
rename to erpnext/setup/doctype/email_digest/email_digest.css
diff --git a/setup/doctype/email_digest/email_digest.js b/erpnext/setup/doctype/email_digest/email_digest.js
similarity index 100%
rename from setup/doctype/email_digest/email_digest.js
rename to erpnext/setup/doctype/email_digest/email_digest.js
diff --git a/setup/doctype/email_digest/email_digest.py b/erpnext/setup/doctype/email_digest/email_digest.py
similarity index 99%
rename from setup/doctype/email_digest/email_digest.py
rename to erpnext/setup/doctype/email_digest/email_digest.py
index f01c8a8..b9125c9 100644
--- a/setup/doctype/email_digest/email_digest.py
+++ b/erpnext/setup/doctype/email_digest/email_digest.py
@@ -293,7 +293,7 @@
filter_by_company=False)
def get_calendar_events(self, user_id):
- from core.doctype.event.event import get_events
+ from webnotes.core.doctype.event.event import get_events
events = get_events(self.future_from_date.strftime("%Y-%m-%d"), self.future_to_date.strftime("%Y-%m-%d"))
html = ""
@@ -314,7 +314,7 @@
return 0, "<p>Calendar Events</p>"
def get_todo_list(self, user_id):
- from core.page.todo.todo import get
+ from webnotes.core.page.todo.todo import get
todo_list = get()
html = ""
@@ -483,4 +483,4 @@
where enabled=1 and docstatus<2""", as_list=1):
ed_obj = get_obj('Email Digest', ed[0])
if (now_date == ed_obj.get_next_sending()):
- ed_obj.send()
\ No newline at end of file
+ ed_obj.send()
diff --git a/setup/doctype/email_digest/email_digest.txt b/erpnext/setup/doctype/email_digest/email_digest.txt
similarity index 100%
rename from setup/doctype/email_digest/email_digest.txt
rename to erpnext/setup/doctype/email_digest/email_digest.txt
diff --git a/setup/doctype/email_settings/README.md b/erpnext/setup/doctype/email_settings/README.md
similarity index 100%
rename from setup/doctype/email_settings/README.md
rename to erpnext/setup/doctype/email_settings/README.md
diff --git a/setup/doctype/email_settings/__init__.py b/erpnext/setup/doctype/email_settings/__init__.py
similarity index 100%
rename from setup/doctype/email_settings/__init__.py
rename to erpnext/setup/doctype/email_settings/__init__.py
diff --git a/setup/doctype/email_settings/email_settings.py b/erpnext/setup/doctype/email_settings/email_settings.py
similarity index 100%
rename from setup/doctype/email_settings/email_settings.py
rename to erpnext/setup/doctype/email_settings/email_settings.py
diff --git a/setup/doctype/email_settings/email_settings.txt b/erpnext/setup/doctype/email_settings/email_settings.txt
similarity index 100%
rename from setup/doctype/email_settings/email_settings.txt
rename to erpnext/setup/doctype/email_settings/email_settings.txt
diff --git a/setup/doctype/features_setup/README.md b/erpnext/setup/doctype/features_setup/README.md
similarity index 100%
rename from setup/doctype/features_setup/README.md
rename to erpnext/setup/doctype/features_setup/README.md
diff --git a/setup/doctype/features_setup/__init__.py b/erpnext/setup/doctype/features_setup/__init__.py
similarity index 100%
rename from setup/doctype/features_setup/__init__.py
rename to erpnext/setup/doctype/features_setup/__init__.py
diff --git a/setup/doctype/features_setup/features_setup.py b/erpnext/setup/doctype/features_setup/features_setup.py
similarity index 100%
rename from setup/doctype/features_setup/features_setup.py
rename to erpnext/setup/doctype/features_setup/features_setup.py
diff --git a/setup/doctype/features_setup/features_setup.txt b/erpnext/setup/doctype/features_setup/features_setup.txt
similarity index 100%
rename from setup/doctype/features_setup/features_setup.txt
rename to erpnext/setup/doctype/features_setup/features_setup.txt
diff --git a/setup/doctype/global_defaults/README.md b/erpnext/setup/doctype/global_defaults/README.md
similarity index 100%
rename from setup/doctype/global_defaults/README.md
rename to erpnext/setup/doctype/global_defaults/README.md
diff --git a/setup/doctype/global_defaults/__init__.py b/erpnext/setup/doctype/global_defaults/__init__.py
similarity index 100%
rename from setup/doctype/global_defaults/__init__.py
rename to erpnext/setup/doctype/global_defaults/__init__.py
diff --git a/setup/doctype/global_defaults/global_defaults.js b/erpnext/setup/doctype/global_defaults/global_defaults.js
similarity index 95%
rename from setup/doctype/global_defaults/global_defaults.js
rename to erpnext/setup/doctype/global_defaults/global_defaults.js
index ba31f3c..6a2f84a 100644
--- a/setup/doctype/global_defaults/global_defaults.js
+++ b/erpnext/setup/doctype/global_defaults/global_defaults.js
@@ -7,7 +7,7 @@
this.timezone = doc.time_zone;
wn.call({
- method:"webnotes.country_info.get_country_timezone_info",
+ method: "webnotes.country_info.get_country_timezone_info",
callback: function(data) {
erpnext.country_info = data.message.country_info;
erpnext.all_timezones = data.message.all_timezones;
diff --git a/setup/doctype/global_defaults/global_defaults.py b/erpnext/setup/doctype/global_defaults/global_defaults.py
similarity index 100%
rename from setup/doctype/global_defaults/global_defaults.py
rename to erpnext/setup/doctype/global_defaults/global_defaults.py
diff --git a/setup/doctype/global_defaults/global_defaults.txt b/erpnext/setup/doctype/global_defaults/global_defaults.txt
similarity index 100%
rename from setup/doctype/global_defaults/global_defaults.txt
rename to erpnext/setup/doctype/global_defaults/global_defaults.txt
diff --git a/setup/doctype/item_group/README.md b/erpnext/setup/doctype/item_group/README.md
similarity index 100%
rename from setup/doctype/item_group/README.md
rename to erpnext/setup/doctype/item_group/README.md
diff --git a/setup/doctype/item_group/__init__.py b/erpnext/setup/doctype/item_group/__init__.py
similarity index 100%
rename from setup/doctype/item_group/__init__.py
rename to erpnext/setup/doctype/item_group/__init__.py
diff --git a/setup/doctype/item_group/item_group.js b/erpnext/setup/doctype/item_group/item_group.js
similarity index 100%
rename from setup/doctype/item_group/item_group.js
rename to erpnext/setup/doctype/item_group/item_group.js
diff --git a/setup/doctype/item_group/item_group.py b/erpnext/setup/doctype/item_group/item_group.py
similarity index 86%
rename from setup/doctype/item_group/item_group.py
rename to erpnext/setup/doctype/item_group/item_group.py
index e2fc7ab..6b989d5 100644
--- a/setup/doctype/item_group/item_group.py
+++ b/erpnext/setup/doctype/item_group/item_group.py
@@ -19,7 +19,7 @@
self.validate_name_with_item()
- from selling.utils.product import invalidate_cache_for
+ from erpnext.selling.utils.product import invalidate_cache_for
invalidate_cache_for(self.doc.name)
self.validate_one_root()
@@ -30,7 +30,7 @@
item group name or rename the item" % self.doc.name, raise_exception=1)
def get_context(self):
- from selling.utils.product import get_product_list_for_group, \
+ from erpnext.selling.utils.product import get_product_list_for_group, \
get_parent_item_groups, get_group_item_count
self.doc.sub_groups = webnotes.conn.sql("""select name, page_name
@@ -45,6 +45,6 @@
self.doc.title = self.doc.name
if self.doc.slideshow:
- from website.doctype.website_slideshow.website_slideshow import get_slideshow
+ from webnotes.website.doctype.website_slideshow.website_slideshow import get_slideshow
get_slideshow(self)
\ No newline at end of file
diff --git a/setup/doctype/item_group/item_group.txt b/erpnext/setup/doctype/item_group/item_group.txt
similarity index 100%
rename from setup/doctype/item_group/item_group.txt
rename to erpnext/setup/doctype/item_group/item_group.txt
diff --git a/setup/doctype/item_group/test_item_group.py b/erpnext/setup/doctype/item_group/test_item_group.py
similarity index 100%
rename from setup/doctype/item_group/test_item_group.py
rename to erpnext/setup/doctype/item_group/test_item_group.py
diff --git a/setup/doctype/jobs_email_settings/README.md b/erpnext/setup/doctype/jobs_email_settings/README.md
similarity index 100%
rename from setup/doctype/jobs_email_settings/README.md
rename to erpnext/setup/doctype/jobs_email_settings/README.md
diff --git a/setup/doctype/jobs_email_settings/__init__.py b/erpnext/setup/doctype/jobs_email_settings/__init__.py
similarity index 100%
rename from setup/doctype/jobs_email_settings/__init__.py
rename to erpnext/setup/doctype/jobs_email_settings/__init__.py
diff --git a/setup/doctype/jobs_email_settings/jobs_email_settings.js b/erpnext/setup/doctype/jobs_email_settings/jobs_email_settings.js
similarity index 100%
rename from setup/doctype/jobs_email_settings/jobs_email_settings.js
rename to erpnext/setup/doctype/jobs_email_settings/jobs_email_settings.js
diff --git a/setup/doctype/jobs_email_settings/jobs_email_settings.py b/erpnext/setup/doctype/jobs_email_settings/jobs_email_settings.py
similarity index 100%
rename from setup/doctype/jobs_email_settings/jobs_email_settings.py
rename to erpnext/setup/doctype/jobs_email_settings/jobs_email_settings.py
diff --git a/setup/doctype/jobs_email_settings/jobs_email_settings.txt b/erpnext/setup/doctype/jobs_email_settings/jobs_email_settings.txt
similarity index 100%
rename from setup/doctype/jobs_email_settings/jobs_email_settings.txt
rename to erpnext/setup/doctype/jobs_email_settings/jobs_email_settings.txt
diff --git a/setup/doctype/naming_series/README.md b/erpnext/setup/doctype/naming_series/README.md
similarity index 100%
rename from setup/doctype/naming_series/README.md
rename to erpnext/setup/doctype/naming_series/README.md
diff --git a/setup/doctype/naming_series/__init__.py b/erpnext/setup/doctype/naming_series/__init__.py
similarity index 100%
rename from setup/doctype/naming_series/__init__.py
rename to erpnext/setup/doctype/naming_series/__init__.py
diff --git a/setup/doctype/naming_series/naming_series.js b/erpnext/setup/doctype/naming_series/naming_series.js
similarity index 100%
rename from setup/doctype/naming_series/naming_series.js
rename to erpnext/setup/doctype/naming_series/naming_series.js
diff --git a/setup/doctype/naming_series/naming_series.py b/erpnext/setup/doctype/naming_series/naming_series.py
similarity index 97%
rename from setup/doctype/naming_series/naming_series.py
rename to erpnext/setup/doctype/naming_series/naming_series.py
index 3a14d41..092de20 100644
--- a/setup/doctype/naming_series/naming_series.py
+++ b/erpnext/setup/doctype/naming_series/naming_series.py
@@ -83,7 +83,7 @@
webnotes.clear_cache(doctype=doctype)
def check_duplicate(self):
- from core.doctype.doctype.doctype import DocType
+ from webnotes.core.doctype.doctype.doctype import DocType
dt = DocType()
parent = list(set(
@@ -141,7 +141,7 @@
msgprint("Please select prefix first")
def set_by_naming_series(doctype, fieldname, naming_series, hide_name_field=True):
- from core.doctype.property_setter.property_setter import make_property_setter
+ from webnotes.core.doctype.property_setter.property_setter import make_property_setter
if naming_series:
make_property_setter(doctype, "naming_series", "hidden", 0, "Check")
make_property_setter(doctype, "naming_series", "reqd", 1, "Check")
diff --git a/setup/doctype/naming_series/naming_series.txt b/erpnext/setup/doctype/naming_series/naming_series.txt
similarity index 100%
rename from setup/doctype/naming_series/naming_series.txt
rename to erpnext/setup/doctype/naming_series/naming_series.txt
diff --git a/setup/doctype/notification_control/README.md b/erpnext/setup/doctype/notification_control/README.md
similarity index 100%
rename from setup/doctype/notification_control/README.md
rename to erpnext/setup/doctype/notification_control/README.md
diff --git a/setup/doctype/notification_control/__init__.py b/erpnext/setup/doctype/notification_control/__init__.py
similarity index 100%
rename from setup/doctype/notification_control/__init__.py
rename to erpnext/setup/doctype/notification_control/__init__.py
diff --git a/setup/doctype/notification_control/notification_control.js b/erpnext/setup/doctype/notification_control/notification_control.js
similarity index 100%
rename from setup/doctype/notification_control/notification_control.js
rename to erpnext/setup/doctype/notification_control/notification_control.js
diff --git a/setup/doctype/notification_control/notification_control.py b/erpnext/setup/doctype/notification_control/notification_control.py
similarity index 100%
rename from setup/doctype/notification_control/notification_control.py
rename to erpnext/setup/doctype/notification_control/notification_control.py
diff --git a/setup/doctype/notification_control/notification_control.txt b/erpnext/setup/doctype/notification_control/notification_control.txt
similarity index 100%
rename from setup/doctype/notification_control/notification_control.txt
rename to erpnext/setup/doctype/notification_control/notification_control.txt
diff --git a/setup/doctype/print_heading/README.md b/erpnext/setup/doctype/print_heading/README.md
similarity index 100%
rename from setup/doctype/print_heading/README.md
rename to erpnext/setup/doctype/print_heading/README.md
diff --git a/setup/doctype/print_heading/__init__.py b/erpnext/setup/doctype/print_heading/__init__.py
similarity index 100%
rename from setup/doctype/print_heading/__init__.py
rename to erpnext/setup/doctype/print_heading/__init__.py
diff --git a/setup/doctype/print_heading/print_heading.js b/erpnext/setup/doctype/print_heading/print_heading.js
similarity index 100%
rename from setup/doctype/print_heading/print_heading.js
rename to erpnext/setup/doctype/print_heading/print_heading.js
diff --git a/setup/doctype/print_heading/print_heading.py b/erpnext/setup/doctype/print_heading/print_heading.py
similarity index 100%
rename from setup/doctype/print_heading/print_heading.py
rename to erpnext/setup/doctype/print_heading/print_heading.py
diff --git a/setup/doctype/print_heading/print_heading.txt b/erpnext/setup/doctype/print_heading/print_heading.txt
similarity index 100%
rename from setup/doctype/print_heading/print_heading.txt
rename to erpnext/setup/doctype/print_heading/print_heading.txt
diff --git a/setup/doctype/print_heading/test_print_heading.py b/erpnext/setup/doctype/print_heading/test_print_heading.py
similarity index 100%
rename from setup/doctype/print_heading/test_print_heading.py
rename to erpnext/setup/doctype/print_heading/test_print_heading.py
diff --git a/setup/doctype/quotation_lost_reason/README.md b/erpnext/setup/doctype/quotation_lost_reason/README.md
similarity index 100%
rename from setup/doctype/quotation_lost_reason/README.md
rename to erpnext/setup/doctype/quotation_lost_reason/README.md
diff --git a/setup/doctype/quotation_lost_reason/__init__.py b/erpnext/setup/doctype/quotation_lost_reason/__init__.py
similarity index 100%
rename from setup/doctype/quotation_lost_reason/__init__.py
rename to erpnext/setup/doctype/quotation_lost_reason/__init__.py
diff --git a/setup/doctype/quotation_lost_reason/quotation_lost_reason.js b/erpnext/setup/doctype/quotation_lost_reason/quotation_lost_reason.js
similarity index 100%
rename from setup/doctype/quotation_lost_reason/quotation_lost_reason.js
rename to erpnext/setup/doctype/quotation_lost_reason/quotation_lost_reason.js
diff --git a/setup/doctype/quotation_lost_reason/quotation_lost_reason.py b/erpnext/setup/doctype/quotation_lost_reason/quotation_lost_reason.py
similarity index 100%
rename from setup/doctype/quotation_lost_reason/quotation_lost_reason.py
rename to erpnext/setup/doctype/quotation_lost_reason/quotation_lost_reason.py
diff --git a/setup/doctype/quotation_lost_reason/quotation_lost_reason.txt b/erpnext/setup/doctype/quotation_lost_reason/quotation_lost_reason.txt
similarity index 100%
rename from setup/doctype/quotation_lost_reason/quotation_lost_reason.txt
rename to erpnext/setup/doctype/quotation_lost_reason/quotation_lost_reason.txt
diff --git a/setup/doctype/quotation_lost_reason/test_quotation_lost_reason.py b/erpnext/setup/doctype/quotation_lost_reason/test_quotation_lost_reason.py
similarity index 100%
rename from setup/doctype/quotation_lost_reason/test_quotation_lost_reason.py
rename to erpnext/setup/doctype/quotation_lost_reason/test_quotation_lost_reason.py
diff --git a/setup/doctype/sales_email_settings/README.md b/erpnext/setup/doctype/sales_email_settings/README.md
similarity index 100%
rename from setup/doctype/sales_email_settings/README.md
rename to erpnext/setup/doctype/sales_email_settings/README.md
diff --git a/setup/doctype/sales_email_settings/__init__.py b/erpnext/setup/doctype/sales_email_settings/__init__.py
similarity index 100%
rename from setup/doctype/sales_email_settings/__init__.py
rename to erpnext/setup/doctype/sales_email_settings/__init__.py
diff --git a/setup/doctype/sales_email_settings/sales_email_settings.js b/erpnext/setup/doctype/sales_email_settings/sales_email_settings.js
similarity index 100%
rename from setup/doctype/sales_email_settings/sales_email_settings.js
rename to erpnext/setup/doctype/sales_email_settings/sales_email_settings.js
diff --git a/setup/doctype/sales_email_settings/sales_email_settings.py b/erpnext/setup/doctype/sales_email_settings/sales_email_settings.py
similarity index 100%
rename from setup/doctype/sales_email_settings/sales_email_settings.py
rename to erpnext/setup/doctype/sales_email_settings/sales_email_settings.py
diff --git a/setup/doctype/sales_email_settings/sales_email_settings.txt b/erpnext/setup/doctype/sales_email_settings/sales_email_settings.txt
similarity index 100%
rename from setup/doctype/sales_email_settings/sales_email_settings.txt
rename to erpnext/setup/doctype/sales_email_settings/sales_email_settings.txt
diff --git a/setup/doctype/sales_partner/README.md b/erpnext/setup/doctype/sales_partner/README.md
similarity index 100%
rename from setup/doctype/sales_partner/README.md
rename to erpnext/setup/doctype/sales_partner/README.md
diff --git a/setup/doctype/sales_partner/__init__.py b/erpnext/setup/doctype/sales_partner/__init__.py
similarity index 100%
rename from setup/doctype/sales_partner/__init__.py
rename to erpnext/setup/doctype/sales_partner/__init__.py
diff --git a/setup/doctype/sales_partner/sales_partner.js b/erpnext/setup/doctype/sales_partner/sales_partner.js
similarity index 98%
rename from setup/doctype/sales_partner/sales_partner.js
rename to erpnext/setup/doctype/sales_partner/sales_partner.js
index 0576857..57eca34 100644
--- a/setup/doctype/sales_partner/sales_partner.js
+++ b/erpnext/setup/doctype/sales_partner/sales_partner.js
@@ -1,7 +1,7 @@
// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
-wn.require('app/setup/doctype/contact_control/contact_control.js');
+{% include 'setup/doctype/contact_control/contact_control.js' %};
cur_frm.cscript.onload = function(doc,dt,dn){
diff --git a/setup/doctype/sales_partner/sales_partner.py b/erpnext/setup/doctype/sales_partner/sales_partner.py
similarity index 100%
rename from setup/doctype/sales_partner/sales_partner.py
rename to erpnext/setup/doctype/sales_partner/sales_partner.py
diff --git a/setup/doctype/sales_partner/sales_partner.txt b/erpnext/setup/doctype/sales_partner/sales_partner.txt
similarity index 100%
rename from setup/doctype/sales_partner/sales_partner.txt
rename to erpnext/setup/doctype/sales_partner/sales_partner.txt
diff --git a/setup/doctype/sales_partner/templates/__init__.py b/erpnext/setup/doctype/sales_partner/templates/__init__.py
similarity index 100%
rename from setup/doctype/sales_partner/templates/__init__.py
rename to erpnext/setup/doctype/sales_partner/templates/__init__.py
diff --git a/setup/doctype/sales_partner/templates/generators/__init__.py b/erpnext/setup/doctype/sales_partner/templates/generators/__init__.py
similarity index 100%
rename from setup/doctype/sales_partner/templates/generators/__init__.py
rename to erpnext/setup/doctype/sales_partner/templates/generators/__init__.py
diff --git a/setup/doctype/sales_partner/templates/generators/partner.html b/erpnext/setup/doctype/sales_partner/templates/generators/partner.html
similarity index 100%
rename from setup/doctype/sales_partner/templates/generators/partner.html
rename to erpnext/setup/doctype/sales_partner/templates/generators/partner.html
diff --git a/setup/doctype/sales_partner/templates/generators/partner.py b/erpnext/setup/doctype/sales_partner/templates/generators/partner.py
similarity index 100%
rename from setup/doctype/sales_partner/templates/generators/partner.py
rename to erpnext/setup/doctype/sales_partner/templates/generators/partner.py
diff --git a/setup/doctype/sales_partner/templates/pages/__init__.py b/erpnext/setup/doctype/sales_partner/templates/pages/__init__.py
similarity index 100%
rename from setup/doctype/sales_partner/templates/pages/__init__.py
rename to erpnext/setup/doctype/sales_partner/templates/pages/__init__.py
diff --git a/setup/doctype/sales_partner/templates/pages/partners.html b/erpnext/setup/doctype/sales_partner/templates/pages/partners.html
similarity index 100%
rename from setup/doctype/sales_partner/templates/pages/partners.html
rename to erpnext/setup/doctype/sales_partner/templates/pages/partners.html
diff --git a/setup/doctype/sales_partner/templates/pages/partners.py b/erpnext/setup/doctype/sales_partner/templates/pages/partners.py
similarity index 100%
rename from setup/doctype/sales_partner/templates/pages/partners.py
rename to erpnext/setup/doctype/sales_partner/templates/pages/partners.py
diff --git a/setup/doctype/sales_partner/test_sales_partner.py b/erpnext/setup/doctype/sales_partner/test_sales_partner.py
similarity index 100%
rename from setup/doctype/sales_partner/test_sales_partner.py
rename to erpnext/setup/doctype/sales_partner/test_sales_partner.py
diff --git a/setup/doctype/sales_person/README.md b/erpnext/setup/doctype/sales_person/README.md
similarity index 100%
rename from setup/doctype/sales_person/README.md
rename to erpnext/setup/doctype/sales_person/README.md
diff --git a/setup/doctype/sales_person/__init__.py b/erpnext/setup/doctype/sales_person/__init__.py
similarity index 100%
rename from setup/doctype/sales_person/__init__.py
rename to erpnext/setup/doctype/sales_person/__init__.py
diff --git a/setup/doctype/sales_person/sales_person.js b/erpnext/setup/doctype/sales_person/sales_person.js
similarity index 93%
rename from setup/doctype/sales_person/sales_person.js
rename to erpnext/setup/doctype/sales_person/sales_person.js
index 55d8684..a25a3d1 100644
--- a/setup/doctype/sales_person/sales_person.js
+++ b/erpnext/setup/doctype/sales_person/sales_person.js
@@ -37,4 +37,4 @@
}
cur_frm.fields_dict.employee.get_query = function(doc,cdt,cdn) {
- return{ query:"controllers.queries.employee_query" } }
\ No newline at end of file
+ return{ query: "erpnext.controllers.queries.employee_query" } }
\ No newline at end of file
diff --git a/setup/doctype/sales_person/sales_person.py b/erpnext/setup/doctype/sales_person/sales_person.py
similarity index 100%
rename from setup/doctype/sales_person/sales_person.py
rename to erpnext/setup/doctype/sales_person/sales_person.py
diff --git a/setup/doctype/sales_person/sales_person.txt b/erpnext/setup/doctype/sales_person/sales_person.txt
similarity index 100%
rename from setup/doctype/sales_person/sales_person.txt
rename to erpnext/setup/doctype/sales_person/sales_person.txt
diff --git a/setup/doctype/sales_person/test_sales_person.py b/erpnext/setup/doctype/sales_person/test_sales_person.py
similarity index 100%
rename from setup/doctype/sales_person/test_sales_person.py
rename to erpnext/setup/doctype/sales_person/test_sales_person.py
diff --git a/setup/doctype/sms_parameter/README.md b/erpnext/setup/doctype/sms_parameter/README.md
similarity index 100%
rename from setup/doctype/sms_parameter/README.md
rename to erpnext/setup/doctype/sms_parameter/README.md
diff --git a/setup/doctype/sms_parameter/__init__.py b/erpnext/setup/doctype/sms_parameter/__init__.py
similarity index 100%
rename from setup/doctype/sms_parameter/__init__.py
rename to erpnext/setup/doctype/sms_parameter/__init__.py
diff --git a/setup/doctype/sms_parameter/sms_parameter.py b/erpnext/setup/doctype/sms_parameter/sms_parameter.py
similarity index 100%
rename from setup/doctype/sms_parameter/sms_parameter.py
rename to erpnext/setup/doctype/sms_parameter/sms_parameter.py
diff --git a/setup/doctype/sms_parameter/sms_parameter.txt b/erpnext/setup/doctype/sms_parameter/sms_parameter.txt
similarity index 100%
rename from setup/doctype/sms_parameter/sms_parameter.txt
rename to erpnext/setup/doctype/sms_parameter/sms_parameter.txt
diff --git a/setup/doctype/sms_settings/README.md b/erpnext/setup/doctype/sms_settings/README.md
similarity index 100%
rename from setup/doctype/sms_settings/README.md
rename to erpnext/setup/doctype/sms_settings/README.md
diff --git a/setup/doctype/sms_settings/__init__.py b/erpnext/setup/doctype/sms_settings/__init__.py
similarity index 100%
rename from setup/doctype/sms_settings/__init__.py
rename to erpnext/setup/doctype/sms_settings/__init__.py
diff --git a/setup/doctype/sms_settings/sms_settings.py b/erpnext/setup/doctype/sms_settings/sms_settings.py
similarity index 100%
rename from setup/doctype/sms_settings/sms_settings.py
rename to erpnext/setup/doctype/sms_settings/sms_settings.py
diff --git a/setup/doctype/sms_settings/sms_settings.txt b/erpnext/setup/doctype/sms_settings/sms_settings.txt
similarity index 100%
rename from setup/doctype/sms_settings/sms_settings.txt
rename to erpnext/setup/doctype/sms_settings/sms_settings.txt
diff --git a/setup/doctype/supplier_type/README.md b/erpnext/setup/doctype/supplier_type/README.md
similarity index 100%
rename from setup/doctype/supplier_type/README.md
rename to erpnext/setup/doctype/supplier_type/README.md
diff --git a/setup/doctype/supplier_type/__init__.py b/erpnext/setup/doctype/supplier_type/__init__.py
similarity index 100%
rename from setup/doctype/supplier_type/__init__.py
rename to erpnext/setup/doctype/supplier_type/__init__.py
diff --git a/setup/doctype/supplier_type/supplier_type.js b/erpnext/setup/doctype/supplier_type/supplier_type.js
similarity index 100%
rename from setup/doctype/supplier_type/supplier_type.js
rename to erpnext/setup/doctype/supplier_type/supplier_type.js
diff --git a/setup/doctype/supplier_type/supplier_type.py b/erpnext/setup/doctype/supplier_type/supplier_type.py
similarity index 100%
rename from setup/doctype/supplier_type/supplier_type.py
rename to erpnext/setup/doctype/supplier_type/supplier_type.py
diff --git a/setup/doctype/supplier_type/supplier_type.txt b/erpnext/setup/doctype/supplier_type/supplier_type.txt
similarity index 100%
rename from setup/doctype/supplier_type/supplier_type.txt
rename to erpnext/setup/doctype/supplier_type/supplier_type.txt
diff --git a/setup/doctype/supplier_type/test_supplier_type.py b/erpnext/setup/doctype/supplier_type/test_supplier_type.py
similarity index 100%
rename from setup/doctype/supplier_type/test_supplier_type.py
rename to erpnext/setup/doctype/supplier_type/test_supplier_type.py
diff --git a/setup/doctype/target_detail/README.md b/erpnext/setup/doctype/target_detail/README.md
similarity index 100%
rename from setup/doctype/target_detail/README.md
rename to erpnext/setup/doctype/target_detail/README.md
diff --git a/setup/doctype/target_detail/__init__.py b/erpnext/setup/doctype/target_detail/__init__.py
similarity index 100%
rename from setup/doctype/target_detail/__init__.py
rename to erpnext/setup/doctype/target_detail/__init__.py
diff --git a/setup/doctype/target_detail/target_detail.py b/erpnext/setup/doctype/target_detail/target_detail.py
similarity index 100%
rename from setup/doctype/target_detail/target_detail.py
rename to erpnext/setup/doctype/target_detail/target_detail.py
diff --git a/setup/doctype/target_detail/target_detail.txt b/erpnext/setup/doctype/target_detail/target_detail.txt
similarity index 100%
rename from setup/doctype/target_detail/target_detail.txt
rename to erpnext/setup/doctype/target_detail/target_detail.txt
diff --git a/setup/doctype/terms_and_conditions/README.md b/erpnext/setup/doctype/terms_and_conditions/README.md
similarity index 100%
rename from setup/doctype/terms_and_conditions/README.md
rename to erpnext/setup/doctype/terms_and_conditions/README.md
diff --git a/setup/doctype/terms_and_conditions/__init__.py b/erpnext/setup/doctype/terms_and_conditions/__init__.py
similarity index 100%
rename from setup/doctype/terms_and_conditions/__init__.py
rename to erpnext/setup/doctype/terms_and_conditions/__init__.py
diff --git a/setup/doctype/terms_and_conditions/terms_and_conditions.js b/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.js
similarity index 100%
rename from setup/doctype/terms_and_conditions/terms_and_conditions.js
rename to erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.js
diff --git a/setup/doctype/terms_and_conditions/terms_and_conditions.py b/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.py
similarity index 100%
rename from setup/doctype/terms_and_conditions/terms_and_conditions.py
rename to erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.py
diff --git a/setup/doctype/terms_and_conditions/terms_and_conditions.txt b/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.txt
similarity index 100%
rename from setup/doctype/terms_and_conditions/terms_and_conditions.txt
rename to erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.txt
diff --git a/setup/doctype/terms_and_conditions/test_terms_and_conditions.py b/erpnext/setup/doctype/terms_and_conditions/test_terms_and_conditions.py
similarity index 100%
rename from setup/doctype/terms_and_conditions/test_terms_and_conditions.py
rename to erpnext/setup/doctype/terms_and_conditions/test_terms_and_conditions.py
diff --git a/setup/doctype/territory/README.md b/erpnext/setup/doctype/territory/README.md
similarity index 100%
rename from setup/doctype/territory/README.md
rename to erpnext/setup/doctype/territory/README.md
diff --git a/setup/doctype/territory/__init__.py b/erpnext/setup/doctype/territory/__init__.py
similarity index 100%
rename from setup/doctype/territory/__init__.py
rename to erpnext/setup/doctype/territory/__init__.py
diff --git a/setup/doctype/territory/territory.js b/erpnext/setup/doctype/territory/territory.js
similarity index 100%
rename from setup/doctype/territory/territory.js
rename to erpnext/setup/doctype/territory/territory.js
diff --git a/setup/doctype/territory/territory.py b/erpnext/setup/doctype/territory/territory.py
similarity index 100%
rename from setup/doctype/territory/territory.py
rename to erpnext/setup/doctype/territory/territory.py
diff --git a/setup/doctype/territory/territory.txt b/erpnext/setup/doctype/territory/territory.txt
similarity index 100%
rename from setup/doctype/territory/territory.txt
rename to erpnext/setup/doctype/territory/territory.txt
diff --git a/setup/doctype/territory/test_territory.py b/erpnext/setup/doctype/territory/test_territory.py
similarity index 100%
rename from setup/doctype/territory/test_territory.py
rename to erpnext/setup/doctype/territory/test_territory.py
diff --git a/setup/doctype/uom/README.md b/erpnext/setup/doctype/uom/README.md
similarity index 100%
rename from setup/doctype/uom/README.md
rename to erpnext/setup/doctype/uom/README.md
diff --git a/setup/doctype/uom/__init__.py b/erpnext/setup/doctype/uom/__init__.py
similarity index 100%
rename from setup/doctype/uom/__init__.py
rename to erpnext/setup/doctype/uom/__init__.py
diff --git a/setup/doctype/uom/test_uom.py b/erpnext/setup/doctype/uom/test_uom.py
similarity index 100%
rename from setup/doctype/uom/test_uom.py
rename to erpnext/setup/doctype/uom/test_uom.py
diff --git a/setup/doctype/uom/uom.js b/erpnext/setup/doctype/uom/uom.js
similarity index 100%
rename from setup/doctype/uom/uom.js
rename to erpnext/setup/doctype/uom/uom.js
diff --git a/setup/doctype/uom/uom.py b/erpnext/setup/doctype/uom/uom.py
similarity index 100%
rename from setup/doctype/uom/uom.py
rename to erpnext/setup/doctype/uom/uom.py
diff --git a/setup/doctype/uom/uom.txt b/erpnext/setup/doctype/uom/uom.txt
similarity index 100%
rename from setup/doctype/uom/uom.txt
rename to erpnext/setup/doctype/uom/uom.txt
diff --git a/setup/doctype/website_item_group/README.md b/erpnext/setup/doctype/website_item_group/README.md
similarity index 100%
rename from setup/doctype/website_item_group/README.md
rename to erpnext/setup/doctype/website_item_group/README.md
diff --git a/setup/doctype/website_item_group/__init__.py b/erpnext/setup/doctype/website_item_group/__init__.py
similarity index 100%
rename from setup/doctype/website_item_group/__init__.py
rename to erpnext/setup/doctype/website_item_group/__init__.py
diff --git a/setup/doctype/website_item_group/website_item_group.py b/erpnext/setup/doctype/website_item_group/website_item_group.py
similarity index 100%
rename from setup/doctype/website_item_group/website_item_group.py
rename to erpnext/setup/doctype/website_item_group/website_item_group.py
diff --git a/setup/doctype/website_item_group/website_item_group.txt b/erpnext/setup/doctype/website_item_group/website_item_group.txt
similarity index 100%
rename from setup/doctype/website_item_group/website_item_group.txt
rename to erpnext/setup/doctype/website_item_group/website_item_group.txt
diff --git a/startup/install.py b/erpnext/setup/install.py
similarity index 96%
rename from startup/install.py
rename to erpnext/setup/install.py
index 94a3f55..0f18ae5 100644
--- a/startup/install.py
+++ b/erpnext/setup/install.py
@@ -5,41 +5,15 @@
import webnotes
-def post_import():
- webnotes.conn.begin()
-
- # feature setup
+def after_install():
import_defaults()
import_country_and_currency()
-
- # home page
webnotes.conn.set_value('Control Panel', None, 'home_page', 'setup-wizard')
-
- # features
feature_setup()
-
- # all roles to Administrator
- from setup.page.setup_wizard.setup_wizard import add_all_roles_to
+ from erpnext.setup.page.setup_wizard.setup_wizard import add_all_roles_to
add_all_roles_to("Administrator")
-
webnotes.conn.commit()
-def feature_setup():
- """save global defaults and features setup"""
- bean = webnotes.bean("Features Setup", "Features Setup")
- bean.ignore_permissions = True
-
- # store value as 1 for all these fields
- flds = ['fs_item_serial_nos', 'fs_item_batch_nos', 'fs_brands', 'fs_item_barcode',
- 'fs_item_advanced', 'fs_packing_details', 'fs_item_group_in_details',
- 'fs_exports', 'fs_imports', 'fs_discounts', 'fs_purchase_discounts',
- 'fs_after_sales_installations', 'fs_projects', 'fs_sales_extras',
- 'fs_recurring_invoice', 'fs_pos', 'fs_manufacturing', 'fs_quality',
- 'fs_page_break', 'fs_more_info', 'fs_pos_view'
- ]
- bean.doc.fields.update(dict(zip(flds, [1]*len(flds))))
- bean.save()
-
def import_country_and_currency():
from webnotes.country_info import get_all
data = get_all()
@@ -138,4 +112,20 @@
if parent_link_field in bean.doc.fields and not bean.doc.fields.get(parent_link_field):
bean.ignore_mandatory = True
- bean.insert()
\ No newline at end of file
+ bean.insert()
+
+def feature_setup():
+ """save global defaults and features setup"""
+ bean = webnotes.bean("Features Setup", "Features Setup")
+ bean.ignore_permissions = True
+
+ # store value as 1 for all these fields
+ flds = ['fs_item_serial_nos', 'fs_item_batch_nos', 'fs_brands', 'fs_item_barcode',
+ 'fs_item_advanced', 'fs_packing_details', 'fs_item_group_in_details',
+ 'fs_exports', 'fs_imports', 'fs_discounts', 'fs_purchase_discounts',
+ 'fs_after_sales_installations', 'fs_projects', 'fs_sales_extras',
+ 'fs_recurring_invoice', 'fs_pos', 'fs_manufacturing', 'fs_quality',
+ 'fs_page_break', 'fs_more_info', 'fs_pos_view'
+ ]
+ bean.doc.fields.update(dict(zip(flds, [1]*len(flds))))
+ bean.save()
\ No newline at end of file
diff --git a/setup/page/__init__.py b/erpnext/setup/page/__init__.py
similarity index 100%
rename from setup/page/__init__.py
rename to erpnext/setup/page/__init__.py
diff --git a/setup/page/setup/__init__.py b/erpnext/setup/page/setup/__init__.py
similarity index 100%
rename from setup/page/setup/__init__.py
rename to erpnext/setup/page/setup/__init__.py
diff --git a/setup/page/setup/setup.js b/erpnext/setup/page/setup/setup.js
similarity index 98%
rename from setup/page/setup/setup.js
rename to erpnext/setup/page/setup/setup.js
index fc6afb4..fdde693 100644
--- a/setup/page/setup/setup.js
+++ b/erpnext/setup/page/setup/setup.js
@@ -175,7 +175,7 @@
}
return wn.call({
- method: "setup.page.setup.setup.get",
+ method: "erpnext.setup.page.setup.setup.get",
callback: function(r) {
if(r.message) {
body.empty();
diff --git a/setup/page/setup/setup.py b/erpnext/setup/page/setup/setup.py
similarity index 100%
rename from setup/page/setup/setup.py
rename to erpnext/setup/page/setup/setup.py
diff --git a/setup/page/setup/setup.txt b/erpnext/setup/page/setup/setup.txt
similarity index 100%
rename from setup/page/setup/setup.txt
rename to erpnext/setup/page/setup/setup.txt
diff --git a/setup/page/setup_wizard/__init__.py b/erpnext/setup/page/setup_wizard/__init__.py
similarity index 100%
rename from setup/page/setup_wizard/__init__.py
rename to erpnext/setup/page/setup_wizard/__init__.py
diff --git a/setup/page/setup_wizard/setup_wizard.css b/erpnext/setup/page/setup_wizard/setup_wizard.css
similarity index 100%
rename from setup/page/setup_wizard/setup_wizard.css
rename to erpnext/setup/page/setup_wizard/setup_wizard.css
diff --git a/erpnext/setup/page/setup_wizard/setup_wizard.js b/erpnext/setup/page/setup_wizard/setup_wizard.js
new file mode 100644
index 0000000..4c91727
--- /dev/null
+++ b/erpnext/setup/page/setup_wizard/setup_wizard.js
@@ -0,0 +1,445 @@
+wn.pages['setup-wizard'].onload = function(wrapper) {
+ if(sys_defaults.company) {
+ wn.set_route("desktop");
+ return;
+ }
+ $(".navbar:first").toggle(false);
+ $("body").css({"padding-top":"30px"});
+
+ var wizard_settings = {
+ page_name: "setup-wizard",
+ parent: wrapper,
+ on_complete: function(wiz) {
+ var values = wiz.get_values();
+ wiz.show_working();
+ wn.call({
+ method: "erpnext.setup.page.setup_wizard.setup_wizard.setup_account",
+ args: values,
+ callback: function(r) {
+ if(r.exc) {
+ var d = msgprint(wn._("There were errors."));
+ d.custom_onhide = function() {
+ wn.set_route(erpnext.wiz.page_name, "0");
+ }
+ } else {
+ wiz.show_complete();
+ setTimeout(function() {
+ if(user==="Administrator") {
+ msgprint(wn._("Login with your new User ID") + ":" + values.email);
+ setTimeout(function() {
+ wn.app.logout();
+ }, 2000);
+ } else {
+ window.location = "app.html";
+ }
+ }, 2000);
+ }
+ }
+ })
+ },
+ title: wn._("ERPNext Setup Guide"),
+ welcome_html: '<h1 class="text-muted text-center"><i class="icon-magic"></i></h1>\
+ <h2 class="text-center">'+wn._('ERPNext Setup')+'</h2>\
+ <p class="text-center">' +
+ wn._('Welcome to ERPNext. Over the next few minutes we will help you setup your ERPNext account. Try and fill in as much information as you have even if it takes a bit longer. It will save you a lot of time later. Good Luck!') +
+ '</p>',
+ working_html: '<h3 class="text-muted text-center"><i class="icon-refresh icon-spin"></i></h3>\
+ <h2 class="text-center">'+wn._('Setting up...')+'</h2>\
+ <p class="text-center">' +
+ wn._('Sit tight while your system is being setup. This may take a few moments.') +
+ '</p>',
+ complete_html: '<h1 class="text-muted text-center"><i class="icon-thumbs-up"></i></h1>\
+ <h2 class="text-center">'+wn._('Setup Complete!')+'</h2>\
+ <p class="text-center">' +
+ wn._('Your setup is complete. Refreshing...') +
+ '</p>',
+ slides: [
+ // User
+ {
+ title: wn._("The First User: You"),
+ icon: "icon-user",
+ fields: [
+ {"fieldname": "first_name", "label": wn._("First Name"), "fieldtype": "Data",
+ reqd:1},
+ {"fieldname": "last_name", "label": wn._("Last Name"), "fieldtype": "Data",
+ reqd:1},
+ {"fieldname": "email", "label": wn._("Email Id"), "fieldtype": "Data",
+ reqd:1, "description":"Your Login Id", "options":"Email"},
+ {"fieldname": "password", "label": wn._("Password"), "fieldtype": "Password",
+ reqd:1},
+ {fieldtype:"Attach Image", fieldname:"attach_profile",
+ label:"Attach Your Profile..."},
+ ],
+ help: wn._('The first user will become the System Manager (you can change that later).'),
+ onload: function(slide) {
+ if(user!=="Administrator") {
+ slide.form.fields_dict.password.$wrapper.toggle(false);
+ slide.form.fields_dict.email.$wrapper.toggle(false);
+ slide.form.fields_dict.first_name.set_input(wn.boot.profile.first_name);
+ slide.form.fields_dict.last_name.set_input(wn.boot.profile.last_name);
+
+ delete slide.form.fields_dict.email;
+ delete slide.form.fields_dict.password;
+ }
+ }
+ },
+
+ // Organization
+ {
+ title: wn._("The Organization"),
+ icon: "icon-building",
+ fields: [
+ {fieldname:'company_name', label: wn._('Company Name'), fieldtype:'Data', reqd:1,
+ placeholder: 'e.g. "My Company LLC"'},
+ {fieldname:'company_abbr', label: wn._('Company Abbreviation'), fieldtype:'Data',
+ placeholder:'e.g. "MC"',reqd:1},
+ {fieldname:'fy_start_date', label:'Financial Year Start Date', fieldtype:'Date',
+ description:'Your financial year begins on', reqd:1},
+ {fieldname:'fy_end_date', label:'Financial Year End Date', fieldtype:'Date',
+ description:'Your financial year ends on', reqd:1},
+ {fieldname:'company_tagline', label: wn._('What does it do?'), fieldtype:'Data',
+ placeholder:'e.g. "Build tools for builders"', reqd:1},
+ ],
+ help: wn._('The name of your company for which you are setting up this system.'),
+ onload: function(slide) {
+ slide.get_input("company_name").on("change", function() {
+ var parts = slide.get_input("company_name").val().split(" ");
+ var abbr = $.map(parts, function(p) { return p ? p.substr(0,1) : null }).join("");
+ slide.get_input("company_abbr").val(abbr.toUpperCase());
+ }).val(wn.boot.control_panel.company_name || "").trigger("change");
+
+ slide.get_input("fy_start_date").on("change", function() {
+ var year_end_date =
+ wn.datetime.add_days(wn.datetime.add_months(slide.get_input("fy_start_date").val(), 12), -1);
+ slide.get_input("fy_end_date").val(year_end_date);
+ });
+ }
+ },
+
+ // Country
+ {
+ title: wn._("Country, Timezone and Currency"),
+ icon: "icon-flag",
+ fields: [
+ {fieldname:'country', label: wn._('Country'), reqd:1,
+ options: "", fieldtype: 'Select'},
+ {fieldname:'currency', label: wn._('Default Currency'), reqd:1,
+ options: "", fieldtype: 'Select'},
+ {fieldname:'timezone', label: wn._('Time Zone'), reqd:1,
+ options: "", fieldtype: 'Select'},
+ ],
+ help: wn._('Select your home country and check the timezone and currency.'),
+ onload: function(slide, form) {
+ wn.call({
+ method:"webnotes.country_info.get_country_timezone_info",
+ callback: function(data) {
+ erpnext.country_info = data.message.country_info;
+ erpnext.all_timezones = data.message.all_timezones;
+ slide.get_input("country").empty()
+ .add_options([""].concat(keys(erpnext.country_info).sort()));
+ slide.get_input("currency").empty()
+ .add_options(wn.utils.unique([""].concat($.map(erpnext.country_info,
+ function(opts, country) { return opts.currency; }))).sort());
+ slide.get_input("timezone").empty()
+ .add_options([""].concat(erpnext.all_timezones));
+ }
+ })
+
+ slide.get_input("country").on("change", function() {
+ var country = slide.get_input("country").val();
+ var $timezone = slide.get_input("timezone");
+ $timezone.empty();
+ // add country specific timezones first
+ if(country){
+ var timezone_list = erpnext.country_info[country].timezones || [];
+ $timezone.add_options(timezone_list.sort());
+ slide.get_input("currency").val(erpnext.country_info[country].currency);
+ }
+ // add all timezones at the end, so that user has the option to change it to any timezone
+ $timezone.add_options([""].concat(erpnext.all_timezones));
+ });
+ }
+ },
+
+ // Logo
+ {
+ icon: "icon-bookmark",
+ title: wn._("Logo and Letter Heads"),
+ help: wn._('Upload your letter head and logo - you can edit them later.'),
+ fields: [
+ {fieldtype:"Attach Image", fieldname:"attach_letterhead", label:"Attach Letterhead..."},
+ {fieldtype:"Attach Image", fieldname:"attach_logo", label:"Attach Logo..."},
+ ],
+ },
+
+ // Taxes
+ {
+ icon: "icon-money",
+ "title": wn._("Add Taxes"),
+ "help": wn._("List your tax heads (e.g. VAT, Excise) (upto 3) and their standard rates. This will create a standard template, you can edit and add more later."),
+ "fields": [],
+ },
+
+ // Customers
+ {
+ icon: "icon-group",
+ "title": wn._("Your Customers"),
+ "help": wn._("List a few of your customers. They could be organizations or individuals."),
+ "fields": [],
+ },
+
+ // Items to Sell
+ {
+ icon: "icon-barcode",
+ "title": wn._("Your Products or Services"),
+ "help": wn._("List your products or services that you sell to your customers. Make sure to check the Item Group, Unit of Measure and other properties when you start."),
+ "fields": [],
+ },
+
+ // Suppliers
+ {
+ icon: "icon-group",
+ "title": wn._("Your Suppliers"),
+ "help": wn._("List a few of your suppliers. They could be organizations or individuals."),
+ "fields": [],
+ },
+
+ // Items to Buy
+ {
+ icon: "icon-barcode",
+ "title": wn._("Products or Services You Buy"),
+ "help": wn._("List a few products or services you buy from your suppliers or vendors. If these are same as your products, then do not add them."),
+ "fields": [],
+ },
+
+ ]
+ }
+
+ // taxes
+ for(var i=1; i<4; i++) {
+ wizard_settings.slides[4].fields = wizard_settings.slides[4].fields.concat([
+ {fieldtype:"Data", fieldname:"tax_"+ i, label:"Tax " + 1, placeholder:"e.g. VAT"},
+ {fieldtype:"Column Break"},
+ {fieldtype:"Data", fieldname:"tax_rate_i", label:"Rate (%)", placeholder:"e.g. 5"},
+ {fieldtype:"Section Break"},
+ ])
+ }
+
+ // customers
+ for(var i=1; i<6; i++) {
+ wizard_settings.slides[5].fields = wizard_settings.slides[5].fields.concat([
+ {fieldtype:"Data", fieldname:"customer_" + i, label:"Customer " + i,
+ placeholder:"Customer Name"},
+ {fieldtype:"Column Break"},
+ {fieldtype:"Data", fieldname:"customer_contact_" + i,
+ label:"Contact", placeholder:"Contact Name"},
+ {fieldtype:"Section Break"}
+ ])
+ }
+
+ for(var i=1; i<6; i++) {
+ wizard_settings.slides[6].fields = wizard_settings.slides[6].fields.concat([
+ {fieldtype:"Data", fieldname:"item_" + i, label:"Item " + 1,
+ placeholder:"A Product or Service"},
+ {fieldtype:"Column Break"},
+ {fieldtype:"Attach", fieldname:"item_img_" + i, label:"Attach Image..."},
+ {fieldtype:"Section Break"},
+ {fieldtype:"Column Break"},
+ {fieldtype:"Select", label:"Group", fieldname:"item_group_" + i,
+ options:["Products", "Services", "Raw Material", "Sub Assemblies"]},
+ {fieldtype:"Column Break"},
+ {fieldtype:"Select", fieldname:"item_uom_" + i, label:"UOM",
+ options:["Unit", "Nos", "Box", "Pair", "Kg", "Set", "Hour", "Minute"]},
+ {fieldtype:"Section Break"}
+ ])
+ }
+
+ for(var i=1; i<6; i++) {
+ wizard_settings.slides[7].fields = wizard_settings.slides[7].fields.concat([
+ {fieldtype:"Data", fieldname:"supplier_" + i, label:"Supplier " + i,
+ placeholder:"Supplier Name"},
+ {fieldtype:"Column Break"},
+ {fieldtype:"Data", fieldname:"supplier_contact_" + i,
+ label:"Contact", placeholder:"Contact Name"},
+ {fieldtype:"Section Break"}
+ ])
+ }
+
+ for(var i=1; i<6; i++) {
+ wizard_settings.slides[8].fields = wizard_settings.slides[8].fields.concat([
+ {fieldtype:"Data", fieldname:"item_buy_" + i, label:"Item " + i,
+ placeholder:"A Product or Service"},
+ {fieldtype:"Column Break"},
+ {fieldtype:"Section Break"},
+ {fieldtype:"Column Break"},
+ {fieldtype:"Select", fieldname:"item_buy_group_" + i, label: "Group",
+ options:["Raw Material", "Consumable", "Sub Assemblies", "Services", "Products"]},
+ {fieldtype:"Column Break"},
+ {fieldtype:"Select", fieldname:"item_buy_uom_" + i, label: "UOM",
+ options:["Unit", "Nos", "Box", "Pair", "Kg", "Set", "Hour", "Minute"]},
+ {fieldtype:"Section Break"},
+ ])
+ }
+
+ erpnext.wiz = new wn.wiz.Wizard(wizard_settings)
+}
+
+wn.pages['setup-wizard'].onshow = function(wrapper) {
+ if(wn.get_route()[1])
+ erpnext.wiz.show(wn.get_route()[1]);
+}
+
+wn.provide("wn.wiz");
+
+wn.wiz.Wizard = Class.extend({
+ init: function(opts) {
+ $.extend(this, opts);
+ this.slides = this.slides;
+ this.slide_dict = {};
+ this.show_welcome();
+ },
+ get_message: function(html) {
+ return $(repl('<div class="panel panel-default">\
+ <div class="panel-body" style="padding: 40px;">%(html)s</div>\
+ </div>', {html:html}))
+ },
+ show_welcome: function() {
+ if(this.$welcome)
+ return;
+ var me = this;
+ this.$welcome = this.get_message(this.welcome_html +
+ '<br><p class="text-center"><button class="btn btn-primary">'+wn._("Start")+'</button></p>')
+ .appendTo(this.parent);
+
+ this.$welcome.find(".btn").click(function() {
+ me.$welcome.toggle(false);
+ me.welcomed = true;
+ wn.set_route(me.page_name, "0");
+ })
+
+ this.current_slide = {"$wrapper": this.$welcome};
+ },
+ show_working: function() {
+ this.hide_current_slide();
+ wn.set_route(this.page_name);
+ this.current_slide = {"$wrapper": this.get_message(this.working_html).appendTo(this.parent)};
+ },
+ show_complete: function() {
+ this.hide_current_slide();
+ this.current_slide = {"$wrapper": this.get_message(this.complete_html).appendTo(this.parent)};
+ },
+ show: function(id) {
+ if(!this.welcomed) {
+ wn.set_route(this.page_name);
+ return;
+ }
+ id = cint(id);
+ if(this.current_slide && this.current_slide.id===id)
+ return;
+ if(!this.slide_dict[id]) {
+ this.slide_dict[id] = new wn.wiz.WizardSlide($.extend(this.slides[id], {wiz:this, id:id}));
+ this.slide_dict[id].make();
+ }
+
+ this.hide_current_slide();
+
+ this.current_slide = this.slide_dict[id];
+ this.current_slide.$wrapper.toggle(true);
+ },
+ hide_current_slide: function() {
+ if(this.current_slide) {
+ this.current_slide.$wrapper.toggle(false);
+ this.current_slide = null;
+ }
+ },
+ get_values: function() {
+ var values = {};
+ $.each(this.slide_dict, function(id, slide) {
+ $.extend(values, slide.values)
+ })
+ return values;
+ }
+});
+
+wn.wiz.WizardSlide = Class.extend({
+ init: function(opts) {
+ $.extend(this, opts);
+ },
+ make: function() {
+ var me = this;
+ this.$wrapper = $(repl('<div class="panel panel-default">\
+ <div class="panel-heading">\
+ <div class="panel-title row">\
+ <div class="col-sm-8">\
+ <i class="%(icon)s text-muted"></i> %(title)s</div>\
+ <div class="col-sm-4 text-right"><a class="prev-btn hide">Previous</a> \
+ <a class="next-btn hide">Next</a> \
+ <a class="complete-btn hide"><b>Complete Setup</b></a>\
+ </div>\
+ </div>\
+ </div>\
+ <div class="panel-body">\
+ <div class="progress">\
+ <div class="progress-bar" style="width: %(width)s%"></div>\
+ </div>\
+ <br>\
+ <div class="row">\
+ <div class="col-sm-8 form"></div>\
+ <div class="col-sm-4 help">\
+ <p class="text-muted">%(help)s</p>\
+ </div>\
+ </div>\
+ <hr>\
+ <div class="footer"></div>\
+ </div>\
+ </div>', {help:this.help, title:this.title, main_title:this.wiz.title, step: this.id + 1,
+ width: (flt(this.id + 1) / (this.wiz.slides.length+1)) * 100, icon:this.icon}))
+ .appendTo(this.wiz.parent);
+
+ this.body = this.$wrapper.find(".form")[0];
+
+ if(this.fields) {
+ this.form = new wn.ui.FieldGroup({
+ fields: this.fields,
+ body: this.body,
+ no_submit_on_enter: true
+ });
+ this.form.make();
+ } else {
+ $(this.body).html(this.html)
+ }
+
+ if(this.id > 0) {
+ this.$prev = this.$wrapper.find('.prev-btn').removeClass("hide")
+ .click(function() {
+ wn.set_route(me.wiz.page_name, me.id-1 + "");
+ })
+ .css({"margin-right": "10px"});
+ }
+ if(this.id+1 < this.wiz.slides.length) {
+ this.$next = this.$wrapper.find('.next-btn').removeClass("hide")
+ .click(function() {
+ me.values = me.form.get_values();
+ if(me.values===null)
+ return;
+ wn.set_route(me.wiz.page_name, me.id+1 + "");
+ })
+ } else {
+ this.$complete = this.$wrapper.find('.complete-btn').removeClass("hide")
+ .click(function() {
+ me.values = me.form.get_values();
+ if(me.values===null)
+ return;
+ me.wiz.on_complete(me.wiz);
+ })
+ }
+
+ if(this.onload) {
+ this.onload(this);
+ }
+
+ },
+ get_input: function(fn) {
+ return this.form.get_input(fn);
+ }
+})
\ No newline at end of file
diff --git a/setup/page/setup_wizard/setup_wizard.py b/erpnext/setup/page/setup_wizard/setup_wizard.py
similarity index 98%
rename from setup/page/setup_wizard/setup_wizard.py
rename to erpnext/setup/page/setup_wizard/setup_wizard.py
index c1d3571..6298973 100644
--- a/setup/page/setup_wizard/setup_wizard.py
+++ b/erpnext/setup/page/setup_wizard/setup_wizard.py
@@ -169,8 +169,8 @@
def create_feed_and_todo():
"""update activty feed and create todo for creation of item, customer, vendor"""
- import home
- home.make_feed('Comment', 'ToDo', '', webnotes.session['user'],
+ from erpnext.home import make_feed
+ make_feed('Comment', 'ToDo', '', webnotes.session['user'],
'ERNext Setup Complete!', '#6B24B3')
def create_email_digest():
@@ -342,7 +342,7 @@
def create_territories():
"""create two default territories, one for home country and one named Rest of the World"""
- from setup.utils import get_root_of
+ from erpnext.setup.utils import get_root_of
country = webnotes.conn.get_value("Control Panel", None, "country")
root_territory = get_root_of("Territory")
for name in (country, "Rest Of The World"):
diff --git a/setup/page/setup_wizard/setup_wizard.txt b/erpnext/setup/page/setup_wizard/setup_wizard.txt
similarity index 100%
rename from setup/page/setup_wizard/setup_wizard.txt
rename to erpnext/setup/page/setup_wizard/setup_wizard.txt
diff --git a/setup/page/setup_wizard/test_setup_data.py b/erpnext/setup/page/setup_wizard/test_setup_data.py
similarity index 100%
rename from setup/page/setup_wizard/test_setup_data.py
rename to erpnext/setup/page/setup_wizard/test_setup_data.py
diff --git a/setup/page/setup_wizard/test_setup_wizard.py b/erpnext/setup/page/setup_wizard/test_setup_wizard.py
similarity index 68%
rename from setup/page/setup_wizard/test_setup_wizard.py
rename to erpnext/setup/page/setup_wizard/test_setup_wizard.py
index fe0904d..a4e5c29 100644
--- a/setup/page/setup_wizard/test_setup_wizard.py
+++ b/erpnext/setup/page/setup_wizard/test_setup_wizard.py
@@ -4,8 +4,8 @@
from __future__ import unicode_literals
import webnotes
-from setup.page.setup_wizard.test_setup_data import args
-from setup.page.setup_wizard.setup_wizard import setup_account
+from erpnext.setup.page.setup_wizard.test_setup_data import args
+from erpnext.setup.page.setup_wizard.setup_wizard import setup_account
if __name__=="__main__":
webnotes.connect()
diff --git a/setup/report/__init__.py b/erpnext/setup/report/__init__.py
similarity index 100%
rename from setup/report/__init__.py
rename to erpnext/setup/report/__init__.py
diff --git a/setup/report/item_wise_price_list_rate/__init__.py b/erpnext/setup/report/item_wise_price_list_rate/__init__.py
similarity index 100%
rename from setup/report/item_wise_price_list_rate/__init__.py
rename to erpnext/setup/report/item_wise_price_list_rate/__init__.py
diff --git a/setup/report/item_wise_price_list_rate/item_wise_price_list_rate.txt b/erpnext/setup/report/item_wise_price_list_rate/item_wise_price_list_rate.txt
similarity index 100%
rename from setup/report/item_wise_price_list_rate/item_wise_price_list_rate.txt
rename to erpnext/setup/report/item_wise_price_list_rate/item_wise_price_list_rate.txt
diff --git a/setup/utils.py b/erpnext/setup/utils.py
similarity index 100%
rename from setup/utils.py
rename to erpnext/setup/utils.py
diff --git a/startup/__init__.py b/erpnext/startup/__init__.py
similarity index 100%
rename from startup/__init__.py
rename to erpnext/startup/__init__.py
diff --git a/startup/boot.py b/erpnext/startup/boot.py
similarity index 97%
rename from startup/boot.py
rename to erpnext/startup/boot.py
index a8dbf81..e28e5ba 100644
--- a/startup/boot.py
+++ b/erpnext/startup/boot.py
@@ -4,7 +4,6 @@
from __future__ import unicode_literals
import webnotes
-import home
def boot_session(bootinfo):
"""boot session - send website info if guest"""
@@ -48,7 +47,6 @@
where ifnull(enabled,0)=1""", as_dict=1, update={"doctype":":Currency"})
def get_letter_heads():
- """load letter heads with startup"""
import webnotes
ret = webnotes.conn.sql("""select name, content from `tabLetter Head`
where ifnull(disabled,0)=0""")
diff --git a/startup/event_handlers.py b/erpnext/startup/event_handlers.py
similarity index 81%
rename from startup/event_handlers.py
rename to erpnext/startup/event_handlers.py
index f0323ea..262771d 100644
--- a/startup/event_handlers.py
+++ b/erpnext/startup/event_handlers.py
@@ -4,9 +4,8 @@
from __future__ import unicode_literals
import webnotes
-import home
-def on_login_post_session(login_manager):
+def on_session_creation(login_manager):
"""
called after login
update login_from and delete parallel sessions
@@ -25,13 +24,13 @@
from webnotes.utils import nowtime
from webnotes.profile import get_user_fullname
webnotes.conn.begin()
- home.make_feed('Login', 'Profile', login_manager.user, login_manager.user,
+ make_feed('Login', 'Profile', login_manager.user, login_manager.user,
'%s logged in at %s' % (get_user_fullname(login_manager.user), nowtime()),
login_manager.user=='Administrator' and '#8CA2B3' or '#1B750D')
webnotes.conn.commit()
if webnotes.conn.get_value("Profile", webnotes.session.user, "user_type") == "Website User":
- from selling.utils.cart import set_cart_count
+ from erpnext.selling.utils.cart import set_cart_count
set_cart_count()
def on_logout(login_manager):
@@ -62,14 +61,4 @@
webnotes.msgprint(msg)
webnotes.response['message'] = 'Account Expired'
- raise webnotes.AuthenticationError
-
-def on_build():
- from home.page.latest_updates import latest_updates
- latest_updates.make()
-
-def comment_added(doc):
- """add comment to feed"""
- home.make_feed('Comment', doc.comment_doctype, doc.comment_docname, doc.comment_by,
- '<i>"' + doc.comment + '"</i>', '#6B24B3')
-
+ raise webnotes.AuthenticationError
diff --git a/erpnext/startup/notifications.py b/erpnext/startup/notifications.py
new file mode 100644
index 0000000..d4cb4fa
--- /dev/null
+++ b/erpnext/startup/notifications.py
@@ -0,0 +1,35 @@
+# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import webnotes
+
+def get_notification_config():
+ return { "for_doctype":
+ {
+ "Support Ticket": {"status":"Open"},
+ "Customer Issue": {"status":"Open"},
+ "Task": {"status":"Open"},
+ "Lead": {"status":"Open"},
+ "Contact": {"status":"Open"},
+ "Opportunity": {"docstatus":0},
+ "Quotation": {"docstatus":0},
+ "Sales Order": {"docstatus":0},
+ "Journal Voucher": {"docstatus":0},
+ "Sales Invoice": {"docstatus":0},
+ "Purchase Invoice": {"docstatus":0},
+ "Leave Application": {"status":"Open"},
+ "Expense Claim": {"approval_status":"Draft"},
+ "Job Applicant": {"status":"Open"},
+ "Purchase Receipt": {"docstatus":0},
+ "Delivery Note": {"docstatus":0},
+ "Stock Entry": {"docstatus":0},
+ "Material Request": {"docstatus":0},
+ "Purchase Order": {"docstatus":0},
+ "Production Order": {"docstatus":0},
+ "BOM": {"docstatus":0},
+ "Timesheet": {"docstatus":0},
+ "Time Log": {"status":"Draft"},
+ "Time Log Batch": {"status":"Draft"},
+ }
+ }
\ No newline at end of file
diff --git a/startup/report_data_map.py b/erpnext/startup/report_data_map.py
similarity index 100%
rename from startup/report_data_map.py
rename to erpnext/startup/report_data_map.py
diff --git a/startup/webutils.py b/erpnext/startup/webutils.py
similarity index 96%
rename from startup/webutils.py
rename to erpnext/startup/webutils.py
index 9e18d4e..ef8c88b 100644
--- a/startup/webutils.py
+++ b/erpnext/startup/webutils.py
@@ -4,7 +4,7 @@
import webnotes
from webnotes.utils import cint
-def get_website_settings(context):
+def update_website_context(context):
post_login = []
cart_enabled = cint(webnotes.conn.get_default("shopping_cart_enabled"))
if cart_enabled:
diff --git a/stock/Print Format/Delivery Note Classic/Delivery Note Classic.txt b/erpnext/stock/Print Format/Delivery Note Classic/Delivery Note Classic.txt
similarity index 100%
rename from stock/Print Format/Delivery Note Classic/Delivery Note Classic.txt
rename to erpnext/stock/Print Format/Delivery Note Classic/Delivery Note Classic.txt
diff --git a/stock/Print Format/Delivery Note Modern/Delivery Note Modern.txt b/erpnext/stock/Print Format/Delivery Note Modern/Delivery Note Modern.txt
similarity index 100%
rename from stock/Print Format/Delivery Note Modern/Delivery Note Modern.txt
rename to erpnext/stock/Print Format/Delivery Note Modern/Delivery Note Modern.txt
diff --git a/stock/Print Format/Delivery Note Packing List Wise/Delivery Note Packing List Wise.txt b/erpnext/stock/Print Format/Delivery Note Packing List Wise/Delivery Note Packing List Wise.txt
similarity index 100%
rename from stock/Print Format/Delivery Note Packing List Wise/Delivery Note Packing List Wise.txt
rename to erpnext/stock/Print Format/Delivery Note Packing List Wise/Delivery Note Packing List Wise.txt
diff --git a/stock/Print Format/Delivery Note Spartan/Delivery Note Spartan.txt b/erpnext/stock/Print Format/Delivery Note Spartan/Delivery Note Spartan.txt
similarity index 100%
rename from stock/Print Format/Delivery Note Spartan/Delivery Note Spartan.txt
rename to erpnext/stock/Print Format/Delivery Note Spartan/Delivery Note Spartan.txt
diff --git a/stock/Print Format/Purchase Receipt Format/Purchase Receipt Format.txt b/erpnext/stock/Print Format/Purchase Receipt Format/Purchase Receipt Format.txt
similarity index 100%
rename from stock/Print Format/Purchase Receipt Format/Purchase Receipt Format.txt
rename to erpnext/stock/Print Format/Purchase Receipt Format/Purchase Receipt Format.txt
diff --git a/stock/README.md b/erpnext/stock/README.md
similarity index 100%
rename from stock/README.md
rename to erpnext/stock/README.md
diff --git a/stock/__init__.py b/erpnext/stock/__init__.py
similarity index 100%
rename from stock/__init__.py
rename to erpnext/stock/__init__.py
diff --git a/stock/doctype/__init__.py b/erpnext/stock/doctype/__init__.py
similarity index 100%
rename from stock/doctype/__init__.py
rename to erpnext/stock/doctype/__init__.py
diff --git a/stock/doctype/batch/README.md b/erpnext/stock/doctype/batch/README.md
similarity index 100%
rename from stock/doctype/batch/README.md
rename to erpnext/stock/doctype/batch/README.md
diff --git a/stock/doctype/batch/__init__.py b/erpnext/stock/doctype/batch/__init__.py
similarity index 100%
rename from stock/doctype/batch/__init__.py
rename to erpnext/stock/doctype/batch/__init__.py
diff --git a/stock/doctype/batch/batch.js b/erpnext/stock/doctype/batch/batch.js
similarity index 83%
rename from stock/doctype/batch/batch.js
rename to erpnext/stock/doctype/batch/batch.js
index 51e7470..cc142ed 100644
--- a/stock/doctype/batch/batch.js
+++ b/erpnext/stock/doctype/batch/batch.js
@@ -3,7 +3,7 @@
cur_frm.fields_dict['item'].get_query = function(doc, cdt, cdn) {
return {
- query:"controllers.queries.item_query",
+ query: "erpnext.controllers.queries.item_query",
filters:{
'is_stock_item': 'Yes'
}
diff --git a/stock/doctype/batch/batch.py b/erpnext/stock/doctype/batch/batch.py
similarity index 100%
rename from stock/doctype/batch/batch.py
rename to erpnext/stock/doctype/batch/batch.py
diff --git a/stock/doctype/batch/batch.txt b/erpnext/stock/doctype/batch/batch.txt
similarity index 100%
rename from stock/doctype/batch/batch.txt
rename to erpnext/stock/doctype/batch/batch.txt
diff --git a/stock/doctype/bin/README.md b/erpnext/stock/doctype/bin/README.md
similarity index 100%
rename from stock/doctype/bin/README.md
rename to erpnext/stock/doctype/bin/README.md
diff --git a/stock/doctype/bin/__init__.py b/erpnext/stock/doctype/bin/__init__.py
similarity index 100%
rename from stock/doctype/bin/__init__.py
rename to erpnext/stock/doctype/bin/__init__.py
diff --git a/stock/doctype/bin/bin.py b/erpnext/stock/doctype/bin/bin.py
similarity index 97%
rename from stock/doctype/bin/bin.py
rename to erpnext/stock/doctype/bin/bin.py
index 73b1cac..1acb3aa 100644
--- a/stock/doctype/bin/bin.py
+++ b/erpnext/stock/doctype/bin/bin.py
@@ -33,7 +33,7 @@
self.update_qty(args)
if args.get("actual_qty"):
- from stock.stock_ledger import update_entries_after
+ from erpnext.stock.stock_ledger import update_entries_after
if not args.get("posting_date"):
args["posting_date"] = nowdate()
diff --git a/stock/doctype/bin/bin.txt b/erpnext/stock/doctype/bin/bin.txt
similarity index 100%
rename from stock/doctype/bin/bin.txt
rename to erpnext/stock/doctype/bin/bin.txt
diff --git a/stock/doctype/delivery_note/README.md b/erpnext/stock/doctype/delivery_note/README.md
similarity index 100%
rename from stock/doctype/delivery_note/README.md
rename to erpnext/stock/doctype/delivery_note/README.md
diff --git a/stock/doctype/delivery_note/__init__.py b/erpnext/stock/doctype/delivery_note/__init__.py
similarity index 100%
rename from stock/doctype/delivery_note/__init__.py
rename to erpnext/stock/doctype/delivery_note/__init__.py
diff --git a/stock/doctype/delivery_note/delivery_note.js b/erpnext/stock/doctype/delivery_note/delivery_note.js
similarity index 92%
rename from stock/doctype/delivery_note/delivery_note.js
rename to erpnext/stock/doctype/delivery_note/delivery_note.js
index 7376f3c..56329a1 100644
--- a/stock/doctype/delivery_note/delivery_note.js
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.js
@@ -7,10 +7,10 @@
cur_frm.cscript.other_fname = "other_charges";
cur_frm.cscript.sales_team_fname = "sales_team";
-wn.require('app/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js');
-wn.require('app/utilities/doctype/sms_control/sms_control.js');
-wn.require('app/selling/sales_common.js');
-wn.require('app/accounts/doctype/sales_invoice/pos.js');
+{% include 'selling/sales_common.js' %};
+{% include 'accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js' %}
+{% include 'utilities/doctype/sms_control/sms_control.js' %}
+{% include 'accounts/doctype/sales_invoice/pos.js' %}
wn.provide("erpnext.stock");
erpnext.stock.DeliveryNoteController = erpnext.selling.SellingController.extend({
@@ -52,7 +52,7 @@
cur_frm.add_custom_button(wn._('From Sales Order'),
function() {
wn.model.map_current_doc({
- method: "selling.doctype.sales_order.sales_order.make_delivery_note",
+ method: "erpnext.selling.doctype.sales_order.sales_order.make_delivery_note",
source_doctype: "Sales Order",
get_query_filters: {
docstatus: 1,
@@ -70,14 +70,14 @@
make_sales_invoice: function() {
wn.model.open_mapped_doc({
- method: "stock.doctype.delivery_note.delivery_note.make_sales_invoice",
+ method: "erpnext.stock.doctype.delivery_note.delivery_note.make_sales_invoice",
source_name: cur_frm.doc.name
})
},
make_installation_note: function() {
wn.model.open_mapped_doc({
- method: "stock.doctype.delivery_note.delivery_note.make_installation_note",
+ method: "erpnext.stock.doctype.delivery_note.delivery_note.make_installation_note",
source_name: cur_frm.doc.name
});
},
@@ -106,7 +106,7 @@
// ***************** Get project name *****************
cur_frm.fields_dict['project_name'].get_query = function(doc, cdt, cdn) {
return {
- query: "controllers.queries.get_project_name",
+ query: "erpnext.controllers.queries.get_project_name",
filters: {
'customer': doc.customer
}
diff --git a/stock/doctype/delivery_note/delivery_note.py b/erpnext/stock/doctype/delivery_note/delivery_note.py
similarity index 97%
rename from stock/doctype/delivery_note/delivery_note.py
rename to erpnext/stock/doctype/delivery_note/delivery_note.py
index b2149b1..be0b95f 100644
--- a/stock/doctype/delivery_note/delivery_note.py
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.py
@@ -10,8 +10,8 @@
from webnotes import msgprint, _
import webnotes.defaults
from webnotes.model.mapper import get_mapped_doclist
-from stock.utils import update_bin
-from controllers.selling_controller import SellingController
+from erpnext.stock.utils import update_bin
+from erpnext.controllers.selling_controller import SellingController
class DocType(SellingController):
def __init__(self, doc, doclist=[]):
@@ -61,8 +61,8 @@
def validate(self):
super(DocType, self).validate()
- import utilities
- utilities.validate_status(self.doc.status, ["Draft", "Submitted", "Cancelled"])
+ from erpnext.utilities import validate_status
+ validate_status(self.doc.status, ["Draft", "Submitted", "Cancelled"])
self.so_required()
self.validate_proj_cust()
@@ -73,7 +73,7 @@
self.update_current_stock()
self.validate_with_previous_doc()
- from stock.doctype.packed_item.packed_item import make_packing_list
+ from erpnext.stock.doctype.packed_item.packed_item import make_packing_list
self.doclist = make_packing_list(self, 'delivery_note_details')
self.doc.status = 'Draft'
diff --git a/stock/doctype/delivery_note/delivery_note.txt b/erpnext/stock/doctype/delivery_note/delivery_note.txt
similarity index 100%
rename from stock/doctype/delivery_note/delivery_note.txt
rename to erpnext/stock/doctype/delivery_note/delivery_note.txt
diff --git a/stock/doctype/delivery_note/test_delivery_note.py b/erpnext/stock/doctype/delivery_note/test_delivery_note.py
similarity index 90%
rename from stock/doctype/delivery_note/test_delivery_note.py
rename to erpnext/stock/doctype/delivery_note/test_delivery_note.py
index ae69db6..4213d19 100644
--- a/stock/doctype/delivery_note/test_delivery_note.py
+++ b/erpnext/stock/doctype/delivery_note/test_delivery_note.py
@@ -7,7 +7,7 @@
import webnotes
import webnotes.defaults
from webnotes.utils import cint
-from stock.doctype.purchase_receipt.test_purchase_receipt import get_gl_entries, set_perpetual_inventory, test_records as pr_test_records
+from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import get_gl_entries, set_perpetual_inventory, test_records as pr_test_records
def _insert_purchase_receipt(item_code=None):
if not item_code:
@@ -23,7 +23,7 @@
self.clear_stock_account_balance()
_insert_purchase_receipt()
- from stock.doctype.delivery_note.delivery_note import make_sales_invoice
+ from erpnext.stock.doctype.delivery_note.delivery_note import make_sales_invoice
_insert_purchase_receipt()
dn = webnotes.bean(copy=test_records[0]).insert()
@@ -75,7 +75,7 @@
stock_in_hand_account = webnotes.conn.get_value("Account",
{"master_name": dn.doclist[1].warehouse})
- from accounts.utils import get_balance_on
+ from erpnext.accounts.utils import get_balance_on
prev_bal = get_balance_on(stock_in_hand_account, dn.doc.posting_date)
dn.insert()
@@ -130,7 +130,7 @@
stock_in_hand_account = webnotes.conn.get_value("Account",
{"master_name": dn.doclist[1].warehouse})
- from accounts.utils import get_balance_on
+ from erpnext.accounts.utils import get_balance_on
prev_bal = get_balance_on(stock_in_hand_account, dn.doc.posting_date)
dn.insert()
@@ -156,8 +156,8 @@
set_perpetual_inventory(0)
def test_serialized(self):
- from stock.doctype.stock_entry.test_stock_entry import make_serialized_item
- from stock.doctype.serial_no.serial_no import get_serial_nos
+ from erpnext.stock.doctype.stock_entry.test_stock_entry import make_serialized_item
+ from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos
se = make_serialized_item()
serial_nos = get_serial_nos(se.doclist[1].serial_no)
@@ -177,7 +177,7 @@
return dn
def test_serialized_cancel(self):
- from stock.doctype.serial_no.serial_no import get_serial_nos
+ from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos
dn = self.test_serialized()
dn.cancel()
@@ -189,8 +189,8 @@
"delivery_document_no"))
def test_serialize_status(self):
- from stock.doctype.serial_no.serial_no import SerialNoStatusError, get_serial_nos
- from stock.doctype.stock_entry.test_stock_entry import make_serialized_item
+ from erpnext.stock.doctype.serial_no.serial_no import SerialNoStatusError, get_serial_nos
+ from erpnext.stock.doctype.stock_entry.test_stock_entry import make_serialized_item
se = make_serialized_item()
serial_nos = get_serial_nos(se.doclist[1].serial_no)
diff --git a/stock/doctype/delivery_note_item/README.md b/erpnext/stock/doctype/delivery_note_item/README.md
similarity index 100%
rename from stock/doctype/delivery_note_item/README.md
rename to erpnext/stock/doctype/delivery_note_item/README.md
diff --git a/stock/doctype/delivery_note_item/__init__.py b/erpnext/stock/doctype/delivery_note_item/__init__.py
similarity index 100%
rename from stock/doctype/delivery_note_item/__init__.py
rename to erpnext/stock/doctype/delivery_note_item/__init__.py
diff --git a/stock/doctype/delivery_note_item/delivery_note_item.py b/erpnext/stock/doctype/delivery_note_item/delivery_note_item.py
similarity index 100%
rename from stock/doctype/delivery_note_item/delivery_note_item.py
rename to erpnext/stock/doctype/delivery_note_item/delivery_note_item.py
diff --git a/stock/doctype/delivery_note_item/delivery_note_item.txt b/erpnext/stock/doctype/delivery_note_item/delivery_note_item.txt
similarity index 100%
rename from stock/doctype/delivery_note_item/delivery_note_item.txt
rename to erpnext/stock/doctype/delivery_note_item/delivery_note_item.txt
diff --git a/stock/doctype/item/README.md b/erpnext/stock/doctype/item/README.md
similarity index 100%
rename from stock/doctype/item/README.md
rename to erpnext/stock/doctype/item/README.md
diff --git a/stock/doctype/item/__init__.py b/erpnext/stock/doctype/item/__init__.py
similarity index 100%
rename from stock/doctype/item/__init__.py
rename to erpnext/stock/doctype/item/__init__.py
diff --git a/stock/doctype/item/item.js b/erpnext/stock/doctype/item/item.js
similarity index 97%
rename from stock/doctype/item/item.js
rename to erpnext/stock/doctype/item/item.js
index c9aa75e..1ee5e04 100644
--- a/stock/doctype/item/item.js
+++ b/erpnext/stock/doctype/item/item.js
@@ -151,11 +151,11 @@
cur_frm.fields_dict.item_customer_details.grid.get_field("customer_name").get_query =
function(doc,cdt,cdn) {
- return{ query:"controllers.queries.customer_query" } }
+ return{ query: "erpnext.controllers.queries.customer_query" } }
cur_frm.fields_dict.item_supplier_details.grid.get_field("supplier").get_query =
function(doc,cdt,cdn) {
- return{ query:"controllers.queries.supplier_query" } }
+ return{ query: "erpnext.controllers.queries.supplier_query" } }
cur_frm.cscript.copy_from_item_group = function(doc) {
wn.model.with_doc("Item Group", doc.item_group, function() {
diff --git a/stock/doctype/item/item.py b/erpnext/stock/doctype/item/item.py
similarity index 92%
rename from stock/doctype/item/item.py
rename to erpnext/stock/doctype/item/item.py
index 4ebf9c4..f9763cd 100644
--- a/stock/doctype/item/item.py
+++ b/erpnext/stock/doctype/item/item.py
@@ -90,9 +90,7 @@
(self.doc.stock_uom, self.doc.name))
if not matched:
- webnotes.throw(_("Default Unit of Measure can not be changed directly \
- because you have already made some transaction(s) with another UOM.\n \
- To change default UOM, use 'UOM Replace Utility' tool under Stock module."))
+ webnotes.throw(_("Default Unit of Measure can not be changed directly because you have already made some transaction(s) with another UOM. To change default UOM, use 'UOM Replace Utility' tool under Stock module."))
def validate_conversion_factor(self):
check_list = []
@@ -104,12 +102,10 @@
check_list.append(cstr(d.uom))
if d.uom and cstr(d.uom) == cstr(self.doc.stock_uom) and flt(d.conversion_factor) != 1:
- msgprint(_("""Conversion Factor of UOM: %s should be equal to 1.
- As UOM: %s is Stock UOM of Item: %s.""" %
+ msgprint(_("""Conversion Factor of UOM: %s should be equal to 1. As UOM: %s is Stock UOM of Item: %s.""" %
(d.uom, d.uom, self.doc.name)), raise_exception=1)
elif d.uom and cstr(d.uom)!= self.doc.stock_uom and flt(d.conversion_factor) == 1:
- msgprint(_("""Conversion Factor of UOM: %s should not be equal to 1.
- As UOM: %s is not Stock UOM of Item: %s""" %
+ msgprint(_("""Conversion Factor of UOM: %s should not be equal to 1. As UOM: %s is not Stock UOM of Item: %s""" %
(d.uom, d.uom, self.doc.name)), raise_exception=1)
def validate_item_type(self):
@@ -180,9 +176,7 @@
vals.has_serial_no != self.doc.has_serial_no or
cstr(vals.valuation_method) != cstr(self.doc.valuation_method)):
if self.check_if_sle_exists() == "exists":
- webnotes.msgprint(_("As there are existing stock transactions for this \
- item, you can not change the values of 'Has Serial No', \
- 'Is Stock Item' and 'Valuation Method'"), raise_exception=1)
+ webnotes.throw(_("As there are existing stock transactions for this item, you can not change the values of 'Has Serial No', 'Is Stock Item' and 'Valuation Method'"))
def validate_item_type_for_reorder(self):
if self.doc.re_order_level or len(self.doclist.get({"parentfield": "item_reorder",
@@ -204,7 +198,7 @@
self.doc.name, raise_exception=1)
def update_website(self):
- from selling.utils.product import invalidate_cache_for
+ from erpnext.selling.utils.product import invalidate_cache_for
invalidate_cache_for(self.doc.item_group)
[invalidate_cache_for(d.item_group) for d in \
self.doclist.get({"doctype":"Website Item Group"})]
@@ -228,12 +222,12 @@
return { "tax_rate": webnotes.conn.get_value("Account", tax_type, "tax_rate") }
def get_context(self):
- from selling.utils.product import get_parent_item_groups
+ from erpnext.selling.utils.product import get_parent_item_groups
self.parent_groups = get_parent_item_groups(self.doc.item_group) + [{"name":self.doc.name}]
self.doc.title = self.doc.item_name
if self.doc.slideshow:
- from website.doctype.website_slideshow.website_slideshow import get_slideshow
+ from webnotes.website.doctype.website_slideshow.website_slideshow import get_slideshow
get_slideshow(self)
def get_file_details(self, arg = ''):
@@ -278,12 +272,12 @@
clear_cache(self.doc.page_name)
def set_last_purchase_rate(self, newdn):
- from buying.utils import get_last_purchase_details
+ from erpnext.buying.utils import get_last_purchase_details
last_purchase_rate = get_last_purchase_details(newdn).get("purchase_rate", 0)
webnotes.conn.set_value("Item", newdn, "last_purchase_rate", last_purchase_rate)
def recalculate_bin_qty(self, newdn):
- from utilities.repost_stock import repost_stock
+ from erpnext.utilities.repost_stock import repost_stock
webnotes.conn.auto_commit_on_many_writes = 1
webnotes.conn.set_default("allow_negative_stock", 1)
diff --git a/stock/doctype/item/item.txt b/erpnext/stock/doctype/item/item.txt
similarity index 100%
rename from stock/doctype/item/item.txt
rename to erpnext/stock/doctype/item/item.txt
diff --git a/stock/doctype/item/templates/__init__.py b/erpnext/stock/doctype/item/templates/__init__.py
similarity index 100%
rename from stock/doctype/item/templates/__init__.py
rename to erpnext/stock/doctype/item/templates/__init__.py
diff --git a/stock/doctype/item/test_item.py b/erpnext/stock/doctype/item/test_item.py
similarity index 98%
rename from stock/doctype/item/test_item.py
rename to erpnext/stock/doctype/item/test_item.py
index b8f6f9e..3cf1d5e 100644
--- a/stock/doctype/item/test_item.py
+++ b/erpnext/stock/doctype/item/test_item.py
@@ -10,7 +10,7 @@
class TestItem(unittest.TestCase):
def test_default_warehouse(self):
- from stock.doctype.item.item import WarehouseNotSet
+ from erpnext.stock.doctype.item.item import WarehouseNotSet
item = webnotes.bean(copy=test_records[0])
item.doc.is_stock_item = "Yes"
item.doc.default_warehouse = None
diff --git a/stock/doctype/item_customer_detail/README.md b/erpnext/stock/doctype/item_customer_detail/README.md
similarity index 100%
rename from stock/doctype/item_customer_detail/README.md
rename to erpnext/stock/doctype/item_customer_detail/README.md
diff --git a/stock/doctype/item_customer_detail/__init__.py b/erpnext/stock/doctype/item_customer_detail/__init__.py
similarity index 100%
rename from stock/doctype/item_customer_detail/__init__.py
rename to erpnext/stock/doctype/item_customer_detail/__init__.py
diff --git a/stock/doctype/item_customer_detail/item_customer_detail.py b/erpnext/stock/doctype/item_customer_detail/item_customer_detail.py
similarity index 100%
rename from stock/doctype/item_customer_detail/item_customer_detail.py
rename to erpnext/stock/doctype/item_customer_detail/item_customer_detail.py
diff --git a/stock/doctype/item_customer_detail/item_customer_detail.txt b/erpnext/stock/doctype/item_customer_detail/item_customer_detail.txt
similarity index 100%
rename from stock/doctype/item_customer_detail/item_customer_detail.txt
rename to erpnext/stock/doctype/item_customer_detail/item_customer_detail.txt
diff --git a/stock/doctype/item_price/README.md b/erpnext/stock/doctype/item_price/README.md
similarity index 100%
rename from stock/doctype/item_price/README.md
rename to erpnext/stock/doctype/item_price/README.md
diff --git a/stock/doctype/item_price/__init__.py b/erpnext/stock/doctype/item_price/__init__.py
similarity index 100%
rename from stock/doctype/item_price/__init__.py
rename to erpnext/stock/doctype/item_price/__init__.py
diff --git a/stock/doctype/item_price/item_price.js b/erpnext/stock/doctype/item_price/item_price.js
similarity index 100%
rename from stock/doctype/item_price/item_price.js
rename to erpnext/stock/doctype/item_price/item_price.js
diff --git a/stock/doctype/item_price/item_price.py b/erpnext/stock/doctype/item_price/item_price.py
similarity index 100%
rename from stock/doctype/item_price/item_price.py
rename to erpnext/stock/doctype/item_price/item_price.py
diff --git a/stock/doctype/item_price/item_price.txt b/erpnext/stock/doctype/item_price/item_price.txt
similarity index 100%
rename from stock/doctype/item_price/item_price.txt
rename to erpnext/stock/doctype/item_price/item_price.txt
diff --git a/stock/doctype/item_price/test_item_price.py b/erpnext/stock/doctype/item_price/test_item_price.py
similarity index 86%
rename from stock/doctype/item_price/test_item_price.py
rename to erpnext/stock/doctype/item_price/test_item_price.py
index 583b3de..bc695ea 100644
--- a/stock/doctype/item_price/test_item_price.py
+++ b/erpnext/stock/doctype/item_price/test_item_price.py
@@ -7,7 +7,7 @@
class TestItem(unittest.TestCase):
def test_duplicate_item(self):
- from stock.doctype.item_price.item_price import ItemPriceDuplicateItem
+ from erpnext.stock.doctype.item_price.item_price import ItemPriceDuplicateItem
bean = webnotes.bean(copy=test_records[0])
self.assertRaises(ItemPriceDuplicateItem, bean.insert)
diff --git a/stock/doctype/item_quality_inspection_parameter/README.md b/erpnext/stock/doctype/item_quality_inspection_parameter/README.md
similarity index 100%
rename from stock/doctype/item_quality_inspection_parameter/README.md
rename to erpnext/stock/doctype/item_quality_inspection_parameter/README.md
diff --git a/stock/doctype/item_quality_inspection_parameter/__init__.py b/erpnext/stock/doctype/item_quality_inspection_parameter/__init__.py
similarity index 100%
rename from stock/doctype/item_quality_inspection_parameter/__init__.py
rename to erpnext/stock/doctype/item_quality_inspection_parameter/__init__.py
diff --git a/stock/doctype/item_quality_inspection_parameter/item_quality_inspection_parameter.py b/erpnext/stock/doctype/item_quality_inspection_parameter/item_quality_inspection_parameter.py
similarity index 100%
rename from stock/doctype/item_quality_inspection_parameter/item_quality_inspection_parameter.py
rename to erpnext/stock/doctype/item_quality_inspection_parameter/item_quality_inspection_parameter.py
diff --git a/stock/doctype/item_quality_inspection_parameter/item_quality_inspection_parameter.txt b/erpnext/stock/doctype/item_quality_inspection_parameter/item_quality_inspection_parameter.txt
similarity index 100%
rename from stock/doctype/item_quality_inspection_parameter/item_quality_inspection_parameter.txt
rename to erpnext/stock/doctype/item_quality_inspection_parameter/item_quality_inspection_parameter.txt
diff --git a/stock/doctype/item_reorder/README.md b/erpnext/stock/doctype/item_reorder/README.md
similarity index 100%
rename from stock/doctype/item_reorder/README.md
rename to erpnext/stock/doctype/item_reorder/README.md
diff --git a/stock/doctype/item_reorder/__init__.py b/erpnext/stock/doctype/item_reorder/__init__.py
similarity index 100%
rename from stock/doctype/item_reorder/__init__.py
rename to erpnext/stock/doctype/item_reorder/__init__.py
diff --git a/stock/doctype/item_reorder/item_reorder.py b/erpnext/stock/doctype/item_reorder/item_reorder.py
similarity index 100%
rename from stock/doctype/item_reorder/item_reorder.py
rename to erpnext/stock/doctype/item_reorder/item_reorder.py
diff --git a/stock/doctype/item_reorder/item_reorder.txt b/erpnext/stock/doctype/item_reorder/item_reorder.txt
similarity index 100%
rename from stock/doctype/item_reorder/item_reorder.txt
rename to erpnext/stock/doctype/item_reorder/item_reorder.txt
diff --git a/stock/doctype/item_supplier/README.md b/erpnext/stock/doctype/item_supplier/README.md
similarity index 100%
rename from stock/doctype/item_supplier/README.md
rename to erpnext/stock/doctype/item_supplier/README.md
diff --git a/stock/doctype/item_supplier/__init__.py b/erpnext/stock/doctype/item_supplier/__init__.py
similarity index 100%
rename from stock/doctype/item_supplier/__init__.py
rename to erpnext/stock/doctype/item_supplier/__init__.py
diff --git a/stock/doctype/item_supplier/item_supplier.py b/erpnext/stock/doctype/item_supplier/item_supplier.py
similarity index 100%
rename from stock/doctype/item_supplier/item_supplier.py
rename to erpnext/stock/doctype/item_supplier/item_supplier.py
diff --git a/stock/doctype/item_supplier/item_supplier.txt b/erpnext/stock/doctype/item_supplier/item_supplier.txt
similarity index 100%
rename from stock/doctype/item_supplier/item_supplier.txt
rename to erpnext/stock/doctype/item_supplier/item_supplier.txt
diff --git a/stock/doctype/item_tax/README.md b/erpnext/stock/doctype/item_tax/README.md
similarity index 100%
rename from stock/doctype/item_tax/README.md
rename to erpnext/stock/doctype/item_tax/README.md
diff --git a/stock/doctype/item_tax/__init__.py b/erpnext/stock/doctype/item_tax/__init__.py
similarity index 100%
rename from stock/doctype/item_tax/__init__.py
rename to erpnext/stock/doctype/item_tax/__init__.py
diff --git a/stock/doctype/item_tax/item_tax.py b/erpnext/stock/doctype/item_tax/item_tax.py
similarity index 100%
rename from stock/doctype/item_tax/item_tax.py
rename to erpnext/stock/doctype/item_tax/item_tax.py
diff --git a/stock/doctype/item_tax/item_tax.txt b/erpnext/stock/doctype/item_tax/item_tax.txt
similarity index 100%
rename from stock/doctype/item_tax/item_tax.txt
rename to erpnext/stock/doctype/item_tax/item_tax.txt
diff --git a/stock/doctype/item_website_specification/README.md b/erpnext/stock/doctype/item_website_specification/README.md
similarity index 100%
rename from stock/doctype/item_website_specification/README.md
rename to erpnext/stock/doctype/item_website_specification/README.md
diff --git a/stock/doctype/item_website_specification/__init__.py b/erpnext/stock/doctype/item_website_specification/__init__.py
similarity index 100%
rename from stock/doctype/item_website_specification/__init__.py
rename to erpnext/stock/doctype/item_website_specification/__init__.py
diff --git a/stock/doctype/item_website_specification/item_website_specification.py b/erpnext/stock/doctype/item_website_specification/item_website_specification.py
similarity index 100%
rename from stock/doctype/item_website_specification/item_website_specification.py
rename to erpnext/stock/doctype/item_website_specification/item_website_specification.py
diff --git a/stock/doctype/item_website_specification/item_website_specification.txt b/erpnext/stock/doctype/item_website_specification/item_website_specification.txt
similarity index 100%
rename from stock/doctype/item_website_specification/item_website_specification.txt
rename to erpnext/stock/doctype/item_website_specification/item_website_specification.txt
diff --git a/stock/doctype/landed_cost_item/README.md b/erpnext/stock/doctype/landed_cost_item/README.md
similarity index 100%
rename from stock/doctype/landed_cost_item/README.md
rename to erpnext/stock/doctype/landed_cost_item/README.md
diff --git a/stock/doctype/landed_cost_item/__init__.py b/erpnext/stock/doctype/landed_cost_item/__init__.py
similarity index 100%
rename from stock/doctype/landed_cost_item/__init__.py
rename to erpnext/stock/doctype/landed_cost_item/__init__.py
diff --git a/stock/doctype/landed_cost_item/landed_cost_item.py b/erpnext/stock/doctype/landed_cost_item/landed_cost_item.py
similarity index 100%
rename from stock/doctype/landed_cost_item/landed_cost_item.py
rename to erpnext/stock/doctype/landed_cost_item/landed_cost_item.py
diff --git a/stock/doctype/landed_cost_item/landed_cost_item.txt b/erpnext/stock/doctype/landed_cost_item/landed_cost_item.txt
similarity index 100%
rename from stock/doctype/landed_cost_item/landed_cost_item.txt
rename to erpnext/stock/doctype/landed_cost_item/landed_cost_item.txt
diff --git a/stock/doctype/landed_cost_purchase_receipt/README.md b/erpnext/stock/doctype/landed_cost_purchase_receipt/README.md
similarity index 100%
rename from stock/doctype/landed_cost_purchase_receipt/README.md
rename to erpnext/stock/doctype/landed_cost_purchase_receipt/README.md
diff --git a/stock/doctype/landed_cost_purchase_receipt/__init__.py b/erpnext/stock/doctype/landed_cost_purchase_receipt/__init__.py
similarity index 100%
rename from stock/doctype/landed_cost_purchase_receipt/__init__.py
rename to erpnext/stock/doctype/landed_cost_purchase_receipt/__init__.py
diff --git a/stock/doctype/landed_cost_purchase_receipt/landed_cost_purchase_receipt.py b/erpnext/stock/doctype/landed_cost_purchase_receipt/landed_cost_purchase_receipt.py
similarity index 100%
rename from stock/doctype/landed_cost_purchase_receipt/landed_cost_purchase_receipt.py
rename to erpnext/stock/doctype/landed_cost_purchase_receipt/landed_cost_purchase_receipt.py
diff --git a/stock/doctype/landed_cost_purchase_receipt/landed_cost_purchase_receipt.txt b/erpnext/stock/doctype/landed_cost_purchase_receipt/landed_cost_purchase_receipt.txt
similarity index 100%
rename from stock/doctype/landed_cost_purchase_receipt/landed_cost_purchase_receipt.txt
rename to erpnext/stock/doctype/landed_cost_purchase_receipt/landed_cost_purchase_receipt.txt
diff --git a/stock/doctype/landed_cost_wizard/README.md b/erpnext/stock/doctype/landed_cost_wizard/README.md
similarity index 100%
rename from stock/doctype/landed_cost_wizard/README.md
rename to erpnext/stock/doctype/landed_cost_wizard/README.md
diff --git a/stock/doctype/landed_cost_wizard/__init__.py b/erpnext/stock/doctype/landed_cost_wizard/__init__.py
similarity index 100%
rename from stock/doctype/landed_cost_wizard/__init__.py
rename to erpnext/stock/doctype/landed_cost_wizard/__init__.py
diff --git a/stock/doctype/landed_cost_wizard/landed_cost_wizard.js b/erpnext/stock/doctype/landed_cost_wizard/landed_cost_wizard.js
similarity index 95%
rename from stock/doctype/landed_cost_wizard/landed_cost_wizard.js
rename to erpnext/stock/doctype/landed_cost_wizard/landed_cost_wizard.js
index 68f1bd0..86b34c0 100644
--- a/stock/doctype/landed_cost_wizard/landed_cost_wizard.js
+++ b/erpnext/stock/doctype/landed_cost_wizard/landed_cost_wizard.js
@@ -3,7 +3,7 @@
wn.provide("erpnext.stock");
-wn.require("public/app/js/controllers/stock_controller.js");
+wn.require("assets/erpnext/js/controllers/stock_controller.js");
erpnext.stock.LandedCostWizard = erpnext.stock.StockController.extend({
setup: function() {
diff --git a/stock/doctype/landed_cost_wizard/landed_cost_wizard.py b/erpnext/stock/doctype/landed_cost_wizard/landed_cost_wizard.py
similarity index 100%
rename from stock/doctype/landed_cost_wizard/landed_cost_wizard.py
rename to erpnext/stock/doctype/landed_cost_wizard/landed_cost_wizard.py
diff --git a/stock/doctype/landed_cost_wizard/landed_cost_wizard.txt b/erpnext/stock/doctype/landed_cost_wizard/landed_cost_wizard.txt
similarity index 100%
rename from stock/doctype/landed_cost_wizard/landed_cost_wizard.txt
rename to erpnext/stock/doctype/landed_cost_wizard/landed_cost_wizard.txt
diff --git a/stock/doctype/material_request/README.md b/erpnext/stock/doctype/material_request/README.md
similarity index 100%
rename from stock/doctype/material_request/README.md
rename to erpnext/stock/doctype/material_request/README.md
diff --git a/stock/doctype/material_request/__init__.py b/erpnext/stock/doctype/material_request/__init__.py
similarity index 100%
rename from stock/doctype/material_request/__init__.py
rename to erpnext/stock/doctype/material_request/__init__.py
diff --git a/stock/doctype/material_request/material_request.js b/erpnext/stock/doctype/material_request/material_request.js
similarity index 89%
rename from stock/doctype/material_request/material_request.js
rename to erpnext/stock/doctype/material_request/material_request.js
index 3ca95a4..31a5753 100644
--- a/stock/doctype/material_request/material_request.js
+++ b/erpnext/stock/doctype/material_request/material_request.js
@@ -4,8 +4,8 @@
cur_frm.cscript.tname = "Material Request Item";
cur_frm.cscript.fname = "indent_details";
-wn.require('app/utilities/doctype/sms_control/sms_control.js');
-wn.require('app/buying/doctype/purchase_common/purchase_common.js');
+{% include 'buying/doctype/purchase_common/purchase_common.js' %};
+{% include 'utilities/doctype/sms_control/sms_control.js' %}
erpnext.buying.MaterialRequestController = erpnext.buying.BuyingController.extend({
refresh: function(doc) {
@@ -49,7 +49,7 @@
cur_frm.add_custom_button(wn._('From Sales Order'),
function() {
wn.model.map_current_doc({
- method: "selling.doctype.sales_order.sales_order.make_material_request",
+ method: "erpnext.selling.doctype.sales_order.sales_order.make_material_request",
source_doctype: "Sales Order",
get_query_filters: {
docstatus: 1,
@@ -95,7 +95,7 @@
if(!values) return;
wn.call({
- method:"manufacturing.doctype.bom.bom.get_bom_items",
+ method: "erpnext.manufacturing.doctype.bom.bom.get_bom_items",
args: values,
callback: function(r) {
$.each(r.message, function(i, item) {
@@ -128,21 +128,21 @@
make_purchase_order: function() {
wn.model.open_mapped_doc({
- method: "stock.doctype.material_request.material_request.make_purchase_order",
+ method: "erpnext.stock.doctype.material_request.material_request.make_purchase_order",
source_name: cur_frm.doc.name
})
},
make_supplier_quotation: function() {
wn.model.open_mapped_doc({
- method: "stock.doctype.material_request.material_request.make_supplier_quotation",
+ method: "erpnext.stock.doctype.material_request.material_request.make_supplier_quotation",
source_name: cur_frm.doc.name
})
},
make_stock_entry: function() {
wn.model.open_mapped_doc({
- method: "stock.doctype.material_request.material_request.make_stock_entry",
+ method: "erpnext.stock.doctype.material_request.material_request.make_stock_entry",
source_name: cur_frm.doc.name
})
}
diff --git a/stock/doctype/material_request/material_request.py b/erpnext/stock/doctype/material_request/material_request.py
similarity index 97%
rename from stock/doctype/material_request/material_request.py
rename to erpnext/stock/doctype/material_request/material_request.py
index 50661a3..28ec508 100644
--- a/stock/doctype/material_request/material_request.py
+++ b/erpnext/stock/doctype/material_request/material_request.py
@@ -12,7 +12,7 @@
from webnotes.model.code import get_obj
from webnotes import msgprint, _
-from controllers.buying_controller import BuyingController
+from erpnext.controllers.buying_controller import BuyingController
class DocType(BuyingController):
def __init__(self, doc, doclist=[]):
self.doc = doc
@@ -68,8 +68,8 @@
if not self.doc.status:
self.doc.status = "Draft"
- import utilities
- utilities.validate_status(self.doc.status, ["Draft", "Submitted", "Stopped", "Cancelled"])
+ from erpnext.utilities import validate_status
+ validate_status(self.doc.status, ["Draft", "Submitted", "Stopped", "Cancelled"])
self.validate_value("material_request_type", "in", ["Purchase", "Transfer"])
@@ -81,7 +81,7 @@
def update_bin(self, is_submit, is_stopped):
""" Update Quantity Requested for Purchase in Bin for Material Request of type 'Purchase'"""
- from stock.utils import update_bin
+ from erpnext.stock.utils import update_bin
for d in getlist(self.doclist, 'indent_details'):
if webnotes.conn.get_value("Item", d.item_code, "is_stock_item") == "Yes":
if not d.warehouse:
@@ -194,7 +194,7 @@
def _update_requested_qty(controller, mr_obj, mr_items):
"""update requested qty (before ordered_qty is updated)"""
- from stock.utils import update_bin
+ from erpnext.stock.utils import update_bin
for mr_item_name in mr_items:
mr_item = mr_obj.doclist.getone({"parentfield": "indent_details", "name": mr_item_name})
se_detail = controller.doclist.getone({"parentfield": "mtn_details",
diff --git a/stock/doctype/material_request/material_request.txt b/erpnext/stock/doctype/material_request/material_request.txt
similarity index 100%
rename from stock/doctype/material_request/material_request.txt
rename to erpnext/stock/doctype/material_request/material_request.txt
diff --git a/stock/doctype/material_request/test_material_request.py b/erpnext/stock/doctype/material_request/test_material_request.py
similarity index 93%
rename from stock/doctype/material_request/test_material_request.py
rename to erpnext/stock/doctype/material_request/test_material_request.py
index c19bfd3..5266f49 100644
--- a/stock/doctype/material_request/test_material_request.py
+++ b/erpnext/stock/doctype/material_request/test_material_request.py
@@ -13,7 +13,7 @@
webnotes.defaults.set_global_default("auto_accounting_for_stock", 0)
def test_make_purchase_order(self):
- from stock.doctype.material_request.material_request import make_purchase_order
+ from erpnext.stock.doctype.material_request.material_request import make_purchase_order
mr = webnotes.bean(copy=test_records[0]).insert()
@@ -28,7 +28,7 @@
self.assertEquals(len(po), len(mr.doclist))
def test_make_supplier_quotation(self):
- from stock.doctype.material_request.material_request import make_supplier_quotation
+ from erpnext.stock.doctype.material_request.material_request import make_supplier_quotation
mr = webnotes.bean(copy=test_records[0]).insert()
@@ -44,7 +44,7 @@
def test_make_stock_entry(self):
- from stock.doctype.material_request.material_request import make_stock_entry
+ from erpnext.stock.doctype.material_request.material_request import make_stock_entry
mr = webnotes.bean(copy=test_records[0]).insert()
@@ -122,7 +122,7 @@
self._test_requested_qty(54.0, 3.0)
# map a purchase order
- from stock.doctype.material_request.material_request import make_purchase_order
+ from erpnext.stock.doctype.material_request.material_request import make_purchase_order
po_doclist = make_purchase_order(mr.doc.name)
po_doclist[0].supplier = "_Test Supplier"
po_doclist[1].qty = 27.0
@@ -169,7 +169,7 @@
self._test_requested_qty(54.0, 3.0)
- from stock.doctype.material_request.material_request import make_stock_entry
+ from erpnext.stock.doctype.material_request.material_request import make_stock_entry
# map a stock entry
se_doclist = make_stock_entry(mr.doc.name)
@@ -233,7 +233,7 @@
self._test_requested_qty(54.0, 3.0)
# map a stock entry
- from stock.doctype.material_request.material_request import make_stock_entry
+ from erpnext.stock.doctype.material_request.material_request import make_stock_entry
se_doclist = make_stock_entry(mr.doc.name)
se_doclist[0].update({
@@ -288,7 +288,7 @@
mr.submit()
# map a stock entry
- from stock.doctype.material_request.material_request import make_stock_entry
+ from erpnext.stock.doctype.material_request.material_request import make_stock_entry
se_doclist = make_stock_entry(mr.doc.name)
se_doclist[0].update({
@@ -315,7 +315,7 @@
self.assertRaises(webnotes.MappingMismatchError, se.insert)
def test_warehouse_company_validation(self):
- from stock.utils import InvalidWarehouseCompany
+ from erpnext.stock.utils import InvalidWarehouseCompany
mr = webnotes.bean(copy=test_records[0])
mr.doc.company = "_Test Company 1"
self.assertRaises(InvalidWarehouseCompany, mr.insert)
diff --git a/stock/doctype/material_request_item/README.md b/erpnext/stock/doctype/material_request_item/README.md
similarity index 100%
rename from stock/doctype/material_request_item/README.md
rename to erpnext/stock/doctype/material_request_item/README.md
diff --git a/stock/doctype/material_request_item/__init__.py b/erpnext/stock/doctype/material_request_item/__init__.py
similarity index 100%
rename from stock/doctype/material_request_item/__init__.py
rename to erpnext/stock/doctype/material_request_item/__init__.py
diff --git a/stock/doctype/material_request_item/material_request_item.py b/erpnext/stock/doctype/material_request_item/material_request_item.py
similarity index 100%
rename from stock/doctype/material_request_item/material_request_item.py
rename to erpnext/stock/doctype/material_request_item/material_request_item.py
diff --git a/stock/doctype/material_request_item/material_request_item.txt b/erpnext/stock/doctype/material_request_item/material_request_item.txt
similarity index 100%
rename from stock/doctype/material_request_item/material_request_item.txt
rename to erpnext/stock/doctype/material_request_item/material_request_item.txt
diff --git a/stock/doctype/packed_item/__init__.py b/erpnext/stock/doctype/packed_item/__init__.py
similarity index 100%
rename from stock/doctype/packed_item/__init__.py
rename to erpnext/stock/doctype/packed_item/__init__.py
diff --git a/stock/doctype/packed_item/packed_item.py b/erpnext/stock/doctype/packed_item/packed_item.py
similarity index 100%
rename from stock/doctype/packed_item/packed_item.py
rename to erpnext/stock/doctype/packed_item/packed_item.py
diff --git a/stock/doctype/packed_item/packed_item.txt b/erpnext/stock/doctype/packed_item/packed_item.txt
similarity index 100%
rename from stock/doctype/packed_item/packed_item.txt
rename to erpnext/stock/doctype/packed_item/packed_item.txt
diff --git a/stock/doctype/packing_slip/README.md b/erpnext/stock/doctype/packing_slip/README.md
similarity index 100%
rename from stock/doctype/packing_slip/README.md
rename to erpnext/stock/doctype/packing_slip/README.md
diff --git a/stock/doctype/packing_slip/__init__.py b/erpnext/stock/doctype/packing_slip/__init__.py
similarity index 100%
rename from stock/doctype/packing_slip/__init__.py
rename to erpnext/stock/doctype/packing_slip/__init__.py
diff --git a/stock/doctype/packing_slip/packing_slip.js b/erpnext/stock/doctype/packing_slip/packing_slip.js
similarity index 100%
rename from stock/doctype/packing_slip/packing_slip.js
rename to erpnext/stock/doctype/packing_slip/packing_slip.js
diff --git a/stock/doctype/packing_slip/packing_slip.py b/erpnext/stock/doctype/packing_slip/packing_slip.py
similarity index 96%
rename from stock/doctype/packing_slip/packing_slip.py
rename to erpnext/stock/doctype/packing_slip/packing_slip.py
index 8501b2b..de97a7e 100644
--- a/stock/doctype/packing_slip/packing_slip.py
+++ b/erpnext/stock/doctype/packing_slip/packing_slip.py
@@ -24,7 +24,7 @@
self.validate_case_nos()
self.validate_qty()
- from utilities.transaction_base import validate_uom_is_integer
+ from erpnext.utilities.transaction_base import validate_uom_is_integer
validate_uom_is_integer(self.doclist, "stock_uom", "qty")
validate_uom_is_integer(self.doclist, "weight_uom", "net_weight")
@@ -33,8 +33,7 @@
Validates if delivery note has status as draft
"""
if cint(webnotes.conn.get_value("Delivery Note", self.doc.delivery_note, "docstatus")) != 0:
- msgprint(_("""Invalid Delivery Note. Delivery Note should exist and should be in
- draft state. Please rectify and try again."""), raise_exception=1)
+ msgprint(_("""Invalid Delivery Note. Delivery Note should exist and should be in draft state. Please rectify and try again."""), raise_exception=1)
def validate_items_mandatory(self):
rows = [d.item_code for d in self.doclist.get({"parentfield": "item_details"})]
@@ -165,7 +164,7 @@
self.update_item_details()
def item_details(doctype, txt, searchfield, start, page_len, filters):
- from controllers.queries import get_match_cond
+ from erpnext.controllers.queries import get_match_cond
return webnotes.conn.sql("""select name, item_name, description from `tabItem`
where name in ( select item_code FROM `tabDelivery Note Item`
where parent= %s
diff --git a/stock/doctype/packing_slip/packing_slip.txt b/erpnext/stock/doctype/packing_slip/packing_slip.txt
similarity index 100%
rename from stock/doctype/packing_slip/packing_slip.txt
rename to erpnext/stock/doctype/packing_slip/packing_slip.txt
diff --git a/stock/doctype/packing_slip_item/README.md b/erpnext/stock/doctype/packing_slip_item/README.md
similarity index 100%
rename from stock/doctype/packing_slip_item/README.md
rename to erpnext/stock/doctype/packing_slip_item/README.md
diff --git a/stock/doctype/packing_slip_item/__init__.py b/erpnext/stock/doctype/packing_slip_item/__init__.py
similarity index 100%
rename from stock/doctype/packing_slip_item/__init__.py
rename to erpnext/stock/doctype/packing_slip_item/__init__.py
diff --git a/stock/doctype/packing_slip_item/packing_slip_item.py b/erpnext/stock/doctype/packing_slip_item/packing_slip_item.py
similarity index 100%
rename from stock/doctype/packing_slip_item/packing_slip_item.py
rename to erpnext/stock/doctype/packing_slip_item/packing_slip_item.py
diff --git a/stock/doctype/packing_slip_item/packing_slip_item.txt b/erpnext/stock/doctype/packing_slip_item/packing_slip_item.txt
similarity index 100%
rename from stock/doctype/packing_slip_item/packing_slip_item.txt
rename to erpnext/stock/doctype/packing_slip_item/packing_slip_item.txt
diff --git a/stock/doctype/price_list/README.md b/erpnext/stock/doctype/price_list/README.md
similarity index 100%
rename from stock/doctype/price_list/README.md
rename to erpnext/stock/doctype/price_list/README.md
diff --git a/stock/doctype/price_list/__init__.py b/erpnext/stock/doctype/price_list/__init__.py
similarity index 100%
rename from stock/doctype/price_list/__init__.py
rename to erpnext/stock/doctype/price_list/__init__.py
diff --git a/stock/doctype/price_list/price_list.css b/erpnext/stock/doctype/price_list/price_list.css
similarity index 100%
rename from stock/doctype/price_list/price_list.css
rename to erpnext/stock/doctype/price_list/price_list.css
diff --git a/stock/doctype/price_list/price_list.js b/erpnext/stock/doctype/price_list/price_list.js
similarity index 100%
rename from stock/doctype/price_list/price_list.js
rename to erpnext/stock/doctype/price_list/price_list.js
diff --git a/stock/doctype/price_list/price_list.py b/erpnext/stock/doctype/price_list/price_list.py
similarity index 100%
rename from stock/doctype/price_list/price_list.py
rename to erpnext/stock/doctype/price_list/price_list.py
diff --git a/stock/doctype/price_list/price_list.txt b/erpnext/stock/doctype/price_list/price_list.txt
similarity index 100%
rename from stock/doctype/price_list/price_list.txt
rename to erpnext/stock/doctype/price_list/price_list.txt
diff --git a/stock/doctype/price_list/test_price_list.py b/erpnext/stock/doctype/price_list/test_price_list.py
similarity index 100%
rename from stock/doctype/price_list/test_price_list.py
rename to erpnext/stock/doctype/price_list/test_price_list.py
diff --git a/stock/doctype/purchase_receipt/README.md b/erpnext/stock/doctype/purchase_receipt/README.md
similarity index 100%
rename from stock/doctype/purchase_receipt/README.md
rename to erpnext/stock/doctype/purchase_receipt/README.md
diff --git a/stock/doctype/purchase_receipt/__init__.py b/erpnext/stock/doctype/purchase_receipt/__init__.py
similarity index 100%
rename from stock/doctype/purchase_receipt/__init__.py
rename to erpnext/stock/doctype/purchase_receipt/__init__.py
diff --git a/stock/doctype/purchase_receipt/purchase_receipt.js b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
similarity index 90%
rename from stock/doctype/purchase_receipt/purchase_receipt.js
rename to erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
index c647305..5151c00 100644
--- a/stock/doctype/purchase_receipt/purchase_receipt.js
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
@@ -5,10 +5,10 @@
cur_frm.cscript.fname = "purchase_receipt_details";
cur_frm.cscript.other_fname = "purchase_tax_details";
-wn.require('app/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.js');
-wn.require('app/utilities/doctype/sms_control/sms_control.js');
-wn.require('app/buying/doctype/purchase_common/purchase_common.js');
-wn.require('app/accounts/doctype/sales_invoice/pos.js');
+{% include 'buying/doctype/purchase_common/purchase_common.js' %};
+{% include 'accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.js' %}
+{% include 'utilities/doctype/sms_control/sms_control.js' %}
+{% include 'accounts/doctype/sales_invoice/pos.js' %}
wn.provide("erpnext.stock");
erpnext.stock.PurchaseReceiptController = erpnext.buying.BuyingController.extend({
@@ -28,7 +28,7 @@
cur_frm.add_custom_button(wn._(wn._('From Purchase Order')),
function() {
wn.model.map_current_doc({
- method: "buying.doctype.purchase_order.purchase_order.make_purchase_receipt",
+ method: "erpnext.buying.doctype.purchase_order.purchase_order.make_purchase_receipt",
source_doctype: "Purchase Order",
get_query_filters: {
supplier: cur_frm.doc.supplier || undefined,
@@ -91,7 +91,7 @@
make_purchase_invoice: function() {
wn.model.open_mapped_doc({
- method: "stock.doctype.purchase_receipt.purchase_receipt.make_purchase_invoice",
+ method: "erpnext.stock.doctype.purchase_receipt.purchase_receipt.make_purchase_invoice",
source_name: cur_frm.doc.name
})
},
diff --git a/stock/doctype/purchase_receipt/purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
similarity index 97%
rename from stock/doctype/purchase_receipt/purchase_receipt.py
rename to erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
index f8173bf..7a33971 100644
--- a/stock/doctype/purchase_receipt/purchase_receipt.py
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
@@ -9,9 +9,9 @@
from webnotes.model.code import get_obj
from webnotes import msgprint, _
import webnotes.defaults
-from stock.utils import update_bin
+from erpnext.stock.utils import update_bin
-from controllers.buying_controller import BuyingController
+from erpnext.controllers.buying_controller import BuyingController
class DocType(BuyingController):
def __init__(self, doc, doclist=[]):
self.doc = doc
@@ -46,8 +46,8 @@
if not self.doc.status:
self.doc.status = "Draft"
- import utilities
- utilities.validate_status(self.doc.status, ["Draft", "Submitted", "Cancelled"])
+ from erpnext.utilities import validate_status
+ validate_status(self.doc.status, ["Draft", "Submitted", "Cancelled"])
self.validate_with_previous_doc()
self.validate_rejected_warehouse()
@@ -240,7 +240,7 @@
self.update_stock()
- from stock.doctype.serial_no.serial_no import update_serial_nos_after_submit
+ from erpnext.stock.doctype.serial_no.serial_no import update_serial_nos_after_submit
update_serial_nos_after_submit(self, "purchase_receipt_details")
purchase_controller.update_last_purchase_rate(self, 1)
diff --git a/stock/doctype/purchase_receipt/purchase_receipt.txt b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.txt
similarity index 100%
rename from stock/doctype/purchase_receipt/purchase_receipt.txt
rename to erpnext/stock/doctype/purchase_receipt/purchase_receipt.txt
diff --git a/stock/doctype/purchase_receipt/test_purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
similarity index 98%
rename from stock/doctype/purchase_receipt/test_purchase_receipt.py
rename to erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
index 96d1a13..89e77ce 100644
--- a/stock/doctype/purchase_receipt/test_purchase_receipt.py
+++ b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
@@ -12,7 +12,7 @@
def test_make_purchase_invoice(self):
self._clear_stock_account_balance()
set_perpetual_inventory(0)
- from stock.doctype.purchase_receipt.purchase_receipt import make_purchase_invoice
+ from erpnext.stock.doctype.purchase_receipt.purchase_receipt import make_purchase_invoice
pr = webnotes.bean(copy=test_records[0]).insert()
diff --git a/stock/doctype/purchase_receipt_item/README.md b/erpnext/stock/doctype/purchase_receipt_item/README.md
similarity index 100%
rename from stock/doctype/purchase_receipt_item/README.md
rename to erpnext/stock/doctype/purchase_receipt_item/README.md
diff --git a/stock/doctype/purchase_receipt_item/__init__.py b/erpnext/stock/doctype/purchase_receipt_item/__init__.py
similarity index 100%
rename from stock/doctype/purchase_receipt_item/__init__.py
rename to erpnext/stock/doctype/purchase_receipt_item/__init__.py
diff --git a/stock/doctype/purchase_receipt_item/purchase_receipt_item.py b/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.py
similarity index 100%
rename from stock/doctype/purchase_receipt_item/purchase_receipt_item.py
rename to erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.py
diff --git a/stock/doctype/purchase_receipt_item/purchase_receipt_item.txt b/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.txt
similarity index 100%
rename from stock/doctype/purchase_receipt_item/purchase_receipt_item.txt
rename to erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.txt
diff --git a/stock/doctype/sales_bom/README.md b/erpnext/stock/doctype/sales_bom/README.md
similarity index 100%
rename from stock/doctype/sales_bom/README.md
rename to erpnext/stock/doctype/sales_bom/README.md
diff --git a/stock/doctype/sales_bom_item/README.md b/erpnext/stock/doctype/sales_bom_item/README.md
similarity index 100%
rename from stock/doctype/sales_bom_item/README.md
rename to erpnext/stock/doctype/sales_bom_item/README.md
diff --git a/stock/doctype/serial_no/README.md b/erpnext/stock/doctype/serial_no/README.md
similarity index 100%
rename from stock/doctype/serial_no/README.md
rename to erpnext/stock/doctype/serial_no/README.md
diff --git a/stock/doctype/serial_no/__init__.py b/erpnext/stock/doctype/serial_no/__init__.py
similarity index 100%
rename from stock/doctype/serial_no/__init__.py
rename to erpnext/stock/doctype/serial_no/__init__.py
diff --git a/stock/doctype/serial_no/serial_no.js b/erpnext/stock/doctype/serial_no/serial_no.js
similarity index 100%
rename from stock/doctype/serial_no/serial_no.js
rename to erpnext/stock/doctype/serial_no/serial_no.js
diff --git a/stock/doctype/serial_no/serial_no.py b/erpnext/stock/doctype/serial_no/serial_no.py
similarity index 99%
rename from stock/doctype/serial_no/serial_no.py
rename to erpnext/stock/doctype/serial_no/serial_no.py
index bd2704d..9c1da65 100644
--- a/stock/doctype/serial_no/serial_no.py
+++ b/erpnext/stock/doctype/serial_no/serial_no.py
@@ -8,7 +8,7 @@
import datetime
from webnotes import _, ValidationError
-from controllers.stock_controller import StockController
+from erpnext.controllers.stock_controller import StockController
class SerialNoCannotCreateDirectError(ValidationError): pass
class SerialNoCannotCannotChangeError(ValidationError): pass
diff --git a/stock/doctype/serial_no/serial_no.txt b/erpnext/stock/doctype/serial_no/serial_no.txt
similarity index 100%
rename from stock/doctype/serial_no/serial_no.txt
rename to erpnext/stock/doctype/serial_no/serial_no.txt
diff --git a/stock/doctype/serial_no/test_serial_no.py b/erpnext/stock/doctype/serial_no/test_serial_no.py
similarity index 93%
rename from stock/doctype/serial_no/test_serial_no.py
rename to erpnext/stock/doctype/serial_no/test_serial_no.py
index 8ce36cd..fb23361 100644
--- a/stock/doctype/serial_no/test_serial_no.py
+++ b/erpnext/stock/doctype/serial_no/test_serial_no.py
@@ -10,7 +10,7 @@
test_dependencies = ["Item"]
test_records = []
-from stock.doctype.serial_no.serial_no import *
+from erpnext.stock.doctype.serial_no.serial_no import *
class TestSerialNo(unittest.TestCase):
def test_cannot_create_direct(self):
diff --git a/stock/doctype/stock_entry/README.md b/erpnext/stock/doctype/stock_entry/README.md
similarity index 100%
rename from stock/doctype/stock_entry/README.md
rename to erpnext/stock/doctype/stock_entry/README.md
diff --git a/stock/doctype/stock_entry/__init__.py b/erpnext/stock/doctype/stock_entry/__init__.py
similarity index 100%
rename from stock/doctype/stock_entry/__init__.py
rename to erpnext/stock/doctype/stock_entry/__init__.py
diff --git a/stock/doctype/stock_entry/stock_entry.js b/erpnext/stock/doctype/stock_entry/stock_entry.js
similarity index 97%
rename from stock/doctype/stock_entry/stock_entry.js
rename to erpnext/stock/doctype/stock_entry/stock_entry.js
index 73fd441..ec46685 100644
--- a/stock/doctype/stock_entry/stock_entry.js
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.js
@@ -4,7 +4,7 @@
cur_frm.cscript.tname = "Stock Entry Detail";
cur_frm.cscript.fname = "mtn_details";
-wn.require("public/app/js/controllers/stock_controller.js");
+wn.require("assets/erpnext/js/controllers/stock_controller.js");
wn.provide("erpnext.stock");
erpnext.stock.StockEntry = erpnext.stock.StockController.extend({
@@ -99,7 +99,7 @@
account_for = "stock_received_but_not_billed";
return this.frm.call({
- method: "accounts.utils.get_company_default",
+ method: "erpnext.accounts.utils.get_company_default",
args: {
"fieldname": account_for,
"company": this.frm.doc.company
@@ -167,8 +167,7 @@
if(this.frm.doc.purpose === "Sales Return") {
if(this.frm.doc.delivery_note_no && this.frm.doc.sales_invoice_no) {
// both specified
- msgprint(wn._("You can not enter both Delivery Note No and Sales Invoice No. \
- Please enter any one."));
+ msgprint(wn._("You can not enter both Delivery Note No and Sales Invoice No. Please enter any one."));
} else if(!(this.frm.doc.delivery_note_no || this.frm.doc.sales_invoice_no)) {
// none specified
@@ -386,9 +385,9 @@
}
cur_frm.fields_dict.customer.get_query = function(doc, cdt, cdn) {
- return{ query:"controllers.queries.customer_query" }
+ return{ query: "erpnext.controllers.queries.customer_query" }
}
cur_frm.fields_dict.supplier.get_query = function(doc, cdt, cdn) {
- return{ query:"controllers.queries.supplier_query" }
+ return{ query: "erpnext.controllers.queries.supplier_query" }
}
diff --git a/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py
similarity index 97%
rename from stock/doctype/stock_entry/stock_entry.py
rename to erpnext/stock/doctype/stock_entry/stock_entry.py
index 2e7e2a4..3ba0deb 100644
--- a/stock/doctype/stock_entry/stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.py
@@ -10,9 +10,9 @@
from webnotes.model.bean import getlist
from webnotes.model.code import get_obj
from webnotes import msgprint, _
-from stock.utils import get_incoming_rate
-from stock.stock_ledger import get_previous_sle
-from controllers.queries import get_match_cond
+from erpnext.stock.utils import get_incoming_rate
+from erpnext.stock.stock_ledger import get_previous_sle
+from erpnext.controllers.queries import get_match_cond
import json
@@ -22,7 +22,7 @@
class DuplicateEntryForProductionOrderError(webnotes.ValidationError): pass
class StockOverProductionError(webnotes.ValidationError): pass
-from controllers.stock_controller import StockController
+from erpnext.controllers.stock_controller import StockController
class DocType(StockController):
def __init__(self, doc, doclist=None):
@@ -53,7 +53,7 @@
def on_submit(self):
self.update_stock_ledger()
- from stock.doctype.serial_no.serial_no import update_serial_nos_after_submit
+ from erpnext.stock.doctype.serial_no.serial_no import update_serial_nos_after_submit
update_serial_nos_after_submit(self, "mtn_details")
self.update_production_order()
self.make_gl_entries()
@@ -64,8 +64,8 @@
self.make_cancel_gl_entries()
def validate_fiscal_year(self):
- import accounts.utils
- accounts.utils.validate_fiscal_year(self.doc.posting_date, self.doc.fiscal_year,
+ from erpnext.accounts.utils import validate_fiscal_year
+ validate_fiscal_year(self.doc.posting_date, self.doc.fiscal_year,
self.meta.get_label("posting_date"))
def validate_purpose(self):
@@ -243,9 +243,7 @@
for d in getlist(self.doclist, 'mtn_details'):
if d.bom_no and flt(d.transfer_qty) != flt(self.doc.fg_completed_qty):
msgprint(_("Row #") + " %s: " % d.idx
- + _("Quantity should be equal to Manufacturing Quantity. ")
- + _("To fetch items again, click on 'Get Items' button \
- or update the Quantity manually."), raise_exception=1)
+ + _("Quantity should be equal to Manufacturing Quantity. To fetch items again, click on 'Get Items' button or update the Quantity manually."), raise_exception=1)
def validate_return_reference_doc(self):
"""validate item with reference doc"""
@@ -362,7 +360,7 @@
where name=%s""", (status, produced_qty, self.doc.production_order))
def update_planned_qty(self, pro_bean):
- from stock.utils import update_bin
+ from erpnext.stock.utils import update_bin
update_bin({
"item_code": pro_bean.doc.production_item,
"warehouse": pro_bean.doc.fg_warehouse,
@@ -501,7 +499,7 @@
self.get_stock_and_rate()
def get_bom_raw_materials(self, qty):
- from manufacturing.doctype.bom.bom import get_bom_items_as_dict
+ from erpnext.manufacturing.doctype.bom.bom import get_bom_items_as_dict
# item dict = { item_code: {qty, description, stock_uom} }
item_dict = get_bom_items_as_dict(self.doc.bom_no, qty=qty, fetch_exploded = self.doc.use_multi_level_bom)
@@ -607,7 +605,7 @@
return result and result[0] or {}
def get_cust_addr(self):
- from utilities.transaction_base import get_default_address, get_address_display
+ from erpnext.utilities.transaction_base import get_default_address, get_address_display
res = webnotes.conn.sql("select customer_name from `tabCustomer` where name = '%s'"%self.doc.customer)
address_display = None
customer_address = get_default_address("customer", self.doc.customer)
@@ -628,7 +626,7 @@
return result and result[0] or {}
def get_supp_addr(self):
- from utilities.transaction_base import get_default_address, get_address_display
+ from erpnext.utilities.transaction_base import get_default_address, get_address_display
res = webnotes.conn.sql("""select supplier_name from `tabSupplier`
where name=%s""", self.doc.supplier)
address_display = None
@@ -817,7 +815,7 @@
"company": se.doc.company
}]
- from accounts.utils import get_balance_on
+ from erpnext.accounts.utils import get_balance_on
for r in result:
jv_list.append({
"__islocal": 1,
diff --git a/stock/doctype/stock_entry/stock_entry.txt b/erpnext/stock/doctype/stock_entry/stock_entry.txt
similarity index 100%
rename from stock/doctype/stock_entry/stock_entry.txt
rename to erpnext/stock/doctype/stock_entry/stock_entry.txt
diff --git a/stock/doctype/stock_entry/test_stock_entry.py b/erpnext/stock/doctype/stock_entry/test_stock_entry.py
similarity index 95%
rename from stock/doctype/stock_entry/test_stock_entry.py
rename to erpnext/stock/doctype/stock_entry/test_stock_entry.py
index d6f34f6..8014c99 100644
--- a/stock/doctype/stock_entry/test_stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/test_stock_entry.py
@@ -4,8 +4,8 @@
from __future__ import unicode_literals
import webnotes, unittest
from webnotes.utils import flt
-from stock.doctype.serial_no.serial_no import *
-from stock.doctype.purchase_receipt.test_purchase_receipt import set_perpetual_inventory
+from erpnext.stock.doctype.serial_no.serial_no import *
+from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import set_perpetual_inventory
class TestStockEntry(unittest.TestCase):
@@ -29,7 +29,7 @@
st2.insert()
st2.submit()
- from stock.utils import reorder_item
+ from erpnext.stock.utils import reorder_item
reorder_item()
mr_name = webnotes.conn.sql("""select parent from `tabMaterial Request Item`
@@ -46,7 +46,7 @@
.add_roles("Sales User", "Sales Manager", "Material User", "Material Manager")
webnotes.session.user = "test2@example.com"
- from stock.utils import InvalidWarehouseCompany
+ from erpnext.stock.utils import InvalidWarehouseCompany
st1 = webnotes.bean(copy=test_records[0])
st1.doclist[1].t_warehouse="_Test Warehouse 2 - _TC1"
st1.insert()
@@ -56,7 +56,7 @@
def test_warehouse_user(self):
set_perpetual_inventory(0)
- from stock.utils import UserNotAllowedForWarehouse
+ from erpnext.stock.utils import UserNotAllowedForWarehouse
webnotes.bean("Profile", "test@example.com").get_controller()\
.add_roles("Sales User", "Sales Manager", "Material User", "Material Manager")
@@ -272,9 +272,9 @@
"warehouse": "_Test Warehouse - _TC"}, "actual_qty"))
def _test_sales_invoice_return(self, item_code, delivered_qty, returned_qty):
- from stock.doctype.stock_entry.stock_entry import NotUpdateStockError
+ from erpnext.stock.doctype.stock_entry.stock_entry import NotUpdateStockError
- from accounts.doctype.sales_invoice.test_sales_invoice \
+ from erpnext.accounts.doctype.sales_invoice.test_sales_invoice \
import test_records as sales_invoice_test_records
# invalid sales invoice as update stock not checked
@@ -352,10 +352,10 @@
def _test_delivery_note_return(self, item_code, delivered_qty, returned_qty):
self._insert_material_receipt()
- from stock.doctype.delivery_note.test_delivery_note \
+ from erpnext.stock.doctype.delivery_note.test_delivery_note \
import test_records as delivery_note_test_records
- from stock.doctype.delivery_note.delivery_note import make_sales_invoice
+ from erpnext.stock.doctype.delivery_note.delivery_note import make_sales_invoice
actual_qty_0 = self._get_actual_qty()
# make a delivery note based on this invoice
@@ -404,7 +404,7 @@
self._test_delivery_note_return("_Test Sales BOM Item", 25, 20)
def _test_sales_return_jv(self, se):
- from stock.doctype.stock_entry.stock_entry import make_return_jv
+ from erpnext.stock.doctype.stock_entry.stock_entry import make_return_jv
jv_list = make_return_jv(se.doc.name)
self.assertEqual(len(jv_list), 3)
@@ -443,8 +443,8 @@
def _test_delivery_note_return_against_sales_order(self, item_code, delivered_qty, returned_qty):
self._insert_material_receipt()
- from selling.doctype.sales_order.test_sales_order import test_records as sales_order_test_records
- from selling.doctype.sales_order.sales_order import make_sales_invoice, make_delivery_note
+ from erpnext.selling.doctype.sales_order.test_sales_order import test_records as sales_order_test_records
+ from erpnext.selling.doctype.sales_order.sales_order import make_sales_invoice, make_delivery_note
actual_qty_0 = self._get_actual_qty()
@@ -498,10 +498,10 @@
actual_qty_0 = self._get_actual_qty()
- from stock.doctype.purchase_receipt.test_purchase_receipt \
+ from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt \
import test_records as purchase_receipt_test_records
- from stock.doctype.purchase_receipt.purchase_receipt import make_purchase_invoice
+ from erpnext.stock.doctype.purchase_receipt.purchase_receipt import make_purchase_invoice
# submit purchase receipt
pr = webnotes.bean(copy=purchase_receipt_test_records[0])
@@ -549,7 +549,7 @@
return se, pr.doc.name
def test_over_stock_return(self):
- from stock.doctype.stock_entry.stock_entry import StockOverReturnError
+ from erpnext.stock.doctype.stock_entry.stock_entry import StockOverReturnError
self._clear_stock_account_balance()
# out of 10, 5 gets returned
@@ -567,7 +567,7 @@
self.assertRaises(StockOverReturnError, se.insert)
def _test_purchase_return_jv(self, se):
- from stock.doctype.stock_entry.stock_entry import make_return_jv
+ from erpnext.stock.doctype.stock_entry.stock_entry import make_return_jv
jv_list = make_return_jv(se.doc.name)
self.assertEqual(len(jv_list), 3)
@@ -590,10 +590,10 @@
actual_qty_0 = self._get_actual_qty()
- from buying.doctype.purchase_order.test_purchase_order \
+ from erpnext.buying.doctype.purchase_order.test_purchase_order \
import test_records as purchase_order_test_records
- from buying.doctype.purchase_order.purchase_order import \
+ from erpnext.buying.doctype.purchase_order.purchase_order import \
make_purchase_receipt, make_purchase_invoice
# submit purchase receipt
diff --git a/stock/doctype/stock_entry_detail/README.md b/erpnext/stock/doctype/stock_entry_detail/README.md
similarity index 100%
rename from stock/doctype/stock_entry_detail/README.md
rename to erpnext/stock/doctype/stock_entry_detail/README.md
diff --git a/stock/doctype/stock_entry_detail/__init__.py b/erpnext/stock/doctype/stock_entry_detail/__init__.py
similarity index 100%
rename from stock/doctype/stock_entry_detail/__init__.py
rename to erpnext/stock/doctype/stock_entry_detail/__init__.py
diff --git a/stock/doctype/stock_entry_detail/stock_entry_detail.py b/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.py
similarity index 100%
rename from stock/doctype/stock_entry_detail/stock_entry_detail.py
rename to erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.py
diff --git a/stock/doctype/stock_entry_detail/stock_entry_detail.txt b/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.txt
similarity index 100%
rename from stock/doctype/stock_entry_detail/stock_entry_detail.txt
rename to erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.txt
diff --git a/stock/doctype/stock_ledger/stock_ledger.py b/erpnext/stock/doctype/stock_ledger/stock_ledger.py
similarity index 96%
rename from stock/doctype/stock_ledger/stock_ledger.py
rename to erpnext/stock/doctype/stock_ledger/stock_ledger.py
index 062d70f..f44e5e3 100644
--- a/stock/doctype/stock_ledger/stock_ledger.py
+++ b/erpnext/stock/doctype/stock_ledger/stock_ledger.py
@@ -9,7 +9,7 @@
from webnotes.model.bean import getlist
from webnotes.model.code import get_obj
from webnotes import session, msgprint
-from stock.utils import get_valid_serial_nos
+from erpnext.stock.utils import get_valid_serial_nos
class DocType:
diff --git a/stock/doctype/stock_ledger_entry/README.md b/erpnext/stock/doctype/stock_ledger_entry/README.md
similarity index 100%
rename from stock/doctype/stock_ledger_entry/README.md
rename to erpnext/stock/doctype/stock_ledger_entry/README.md
diff --git a/stock/doctype/stock_ledger_entry/__init__.py b/erpnext/stock/doctype/stock_ledger_entry/__init__.py
similarity index 100%
rename from stock/doctype/stock_ledger_entry/__init__.py
rename to erpnext/stock/doctype/stock_ledger_entry/__init__.py
diff --git a/stock/doctype/stock_ledger_entry/stock_ledger_entry.py b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
similarity index 94%
rename from stock/doctype/stock_ledger_entry/stock_ledger_entry.py
rename to erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
index f059451..c14918f 100644
--- a/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
+++ b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
@@ -13,21 +13,21 @@
self.doclist = doclist
def validate(self):
- from stock.utils import validate_warehouse_user, validate_warehouse_company
+ from erpnext.stock.utils import validate_warehouse_user, validate_warehouse_company
self.validate_mandatory()
self.validate_item()
validate_warehouse_user(self.doc.warehouse)
validate_warehouse_company(self.doc.warehouse, self.doc.company)
self.scrub_posting_time()
- from accounts.utils import validate_fiscal_year
+ from erpnext.accounts.utils import validate_fiscal_year
validate_fiscal_year(self.doc.posting_date, self.doc.fiscal_year, self.meta.get_label("posting_date"))
def on_submit(self):
self.check_stock_frozen_date()
self.actual_amt_check()
- from stock.doctype.serial_no.serial_no import process_serial_no
+ from erpnext.stock.doctype.serial_no.serial_no import process_serial_no
process_serial_no(self.doc)
#check for item quantity available in stock
diff --git a/stock/doctype/stock_ledger_entry/stock_ledger_entry.txt b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.txt
similarity index 100%
rename from stock/doctype/stock_ledger_entry/stock_ledger_entry.txt
rename to erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.txt
diff --git a/stock/doctype/stock_reconciliation/README.md b/erpnext/stock/doctype/stock_reconciliation/README.md
similarity index 100%
rename from stock/doctype/stock_reconciliation/README.md
rename to erpnext/stock/doctype/stock_reconciliation/README.md
diff --git a/stock/doctype/stock_reconciliation/__init__.py b/erpnext/stock/doctype/stock_reconciliation/__init__.py
similarity index 100%
rename from stock/doctype/stock_reconciliation/__init__.py
rename to erpnext/stock/doctype/stock_reconciliation/__init__.py
diff --git a/stock/doctype/stock_reconciliation/stock_reconciliation.js b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js
similarity index 94%
rename from stock/doctype/stock_reconciliation/stock_reconciliation.js
rename to erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js
index fc50246..48f3e45 100644
--- a/stock/doctype/stock_reconciliation/stock_reconciliation.js
+++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js
@@ -1,7 +1,7 @@
// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
-wn.require("public/app/js/controllers/stock_controller.js");
+wn.require("assets/erpnext/js/controllers/stock_controller.js");
wn.provide("erpnext.stock");
erpnext.stock.StockReconciliation = erpnext.stock.StockController.extend({
@@ -14,7 +14,7 @@
if (sys_defaults.auto_accounting_for_stock && !this.frm.doc.expense_account) {
return this.frm.call({
- method: "accounts.utils.get_company_default",
+ method: "erpnext.accounts.utils.get_company_default",
args: {
"fieldname": "stock_adjustment_account",
"company": this.frm.doc.company
@@ -50,8 +50,7 @@
if(this.frm.doc.reconciliation_json) {
this.frm.set_intro(wn._("You can submit this Stock Reconciliation."));
} else {
- this.frm.set_intro(wn._("Download the Template, fill appropriate data and \
- attach the modified file."));
+ this.frm.set_intro(wn._("Download the Template, fill appropriate data and attach the modified file."));
}
} else if(this.frm.doc.docstatus == 1) {
this.frm.set_intro(wn._("Cancelling this Stock Reconciliation will nullify its effect."));
@@ -94,7 +93,7 @@
wn.upload.make({
parent: $wrapper,
args: {
- method: 'stock.doctype.stock_reconciliation.stock_reconciliation.upload'
+ method: 'erpnext.stock.doctype.stock_reconciliation.stock_reconciliation.upload'
},
sample_url: "e.g. http://example.com/somefile.csv",
callback: function(fid, filename, r) {
diff --git a/stock/doctype/stock_reconciliation/stock_reconciliation.py b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
similarity index 94%
rename from stock/doctype/stock_reconciliation/stock_reconciliation.py
rename to erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
index 01ded1a..f219aa0 100644
--- a/stock/doctype/stock_reconciliation/stock_reconciliation.py
+++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
@@ -7,9 +7,9 @@
import json
from webnotes import msgprint, _
from webnotes.utils import cstr, flt, cint
-from stock.stock_ledger import update_entries_after
-from controllers.stock_controller import StockController
-from stock.utils import update_bin
+from erpnext.stock.stock_ledger import update_entries_after
+from erpnext.controllers.stock_controller import StockController
+from erpnext.stock.utils import update_bin
class DocType(StockController):
def setup(self):
@@ -90,7 +90,7 @@
raise webnotes.ValidationError
def validate_item(self, item_code, row_num):
- from stock.utils import validate_end_of_life, validate_is_stock_item, \
+ from erpnext.stock.utils import validate_end_of_life, validate_is_stock_item, \
validate_cancelled_item
# using try except to catch all validation msgs and display together
@@ -118,8 +118,8 @@
def insert_stock_ledger_entries(self):
""" find difference between current and expected entries
and create stock ledger entries based on the difference"""
- from stock.utils import get_valuation_method
- from stock.stock_ledger import get_previous_sle
+ from erpnext.stock.utils import get_valuation_method
+ from erpnext.stock.stock_ledger import get_previous_sle
row_template = ["item_code", "warehouse", "qty", "valuation_rate"]
@@ -140,10 +140,9 @@
# check valuation rate mandatory
if row.qty != "" and not row.valuation_rate and \
flt(previous_sle.get("qty_after_transaction")) <= 0:
- webnotes.msgprint(_("As existing qty for item: ") + row.item_code +
+ webnotes.throw(_("As existing qty for item: ") + row.item_code +
_(" at warehouse: ") + row.warehouse +
- _(" is less than equals to zero in the system, \
- valuation rate is mandatory for this item"), raise_exception=1)
+ _(" is less than equals to zero in the system, valuation rate is mandatory for this item"))
change_in_qty = row.qty != "" and \
(flt(row.qty) - flt(previous_sle.get("qty_after_transaction")))
diff --git a/stock/doctype/stock_reconciliation/stock_reconciliation.txt b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.txt
similarity index 100%
rename from stock/doctype/stock_reconciliation/stock_reconciliation.txt
rename to erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.txt
diff --git a/stock/doctype/stock_reconciliation/test_stock_reconciliation.py b/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py
similarity index 98%
rename from stock/doctype/stock_reconciliation/test_stock_reconciliation.py
rename to erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py
index 984e508..287395f 100644
--- a/stock/doctype/stock_reconciliation/test_stock_reconciliation.py
+++ b/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py
@@ -8,7 +8,7 @@
import webnotes, unittest
from webnotes.utils import flt
import json
-from accounts.utils import get_fiscal_year, get_stock_and_account_difference, get_balance_on
+from erpnext.accounts.utils import get_fiscal_year, get_stock_and_account_difference, get_balance_on
class TestStockReconciliation(unittest.TestCase):
diff --git a/stock/doctype/stock_settings/__init__.py b/erpnext/stock/doctype/stock_settings/__init__.py
similarity index 100%
rename from stock/doctype/stock_settings/__init__.py
rename to erpnext/stock/doctype/stock_settings/__init__.py
diff --git a/stock/doctype/stock_settings/stock_settings.py b/erpnext/stock/doctype/stock_settings/stock_settings.py
similarity index 87%
rename from stock/doctype/stock_settings/stock_settings.py
rename to erpnext/stock/doctype/stock_settings/stock_settings.py
index 48e1ee1..e3e29b9 100644
--- a/stock/doctype/stock_settings/stock_settings.py
+++ b/erpnext/stock/doctype/stock_settings/stock_settings.py
@@ -16,7 +16,7 @@
"allow_negative_stock"]:
webnotes.conn.set_default(key, self.doc.fields.get(key, ""))
- from setup.doctype.naming_series.naming_series import set_by_naming_series
+ from erpnext.setup.doctype.naming_series.naming_series import set_by_naming_series
set_by_naming_series("Item", "item_code",
self.doc.get("item_naming_by")=="Naming Series", hide_name_field=True)
diff --git a/stock/doctype/stock_settings/stock_settings.txt b/erpnext/stock/doctype/stock_settings/stock_settings.txt
similarity index 100%
rename from stock/doctype/stock_settings/stock_settings.txt
rename to erpnext/stock/doctype/stock_settings/stock_settings.txt
diff --git a/stock/doctype/stock_uom_replace_utility/README.md b/erpnext/stock/doctype/stock_uom_replace_utility/README.md
similarity index 100%
rename from stock/doctype/stock_uom_replace_utility/README.md
rename to erpnext/stock/doctype/stock_uom_replace_utility/README.md
diff --git a/stock/doctype/stock_uom_replace_utility/__init__.py b/erpnext/stock/doctype/stock_uom_replace_utility/__init__.py
similarity index 100%
rename from stock/doctype/stock_uom_replace_utility/__init__.py
rename to erpnext/stock/doctype/stock_uom_replace_utility/__init__.py
diff --git a/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.js b/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.js
similarity index 100%
rename from stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.js
rename to erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.js
diff --git a/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py b/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py
similarity index 98%
rename from stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py
rename to erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py
index 5441c24..2644995 100644
--- a/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py
+++ b/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py
@@ -58,7 +58,7 @@
def update_stock_ledger_entry(self):
# update stock ledger entry
- from stock.stock_ledger import update_entries_after
+ from erpnext.stock.stock_ledger import update_entries_after
if flt(self.doc.conversion_factor) != flt(1):
webnotes.conn.sql("update `tabStock Ledger Entry` set stock_uom = '%s', actual_qty = ifnull(actual_qty,0) * '%s' where item_code = '%s' " % (self.doc.new_stock_uom, self.doc.conversion_factor, self.doc.item_code))
diff --git a/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.txt b/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.txt
similarity index 100%
rename from stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.txt
rename to erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.txt
diff --git a/stock/doctype/uom_conversion_detail/README.md b/erpnext/stock/doctype/uom_conversion_detail/README.md
similarity index 100%
rename from stock/doctype/uom_conversion_detail/README.md
rename to erpnext/stock/doctype/uom_conversion_detail/README.md
diff --git a/stock/doctype/uom_conversion_detail/__init__.py b/erpnext/stock/doctype/uom_conversion_detail/__init__.py
similarity index 100%
rename from stock/doctype/uom_conversion_detail/__init__.py
rename to erpnext/stock/doctype/uom_conversion_detail/__init__.py
diff --git a/stock/doctype/uom_conversion_detail/uom_conversion_detail.py b/erpnext/stock/doctype/uom_conversion_detail/uom_conversion_detail.py
similarity index 100%
rename from stock/doctype/uom_conversion_detail/uom_conversion_detail.py
rename to erpnext/stock/doctype/uom_conversion_detail/uom_conversion_detail.py
diff --git a/stock/doctype/uom_conversion_detail/uom_conversion_detail.txt b/erpnext/stock/doctype/uom_conversion_detail/uom_conversion_detail.txt
similarity index 100%
rename from stock/doctype/uom_conversion_detail/uom_conversion_detail.txt
rename to erpnext/stock/doctype/uom_conversion_detail/uom_conversion_detail.txt
diff --git a/stock/doctype/warehouse/README.md b/erpnext/stock/doctype/warehouse/README.md
similarity index 100%
rename from stock/doctype/warehouse/README.md
rename to erpnext/stock/doctype/warehouse/README.md
diff --git a/stock/doctype/warehouse/__init__.py b/erpnext/stock/doctype/warehouse/__init__.py
similarity index 100%
rename from stock/doctype/warehouse/__init__.py
rename to erpnext/stock/doctype/warehouse/__init__.py
diff --git a/stock/doctype/warehouse/test_warehouse.py b/erpnext/stock/doctype/warehouse/test_warehouse.py
similarity index 100%
rename from stock/doctype/warehouse/test_warehouse.py
rename to erpnext/stock/doctype/warehouse/test_warehouse.py
diff --git a/stock/doctype/warehouse/warehouse.js b/erpnext/stock/doctype/warehouse/warehouse.js
similarity index 100%
rename from stock/doctype/warehouse/warehouse.js
rename to erpnext/stock/doctype/warehouse/warehouse.js
diff --git a/stock/doctype/warehouse/warehouse.py b/erpnext/stock/doctype/warehouse/warehouse.py
similarity index 96%
rename from stock/doctype/warehouse/warehouse.py
rename to erpnext/stock/doctype/warehouse/warehouse.py
index db4ee40..7729b2e 100644
--- a/stock/doctype/warehouse/warehouse.py
+++ b/erpnext/stock/doctype/warehouse/warehouse.py
@@ -93,7 +93,7 @@
def before_rename(self, olddn, newdn, merge=False):
# Add company abbr if not provided
- from setup.doctype.company.company import get_name_with_abbr
+ from erpnext.setup.doctype.company.company import get_name_with_abbr
new_warehouse = get_name_with_abbr(newdn, self.doc.company)
if merge:
@@ -105,7 +105,7 @@
webnotes.conn.sql("delete from `tabBin` where warehouse=%s", olddn)
- from accounts.utils import rename_account_for
+ from erpnext.accounts.utils import rename_account_for
rename_account_for("Warehouse", olddn, new_warehouse, merge)
return new_warehouse
@@ -115,7 +115,7 @@
self.recalculate_bin_qty(newdn)
def recalculate_bin_qty(self, newdn):
- from utilities.repost_stock import repost_stock
+ from erpnext.utilities.repost_stock import repost_stock
webnotes.conn.auto_commit_on_many_writes = 1
webnotes.conn.set_default("allow_negative_stock", 1)
diff --git a/stock/doctype/warehouse/warehouse.txt b/erpnext/stock/doctype/warehouse/warehouse.txt
similarity index 100%
rename from stock/doctype/warehouse/warehouse.txt
rename to erpnext/stock/doctype/warehouse/warehouse.txt
diff --git a/stock/doctype/warehouse_user/README.md b/erpnext/stock/doctype/warehouse_user/README.md
similarity index 100%
rename from stock/doctype/warehouse_user/README.md
rename to erpnext/stock/doctype/warehouse_user/README.md
diff --git a/stock/doctype/warehouse_user/__init__.py b/erpnext/stock/doctype/warehouse_user/__init__.py
similarity index 100%
rename from stock/doctype/warehouse_user/__init__.py
rename to erpnext/stock/doctype/warehouse_user/__init__.py
diff --git a/stock/doctype/warehouse_user/warehouse_user.py b/erpnext/stock/doctype/warehouse_user/warehouse_user.py
similarity index 100%
rename from stock/doctype/warehouse_user/warehouse_user.py
rename to erpnext/stock/doctype/warehouse_user/warehouse_user.py
diff --git a/stock/doctype/warehouse_user/warehouse_user.txt b/erpnext/stock/doctype/warehouse_user/warehouse_user.txt
similarity index 100%
rename from stock/doctype/warehouse_user/warehouse_user.txt
rename to erpnext/stock/doctype/warehouse_user/warehouse_user.txt
diff --git a/stock/page/__init__.py b/erpnext/stock/page/__init__.py
similarity index 100%
rename from stock/page/__init__.py
rename to erpnext/stock/page/__init__.py
diff --git a/erpnext/stock/page/stock_ageing/README.md b/erpnext/stock/page/stock_ageing/README.md
new file mode 100644
index 0000000..e8597b2
--- /dev/null
+++ b/erpnext/stock/page/stock_ageing/README.md
@@ -0,0 +1 @@
+Average "age" of an Item in a particular Warehouse based on First-in-first-out (FIFO).
\ No newline at end of file
diff --git a/accounts/doctype/pos_setting/__init__.py b/erpnext/stock/page/stock_ageing/__init__.py
similarity index 100%
copy from accounts/doctype/pos_setting/__init__.py
copy to erpnext/stock/page/stock_ageing/__init__.py
diff --git a/erpnext/stock/page/stock_ageing/stock_ageing.js b/erpnext/stock/page/stock_ageing/stock_ageing.js
new file mode 100644
index 0000000..33dbf54
--- /dev/null
+++ b/erpnext/stock/page/stock_ageing/stock_ageing.js
@@ -0,0 +1,183 @@
+// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
+// License: GNU General Public License v3. See license.txt
+
+
+wn.pages['stock-ageing'].onload = function(wrapper) {
+ wn.ui.make_app_page({
+ parent: wrapper,
+ title: wn._('Stock Ageing'),
+ single_column: true
+ });
+
+ new erpnext.StockAgeing(wrapper);
+
+
+ wrapper.appframe.add_module_icon("Stock")
+
+}
+
+wn.require("assets/erpnext/js/stock_grid_report.js");
+
+erpnext.StockAgeing = erpnext.StockGridReport.extend({
+ init: function(wrapper) {
+ this._super({
+ title: wn._("Stock Ageing"),
+ page: wrapper,
+ parent: $(wrapper).find('.layout-main'),
+ appframe: wrapper.appframe,
+ doctypes: ["Item", "Warehouse", "Stock Ledger Entry", "Item Group", "Brand", "Serial No"],
+ })
+ },
+ setup_columns: function() {
+ this.columns = [
+ {id: "name", name: wn._("Item"), field: "name", width: 300,
+ link_formatter: {
+ open_btn: true,
+ doctype: '"Item"'
+ }},
+ {id: "item_name", name: wn._("Item Name"), field: "item_name",
+ width: 100, formatter: this.text_formatter},
+ {id: "description", name: wn._("Description"), field: "description",
+ width: 200, formatter: this.text_formatter},
+ {id: "brand", name: wn._("Brand"), field: "brand", width: 100},
+ {id: "average_age", name: wn._("Average Age"), field: "average_age",
+ formatter: this.currency_formatter},
+ {id: "earliest", name: wn._("Earliest"), field: "earliest",
+ formatter: this.currency_formatter},
+ {id: "latest", name: wn._("Latest"), field: "latest",
+ formatter: this.currency_formatter},
+ {id: "stock_uom", name: "UOM", field: "stock_uom", width: 100},
+ ];
+ },
+ filters: [
+ {fieldtype:"Select", label: wn._("Warehouse"), link:"Warehouse",
+ default_value: "Select Warehouse..."},
+ {fieldtype:"Select", label: wn._("Brand"), link:"Brand",
+ default_value: "Select Brand...", filter: function(val, item, opts) {
+ return val == opts.default_value || item.brand == val;
+ }, link_formatter: {filter_input: "brand"}},
+ {fieldtype:"Select", label: wn._("Plot By"),
+ options: ["Average Age", "Earliest", "Latest"]},
+ {fieldtype:"Date", label: wn._("To Date")},
+ {fieldtype:"Button", label: wn._("Refresh"), icon:"icon-refresh icon-white"},
+ {fieldtype:"Button", label: wn._("Reset Filters")}
+ ],
+ setup_filters: function() {
+ var me = this;
+ this._super();
+ this.trigger_refresh_on_change(["warehouse", "plot_by", "brand"]);
+ this.show_zero_check();
+ },
+ init_filter_values: function() {
+ this._super();
+ this.filter_inputs.to_date.val(dateutil.obj_to_user(new Date()));
+ },
+ prepare_data: function() {
+ var me = this;
+
+ if(!this.data) {
+ me._data = wn.report_dump.data["Item"];
+ me.item_by_name = me.make_name_map(me._data);
+ }
+
+ this.data = [].concat(this._data);
+
+ this.serialized_buying_rates = this.get_serialized_buying_rates();
+
+ $.each(this.data, function(i, d) {
+ me.reset_item_values(d);
+ });
+
+ this.prepare_balances();
+
+ // filter out brand
+ this.data = $.map(this.data, function(d) {
+ return me.apply_filter(d, "brand") ? d : null;
+ });
+
+ // filter out rows with zero values
+ this.data = $.map(this.data, function(d) {
+ return me.apply_zero_filter(null, d, null, me) ? d : null;
+ });
+ },
+ prepare_balances: function() {
+ var me = this;
+ var to_date = dateutil.str_to_obj(this.to_date);
+ var data = wn.report_dump.data["Stock Ledger Entry"];
+
+ this.item_warehouse = {};
+
+ for(var i=0, j=data.length; i<j; i++) {
+ var sl = data[i];
+ var posting_date = dateutil.str_to_obj(sl.posting_date);
+
+ if(me.is_default("warehouse") ? true : me.warehouse == sl.warehouse) {
+ var wh = me.get_item_warehouse(sl.warehouse, sl.item_code);
+
+ // call diff to build fifo stack in item_warehouse
+ var diff = me.get_value_diff(wh, sl, true);
+
+ if(posting_date > to_date)
+ break;
+ }
+ }
+
+ $.each(me.data, function(i, item) {
+ var full_fifo_stack = [];
+ if(me.is_default("warehouse")) {
+ $.each(me.item_warehouse[item.name] || {}, function(i, wh) {
+ full_fifo_stack = full_fifo_stack.concat(wh.fifo_stack || [])
+ });
+ } else {
+ full_fifo_stack = me.get_item_warehouse(me.warehouse, item.name).fifo_stack || [];
+ }
+
+ var age_qty = total_qty = 0.0;
+ var min_age = max_age = null;
+
+ $.each(full_fifo_stack, function(i, batch) {
+ var batch_age = dateutil.get_diff(me.to_date, batch[2]);
+ age_qty += batch_age * batch[0];
+ total_qty += batch[0];
+ max_age = Math.max(max_age, batch_age);
+ if(min_age===null) min_age=batch_age;
+ else min_age = Math.min(min_age, batch_age);
+ });
+
+ item.average_age = total_qty.toFixed(2)==0.0 ? 0
+ : (age_qty / total_qty).toFixed(2);
+ item.earliest = max_age || 0.0;
+ item.latest = min_age || 0.0;
+ });
+
+ this.data = this.data.sort(function(a, b) {
+ var sort_by = me.plot_by.replace(" ", "_").toLowerCase();
+ return b[sort_by] - a[sort_by];
+ });
+ },
+ get_plot_data: function() {
+ var data = [];
+ var me = this;
+
+ data.push({
+ label: me.plot_by,
+ data: $.map(me.data, function(item, idx) {
+ return [[idx+1, item[me.plot_by.replace(" ", "_").toLowerCase() ]]]
+ }),
+ bars: {show: true},
+ });
+
+ return data.length ? data : false;
+ },
+ get_plot_options: function() {
+ var me = this;
+ return {
+ grid: { hoverable: true, clickable: true },
+ xaxis: {
+ ticks: $.map(me.data, function(item, idx) { return [[idx+1, item.name]] }),
+ max: 15
+ },
+ series: { downsample: { threshold: 1000 } }
+ }
+ }
+});
\ No newline at end of file
diff --git a/erpnext/stock/page/stock_ageing/stock_ageing.txt b/erpnext/stock/page/stock_ageing/stock_ageing.txt
new file mode 100644
index 0000000..cd1cfbd
--- /dev/null
+++ b/erpnext/stock/page/stock_ageing/stock_ageing.txt
@@ -0,0 +1,37 @@
+[
+ {
+ "creation": "2012-09-21 20:15:14",
+ "docstatus": 0,
+ "modified": "2013-07-11 14:44:08",
+ "modified_by": "Administrator",
+ "owner": "Administrator"
+ },
+ {
+ "doctype": "Page",
+ "icon": "icon-table",
+ "module": "Stock",
+ "name": "__common__",
+ "page_name": "stock-ageing",
+ "standard": "Yes",
+ "title": "Stock Ageing"
+ },
+ {
+ "doctype": "Page Role",
+ "name": "__common__",
+ "parent": "stock-ageing",
+ "parentfield": "roles",
+ "parenttype": "Page"
+ },
+ {
+ "doctype": "Page",
+ "name": "stock-ageing"
+ },
+ {
+ "doctype": "Page Role",
+ "role": "Analytics"
+ },
+ {
+ "doctype": "Page Role",
+ "role": "Material Manager"
+ }
+]
\ No newline at end of file
diff --git a/stock/page/stock_analytics/README.md b/erpnext/stock/page/stock_analytics/README.md
similarity index 100%
rename from stock/page/stock_analytics/README.md
rename to erpnext/stock/page/stock_analytics/README.md
diff --git a/stock/page/stock_analytics/__init__.py b/erpnext/stock/page/stock_analytics/__init__.py
similarity index 100%
rename from stock/page/stock_analytics/__init__.py
rename to erpnext/stock/page/stock_analytics/__init__.py
diff --git a/stock/page/stock_analytics/stock_analytics.js b/erpnext/stock/page/stock_analytics/stock_analytics.js
similarity index 88%
rename from stock/page/stock_analytics/stock_analytics.js
rename to erpnext/stock/page/stock_analytics/stock_analytics.js
index 3fb4a85..ba2c55a 100644
--- a/stock/page/stock_analytics/stock_analytics.js
+++ b/erpnext/stock/page/stock_analytics/stock_analytics.js
@@ -16,4 +16,4 @@
}
-wn.require("app/js/stock_analytics.js");
\ No newline at end of file
+wn.require("assets/erpnext/js/stock_analytics.js");
\ No newline at end of file
diff --git a/stock/page/stock_analytics/stock_analytics.txt b/erpnext/stock/page/stock_analytics/stock_analytics.txt
similarity index 100%
rename from stock/page/stock_analytics/stock_analytics.txt
rename to erpnext/stock/page/stock_analytics/stock_analytics.txt
diff --git a/stock/page/stock_balance/README.md b/erpnext/stock/page/stock_balance/README.md
similarity index 100%
rename from stock/page/stock_balance/README.md
rename to erpnext/stock/page/stock_balance/README.md
diff --git a/stock/page/stock_balance/__init__.py b/erpnext/stock/page/stock_balance/__init__.py
similarity index 100%
rename from stock/page/stock_balance/__init__.py
rename to erpnext/stock/page/stock_balance/__init__.py
diff --git a/stock/page/stock_balance/stock_balance.js b/erpnext/stock/page/stock_balance/stock_balance.js
similarity index 98%
rename from stock/page/stock_balance/stock_balance.js
rename to erpnext/stock/page/stock_balance/stock_balance.js
index 604312f..cc293a4 100644
--- a/stock/page/stock_balance/stock_balance.js
+++ b/erpnext/stock/page/stock_balance/stock_balance.js
@@ -1,7 +1,7 @@
// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
-wn.require("app/js/stock_analytics.js");
+wn.require("assets/erpnext/js/stock_analytics.js");
wn.pages['stock-balance'].onload = function(wrapper) {
wn.ui.make_app_page({
diff --git a/stock/page/stock_balance/stock_balance.txt b/erpnext/stock/page/stock_balance/stock_balance.txt
similarity index 100%
rename from stock/page/stock_balance/stock_balance.txt
rename to erpnext/stock/page/stock_balance/stock_balance.txt
diff --git a/stock/page/stock_home/__init__.py b/erpnext/stock/page/stock_home/__init__.py
similarity index 100%
rename from stock/page/stock_home/__init__.py
rename to erpnext/stock/page/stock_home/__init__.py
diff --git a/stock/page/stock_home/stock_home.js b/erpnext/stock/page/stock_home/stock_home.js
similarity index 100%
rename from stock/page/stock_home/stock_home.js
rename to erpnext/stock/page/stock_home/stock_home.js
diff --git a/stock/page/stock_home/stock_home.txt b/erpnext/stock/page/stock_home/stock_home.txt
similarity index 100%
rename from stock/page/stock_home/stock_home.txt
rename to erpnext/stock/page/stock_home/stock_home.txt
diff --git a/erpnext/stock/page/stock_ledger/README.md b/erpnext/stock/page/stock_ledger/README.md
new file mode 100644
index 0000000..774498b
--- /dev/null
+++ b/erpnext/stock/page/stock_ledger/README.md
@@ -0,0 +1 @@
+Stock movement report based on Stock Ledger Entry.
\ No newline at end of file
diff --git a/accounts/doctype/cost_center/__init__.py b/erpnext/stock/page/stock_ledger/__init__.py
similarity index 100%
copy from accounts/doctype/cost_center/__init__.py
copy to erpnext/stock/page/stock_ledger/__init__.py
diff --git a/erpnext/stock/page/stock_ledger/stock_ledger.js b/erpnext/stock/page/stock_ledger/stock_ledger.js
new file mode 100644
index 0000000..a8a966f
--- /dev/null
+++ b/erpnext/stock/page/stock_ledger/stock_ledger.js
@@ -0,0 +1,247 @@
+// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
+// License: GNU General Public License v3. See license.txt
+
+wn.pages['stock-ledger'].onload = function(wrapper) {
+ wn.ui.make_app_page({
+ parent: wrapper,
+ title: wn._('Stock Ledger'),
+ single_column: true
+ });
+
+ new erpnext.StockLedger(wrapper);
+ wrapper.appframe.add_module_icon("Stock")
+}
+
+wn.require("assets/erpnext/js/stock_grid_report.js");
+
+erpnext.StockLedger = erpnext.StockGridReport.extend({
+ init: function(wrapper) {
+ this._super({
+ title: wn._("Stock Ledger"),
+ page: wrapper,
+ parent: $(wrapper).find('.layout-main'),
+ appframe: wrapper.appframe,
+ doctypes: ["Item", "Item Group", "Warehouse", "Stock Ledger Entry", "Brand", "Serial No"],
+ })
+ },
+
+ setup_columns: function() {
+ this.hide_balance = (this.is_default("item_code") || this.voucher_no) ? true : false;
+ this.columns = [
+ {id: "posting_datetime", name: wn._("Posting Date"), field: "posting_datetime", width: 120,
+ formatter: this.date_formatter},
+ {id: "item_code", name: wn._("Item Code"), field: "item_code", width: 160,
+ link_formatter: {
+ filter_input: "item_code",
+ open_btn: true,
+ doctype: '"Item"',
+ }},
+ {id: "description", name: wn._("Description"), field: "description", width: 200,
+ formatter: this.text_formatter},
+ {id: "warehouse", name: wn._("Warehouse"), field: "warehouse", width: 100,
+ link_formatter: {filter_input: "warehouse"}},
+ {id: "brand", name: wn._("Brand"), field: "brand", width: 100},
+ {id: "stock_uom", name: wn._("UOM"), field: "stock_uom", width: 100},
+ {id: "qty", name: wn._("Qty"), field: "qty", width: 100,
+ formatter: this.currency_formatter},
+ {id: "balance", name: wn._("Balance Qty"), field: "balance", width: 100,
+ formatter: this.currency_formatter,
+ hidden: this.hide_balance},
+ {id: "balance_value", name: wn._("Balance Value"), field: "balance_value", width: 100,
+ formatter: this.currency_formatter, hidden: this.hide_balance},
+ {id: "voucher_type", name: wn._("Voucher Type"), field: "voucher_type", width: 120},
+ {id: "voucher_no", name: wn._("Voucher No"), field: "voucher_no", width: 160,
+ link_formatter: {
+ filter_input: "voucher_no",
+ open_btn: true,
+ doctype: "dataContext.voucher_type"
+ }},
+ ];
+
+ },
+ filters: [
+ {fieldtype:"Select", label: wn._("Warehouse"), link:"Warehouse",
+ default_value: "Select Warehouse...", filter: function(val, item, opts) {
+ return item.warehouse == val || val == opts.default_value;
+ }},
+ {fieldtype:"Link", label: wn._("Item Code"), link:"Item", default_value: "Select Item...",
+ filter: function(val, item, opts) {
+ return item.item_code == val || !val;
+ }},
+ {fieldtype:"Select", label: "Brand", link:"Brand",
+ default_value: "Select Brand...", filter: function(val, item, opts) {
+ return val == opts.default_value || item.brand == val || item._show;
+ }, link_formatter: {filter_input: "brand"}},
+ {fieldtype:"Data", label: wn._("Voucher No"),
+ filter: function(val, item, opts) {
+ if(!val) return true;
+ return (item.voucher_no && item.voucher_no.indexOf(val)!=-1);
+ }},
+ {fieldtype:"Date", label: wn._("From Date"), filter: function(val, item) {
+ return dateutil.str_to_obj(val) <= dateutil.str_to_obj(item.posting_date);
+ }},
+ {fieldtype:"Label", label: wn._("To")},
+ {fieldtype:"Date", label: wn._("To Date"), filter: function(val, item) {
+ return dateutil.str_to_obj(val) >= dateutil.str_to_obj(item.posting_date);
+ }},
+ {fieldtype:"Button", label: wn._("Refresh"), icon:"icon-refresh icon-white"},
+ {fieldtype:"Button", label: wn._("Reset Filters")}
+ ],
+
+ setup_filters: function() {
+ var me = this;
+ this._super();
+
+ this.wrapper.bind("apply_filters_from_route", function() { me.toggle_enable_brand(); });
+ this.filter_inputs.item_code.change(function() { me.toggle_enable_brand(); });
+
+ this.trigger_refresh_on_change(["item_code", "warehouse", "brand"]);
+ },
+
+ toggle_enable_brand: function() {
+ if(!this.filter_inputs.item_code.val()) {
+ this.filter_inputs.brand.prop("disabled", false);
+ } else {
+ this.filter_inputs.brand
+ .val(this.filter_inputs.brand.get(0).opts.default_value)
+ .prop("disabled", true);
+ }
+ },
+
+ init_filter_values: function() {
+ this._super();
+ this.filter_inputs.warehouse.get(0).selectedIndex = 0;
+ },
+ prepare_data: function() {
+ var me = this;
+ if(!this.item_by_name)
+ this.item_by_name = this.make_name_map(wn.report_dump.data["Item"]);
+ var data = wn.report_dump.data["Stock Ledger Entry"];
+ var out = [];
+
+ var opening = {
+ item_code: "On " + dateutil.str_to_user(this.from_date), qty: 0.0, balance: 0.0,
+ id:"_opening", _show: true, _style: "font-weight: bold", balance_value: 0.0
+ }
+ var total_in = {
+ item_code: "Total In", qty: 0.0, balance: 0.0, balance_value: 0.0,
+ id:"_total_in", _show: true, _style: "font-weight: bold"
+ }
+ var total_out = {
+ item_code: "Total Out", qty: 0.0, balance: 0.0, balance_value: 0.0,
+ id:"_total_out", _show: true, _style: "font-weight: bold"
+ }
+
+ // clear balance
+ $.each(wn.report_dump.data["Item"], function(i, item) {
+ item.balance = item.balance_value = 0.0;
+ });
+
+ // initialize warehouse-item map
+ this.item_warehouse = {};
+ this.serialized_buying_rates = this.get_serialized_buying_rates();
+ var from_datetime = dateutil.str_to_obj(me.from_date + " 00:00:00");
+ var to_datetime = dateutil.str_to_obj(me.to_date + " 23:59:59");
+
+ //
+ for(var i=0, j=data.length; i<j; i++) {
+ var sl = data[i];
+ var item = me.item_by_name[sl.item_code]
+ var wh = me.get_item_warehouse(sl.warehouse, sl.item_code);
+ sl.description = item.description;
+ sl.posting_datetime = sl.posting_date + " " + (sl.posting_time || "00:00:00");
+ sl.brand = item.brand;
+ var posting_datetime = dateutil.str_to_obj(sl.posting_datetime);
+
+ var is_fifo = item.valuation_method ? item.valuation_method=="FIFO"
+ : sys_defaults.valuation_method=="FIFO";
+ var value_diff = me.get_value_diff(wh, sl, is_fifo);
+
+ // opening, transactions, closing, total in, total out
+ var before_end = posting_datetime <= to_datetime;
+ if((!me.is_default("item_code") ? me.apply_filter(sl, "item_code") : true)
+ && me.apply_filter(sl, "warehouse") && me.apply_filter(sl, "voucher_no")
+ && me.apply_filter(sl, "brand")) {
+ if(posting_datetime < from_datetime) {
+ opening.balance += sl.qty;
+ opening.balance_value += value_diff;
+ } else if(before_end) {
+ if(sl.qty > 0) {
+ total_in.qty += sl.qty;
+ total_in.balance_value += value_diff;
+ } else {
+ total_out.qty += (-1 * sl.qty);
+ total_out.balance_value += value_diff;
+ }
+ }
+ }
+
+ if(!before_end) break;
+
+ // apply filters
+ if(me.apply_filters(sl)) {
+ out.push(sl);
+ }
+
+ // update balance
+ if((!me.is_default("warehouse") ? me.apply_filter(sl, "warehouse") : true)) {
+ sl.balance = me.item_by_name[sl.item_code].balance + sl.qty;
+ me.item_by_name[sl.item_code].balance = sl.balance;
+
+ sl.balance_value = me.item_by_name[sl.item_code].balance_value + value_diff;
+ me.item_by_name[sl.item_code].balance_value = sl.balance_value;
+ }
+ }
+
+ if(me.item_code && !me.voucher_no) {
+ var closing = {
+ item_code: "On " + dateutil.str_to_user(this.to_date),
+ balance: (out.length ? out[out.length-1].balance : 0), qty: 0,
+ balance_value: (out.length ? out[out.length-1].balance_value : 0),
+ id:"_closing", _show: true, _style: "font-weight: bold"
+ };
+ total_out.balance_value = -total_out.balance_value;
+ var out = [opening].concat(out).concat([total_in, total_out, closing]);
+ }
+
+ this.data = out;
+ },
+ get_plot_data: function() {
+ var data = [];
+ var me = this;
+ if(me.hide_balance) return false;
+ data.push({
+ label: me.item_code,
+ data: [[dateutil.str_to_obj(me.from_date).getTime(), me.data[0].balance]]
+ .concat($.map(me.data, function(col, idx) {
+ if (col.posting_datetime) {
+ return [[dateutil.str_to_obj(col.posting_datetime).getTime(), col.balance - col.qty],
+ [dateutil.str_to_obj(col.posting_datetime).getTime(), col.balance]]
+ }
+ return null;
+ })).concat([
+ // closing
+ [dateutil.str_to_obj(me.to_date).getTime(), me.data[me.data.length - 1].balance]
+ ]),
+ points: {show: true},
+ lines: {show: true, fill: true},
+ });
+ return data;
+ },
+ get_plot_options: function() {
+ return {
+ grid: { hoverable: true, clickable: true },
+ xaxis: { mode: "time",
+ min: dateutil.str_to_obj(this.from_date).getTime(),
+ max: dateutil.str_to_obj(this.to_date).getTime(),
+ },
+ series: { downsample: { threshold: 1000 } }
+ }
+ },
+ get_tooltip_text: function(label, x, y) {
+ var d = new Date(x);
+ var date = dateutil.obj_to_user(d) + " " + d.getHours() + ":" + d.getMinutes();
+ var value = format_number(y);
+ return value.bold() + " on " + date;
+ }
+});
\ No newline at end of file
diff --git a/erpnext/stock/page/stock_ledger/stock_ledger.txt b/erpnext/stock/page/stock_ledger/stock_ledger.txt
new file mode 100644
index 0000000..9c2a4b7
--- /dev/null
+++ b/erpnext/stock/page/stock_ledger/stock_ledger.txt
@@ -0,0 +1,41 @@
+[
+ {
+ "creation": "2012-09-21 20:15:14",
+ "docstatus": 0,
+ "modified": "2013-07-11 14:44:19",
+ "modified_by": "Administrator",
+ "owner": "Administrator"
+ },
+ {
+ "doctype": "Page",
+ "icon": "icon-table",
+ "module": "Stock",
+ "name": "__common__",
+ "page_name": "stock-ledger",
+ "standard": "Yes",
+ "title": "Stock Ledger"
+ },
+ {
+ "doctype": "Page Role",
+ "name": "__common__",
+ "parent": "stock-ledger",
+ "parentfield": "roles",
+ "parenttype": "Page"
+ },
+ {
+ "doctype": "Page",
+ "name": "stock-ledger"
+ },
+ {
+ "doctype": "Page Role",
+ "role": "Analytics"
+ },
+ {
+ "doctype": "Page Role",
+ "role": "Material Manager"
+ },
+ {
+ "doctype": "Page Role",
+ "role": "Material User"
+ }
+]
\ No newline at end of file
diff --git a/erpnext/stock/page/stock_level/README.md b/erpnext/stock/page/stock_level/README.md
new file mode 100644
index 0000000..43b2b0f
--- /dev/null
+++ b/erpnext/stock/page/stock_level/README.md
@@ -0,0 +1 @@
+Stock levels (actual, planned, reserved, ordered) for Items on a particular date.
\ No newline at end of file
diff --git a/stock/report/itemwise_recommended_reorder_level/__init__.py b/erpnext/stock/page/stock_level/__init__.py
similarity index 100%
copy from stock/report/itemwise_recommended_reorder_level/__init__.py
copy to erpnext/stock/page/stock_level/__init__.py
diff --git a/erpnext/stock/page/stock_level/stock_level.js b/erpnext/stock/page/stock_level/stock_level.js
new file mode 100644
index 0000000..8cef636
--- /dev/null
+++ b/erpnext/stock/page/stock_level/stock_level.js
@@ -0,0 +1,228 @@
+// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
+// License: GNU General Public License v3. See license.txt
+
+wn.pages['stock-level'].onload = function(wrapper) {
+ wn.ui.make_app_page({
+ parent: wrapper,
+ title: wn._('Stock Level'),
+ single_column: true
+ });
+
+ new erpnext.StockLevel(wrapper);
+
+
+ wrapper.appframe.add_module_icon("Stock")
+ ;
+}
+
+wn.require("assets/erpnext/js/stock_grid_report.js");
+
+erpnext.StockLevel = erpnext.StockGridReport.extend({
+ init: function(wrapper) {
+ var me = this;
+
+ this._super({
+ title: wn._("Stock Level"),
+ page: wrapper,
+ parent: $(wrapper).find('.layout-main'),
+ appframe: wrapper.appframe,
+ doctypes: ["Item", "Warehouse", "Stock Ledger Entry", "Production Order",
+ "Material Request Item", "Purchase Order Item", "Sales Order Item", "Brand", "Serial No"],
+ });
+
+ this.wrapper.bind("make", function() {
+ wn.utils.set_footnote(me, me.wrapper.get(0),
+ "<ul> \
+ <li style='font-weight: bold;'> \
+ Projected Qty = Actual Qty + Planned Qty + Requested Qty \
+ + Ordered Qty - Reserved Qty </li> \
+ <ul> \
+ <li>"+wn._("Actual Qty: Quantity available in the warehouse.") +"</li>"+
+ "<li>"+wn._("Planned Qty: Quantity, for which, Production Order has been raised,")+
+ wn._("but is pending to be manufactured.")+ "</li> " +
+ "<li>"+wn._("Requested Qty: Quantity requested for purchase, but not ordered.") + "</li>" +
+ "<li>" + wn._("Ordered Qty: Quantity ordered for purchase, but not received.")+ "</li>" +
+ "<li>" + wn._("Reserved Qty: Quantity ordered for sale, but not delivered.") + "</li>" +
+ "</ul> \
+ </ul>");
+ });
+ },
+
+ setup_columns: function() {
+ this.columns = [
+ {id: "item_code", name: wn._("Item Code"), field: "item_code", width: 160,
+ link_formatter: {
+ filter_input: "item_code",
+ open_btn: true,
+ doctype: '"Item"',
+ }},
+ {id: "item_name", name: wn._("Item Name"), field: "item_name", width: 100,
+ formatter: this.text_formatter},
+ {id: "description", name: wn._("Description"), field: "description", width: 200,
+ formatter: this.text_formatter},
+ {id: "brand", name: wn._("Brand"), field: "brand", width: 100,
+ link_formatter: {filter_input: "brand"}},
+ {id: "warehouse", name: wn._("Warehouse"), field: "warehouse", width: 100,
+ link_formatter: {filter_input: "warehouse"}},
+ {id: "uom", name: wn._("UOM"), field: "uom", width: 60},
+ {id: "actual_qty", name: wn._("Actual Qty"),
+ field: "actual_qty", width: 80, formatter: this.currency_formatter},
+ {id: "planned_qty", name: wn._("Planned Qty"),
+ field: "planned_qty", width: 80, formatter: this.currency_formatter},
+ {id: "requested_qty", name: wn._("Requested Qty"),
+ field: "requested_qty", width: 80, formatter: this.currency_formatter},
+ {id: "ordered_qty", name: wn._("Ordered Qty"),
+ field: "ordered_qty", width: 80, formatter: this.currency_formatter},
+ {id: "reserved_qty", name: wn._("Reserved Qty"),
+ field: "reserved_qty", width: 80, formatter: this.currency_formatter},
+ {id: "projected_qty", name: wn._("Projected Qty"),
+ field: "projected_qty", width: 80, formatter: this.currency_formatter},
+ {id: "re_order_level", name: wn._("Re-Order Level"),
+ field: "re_order_level", width: 80, formatter: this.currency_formatter},
+ {id: "re_order_qty", name: wn._("Re-Order Qty"),
+ field: "re_order_qty", width: 80, formatter: this.currency_formatter},
+ ];
+ },
+
+ filters: [
+ {fieldtype:"Link", label: wn._("Item Code"), link:"Item", default_value: "Select Item...",
+ filter: function(val, item, opts) {
+ return item.item_code == val || !val;
+ }},
+
+ {fieldtype:"Select", label: wn._("Warehouse"), link:"Warehouse",
+ default_value: "Select Warehouse...", filter: function(val, item, opts) {
+ return item.warehouse == val || val == opts.default_value;
+ }},
+
+ {fieldtype:"Select", label: wn._("Brand"), link:"Brand",
+ default_value: "Select Brand...", filter: function(val, item, opts) {
+ return val == opts.default_value || item.brand == val;
+ }},
+ {fieldtype:"Button", label: wn._("Refresh"), icon:"icon-refresh icon-white"},
+ {fieldtype:"Button", label: wn._("Reset Filters")}
+ ],
+
+ setup_filters: function() {
+ var me = this;
+ this._super();
+
+ this.wrapper.bind("apply_filters_from_route", function() { me.toggle_enable_brand(); });
+ this.filter_inputs.item_code.change(function() { me.toggle_enable_brand(); });
+
+ this.trigger_refresh_on_change(["item_code", "warehouse", "brand"]);
+ },
+
+ toggle_enable_brand: function() {
+ if(!this.filter_inputs.item_code.val()) {
+ this.filter_inputs.brand.prop("disabled", false);
+ } else {
+ this.filter_inputs.brand
+ .val(this.filter_inputs.brand.get(0).opts.default_value)
+ .prop("disabled", true);
+ }
+ },
+
+ init_filter_values: function() {
+ this._super();
+ this.filter_inputs.warehouse.get(0).selectedIndex = 0;
+ },
+
+ prepare_data: function() {
+ var me = this;
+
+ if(!this._data) {
+ this._data = [];
+ this.item_warehouse_map = {};
+ this.item_by_name = this.make_name_map(wn.report_dump.data["Item"]);
+ this.calculate_quantities();
+ }
+
+ this.data = [].concat(this._data);
+ this.data = $.map(this.data, function(d) {
+ return me.apply_filters(d) ? d : null;
+ });
+
+ this.calculate_total();
+ },
+
+ calculate_quantities: function() {
+ var me = this;
+ $.each([
+ ["Stock Ledger Entry", "actual_qty"],
+ ["Production Order", "planned_qty"],
+ ["Material Request Item", "requested_qty"],
+ ["Purchase Order Item", "ordered_qty"],
+ ["Sales Order Item", "reserved_qty"]],
+ function(i, v) {
+ $.each(wn.report_dump.data[v[0]], function(i, item) {
+ var row = me.get_row(item.item_code, item.warehouse);
+ row[v[1]] += flt(item.qty);
+ });
+ }
+ );
+
+ // sort by item, warehouse
+ this._data = $.map(Object.keys(this.item_warehouse_map).sort(), function(key) {
+ return me.item_warehouse_map[key];
+ });
+
+ // calculate projected qty
+ $.each(this._data, function(i, row) {
+ row.projected_qty = row.actual_qty + row.planned_qty + row.requested_qty
+ + row.ordered_qty - row.reserved_qty;
+ });
+
+ // filter out rows with zero values
+ this._data = $.map(this._data, function(d) {
+ return me.apply_zero_filter(null, d, null, me) ? d : null;
+ });
+ },
+
+ get_row: function(item_code, warehouse) {
+ var key = item_code + ":" + warehouse;
+ if(!this.item_warehouse_map[key]) {
+ var item = this.item_by_name[item_code];
+ var row = {
+ item_code: item_code,
+ warehouse: warehouse,
+ description: item.description,
+ brand: item.brand,
+ item_name: item.item_name || item.name,
+ uom: item.stock_uom,
+ id: key,
+ }
+ this.reset_item_values(row);
+
+ row["re_order_level"] = item.re_order_level
+ row["re_order_qty"] = item.re_order_qty
+
+ this.item_warehouse_map[key] = row;
+ }
+ return this.item_warehouse_map[key];
+ },
+
+ calculate_total: function() {
+ var me = this;
+ // show total if a specific item is selected and warehouse is not filtered
+ if(this.is_default("warehouse") && !this.is_default("item_code")) {
+ var total = {
+ id: "_total",
+ item_code: "Total",
+ _style: "font-weight: bold",
+ _show: true
+ };
+ this.reset_item_values(total);
+
+ $.each(this.data, function(i, row) {
+ $.each(me.columns, function(i, col) {
+ if (col.formatter==me.currency_formatter) {
+ total[col.id] += row[col.id];
+ }
+ });
+ });
+
+ this.data = this.data.concat([total]);
+ }
+ }
+})
diff --git a/erpnext/stock/page/stock_level/stock_level.txt b/erpnext/stock/page/stock_level/stock_level.txt
new file mode 100644
index 0000000..bae3d9c
--- /dev/null
+++ b/erpnext/stock/page/stock_level/stock_level.txt
@@ -0,0 +1,37 @@
+[
+ {
+ "creation": "2012-12-31 10:52:14",
+ "docstatus": 0,
+ "modified": "2013-07-11 14:44:21",
+ "modified_by": "Administrator",
+ "owner": "Administrator"
+ },
+ {
+ "doctype": "Page",
+ "icon": "icon-table",
+ "module": "Stock",
+ "name": "__common__",
+ "page_name": "stock-level",
+ "standard": "Yes",
+ "title": "Stock Level"
+ },
+ {
+ "doctype": "Page Role",
+ "name": "__common__",
+ "parent": "stock-level",
+ "parentfield": "roles",
+ "parenttype": "Page"
+ },
+ {
+ "doctype": "Page",
+ "name": "stock-level"
+ },
+ {
+ "doctype": "Page Role",
+ "role": "Material Manager"
+ },
+ {
+ "doctype": "Page Role",
+ "role": "Analytics"
+ }
+]
\ No newline at end of file
diff --git a/stock/report/__init__.py b/erpnext/stock/report/__init__.py
similarity index 100%
rename from stock/report/__init__.py
rename to erpnext/stock/report/__init__.py
diff --git a/stock/report/batch_wise_balance_history/__init__.py b/erpnext/stock/report/batch_wise_balance_history/__init__.py
similarity index 100%
rename from stock/report/batch_wise_balance_history/__init__.py
rename to erpnext/stock/report/batch_wise_balance_history/__init__.py
diff --git a/stock/report/batch_wise_balance_history/batch_wise_balance_history.js b/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.js
similarity index 100%
rename from stock/report/batch_wise_balance_history/batch_wise_balance_history.js
rename to erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.js
diff --git a/stock/report/batch_wise_balance_history/batch_wise_balance_history.py b/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py
similarity index 100%
rename from stock/report/batch_wise_balance_history/batch_wise_balance_history.py
rename to erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py
diff --git a/stock/report/batch_wise_balance_history/batch_wise_balance_history.txt b/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.txt
similarity index 100%
rename from stock/report/batch_wise_balance_history/batch_wise_balance_history.txt
rename to erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.txt
diff --git a/stock/report/delivery_note_trends/__init__.py b/erpnext/stock/report/delivery_note_trends/__init__.py
similarity index 100%
rename from stock/report/delivery_note_trends/__init__.py
rename to erpnext/stock/report/delivery_note_trends/__init__.py
diff --git a/stock/report/delivery_note_trends/delivery_note_trends.js b/erpnext/stock/report/delivery_note_trends/delivery_note_trends.js
similarity index 78%
rename from stock/report/delivery_note_trends/delivery_note_trends.js
rename to erpnext/stock/report/delivery_note_trends/delivery_note_trends.js
index ab0147b..568d982 100644
--- a/stock/report/delivery_note_trends/delivery_note_trends.js
+++ b/erpnext/stock/report/delivery_note_trends/delivery_note_trends.js
@@ -1,7 +1,7 @@
// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
-wn.require("app/js/sales_trends_filters.js");
+wn.require("assets/erpnext/js/sales_trends_filters.js");
wn.query_reports["Delivery Note Trends"] = {
filters: get_filters()
diff --git a/stock/report/delivery_note_trends/delivery_note_trends.py b/erpnext/stock/report/delivery_note_trends/delivery_note_trends.py
similarity index 86%
rename from stock/report/delivery_note_trends/delivery_note_trends.py
rename to erpnext/stock/report/delivery_note_trends/delivery_note_trends.py
index 6cd6f8e..a3f4218 100644
--- a/stock/report/delivery_note_trends/delivery_note_trends.py
+++ b/erpnext/stock/report/delivery_note_trends/delivery_note_trends.py
@@ -3,7 +3,7 @@
from __future__ import unicode_literals
import webnotes
-from controllers.trends import get_columns,get_data
+from erpnext.controllers.trends import get_columns,get_data
def execute(filters=None):
if not filters: filters ={}
diff --git a/stock/report/delivery_note_trends/delivery_note_trends.txt b/erpnext/stock/report/delivery_note_trends/delivery_note_trends.txt
similarity index 100%
rename from stock/report/delivery_note_trends/delivery_note_trends.txt
rename to erpnext/stock/report/delivery_note_trends/delivery_note_trends.txt
diff --git a/stock/report/item_prices/__init__.py b/erpnext/stock/report/item_prices/__init__.py
similarity index 100%
rename from stock/report/item_prices/__init__.py
rename to erpnext/stock/report/item_prices/__init__.py
diff --git a/stock/report/item_prices/item_prices.py b/erpnext/stock/report/item_prices/item_prices.py
similarity index 100%
rename from stock/report/item_prices/item_prices.py
rename to erpnext/stock/report/item_prices/item_prices.py
diff --git a/stock/report/item_prices/item_prices.txt b/erpnext/stock/report/item_prices/item_prices.txt
similarity index 100%
rename from stock/report/item_prices/item_prices.txt
rename to erpnext/stock/report/item_prices/item_prices.txt
diff --git a/stock/report/item_shortage_report/__init__.py b/erpnext/stock/report/item_shortage_report/__init__.py
similarity index 100%
rename from stock/report/item_shortage_report/__init__.py
rename to erpnext/stock/report/item_shortage_report/__init__.py
diff --git a/stock/report/item_shortage_report/item_shortage_report.txt b/erpnext/stock/report/item_shortage_report/item_shortage_report.txt
similarity index 100%
rename from stock/report/item_shortage_report/item_shortage_report.txt
rename to erpnext/stock/report/item_shortage_report/item_shortage_report.txt
diff --git a/stock/report/items_to_be_requested/__init__.py b/erpnext/stock/report/items_to_be_requested/__init__.py
similarity index 100%
rename from stock/report/items_to_be_requested/__init__.py
rename to erpnext/stock/report/items_to_be_requested/__init__.py
diff --git a/stock/report/items_to_be_requested/items_to_be_requested.txt b/erpnext/stock/report/items_to_be_requested/items_to_be_requested.txt
similarity index 100%
rename from stock/report/items_to_be_requested/items_to_be_requested.txt
rename to erpnext/stock/report/items_to_be_requested/items_to_be_requested.txt
diff --git a/stock/report/itemwise_recommended_reorder_level/__init__.py b/erpnext/stock/report/itemwise_recommended_reorder_level/__init__.py
similarity index 100%
rename from stock/report/itemwise_recommended_reorder_level/__init__.py
rename to erpnext/stock/report/itemwise_recommended_reorder_level/__init__.py
diff --git a/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.js b/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.js
similarity index 100%
rename from stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.js
rename to erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.js
diff --git a/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py b/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py
similarity index 100%
rename from stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py
rename to erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py
diff --git a/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.txt b/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.txt
similarity index 100%
rename from stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.txt
rename to erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.txt
diff --git a/stock/report/material_requests_for_which_supplier_quotations_are_not_created/__init__.py b/erpnext/stock/report/material_requests_for_which_supplier_quotations_are_not_created/__init__.py
similarity index 100%
rename from stock/report/material_requests_for_which_supplier_quotations_are_not_created/__init__.py
rename to erpnext/stock/report/material_requests_for_which_supplier_quotations_are_not_created/__init__.py
diff --git a/stock/report/material_requests_for_which_supplier_quotations_are_not_created/material_requests_for_which_supplier_quotations_are_not_created.txt b/erpnext/stock/report/material_requests_for_which_supplier_quotations_are_not_created/material_requests_for_which_supplier_quotations_are_not_created.txt
similarity index 100%
rename from stock/report/material_requests_for_which_supplier_quotations_are_not_created/material_requests_for_which_supplier_quotations_are_not_created.txt
rename to erpnext/stock/report/material_requests_for_which_supplier_quotations_are_not_created/material_requests_for_which_supplier_quotations_are_not_created.txt
diff --git a/stock/report/ordered_items_to_be_delivered/__init__.py b/erpnext/stock/report/ordered_items_to_be_delivered/__init__.py
similarity index 100%
rename from stock/report/ordered_items_to_be_delivered/__init__.py
rename to erpnext/stock/report/ordered_items_to_be_delivered/__init__.py
diff --git a/stock/report/ordered_items_to_be_delivered/ordered_items_to_be_delivered.txt b/erpnext/stock/report/ordered_items_to_be_delivered/ordered_items_to_be_delivered.txt
similarity index 100%
rename from stock/report/ordered_items_to_be_delivered/ordered_items_to_be_delivered.txt
rename to erpnext/stock/report/ordered_items_to_be_delivered/ordered_items_to_be_delivered.txt
diff --git a/stock/report/purchase_in_transit/__init__.py b/erpnext/stock/report/purchase_in_transit/__init__.py
similarity index 100%
rename from stock/report/purchase_in_transit/__init__.py
rename to erpnext/stock/report/purchase_in_transit/__init__.py
diff --git a/stock/report/purchase_in_transit/purchase_in_transit.txt b/erpnext/stock/report/purchase_in_transit/purchase_in_transit.txt
similarity index 100%
rename from stock/report/purchase_in_transit/purchase_in_transit.txt
rename to erpnext/stock/report/purchase_in_transit/purchase_in_transit.txt
diff --git a/stock/report/purchase_order_items_to_be_received/__init__.py b/erpnext/stock/report/purchase_order_items_to_be_received/__init__.py
similarity index 100%
rename from stock/report/purchase_order_items_to_be_received/__init__.py
rename to erpnext/stock/report/purchase_order_items_to_be_received/__init__.py
diff --git a/stock/report/purchase_order_items_to_be_received/purchase_order_items_to_be_received.txt b/erpnext/stock/report/purchase_order_items_to_be_received/purchase_order_items_to_be_received.txt
similarity index 100%
rename from stock/report/purchase_order_items_to_be_received/purchase_order_items_to_be_received.txt
rename to erpnext/stock/report/purchase_order_items_to_be_received/purchase_order_items_to_be_received.txt
diff --git a/stock/report/purchase_receipt_trends/__init__.py b/erpnext/stock/report/purchase_receipt_trends/__init__.py
similarity index 100%
rename from stock/report/purchase_receipt_trends/__init__.py
rename to erpnext/stock/report/purchase_receipt_trends/__init__.py
diff --git a/stock/report/purchase_receipt_trends/purchase_receipt_trends.js b/erpnext/stock/report/purchase_receipt_trends/purchase_receipt_trends.js
similarity index 77%
rename from stock/report/purchase_receipt_trends/purchase_receipt_trends.js
rename to erpnext/stock/report/purchase_receipt_trends/purchase_receipt_trends.js
index c3397f7..f66fcfc 100644
--- a/stock/report/purchase_receipt_trends/purchase_receipt_trends.js
+++ b/erpnext/stock/report/purchase_receipt_trends/purchase_receipt_trends.js
@@ -1,7 +1,7 @@
// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
-wn.require("app/js/purchase_trends_filters.js");
+wn.require("assets/erpnext/js/purchase_trends_filters.js");
wn.query_reports["Purchase Receipt Trends"] = {
filters: get_filters()
diff --git a/stock/report/purchase_receipt_trends/purchase_receipt_trends.py b/erpnext/stock/report/purchase_receipt_trends/purchase_receipt_trends.py
similarity index 86%
rename from stock/report/purchase_receipt_trends/purchase_receipt_trends.py
rename to erpnext/stock/report/purchase_receipt_trends/purchase_receipt_trends.py
index 5fd003b..6be1179 100644
--- a/stock/report/purchase_receipt_trends/purchase_receipt_trends.py
+++ b/erpnext/stock/report/purchase_receipt_trends/purchase_receipt_trends.py
@@ -3,7 +3,7 @@
from __future__ import unicode_literals
import webnotes
-from controllers.trends import get_columns,get_data
+from erpnext.controllers.trends import get_columns,get_data
def execute(filters=None):
if not filters: filters ={}
diff --git a/stock/report/purchase_receipt_trends/purchase_receipt_trends.txt b/erpnext/stock/report/purchase_receipt_trends/purchase_receipt_trends.txt
similarity index 100%
rename from stock/report/purchase_receipt_trends/purchase_receipt_trends.txt
rename to erpnext/stock/report/purchase_receipt_trends/purchase_receipt_trends.txt
diff --git a/stock/report/requested_items_to_be_transferred/__init__.py b/erpnext/stock/report/requested_items_to_be_transferred/__init__.py
similarity index 100%
rename from stock/report/requested_items_to_be_transferred/__init__.py
rename to erpnext/stock/report/requested_items_to_be_transferred/__init__.py
diff --git a/stock/report/requested_items_to_be_transferred/requested_items_to_be_transferred.txt b/erpnext/stock/report/requested_items_to_be_transferred/requested_items_to_be_transferred.txt
similarity index 100%
rename from stock/report/requested_items_to_be_transferred/requested_items_to_be_transferred.txt
rename to erpnext/stock/report/requested_items_to_be_transferred/requested_items_to_be_transferred.txt
diff --git a/stock/report/serial_no_service_contract_expiry/__init__.py b/erpnext/stock/report/serial_no_service_contract_expiry/__init__.py
similarity index 100%
rename from stock/report/serial_no_service_contract_expiry/__init__.py
rename to erpnext/stock/report/serial_no_service_contract_expiry/__init__.py
diff --git a/stock/report/serial_no_service_contract_expiry/serial_no_service_contract_expiry.txt b/erpnext/stock/report/serial_no_service_contract_expiry/serial_no_service_contract_expiry.txt
similarity index 100%
rename from stock/report/serial_no_service_contract_expiry/serial_no_service_contract_expiry.txt
rename to erpnext/stock/report/serial_no_service_contract_expiry/serial_no_service_contract_expiry.txt
diff --git a/stock/report/serial_no_status/__init__.py b/erpnext/stock/report/serial_no_status/__init__.py
similarity index 100%
rename from stock/report/serial_no_status/__init__.py
rename to erpnext/stock/report/serial_no_status/__init__.py
diff --git a/stock/report/serial_no_status/serial_no_status.txt b/erpnext/stock/report/serial_no_status/serial_no_status.txt
similarity index 100%
rename from stock/report/serial_no_status/serial_no_status.txt
rename to erpnext/stock/report/serial_no_status/serial_no_status.txt
diff --git a/stock/report/serial_no_warranty_expiry/__init__.py b/erpnext/stock/report/serial_no_warranty_expiry/__init__.py
similarity index 100%
rename from stock/report/serial_no_warranty_expiry/__init__.py
rename to erpnext/stock/report/serial_no_warranty_expiry/__init__.py
diff --git a/stock/report/serial_no_warranty_expiry/serial_no_warranty_expiry.txt b/erpnext/stock/report/serial_no_warranty_expiry/serial_no_warranty_expiry.txt
similarity index 100%
rename from stock/report/serial_no_warranty_expiry/serial_no_warranty_expiry.txt
rename to erpnext/stock/report/serial_no_warranty_expiry/serial_no_warranty_expiry.txt
diff --git a/stock/report/stock_ledger/__init__.py b/erpnext/stock/report/stock_ledger/__init__.py
similarity index 100%
rename from stock/report/stock_ledger/__init__.py
rename to erpnext/stock/report/stock_ledger/__init__.py
diff --git a/stock/report/stock_ledger/stock_ledger.js b/erpnext/stock/report/stock_ledger/stock_ledger.js
similarity index 100%
rename from stock/report/stock_ledger/stock_ledger.js
rename to erpnext/stock/report/stock_ledger/stock_ledger.js
diff --git a/stock/report/stock_ledger/stock_ledger.py b/erpnext/stock/report/stock_ledger/stock_ledger.py
similarity index 100%
rename from stock/report/stock_ledger/stock_ledger.py
rename to erpnext/stock/report/stock_ledger/stock_ledger.py
diff --git a/stock/report/stock_ledger/stock_ledger.txt b/erpnext/stock/report/stock_ledger/stock_ledger.txt
similarity index 100%
rename from stock/report/stock_ledger/stock_ledger.txt
rename to erpnext/stock/report/stock_ledger/stock_ledger.txt
diff --git a/stock/report/supplier_wise_sales_analytics/__init__.py b/erpnext/stock/report/supplier_wise_sales_analytics/__init__.py
similarity index 100%
rename from stock/report/supplier_wise_sales_analytics/__init__.py
rename to erpnext/stock/report/supplier_wise_sales_analytics/__init__.py
diff --git a/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.js b/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.js
similarity index 100%
rename from stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.js
rename to erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.js
diff --git a/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py b/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py
similarity index 100%
rename from stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py
rename to erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py
diff --git a/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.txt b/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.txt
similarity index 100%
rename from stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.txt
rename to erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.txt
diff --git a/stock/report/warehouse_wise_stock_balance/__init__.py b/erpnext/stock/report/warehouse_wise_stock_balance/__init__.py
similarity index 100%
rename from stock/report/warehouse_wise_stock_balance/__init__.py
rename to erpnext/stock/report/warehouse_wise_stock_balance/__init__.py
diff --git a/stock/report/warehouse_wise_stock_balance/warehouse_wise_stock_balance.js b/erpnext/stock/report/warehouse_wise_stock_balance/warehouse_wise_stock_balance.js
similarity index 100%
rename from stock/report/warehouse_wise_stock_balance/warehouse_wise_stock_balance.js
rename to erpnext/stock/report/warehouse_wise_stock_balance/warehouse_wise_stock_balance.js
diff --git a/stock/report/warehouse_wise_stock_balance/warehouse_wise_stock_balance.py b/erpnext/stock/report/warehouse_wise_stock_balance/warehouse_wise_stock_balance.py
similarity index 100%
rename from stock/report/warehouse_wise_stock_balance/warehouse_wise_stock_balance.py
rename to erpnext/stock/report/warehouse_wise_stock_balance/warehouse_wise_stock_balance.py
diff --git a/stock/report/warehouse_wise_stock_balance/warehouse_wise_stock_balance.txt b/erpnext/stock/report/warehouse_wise_stock_balance/warehouse_wise_stock_balance.txt
similarity index 100%
rename from stock/report/warehouse_wise_stock_balance/warehouse_wise_stock_balance.txt
rename to erpnext/stock/report/warehouse_wise_stock_balance/warehouse_wise_stock_balance.txt
diff --git a/stock/stock_ledger.py b/erpnext/stock/stock_ledger.py
similarity index 98%
rename from stock/stock_ledger.py
rename to erpnext/stock/stock_ledger.py
index 980dcd6..860bb76 100644
--- a/stock/stock_ledger.py
+++ b/erpnext/stock/stock_ledger.py
@@ -5,7 +5,7 @@
import webnotes
from webnotes import msgprint
from webnotes.utils import cint, flt, cstr, now
-from stock.utils import get_valuation_method
+from erpnext.stock.utils import get_valuation_method
import json
# future reposting
@@ -16,7 +16,7 @@
def make_sl_entries(sl_entries, is_amended=None):
if sl_entries:
- from stock.utils import update_bin
+ from erpnext.stock.utils import update_bin
cancel = True if sl_entries[0].get("is_cancelled") == "Yes" else False
if cancel:
diff --git a/stock/utils.py b/erpnext/stock/utils.py
similarity index 98%
rename from stock/utils.py
rename to erpnext/stock/utils.py
index 4f5e11a..b748029 100644
--- a/stock/utils.py
+++ b/erpnext/stock/utils.py
@@ -110,7 +110,7 @@
def get_incoming_rate(args):
"""Get Incoming Rate based on valuation method"""
- from stock.stock_ledger import get_previous_sle
+ from erpnext.stock.stock_ledger import get_previous_sle
in_rate = 0
if args.get("serial_no"):
@@ -299,7 +299,7 @@
mr_list = []
defaults = webnotes.defaults.get_defaults()
exceptions_list = []
- from accounts.utils import get_fiscal_year
+ from erpnext.accounts.utils import get_fiscal_year
current_fiscal_year = get_fiscal_year(nowdate())[0] or defaults.fiscal_year
for request_type in material_requests:
for company in material_requests[request_type]:
@@ -343,7 +343,7 @@
exceptions_list.append([] + webnotes.local.message_log)
webnotes.local.message_log = []
else:
- exceptions_list.append(webnotes.getTraceback())
+ exceptions_list.append(webnotes.get_traceback())
if mr_list:
if getattr(webnotes.local, "reorder_email_notify", None) is None:
diff --git a/support/README.md b/erpnext/support/README.md
similarity index 100%
rename from support/README.md
rename to erpnext/support/README.md
diff --git a/support/__init__.py b/erpnext/support/__init__.py
similarity index 100%
rename from support/__init__.py
rename to erpnext/support/__init__.py
diff --git a/support/doctype/__init__.py b/erpnext/support/doctype/__init__.py
similarity index 100%
rename from support/doctype/__init__.py
rename to erpnext/support/doctype/__init__.py
diff --git a/support/doctype/customer_issue/README.md b/erpnext/support/doctype/customer_issue/README.md
similarity index 100%
rename from support/doctype/customer_issue/README.md
rename to erpnext/support/doctype/customer_issue/README.md
diff --git a/support/doctype/customer_issue/__init__.py b/erpnext/support/doctype/customer_issue/__init__.py
similarity index 100%
rename from support/doctype/customer_issue/__init__.py
rename to erpnext/support/doctype/customer_issue/__init__.py
diff --git a/support/doctype/customer_issue/customer_issue.js b/erpnext/support/doctype/customer_issue/customer_issue.js
similarity index 94%
rename from support/doctype/customer_issue/customer_issue.js
rename to erpnext/support/doctype/customer_issue/customer_issue.js
index 066a11a..0ff3f17 100644
--- a/support/doctype/customer_issue/customer_issue.js
+++ b/erpnext/support/doctype/customer_issue/customer_issue.js
@@ -25,7 +25,7 @@
make_maintenance_visit: function() {
wn.model.open_mapped_doc({
- method: "support.doctype.customer_issue.customer_issue.make_maintenance_visit",
+ method: "erpnext.support.doctype.customer_issue.customer_issue.make_maintenance_visit",
source_name: cur_frm.doc.name
})
}
@@ -103,4 +103,4 @@
cur_frm.fields_dict.customer.get_query = function(doc,cdt,cdn) {
- return{ query:"controllers.queries.customer_query" } }
+ return{ query: "erpnext.controllers.queries.customer_query" } }
diff --git a/support/doctype/customer_issue/customer_issue.py b/erpnext/support/doctype/customer_issue/customer_issue.py
similarity index 96%
rename from support/doctype/customer_issue/customer_issue.py
rename to erpnext/support/doctype/customer_issue/customer_issue.py
index 0739a2d..f6e6b6d 100644
--- a/support/doctype/customer_issue/customer_issue.py
+++ b/erpnext/support/doctype/customer_issue/customer_issue.py
@@ -9,7 +9,7 @@
-from utilities.transaction_base import TransactionBase
+from erpnext.utilities.transaction_base import TransactionBase
class DocType(TransactionBase):
def __init__(self, doc, doclist=[]):
diff --git a/support/doctype/customer_issue/customer_issue.txt b/erpnext/support/doctype/customer_issue/customer_issue.txt
similarity index 100%
rename from support/doctype/customer_issue/customer_issue.txt
rename to erpnext/support/doctype/customer_issue/customer_issue.txt
diff --git a/support/doctype/maintenance_schedule/README.md b/erpnext/support/doctype/maintenance_schedule/README.md
similarity index 100%
rename from support/doctype/maintenance_schedule/README.md
rename to erpnext/support/doctype/maintenance_schedule/README.md
diff --git a/support/doctype/maintenance_schedule/__init__.py b/erpnext/support/doctype/maintenance_schedule/__init__.py
similarity index 100%
rename from support/doctype/maintenance_schedule/__init__.py
rename to erpnext/support/doctype/maintenance_schedule/__init__.py
diff --git a/support/doctype/maintenance_schedule/maintenance_schedule.js b/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js
similarity index 92%
rename from support/doctype/maintenance_schedule/maintenance_schedule.js
rename to erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js
index 25fe69a..75773e0 100644
--- a/support/doctype/maintenance_schedule/maintenance_schedule.js
+++ b/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js
@@ -9,7 +9,7 @@
cur_frm.add_custom_button(wn._('From Sales Order'),
function() {
wn.model.map_current_doc({
- method: "selling.doctype.sales_order.sales_order.make_maintenance_schedule",
+ method: "erpnext.selling.doctype.sales_order.sales_order.make_maintenance_schedule",
source_doctype: "Sales Order",
get_query_filters: {
docstatus: 1,
@@ -22,7 +22,7 @@
} else if (this.frm.doc.docstatus===1) {
cur_frm.add_custom_button(wn._("Make Maintenance Visit"), function() {
wn.model.open_mapped_doc({
- method: "support.doctype.maintenance_schedule.maintenance_schedule.make_maintenance_visit",
+ method: "erpnext.support.doctype.maintenance_schedule.maintenance_schedule.make_maintenance_visit",
source_name: cur_frm.doc.name
})
})
@@ -108,4 +108,4 @@
}
cur_frm.fields_dict.customer.get_query = function(doc,cdt,cdn) {
- return{ query:"controllers.queries.customer_query" } }
+ return{ query: "erpnext.controllers.queries.customer_query" } }
diff --git a/support/doctype/maintenance_schedule/maintenance_schedule.py b/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py
similarity index 99%
rename from support/doctype/maintenance_schedule/maintenance_schedule.py
rename to erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py
index f18408f..8263b19 100644
--- a/support/doctype/maintenance_schedule/maintenance_schedule.py
+++ b/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py
@@ -11,7 +11,7 @@
-from utilities.transaction_base import TransactionBase, delete_events
+from erpnext.utilities.transaction_base import TransactionBase, delete_events
class DocType(TransactionBase):
def __init__(self, doc, doclist=[]):
diff --git a/support/doctype/maintenance_schedule/maintenance_schedule.txt b/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.txt
similarity index 100%
rename from support/doctype/maintenance_schedule/maintenance_schedule.txt
rename to erpnext/support/doctype/maintenance_schedule/maintenance_schedule.txt
diff --git a/support/doctype/maintenance_schedule_detail/README.md b/erpnext/support/doctype/maintenance_schedule_detail/README.md
similarity index 100%
rename from support/doctype/maintenance_schedule_detail/README.md
rename to erpnext/support/doctype/maintenance_schedule_detail/README.md
diff --git a/support/doctype/maintenance_schedule_detail/__init__.py b/erpnext/support/doctype/maintenance_schedule_detail/__init__.py
similarity index 100%
rename from support/doctype/maintenance_schedule_detail/__init__.py
rename to erpnext/support/doctype/maintenance_schedule_detail/__init__.py
diff --git a/support/doctype/maintenance_schedule_detail/maintenance_schedule_detail.py b/erpnext/support/doctype/maintenance_schedule_detail/maintenance_schedule_detail.py
similarity index 100%
rename from support/doctype/maintenance_schedule_detail/maintenance_schedule_detail.py
rename to erpnext/support/doctype/maintenance_schedule_detail/maintenance_schedule_detail.py
diff --git a/support/doctype/maintenance_schedule_detail/maintenance_schedule_detail.txt b/erpnext/support/doctype/maintenance_schedule_detail/maintenance_schedule_detail.txt
similarity index 100%
rename from support/doctype/maintenance_schedule_detail/maintenance_schedule_detail.txt
rename to erpnext/support/doctype/maintenance_schedule_detail/maintenance_schedule_detail.txt
diff --git a/support/doctype/maintenance_schedule_item/README.md b/erpnext/support/doctype/maintenance_schedule_item/README.md
similarity index 100%
rename from support/doctype/maintenance_schedule_item/README.md
rename to erpnext/support/doctype/maintenance_schedule_item/README.md
diff --git a/support/doctype/maintenance_schedule_item/__init__.py b/erpnext/support/doctype/maintenance_schedule_item/__init__.py
similarity index 100%
rename from support/doctype/maintenance_schedule_item/__init__.py
rename to erpnext/support/doctype/maintenance_schedule_item/__init__.py
diff --git a/support/doctype/maintenance_schedule_item/maintenance_schedule_item.py b/erpnext/support/doctype/maintenance_schedule_item/maintenance_schedule_item.py
similarity index 100%
rename from support/doctype/maintenance_schedule_item/maintenance_schedule_item.py
rename to erpnext/support/doctype/maintenance_schedule_item/maintenance_schedule_item.py
diff --git a/support/doctype/maintenance_schedule_item/maintenance_schedule_item.txt b/erpnext/support/doctype/maintenance_schedule_item/maintenance_schedule_item.txt
similarity index 100%
rename from support/doctype/maintenance_schedule_item/maintenance_schedule_item.txt
rename to erpnext/support/doctype/maintenance_schedule_item/maintenance_schedule_item.txt
diff --git a/support/doctype/maintenance_visit/README.md b/erpnext/support/doctype/maintenance_visit/README.md
similarity index 100%
rename from support/doctype/maintenance_visit/README.md
rename to erpnext/support/doctype/maintenance_visit/README.md
diff --git a/support/doctype/maintenance_visit/__init__.py b/erpnext/support/doctype/maintenance_visit/__init__.py
similarity index 100%
rename from support/doctype/maintenance_visit/__init__.py
rename to erpnext/support/doctype/maintenance_visit/__init__.py
diff --git a/support/doctype/maintenance_visit/maintenance_visit.js b/erpnext/support/doctype/maintenance_visit/maintenance_visit.js
similarity index 89%
rename from support/doctype/maintenance_visit/maintenance_visit.js
rename to erpnext/support/doctype/maintenance_visit/maintenance_visit.js
index 1a618cd..f571b9a 100644
--- a/support/doctype/maintenance_visit/maintenance_visit.js
+++ b/erpnext/support/doctype/maintenance_visit/maintenance_visit.js
@@ -9,7 +9,7 @@
cur_frm.add_custom_button(wn._('From Maintenance Schedule'),
function() {
wn.model.map_current_doc({
- method: "support.doctype.maintenance_schedule.maintenance_schedule.make_maintenance_visit",
+ method: "erpnext.support.doctype.maintenance_schedule.maintenance_schedule.make_maintenance_visit",
source_doctype: "Maintenance Schedule",
get_query_filters: {
docstatus: 1,
@@ -21,7 +21,7 @@
cur_frm.add_custom_button(wn._('From Customer Issue'),
function() {
wn.model.map_current_doc({
- method: "support.doctype.customer_issue.customer_issue.make_maintenance_visit",
+ method: "erpnext.support.doctype.customer_issue.customer_issue.make_maintenance_visit",
source_doctype: "Customer Issue",
get_query_filters: {
status: ["in", "Open, Work in Progress"],
@@ -33,7 +33,7 @@
cur_frm.add_custom_button(wn._('From Sales Order'),
function() {
wn.model.map_current_doc({
- method: "selling.doctype.sales_order.sales_order.make_maintenance_visit",
+ method: "erpnext.selling.doctype.sales_order.sales_order.make_maintenance_visit",
source_doctype: "Sales Order",
get_query_filters: {
docstatus: 1,
@@ -104,5 +104,5 @@
cur_frm.fields_dict.customer.get_query = function(doc,cdt,cdn) {
- return {query: "controllers.queries.customer_query" }
+ return {query: "erpnext.controllers.queries.customer_query" }
}
\ No newline at end of file
diff --git a/support/doctype/maintenance_visit/maintenance_visit.py b/erpnext/support/doctype/maintenance_visit/maintenance_visit.py
similarity index 98%
rename from support/doctype/maintenance_visit/maintenance_visit.py
rename to erpnext/support/doctype/maintenance_visit/maintenance_visit.py
index f469657..e56389e 100644
--- a/support/doctype/maintenance_visit/maintenance_visit.py
+++ b/erpnext/support/doctype/maintenance_visit/maintenance_visit.py
@@ -10,7 +10,7 @@
-from utilities.transaction_base import TransactionBase
+from erpnext.utilities.transaction_base import TransactionBase
class DocType(TransactionBase):
def __init__(self, doc, doclist=[]):
diff --git a/support/doctype/maintenance_visit/maintenance_visit.txt b/erpnext/support/doctype/maintenance_visit/maintenance_visit.txt
similarity index 100%
rename from support/doctype/maintenance_visit/maintenance_visit.txt
rename to erpnext/support/doctype/maintenance_visit/maintenance_visit.txt
diff --git a/support/doctype/maintenance_visit_purpose/README.md b/erpnext/support/doctype/maintenance_visit_purpose/README.md
similarity index 100%
rename from support/doctype/maintenance_visit_purpose/README.md
rename to erpnext/support/doctype/maintenance_visit_purpose/README.md
diff --git a/support/doctype/maintenance_visit_purpose/__init__.py b/erpnext/support/doctype/maintenance_visit_purpose/__init__.py
similarity index 100%
rename from support/doctype/maintenance_visit_purpose/__init__.py
rename to erpnext/support/doctype/maintenance_visit_purpose/__init__.py
diff --git a/support/doctype/maintenance_visit_purpose/maintenance_visit_purpose.py b/erpnext/support/doctype/maintenance_visit_purpose/maintenance_visit_purpose.py
similarity index 100%
rename from support/doctype/maintenance_visit_purpose/maintenance_visit_purpose.py
rename to erpnext/support/doctype/maintenance_visit_purpose/maintenance_visit_purpose.py
diff --git a/support/doctype/maintenance_visit_purpose/maintenance_visit_purpose.txt b/erpnext/support/doctype/maintenance_visit_purpose/maintenance_visit_purpose.txt
similarity index 100%
rename from support/doctype/maintenance_visit_purpose/maintenance_visit_purpose.txt
rename to erpnext/support/doctype/maintenance_visit_purpose/maintenance_visit_purpose.txt
diff --git a/support/doctype/newsletter/README.md b/erpnext/support/doctype/newsletter/README.md
similarity index 100%
rename from support/doctype/newsletter/README.md
rename to erpnext/support/doctype/newsletter/README.md
diff --git a/support/doctype/newsletter/__init__.py b/erpnext/support/doctype/newsletter/__init__.py
similarity index 100%
rename from support/doctype/newsletter/__init__.py
rename to erpnext/support/doctype/newsletter/__init__.py
diff --git a/support/doctype/newsletter/newsletter.js b/erpnext/support/doctype/newsletter/newsletter.js
similarity index 95%
rename from support/doctype/newsletter/newsletter.js
rename to erpnext/support/doctype/newsletter/newsletter.js
index f7a7ad1..41967e3 100644
--- a/support/doctype/newsletter/newsletter.js
+++ b/erpnext/support/doctype/newsletter/newsletter.js
@@ -3,7 +3,7 @@
cur_frm.cscript.onload = function(doc) {
return wn.call({
- method: "support.doctype.newsletter.newsletter.get_lead_options",
+ method: "erpnext.support.doctype.newsletter.newsletter.get_lead_options",
type: "GET",
callback: function(r) {
set_field_options("lead_source", r.message.sources.join("\n"))
diff --git a/support/doctype/newsletter/newsletter.py b/erpnext/support/doctype/newsletter/newsletter.py
similarity index 100%
rename from support/doctype/newsletter/newsletter.py
rename to erpnext/support/doctype/newsletter/newsletter.py
diff --git a/support/doctype/newsletter/newsletter.txt b/erpnext/support/doctype/newsletter/newsletter.txt
similarity index 100%
rename from support/doctype/newsletter/newsletter.txt
rename to erpnext/support/doctype/newsletter/newsletter.txt
diff --git a/support/doctype/newsletter/test_newsletter.py b/erpnext/support/doctype/newsletter/test_newsletter.py
similarity index 100%
rename from support/doctype/newsletter/test_newsletter.py
rename to erpnext/support/doctype/newsletter/test_newsletter.py
diff --git a/support/doctype/support_ticket/README.md b/erpnext/support/doctype/support_ticket/README.md
similarity index 100%
rename from support/doctype/support_ticket/README.md
rename to erpnext/support/doctype/support_ticket/README.md
diff --git a/support/doctype/support_ticket/__init__.py b/erpnext/support/doctype/support_ticket/__init__.py
similarity index 100%
rename from support/doctype/support_ticket/__init__.py
rename to erpnext/support/doctype/support_ticket/__init__.py
diff --git a/support/doctype/support_ticket/get_support_mails.py b/erpnext/support/doctype/support_ticket/get_support_mails.py
similarity index 97%
rename from support/doctype/support_ticket/get_support_mails.py
rename to erpnext/support/doctype/support_ticket/get_support_mails.py
index 33cb023..b50e46e 100644
--- a/support/doctype/support_ticket/get_support_mails.py
+++ b/erpnext/support/doctype/support_ticket/get_support_mails.py
@@ -6,7 +6,7 @@
from webnotes.utils import cstr, cint, decode_dict, today
from webnotes.utils.email_lib import sendmail
from webnotes.utils.email_lib.receive import POP3Mailbox
-from core.doctype.communication.communication import make
+from webnotes.core.doctype.communication.communication import make
class SupportMailbox(POP3Mailbox):
def setup(self, args=None):
diff --git a/support/doctype/support_ticket/support_ticket.js b/erpnext/support/doctype/support_ticket/support_ticket.js
similarity index 93%
rename from support/doctype/support_ticket/support_ticket.js
rename to erpnext/support/doctype/support_ticket/support_ticket.js
index 4f8f756..b5224e7 100644
--- a/support/doctype/support_ticket/support_ticket.js
+++ b/erpnext/support/doctype/support_ticket/support_ticket.js
@@ -2,7 +2,7 @@
// License: GNU General Public License v3. See license.txt
cur_frm.fields_dict.customer.get_query = function(doc,cdt,cdn) {
- return{ query:"controllers.queries.customer_query" } }
+ return{ query: "erpnext.controllers.queries.customer_query" } }
wn.provide("erpnext.support");
// TODO commonify this code
@@ -75,7 +75,7 @@
set_status: function(status) {
return wn.call({
- method:"support.doctype.support_ticket.support_ticket.set_status",
+ method: "erpnext.support.doctype.support_ticket.support_ticket.set_status",
args: {
name: cur_frm.doc.name,
status: status
diff --git a/support/doctype/support_ticket/support_ticket.py b/erpnext/support/doctype/support_ticket/support_ticket.py
similarity index 96%
rename from support/doctype/support_ticket/support_ticket.py
rename to erpnext/support/doctype/support_ticket/support_ticket.py
index fd79583..0b95292 100644
--- a/support/doctype/support_ticket/support_ticket.py
+++ b/erpnext/support/doctype/support_ticket/support_ticket.py
@@ -4,7 +4,7 @@
from __future__ import unicode_literals
import webnotes
-from utilities.transaction_base import TransactionBase
+from erpnext.utilities.transaction_base import TransactionBase
from webnotes.utils import now, extract_email_id
class DocType(TransactionBase):
diff --git a/support/doctype/support_ticket/support_ticket.txt b/erpnext/support/doctype/support_ticket/support_ticket.txt
similarity index 100%
rename from support/doctype/support_ticket/support_ticket.txt
rename to erpnext/support/doctype/support_ticket/support_ticket.txt
diff --git a/support/page/__init__.py b/erpnext/support/page/__init__.py
similarity index 100%
rename from support/page/__init__.py
rename to erpnext/support/page/__init__.py
diff --git a/support/page/support_analytics/README.md b/erpnext/support/page/support_analytics/README.md
similarity index 100%
rename from support/page/support_analytics/README.md
rename to erpnext/support/page/support_analytics/README.md
diff --git a/support/page/support_analytics/__init__.py b/erpnext/support/page/support_analytics/__init__.py
similarity index 100%
rename from support/page/support_analytics/__init__.py
rename to erpnext/support/page/support_analytics/__init__.py
diff --git a/support/page/support_analytics/support_analytics.js b/erpnext/support/page/support_analytics/support_analytics.js
similarity index 100%
rename from support/page/support_analytics/support_analytics.js
rename to erpnext/support/page/support_analytics/support_analytics.js
diff --git a/support/page/support_analytics/support_analytics.txt b/erpnext/support/page/support_analytics/support_analytics.txt
similarity index 100%
rename from support/page/support_analytics/support_analytics.txt
rename to erpnext/support/page/support_analytics/support_analytics.txt
diff --git a/support/page/support_home/__init__.py b/erpnext/support/page/support_home/__init__.py
similarity index 100%
rename from support/page/support_home/__init__.py
rename to erpnext/support/page/support_home/__init__.py
diff --git a/support/page/support_home/support_home.js b/erpnext/support/page/support_home/support_home.js
similarity index 100%
rename from support/page/support_home/support_home.js
rename to erpnext/support/page/support_home/support_home.js
diff --git a/support/page/support_home/support_home.txt b/erpnext/support/page/support_home/support_home.txt
similarity index 100%
rename from support/page/support_home/support_home.txt
rename to erpnext/support/page/support_home/support_home.txt
diff --git a/support/report/__init__.py b/erpnext/support/report/__init__.py
similarity index 100%
rename from support/report/__init__.py
rename to erpnext/support/report/__init__.py
diff --git a/support/report/maintenance_schedules/__init__.py b/erpnext/support/report/maintenance_schedules/__init__.py
similarity index 100%
rename from support/report/maintenance_schedules/__init__.py
rename to erpnext/support/report/maintenance_schedules/__init__.py
diff --git a/support/report/maintenance_schedules/maintenance_schedules.txt b/erpnext/support/report/maintenance_schedules/maintenance_schedules.txt
similarity index 100%
rename from support/report/maintenance_schedules/maintenance_schedules.txt
rename to erpnext/support/report/maintenance_schedules/maintenance_schedules.txt
diff --git a/portal/templates/__init__.py b/erpnext/templates/__init__.py
similarity index 100%
rename from portal/templates/__init__.py
rename to erpnext/templates/__init__.py
diff --git a/stock/doctype/item/templates/generators/__init__.py b/erpnext/templates/generators/__init__.py
similarity index 100%
rename from stock/doctype/item/templates/generators/__init__.py
rename to erpnext/templates/generators/__init__.py
diff --git a/stock/doctype/item/templates/generators/item.html b/erpnext/templates/generators/item.html
similarity index 81%
rename from stock/doctype/item/templates/generators/item.html
rename to erpnext/templates/generators/item.html
index 545693d..91ea3e4 100644
--- a/stock/doctype/item/templates/generators/item.html
+++ b/erpnext/templates/generators/item.html
@@ -2,12 +2,12 @@
{% block javascript %}
<script>
- {% include "app/stock/doctype/item/templates/includes/product_page.js" %}
+ {% include "templates/includes/product_page.js" %}
$(function() {
if(window.logged_in && getCookie("system_user")==="yes") {
wn.has_permission("Item", "{{ name }}", "write", function(r) {
- wn.require("lib/js/wn/website/editable.js");
+ wn.require("assets/webnotes/js/wn/website/editable.js");
wn.make_editable($('[itemprop="description"]'), "Item", "{{ name }}", "web_long_description");
});
}
@@ -17,25 +17,25 @@
{% block css %}
<style>
- {% include "app/stock/doctype/item/templates/includes/product_page.css" %}
+ {% include "templates/includes/product_page.css" %}
</style>
{% endblock %}
{% block content %}
- {% include 'app/stock/doctype/item/templates/includes/product_search_box.html' %}
- {% include 'app/stock/doctype/item/templates/includes/product_breadcrumbs.html' %}
+ {% include 'templates/includes/product_search_box.html' %}
+ {% include 'templates/includes/product_breadcrumbs.html' %}
<div class="container content product-page-content" itemscope itemtype="http://schema.org/Product">
<div class="row">
<div class="col-md-6">
{% if slideshow %}
- {% include "lib/website/doctype/website_slideshow/templates/includes/slideshow.html" %}
+ {% include "templates/includes/slideshow.html" %}
{% else %}
{% if website_image %}
<image itemprop="image" class="item-main-image"
src="{{ website_image }}" />
{% else %}
<div class="img-area">
- {% include 'app/stock/doctype/item/templates/includes/product_missing_image.html' %}
+ {% include 'templates/includes/product_missing_image.html' %}
</div>
{% endif %}
{% endif %}
diff --git a/stock/doctype/item/templates/generators/item.py b/erpnext/templates/generators/item.py
similarity index 100%
rename from stock/doctype/item/templates/generators/item.py
rename to erpnext/templates/generators/item.py
diff --git a/setup/doctype/item_group/templates/generators/item_group.html b/erpnext/templates/generators/item_group.html
similarity index 78%
rename from setup/doctype/item_group/templates/generators/item_group.html
rename to erpnext/templates/generators/item_group.html
index e80d0a2..c5fcd90 100644
--- a/setup/doctype/item_group/templates/generators/item_group.html
+++ b/erpnext/templates/generators/item_group.html
@@ -1,11 +1,11 @@
{% extends base_template %}
{% block content %}
-{% include 'app/stock/doctype/item/templates/includes/product_search_box.html' %}
-{% include 'app/stock/doctype/item/templates/includes/product_breadcrumbs.html' %}
+{% include 'templates/includes/product_search_box.html' %}
+{% include 'templates/includes/product_breadcrumbs.html' %}
<div class="container content">
{% if slideshow %}<!-- slideshow -->
- {% include "lib/website/doctype/website_slideshow/templates/includes/slideshow.html" %}
+ {% include "templates/includes/slideshow.html" %}
{% endif %}
{% if description %}<!-- description -->
<div itemprop="description">{{ description or ""}}</div>
@@ -42,7 +42,7 @@
$(function() {
if(window.logged_in && getCookie("system_user")==="yes") {
wn.has_permission("Item Group", "{{ name }}", "write", function(r) {
- wn.require("lib/js/wn/website/editable.js");
+ wn.require("assets/webnotes/js/wn/website/editable.js");
wn.make_editable($('[itemprop="description"]'), "Item Group", "{{ name }}", "description");
});
}
diff --git a/setup/doctype/item_group/templates/generators/item_group.py b/erpnext/templates/generators/item_group.py
similarity index 100%
rename from setup/doctype/item_group/templates/generators/item_group.py
rename to erpnext/templates/generators/item_group.py
diff --git a/portal/templates/includes/cart.js b/erpnext/templates/includes/cart.js
similarity index 96%
rename from portal/templates/includes/cart.js
rename to erpnext/templates/includes/cart.js
index 232501d..c521b6c 100644
--- a/portal/templates/includes/cart.js
+++ b/erpnext/templates/includes/cart.js
@@ -7,7 +7,7 @@
erpnext.cart.bind_events();
return wn.call({
type: "POST",
- method: "selling.utils.cart.get_cart_quotation",
+ method: "erpnext.selling.utils.cart.get_cart_quotation",
callback: function(r) {
$("#cart-container").removeClass("hide");
$(".progress").remove();
@@ -127,7 +127,7 @@
render_item_row: function($cart_items, doc) {
doc.image_html = doc.website_image ?
'<div style="height: 120px; overflow: hidden;"><img src="' + doc.website_image + '" /></div>' :
- '{% include "app/stock/doctype/item/templates/includes/product_missing_image.html" %}';
+ '{% include "stock/doctype/item/templates/includes/product_missing_image.html" %}';
if(doc.description === doc.item_name) doc.description = "";
@@ -193,7 +193,7 @@
return wn.call({
btn: btn,
type: "POST",
- method: "selling.utils.cart.apply_shipping_rule",
+ method: "erpnext.selling.utils.cart.apply_shipping_rule",
args: { shipping_rule: rule },
callback: function(r) {
if(!r.exc) {
@@ -241,7 +241,7 @@
return wn.call({
type: "POST",
- method: "selling.utils.cart.update_cart_address",
+ method: "erpnext.selling.utils.cart.update_cart_address",
args: {
address_fieldname: $address_wrapper.attr("data-fieldname"),
address_name: $(this).attr("data-address-name")
@@ -272,7 +272,7 @@
place_order: function(btn) {
return wn.call({
type: "POST",
- method: "selling.utils.cart.place_order",
+ method: "erpnext.selling.utils.cart.place_order",
btn: btn,
callback: function(r) {
if(r.exc) {
diff --git a/portal/templates/includes/footer.html b/erpnext/templates/includes/footer_extension.html
similarity index 85%
rename from portal/templates/includes/footer.html
rename to erpnext/templates/includes/footer_extension.html
index cd75fd1..51367e1 100644
--- a/portal/templates/includes/footer.html
+++ b/erpnext/templates/includes/footer_extension.html
@@ -1,8 +1,3 @@
-{% extends "lib/website/templates/includes/footer.html" %}
-
-{% block powered %}<a href="http://erpnext.org" style="color: #aaa;">ERPNext Powered</a>{% endblock %}
-
-{% block extension %}
<div class="container">
<div class="row">
<div class="input-group col-sm-6 col-sm-offset-3" style="margin-top: 7px;">
@@ -39,4 +34,3 @@
}
});
</script>
-{% endblock %}
diff --git a/erpnext/templates/includes/footer_powered.html b/erpnext/templates/includes/footer_powered.html
new file mode 100644
index 0000000..0abf2e4
--- /dev/null
+++ b/erpnext/templates/includes/footer_powered.html
@@ -0,0 +1 @@
+<a href="http://erpnext.org" style="color: #aaa;">ERPNext Powered</a>
\ No newline at end of file
diff --git a/stock/doctype/item/templates/includes/product_breadcrumbs.html b/erpnext/templates/includes/product_breadcrumbs.html
similarity index 100%
rename from stock/doctype/item/templates/includes/product_breadcrumbs.html
rename to erpnext/templates/includes/product_breadcrumbs.html
diff --git a/stock/doctype/item/templates/includes/product_in_grid.html b/erpnext/templates/includes/product_in_grid.html
similarity index 82%
rename from stock/doctype/item/templates/includes/product_in_grid.html
rename to erpnext/templates/includes/product_in_grid.html
index 4271aaa..d99ad00 100644
--- a/stock/doctype/item/templates/includes/product_in_grid.html
+++ b/erpnext/templates/includes/product_in_grid.html
@@ -4,7 +4,7 @@
{%- if website_image -%}
<img class="product-image" style="width: 80%; margin: auto;" src="{{ website_image }}">
{%- else -%}
- {% include 'app/stock/doctype/item/templates/includes/product_missing_image.html' %}
+ {% include 'stock/doctype/item/templates/includes/product_missing_image.html' %}
{%- endif -%}
</a>
</div>
diff --git a/stock/doctype/item/templates/includes/product_in_list.html b/erpnext/templates/includes/product_in_list.html
similarity index 86%
rename from stock/doctype/item/templates/includes/product_in_list.html
rename to erpnext/templates/includes/product_in_list.html
index c501283..f895ab6 100644
--- a/stock/doctype/item/templates/includes/product_in_list.html
+++ b/erpnext/templates/includes/product_in_list.html
@@ -5,7 +5,7 @@
{%- if website_image -%}
<img class="product-image" style="width: 80%; margin: auto;" src="{{ website_image }}">
{%- else -%}
- {% include 'app/website/templates/html/product_missing_image.html' %}
+ {% include 'website/templates/html/product_missing_image.html' %}
{%- endif -%}
</a>
</div>
diff --git a/stock/doctype/item/templates/includes/product_list.js b/erpnext/templates/includes/product_list.js
similarity index 95%
rename from stock/doctype/item/templates/includes/product_list.js
rename to erpnext/templates/includes/product_list.js
index 268760d..ac84c00 100644
--- a/stock/doctype/item/templates/includes/product_list.js
+++ b/erpnext/templates/includes/product_list.js
@@ -15,7 +15,7 @@
url: "/",
dataType: "json",
data: {
- cmd: "selling.utils.product.get_product_list",
+ cmd: "erpnext.selling.utils.product.get_product_list",
start: window.start,
search: window.search,
product_group: window.product_group
diff --git a/stock/doctype/item/templates/includes/product_missing_image.html b/erpnext/templates/includes/product_missing_image.html
similarity index 100%
rename from stock/doctype/item/templates/includes/product_missing_image.html
rename to erpnext/templates/includes/product_missing_image.html
diff --git a/stock/doctype/item/templates/includes/product_page.css b/erpnext/templates/includes/product_page.css
similarity index 100%
rename from stock/doctype/item/templates/includes/product_page.css
rename to erpnext/templates/includes/product_page.css
diff --git a/stock/doctype/item/templates/includes/product_page.js b/erpnext/templates/includes/product_page.js
similarity index 96%
rename from stock/doctype/item/templates/includes/product_page.js
rename to erpnext/templates/includes/product_page.js
index df842cc..5029b90 100644
--- a/stock/doctype/item/templates/includes/product_page.js
+++ b/erpnext/templates/includes/product_page.js
@@ -7,7 +7,7 @@
wn.call({
type: "POST",
- method: "selling.utils.product.get_product_info",
+ method: "erpnext.selling.utils.product.get_product_info",
args: {
item_code: "{{ name }}"
},
diff --git a/stock/doctype/item/templates/includes/product_search_box.html b/erpnext/templates/includes/product_search_box.html
similarity index 100%
rename from stock/doctype/item/templates/includes/product_search_box.html
rename to erpnext/templates/includes/product_search_box.html
diff --git a/portal/templates/includes/transactions.html b/erpnext/templates/includes/transactions.html
similarity index 100%
rename from portal/templates/includes/transactions.html
rename to erpnext/templates/includes/transactions.html
diff --git a/portal/templates/pages/__init__.py b/erpnext/templates/pages/__init__.py
similarity index 100%
rename from portal/templates/pages/__init__.py
rename to erpnext/templates/pages/__init__.py
diff --git a/utilities/doctype/address/templates/pages/address.html b/erpnext/templates/pages/address.html
similarity index 100%
rename from utilities/doctype/address/templates/pages/address.html
rename to erpnext/templates/pages/address.html
diff --git a/utilities/doctype/address/templates/pages/address.py b/erpnext/templates/pages/address.py
similarity index 100%
rename from utilities/doctype/address/templates/pages/address.py
rename to erpnext/templates/pages/address.py
diff --git a/utilities/doctype/address/templates/pages/addresses.html b/erpnext/templates/pages/addresses.html
similarity index 100%
rename from utilities/doctype/address/templates/pages/addresses.html
rename to erpnext/templates/pages/addresses.html
diff --git a/utilities/doctype/address/templates/pages/addresses.py b/erpnext/templates/pages/addresses.py
similarity index 100%
rename from utilities/doctype/address/templates/pages/addresses.py
rename to erpnext/templates/pages/addresses.py
diff --git a/portal/templates/pages/cart.html b/erpnext/templates/pages/cart.html
similarity index 95%
rename from portal/templates/pages/cart.html
rename to erpnext/templates/pages/cart.html
index 1abe467..8aae9d9 100644
--- a/portal/templates/pages/cart.html
+++ b/erpnext/templates/pages/cart.html
@@ -1,7 +1,7 @@
{% extends base_template %}
{% block javascript %}
-<script>{% include "app/portal/templates/includes/cart.js" %}</script>
+<script>{% include "templates/includes/cart.js" %}</script>
{% endblock %}
{% set title="Shopping Cart" %}
diff --git a/portal/templates/pages/cart.py b/erpnext/templates/pages/cart.py
similarity index 100%
rename from portal/templates/pages/cart.py
rename to erpnext/templates/pages/cart.py
diff --git a/accounts/doctype/sales_invoice/templates/pages/invoice.html b/erpnext/templates/pages/invoice.html
similarity index 64%
rename from accounts/doctype/sales_invoice/templates/pages/invoice.html
rename to erpnext/templates/pages/invoice.html
index db6e009..45867ea 100644
--- a/accounts/doctype/sales_invoice/templates/pages/invoice.html
+++ b/erpnext/templates/pages/invoice.html
@@ -1,4 +1,4 @@
-{% extends "app/portal/templates/sale.html" %}
+{% extends "templates/sale.html" %}
{% block status -%}
{% if doc.status %}{{ doc.status }}{% endif %}
diff --git a/accounts/doctype/sales_invoice/templates/pages/invoice.py b/erpnext/templates/pages/invoice.py
similarity index 93%
rename from accounts/doctype/sales_invoice/templates/pages/invoice.py
rename to erpnext/templates/pages/invoice.py
index 89789d3..9d6a558 100644
--- a/accounts/doctype/sales_invoice/templates/pages/invoice.py
+++ b/erpnext/templates/pages/invoice.py
@@ -9,7 +9,7 @@
no_cache = True
def get_context():
- from portal.utils import get_transaction_context
+ from erpnext.templates.utils import get_transaction_context
context = get_transaction_context("Sales Invoice", webnotes.form_dict.name)
modify_status(context.get("doc"))
context.update({
diff --git a/erpnext/templates/pages/invoices.html b/erpnext/templates/pages/invoices.html
new file mode 100644
index 0000000..0467f34
--- /dev/null
+++ b/erpnext/templates/pages/invoices.html
@@ -0,0 +1 @@
+{% extends "templates/sales_transactions.html" %}
\ No newline at end of file
diff --git a/accounts/doctype/sales_invoice/templates/pages/invoices.py b/erpnext/templates/pages/invoices.py
similarity index 76%
rename from accounts/doctype/sales_invoice/templates/pages/invoices.py
rename to erpnext/templates/pages/invoices.py
index 871e37d..448c525 100644
--- a/accounts/doctype/sales_invoice/templates/pages/invoices.py
+++ b/erpnext/templates/pages/invoices.py
@@ -7,7 +7,7 @@
no_cache = True
def get_context():
- from portal.utils import get_currency_context
+ from erpnext.templates.utils import get_currency_context
context = get_currency_context()
context.update({
"title": "Invoices",
@@ -20,8 +20,8 @@
@webnotes.whitelist()
def get_invoices(start=0):
- from portal.utils import get_transaction_list
- from accounts.doctype.sales_invoice.templates.pages.invoice import modify_status
+ from erpnext.templates.utils import get_transaction_list
+ from erpnext.accounts.doctype.sales_invoice.templates.pages.invoice import modify_status
invoices = get_transaction_list("Sales Invoice", start, ["outstanding_amount"])
for d in invoices:
modify_status(d)
diff --git a/stock/doctype/item/templates/pages/product_search.html b/erpnext/templates/pages/product_search.html
similarity index 78%
rename from stock/doctype/item/templates/pages/product_search.html
rename to erpnext/templates/pages/product_search.html
index 132e3b1..02c161c 100644
--- a/stock/doctype/item/templates/pages/product_search.html
+++ b/erpnext/templates/pages/product_search.html
@@ -3,7 +3,7 @@
{% set title="Product Search" %}
{% block javascript %}
-<script>{% include "app/stock/doctype/item/templates/includes/product_list.js" %}</script>
+<script>{% include "stock/doctype/item/templates/includes/product_list.js" %}</script>
{% endblock %}
{% block content %}
@@ -17,7 +17,7 @@
});
</script>
-{% include "app/stock/doctype/item/templates/includes/product_search_box.html" %}
+{% include "stock/doctype/item/templates/includes/product_search_box.html" %}
<div class="container content">
<h3 class="search-results">Search Results</h3>
<div id="search-list" class="row">
diff --git a/stock/doctype/item/templates/pages/product_search.py b/erpnext/templates/pages/product_search.py
similarity index 100%
rename from stock/doctype/item/templates/pages/product_search.py
rename to erpnext/templates/pages/product_search.py
diff --git a/portal/templates/pages/profile.html b/erpnext/templates/pages/profile.html
similarity index 95%
rename from portal/templates/pages/profile.html
rename to erpnext/templates/pages/profile.html
index a807731..880b8d4 100644
--- a/portal/templates/pages/profile.html
+++ b/erpnext/templates/pages/profile.html
@@ -34,7 +34,7 @@
$("#fullname").val(getCookie("full_name") || "");
$("#update_profile").click(function() {
wn.call({
- method: "portal.templates.pages.profile.update_profile",
+ method: "erpnext.templates.pages.profile.update_profile",
type: "POST",
args: {
fullname: $("#fullname").val(),
diff --git a/portal/templates/pages/profile.py b/erpnext/templates/pages/profile.py
similarity index 90%
rename from portal/templates/pages/profile.py
rename to erpnext/templates/pages/profile.py
index 241f953..143abef 100644
--- a/portal/templates/pages/profile.py
+++ b/erpnext/templates/pages/profile.py
@@ -10,7 +10,7 @@
no_sitemap = True
def get_context():
- from selling.utils.cart import get_lead_or_customer
+ from erpnext.selling.utils.cart import get_lead_or_customer
party = get_lead_or_customer()
if party.doctype == "Lead":
mobile_no = party.mobile_no
@@ -27,7 +27,7 @@
@webnotes.whitelist()
def update_profile(fullname, password=None, company_name=None, mobile_no=None, phone=None):
- from selling.utils.cart import update_party
+ from erpnext.selling.utils.cart import update_party
update_party(fullname, company_name, mobile_no, phone)
if not fullname:
diff --git a/erpnext/templates/pages/shipment.html b/erpnext/templates/pages/shipment.html
new file mode 100644
index 0000000..d0aaa3e
--- /dev/null
+++ b/erpnext/templates/pages/shipment.html
@@ -0,0 +1 @@
+{% extends "templates/sale.html" %}
\ No newline at end of file
diff --git a/stock/doctype/delivery_note/templates/pages/shipment.py b/erpnext/templates/pages/shipment.py
similarity index 86%
rename from stock/doctype/delivery_note/templates/pages/shipment.py
rename to erpnext/templates/pages/shipment.py
index 760ffe0..e744685 100644
--- a/stock/doctype/delivery_note/templates/pages/shipment.py
+++ b/erpnext/templates/pages/shipment.py
@@ -7,7 +7,7 @@
no_cache = True
def get_context():
- from portal.utils import get_transaction_context
+ from erpnext.templates.utils import get_transaction_context
context = get_transaction_context("Delivery Note", webnotes.form_dict.name)
context.update({
"parent_link": "shipments",
diff --git a/erpnext/templates/pages/shipments.html b/erpnext/templates/pages/shipments.html
new file mode 100644
index 0000000..0467f34
--- /dev/null
+++ b/erpnext/templates/pages/shipments.html
@@ -0,0 +1 @@
+{% extends "templates/sales_transactions.html" %}
\ No newline at end of file
diff --git a/stock/doctype/delivery_note/templates/pages/shipments.py b/erpnext/templates/pages/shipments.py
similarity index 74%
rename from stock/doctype/delivery_note/templates/pages/shipments.py
rename to erpnext/templates/pages/shipments.py
index b8fe65a..03d074a 100644
--- a/stock/doctype/delivery_note/templates/pages/shipments.py
+++ b/erpnext/templates/pages/shipments.py
@@ -7,11 +7,11 @@
no_cache = True
def get_context():
- from portal.utils import get_currency_context
+ from erpnext.templates.utils import get_currency_context
context = get_currency_context()
context.update({
"title": "Shipments",
- "method": "portal.templates.pages.shipments.get_shipments",
+ "method": "erpnext.templates.pages.shipments.get_shipments",
"icon": "icon-truck",
"empty_list_message": "No Shipments Found",
"page": "shipment"
@@ -20,5 +20,5 @@
@webnotes.whitelist()
def get_shipments(start=0):
- from portal.utils import get_transaction_list
+ from erpnext.templates.utils import get_transaction_list
return get_transaction_list("Delivery Note", start)
diff --git a/support/doctype/support_ticket/templates/pages/ticket.html b/erpnext/templates/pages/ticket.html
similarity index 100%
rename from support/doctype/support_ticket/templates/pages/ticket.html
rename to erpnext/templates/pages/ticket.html
diff --git a/support/doctype/support_ticket/templates/pages/ticket.py b/erpnext/templates/pages/ticket.py
similarity index 93%
rename from support/doctype/support_ticket/templates/pages/ticket.py
rename to erpnext/templates/pages/ticket.py
index 28d8802..f9e5c88 100644
--- a/support/doctype/support_ticket/templates/pages/ticket.py
+++ b/erpnext/templates/pages/ticket.py
@@ -31,7 +31,7 @@
if bean.doc.raised_by != webnotes.session.user:
raise webnotes.throw(_("You are not allowed to reply to this ticket."), webnotes.PermissionError)
- from core.doctype.communication.communication import make
+ from webnotes.core.doctype.communication.communication import make
make(content=message, sender=bean.doc.raised_by, subject = bean.doc.subject,
doctype="Support Ticket", name=bean.doc.name,
date=today())
\ No newline at end of file
diff --git a/support/doctype/support_ticket/templates/pages/tickets.html b/erpnext/templates/pages/tickets.html
similarity index 97%
rename from support/doctype/support_ticket/templates/pages/tickets.html
rename to erpnext/templates/pages/tickets.html
index d99e614..6942d3b 100644
--- a/support/doctype/support_ticket/templates/pages/tickets.html
+++ b/erpnext/templates/pages/tickets.html
@@ -1,4 +1,4 @@
-{% extends "app/portal/templates/includes/transactions.html" %}
+{% extends "templates/includes/transactions.html" %}
{% block javascript -%}
{{ super() }}
diff --git a/support/doctype/support_ticket/templates/pages/tickets.py b/erpnext/templates/pages/tickets.py
similarity index 91%
rename from support/doctype/support_ticket/templates/pages/tickets.py
rename to erpnext/templates/pages/tickets.py
index 1816ccc..7434af2 100644
--- a/support/doctype/support_ticket/templates/pages/tickets.py
+++ b/erpnext/templates/pages/tickets.py
@@ -32,7 +32,7 @@
if not (subject and message):
raise webnotes.throw(_("Please write something in subject and message!"))
- from support.doctype.support_ticket.get_support_mails import add_support_communication
+ from erpnext.support.doctype.support_ticket.get_support_mails import add_support_communication
ticket = add_support_communication(subject, message, webnotes.session.user)
return ticket.doc.name
\ No newline at end of file
diff --git a/portal/templates/sale.html b/erpnext/templates/sale.html
similarity index 100%
rename from portal/templates/sale.html
rename to erpnext/templates/sale.html
diff --git a/portal/templates/sales_transactions.html b/erpnext/templates/sales_transactions.html
similarity index 93%
rename from portal/templates/sales_transactions.html
rename to erpnext/templates/sales_transactions.html
index f4fd5d1..4836c12 100644
--- a/portal/templates/sales_transactions.html
+++ b/erpnext/templates/sales_transactions.html
@@ -1,4 +1,4 @@
-{% extends "app/portal/templates/includes/transactions.html" %}
+{% extends "templates/includes/transactions.html" %}
{% block javascript -%}
<script>
diff --git a/portal/utils.py b/erpnext/templates/utils.py
similarity index 90%
rename from portal/utils.py
rename to erpnext/templates/utils.py
index 89800f3..9ec5422 100644
--- a/portal/utils.py
+++ b/erpnext/templates/utils.py
@@ -59,7 +59,7 @@
@webnotes.whitelist(allow_guest=True)
def send_message(subject="Website Query", message="", sender="", status="Open"):
- from website.doctype.contact_us_settings.templates.pages.contact \
+ from webnotes.website.doctype.contact_us_settings.templates.pages.contact \
import send_message as website_send_message
if not website_send_message(subject, message, sender):
@@ -67,11 +67,11 @@
if subject=="Support":
# create support ticket
- from support.doctype.support_ticket.get_support_mails import add_support_communication
+ from erpnext.support.doctype.support_ticket.get_support_mails import add_support_communication
add_support_communication(subject, message, sender, mail=None)
else:
# make lead / communication
- from selling.doctype.lead.get_leads import add_sales_communication
+ from erpnext.selling.doctype.lead.get_leads import add_sales_communication
add_sales_communication(subject or "Website Query", message, sender, sender,
mail=None, status=status)
\ No newline at end of file
diff --git a/translations/ar.csv b/erpnext/translations/ar.csv
similarity index 100%
rename from translations/ar.csv
rename to erpnext/translations/ar.csv
diff --git a/translations/de.csv b/erpnext/translations/de.csv
similarity index 62%
rename from translations/de.csv
rename to erpnext/translations/de.csv
index f68cabf..0a0569e 100644
--- a/translations/de.csv
+++ b/erpnext/translations/de.csv
@@ -1,42 +1,52 @@
(Half Day),(Halber Tag)
+ .You can not assign / modify / remove Master Name,
+ Quantity should be greater than 0.,
+ after this transaction.,
against sales order,gegen Kundenauftrag
against same operation,gegen dieselbe Operation
already marked,bereits markierten
and year: ,und Jahr:
as it is stock Item or packing item,wie es ist lagernd Artikel oder Packstück
at warehouse: ,im Warenlager:
+ budget ,
by Role ,von Rolle
+ can not be created/modified against stopped Sales Order ,
can not be made.,nicht vorgenommen werden.
- can not be marked as a ledger as it has existing child,"nicht als Ledger gekennzeichnet, da es bestehenden Kind"
- cannot be 0,nicht 0 sein kann
- cannot be deleted.,kann nicht gelöscht werden.
+ can not be received twice,
+ can only be debited/credited through Stock transactions,
+ does not belong to ,
+ does not belong to Warehouse,
does not belong to the company,nicht dem Unternehmen gehören
+ for account ,
has already been submitted.,wurde bereits eingereicht.
- has been freezed. ,wurde eingefroren.
- has been freezed. \ Only Accounts Manager can do transaction against this account,Wurde eingefroren. \ Nur Accounts Manager kann Transaktion gegen dieses Konto zu tun
-" is less than equals to zero in the system, \ valuation rate is mandatory for this item",weniger als gleich im System Null ist \ Wertansatz für diesen Artikel zwingend
+ is a frozen account. Either make the account active or assign role in Accounts Settings who can create / modify entries against this account,
+" is a frozen account. To create / edit transactions against this account, you need role",
+" is less than equals to zero in the system, valuation rate is mandatory for this item",
is mandatory,zwingend
is mandatory for GL Entry,ist für GL Eintrag zwingend
- is not a ledger,ist nicht ein Ledger
- is not active,nicht aktiv
is not set,nicht gesetzt
- is now the default Fiscal Year. \ Please refresh your browser for the change to take effect.,"Ist nun der Standard Geschäftsjahr. \ Bitte Ihren Browser aktualisieren, damit die Änderungen wirksam werden."
+" is now the default Fiscal Year. \
+ Please refresh your browser for the change to take effect.",
is present in one or many Active BOMs,ist in einer oder mehreren Active BOMs
not active or does not exists in the system,nicht aktiv oder existiert nicht im System
not submitted,nicht vorgelegt
or the BOM is cancelled or inactive,oder das BOM wird abgebrochen oder inaktiv
should be 'Yes'. As Item: ,sollte "Ja". Als Item:
- should be same as that in ,sollte dieselbe wie die in
- was on leave on ,war im Urlaub aus
will be ,wird
will be over-billed against mentioned ,wird gegen erwähnt überrepräsentiert in Rechnung gestellt werden
- will become ,werden
-"""Company History""",Firmengeschichte
-"""Team Members"" or ""Management""","Teammitglieder oder ""Management"""
+ will exceed by ,
+# ###.##,
+"#,###",
+"#,###.##",
+"#,###.###",
+"#,##,###.##",
+#.###,
+"#.###,##",
% Delivered,% Lieferung
% Amount Billed,% Rechnungsbetrag
% Billed,% Billed
% Completed,% Abgeschlossen
+% Delivered,Geliefert %
% Installed,% Installierte
% Received,% Erhaltene
% of materials billed against this Purchase Order.,% Der Materialien gegen diese Bestellung in Rechnung gestellt.
@@ -45,59 +55,66 @@
% of materials delivered against this Sales Order,% Der Materialien gegen diesen Kundenauftrag geliefert
% of materials ordered against this Material Request,% Der bestellten Materialien gegen diesen Werkstoff anfordern
% of materials received against this Purchase Order,% Der Materialien erhalten gegen diese Bestellung
-"' can not be managed using Stock Reconciliation.\ You can add/delete Serial No directly, \ to modify stock of this item.",'Kann nicht verwaltet mit Lager Versöhnung werden. \ Sie können hinzufügen / löschen Seriennummer direkt \ to stock dieses Artikels ändern.
+%(conversion_rate_label)s is mandatory. Maybe Currency Exchange record is not created for %(from_currency)s to %(to_currency)s,% ( conversion_rate_label ) s ist obligatorisch. Vielleicht Devisenwechsel Datensatz nicht für% erstellt ( from_currency ) s in% ( to_currency ) s
' in Company: ,'In Unternehmen:
'To Case No.' cannot be less than 'From Case No.','To Fall Nr.' kann nicht kleiner sein als "Von Fall Nr. '
+(Total) Net Weight value. Make sure that Net Weight of each item is,"(Total ) Nettogewichtswert. Stellen Sie sicher, dass die Netto-Gewicht der einzelnen Elemente ist"
* Will be calculated in the transaction.,* Wird in der Transaktion berechnet werden.
-"**Budget Distribution** helps you distribute your budget across months if you have seasonality in your business.To distribute a budget using this distribution, set this **Budget Distribution** in the **Cost Center**","** Budget Verteilung ** hilft Ihnen verteilen Sie Ihr Budget über Monate, wenn Sie Saisonalität in Ihrem business.To vertreiben ein Budget Verwendung dieser Verteilung, setzen Sie diesen ** Budget Verteilung ** in der ** Cost Center ** haben"
+"**Budget Distribution** helps you distribute your budget across months if you have seasonality in your business.
+
+To distribute a budget using this distribution, set this **Budget Distribution** in the **Cost Center**",
**Currency** Master,** Währung ** Meister
**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Geschäftsjahr ** ein Geschäftsjahr. Alle Buchungen und anderen wichtigen Transaktionen gegen ** Geschäftsjahr ** verfolgt.
-. Outstanding cannot be less than zero. \ Please match exact outstanding.,. Herausragende kann nicht kleiner als Null ist. \ Bitte Exakte hervorragend.
+. Max allowed ,
+". Outstanding cannot be less than zero. \
+ Please match exact outstanding.",
. Please set status of the employee as 'Left',. Bitte setzen Sie den Status des Mitarbeiters als "links"
. You can not mark his attendance as 'Present',. Sie können nicht markieren seine Teilnahme als "Gegenwart"
-"000 is black, fff is white","000 ist schwarz, weiß fff"
-1 Currency = [?] FractionFor e.g. 1 USD = 100 Cent,1 Währung = [?] FractionFor beispielsweise 1 USD = 100 Cent
+01,01
+02,02
+03,03
+04,04
+05,05
+06,06
+07,07
+08,08
+09,09
+"1 Currency = [?] Fraction
+For e.g. 1 USD = 100 Cent",
1. To maintain the customer wise item code and to make them searchable based on their code use this option,Ein. Um den Kunden kluge Artikel Code zu pflegen und um sie durchsuchbar basierend auf ihren Code um diese Option
-12px,12px
-13px,13px
-14px,14px
-15px,15px
-16px,16px
+10,10
+11,11
+12,12
+2,2
2 days ago,Vor 2 Tagen
+3,3
+4,4
+5,5
+6,6
: Duplicate row from same ,: Doppelte Reihe von gleichen
-: It is linked to other active BOM(s),: Es wird mit anderen aktiven BOM (s) verbunden
: Mandatory for a Recurring Invoice.,: Obligatorisch für ein Recurring Invoice.
-"<a href=""#!Sales Browser/Customer Group"">To manage Customer Groups, click here</a>","<a href=""#!Sales Browser/Customer Group""> Kundengruppen zu verwalten, klicken Sie hier </ a>"
-"<a href=""#!Sales Browser/Item Group"">Manage Item Groups</a>","<a href=""#!Sales Browser/Item Group""> Artikel Gruppen verwalten </ a>"
-"<a href=""#!Sales Browser/Territory"">To manage Territory, click here</a>","<a href=""#!Sales Browser/Territory""> Um Territory zu verwalten, klicken Sie hier </ a>"
-"<a href=""#Sales Browser/Customer Group"">Manage Customer Groups</a>","<a href=""#Sales Browser/Customer Group"">Verwalten von Kunden-Gruppen</a>"
-"<a href=""#Sales Browser/Customer Group"">To manage Territory, click here</a>","<a href=""#Sales Browser/Customer Group""> Um Territory zu verwalten, klicken Sie hier </ a>"
-"<a href=""#Sales Browser/Item Group"">Manage Item Groups</a>","<a href=""#Sales Browser/Item Group"">Artikel verwalten Gruppen</a>"
-"<a href=""#Sales Browser/Territory"">Territory</a>","<a href=""#Sales Browser/Territory"">Bereich</a>"
-"<a href=""#Sales Browser/Territory"">To manage Territory, click here</a>","<a href=""#Sales Browser/Territory""> Um Territory zu verwalten, klicken Sie hier </ a>"
-"<a onclick=""msgprint('<ol>\<li><b>field:[fieldname]</b> - By Field\<li><b>naming_series:</b> - By Naming Series (field called naming_series must be present\<li><b>eval:[expression]</b> - Evaluate an expression in python (self is doc)\<li><b>Prompt</b> - Prompt user for a name\<li><b>[series]</b> - Series by prefix (separated by a dot); for example PRE.#####\</ol>')"">Naming Options</a>","<A onclick = ""msgprint ('<ol> \ <li> <b> Feld: [Feldname] </ b> - Durch Feld \ <li> <b> naming_series: </ b> - durch die Benennung Series (Feld namens naming_series muss vorhanden sein \ <li> <b> eval: [Ausdruck] </ b> - Bewerten Sie einen Ausdruck in python (Selbst ist doc) \ <li> <b> Prompt </ b> - Benutzer nach einem Namen \ <li> <b> [Serie] </ b> - Series by Prefix (getrennt durch einen Punkt);. zum Beispiel PRE # # # # # \ </ ol> ') ""> Naming Optionen </ a>"
-<b>Cancel</b> allows you change Submitted documents by cancelling them and amending them.,<b> Abbrechen </ b> können Sie ändern eingereichten Unterlagen durch Vernichtung von ihnen und zur Änderung ihnen.
-"<span class=""sys_manager"">To setup, please go to Setup > Naming Series</span>","<span class=""sys_manager""> Um einzurichten, gehen Sie bitte auf Setup> Naming Series </ span>"
+"<a href=""#Sales Browser/Customer Group"">Add / Edit</a>","<a href=""#Sales Browser/Customer Group""> Hinzufügen / Bearbeiten </ a>"
+"<a href=""#Sales Browser/Item Group"">Add / Edit</a>","<a href=""#Sales Browser/Item Group""> Hinzufügen / Bearbeiten </ a>"
+"<a href=""#Sales Browser/Territory"">Add / Edit</a>","<a href=""#Sales Browser/Territory""> Hinzufügen / Bearbeiten </ a>"
+"<a href=""https://en.wikipedia.org/wiki/Transport_Layer_Security"" target=""_blank"">[?]</a>","<a href=""https://en.wikipedia.org/wiki/Transport_Layer_Security"" target=""_blank""> [?] </ a>"
A Customer exists with same name,Ein Kunde gibt mit dem gleichen Namen
A Lead with this email id should exist,Ein Lead mit dieser E-Mail-ID sollte vorhanden sein
"A Product or a Service that is bought, sold or kept in stock.","Ein Produkt oder eine Dienstleistung, die gekauft, verkauft oder gehalten auf Lager."
A Supplier exists with same name,Ein Lieferant existiert mit dem gleichen Namen
A condition for a Shipping Rule,Eine Bedingung für einen Versand Rule
A logical Warehouse against which stock entries are made.,Eine logische Warehouse gegen die Lager-Einträge vorgenommen werden.
-A new popup will open that will ask you to select further conditions.,"Ein neues Pop-up öffnet das wird Sie bitten, weitere Bedingungen zu wählen."
A symbol for this currency. For e.g. $,Ein Symbol für diese Währung. Für z.B. $
A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Ein Dritter Vertrieb / Händler / Kommissionär / affiliate / Vertragshändler verkauft die Unternehmen Produkte für eine Provision.
-A user can have multiple values for a property.,Ein Benutzer kann mehrere Werte für eine Eigenschaft.
A+,A +
A-,A-
AB+,AB +
AB-,AB-
AMC Expiry Date,AMC Ablaufdatum
+AMC expiry date and maintenance status mismatched,AMC Verfallsdatum und Wartungsstatus nicht übereinstimm
ATT,ATT
Abbr,Abk.
About,Über
-About Us Settings,Über uns Settings
-About Us Team Member,Über uns Team Member
+About ERPNext,Über ERPNext
Above Value,Vor Wert
Absent,Abwesend
Acceptance Criteria,Akzeptanzkriterien
@@ -108,11 +125,14 @@
Account Balance,Kontostand
Account Details,Kontodetails
Account Head,Konto Leiter
-Account Id,Konto-ID
Account Name,Account Name
Account Type,Kontotyp
+Account expires on,Konto läuft auf
+Account for the warehouse (Perpetual Inventory) will be created under this Account.,Konto für das Lager ( Perpetual Inventory) wird unter diesem Konto erstellt werden.
Account for this ,Konto für diese
Accounting,Buchhaltung
+Accounting Entries are not allowed against groups.,Accounting -Einträge sind nicht gegen Gruppen erlaubt .
+"Accounting Entries can be made against leaf nodes, called","Accounting Einträge können gegen Blattknoten gemacht werden , die so genannte"
Accounting Year.,Rechnungsjahres.
"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Buchhaltungseingaben bis zu diesem Zeitpunkt eingefroren, kann niemand / nicht ändern Eintrag außer Rolle unten angegebenen."
Accounting journal entries.,Accounting Journaleinträge.
@@ -122,10 +142,12 @@
Accounts Receivable,Debitorenbuchhaltung
Accounts Settings,Konten-Einstellungen
Action,Aktion
+Actions,Aktionen
Active,Aktiv
Active: Will extract emails from ,Aktiv: Werden E-Mails extrahieren
Activity,Aktivität
Activity Log,Activity Log
+Activity Log:,Activity Log:
Activity Type,Art der Tätigkeit
Actual,Tatsächlich
Actual Budget,Tatsächliche Budget
@@ -137,34 +159,26 @@
Actual Qty,Tatsächliche Menge
Actual Qty (at source/target),Tatsächliche Menge (an der Quelle / Ziel)
Actual Qty After Transaction,Tatsächliche Menge Nach Transaction
+Actual Qty: Quantity available in the warehouse.,Tatsächliche Menge: Menge verfügbar im Lager.
Actual Quantity,Tatsächliche Menge
Actual Start Date,Tatsächliche Startdatum
Add,Hinzufügen
Add / Edit Taxes and Charges,Hinzufügen / Bearbeiten Steuern und Abgaben
-Add A New Rule,Fügen Sie eine neue Regel
-Add A Property,Fügen Sie eine Eigenschaft
Add Attachments,Anhänge hinzufügen
Add Bookmark,Lesezeichen hinzufügen
-Add CSS,Fügen Sie CSS
+Add Child,Kinder hinzufügen
Add Column,Spalte hinzufügen
-Add Comment,Kommentar hinzufügen
-Add Google Analytics ID: eg. UA-89XXX57-1. Please search help on Google Analytics for more information.,In Google Analytics ID: zB. UA-89XXX57-1. Bitte suchen Sie Hilfe zu Google Analytics für weitere Informationen.
Add Message,Nachricht hinzufügen
-Add New Permission Rule,Add New Permission Rule
Add Reply,Fügen Sie Antworten
-Add Terms and Conditions for the Material Request. You can also prepare a Terms and Conditions Master and use the Template,In Allgemeinen Geschäftsbedingungen für das Material-Request. Sie können auch ein Master-AGB und verwenden Sie die Vorlage
-Add Terms and Conditions for the Purchase Receipt. You can also prepare a Terms and Conditions Master and use the Template.,Hinzufügen Geschäftsbedingungen für den Kaufbeleg. Sie können auch eine AGB-Master und verwenden Sie die Vorlage.
-"Add Terms and Conditions for the Quotation like Payment Terms, Validity of Offer etc. You can also prepare a Terms and Conditions Master and use the Template","Fügen AGB für das Angebot wie Zahlungsbedingungen, Gültigkeit des Angebots etc. Sie können auch ein AGB-Master und verwenden Sie die Vorlage"
-Add Total Row,In insgesamt Row
-Add a banner to the site. (small banners are usually good),Hinzufügen einen Banner auf der Website. (Kleine Banner sind in der Regel gut)
+Add Serial No,In Seriennummer
+Add Taxes,Steuern hinzufügen
+Add Taxes and Charges,In Steuern und Abgaben
Add attachment,Anhang hinzufügen
-Add code as <script>,Fügen Sie Code wie <script>
Add new row,In neue Zeile
Add or Deduct,Hinzufügen oder abziehen
Add rows to set annual budgets on Accounts.,Fügen Sie Zeilen hinzu jährlichen Budgets für Konten festgelegt.
-"Add the name of <a href=""http://google.com/webfonts"" target=""_blank"">Google Web Font</a> e.g. ""Open Sans""","Fügen Sie den Namen <a href=""http://google.com/webfonts"" target=""_blank"">Google Web Font</a> zB "Offene Sans""
Add to To Do,In den To Do
-Add to To Do List of,In den Um-Liste von Do
+Add to calendar on this date,In den an diesem Tag Kalender
Add/Remove Recipients,Hinzufügen / Entfernen von Empfängern
Additional Info,Zusätzliche Informationen
Address,Adresse
@@ -177,14 +191,8 @@
Address Line 2,Address Line 2
Address Title,Anrede
Address Type,Adresse Typ
-Address and other legal information you may want to put in the footer.,Adresse und weitere rechtliche Informationen möchten Sie vielleicht in der Fußzeile setzen.
-Address to be displayed on the Contact Page,Adresse auf der Kontakt Seite angezeigt werden
-Adds a custom field to a DocType,Fügt ein benutzerdefiniertes Feld zu einem DocType
-Adds a custom script (client or server) to a DocType,Fügt ein benutzerdefiniertes Skript (Client oder Server) zu einem DocType
Advance Amount,Voraus Betrag
Advance amount,Vorschuss in Höhe
-Advanced Scripting,Advanced Scripting
-Advanced Settings,Erweiterte Einstellungen
Advances,Advances
Advertisement,Anzeige
After Sale Installations,After Sale Installationen
@@ -192,7 +200,6 @@
Against Account,Vor Konto
Against Docname,Vor DocName
Against Doctype,Vor Doctype
-Against Document Date,Gegen Dokument Datum
Against Document Detail No,Vor Document Detailaufnahme
Against Document No,Gegen Dokument Nr.
Against Expense Account,Vor Expense Konto
@@ -200,10 +207,18 @@
Against Journal Voucher,Vor Journal Gutschein
Against Purchase Invoice,Vor Kaufrechnung
Against Sales Invoice,Vor Sales Invoice
+Against Sales Order,Vor Sales Order
Against Voucher,Gegen Gutschein
Against Voucher Type,Gegen Gutschein Type
+Ageing Based On,"Altern, basiert auf"
Agent,Agent
-"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. The package **Item** will have ""Is Stock Item"" as ""No"" and ""Is Sales Item"" as ""Yes"".For Example: If you are selling Laptops and Backpacks separately and have a special price if the customer buys both, then the Laptop + Backpack will be a new Sales BOM Item.Note: BOM = Bill of Materials","Aggregate Gruppe ** Artikel ** in einen anderen ** Artikel. ** Dies ist nützlich, wenn Sie bündeln eine gewisse ** Die Artikel werden ** in einem Paket und Sie behalten Lager der verpackten ** Artikel ** und nicht das Aggregat ** Artikel. ** Das Paket ** Artikel ** haben wird: ""Ist Stock Item"" als ""Nein"" und ""Ist Vertrieb Item"" als ""Ja"" Zum Beispiel:. Wenn Sie den Verkauf Laptops und Rucksäcke werden getrennt und haben einen besonderen Preis, wenn der Kunde kauft sowohl BOM = Bill of Materials:, dann wird der Laptop + Rucksack wird ein neuer Sales BOM Item.Note sein"
+"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**.
+
+The package **Item** will have ""Is Stock Item"" as ""No"" and ""Is Sales Item"" as ""Yes"".
+
+For Example: If you are selling Laptops and Backpacks separately and have a special price if the customer buys both, then the Laptop + Backpack will be a new Sales BOM Item.
+
+Note: BOM = Bill of Materials",
Aging Date,Aging Datum
All Addresses.,Alle Adressen.
All Contact,Alle Kontakt
@@ -217,51 +232,47 @@
All Sales Person,Alle Sales Person
All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Alle Verkäufe Transaktionen können gegen mehrere ** Umsatz Personen **, so dass Sie und überwachen Ziele können markiert werden."
All Supplier Contact,Alle Lieferanten Kontakt
-"All account columns should be after \ standard columns and on the right. If you entered it properly, next probable reason \ could be wrong account name. Please rectify it in the file and try again.","Alle Spalten Konto sollte nach \ standard Säulen und auf der rechten Seite. Wenn Sie es richtig eingegeben, könnte nächste wahrscheinliche Grund \ falsche Konto-Name sein. Bitte berichtigen in der Datei und versuchen Sie es erneut."
-"All export related fields like currency, conversion rate, export total, export grand total etc are available in <br>Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.","Alle Export-verwandten Bereichen wie Währung, Conversion-Rate, Export Insgesamt Export Gesamtsumme etc sind in <br> Lieferschein, POS, Angebot, Sales Invoice, Auftragsabwicklung, etc."
-"All import related fields like currency, conversion rate, import total, import grand total etc are available in <br>Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.","Alle Import-verwandten Bereichen wie Währung, Conversion-Rate, Import Insgesamt sind Import Gesamtsumme etc in <br> Kaufbeleg Lieferant Angebot, Auftragsbestätigung, Bestellung etc. zur Verfügung"
-All items have already been transferred \ for this Production Order.,Alle Elemente wurden bereits \ für diesen Fertigungsauftrag übertragen.
-"All possible Workflow States and roles of the workflow. <br>Docstatus Options: 0 is""Saved"", 1 is ""Submitted"" and 2 is ""Cancelled""","Alle möglichen Workflow-Status und Rollen des Workflows. <br> DocStatus Optionen: 0 wird ""Gespeichert"" wird ein ""Eingereicht"" und 2 ""Cancelled"""
-All posts by,Alle Beiträge
+All Supplier Types,Alle Lieferant Typen
+"All export related fields like currency, conversion rate, export total, export grand total etc are available in <br>
+Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.",
+"All import related fields like currency, conversion rate, import total, import grand total etc are available in <br>
+Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.",
Allocate,Zuweisen
Allocate leaves for the year.,Weisen Blätter für das Jahr.
Allocated Amount,Zugeteilten Betrag
Allocated Budget,Zugeteilten Budget
Allocated amount,Zugeteilten Betrag
-Allow Attach,Lassen Befestigen
Allow Bill of Materials,Lassen Bill of Materials
Allow Dropbox Access,Erlauben Dropbox-Zugang
-Allow Editing of Frozen Accounts For,Erlauben Bearbeiten von eingefrorenen Konten für
+Allow For Users,Lassen Sie für Benutzer
Allow Google Drive Access,Erlauben Sie Google Drive Zugang
-Allow Import,Erlauben Sie importieren
-Allow Import via Data Import Tool,Erlauben Import via Datenimport-Werkzeug
Allow Negative Balance,Lassen Negative Bilanz
Allow Negative Stock,Lassen Negative Lager
Allow Production Order,Lassen Fertigungsauftrag
-Allow Rename,Lassen Sie Umbenennen
-Allow Samples,Lassen Proben
Allow User,Benutzer zulassen
Allow Users,Ermöglichen
-Allow on Submit,Lassen Sie auf Absenden
Allow the following users to approve Leave Applications for block days.,Lassen Sie die folgenden Benutzer zu verlassen Anwendungen für Block Tage genehmigen.
Allow user to edit Price List Rate in transactions,Benutzer zulassen Preis List in Transaktionen bearbeiten
-Allow user to login only after this hour (0-24),"Lassen Sie Benutzer nur anmelden, nach dieser Stunde (0-24)"
-Allow user to login only before this hour (0-24),"Lassen Sie Benutzer nur anmelden, bevor dieser Stunde (0-24)"
Allowance Percent,Allowance Prozent
-Allowed,Erlaubt
-Already Registered,Bereits angemeldete
-Always use Login Id as sender,Immer Login ID als Absender
+Allowed Role to Edit Entries Before Frozen Date,"Erlaubt Rolle , um Einträge bearbeiten Bevor Gefrorene Datum"
+Always use above Login Id as sender,Verwenden Sie immer über Anmelde-ID als Absender
Amend,Ändern
Amended From,Geändert von
Amount,Menge
Amount (Company Currency),Betrag (Gesellschaft Währung)
Amount <=,Betrag <=
Amount >=,Betrag> =
-"An icon file with .ico extension. Should be 16 x 16 px. Generated using a favicon generator. [<a href=""http://favicon-generator.org/"" target=""_blank"">favicon-generator.org</a>]","Ein Symbol-Datei mit. Ico. Sollte 16 x 16 px sein. Erzeugt mit ein Favicon-Generator. [<a Href=""http://favicon-generator.org/"" target=""_blank""> favicon-generator.org </ a>]"
+Amount to Bill,Belaufen sich auf Bill
+"An active Salary Structure already exists. \
+ If you want to create new one, please ensure that no active \
+ Salary Structure exists for this Employee. \
+ Go to the active Salary Structure and set \",
Analytics,Analytics
-Another Salary Structure '%s' is active for employee '%s'. Please make its status 'Inactive' to proceed.,"Another Gehaltsstruktur '% s' ist für Mitarbeiter '% s' aktiv. Bitte stellen Sie den Status "inaktiv", um fortzufahren."
+Another Period Closing Entry,Eine weitere Periode Schluss Eintrag
+Another Salary Structure '%s' is active for employee '%s'. Please make its status 'Inactive' to proceed.,"Eine andere Gehaltsstruktur '% s' ist für Mitarbeiter '% s' aktiv. Bitte stellen Sie ihren Status ""inaktiv"" , um fortzufahren."
"Any other comments, noteworthy effort that should go in the records.","Weitere Kommentare, bemerkenswerte Anstrengungen, die in den Aufzeichnungen gehen sollte."
Applicable Holiday List,Anwendbar Ferienwohnung Liste
+Applicable Territory,Anwendbar Territory
Applicable To (Designation),Für (Bezeichnung)
Applicable To (Employee),Für (Employee)
Applicable To (Role),Anwendbar (Rolle)
@@ -272,8 +283,6 @@
Applications for leave.,Bei Anträgen auf Urlaub.
Applies to Company,Gilt für Unternehmen
Apply / Approve Leaves,Übernehmen / Genehmigen Leaves
-Apply Shipping Rule,Bewerben Versand Rule
-Apply Taxes and Charges Master,Bewerben Steuern und Gebühren Meister
Appraisal,Bewertung
Appraisal Goal,Bewertung Goal
Appraisal Goals,Bewertung Details
@@ -285,31 +294,23 @@
Approver,Approver
Approving Role,Genehmigung Rolle
Approving User,Genehmigen Benutzer
+Are you sure you want to STOP ,
+Are you sure you want to UNSTOP ,
Are you sure you want to delete the attachment?,"Sind Sie sicher, dass Sie den Anhang löschen?"
-Arial,Arial
Arrear Amount,Nachträglich Betrag
-"As a best practice, do not assign the same set of permission rule to different Roles instead set multiple Roles to the User","Als Best Practice, nicht die gleiche Menge von Berechtigungen Vorschrift auf unterschiedliche Rollen stattdessen mehrere Rollen für den Benutzer"
As existing qty for item: ,Da sich die bestehenden Menge für Artikel:
As per Stock UOM,Wie pro Lagerbestand UOM
-"As there are existing stock transactions for this \ item, you can not change the values of 'Has Serial No', \ 'Is Stock Item' and 'Valuation Method'","Da es Bestand Transaktionen dieser \ item sind, können Sie nicht ändern, die Werte von 'Hat Seriennummer', 'Ist Lager Item' \ und "Valuation Method '"
+"As there are existing stock transactions for this item, you can not change the values of 'Has Serial No', 'Is Stock Item' and 'Valuation Method'","Da gibt es bestehende Aktientransaktionen zu diesem Artikel , können Sie die Werte von "" Hat Serien Nein ' nicht ändern , Ist Auf Artikel "" und "" Bewertungsmethode """
Ascending,Aufsteigend
-Assign To,Zuordnen zu
-Assigned By,Zugewiesen von
-Assignment,Zuordnung
-Assignments,Zuordnungen
-Associate a DocType to the Print Format,Zuordnen eines DocType der Print Format
+Assigned To,zugewiesen an
Atleast one warehouse is mandatory,Mindestens eines Lagers ist obligatorisch
-Attach,Befestigen
-Attach Document Print,Anhängen Dokument drucken
-Attached To DocType,Hinzugefügt zu DOCTYPE
-Attached To Name,An den Dateinamen
-Attachment,Anhang
+Attach as web link,Bringen Sie als Web-Link
Attachments,Zubehör
-Attempted to Contact,"Versucht, Kontakt"
Attendance,Teilnahme
Attendance Date,Teilnahme seit
Attendance Details,Teilnahme Einzelheiten
Attendance From Date,Teilnahme ab-Datum
+Attendance From Date and Attendance To Date is mandatory,Die Teilnahme von Datum bis Datum und Teilnahme ist obligatorisch
Attendance To Date,Teilnahme To Date
Attendance can not be marked for future dates,Die Teilnahme kann nicht für zukünftige Termine markiert werden
Attendance for the employee: ,Die Teilnahme für die Mitarbeiter:
@@ -317,19 +318,21 @@
Attributions,Zuschreibungen
Authorization Control,Authorization Control
Authorization Rule,Autorisierungsregel
+Auto Accounting For Stock Settings,Auto Accounting for Stock -Einstellungen
Auto Email Id,Auto Email Id
-Auto Inventory Accounting,Auto Vorratsbuchhaltung
-Auto Inventory Accounting Settings,Auto Vorratsbuchhaltung Einstellungen
Auto Material Request,Auto Werkstoff anfordern
-Auto Name,Auto Name
-Auto generated,Auto generiert
Auto-raise Material Request if quantity goes below re-order level in a warehouse,"Auto-Raise Werkstoff anfordern, wenn Quantität geht unten re-order-Ebene in einer Lagerhalle"
+Automatically extract Job Applicants from a mail box ,
+Automatically extract Leads from a mail box e.g.,Extrahieren Sie automatisch Leads aus einer Mail-Box z. B.
Automatically updated via Stock Entry of type Manufacture/Repack,Automatisch über Lager Eintrag vom Typ Manufacture / Repack aktualisiert
Autoreply when a new mail is received,Autoreply wenn eine neue E-Mail empfangen
+Available,verfügbar
Available Qty at Warehouse,Verfügbare Menge bei Warehouse
Available Stock for Packing Items,Lagerbestand für Packstücke
-"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Erhältlich in Stücklisten, Lieferschein, Bestellung, Fertigungsauftrag, Bestellung, Kaufbeleg, Sales Invoice, Sales Order, Stock Entry, Timesheet"
-Avatar,Avatar
+"Available in
+BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet",
+Average Age,Durchschnittsalter
+Average Commission Rate,Durchschnittliche Kommission bewerten
Average Discount,Durchschnittliche Discount
B+,B +
B-,B-
@@ -345,16 +348,17 @@
BOM Operations,BOM Operationen
BOM Replace Tool,BOM Replace Tool
BOM replaced,BOM ersetzt
-Background Color,Hintergrundfarbe
-Background Image,Background Image
Backup Manager,Backup Manager
Backup Right Now,Sichern Right Now
Backups will be uploaded to,"Backups werden, die hochgeladen werden"
+Balance Qty,Bilanz Menge
+Balance Value,Bilanzwert
"Balances of Accounts of type ""Bank or Cash""",Kontostände vom Typ "Bank-oder Cash"
Bank,Bank
Bank A/C No.,Bank A / C Nr.
Bank Account,Bankkonto
Bank Account No.,Bank Konto-Nr
+Bank Accounts,Bankkonten
Bank Clearance Summary,Bank-Ausverkauf Zusammenfassung
Bank Name,Name der Bank
Bank Reconciliation,Kontenabstimmung
@@ -363,10 +367,6 @@
Bank Voucher,Bankgutschein
Bank or Cash,Bank oder Bargeld
Bank/Cash Balance,Banken / Cash Balance
-Banner,Banner
-Banner HTML,Banner HTML
-Banner Image,Banner Bild
-Banner is above the Top Menu Bar.,Banner über der oberen Menüleiste.
Barcode,Strichcode
Based On,Basierend auf
Basic Info,Basic Info
@@ -383,8 +383,7 @@
Batch Time Logs for billing.,Batch Zeit Logs für die Abrechnung.
Batch-Wise Balance History,Batch-Wise Gleichgewicht History
Batched for Billing,Batch für Billing
-Be the first one to comment,"Seien Sie der Erste, der einen Kommentar"
-Begin this page with a slideshow of images,Beginnen Sie diese Seite mit einer Diashow von Bildern
+"Before proceeding, please create Customer from Lead","Bevor Sie fortfahren, erstellen Sie bitte Kunden aus Blei"
Better Prospects,Bessere Aussichten
Bill Date,Bill Datum
Bill No,Bill No
@@ -393,6 +392,7 @@
Bill of Materials (BOM),Bill of Materials (BOM)
Billable,Billable
Billed,Angekündigt
+Billed Amount,Rechnungsbetrag
Billed Amt,Billed Amt
Billing,Billing
Billing Address,Rechnungsadresse
@@ -402,49 +402,35 @@
Bills raised to Customers.,"Bills angehoben, um Kunden."
Bin,Kasten
Bio,Bio
-Bio will be displayed in blog section etc.,Bio wird in Blog-Bereich usw. angezeigt werden
-Birth Date,Geburtsdatum
-Blob,Klecks
+Birthday,Geburtstag
Block Date,Blockieren Datum
Block Days,Block Tage
Block Holidays on important days.,Blockieren Urlaub auf wichtige Tage.
Block leave applications by department.,Block verlassen Anwendungen nach Abteilung.
-Blog Category,Blog Kategorie
-Blog Intro,Blog Intro
-Blog Introduction,Blog Einführung
Blog Post,Blog Post
-Blog Settings,Blog-Einstellungen
Blog Subscriber,Blog Subscriber
-Blog Title,Blog Titel
-Blogger,Blogger
Blood Group,Blutgruppe
Bookmarks,Bookmarks
+Both Income and Expense balances are zero. No Need to make Period Closing Entry.,Beide Erträge und Aufwendungen Salden sind Null. No Need to Zeitraum Closing Eintrag zu machen.
+Both Warehouse must belong to same Company,Beide Lager müssen an derselben Gesellschaft gehören
Branch,Zweig
Brand,Marke
-Brand HTML,Marke HTML
Brand Name,Markenname
-"Brand is what appears on the top-right of the toolbar. If it is an image, make sure ithas a transparent background and use the <img /> tag. Keep size as 200px x 30px","Marke ist das, was in der oberen rechten Ecke des Symbolleiste. Wenn es ein Bild ist, stellen Sie sicher, ithas einen transparenten Hintergrund und verwenden Sie die <img />-Tag. Halten Größe wie 200px x 30px"
Brand master.,Marke Meister.
Brands,Marken
Breakdown,Zusammenbruch
Budget,Budget
Budget Allocated,Budget
-Budget Control,Budget Control
Budget Detail,Budget Detailansicht
Budget Details,Budget Einzelheiten
Budget Distribution,Budget Verteilung
Budget Distribution Detail,Budget Verteilung Detailansicht
Budget Distribution Details,Budget Ausschüttungsinformationen
Budget Variance Report,Budget Variance melden
-Build Modules,Bauen Module
-Build Pages,Bauen Seiten
-Build Server API,Build-Server API
-Build Sitemap,Bauen Sitemap
-Bulk Email,Bulk Email
-Bulk Email records.,Bulk Email Datensätze.
+Build Report,Bauen Bericht
+Bulk Rename,Groß Umbenennen
Bummer! There are more holidays than working days this month.,Bummer! Es gibt mehr Feiertage als Arbeitstage in diesem Monat.
Bundle items at time of sale.,Bundle Artikel zum Zeitpunkt des Verkaufs.
-Button,Taste
Buyer of Goods and Services.,Käufer von Waren und Dienstleistungen.
Buying,Kauf
Buying Amount,Einkaufsführer Betrag
@@ -455,9 +441,9 @@
C-Form Applicable,"C-Form,"
C-Form Invoice Detail,C-Form Rechnungsdetails
C-Form No,C-Form nicht
+C-Form records,C- Form- Aufzeichnungen
CI/2010-2011/,CI/2010-2011 /
COMM-,COMM-
-CSS,CSS
CUST,CUST
CUSTMUM,CUSTMUM
Calculate Based On,Berechnen Basierend auf
@@ -469,29 +455,28 @@
Campaign Name,Kampagnenname
Can only be exported by users with role 'Report Manager',"Kann nur von Benutzern mit der Rolle ""Report Manager"" exportiert werden"
Cancel,Kündigen
-Cancel permission also allows the user to delete a document (if it is not linked to any other document).,"Abbrechen Erlaubnis ermöglicht dem Benutzer auch, um ein Dokument (wenn sie nicht auf irgendeine andere Dokument verknüpft) zu löschen."
Cancelled,Abgesagt
+Cancelling this Stock Reconciliation will nullify its effect.,Annullierung dieses Lizenz Versöhnung wird ihre Wirkung zunichte machen .
Cannot ,Kann nicht
+Cannot Cancel Opportunity as Quotation Exists,Kann nicht Abbrechen Gelegenheit als Zitat vorhanden ist
Cannot approve leave as you are not authorized to approve leaves on Block Dates.,"Kann nicht genehmigen lassen, wie Sie sind nicht berechtigt, Blätter auf Block-Termine genehmigen."
-Cannot change from,Kann nicht ändern
+Cannot change Year Start Date and Year End Date once the Fiscal Year is saved.,"Jahr Startdatum und Enddatum Jahr , sobald die Geschäftsjahr wird gespeichert nicht ändern kann."
Cannot continue.,Kann nicht fortgesetzt werden.
-Cannot have two prices for same Price List,Kann nicht zwei Preise für das gleiche Preisliste
-Cannot map because following condition fails: ,"Kann nicht zuordnen, da folgende Bedingung nicht:"
+"Cannot declare as lost, because Quotation has been made.","Kann nicht erklären, wie verloren, da Zitat gemacht worden ."
+"Cannot delete Serial No in warehouse. \
+ First remove from warehouse, then delete.",
+Cannot edit standard fields,Kann Standardfelder nicht bearbeiten
+Cannot set as Lost as Sales Order is made.,Kann nicht als Passwort gesetzt als Sales Order erfolgt.
Capacity,Kapazität
Capacity Units,Capacity Units
Carry Forward,Vortragen
Carry Forwarded Leaves,Carry Weitergeleitete Leaves
-Case No(s) already in use. Please rectify and try again. Recommended <b>From Case No. = %s</b>,Fall Nr. (n) bereits im Einsatz. Bitte korrigieren und versuchen Sie es erneut. Empfohlen <b>von Fall Nr. =% s</b>
+Case No. cannot be 0,Fall Nr. kann nicht 0 sein
Cash,Bargeld
Cash Voucher,Cash Gutschein
Cash/Bank Account,Cash / Bank Account
-Categorize blog posts.,Kategorisieren Blog-Posts.
Category,Kategorie
-Category Name,Kategorie Name
-Category of customer as entered in Customer master,"Kategorie von Kunden, wie in Customer Master eingetragen"
Cell Number,Cell Number
-Center,Zentrum
-"Certain documents should not be changed once final, like an Invoice for example. The final state for such documents is called <b>Submitted</b>. You can restrict which roles can Submit.","Bestimmte Dokumente sollten nicht geändert werden, nachdem endgültig angesehen werden, wie eine Rechnung zum Beispiel. Der Endzustand für solche Dokumente wird als <b> Eingereicht </ b>. Sie können einschränken, welche Rollen können Sie auf Absenden."
Change UOM for an Item.,Ändern UOM für ein Item.
Change the starting / current sequence number of an existing series.,Ändern Sie den Start / aktuelle Sequenznummer eines bestehenden Serie.
Channel Partner,Channel Partner
@@ -500,9 +485,8 @@
Chart of Accounts,Kontenplan
Chart of Cost Centers,Abbildung von Kostenstellen
Chat,Plaudern
-Check,Überprüfen
-Check / Uncheck roles assigned to the Profile. Click on the Role to find out what permissions that Role has.,"Aktivieren / Deaktivieren zugewiesenen Rollen der Profile. Klicken Sie auf die Rolle, um herauszufinden, welche Berechtigungen dieser Rolle hat."
Check all the items below that you want to send in this digest.,"Überprüfen Sie alle Artikel unten, dass Sie in diesem Digest senden."
+Check for Duplicates,Dublettenprüfung
Check how the newsletter looks in an email by sending it to your email.,"Prüfen Sie, wie der Newsletter in einer E-Mail aussieht, indem es an deine E-Mail."
"Check if recurring invoice, uncheck to stop recurring or put proper End Date","Prüfen Sie, ob wiederkehrende Rechnung, deaktivieren zu stoppen wiederkehrende oder legen richtigen Enddatum"
"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.","Überprüfen Sie, ob Sie die automatische wiederkehrende Rechnungen benötigen. Nach dem Absenden eine Rechnung über den Verkauf wird Recurring Abschnitt sichtbar sein."
@@ -511,16 +495,13 @@
Check this if you want to send emails as this id only (in case of restriction by your email provider).,"Aktivieren Sie diese Option, wenn Sie E-Mails, da diese id nur (im Falle von Beschränkungen durch Ihre E-Mail-Provider) gesendet werden soll."
Check this if you want to show in website,"Aktivieren Sie diese Option, wenn Sie in der Website zeigen wollen"
Check this to disallow fractions. (for Nos),Aktivieren Sie diese verbieten Fraktionen. (Für Nos)
-Check this to make this the default letter head in all prints,"Aktivieren Sie diese Option, um es als Standard-Briefkopf in allen Ausdrucke"
Check this to pull emails from your mailbox,"Aktivieren Sie diese Option, um E-Mails aus Ihrer Mailbox ziehen"
Check to activate,Überprüfen Sie aktivieren
Check to make Shipping Address,"Überprüfen Sie, Liefer-Adresse machen"
Check to make primary address,Überprüfen primäre Adresse machen
-Checked,Geprüft
Cheque,Scheck
Cheque Date,Scheck Datum
Cheque Number,Scheck-Nummer
-Child Tables are shown as a Grid in other DocTypes.,Child-Tabellen werden als Grid in anderen DocTypes gezeigt.
City,City
City/Town,Stadt / Ort
Claim Amount,Schadenhöhe
@@ -531,66 +512,64 @@
Clear Cache & Refresh,Clear Cache & Refresh
Clear Table,Tabelle löschen
Clearance Date,Clearance Datum
-"Click on ""Get Latest Updates""",Klicken Sie auf "Get Latest Updates"
+Click here to buy subscription.,"Klicken Sie hier, um Abonnements zu kaufen."
Click on 'Make Sales Invoice' button to create a new Sales Invoice.,"Klicken Sie auf "Als Sales Invoice", um einen neuen Sales Invoice erstellen."
-Click on button in the 'Condition' column and select the option 'User is the creator of the document',"Klicken Sie auf die Schaltfläche in der 'Bedingung' Spalte und wählen Sie die Option ""Benutzer ist der Schöpfer des Dokuments"""
+Click on a link to get options to expand get options ,
+Click on row to edit.,Klicken Sie auf die Zeile zu bearbeiten.
Click to Expand / Collapse,Klicken Sie auf Erweitern / Reduzieren
Client,Auftraggeber
Close,Schließen
+Close Balance Sheet and book Profit or Loss.,Schließen Bilanz und Gewinn-und -Verlust- Buch .
Closed,Geschlossen
Closing Account Head,Konto schließen Leiter
Closing Date,Einsendeschluss
Closing Fiscal Year,Schließen Geschäftsjahr
+Closing Qty,Schließen Menge
+Closing Value,Schlusswerte
CoA Help,CoA Hilfe
-Code,Code
Cold Calling,Cold Calling
Color,Farbe
-Column Break,Spaltenumbruch
Comma separated list of email addresses,Durch Komma getrennte Liste von E-Mail-Adressen
-Comment,Kommentar
-Comment By,Kommentar von
-Comment By Fullname,Kommentar von Fullname
-Comment Date,Kommentar Datum
-Comment Docname,Kommentar DocName
-Comment Doctype,Kommentar Doctype
-Comment Time,Kommentar Zeit
Comments,Kommentare
Commission Rate,Kommission bewerten
Commission Rate (%),Kommission Rate (%)
Commission partners and targets,Kommission Partnern und Ziele
+Commit Log,Commit- Log
Communication,Kommunikation
Communication HTML,Communication HTML
Communication History,Communication History
Communication Medium,Communication Medium
Communication log.,Communication log.
+Communications,Kommunikation
Company,Firma
+Company Abbreviation,Firmen Abkürzung
Company Details,Unternehmensprofil
-Company History,Unternehmensgeschichte
-Company History Heading,Unternehmensgeschichte Überschrift
+Company Email,Firma E-Mail
Company Info,Firmeninfo
-Company Introduction,Vorstellung der Gesellschaft
Company Master.,Firma Meister.
Company Name,Firmenname
Company Settings,Gesellschaft Einstellungen
Company branches.,Unternehmen Niederlassungen.
Company departments.,Abteilungen des Unternehmens.
-Company is missing or entered incorrect value,Unternehmen fehlt oder falsch eingegeben Wert
-Company mismatch for Warehouse,Unternehmen Mismatch für Warehouse
+Company is mandatory,Gesellschaft ist obligatorisch
Company registration numbers for your reference. Example: VAT Registration Numbers etc.,Handelsregisternummer für Ihre Referenz. Beispiel: Umsatzsteuer-Identifikationsnummern usw.
Company registration numbers for your reference. Tax numbers etc.,Handelsregisternummer für Ihre Referenz. MwSt.-Nummern etc.
+"Company, Month and Fiscal Year is mandatory","Unternehmen , Monat und Geschäftsjahr ist obligatorisch"
Complaint,Beschwerde
Complete,Vervollständigen
-Complete By,Complete von
Completed,Fertiggestellt
+Completed Production Orders,Abgeschlossene Fertigungsaufträge
Completed Qty,Abgeschlossene Menge
Completion Date,Datum der Fertigstellung
Completion Status,Completion Status
+Confirmation Date,Bestätigung Datum
Confirmed orders from Customers.,Bestätigte Bestellungen von Kunden.
Consider Tax or Charge for,Betrachten Sie Steuern oder Gebühren für die
-"Consider this Price List for fetching rate. (only which have ""For Buying"" as checked)","Betrachten Sie diese Preisliste für das Abrufen bewerten. (Nur die haben ""für den Kauf"", wie geprüft)"
Considered as Opening Balance,Er gilt als Eröffnungsbilanz
Considered as an Opening Balance,Er gilt als einer Eröffnungsbilanz
Consultant,Berater
+Consumable Cost,Verbrauchskosten
+Consumable cost per hour,Verbrauchskosten pro Stunde
Consumed Qty,Verbrauchte Menge
Contact,Kontakt
Contact Control,Kontakt Kontrolle
@@ -604,43 +583,39 @@
Contact No.,Kontakt Nr.
Contact Person,Ansprechpartner
Contact Type,Kontakt Typ
-Contact Us Settings,Kontakt Settings
-Contact in Future,Kontakt in Zukunft
-"Contact options, like ""Sales Query, Support Query"" etc each on a new line or separated by commas.","Kontakt Optionen, wie ""Sales Query, Support-Anfrage"" etc jeweils auf einer neuen Zeile oder durch Kommas getrennt."
-Contacted,Kontaktiert
Content,Inhalt
Content Type,Content Type
-Content in markdown format that appears on the main side of your page,"Content in markdown Format, das auf der Hauptseite Ihrer Seite"
-Content web page.,Inhalt Web-Seite.
Contra Voucher,Contra Gutschein
Contract End Date,Contract End Date
Contribution (%),Anteil (%)
Contribution to Net Total,Beitrag zum Net Total
-Control Panel,Control Panel
Conversion Factor,Umrechnungsfaktor
-Conversion Rate,Conversion Rate
+Conversion Factor of UOM: %s should be equal to 1. As UOM: %s is Stock UOM of Item: %s.,Umrechnungsfaktor der Verpackung: % s gleich 1 sein sollte . Als Maßeinheit: % s ist Auf der Verpackung Artikel: % s .
Convert into Recurring Invoice,Konvertieren in Wiederkehrende Rechnung
+Convert to Group,Konvertieren in Gruppe
+Convert to Ledger,Convert to Ledger
Converted,Umgerechnet
Copy,Kopieren
Copy From Item Group,Kopieren von Artikel-Gruppe
-Copyright,Copyright
-Core,Kern
Cost Center,Kostenstellenrechnung
Cost Center Details,Kosten Center Details
Cost Center Name,Kosten Center Name
-Cost Center is mandatory for item: ,Kostenstelle ist obligatorisch für Artikel:
Cost Center must be specified for PL Account: ,Kostenstelle muss für PL Konto angegeben werden:
Costing,Kalkulation
Country,Land
Country Name,Land Name
+"Country, Timezone and Currency","Land , Zeitzone und Währung"
Create,Schaffen
Create Bank Voucher for the total salary paid for the above selected criteria,Erstellen Bankgutschein für die Lohnsumme für die oben ausgewählten Kriterien gezahlt
+Create Customer,Neues Kunden
Create Material Requests,Material anlegen Requests
+Create New,Neu erstellen
+Create Opportunity,erstellen Sie Gelegenheit
Create Production Orders,Erstellen Fertigungsaufträge
+Create Quotation,Angebot erstellen
Create Receiver List,Erstellen Receiver Liste
Create Salary Slip,Erstellen Gehaltsabrechnung
Create Stock Ledger Entries when you submit a Sales Invoice,"Neues Lager Ledger Einträge, wenn Sie einen Sales Invoice vorlegen"
-"Create a price list from Price List master and enter standard ref rates against each of them. On selection of a price list in Quotation, Sales Order or Delivery Note, corresponding ref rate will be fetched for this item.","Erstellen Sie eine Preisliste von Preisliste Master und geben Sie Standard-ref Preise gegen jeden von ihnen. Bei Auswahl einer Preisliste Angebot, Auftrag oder Lieferschein, werden entsprechende ref für dieser Artikel abgeholt werden."
Create and Send Newsletters,Erstellen und Senden Newsletters
Created Account Head: ,Erstellt Konto Kopf:
Created By,Erstellt von
@@ -649,6 +624,10 @@
Created Opportunity,Erstellt Chance
Created Support Ticket,Erstellt Support Ticket
Creates salary slip for above mentioned criteria.,Erstellt Gehaltsabrechnung für die oben genannten Kriterien.
+Creation Date,Erstellungsdatum
+Creation Document No,Creation Dokument Nr.
+Creation Document Type,Creation Dokumenttyp
+Creation Time,Erstellungszeit
Credentials,Referenzen
Credit,Kredit
Credit Amt,Kredit-Amt
@@ -658,36 +637,31 @@
Credit Limit,Kreditlimit
Credit Note,Gutschrift
Credit To,Kredite an
+Credited account (Customer) is not matching with Sales Invoice,Aufgeführt Konto (Kunde) ist nicht mit Sales Invoice pass
Cross Listing of Item in multiple groups,Überqueren Auflistung der Artikel in mehreren Gruppen
Currency,Währung
Currency Exchange,Geldwechsel
-Currency Format,Währung Format
Currency Name,Währung Name
Currency Settings,Währung Einstellungen
Currency and Price List,Währungs-und Preisliste
-Currency does not match Price List Currency for Price List,Währung nicht mit Preisliste Währung für Preisliste
-Current Accommodation Type,Aktuelle Unterkunftstyp
+Currency is missing for Price List,Die Währung ist für Preisliste fehlt
Current Address,Aktuelle Adresse
+Current Address Is,Aktuelle Adresse
Current BOM,Aktuelle Stückliste
Current Fiscal Year,Laufenden Geschäftsjahr
Current Stock,Aktuelle Stock
Current Stock UOM,Aktuelle Stock UOM
Current Value,Aktueller Wert
-Current status,Aktueller Status
Custom,Brauch
Custom Autoreply Message,Benutzerdefinierte Autoreply Nachricht
-Custom CSS,Custom CSS
-Custom Field,Custom Field
Custom Message,Custom Message
Custom Reports,Benutzerdefinierte Berichte
-Custom Script,Custom Script
-Custom Startup Code,Benutzerdefinierte Startup Code
-Custom?,Custom?
Customer,Kunde
Customer (Receivable) Account,Kunde (Forderungen) Konto
Customer / Item Name,Kunde / Item Name
-Customer Account,Kundenkonto
+Customer / Lead Address,Kunden / Lead -Adresse
Customer Account Head,Kundenkonto Kopf
+Customer Acquisition and Loyalty,Kundengewinnung und-bindung
Customer Address,Kundenadresse
Customer Addresses And Contacts,Kundenadressen und Kontakte
Customer Code,Customer Code
@@ -697,39 +671,30 @@
Customer Discounts,Kunden Rabatte
Customer Feedback,Kundenfeedback
Customer Group,Customer Group
+Customer Group / Customer,Kundengruppe / Kunden
Customer Group Name,Kunden Group Name
Customer Intro,Kunden Intro
Customer Issue,Das Anliegen des Kunden
Customer Issue against Serial No.,Das Anliegen des Kunden gegen Seriennummer
Customer Name,Name des Kunden
Customer Naming By,Kunden Benennen von
-Customer Type,Kundentyp
Customer classification tree.,Einteilung der Kunden Baum.
Customer database.,Kunden-Datenbank.
-Customer's Currency,Kunden Währung
Customer's Item Code,Kunden Item Code
Customer's Purchase Order Date,Bestellung des Kunden Datum
Customer's Purchase Order No,Bestellung des Kunden keine
+Customer's Purchase Order Number,Kundenauftragsnummer
Customer's Vendor,Kunden Hersteller
-Customer's currency,Kunden Währung
-"Customer's currency - If you want to select a currency that is not the default currency, then you must also specify the Currency Conversion Rate.","Kunden Währung - Wenn Sie eine Währung, die nicht die Standard-Währung auswählen wollen, dann müssen Sie auch die Currency Conversion Rate."
Customers Not Buying Since Long Time,Kunden Kaufen nicht seit langer Zeit
Customerwise Discount,Customerwise Discount
-Customize,Anpassen
-Customize Form,Formular anpassen
-Customize Form Field,Passen Form Field
-"Customize Label, Print Hide, Default etc.","Passen Label, Print Hide, Standard, etc."
+Customization,Customization
Customize the Notification,Passen Sie die Benachrichtigung
Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,"Passen Sie den einleitenden Text, der als Teil der E-Mail geht. Jede Transaktion hat einen separaten einleitenden Text."
DN,DN
DN Detail,DN Detailansicht
Daily,Täglich
-Daily Event Digest is sent for Calendar Events where reminders are set.,Täglich Termin Digest ist für Kalendereintrag wo Erinnerungen eingestellt gesendet.
Daily Time Log Summary,Täglich Log Zusammenfassung
-Danger,Gefahr
-Data,Daten
-Data missing in table,Fehlende Daten in der Tabelle
-Database,Datenbank
+Data Import,Datenimport
Database Folder ID,Database Folder ID
Database of potential customers.,Datenbank von potentiellen Kunden.
Date,Datum
@@ -743,9 +708,8 @@
Date of Joining,Datum der Verbindungstechnik
Date on which lorry started from supplier warehouse,"Datum, an dem Lastwagen startete von Lieferantenlager"
Date on which lorry started from your warehouse,"Datum, an dem Lkw begann von Ihrem Lager"
-Date on which the lead was last contacted,"Datum, an dem das Blei letzten kontaktiert wurde"
Dates,Termine
-Datetime,Datetime
+Days Since Last Order,Tage seit dem letzten Auftrag
Days for which Holidays are blocked for this department.,"Tage, für die Feiertage sind für diese Abteilung blockiert."
Dealer,Händler
Dear,Liebe
@@ -753,7 +717,9 @@
Debit Amt,Debit Amt
Debit Note,Lastschrift
Debit To,Debit Um
+Debit and Credit not equal for this voucher: Diff (Debit) is ,
Debit or Credit,Debit-oder Kreditkarten
+Debited account (Supplier) is not matching with Purchase Invoice,Konto abgebucht (Supplier ) nicht mit passenden Einkaufsrechnung
Deduct,Abziehen
Deduction,Abzug
Deduction Type,Abzug Typ
@@ -764,22 +730,18 @@
Default BOM,Standard BOM
Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Standard Bank / Cash-Konto werden automatisch in POS Rechnung aktualisiert werden, wenn dieser Modus ausgewählt ist."
Default Bank Account,Standard Bank Account
+Default Buying Price List,Standard Kaufpreisliste
Default Cash Account,Standard Cashkonto
-Default Commission Rate,Standard Kommission bewerten
Default Company,Standard Unternehmen
Default Cost Center,Standard Kostenstelle
Default Cost Center for tracking expense for this item.,Standard Cost Center for Tracking Kosten für diesen Artikel.
Default Currency,Standardwährung
Default Customer Group,Standard Customer Group
Default Expense Account,Standard Expense Konto
-Default Home Page,Standard Home Page
-Default Home Pages,Standard-Home-Pages
Default Income Account,Standard Income Konto
Default Item Group,Standard Element Gruppe
Default Price List,Standard Preisliste
-Default Print Format,Standard Print Format
Default Purchase Account in which cost of the item will be debited.,Standard Purchase Konto in dem Preis des Artikels wird abgebucht.
-Default Sales Partner,Standard Vertriebspartner
Default Settings,Default Settings
Default Source Warehouse,Default Source Warehouse
Default Stock UOM,Standard Lager UOM
@@ -787,24 +749,20 @@
Default Supplier Type,Standard Lieferant Typ
Default Target Warehouse,Standard Ziel Warehouse
Default Territory,Standard Territory
+Default UOM updated in item ,
Default Unit of Measure,Standard-Maßeinheit
+"Default Unit of Measure can not be changed directly because you have already made some transaction(s) with another UOM. To change default UOM, use 'UOM Replace Utility' tool under Stock module.","Standard- Maßeinheit kann nicht direkt geändert werden , weil Sie bereits eine Transaktion (en) mit einer anderen Verpackung gemacht haben. Um die Standardmengeneinheitzu ändern, verwenden ' Verpackung ersetzen Utility "" -Tool unter Auf -Modul."
Default Valuation Method,Standard Valuation Method
-Default Value,Default Value
Default Warehouse,Standard Warehouse
Default Warehouse is mandatory for Stock Item.,Standard Warehouse ist obligatorisch für Lagerware.
Default settings for Shopping Cart,Standardeinstellungen für Einkaufswagen
-"Default: ""Contact Us""",Default: "Kontaktieren Sie uns"
-DefaultValue,DefaultValue
-Defaults,Defaults
"Define Budget for this Cost Center. To set budget action, see <a href=""#!List/Company"">Company Master</a>","Definieren Budget für diese Kostenstelle. Um Budget Aktion finden Sie unter <a href=""#!List/Company""> Firma Master </ a>"
-Defines actions on states and the next step and allowed roles.,Definiert Aktionen auf Staaten und den nächsten Schritt und erlaubt Rollen.
-Defines workflow states and rules for a document.,Definiert Workflow-Status und Regeln für ein Dokument.
Delete,Löschen
Delete Row,Zeile löschen
Delivered,Lieferung
Delivered Items To Be Billed,Liefergegenstände in Rechnung gestellt werden
Delivered Qty,Geliefert Menge
-Delivery Address,Lieferanschrift
+Delivered Serial No ,
Delivery Date,Liefertermin
Delivery Details,Anlieferungs-Details
Delivery Document No,Lieferung Dokument Nr.
@@ -814,42 +772,29 @@
Delivery Note Items,Lieferscheinpositionen
Delivery Note Message,Lieferschein Nachricht
Delivery Note No,Lieferschein Nein
-Packed Item,Lieferschein Verpackung Artikel
Delivery Note Required,Lieferschein erforderlich
Delivery Note Trends,Lieferschein Trends
Delivery Status,Lieferstatus
Delivery Time,Lieferzeit
Delivery To,Liefern nach
Department,Abteilung
-Depends On,Depends On
Depends on LWP,Abhängig von LWP
Descending,Absteigend
Description,Beschreibung
Description HTML,Beschreibung HTML
-"Description for listing page, in plain text, only a couple of lines. (max 140 characters)","Beschreibung für die Auflistung Seite, im Klartext, nur ein paar Zeilen. (Max 140 Zeichen)"
-Description for page header.,Beschreibung für Seitenkopf.
Description of a Job Opening,Beschreibung eines Job Opening
Designation,Bezeichnung
-Desktop,Desktop
Detailed Breakup of the totals,Detaillierte Breakup der Gesamtsummen
Details,Details
-Deutsch,Deutsch
-Did not add.,Haben Sie nicht hinzuzufügen.
-Did not cancel,Haben Sie nicht abbrechen
-Did not save,Nicht speichern
Difference,Unterschied
-"Different ""States"" this document can exist in. Like ""Open"", ""Pending Approval"" etc.","Different ""Staaten"" in diesem Dokument existieren kann in. Gefällt mir ""Open"", ""Pending Approval"" etc."
-Disable Customer Signup link in Login page,Deaktivieren Kunde anmelden Link in Login-Seite
+Difference Account,Unterschied Konto
+Different UOM for items will lead to incorrect,Unterschiedliche Verpackung für Einzelteile werden zur falschen führen
Disable Rounded Total,Deaktivieren Abgerundete insgesamt
-Disable Signup,Deaktivieren Anmelden
-Disabled,Behindert
Discount %,Discount%
Discount %,Discount%
Discount (%),Rabatt (%)
"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Discount Felder werden in der Bestellung, Kaufbeleg Kauf Rechnung verfügbar"
Discount(%),Rabatt (%)
-Display,Anzeige
-Display Settings,Display-Einstellungen
Display all the individual items delivered with the main items,Alle anzeigen die einzelnen Punkte mit den wichtigsten Liefergegenstände
Distinct unit of an Item,Separate Einheit eines Elements
Distribute transport overhead across items.,Verteilen Transport-Overhead auf Gegenstände.
@@ -858,33 +803,33 @@
Distribution Name,Namen der Distribution
Distributor,Verteiler
Divorced,Geschieden
+Do Not Contact,Nicht berühren
Do not show any symbol like $ etc next to currencies.,Zeigen keine Symbol wie $ etc neben Währungen.
+Do really want to unstop production order: ,
+Do you really want to STOP ,
+Do you really want to STOP this Material Request?,"Wollen Sie wirklich , diese Materialanforderung zu stoppen?"
+Do you really want to Submit all Salary Slip for month : ,
+Do you really want to UNSTOP ,
+Do you really want to UNSTOP this Material Request?,"Wollen Sie wirklich , dieses Material anfordern aufmachen ?"
+Do you really want to stop production order: ,
Doc Name,Doc Namen
-Doc Status,Doc-Status
Doc Type,Doc Type
-DocField,DocField
-DocPerm,DocPerm
-DocType,DOCTYPE
-DocType Details,DocType Einzelheiten
-DocType is a Table / Form in the application.,DocType ist eine Tabelle / Formular in der Anwendung.
-DocType on which this Workflow is applicable.,"DOCTYPE, auf denen diese Workflow-anwendbar ist."
-DocType or Field,DocType oder Field
-Document,Dokument
Document Description,Document Beschreibung
-Document Numbering Series,Belegnummerierung Series
Document Status transition from ,Document Status Übergang von
Document Type,Document Type
Document is only editable by users of role,Dokument ist nur editierbar Nutzer Rolle
Documentation,Dokumentation
-Documentation Generator Console,Documentation Generator Console
-Documentation Tool,Documentation Tool
Documents,Unterlagen
Domain,Domain
+Don't send Employee Birthday Reminders,Senden Sie keine Mitarbeitergeburtstagserinnerungen
Download Backup,Download von Backup
Download Materials Required,Herunterladen benötigte Materialien
+Download Reconcilation Data,Laden Versöhnung Daten
Download Template,Vorlage herunterladen
Download a report containing all raw materials with their latest inventory status,Laden Sie einen Bericht mit allen Rohstoffen mit ihren neuesten Inventar Status
-"Download the Template, fill appropriate data and attach the modified file.All dates and employee combination in the selected period will come in the template, with existing attendance records","Laden Sie die Vorlage, füllen entsprechenden Daten und befestigen Sie die modifizierte file.All Termine und Mitarbeiter Kombination in der gewählten Zeit wird in der Vorlage zu kommen, mit den bestehenden Anwesenheitslisten"
+"Download the Template, fill appropriate data and attach the modified file.","Laden Sie die Vorlage , füllen entsprechenden Daten und befestigen Sie die geänderte Datei ."
+"Download the Template, fill appropriate data and attach the modified file.
+All dates and employee combination in the selected period will come in the template, with existing attendance records",
Draft,Entwurf
Drafts,Dame
Drag to sort columns,Ziehen Sie Spalten sortieren
@@ -893,9 +838,16 @@
Dropbox Access Key,Dropbox Access Key
Dropbox Access Secret,Dropbox Zugang Geheimnis
Due Date,Due Date
+Duplicate Item,Duplizieren Artikel
EMP/,EMP /
+ERPNext Setup,ERPNext -Setup
+ERPNext Setup Guide,ERPNext Setup Guide
+"ERPNext is an open-source web based ERP made by Web Notes Technologies Pvt Ltd.\
+ to provide an integrated tool to manage most processes in a small organization.\
+ For more information about Web Notes, or to buy hosting servies, go to ",
ESIC CARD No,ESIC CARD Nein
ESIC No.,ESIC Nr.
+Earliest,Frühest
Earning,Earning
Earning & Deduction,Earning & Abzug
Earning Type,Earning Typ
@@ -905,30 +857,25 @@
Educational Qualification,Educational Qualifikation
Educational Qualification Details,Educational Qualifikation Einzelheiten
Eg. smsgateway.com/api/send_sms.cgi,Eg. smsgateway.com / api / send_sms.cgi
+Electricity Cost,Stromkosten
+Electricity cost per hour,Stromkosten pro Stunde
Email,E-Mail
-Email (By company),Email (nach Unternehmen)
Email Digest,Email Digest
Email Digest Settings,Email Digest Einstellungen
-Email Host,E-Mail-Host
+Email Digest: ,
Email Id,Email Id
"Email Id must be unique, already exists for: ","E-Mail-ID muss eindeutig sein, bereits für:"
"Email Id where a job applicant will email e.g. ""jobs@example.com""","Email Id, wo ein Bewerber beispielsweise per E-Mail wird ""Jobs@example.com"""
-Email Login,E-Mail Anmelden
-Email Password,E-Mail Passwort
-Email Sent,E-Mail gesendet
Email Sent?,E-Mail gesendet?
Email Settings,E-Mail-Einstellungen
Email Settings for Outgoing and Incoming Emails.,E-Mail-Einstellungen für ausgehende und eingehende E-Mails.
-Email Signature,E-Mail Signatur
-Email Use SSL,E-Mail verwenden SSL
-"Email addresses, separted by commas",E-Mail-Adressen durch Komma separted
Email ids separated by commas.,E-Mail-IDs durch Komma getrennt.
"Email settings for jobs email id ""jobs@example.com""","E-Mail-Einstellungen für Jobs email id ""jobs@example.com"""
"Email settings to extract Leads from sales email id e.g. ""sales@example.com""","E-Mail-Einstellungen zu extrahieren Leads aus dem Verkauf email id zB ""Sales@example.com"""
Email...,E-Mail ...
-Embed image slideshows in website pages.,Einbetten Bild Diashows in Web-Seiten.
+Emergency Contact,Notfallkontakt
Emergency Contact Details,Notfall Kontakt
-Emergency Phone Number,Notrufnummer
+Emergency Phone,Notruf
Employee,Mitarbeiter
Employee Birthday,Angestellter Geburtstag
Employee Designation.,Mitarbeiter Bezeichnung.
@@ -943,6 +890,7 @@
Employee Name,Name des Mitarbeiters
Employee Number,Mitarbeiternummer
Employee Records to be created by,Mitarbeiter Records erstellt werden
+Employee Settings,Mitarbeitereinstellungen
Employee Setup,Mitarbeiter-Setup
Employee Type,Arbeitnehmertyp
Employee grades,Mitarbeiter-Typen
@@ -952,21 +900,16 @@
Employees Email Id,Mitarbeiter Email Id
Employment Details,Beschäftigung Einzelheiten
Employment Type,Beschäftigungsart
-Enable Auto Inventory Accounting,Enable Auto Vorratsbuchhaltung
+Enable / Disable Email Notifications,Aktivieren / Deaktivieren der E-Mail- Benachrichtigungen
Enable Shopping Cart,Aktivieren Einkaufswagen
Enabled,Aktiviert
-Enables <b>More Info.</b> in all documents,Ermöglicht <b> Mehr Info. </ B> in alle Dokumente
Encashment Date,Inkasso Datum
End Date,Enddatum
End date of current invoice's period,Ende der laufenden Rechnung der Zeit
End of Life,End of Life
-Ends on,Endet am
-Enter Email Id to receive Error Report sent by users.E.g.: support@iwebnotes.com,Ihre Email-Id Fehler Bericht users.Eg geschickt bekommen: support@iwebnotes.com
-Enter Form Type,Geben Formulartyp
Enter Row,Geben Row
Enter Verification Code,Sicherheitscode eingeben
Enter campaign name if the source of lead is campaign.,"Geben Sie Namen der Kampagne, wenn die Quelle von Blei-Kampagne."
-"Enter default value fields (keys) and values. If you add multiple values for a field, the first one will be picked. These defaults are also used to set ""match"" permission rules. To see list of fields, go to <a href=""#Form/Customize Form/Customize Form"">Customize Form</a>.","Geben Standardwert Felder (keys) und Werten. Wenn Sie mehrere Werte für ein Feld hinzufügen, wird die erste abgeholt werden. Diese Standardwerte werden auch verwendet, um ""match"" permission Regeln. Um eine Liste der Felder zu sehen, <a gehen href=""#Form/Customize Form/Customize Form""> Formular anpassen </ a>."
Enter department to which this Contact belongs,"Geben Abteilung, auf die diese Kontakt gehört"
Enter designation of this Contact,Geben Bezeichnung dieser Kontakt
"Enter email id separated by commas, invoice will be mailed automatically on particular date","Geben Sie E-Mail-ID durch Kommata getrennt, wird Rechnung automatisch auf bestimmte Zeitpunkt zugeschickt"
@@ -974,29 +917,17 @@
Enter name of campaign if source of enquiry is campaign,"Geben Sie den Namen der Kampagne, wenn die Quelle der Anfrage ist Kampagne"
"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Geben Sie statischen URL-Parameter hier (Bsp. sender = ERPNext, username = ERPNext, password = 1234 etc.)"
Enter the company name under which Account Head will be created for this Supplier,"Geben Sie den Namen des Unternehmens, unter denen Konto Leiter für diesen Lieferant erstellt werden"
-Enter the date by which payments from customer is expected against this invoice.,Geben Sie das Datum der Zahlungen von Kunden gegen diese Rechnung erwartet wird.
Enter url parameter for message,Geben Sie URL-Parameter für die Nachrichtenübertragung
Enter url parameter for receiver nos,Geben Sie URL-Parameter für Empfänger nos
Entries,Einträge
Entries are not allowed against this Fiscal Year if the year is closed.,"Die Einträge sind nicht gegen diese Geschäftsjahr zulässig, wenn die Jahre geschlossen ist."
+Equals,Equals
Error,Fehler
Error for,Fehler für
-Error: Document has been modified after you have opened it,"Fehler: Dokument wurde geändert, nachdem Sie es geöffnet haben"
Estimated Material Cost,Geschätzter Materialkalkulationen
-Event,Veranstaltung
-Event End must be after Start,Termin Ende muss nach Anfang sein
-Event Individuals,Event Personen
-Event Role,Event Rolle
-Event Roles,Event Rollen
-Event Type,Ereignistyp
-Event User,Ereignis Benutzer
-Events In Today's Calendar,Events in der heutigen Kalender
-Every Day,Every Day
-Every Month,Jeden Monat
-Every Week,Jede Woche
-Every Year,Jährlich
Everyone can read,Jeder kann lesen
-Example:,Beispiel:
+"Example: ABCD.#####
+If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.",
Exchange Rate,Wechselkurs
Excise Page Number,Excise Page Number
Excise Voucher,Excise Gutschein
@@ -1019,11 +950,14 @@
Expense Claim Rejected,Expense Antrag abgelehnt
Expense Claim Rejected Message,Expense Antrag abgelehnt Nachricht
Expense Claim Type,Expense Anspruch Type
+Expense Claim has been approved.,Spesenabrechnung genehmigt wurde .
+Expense Claim has been rejected.,Spesenabrechnung wurde abgelehnt.
+Expense Claim is pending approval. Only the Expense Approver can update status.,Spesenabrechnung wird vorbehaltlich der Zustimmung . Nur die Kosten genehmigende Status zu aktualisieren.
Expense Date,Expense Datum
Expense Details,Expense Einzelheiten
Expense Head,Expense Leiter
-Expense account is mandatory for item: ,Expense Konto ist verpflichtend für Artikel:
-Expense/Adjustment Account,Aufwand / Adjustment Konto
+Expense account is mandatory for item,Aufwandskonto ist für Artikel
+Expense/Difference account is mandatory for item: ,
Expenses Booked,Aufwand gebucht
Expenses Included In Valuation,Aufwendungen enthalten In Bewertungstag
Expenses booked for the digest period,Aufwendungen für den gebuchten Zeitraum Digest
@@ -1034,85 +968,51 @@
Extract Emails,Auszug Emails
FCFS Rate,FCFS Rate
FIFO,FIFO
-Facebook Share,Facebook
Failed: ,Failed:
Family Background,Familiärer Hintergrund
-FavIcon,FavIcon
Fax,Fax
Features Setup,Features Setup
Feed,Füttern
Feed Type,Eingabetyp
Feedback,Rückkopplung
Female,Weiblich
-Fetch lead which will be converted into customer.,"Fetch Blei, die in Kunden konvertiert werden."
-Field Description,Feld Beschreibung
-Field Name,Feldname
-Field Type,Feldtyp
+Fetch exploded BOM (including sub-assemblies),Fetch explodierte BOM ( einschließlich Unterbaugruppen )
"Field available in Delivery Note, Quotation, Sales Invoice, Sales Order","Feld in Lieferschein, Angebot, Sales Invoice, Sales Order"
-"Field that represents the Workflow State of the transaction (if field is not present, a new hidden Custom Field will be created)","Feld, das den Workflow-Status der Transaktion darstellt (wenn das Feld nicht vorhanden ist, eine neue versteckte Custom Field wird erstellt)"
-Fieldname,Fieldname
-Fields,Felder
-"Fields separated by comma (,) will be included in the<br /><b>Search By</b> list of Search dialog box","Felder durch ein Komma (,) getrennt werden in der <br /> Suche aufgenommen werden </ b> Liste der Such-Dialogfeld"
File,Datei
-File Data,File Data
-File Name,File Name
-File Size,Dateigröße
-File URL,File URL
-File size exceeded the maximum allowed size,Dateigröße überschritten die maximal zulässige Größe
Files Folder ID,Dateien Ordner-ID
-Filing in Additional Information about the Opportunity will help you analyze your data better.,"Die Einreichung in Weitere Informationen über die Möglichkeit wird Ihnen helfen, Ihre Daten analysieren besser."
-Filing in Additional Information about the Purchase Receipt will help you analyze your data better.,"Die Einreichung in Zusätzliche Informationen über den Kaufbeleg wird Ihnen helfen, Ihre Daten analysieren besser."
-Filling in Additional Information about the Delivery Note will help you analyze your data better.,"Ausfüllen Zusätzliche Informationen über den Lieferschein wird Ihnen helfen, Ihre Daten analysieren besser."
-Filling in additional information about the Quotation will help you analyze your data better.,"Ausfüllen zusätzliche Informationen über das Angebot wird Ihnen helfen, Ihre Daten analysieren besser."
-Filling in additional information about the Sales Order will help you analyze your data better.,"Ausfüllen zusätzliche Informationen über das Sales Order wird Ihnen helfen, Ihre Daten analysieren besser."
+Fill the form and save it,Füllen Sie das Formular aus und speichern Sie sie
Filter,Filtern
Filter By Amount,Filtern nach Betrag
Filter By Date,Nach Datum filtern
Filter based on customer,Filtern basierend auf Kunden-
Filter based on item,Filtern basierend auf Artikel
-Final Confirmation Date,Final Confirmation Datum
Financial Analytics,Financial Analytics
Financial Statements,Financial Statements
+Finished Goods,Fertigwaren
First Name,Vorname
First Responded On,Zunächst reagierte am
Fiscal Year,Geschäftsjahr
Fixed Asset Account,Fixed Asset Konto
-Float,Schweben
Float Precision,Gleitkommatgenauigkeit
Follow via Email,Folgen Sie via E-Mail
-Following Journal Vouchers have been created automatically,Nach Journal Gutscheine wurden automatisch erstellt
"Following table will show values if items are sub - contracted. These values will be fetched from the master of ""Bill of Materials"" of sub - contracted items.","Folgende Tabelle zeigt Werte, wenn Artikel sub sind - vergeben werden. Vertragsgegenständen - Diese Werte werden vom Meister der ""Bill of Materials"" von Sub geholt werden."
-Font (Heading),Font (Überschrift)
-Font (Text),Font (Text)
-Font Size (Text),Schriftgröße (Text)
-Fonts,Fonts
-Footer,Fußzeile
-Footer Items,Footer Artikel
-For All Users,Für alle Benutzer
For Company,Für Unternehmen
For Employee,Für Mitarbeiter
For Employee Name,Für Employee Name
-For Item ,Für Artikel
-"For Links, enter the DocType as rangeFor Select, enter list of Options separated by comma","Für Links, geben Sie die DocType als rangeFor Select, geben Liste der Optionen durch Komma getrennt"
For Production,For Production
For Reference Only.,Nur als Referenz.
For Sales Invoice,Für Sales Invoice
For Server Side Print Formats,Für Server Side Druckformate
-For Territory,Für Territory
+For Supplier,für Lieferanten
For UOM,Für Verpackung
For Warehouse,Für Warehouse
"For comparative filters, start with","Für vergleichende Filter, mit zu beginnen"
"For e.g. 2012, 2012-13","Für z.B. 2012, 2012-13"
-For example if you cancel and amend 'INV004' it will become a new document 'INV004-1'. This helps you to keep track of each amendment.,"Zum Beispiel, wenn Sie stornieren und ändern 'INV004' wird es ein neues Dokument 'INV004-1' geworden. Dies hilft Ihnen, den Überblick über jede Änderung zu halten."
-For example: You want to restrict users to transactions marked with a certain property called 'Territory',"Zum Beispiel: Sie möchten, dass Benutzer auf Geschäfte mit einer bestimmten Eigenschaft namens ""Territory"" markiert beschränken"
For opening balance entry account can not be a PL account,Für Eröffnungsbilanz Eintrag Konto kann nicht ein PL-Konto sein
For ranges,Für Bereiche
For reference,Als Referenz
For reference only.,Nur als Referenz.
-For row,Für Zeile
"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Für die Bequemlichkeit der Kunden, können diese Codes in Druckformate wie Rechnungen und Lieferscheine werden"
-Form,Form
-Format: hh:mm example for one hour expiry set as 01:00. Max expiry will be 72 hours. Default is 24 hours,Format: hh: mm Beispiel für 1 Stunde Ablauf als 1.00 eingestellt. Max Ablauf wird 72 Stunden. Standardwert ist 24 Stunden
Forum,Forum
Fraction,Bruchteil
Fraction Units,Fraction Units
@@ -1124,23 +1024,32 @@
From Currency,Von Währung
From Currency and To Currency cannot be same,Von Währung und To Währung dürfen nicht identisch sein
From Customer,Von Kunden
+From Customer Issue,Von Kunden Ausgabe
From Date,Von Datum
+From Date is mandatory,Von-Datum ist obligatorisch
From Date must be before To Date,Von Datum muss vor dem Laufenden bleiben
From Delivery Note,Von Lieferschein
From Employee,Von Mitarbeiter
From Lead,Von Blei
-From PR Date,Von PR Datum
+From Maintenance Schedule,Vom Wartungsplan
+From Material Request,Von Materialanforderung
+From Opportunity,von der Chance
From Package No.,Von Package No
From Purchase Order,Von Bestellung
From Purchase Receipt,Von Kaufbeleg
+From Quotation,von Zitat
From Sales Order,Von Sales Order
+From Supplier Quotation,Von Lieferant Zitat
From Time,From Time
From Value,Von Wert
From Value should be less than To Value,Von Wert sollte weniger als To Value
Frozen,Eingefroren
+Frozen Accounts Modifier,Eingefrorenen Konten Modifier
Fulfilled,Erfüllte
Full Name,Vollständiger Name
Fully Completed,Vollständig ausgefüllte
+"Further accounts can be made under Groups,","Weitere Konten können unter Gruppen gemacht werden ,"
+Further nodes can be only created under 'Group' type nodes,"Weitere Knoten kann nur unter Typ -Knoten ""Gruppe"" erstellt werden"
GL Entry,GL Eintrag
GL Entry: Debit or Credit amount is mandatory for ,GL Eintrag: Debit-oder Kreditkarten Betrag ist obligatorisch für
GRN,GRN
@@ -1149,24 +1058,23 @@
Gender,Geschlecht
General,General
General Ledger,General Ledger
+General Ledger: ,
Generate Description HTML,Generieren Beschreibung HTML
Generate Material Requests (MRP) and Production Orders.,Generieren Werkstoff Requests (MRP) und Fertigungsaufträge.
Generate Salary Slips,Generieren Gehaltsabrechnungen
Generate Schedule,Generieren Zeitplan
"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Generieren Packzettel für Pakete geliefert werden. Verwendet, um Paket-Nummer, der Lieferumfang und sein Gewicht zu benachrichtigen."
Generates HTML to include selected image in the description,Erzeugt HTML ausgewählte Bild sind in der Beschreibung
-Georgia,Georgia
-Get,Holen Sie sich
Get Advances Paid,Holen Geleistete
Get Advances Received,Holen Erhaltene Anzahlungen
Get Current Stock,Holen Aktuelle Stock
Get From ,Holen Sie sich ab
Get Items,Holen Artikel
Get Items From Sales Orders,Holen Sie Angebote aus Kundenaufträgen
+Get Items from BOM,Holen Sie Angebote von Stücklisten
Get Last Purchase Rate,Get Last Purchase Rate
Get Non Reconciled Entries,Holen Non versöhnt Einträge
Get Outstanding Invoices,Holen Ausstehende Rechnungen
-Get Purchase Receipt,Holen Kaufbeleg
Get Sales Orders,Holen Sie Kundenaufträge
Get Specification Details,Holen Sie Ausschreibungstexte
Get Stock and Rate,Holen Sie Stock und bewerten
@@ -1174,24 +1082,24 @@
Get Terms and Conditions,Holen AGB
Get Weekly Off Dates,Holen Weekly Off Dates
"Get valuation rate and available stock at source/target warehouse on mentioned posting date-time. If serialized item, please press this button after entering serial nos.","Holen Bewertungskurs und verfügbaren Bestand an der Quelle / Ziel-Warehouse am genannten Buchungsdatum-Zeit. Wenn serialisierten Objekt, drücken Sie bitte diese Taste nach Eingabe der Seriennummern nos."
-Give additional details about the indent.,Geben Sie weitere Details zu dem Gedankenstrich.
+GitHub Issues,GitHub Probleme
Global Defaults,Globale Defaults
-Go back to home,Zurück nach Hause
-Go to Setup > <a href='#user-properties'>User Properties</a> to set \ 'territory' for diffent Users.,"Gehe zu> <a Richten href='#user-properties'> User Properties </ a> \ Gebiet ""für diffent Benutzer eingestellt."""
+Global Settings / Default Values,Globale Einstellungen / Standardwerte
+Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts),Gehen Sie auf die entsprechende Gruppe (in der Regel Anwendung des Fonds> Umlaufvermögen > Bank Accounts )
+Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties),Gehen Sie auf die entsprechende Gruppe (in der Regel Quelle der Fonds> kurzfristige Verbindlichkeiten > Steuern und Abgaben )
Goal,Ziel
Goals,Ziele
Goods received from Suppliers.,Wareneingang vom Lieferanten.
-Google Analytics ID,Google Analytics ID
Google Drive,Google Drive
Google Drive Access Allowed,Google Drive Zugang erlaubt
-Google Plus One,Google Plus One
-Google Web Font (Heading),Google Web Font (Überschrift)
-Google Web Font (Text),Google Web Font (Text)
Grade,Klasse
Graduate,Absolvent
Grand Total,Grand Total
Grand Total (Company Currency),Grand Total (Gesellschaft Währung)
Gratuity LIC ID,Gratuity LIC ID
+Greater or equals,Größer oder equals
+Greater than,größer als
+"Grid ""","Grid """
Gross Margin %,Gross Margin%
Gross Margin Value,Gross Margin Wert
Gross Pay,Gross Pay
@@ -1201,21 +1109,21 @@
Gross Weight,Bruttogewicht
Gross Weight UOM,Bruttogewicht UOM
Group,Gruppe
+Group by Ledger,Gruppe von Ledger
+Group by Voucher,Gruppe von Gutschein
Group or Ledger,Gruppe oder Ledger
Groups,Gruppen
HR,HR
HR Settings,HR-Einstellungen
-HTML,HTML
HTML / Banner that will show on the top of product list.,"HTML / Banner, die auf der Oberseite des Produkt-Liste zeigen."
Half Day,Half Day
Half Yearly,Halbjahresfinanzbericht
Half-yearly,Halbjährlich
+Happy Birthday!,Happy Birthday!
Has Batch No,Hat Batch No
Has Child Node,Hat Child Node
Has Serial No,Hat Serial No
Header,Kopfzeile
-Heading,Überschrift
-Heading Text As,Unterwegs Text As
Heads (or groups) against which Accounting Entries are made and balances are maintained.,"Heads (oder Gruppen), gegen die Accounting-Einträge und sind Guthaben gehalten werden."
Health Concerns,Gesundheitliche Bedenken
Health Details,Gesundheit Details
@@ -1223,23 +1131,11 @@
Help,Hilfe
Help HTML,Helfen Sie HTML
"Help: To link to another record in the system, use ""#Form/Note/[Note Name]"" as the Link URL. (don't use ""http://"")","Hilfe: Um zu einem anderen Datensatz im System zu verknüpfen, verwenden Sie "# Form / Note / [Anmerkung Name]", wie der Link URL. (Verwenden Sie nicht "http://")"
-Helvetica Neue,Helvetica Neue
-"Hence, maximum allowed Manufacturing Quantity",Daher maximal erlaubte Menge Fertigung
"Here you can maintain family details like name and occupation of parent, spouse and children","Hier können Sie pflegen Familie Details wie Name und Beruf der Eltern, Ehepartner und Kinder"
"Here you can maintain height, weight, allergies, medical concerns etc","Hier können Sie pflegen Größe, Gewicht, Allergien, medizinischen Bedenken etc"
-Hey there! You need to put at least one item in \ the item table.,Hey there! Sie müssen mindestens ein Element in \ dem Punkt Tisch zu legen.
Hey! All these items have already been invoiced.,Hey! Alle diese Elemente sind bereits in Rechnung gestellt.
-Hey! There should remain at least one System Manager,Hey! Es sollte mindestens eine System-Manager bleiben
-Hidden,Versteckt
-Hide Actions,Ausblenden Aktionen
-Hide Copy,Ausblenden kopieren
Hide Currency Symbol,Ausblenden Währungssymbol
-Hide Email,Ausblenden Email
-Hide Heading,Ausblenden Überschrift
-Hide Print,Ausblenden drucken
-Hide Toolbar,Symbolleiste ausblenden
High,Hoch
-Highlight,Hervorheben
History,Geschichte
History In Company,Geschichte Im Unternehmen
Hold,Halten
@@ -1248,25 +1144,15 @@
Holiday List Name,Ferienwohnung Name
Holidays,Ferien
Home,Zuhause
-Home Page,Home Page
-Home Page is Products,Home Page ist Products
-Home Pages,Home Pages
Host,Gastgeber
"Host, Email and Password required if emails are to be pulled","Host, E-Mail und Passwort erforderlich, wenn E-Mails gezogen werden"
Hour Rate,Hour Rate
-Hour Rate Consumable,Hour Rate Verbrauchsmaterial
-Hour Rate Electricity,Hour Rate Strom
Hour Rate Labour,Hour Rate Labour
-Hour Rate Rent,Hour Rate Miete
Hours,Stunden
How frequently?,Wie häufig?
"How should this currency be formatted? If not set, will use system defaults","Wie soll diese Währung formatiert werden? Wenn nicht gesetzt, verwenden Standardeinstellungen des Systems"
-How to upload,So laden
-Hrvatski,Hrvatski
-Human Resources,Human Resources
-Hurray! The day(s) on which you are applying for leave \ coincide with holiday(s). You need not apply for leave.,"Hurra! Der Tag (e), an dem Sie verlassen \ zusammen mit Urlaub (s) bewerben. Sie müssen nicht für Urlaub beantragen."
+Human Resource,Human Resource
I,Ich
-ID (name) of the entity whose property is to be set,"ID (Name) des Unternehmens, dessen Eigenschaft gesetzt werden"
IDT,IDT
II,II
III,III
@@ -1275,60 +1161,53 @@
INV/10-11/,INV/10-11 /
ITEM,ITEM
IV,IV
-Icon,Symbol
-Icon will appear on the button,Icon wird auf der Schaltfläche angezeigt
-Id of the profile will be the email.,Id des Profils wird die E-Mail.
Identification of the package for the delivery (for print),Identifikation des Pakets für die Lieferung (für den Druck)
If Income or Expense,Wenn Ertrags-oder Aufwandsposten
If Monthly Budget Exceeded,Wenn Monthly Budget überschritten
-"If Sale BOM is defined, the actual BOM of the Pack is displayed as table.Available in Delivery Note and Sales Order","Wenn Sale Stücklisten definiert ist, wird die tatsächliche Stückliste des Pack als table.Available in Lieferschein und Sales Order angezeigt"
+"If Sale BOM is defined, the actual BOM of the Pack is displayed as table.
+Available in Delivery Note and Sales Order",
"If Supplier Part Number exists for given Item, it gets stored here","Wenn der Lieferant Teilenummer existiert für bestimmte Artikel, wird es hier gespeichert"
If Yearly Budget Exceeded,Wenn Jahresbudget überschritten
-"If a User does not have access at Level 0, then higher levels are meaningless","Wenn ein Benutzer keinen Zugriff auf Level 0, dann höheren Ebenen sind bedeutungslos"
"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","Wenn aktiviert, wird Stückliste Baugruppe Artikel für immer Rohstoff betrachtet werden. Andernfalls werden alle Unterbaugruppe Elemente als Ausgangsmaterial behandelt werden."
"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Wenn aktiviert, insgesamt nicht. der Arbeitstage zählen Ferien, und dies wird den Wert der Gehalt pro Tag zu reduzieren"
-"If checked, all other workflows become inactive.","Wenn aktiviert, werden alle anderen Workflows inaktiv."
"If checked, an email with an attached HTML format will be added to part of the EMail body as well as attachment. To only send as attachment, uncheck this.","Wenn aktiviert, wird eine E-Mail mit einer angehängten HTML-Format, einen Teil der EMail Körper sowie Anhang hinzugefügt werden. Um nur als Anhang zu senden, deaktivieren Sie diese."
-"If checked, the Home page will be the default Item Group for the website.","Wenn aktiviert, wird die Startseite der Standard Artikel-Gruppe für die Website."
"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Wenn aktiviert, wird der Steuerbetrag als bereits in der Print Rate / Print Menge aufgenommen werden"
"If disable, 'Rounded Total' field will not be visible in any transaction",Wenn deaktivieren 'Abgerundete Total' Feld nicht in einer Transaktion sichtbar
"If enabled, the system will post accounting entries for inventory automatically.","Wenn aktiviert, wird das System Buchungsposten für Inventar automatisch erstellen."
-"If image is selected, color will be ignored (attach first)","Wenn das Bild ausgewählt ist, wird die Farbe ignoriert (legen zuerst) werden"
If more than one package of the same type (for print),Wenn mehr als ein Paket des gleichen Typs (print)
+"If no change in either Quantity or Valuation Rate, leave the cell blank.","Wenn keine Änderung entweder Menge oder Bewertungs bewerten , lassen Sie die Zelle leer ."
If non standard port (e.g. 587),Wenn Nicht-Standard-Port (zum Beispiel 587)
If not applicable please enter: NA,"Soweit dies nicht zutrifft, geben Sie bitte: NA"
"If not checked, the list will have to be added to each Department where it has to be applied.","Falls nicht, wird die Liste müssen auf jeden Abteilung, wo sie angewendet werden hinzugefügt werden."
-"If not, create a","Wenn nicht, erstellen Sie eine"
"If set, data entry is only allowed for specified users. Else, entry is allowed for all users with requisite permissions.","Wenn gesetzt, wird die Dateneingabe nur für bestimmte Benutzer erlaubt. Else, wird der Eintritt für alle Benutzer mit den erforderlichen Berechtigungen erlaubt."
"If specified, send the newsletter using this email address","Wenn angegeben, senden sie den Newsletter mit dieser E-Mail-Adresse"
-"If the 'territory' Link Field exists, it will give you an option to select it","Wenn das ""Gebiet"" Link Field existiert, wird es geben Sie eine Option, um sie auszuwählen"
-"If the account is frozen, entries are allowed for the ""Account Manager"" only.","Wenn das Konto eingefroren ist, werden die Einträge für die ""Account Manager"" gestattet."
+"If the account is frozen, entries are allowed to restricted users.","Wenn das Konto eingefroren ist, werden Einträge für eingeschränkte Benutzer erlaubt."
"If this Account represents a Customer, Supplier or Employee, set it here.","Wenn dieses Konto ein Kunde, Lieferant oder Mitarbeiter, stellen Sie es hier."
-If you follow Quality Inspection<br>Enables item QA Required and QA No in Purchase Receipt,Folgt man Qualitätsprüfung <br> Ermöglicht Artikel QA Erforderliche und QA Nein in Kaufbeleg
+"If you follow Quality Inspection<br>
+Enables item QA Required and QA No in Purchase Receipt",
If you have Sales Team and Sale Partners (Channel Partners) they can be tagged and maintain their contribution in the sales activity,Wenn Sie Sales Team und Verkauf Partners (Channel Partners) sie markiert werden können und pflegen ihren Beitrag in der Vertriebsaktivitäten
"If you have created a standard template in Purchase Taxes and Charges Master, select one and click on the button below.","Wenn Sie ein Standard-Template in Kauf Steuern und Abgaben Meister erstellt haben, wählen Sie eine aus und klicken Sie auf den Button unten."
"If you have created a standard template in Sales Taxes and Charges Master, select one and click on the button below.","Wenn Sie ein Standard-Template in Sales Steuern und Abgaben Meister erstellt haben, wählen Sie eine aus und klicken Sie auf den Button unten."
"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","Wenn Sie lange drucken, haben Formate, kann diese Funktion dazu verwendet, um die Seite auf mehreren Seiten mit allen Kopf-und Fußzeilen auf jeder Seite gedruckt werden"
-If you involve in manufacturing activity<br>Enables item <b>Is Manufactured</b>,Wenn Sie in die produzierenden Aktivitäten <br> beinhalten Ermöglicht Artikel <b> hergestellt wird </ b>
+"If you involve in manufacturing activity<br>
+Enables item <b>Is Manufactured</b>",
Ignore,Ignorieren
Ignored: ,Ignoriert:
Image,Bild
-Image Link,Link zum Bild
Image View,Bild anzeigen
Implementation Partner,Implementation Partner
Import,Importieren
Import Attendance,Import Teilnahme
+Import Failed!,Import fehlgeschlagen !
Import Log,Import-Logbuch
-Important dates and commitments in your project life cycle,Wichtige Termine und Verpflichtungen in Ihrem Projekt-Lebenszyklus
+Import Successful!,Importieren Sie erfolgreich!
Imports,Imports
-In Dialog,Im Dialog
-In Filter,In Filter
+In,in
In Hours,In Stunden
-In List View,In Listenansicht
In Process,In Process
-In Report Filter,Im Berichts-Filter
+In Qty,Menge
In Row,In Row
-In Store,In Store
+In Value,Wert bei
In Words,In Worte
In Words (Company Currency),In Words (Gesellschaft Währung)
In Words (Export) will be visible once you save the Delivery Note.,"In Words (Export) werden sichtbar, sobald Sie den Lieferschein zu speichern."
@@ -1340,8 +1219,8 @@
In Words will be visible once you save the Sales Invoice.,"In Worte sichtbar sein wird, sobald Sie das Sales Invoice speichern."
In Words will be visible once you save the Sales Order.,"In Worte sichtbar sein wird, sobald Sie den Sales Order zu speichern."
In response to,Als Antwort auf
-"In the Permission Manager, click on the button in the 'Condition' column for the Role you want to restrict.","In der Permission Manager, auf die Schaltfläche in der 'Bedingung' Spalte für die Rolle, die Sie einschränken möchten."
Incentives,Incentives
+Incharge,Incharge
Incharge Name,InCharge Namen
Include holidays in Total no. of Working Days,Fügen Sie Urlaub in Summe nicht. der Arbeitstage
Income / Expense,Erträge / Aufwendungen
@@ -1352,20 +1231,13 @@
Incoming,Eingehende
Incoming / Support Mail Setting,Incoming / Support Mail Setting
Incoming Rate,Incoming Rate
-Incoming Time,Eingehende Zeit
Incoming quality inspection.,Eingehende Qualitätskontrolle.
-Index,Index
Indicates that the package is a part of this delivery,"Zeigt an, dass das Paket ein Teil dieser Lieferung ist"
Individual,Einzelne
-Individuals,Einzelpersonen
Industry,Industrie
Industry Type,Industry Typ
-Info,Info
-Insert After,Einfügen nach
Insert Below,Darunter einfügen
-Insert Code,Code einfügen
Insert Row,Zeile einfügen
-Insert Style,Legen Stil
Inspected By,Geprüft von
Inspection Criteria,Prüfkriterien
Inspection Required,Inspektion erforderlich
@@ -1378,35 +1250,31 @@
Installation record for a Serial No.,Installation Rekord für eine Seriennummer
Installed Qty,Installierte Anzahl
Instructions,Anleitung
-Int,Int
-Integrations,Integrations
+Integrate incoming support emails to Support Ticket,Integrieren eingehende Support- E-Mails an Ticket-Support
Interested,Interessiert
Internal,Intern
-Introduce your company to the website visitor.,Präsentieren Sie Ihr Unternehmen auf der Website Besucher.
Introduction,Einführung
-Introductory information for the Contact Us Page,Einführende Informationen für den Kontakt Seite
-Invalid Delivery Note. Delivery Note should exist and should be in draft state. Please rectify and try again.,Ungültige Lieferschein. Lieferschein sollte vorhanden sein und sollte im Entwurf Zustand sein. Bitte korrigieren und versuchen Sie es erneut.
+Invalid Delivery Note. Delivery Note should exist and should be in draft state. Please rectify and try again.,Ungültige Lieferschein . Lieferschein sollte vorhanden sein und sollte im Entwurf Zustand sein. Bitte korrigieren und versuchen Sie es erneut .
Invalid Email,Ungültige E-Mail
Invalid Email Address,Ungültige E-Mail-Adresse
-Invalid Item or Warehouse Data,Ungültiger Artikel oder Warehouse Data
Invalid Leave Approver,Ungültige Lassen Approver
+Invalid Master Name,Ungültige Master-Name
+Invalid quantity specified for item ,
Inventory,Inventar
-Inverse,Umgekehrt
Invoice Date,Rechnungsdatum
Invoice Details,Rechnungsdetails
Invoice No,Rechnungsnummer
Invoice Period From Date,Rechnung ab Kaufdatum
Invoice Period To Date,Rechnung Zeitraum To Date
+Invoiced Amount (Exculsive Tax),Rechnungsbetrag ( Exculsive MwSt.)
Is Active,Aktiv ist
Is Advance,Ist Advance
Is Asset Item,Ist Aktivposition
Is Cancelled,Wird abgebrochen
Is Carry Forward,Ist Carry Forward
-Is Child Table,Ist Child Table
Is Default,Ist Standard
Is Encash,Ist einlösen
Is LWP,Ist LWP
-Is Mandatory Field,Ist Pflichtfeld
Is Opening,Eröffnet
Is Opening Entry,Öffnet Eintrag
Is PL Account,Ist PL Konto
@@ -1415,20 +1283,15 @@
Is Purchase Item,Ist Kaufsache
Is Sales Item,Ist Verkaufsartikel
Is Service Item,Ist Service Item
-Is Single,Ist Single
-Is Standard,Ist Standard
Is Stock Item,Ist Stock Item
Is Sub Contracted Item,Ist Sub Vertragsgegenstand
Is Subcontracted,Ist Fremdleistungen
-Is Submittable,Ist Submittable
-Is it a Custom DocType created by you?,Ist es ein Custom DocType von Ihnen erstellt?
Is this Tax included in Basic Rate?,Wird diese Steuer in Basic Rate inbegriffen?
Issue,Ausgabe
Issue Date,Issue Date
Issue Details,Issue Details
Issued Items Against Production Order,Ausgestellt Titel Against Fertigungsauftrag
-It is needed to fetch Item Details.,"Es wird benötigt, um Einzelteil-Details zu holen."
-It was raised because the (actual + ordered + indented - reserved) quantity reaches re-order level when the following record was created,"Es wurde erhoben, weil die (tatsächliche + Bestellung + eingerückt - reserviert) Menge erreicht re-order-Ebene, wenn die folgenden Datensatz erstellt wurde"
+It can also be used to create opening stock entries and to fix stock value.,"Es kann auch verwendet werden, um die Öffnung der Vorratszugänge zu schaffen und Bestandswert zu beheben."
Item,Artikel
Item Advanced,Erweiterte Artikel
Item Barcode,Barcode Artikel
@@ -1436,12 +1299,15 @@
Item Classification,Artikel Klassifizierung
Item Code,Item Code
Item Code (item_code) is mandatory because Item naming is not sequential.,"Item Code (item_code) ist zwingend erforderlich, da Artikel Nennung ist nicht sequentiell."
+Item Code and Warehouse should already exist.,Artikel-Code und Lager sollte bereits vorhanden sein .
+Item Code cannot be changed for Serial No.,Item Code kann nicht für Seriennummer geändert werden
Item Customer Detail,Artikel Kundenrezensionen
Item Description,Artikelbeschreibung
Item Desription,Artikel Desription
Item Details,Artikeldetails
Item Group,Artikel-Gruppe
Item Group Name,Artikel Group Name
+Item Group Tree,Artikelgruppenstruktur
Item Groups in Details,Details Gruppen in Artikel
Item Image (if not slideshow),Item Image (wenn nicht Diashow)
Item Name,Item Name
@@ -1452,6 +1318,7 @@
Item Reorder,Artikel Reorder
Item Serial No,Artikel Serial In
Item Serial Nos,Artikel Serial In
+Item Shortage Report,Artikel Mangel Bericht
Item Supplier,Artikel Lieferant
Item Supplier Details,Artikel Supplier Details
Item Tax,MwSt. Artikel
@@ -1464,24 +1331,25 @@
Item Website Specifications,Artikel Spezifikationen Webseite
Item Wise Tax Detail ,Artikel Wise UST Details
Item classification.,Artikel Klassifizierung.
+Item is neither Sales nor Service Item,Artikel ist weder Vertrieb noch Service- Artikel
+Item must have 'Has Serial No' as 'Yes',"Einzelteil muss "" Hat Serien Nein ' als ' Ja ' haben"
+Item table can not be blank,Artikel- Tabelle kann nicht leer sein
Item to be manufactured or repacked,Artikel hergestellt oder umgepackt werden
Item will be saved by this name in the data base.,Einzelteil wird mit diesem Namen in der Datenbank gespeichert werden.
"Item, Warranty, AMC (Annual Maintenance Contract) details will be automatically fetched when Serial Number is selected.","Artikel, Garantie, wird AMC (Annual Maintenance Contract) Details werden automatisch abgerufen Wenn Serial Number ausgewählt ist."
-Item-Wise Price List,Item-Wise Preisliste
Item-wise Last Purchase Rate,Artikel-wise Letzte Purchase Rate
+Item-wise Price List Rate,Artikel weise Preis List
Item-wise Purchase History,Artikel-wise Kauf-Historie
Item-wise Purchase Register,Artikel-wise Kauf Register
Item-wise Sales History,Artikel-wise Vertrieb Geschichte
Item-wise Sales Register,Artikel-wise Vertrieb Registrieren
Items,Artikel
+Items To Be Requested,Artikel angefordert werden
"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty","Welche Gegenstände werden gebeten, sich ""Out of Stock"" unter Berücksichtigung aller Hallen auf projizierte minimale Bestellmenge und Menge der Basis"
Items which do not exist in Item master can also be entered on customer's request,"Gegenstände, die nicht in Artikelstammdaten nicht existieren kann auch auf Wunsch des Kunden eingegeben werden"
Itemwise Discount,Discount Itemwise
Itemwise Recommended Reorder Level,Itemwise Empfohlene Meldebestand
-JSON,JSON
JV,JV
-Javascript,Javascript
-Javascript to append to the head section of the page.,"Javascript, um den Kopfteil der Seite anhängen."
Job Applicant,Job Applicant
Job Opening,Stellenangebot
Job Profile,Job Profil
@@ -1490,15 +1358,12 @@
Jobs Email Settings,Jobs per E-Mail Einstellungen
Journal Entries,Journal Entries
Journal Entry,Journal Entry
-Journal Entry for inventory that is received but not yet invoiced,"Journal Entry für die Inventur, die empfangen, aber noch nicht in Rechnung gestellt"
Journal Voucher,Journal Gutschein
Journal Voucher Detail,Journal Voucher Detail
Journal Voucher Detail No,In Journal Voucher Detail
KRA,KRA
"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment. ","Behalten Verkaufsaktionen. Verfolgen Sie Leads, Angebote, Sales Order etc von Kampagnen zu Return on Investment messen."
-Keep a track of all communications,Halten Sie einen Überblick über alle Kommunikations-
Keep a track of communication related to this enquiry which will help for future reference.,"Verfolgen Sie die Kommunikation im Zusammenhang mit dieser Untersuchung, die für zukünftige Referenz helfen."
-Key,Schlüssel
Key Performance Area,Key Performance Area
Key Responsibility Area,Key Responsibility Bereich
LEAD,FÜHREN
@@ -1507,25 +1372,19 @@
LR Date,LR Datum
LR No,In LR
Label,Etikett
-Label Help,Label Hilfe
-Lacs,Lacs
Landed Cost Item,Landed Cost Artikel
Landed Cost Items,Landed Cost Artikel
Landed Cost Purchase Receipt,Landed Cost Kaufbeleg
Landed Cost Purchase Receipts,Landed Cost Kaufbelege
Landed Cost Wizard,Landed Cost Wizard
-Landing Page,Landing Page
-Language,Sprache
-Language preference for user interface (only if available).,Bevorzugte Sprache für die Benutzeroberfläche (nur falls vorhanden).
-Last Contact Date,Letzter Kontakt Datum
-Last IP,Letzte IP-
-Last Login,Letzter Login
Last Name,Nachname
Last Purchase Rate,Last Purchase Rate
-Lato,Lato
+Last updated by,Zuletzt aktualisiert von
+Latest,neueste
+Latest Updates,Neueste Updates
Lead,Führen
Lead Details,Blei Einzelheiten
-Lead Lost,Führung verloren
+Lead Id,Lead- Id
Lead Name,Name der Person
Lead Owner,Blei Owner
Lead Source,Blei Quelle
@@ -1556,60 +1415,55 @@
Leave Type Name,Lassen Typ Name
Leave Without Pay,Unbezahlten Urlaub
Leave allocations.,Lassen Zuweisungen.
+Leave application has been approved.,Urlaubsantrag genehmigt wurde .
+Leave application has been rejected.,Urlaubsantrag wurde abgelehnt.
Leave blank if considered for all branches,"Freilassen, wenn für alle Branchen betrachtet"
Leave blank if considered for all departments,"Freilassen, wenn für alle Abteilungen betrachtet"
Leave blank if considered for all designations,"Freilassen, wenn für alle Bezeichnungen betrachtet"
Leave blank if considered for all employee types,"Freilassen, wenn für alle Mitarbeiter Typen betrachtet"
Leave blank if considered for all grades,"Freilassen, wenn für alle Typen gilt als"
-Leave blank if you have not decided the end date.,"Leer lassen, wenn Sie noch nicht entschieden haben, das Enddatum."
-Leave by,Lassen Sie von
"Leave can be approved by users with Role, ""Leave Approver""","Kann von Benutzern mit Role zugelassen zu verlassen, ""Leave Approver"""
Ledger,Hauptbuch
+Ledgers,Ledger
Left,Links
Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Legal Entity / Tochtergesellschaft mit einem separaten Kontenplan Zugehörigkeit zu der Organisation.
+Less or equals,Weniger oder equals
+Less than,weniger als
Letter Head,Briefkopf
-Letter Head Image,Briefkopf Bild
-Letter Head Name,Brief Leitung Name
Level,Ebene
-"Level 0 is for document level permissions, higher levels for field level permissions.","Level 0 ist für Dokumenten-Berechtigungen, höhere für die Feldebene Berechtigungen."
Lft,Lft
-Link,Link
-Link to other pages in the side bar and next section,Link zu anderen Seiten in der Seitenleiste und im nächsten Abschnitt
-Linked In Share,Linked In Teilen
+Like,wie
Linked With,Verbunden mit
List,Liste
+List a few of your customers. They could be organizations or individuals.,Listen Sie ein paar Ihrer Kunden. Sie könnten Organisationen oder Einzelpersonen sein .
+List a few of your suppliers. They could be organizations or individuals.,Listen Sie ein paar von Ihren Lieferanten . Sie könnten Organisationen oder Einzelpersonen sein .
+"List a few products or services you buy from your suppliers or vendors. If these are same as your products, then do not add them.","Listen Sie ein paar Produkte oder Dienstleistungen, die Sie von Ihrem Lieferanten oder Anbieter zu kaufen. Wenn diese gleiche wie Ihre Produkte sind , dann nicht hinzufügen."
List items that form the package.,Diese Liste Artikel bilden das Paket.
List of holidays.,Liste der Feiertage.
-List of patches executed,Liste der Patches ausgeführt
-List of records in which this document is linked,Welche Liste der Datensätze in diesem Dokument verknüpft ist
List of users who can edit a particular Note,"Liste der Benutzer, die eine besondere Note bearbeiten können"
List this Item in multiple groups on the website.,Liste Diesen Artikel in mehrere Gruppen auf der Website.
+"List your products or services that you sell to your customers. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Listen Sie Ihre Produkte oder Dienstleistungen, die Sie an Ihre Kunden verkaufen . Achten Sie auf die Artikelgruppe , Messeinheit und andere Eigenschaften zu überprüfen, wenn Sie beginnen."
+"List your tax heads (e.g. VAT, Excise) (upto 3) and their standard rates. This will create a standard template, you can edit and add more later.","Listen Sie Ihre Steuerköpfen ( z. B. Mehrwertsteuer, Verbrauchssteuern ) ( bis zu 3 ) und ihre Standardsätze. Dies wird ein Standard-Template zu erstellen, bearbeiten und später mehr kann ."
Live Chat,Live-Chat
-Load Print View on opening of an existing form,Legen Druckansicht beim Öffnen eines vorhandenen Formulars
Loading,Laden
Loading Report,Loading
-Log,Anmelden
+Loading...,Wird geladen ...
"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Protokoll der Aktivitäten von Nutzern gegen Aufgaben, die zur Zeiterfassung, Abrechnung verwendet werden können durchgeführt werden."
-Log of Scheduler Errors,Melden von Fehlern Scheduler
-Login After,Nach dem Login
-Login Before,Login vor
Login Id,Login ID
+Login with your new User ID,Loggen Sie sich mit Ihrem neuen Benutzer-ID
Logo,Logo
+Logo and Letter Heads,Logo und Briefbögen
Logout,Ausloggen
-Long Text,Langtext
+Lost,verloren
Lost Reason,Verlorene Reason
Low,Gering
Lower Income,Lower Income
-Lucida Grande,Lucida Grande
MIS Control,MIS Kontrolle
MREQ-,MREQ-
MTN Details,MTN Einzelheiten
-Mail Footer,Mail Footer
Mail Password,Mail Passwort
Mail Port,Mail Port
-Mail Server,Mail Server
Main Reports,Haupt-Reports
-Main Section,Main Section
Maintain Same Rate Throughout Sales Cycle,Pflegen gleichen Rate Während Sales Cycle
Maintain same rate throughout purchase cycle,Pflegen gleichen Rate gesamten Kauf-Zyklus
Maintenance,Wartung
@@ -1625,15 +1479,35 @@
Maintenance Visit,Wartung Besuch
Maintenance Visit Purpose,Wartung Visit Zweck
Major/Optional Subjects,Major / Wahlfächer
+Make ,
+Make Accounting Entry For Every Stock Movement,Machen Accounting Eintrag für jede Lagerbewegung
Make Bank Voucher,Machen Bankgutschein
+Make Credit Note,Machen Gutschrift
+Make Debit Note,Machen Lastschrift
+Make Delivery,machen Liefer
Make Difference Entry,Machen Difference Eintrag
-Make Time Log Batch,Nehmen Sie sich Zeit Log Batch
+Make Excise Invoice,Machen Verbrauch Rechnung
+Make Installation Note,Machen Installation Hinweis
+Make Invoice,machen Rechnung
+Make Maint. Schedule,Machen Wa. . Zeitplan
+Make Maint. Visit,Machen Wa. . Besuchen Sie
+Make Maintenance Visit,Machen Wartungsbesuch
+Make Packing Slip,Machen Packzettel
+Make Payment Entry,Machen Zahlungs Eintrag
+Make Purchase Invoice,Machen Einkaufsrechnung
+Make Purchase Order,Machen Bestellung
+Make Purchase Receipt,Machen Kaufbeleg
+Make Salary Slip,Machen Gehaltsabrechnung
+Make Salary Structure,Machen Gehaltsstruktur
+Make Sales Invoice,Machen Sales Invoice
+Make Sales Order,Machen Sie Sales Order
+Make Supplier Quotation,Machen Lieferant Zitat
Make a new,Machen Sie einen neuen
-Make sure that the transactions you want to restrict have a Link field 'territory' that maps to a 'Territory' master.,"Stellen Sie sicher, dass die Transaktionen, die Sie möchten, um die Link-Feld zu beschränken ""Gebiet"" haben, dass die Karten auf den ""Territory"" Master."
Male,Männlich
+Manage 3rd Party Backups,Verwalten 3rd Party Backups
Manage cost of operations,Verwalten Kosten der Operationen
Manage exchange rates for currency conversion,Verwalten Wechselkurse für die Währungsumrechnung
-Mandatory,Verpflichtend
+Mandatory filters required:\n,Pflicht Filter erforderlich : \ n
"Mandatory if Stock Item is ""Yes"". Also the default warehouse where reserved quantity is set from Sales Order.","Obligatorisch, wenn Lager Artikel ist "Ja". Auch die Standard-Lager, wo reservierte Menge von Sales Order eingestellt ist."
Manufacture against Sales Order,Herstellung gegen Sales Order
Manufacture/Repack,Herstellung / Repack
@@ -1643,21 +1517,21 @@
Manufacturer Part Number,Hersteller-Teilenummer
Manufacturing,Herstellung
Manufacturing Quantity,Fertigung Menge
+Manufacturing Quantity is mandatory,Fertigungsmengeist obligatorisch
Margin,Marge
Marital Status,Familienstand
Market Segment,Market Segment
Married,Verheiratet
Mass Mailing,Mass Mailing
-Master,Master
+Master Data,Stammdaten
Master Name,Master Name
+Master Name is mandatory if account type is Warehouse,"Meister -Name ist obligatorisch, wenn Kontotyp Warehouse"
Master Type,Master Type
Masters,Masters
-Match,Entsprechen
Match non-linked Invoices and Payments.,Spiel nicht verknüpften Rechnungen und Zahlungen.
Material Issue,Material Issue
Material Receipt,Material Receipt
Material Request,Material anfordern
-Material Request Date,Material Request Date
Material Request Detail No,Material anfordern Im Detail
Material Request For Warehouse,Material Request For Warehouse
Material Request Item,Material anfordern Artikel
@@ -1665,50 +1539,41 @@
Material Request No,Material anfordern On
Material Request Type,Material Request Type
Material Request used to make this Stock Entry,"Material anfordern verwendet, um dieses Lager Eintrag machen"
+Material Requests for which Supplier Quotations are not created,"Material Anträge , für die Lieferant Zitate werden nicht erstellt"
Material Requirement,Material Requirement
Material Transfer,Material Transfer
Materials,Materialien
Materials Required (Exploded),Benötigte Materialien (Explosionszeichnung)
Max 500 rows only.,Max 500 Zeilen nur.
-Max Attachments,Max Attachments
Max Days Leave Allowed,Max Leave Tage erlaubt
Max Discount (%),Discount Max (%)
-"Meaning of Submit, Cancel, Amend","Bedeutung Absenden, Abbrechen, Amend"
Medium,Medium
-"Menu items in the Top Bar. For setting the color of the Top Bar, go to <a href=""#Form/Style Settings"">Style Settings</a>","Menüpunkte in der oberen Leiste. Zum Einstellen der Farbe der Top Bar, zu gehen <a href=""#Form/Style Settings"">Style Einstellungen</a>"
-Merge,Verschmelzen
-Merge Into,Verschmelzen zu
-Merge Warehouses,Merge Warehouses
-Merging is only possible between Group-to-Group or Ledger-to-Ledger,"Merging ist nur möglich, zwischen Gruppe-zu-Gruppe oder Ledger-to-Ledger"
-"Merging is only possible if following \ properties are same in both records. Group or Ledger, Debit or Credit, Is PL Account","Merging ist nur möglich, wenn nach \ Eigenschaften sind in beiden Datensätzen gleich. Gruppen-oder Ledger, Debit-oder Kreditkarten, PL Konto"
+"Merging is only possible if following \
+ properties are same in both records.
+ Group or Ledger, Debit or Credit, Is PL Account",
Message,Nachricht
Message Parameter,Nachricht Parameter
-Messages greater than 160 characters will be split into multiple messages,Größer als 160 Zeichen Nachricht in mehrere mesage aufgeteilt werden
+Message Sent,Nachricht gesendet
Messages,Nachrichten
-Method,Verfahren
+Messages greater than 160 characters will be split into multiple messages,Größer als 160 Zeichen Nachricht in mehrere mesage aufgeteilt werden
Middle Income,Middle Income
-Middle Name (Optional),Middle Name (Optional)
Milestone,Meilenstein
Milestone Date,Milestone Datum
Milestones,Meilensteine
Milestones will be added as Events in the Calendar,Meilensteine werden die Veranstaltungen in der hinzugefügt werden
-Millions,Millions
Min Order Qty,Mindestbestellmenge
Minimum Order Qty,Minimale Bestellmenge
-Misc,Misc
Misc Details,Misc Einzelheiten
Miscellaneous,Verschieden
Miscelleneous,Miscelleneous
+Missing Currency Exchange Rates for,Fehlende Wechselkurse für
+Missing Values Required,Fehlende Werte Erforderlich
Mobile No,In Mobile
Mobile No.,Handy Nr.
Mode of Payment,Zahlungsweise
Modern,Moderne
Modified Amount,Geändert Betrag
Modified by,Geändert von
-Module,Modul
-Module Def,Module Def
-Module Name,Modulname
-Modules,Module
Monday,Montag
Month,Monat
Monthly,Monatlich
@@ -1720,32 +1585,23 @@
More,Mehr
More Details,Mehr Details
More Info,Mehr Info
-More content for the bottom of the page.,Mehr Inhalte für die unten auf der Seite.
Moving Average,Moving Average
Moving Average Rate,Moving Average Rate
Mr,Herr
Ms,Ms
-Multiple Item Prices,Mehrere Artikel Preise
-Multiple root nodes not allowed.,Mehrere Wurzelknoten nicht erlaubt.
-Mupltiple Item prices.,Artikel Mupltiple Preisen.
+Multiple Item prices.,Mehrere Artikelpreise .
+Multiple Price list.,Mehrere Preisliste .
Must be Whole Number,Muss ganze Zahl sein
-Must have report permission to access this report.,"Muss Bericht Erlaubnis, diesen Bericht zugreifen."
-Must specify a Query to run,Muss eine Abfrage angeben zu laufen
My Settings,Meine Einstellungen
NL-,NL-
Name,Name
-Name Case,Name Gehäuse
Name and Description,Name und Beschreibung
Name and Employee ID,Name und Employee ID
-Name as entered in Sales Partner master,Eingegebene Name in der Master-Vertriebspartner
Name is required,Name wird benötigt
-Name of organization from where lead has come,"Name der Organisation, wo Blei hat kommen"
+"Name of new Account. Note: Please don't create accounts for Customers and Suppliers,","Name des neuen Konto . Hinweis : Bitte keine Konten für Kunden und Lieferanten zu schaffen ,"
Name of person or organization that this address belongs to.,"Name der Person oder Organisation, dass diese Adresse gehört."
Name of the Budget Distribution,Name der Verteilung Budget
-Name of the entity who has requested for the Material Request,"Name der Organisation, die für das Material-Anfrage angefordert hat"
-Naming,Benennung
Naming Series,Benennen Series
-Naming Series mandatory,Benennen Series obligatorisch
Negative balance is not allowed for account ,Negative Bilanz ist nicht für Konto erlaubt
Net Pay,Net Pay
Net Pay (in words) will be visible once you save the Salary Slip.,"Net Pay (in Worten) sichtbar sein wird, sobald Sie die Gehaltsabrechnung zu speichern."
@@ -1756,9 +1612,15 @@
Net Weight of each Item,Nettogewicht der einzelnen Artikel
Net pay can not be negative,Net Pay kann nicht negativ sein
Never,Nie
-New,Neu
+New,neu
+New ,
+New Account,Neues Konto
+New Account Name,New Account Name
New BOM,New BOM
New Communications,New Communications
+New Company,Neue Gesellschaft
+New Cost Center,Neue Kostenstelle
+New Cost Center Name,Neue Kostenstellennamen
New Delivery Notes,New Delivery Notes
New Enquiries,New Anfragen
New Leads,New Leads
@@ -1766,19 +1628,19 @@
New Leaves Allocated,Neue Blätter Allocated
New Leaves Allocated (In Days),New Leaves Allocated (in Tagen)
New Material Requests,Neues Material Requests
-New Password,New Password
New Projects,Neue Projekte
New Purchase Orders,New Bestellungen
New Purchase Receipts,New Kaufbelege
New Quotations,New Zitate
New Record,Neuer Rekord
New Sales Orders,New Sales Orders
+"New Serial No cannot have Warehouse. Warehouse must be \
+ set by Stock Entry or Purchase Receipt",
New Stock Entries,New Stock Einträge
New Stock UOM,New Stock UOM
New Supplier Quotations,Neuer Lieferant Zitate
New Support Tickets,New Support Tickets
New Workplace,New Workplace
-New value to be set,Neuer Wert eingestellt werden
Newsletter,Mitteilungsblatt
Newsletter Content,Newsletter Inhalt
Newsletter Status,Status Newsletter
@@ -1787,90 +1649,85 @@
Next Contact By,Von Next Kontakt
Next Contact Date,Weiter Kontakt Datum
Next Date,Nächster Termin
-Next State,Weiter State
Next actions,Nächste Veranstaltungen
Next email will be sent on:,Weiter E-Mail wird gesendet:
No,Auf
-"No Account found in csv file, May be company abbreviation is not correct","Kein Konto in csv-Datei gefunden wird, kann sein Unternehmen Abkürzung ist nicht richtig"
No Action,In Aktion
No Communication tagged with this ,Keine Kommunikation mit diesem getaggt
-No Copy,No Copy
-No Customer Accounts found. Customer Accounts are identified based on \ 'Master Type' value in account record.,Keine Kundenkonten gefunden. Kundenkonten werden basierend auf \ 'Master Type' Wert in Kontodatensatz identifiziert.
-No Item found with Barcode,Kein Artikel mit Barcode gefunden
+No Customer Accounts found.,Keine Kundenkonten gefunden.
+"No Customer or Supplier Accounts found. Accounts are identified based on \
+ 'Master Type' value in account record.",
+No Item found with ,
No Items to Pack,Keine Einträge zu packen
No Leave Approvers. Please assign 'Leave Approver' Role to atleast one user.,Kein genehmigende hinterlassen. Bitte weisen 'Leave Approver' Rolle zu einem Benutzer atleast.
No Permission,In Permission
-No Permission to ,Keine Berechtigung um
-No Permissions set for this criteria.,In die Berechtigungen für diese Kriterien.
-No Report Loaded. Please use query-report/[Report Name] to run a report.,"Nein Missbrauch geladen. Bitte verwenden query-Bericht / [Report Name], um einen Bericht auszuführen."
-No Supplier Accounts found. Supplier Accounts are identified based on \ 'Master Type' value in account record.,Keine Lieferant Accounts gefunden. Lieferant Accounts basieren auf \ 'Master Type' Wert in Kontodatensatz identifiziert.
-No User Properties found.,In der User Properties gefunden.
+No Supplier Accounts found. Supplier Accounts are identified based on 'Master Type' value in account record.,Keine Lieferantenkontengefunden. Lieferant Konten werden basierend auf dem Wert 'Master Type' in Kontodatensatz identifiziert.
+No accounting entries for following warehouses,Keine Buchungen für folgende Lagerhallen
+No addresses created,Keine Adressen erstellt
+No contacts created,Keine Kontakte erstellt
No default BOM exists for item: ,Kein Standard BOM existiert für Artikel:
-No further records,Keine weiteren Datensätze
No of Requested SMS,Kein SMS Erwünschte
No of Sent SMS,Kein SMS gesendet
No of Visits,Anzahl der Besuche
No one,Keiner
-No permission to write / remove.,Keine Berechtigung zu schreiben / zu entfernen.
No record found,Kein Eintrag gefunden
No records tagged.,In den Datensätzen markiert.
No salary slip found for month: ,Kein Gehaltsabrechnung für den Monat gefunden:
-"No table is created for Single DocTypes, all values are stored in tabSingles as a tuple.","Auf dem Tisch wird für Single doctypes erstellt wurden, werden alle Werte in den tabSingles das Tupel gespeichert."
None,Keine
-None: End of Workflow,None: End of-Workflow
Not,Nicht
Not Active,Nicht aktiv
Not Applicable,Nicht zutreffend
+Not Available,nicht verfügbar
Not Billed,Nicht Billed
Not Delivered,Nicht zugestellt
Not Found,Nicht gefunden
Not Linked to any record.,Nicht zu jedem Datensatz verknüpft.
Not Permitted,Nicht zulässig
-Not allowed for: ,Nicht zugelassen:
-Not enough permission to see links.,Nicht genügend Berechtigung Links zu sehen.
-Not in Use,Nicht im Einsatz
-Not interested,Kein Interesse
-Not linked,Nicht verbunden
+Not Set,Nicht festgelegt
+Not allowed entry in Warehouse,Nicht erlaubt Eintrag im Warehouse
+Not equals,Nicht Gleichen
Note,Hinweis
Note User,Hinweis: User
Note is a free page where users can share documents / notes,"Hinweis ist eine kostenlose Seite, wo Nutzer Dokumente / Notizen austauschen können"
+Note:,Hinweis:
"Note: Backups and files are not deleted from Dropbox, you will have to delete them manually.","Hinweis: Backups und Dateien werden nicht von Dropbox gelöscht wird, müssen Sie sie manuell löschen."
"Note: Backups and files are not deleted from Google Drive, you will have to delete them manually.","Hinweis: Backups und Dateien nicht von Google Drive gelöscht, müssen Sie sie manuell löschen."
Note: Email will not be sent to disabled users,Hinweis: E-Mail wird nicht für behinderte Nutzer gesendet werden
-"Note: For best results, images must be of the same size and width must be greater than height.","Hinweis: Für beste Ergebnisse, Bilder müssen die gleiche Größe und Breite muss größer sein als die Höhe."
Note: Other permission rules may also apply,Hinweis: Weitere Regeln können die Erlaubnis auch gelten
-Note: You Can Manage Multiple Address or Contacts via Addresses & Contacts,Hinweis: Sie können mehrere Kontakte oder Adresse via Adressen & Kontakte verwalten
-Note: maximum attachment size = 1mb,Hinweis: Die maximale Größe von Anhängen = 1mb
Notes,Aufzeichnungen
+Notes:,Hinweise:
Nothing to show,"Nichts zu zeigen,"
-Notice - Number of Days,Hinweis - Anzahl der Tage
+Nothing to show for this selection,Nichts für diese Auswahl zeigen
+Notice (days),Unsere (Tage)
Notification Control,Meldungssteuervorrichtung
Notification Email Address,Benachrichtigung per E-Mail-Adresse
-Notify By Email,Benachrichtigen Sie Per E-Mail
Notify by Email on creation of automatic Material Request,Benachrichtigen Sie per E-Mail bei der Erstellung von automatischen Werkstoff anfordern
Number Format,Number Format
O+,Die +
O-,O-
OPPT,OPPT
+Offer Date,Angebot Datum
Office,Geschäftsstelle
Old Parent,Old Eltern
On,Auf
On Net Total,On Net Total
On Previous Row Amount,Auf Previous Row Betrag
On Previous Row Total,Auf Previous Row insgesamt
-"Once you have set this, the users will only be able access documents with that property.","Sobald Sie dies eingestellt haben, werden die Benutzer nur Zugriff auf Dokumente mit dieser Eigenschaft sein."
-Only Administrator allowed to create Query / Script Reports,"Nur Administrator erlaubt, Query / Script Reports erstellen"
-Only Administrator can save a standard report. Please rename and save.,Nur Administrator können eine Standard-Bericht. Bitte benennen und zu speichern.
-Only Allow Edit For,Für nur erlauben bearbeiten
+"Only Serial Nos with status ""Available"" can be delivered.","Nur Seriennummernmit dem Status ""Verfügbar"" geliefert werden."
Only Stock Items are allowed for Stock Entry,Nur Lagerware für lizenzfreie Eintrag erlaubt
Only System Manager can create / edit reports,Nur System-Manager können / Berichte bearbeiten
Only leaf nodes are allowed in transaction,Nur Blattknoten in Transaktion zulässig
Open,Öffnen
-Open Sans,Offene Sans
+Open Production Orders,Offene Fertigungsaufträge
Open Tickets,Open Tickets
+Opening,Öffnungs
+Opening Accounting Entries,Öffnungs Accounting -Einträge
+Opening Accounts and Stock,Öffnungskontenund Stock
Opening Date,Eröffnungsdatum
Opening Entry,Öffnungszeiten Eintrag
+Opening Qty,Öffnungs Menge
Opening Time,Öffnungszeit
+Opening Value,Öffnungs Wert
Opening for a Job.,Öffnung für den Job.
Operating Cost,Betriebskosten
Operation Description,Operation Beschreibung
@@ -1884,50 +1741,58 @@
Opportunity Items,Gelegenheit Artikel
Opportunity Lost,Chance vertan
Opportunity Type,Gelegenheit Typ
-Options,Optionen
-Options Help,Optionen Hilfe
-Order Confirmed,Bestellung bestätigt
-Order Lost,Lost Order
+Optional. This setting will be used to filter in various transactions.,"Optional. Diese Einstellung wird verwendet, um in verschiedenen Transaktionen zu filtern."
Order Type,Auftragsart
+Ordered,Bestellt
Ordered Items To Be Billed,Bestellte Artikel in Rechnung gestellt werden
Ordered Items To Be Delivered,Bestellte Artikel geliefert werden
+Ordered Qty,bestellte Menge
+"Ordered Qty: Quantity ordered for purchase, but not received.","Bestellte Menge: Bestellmenge für den Kauf, aber nicht empfangen ."
Ordered Quantity,Bestellte Menge
Orders released for production.,Bestellungen für die Produktion freigegeben.
+Organization,Organisation
+Organization Name,Name der Organisation
Organization Profile,Organisation Profil
-Original Message,Original Message
Other,Andere
Other Details,Weitere Details
-Out,Heraus
+Out Qty,out Menge
+Out Value,out Wert
Out of AMC,Von AMC
Out of Warranty,Außerhalb der Garantie
Outgoing,Abgehend
+Outgoing Email Settings,Ausgehende E-Mail -Einstellungen
Outgoing Mail Server,Postausgangsserver
Outgoing Mails,Ausgehende Mails
Outstanding Amount,Ausstehenden Betrag
Outstanding for Voucher ,Herausragend für Gutschein
-Over Heads,Über Heads
Overhead,Oben
-Overlapping Conditions found between,Überschneidungen zwischen AGB gefunden
+Overheads,Gemeinkosten
+Overview,Überblick
Owned,Besitz
+Owner,Eigentümer
PAN Number,PAN-Nummer
PF No.,PF Nr.
PF Number,PF-Nummer
PI/2011/,PI/2011 /
PIN,PIN
+PL or BS,PL oder BS
PO,PO
+PO Date,Bestelldatum
+PO No,PO Nein
POP3 Mail Server,POP3 Mail Server
-POP3 Mail Server (e.g. pop.gmail.com),POP3 Mail Server (beispielsweise pop.gmail.com)
POP3 Mail Settings,POP3-Mail-Einstellungen
POP3 mail server (e.g. pop.gmail.com),POP3-Mail-Server (pop.gmail.com beispielsweise)
POP3 server e.g. (pop.gmail.com),POP3-Server beispielsweise (pop.gmail.com)
POS Setting,POS Setting
POS View,POS anzeigen
PR Detail,PR Detailansicht
+PR Posting Date,PR Buchungsdatum
PRO,PRO
PS,PS
Package Item Details,Package Artikeldetails
Package Items,Package Angebote
Package Weight Details,Paket-Details Gewicht
+Packed Item,Lieferschein Verpackung Artikel
Packing Details,Verpackungs-Details
Packing Detials,Verpackung Detials
Packing List,Packliste
@@ -1935,21 +1800,10 @@
Packing Slip Item,Packzettel Artikel
Packing Slip Items,Packzettel Artikel
Packing Slip(s) Cancelled,Verpackung Slip (s) Gelöscht
-Page,Seite
-Page Background,Seite Hintergrund
-Page Border,Seite Border
Page Break,Seitenwechsel
-Page HTML,HTML-Seite
-Page Headings,Seite Rubriken
-Page Links,Diese Seite Links
Page Name,Page Name
-Page Role,Seite Role
-Page Text,Seite Text
-Page content,Seiteninhalt
Page not found,Seite nicht gefunden
-Page text and background is same color. Please change.,Text und Hintergrund ist die gleiche Farbe. Bitte ändern.
-Page to show on the website,Seite auf der Webseite zeigen
-"Page url name (auto-generated) (add "".html"")","Seite url Namen (automatisch generierte) (zus. ""Html"")"
+Paid,bezahlt
Paid Amount,Gezahlten Betrag
Parameter,Parameter
Parent Account,Hauptkonto
@@ -1958,13 +1812,12 @@
Parent Detail docname,Eltern Detailansicht docname
Parent Item,Übergeordneter Artikel
Parent Item Group,Übergeordneter Artikel Gruppe
-Parent Label,Eltern Etikett
Parent Sales Person,Eltern Sales Person
Parent Territory,Eltern Territory
-Parent is required.,Elternteil erforderlich.
Parenttype,ParentType
+Partially Billed,teilweise Angekündigt
Partially Completed,Teilweise abgeschlossen
-Participants,Die Teilnehmer
+Partially Delivered,teilweise Lieferung
Partly Billed,Teilweise Billed
Partly Delivered,Teilweise Lieferung
Partner Target Detail,Partner Zieldetailbericht
@@ -1973,19 +1826,18 @@
Passive,Passive
Passport Number,Passnummer
Password,Kennwort
-Password Expires in (days),Kennwort läuft ab in (Tage)
-Patch,Fleck
-Patch Log,Anmelden Patch-
Pay To / Recd From,Pay To / From RECD
Payables,Verbindlichkeiten
Payables Group,Verbindlichkeiten Gruppe
-Payment Collection With Ageing,Inkasso Mit Ageing
Payment Days,Zahltage
+Payment Due Date,Zahlungstermin
Payment Entries,Payment Einträge
-Payment Entry has been modified after you pulled it. Please pull it again.,"Payment Eintrag wurde geändert, nachdem Sie ihn gezogen. Bitte ziehen Sie es erneut."
-Payment Made With Ageing,Zahlung Mit Ageing Gemacht
+"Payment Entry has been modified after you pulled it.
+ Please pull it again.",
+Payment Period Based On Invoice Date,Zahlungszeitraum basiert auf Rechnungsdatum
Payment Reconciliation,Payment Versöhnung
-Payment Terms,Zahlungsbedingungen
+Payment Type,Zahlungsart
+Payment of salary for the month: ,
Payment to Invoice Matching Tool,Zahlung an Rechnung Matching-Tool
Payment to Invoice Matching Tool Detail,Zahlung an Rechnung Matching Werkzeug-Detail
Payments,Zahlungen
@@ -1993,36 +1845,25 @@
Payments Received,Erhaltene Anzahlungen
Payments made during the digest period,Zahlungen während der Auszugsperiodeninformation gemacht
Payments received during the digest period,Einzahlungen während der Auszugsperiodeninformation
+Payroll Settings,Payroll -Einstellungen
Payroll Setup,Payroll-Setup
Pending,Schwebend
+Pending Amount,Bis Betrag
Pending Review,Bis Bewertung
Pending SO Items For Purchase Request,Ausstehend SO Artikel zum Kauf anfordern
-Percent,Prozent
Percent Complete,Percent Complete
Percentage Allocation,Prozentuale Aufteilung
Percentage Allocation should be equal to ,Prozentuale Aufteilung sollte gleich
Percentage variation in quantity to be allowed while receiving or delivering this item.,Prozentuale Veränderung in der Menge zu dürfen während des Empfangs oder der Lieferung diesen Artikel werden.
Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Prozentual Sie erlaubt zu empfangen oder zu liefern, mehr gegen die Menge bestellt werden. Zum Beispiel: Wenn Sie 100 Einheiten bestellt. und Ihre Allowance ist 10%, dann dürfen Sie 110 Einheiten erhalten."
Performance appraisal.,Leistungsbeurteilung.
+Period,Zeit
Period Closing Voucher,Periodenverschiebung Gutschein
Periodicity,Periodizität
-Perm Level,Perm Stufe
-Permanent Accommodation Type,Permanent Art der Unterkunft
Permanent Address,Permanent Address
+Permanent Address Is,Permanent -Adresse ist
Permission,Permission
-Permission Level,Berechtigungsstufe
-Permission Levels,Berechtigungsstufen
Permission Manager,Permission Manager
-Permission Rules,Permission-Regeln
-Permissions,Berechtigungen
-Permissions Settings,Berechtigungen Einstellungen
-Permissions are automatically translated to Standard Reports and Searches,Berechtigungen werden automatisch auf Standard Reports und Suchen übersetzt
-"Permissions are set on Roles and Document Types (called DocTypes) by restricting read, edit, make new, submit, cancel, amend and report rights.","Berechtigungen für Rollen und Dokumenttypen (genannt doctypes) werden durch die Beschränkung lesen, bearbeiten, neue gesetzt, einreichen, abzubrechen, und Bericht Amend Rechte."
-Permissions at higher levels are 'Field Level' permissions. All Fields have a 'Permission Level' set against them and the rules defined at that permissions apply to the field. This is useful incase you want to hide or make certain field read-only.,"Berechtigungen sind auf höheren Ebenen 'Level Field' Berechtigungen. Alle Felder haben eine ""Permission Level 'Satz gegen sie und die Regeln zu diesem definierten Berechtigungen gelten für das Feld. Dies ist nützlich, falls man sich zu verstecken oder zu bestimmten Gebiet nur gelesen werden soll."
-"Permissions at level 0 are 'Document Level' permissions, i.e. they are primary for access to the document.","Berechtigungen sind auf Stufe 0 'Level Document ""-Berechtigungen, dh sie sind für die primäre Zugang zu dem Dokument."
-Permissions translate to Users based on what Role they are assigned,"Berechtigungen für Benutzer auf, welche Rolle sie zugeordnet sind, basiert übersetzen"
-Person,Person
-Person To Be Contacted,Person kontaktiert werden
Personal,Persönliche
Personal Details,Persönliche Details
Personal Email,Persönliche E-Mail
@@ -2034,64 +1875,82 @@
Place of Issue,Ausstellungsort
Plan for maintenance visits.,Plan für die Wartung Besuche.
Planned Qty,Geplante Menge
+"Planned Qty: Quantity, for which, Production Order has been raised,","Geplante Menge : Menge , für die , Fertigungsauftrag ausgelöst wurde ,"
Planned Quantity,Geplante Menge
Plant,Pflanze
Please Enter Abbreviation or Short Name properly as it will be added as Suffix to all Account Heads.,Bitte geben Abkürzung oder das Kurzer Name enquiry.c es auf alle Suffix Konto Heads hinzugefügt werden.
-Please Update Stock UOM with the help of Stock UOM Replace Utility.,Bitte aktualisiere Lager Verpackung mit Hilfe von Auf UOM ersetzen Dienstprogramm.
+Please Select Company under which you want to create account head,"Bitte wählen Unternehmen , unter dem Sie angemeldet Kopf erstellen möchten"
Please attach a file first.,Bitte fügen Sie eine Datei zuerst.
Please attach a file or set a URL,Bitte fügen Sie eine Datei oder stellen Sie eine URL
Please check,Bitte überprüfen Sie
+Please create new account from Chart of Accounts.,Bitte neues Konto erstellen von Konten .
+Please do NOT create Account (Ledgers) for Customers and Suppliers. They are created directly from the Customer / Supplier masters.,Bitte nicht erstellen Account ( Ledger ) für Kunden und Lieferanten . Sie werden direkt von den Kunden- / Lieferanten -Master erstellt.
+Please enable pop-ups,Bitte aktivieren Sie Pop-ups
+Please enter Cost Center,Bitte geben Sie Kostenstelle
Please enter Default Unit of Measure,Bitte geben Sie Standard Maßeinheit
Please enter Delivery Note No or Sales Invoice No to proceed,"Bitte geben Sie Lieferschein oder No Sales Invoice Nein, um fortzufahren"
-Please enter Employee Number,Bitte geben Sie Anzahl der Mitarbeiter
+Please enter Employee Id of this sales parson,Bitte geben Sie die Mitarbeiter-ID dieses Verkaufs Pfarrer
Please enter Expense Account,Bitte geben Sie Expense Konto
-Please enter Expense/Adjustment Account,Bitte geben Sie Aufwand / Adjustment Konto
+Please enter Item Code to get batch no,Bitte geben Sie Artikel-Code zu Charge nicht bekommen
+Please enter Item Code.,Bitte geben Sie Artikel-Code .
+Please enter Item first,Bitte geben Sie zuerst Artikel
+Please enter Master Name once the account is created.,"Bitte geben Sie Namen , wenn der Master- Account erstellt ."
+Please enter Production Item first,Bitte geben Sie zuerst Herstellungs Artikel
Please enter Purchase Receipt No to proceed,"Bitte geben Kaufbeleg Nein, um fortzufahren"
Please enter Reserved Warehouse for item ,Bitte geben Reserviert Warehouse für Artikel
-Please enter valid,Bitte geben Sie eine gültige
-Please enter valid ,Bitte geben Sie eine gültige
+Please enter Start Date and End Date,Bitte geben Sie Start- und Enddatum
+"Please enter account group under which account \
+ for warehouse ",
+Please enter company first,Bitte geben Sie Unternehmen zunächst
+Please enter company name first,Bitte geben erste Firmennamen
Please install dropbox python module,Bitte installieren Sie Dropbox Python-Modul
-Please make sure that there are no empty columns in the file.,"Bitte stellen Sie sicher, dass es keine leeren Spalten in der Datei."
Please mention default value for ',Bitte erwähnen Standardwert für '
Please reduce qty.,Bitte reduzieren Menge.
-Please refresh to get the latest document.,Bitte aktualisieren Sie das neueste Dokument zu erhalten.
Please save the Newsletter before sending.,Bitte bewahren Sie den Newsletter vor dem Versenden.
+Please save the document before generating maintenance schedule,Bitte speichern Sie das Dokument vor der Erzeugung Wartungsplan
+Please select Account first,Bitte wählen Sie Konto
Please select Bank Account,Bitte wählen Sie Bank Account
Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Bitte wählen Sie Carry Forward Auch wenn Sie zum vorherigen Geschäftsjahr die Blätter aufnehmen möchten zum Ausgleich in diesem Geschäftsjahr
+Please select Category first,Bitte wählen Sie zuerst Kategorie
+Please select Charge Type first,Bitte wählen Sie Entgeltart ersten
Please select Date on which you want to run the report,"Bitte wählen Sie Datum, an dem Sie den Bericht ausführen"
-Please select Naming Neries,Bitte wählen Naming Neries
Please select Price List,Bitte wählen Preisliste
-Please select Time Logs.,Bitte wählen Sie Zeit Logs.
Please select a,Bitte wählen Sie eine
Please select a csv file,Bitte wählen Sie eine CSV-Datei
-Please select a file or url,Bitte wählen Sie eine Datei oder URL
Please select a service item or change the order type to Sales.,"Bitte wählen Sie einen Dienst Artikel oder die Reihenfolge ändern, Typ Sales."
Please select a sub-contracted item or do not sub-contract the transaction.,Bitte wählen Sie einen Artikel Unteraufträge vergeben werden oder nicht sub-contract die Transaktion.
Please select a valid csv file with data.,Bitte wählen Sie eine gültige CSV-Datei mit Daten.
+"Please select an ""Image"" first","Bitte wählen Sie einen ""Bild"" erste"
Please select month and year,Bitte wählen Sie Monat und Jahr
+Please select options and click on Create,Bitte wählen Sie Optionen und klicken Sie auf Create
Please select the document type first,Bitte wählen Sie den Dokumententyp ersten
Please select: ,Bitte wählen Sie:
Please set Dropbox access keys in,Bitte setzen Dropbox Access Keys in
Please set Google Drive access keys in,Bitte setzen Google Drive Access Keys in
Please setup Employee Naming System in Human Resource > HR Settings,Bitte Setup Mitarbeiter Naming System in Human Resource> HR Einstellungen
+Please setup your chart of accounts before you start Accounting Entries,"Bitte Einrichtung Ihrer Kontenbuchhaltung, bevor Sie beginnen Einträge"
Please specify,Bitte geben Sie
Please specify Company,Bitte geben Unternehmen
Please specify Company to proceed,"Bitte geben Sie Unternehmen, um fortzufahren"
-Please specify Default Currency in Company Master \ and Global Defaults,Bitte geben Sie Standardwährung in Company Master \ Global and Defaults
+"Please specify Default Currency in Company Master \
+ and Global Defaults",
Please specify a,Bitte geben Sie eine
Please specify a Price List which is valid for Territory,Bitte geben Sie einen gültigen Preisliste für Territory ist
Please specify a valid,Bitte geben Sie eine gültige
Please specify a valid 'From Case No.',Bitte geben Sie eine gültige "Von Fall Nr. '
Please specify currency in Company,Bitte geben Sie die Währung in Unternehmen
+Please submit to update Leave Balance.,"Bitte reichen Sie zu verlassen, Bilanz zu aktualisieren."
+Please write something,Bitte schreiben Sie etwas
+Please write something in subject and message!,Bitte schreiben Sie etwas in Betreff und die Nachricht !
+Plot,Grundstück
+Plot By,Grundstück von
Point of Sale,Point of Sale
Point-of-Sale Setting,Point-of-Sale-Einstellung
Post Graduate,Post Graduate
-Post Topic,Beitrag Thema
Postal,Postal
Posting Date,Buchungsdatum
Posting Date Time cannot be before,"Buchungsdatum Zeit kann nicht sein, bevor"
Posting Time,Posting Zeit
-Posts,Beiträge
Potential Sales Deal,Sales Potential Deal
Potential opportunities for selling.,Potenzielle Chancen für den Verkauf.
"Precision for Float fields (quantities, discounts, percentages etc). Floats will be rounded up to specified decimals. Default = 3","Präzision für Float Felder (Mengen, Rabatte, Prozente etc). Floats werden bis zu angegebenen Dezimalstellen gerundet werden. Standard = 3"
@@ -2101,49 +1960,37 @@
Present,Präsentieren
Prevdoc DocType,Prevdoc DocType
Prevdoc Doctype,Prevdoc Doctype
-Preview,Vorschau
Previous Work Experience,Berufserfahrung
-Price,Preis
Price List,Preisliste
Price List Currency,Währung Preisliste
-Price List Currency Conversion Rate,Preisliste Currency Conversion Rate
Price List Exchange Rate,Preisliste Wechselkurs
Price List Master,Meister Preisliste
Price List Name,Preis Name
Price List Rate,Preis List
Price List Rate (Company Currency),Preisliste Rate (Gesellschaft Währung)
-Price List for Costing,Preisliste für die Kalkulation
-Price Lists and Rates,Preislisten und Preise
-Primary,Primär
-Print Format,Drucken Format
+Print,drucken
Print Format Style,Druckformat Stil
-Print Format Type,Drucken Format Type
Print Heading,Unterwegs drucken
-Print Hide,Drucken ausblenden
-Print Width,Druckbreite
Print Without Amount,Drucken ohne Amount
Print...,Drucken ...
+Printing,Drucken
Priority,Priorität
-Private,Privat
-Proceed to Setup,Gehen Sie auf Setup
-Process,Prozess
Process Payroll,Payroll-Prozess
+Produced,produziert
Produced Quantity,Produziert Menge
Product Enquiry,Produkt-Anfrage
Production Order,Fertigungsauftrag
+Production Order must be submitted,Fertigungsauftrag einzureichen
Production Orders,Fertigungsaufträge
+Production Orders in Progress,Fertigungsaufträge
Production Plan Item,Production Plan Artikel
Production Plan Items,Production Plan Artikel
Production Plan Sales Order,Production Plan Sales Order
Production Plan Sales Orders,Production Plan Kundenaufträge
Production Planning (MRP),Production Planning (MRP)
Production Planning Tool,Production Planning-Tool
+Products or Services You Buy,Produkte oder Dienstleistungen kaufen
"Products will be sorted by weight-age in default searches. More the weight-age, higher the product will appear in the list.","Die Produkte werden Gew.-age in Verzug Suchbegriffe sortiert werden. Mehr das Gewicht-Alter, wird das Produkt höher erscheinen in der Liste."
-Profile,Profil
-Profile Defaults,Profil Defaults
-Profile Represents a User in the system.,Stellt ein Benutzerprofil im System.
-Profile of a Blogger,Profil eines Blogger
-Profile of a blog writer.,Profil eines Blog-Schreiber.
Project,Projekt
Project Costing,Projektkalkulation
Project Details,Project Details
@@ -2157,29 +2004,20 @@
Project master.,Projekt Meister.
Project will get saved and will be searchable with project name given,Projekt wird gespeichert und erhalten werden durchsuchbare mit Projekt-Namen
Project wise Stock Tracking,Projekt weise Rohteilnachführung
+Projected,projektiert
Projected Qty,Prognostizierte Anzahl
Projects,Projekte
Prompt for Email on Submission of,Eingabeaufforderung für E-Mail auf Vorlage von
-Properties,Eigenschaften
-Property,Eigentum
-Property Setter,Property Setter
-Property Setter overrides a standard DocType or Field property,Property Setter überschreibt die Standard-DocType Feld oder Eigenschaft
-Property Type,Art der Immobilie
Provide email id registered in company,Bieten E-Mail-ID in Unternehmen registriert
Public,Öffentlichkeit
-Published,Veröffentlicht
-Published On,Veröffentlicht am
-Pull Emails from the Inbox and attach them as Communication records (for known contacts).,Ziehen Sie Emails aus dem Posteingang und bringen Sie die Kommunikation Them zeichnet (für bekannte Kontakte).
Pull Payment Entries,Ziehen Sie Payment Einträge
Pull sales orders (pending to deliver) based on the above criteria,"Ziehen Sie Kundenaufträge (anhängig zu liefern), basierend auf den oben genannten Kriterien"
Purchase,Kaufen
+Purchase / Manufacture Details,Kauf / Herstellung Einzelheiten
Purchase Analytics,Kauf Analytics
Purchase Common,Erwerb Eigener
-Purchase Date,Kauf Datum
Purchase Details,Kaufinformationen
Purchase Discounts,Kauf Rabatte
-Purchase Document No,Die Kaufdokument
-Purchase Document Type,Kauf Document Type
Purchase In Transit,Erwerben In Transit
Purchase Invoice,Kaufrechnung
Purchase Invoice Advance,Advance Purchase Rechnung
@@ -2198,7 +2036,6 @@
Purchase Order Message,Purchase Order Nachricht
Purchase Order Required,Bestellung erforderlich
Purchase Order Trends,Purchase Order Trends
-Purchase Order sent by customer,Bestellung durch den Kunden geschickt
Purchase Orders given to Suppliers.,Bestellungen Angesichts zu Lieferanten.
Purchase Receipt,Kaufbeleg
Purchase Receipt Item,Kaufbeleg Artikel
@@ -2216,7 +2053,6 @@
Purchase Taxes and Charges Master,Steuern und Gebühren Meister Kauf
Purpose,Zweck
Purpose must be one of ,Zweck muss einer sein
-Python Module Name,Python Module Name
QA Inspection,QA Inspection
QAI/11-12/,QAI/11-12 /
QTN,QTN
@@ -2224,6 +2060,10 @@
Qty Consumed Per Unit,Menge pro verbrauchter
Qty To Manufacture,Um Qty Herstellung
Qty as per Stock UOM,Menge pro dem Stock UOM
+Qty to Deliver,Menge zu liefern
+Qty to Order,Menge zu bestellen
+Qty to Receive,Menge zu erhalten
+Qty to Transfer,Menge in den Transfer
Qualification,Qualifikation
Quality,Qualität
Quality Inspection,Qualitätsprüfung
@@ -2232,30 +2072,25 @@
Quality Inspection Readings,Qualitätsprüfung Readings
Quantity,Menge
Quantity Requested for Purchase,Beantragten Menge für Kauf
-Quantity already manufactured,Bereits Menge hergestellt
Quantity and Rate,Menge und Preis
Quantity and Warehouse,Menge und Warehouse
Quantity cannot be a fraction.,Menge kann nicht ein Bruchteil sein.
Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Anzahl der Artikel nach der Herstellung / Umpacken vom Angesichts quantities von Rohstoffen Erhalten
-Quantity should be equal to Manufacturing Quantity. ,Menge sollte gleich zum Verarbeitenden Menge.
+"Quantity should be equal to Manufacturing Quantity. To fetch items again, click on 'Get Items' button or update the Quantity manually.","Menge sollte gleich Fertigungsmenge . Um Einzelteile wieder zu holen, klicken Sie auf ' Get Items "" -Taste oder manuell aktualisieren Sie die Menge ."
Quarter,Quartal
Quarterly,Vierteljährlich
-Query,Abfrage
-Query Options,Abfrageoptionen
Query Report,Query Report
-Query must be a SELECT,Abfrage muss ein SELECT sein
-Quick Help for Setting Permissions,Schnelle Hilfe für Festlegen von Berechtigungen
-Quick Help for User Properties,Schnelle Hilfe für User Properties
+Quick Help,schnelle Hilfe
Quotation,Zitat
Quotation Date,Quotation Datum
Quotation Item,Zitat Artikel
Quotation Items,Angebotspositionen
Quotation Lost Reason,Zitat Passwort Reason
Quotation Message,Quotation Nachricht
-Quotation Sent,Gesendete Quotation
Quotation Series,Zitat Series
Quotation To,Um Angebot
Quotation Trend,Zitat Trend
+Quotation is cancelled.,Zitat wird abgebrochen.
Quotations received from Suppliers.,Zitate von Lieferanten erhalten.
Quotes to Leads or Customers.,Zitate oder Leads zu Kunden.
Raise Material Request when stock reaches re-order level,"Heben Anfrage Material erreicht, wenn der Vorrat re-order-Ebene"
@@ -2283,7 +2118,6 @@
Re-order Level,Re-Order-Ebene
Re-order Qty,Re-Bestellung Menge
Read,Lesen
-Read Only,Nur Lesen
Reading 1,Reading 1
Reading 10,Lesen 10
Reading 2,Reading 2
@@ -2297,18 +2131,19 @@
Reason,Grund
Reason for Leaving,Grund für das Verlassen
Reason for Resignation,Grund zur Resignation
+Reason for losing,Grund für den Verlust
Recd Quantity,Menge RECD
Receivable / Payable account will be identified based on the field Master Type,Forderungen / Verbindlichkeiten Konto wird basierend auf dem Feld Meister Typ identifiziert werden
Receivables,Forderungen
Receivables / Payables,Forderungen / Verbindlichkeiten
Receivables Group,Forderungen Gruppe
+Received,Received
Received Date,Datum empfangen
Received Items To Be Billed,Empfangene Nachrichten in Rechnung gestellt werden
Received Qty,Erhaltene Menge
Received and Accepted,Erhalten und angenommen
Receiver List,Receiver Liste
Receiver Parameter,Empfänger Parameter
-Recipient,Empfänger
Recipients,Empfänger
Reconciliation Data,Datenabgleich
Reconciliation HTML,HTML Versöhnung
@@ -2320,65 +2155,54 @@
Reduce Deduction for Leave Without Pay (LWP),Reduzieren Abzug für unbezahlten Urlaub (LWP)
Reduce Earning for Leave Without Pay (LWP),Reduzieren Sie verdienen für unbezahlten Urlaub (LWP)
Ref Code,Ref Code
-Ref Date is Mandatory if Ref Number is specified,"Ref Datum ist obligatorisch, wenn Ref-Nummer angegeben ist"
-Ref DocType,Ref DocType
-Ref Name,Ref Namen
-Ref Rate,Ref Rate
Ref SQ,Ref SQ
-Ref Type,Ref Type
Reference,Referenz
Reference Date,Stichtag
-Reference DocName,Referenz DocName
-Reference DocType,Referenz DocType
Reference Name,Reference Name
Reference Number,Reference Number
-Reference Type,Referenztyp
Refresh,Erfrischen
-Registered but disabled.,"Registriert, aber deaktiviert."
+Refreshing....,Erfrischend ....
Registration Details,Registrierung Details
-Registration Details Emailed.,Details zur Anmeldung zugeschickt.
Registration Info,Registrierung Info
Rejected,Abgelehnt
Rejected Quantity,Abgelehnt Menge
Rejected Serial No,Abgelehnt Serial In
Rejected Warehouse,Abgelehnt Warehouse
+Rejected Warehouse is mandatory against regected item,Abgelehnt Warehouse ist obligatorisch gegen regected Artikel
Relation,Relation
Relieving Date,Entlastung Datum
Relieving Date of employee is ,Entlastung Datum der Mitarbeiter ist
Remark,Bemerkung
Remarks,Bemerkungen
Remove Bookmark,Lesezeichen entfernen
+Rename,umbenennen
Rename Log,Benennen Anmelden
Rename Tool,Umbenennen-Tool
Rename...,Benennen Sie ...
+Rent Cost,Mieten Kosten
+Rent per hour,Miete pro Stunde
Rented,Gemietet
-Repeat On,Wiederholen On
-Repeat Till,Wiederholen Bis
Repeat on Day of Month,Wiederholen Sie auf Tag des Monats
-Repeat this Event,Wiederholen Sie diesen Termin
Replace,Ersetzen
Replace Item / BOM in all BOMs,Ersetzen Item / BOM in allen Stücklisten
"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM","Ersetzen Sie die insbesondere gut in allen anderen Stücklisten, wo sie verwendet wird. Es wird die alte BOM Link zu ersetzen, aktualisieren kosten und regenerieren ""Explosion Stücklistenposition"" Tabelle pro neuen GOOD"
Replied,Beantwortet
Report,Bericht
-Report Builder,Report Builder
-Report Builder reports are managed directly by the report builder. Nothing to do.,Report Builder-Berichte werden direkt vom Report Builder verwaltet. Nichts zu tun.
Report Date,Report Date
-Report Hide,Ausblenden Bericht
-Report Name,Report Name
-Report Type,Melden Typ
+Report issues at,Bericht Themen auf
Report was not saved (there were errors),Bericht wurde nicht gespeichert (es gab Fehler)
Reports,Reports
Reports to,Berichte an
-Represents the states allowed in one document and role assigned to change the state.,Stellt die Zustände in einem Dokument und Veränderung zugewiesene Rolle des Staates erlaubt.
-Reqd,Reqd
Reqd By Date,Reqd Nach Datum
Request Type,Art der Anfrage
Request for Information,Request for Information
Request for purchase.,Ankaufsgesuch.
-Requested By,Angefordert von
+Requested,Angeforderte
+Requested For,Für Anfrage
Requested Items To Be Ordered,Erwünschte Artikel bestellt werden
Requested Items To Be Transferred,Erwünschte Objekte übertragen werden
+Requested Qty,Angeforderte Menge
+"Requested Qty: Quantity requested for purchase, but not ordered.","Angeforderte Menge : Menge für den Kauf erbeten, aber nicht bestellt ."
Requests for items.,Anfragen für Einzelteile.
Required By,Erforderliche By
Required Date,Erforderlich Datum
@@ -2386,32 +2210,25 @@
Required only for sample item.,Nur erforderlich für die Probe Element.
Required raw materials issued to the supplier for producing a sub - contracted item.,Erforderliche Rohstoffe Ausgestellt an den Lieferanten produziert eine sub - Vertragsgegenstand.
Reseller,Wiederverkäufer
+Reserved,reserviert
+Reserved Qty,reservierte Menge
+"Reserved Qty: Quantity ordered for sale, but not delivered.","Reservierte Menge: bestellte Menge zu verkaufen, aber nicht geliefert ."
Reserved Quantity,Reserviert Menge
Reserved Warehouse,Warehouse Reserved
Reserved Warehouse in Sales Order / Finished Goods Warehouse,Reserviert Warehouse in Sales Order / Fertigwarenlager
Reserved Warehouse is missing in Sales Order,Reserviert Warehouse ist in Sales Order fehlt
+Reset Filters,Filter zurücksetzen
Resignation Letter Date,Rücktrittsschreiben Datum
Resolution,Auflösung
Resolution Date,Resolution Datum
Resolution Details,Auflösung Einzelheiten
Resolved By,Gelöst von
-Restrict IP,Beschränken IP
-Restrict user from this IP address only. Multiple IP addresses can be added by separating with commas. Also accepts partial IP addresses like (111.111.111),Beschränken Sie Benutzer aus dieser IP-Adresse nur. Mehrere IP-Adressen können durch Trennung mit einem Komma hinzugefügt werden. Nimmt auch Teil einer IP-Adressen wie (111.111.111)
-Restricting By User,Durch Einschränken von Benutzerrechten
Retail,Einzelhandel
Retailer,Einzelhändler
Review Date,Bewerten Datum
Rgt,Rgt
-Right,Rechts
-Role,Rolle
Role Allowed to edit frozen stock,Rolle erlaubt den gefrorenen bearbeiten
-Role Name,Rolle Name
Role that is allowed to submit transactions that exceed credit limits set.,"Rolle, die erlaubt, Transaktionen, die Kreditlimiten gesetzt überschreiten vorlegen wird."
-Roles,Rollen
-Roles Assigned,Assigned Roles
-Roles Assigned To User,Zugewiesenen Rollen Benutzer
-Roles HTML,Rollen HTML
-Root ,Wurzel
Root cannot have a parent cost center,Wurzel kann kein übergeordnetes Kostenstelle
Rounded Total,Abgerundete insgesamt
Rounded Total (Company Currency),Abgerundete Total (Gesellschaft Währung)
@@ -2419,23 +2236,21 @@
Row ,Reihe
Row #,Zeile #
Row # ,Zeile #
-Rules defining transition of state in the workflow.,Regeln definieren Zustandsübergang im Workflow.
-"Rules for how states are transitions, like next state and which role is allowed to change state etc.","Regeln für die Staaten sind Übergänge, wie neben Staat und welche Rolle darf Staates usw. ändern"
Rules to calculate shipping amount for a sale,Regeln zum Versand Betrag für einen Verkauf berechnen
-SLE Exists,SLE Exists
+S.O. No.,S.O. Nein.
SMS,SMS
SMS Center,SMS Center
SMS Control,SMS Control
SMS Gateway URL,SMS Gateway URL
SMS Log,SMS Log
SMS Parameter,SMS Parameter
-SMS Parameters,SMS-Parameter
SMS Sender Name,SMS Absender Name
SMS Settings,SMS-Einstellungen
SMTP Server (e.g. smtp.gmail.com),SMTP Server (beispielsweise smtp.gmail.com)
SO,SO
SO Date,SO Datum
SO Pending Qty,SO Pending Menge
+SO Qty,SO Menge
SO/10-11/,SO/10-11 /
SO1112,SO1112
SQTN,SQTN
@@ -2462,11 +2277,11 @@
Sales BOM Help,Vertrieb BOM Hilfe
Sales BOM Item,Vertrieb Stücklistenposition
Sales BOM Items,Vertrieb Stücklistenpositionen
-Sales Common,Vertrieb Gemeinsame
Sales Details,Sales Details
Sales Discounts,Sales Rabatte
Sales Email Settings,Vertrieb E-Mail-Einstellungen
Sales Extras,Verkauf Extras
+Sales Funnel,Sales Funnel
Sales Invoice,Sales Invoice
Sales Invoice Advance,Sales Invoice Geleistete
Sales Invoice Item,Sales Invoice Artikel
@@ -2494,6 +2309,7 @@
Sales Person-wise Transaction Summary,Sales Person-wise Transaction Zusammenfassung
Sales Register,Verkäufe registrieren
Sales Return,Umsatzrendite
+Sales Returned,Verkaufszurück
Sales Taxes and Charges,Vertrieb Steuern und Abgaben
Sales Taxes and Charges Master,Vertrieb Steuern und Abgaben Meister
Sales Team,Sales Team
@@ -2505,76 +2321,52 @@
Sales taxes template.,Umsatzsteuer-Vorlage.
Sales territories.,Vertriebsgebieten.
Salutation,Gruß
-Same file has already been attached to the record,Gleiche Datei bereits auf den Rekordwert angebracht
+Same Serial No,Gleiche Seriennummer
Sample Size,Stichprobenumfang
Sanctioned Amount,Sanktioniert Betrag
Saturday,Samstag
Save,Sparen
Schedule,Planen
+Schedule Date,Termine Datum
Schedule Details,Termine Details
Scheduled,Geplant
-Scheduled Confirmation Date,Voraussichtlicher Bestätigung
Scheduled Date,Voraussichtlicher
-Scheduler Log,Scheduler Log
School/University,Schule / Universität
Score (0-5),Score (0-5)
Score Earned,Ergebnis Bekommen
+Score must be less than or equal to 5,Score muß weniger als oder gleich 5 sein
Scrap %,Scrap%
-Script,Skript
-Script Report,Script melden
-Script Type,Script Type
-Script to attach to all web pages.,Script auf alle Webseiten zu befestigen.
Search,Suchen
-Search Fields,Search Fields
Seasonality for setting budgets.,Saisonalität setzt Budgets.
-Section Break,Section Break
-Security Settings,Security Settings
"See ""Rate Of Materials Based On"" in Costing Section",Siehe "Rate Of Materials Based On" in der Kalkulation Abschnitt
-Select,Wählen
"Select ""Yes"" for sub - contracting items","Wählen Sie ""Ja"" für - Zulieferer Artikel"
-"Select ""Yes"" if this item is to be sent to a customer or received from a supplier as a sample. Delivery notes and Purchase Receipts will update stock levels but there will be no invoice against this item.","Wählen Sie ""Ja"", wenn dieser Punkt ist es, an den Kunden gesendet oder empfangen werden vom Lieferanten auf die Probe. Lieferscheine und Kaufbelege werden aktualisiert Lagerbestände, aber es wird auf der Rechnung vor diesem Element sein."
"Select ""Yes"" if this item is used for some internal purpose in your company.","Wählen Sie ""Ja"", wenn dieser Punkt für einige interne Zwecke in Ihrem Unternehmen verwendet wird."
"Select ""Yes"" if this item represents some work like training, designing, consulting etc.","Wählen Sie ""Ja"", wenn dieser Artikel stellt einige Arbeiten wie Ausbildung, Gestaltung, Beratung etc.."
"Select ""Yes"" if you are maintaining stock of this item in your Inventory.","Wählen Sie ""Ja"", wenn Sie Pflege stock dieses Artikels in Ihrem Inventar."
"Select ""Yes"" if you supply raw materials to your supplier to manufacture this item.","Wählen Sie ""Ja"", wenn Sie Rohstoffe an Ihren Lieferanten liefern, um diesen Artikel zu fertigen."
-Select All,Alles auswählen
-Select Attachments,Wählen Sie Attachments
Select Budget Distribution to unevenly distribute targets across months.,Wählen Budget Verteilung ungleichmäßig Targets über Monate verteilen.
"Select Budget Distribution, if you want to track based on seasonality.","Wählen Budget Distribution, wenn Sie basierend auf Saisonalität verfolgen möchten."
-Select Customer,Wählen Sie Kunde
Select Digest Content,Wählen Inhalt Digest
Select DocType,Wählen DocType
-Select Document Type,Wählen Sie Document Type
-Select Document Type or Role to start.,Wählen Sie Dokumenttyp oder Rolle zu beginnen.
+"Select Item where ""Is Stock Item"" is ""No""","Element auswählen , wo ""Ist Auf Item"" ""Nein"""
Select Items,Elemente auswählen
-Select PR,Select PR
-Select Print Format,Wählen Sie Print Format
-Select Print Heading,Wählen Sie Drucken Überschrift
-Select Report Name,Wählen Sie Report Name
-Select Role,Wählen Sie Rolle
+Select Purchase Receipts,Wählen Kaufbelege
Select Sales Orders,Wählen Sie Kundenaufträge
Select Sales Orders from which you want to create Production Orders.,Wählen Sie Aufträge aus der Sie Fertigungsaufträge erstellen.
-Select Terms and Conditions,Wählen AGB
Select Time Logs and Submit to create a new Sales Invoice.,"Wählen Sie Zeit Logs und abschicken, um einen neuen Sales Invoice erstellen."
Select Transaction,Wählen Sie Transaction
Select Type,Typ wählen
-Select User or Property to start.,Wählen Sie Benutzer-oder Property zu starten.
-Select a Banner Image first.,Wählen Sie ein Banner Bild zuerst.
Select account head of the bank where cheque was deposited.,"Wählen Sie den Kopf des Bankkontos, wo Kontrolle abgelagert wurde."
-Select an image of approx width 150px with a transparent background for best results.,Wählen Sie ein Bild von ca. 150px Breite mit einem transparenten Hintergrund für beste Ergebnisse.
Select company name first.,Wählen Firmennamen erste.
-Select dates to create a new ,"Wählen Sie ihre Reisedaten, um eine neue zu erstellen"
-Select name of Customer to whom project belongs,"Wählen Sie den Namen des Kunden, dem gehört Projekts"
Select or drag across time slots to create a new event.,Wählen oder ziehen in Zeitfenstern um ein neues Ereignis zu erstellen.
Select template from which you want to get the Goals,"Wählen Sie aus, welche Vorlage Sie die Ziele erhalten möchten"
Select the Employee for whom you are creating the Appraisal.,"Wählen Sie den Mitarbeiter, für den Sie erstellen Appraisal."
-Select the currency in which price list is maintained,"Wählen Sie die Währung, in der Preisliste wird beibehalten"
-Select the label after which you want to insert new field.,"Wählen Sie die Bezeichnung, die Sie nach dem Einfügen neuer Bereich."
+Select the Invoice against which you want to allocate payments.,"Wählen Sie die Rechnung , gegen die Sie Zahlungen zuordnen möchten."
Select the period when the invoice will be generated automatically,Wählen Sie den Zeitraum auf der Rechnung wird automatisch erzeugt werden
-"Select the price list as entered in ""Price List"" master. This will pull the reference rates of items against this price list as specified in ""Item"" master.","Wählen Sie die Preisliste in der ""Preisliste"" Master eingetragen. Dadurch werden die Referenzkurse Artikel gegen diese Preisliste in der ""Item"" Master vorgegeben ziehen."
Select the relevant company name if you have multiple companies,"Wählen Sie den entsprechenden Firmennamen, wenn Sie mehrere Unternehmen haben"
Select the relevant company name if you have multiple companies.,"Wählen Sie den entsprechenden Firmennamen, wenn Sie mehrere Unternehmen haben."
Select who you want to send this newsletter to,"Wählen Sie, wer Sie diesen Newsletter senden möchten"
+Select your home country and check the timezone and currency.,Wählen Sie Ihr Heimatland und überprüfen Sie die Zeitzone und Währung.
"Selecting ""Yes"" will allow this item to appear in Purchase Order , Purchase Receipt.","Wählen Sie ""Ja"" können diesen Artikel in Bestellung, Kaufbeleg erscheinen."
"Selecting ""Yes"" will allow this item to figure in Sales Order, Delivery Note","Wählen Sie ""Ja"" können diesen Artikel in Sales Order herauszufinden, Lieferschein"
"Selecting ""Yes"" will allow you to create Bill of Material showing raw material and operational costs incurred to manufacture this item.","Wählen Sie ""Ja"" ermöglicht es Ihnen, Bill of Material zeigt Rohstoffe und Betriebskosten anfallen, um diesen Artikel herzustellen erstellen."
@@ -2584,67 +2376,71 @@
Selling Settings,Verkauf Einstellungen
Send,Senden
Send Autoreply,Senden Autoreply
+Send Bulk SMS to Leads / Contacts,Senden Sie Massen- SMS an Leads / Kontakte
Send Email,E-Mail senden
Send From,Senden Von
-Send Invite Email,Senden Sie E-Mail einladen
-Send Me A Copy,Senden Sie mir eine Kopie
Send Notifications To,Benachrichtigungen an
+Send Now,Jetzt senden
Send Print in Body and Attachment,Senden Drucker in Körper und Anhang
Send SMS,Senden Sie eine SMS
Send To,Send To
Send To Type,Send To Geben
-Send an email reminder in the morning,Senden Sie eine E-Mail-Erinnerung in den Morgen
Send automatic emails to Contacts on Submitting transactions.,Senden Sie automatische E-Mails an Kontakte auf Einreichen Transaktionen.
Send mass SMS to your contacts,Senden Sie Massen-SMS an Ihre Kontakte
Send regular summary reports via Email.,Senden regelmäßige zusammenfassende Berichte per E-Mail.
Send to this list,Senden Sie zu dieser Liste
Sender,Absender
Sender Name,Absender Name
-"Sending newsletters is not allowed for Trial users, \ to prevent abuse of this feature.","Newsletter versenden ist nicht für Trial Nutzer erlaubt, auf \ Prevent Missbrauch dieser Funktion."
+Sent,Sent
Sent Mail,Gesendete E-Mails
Sent On,Sent On
Sent Quotation,Gesendete Quotation
+Sent or Received,Gesendet oder empfangen
Separate production order will be created for each finished good item.,Separate Fertigungsauftrag wird für jeden fertigen gute Position geschaffen werden.
Serial No,Serial In
+Serial No / Batch,Seriennummer / Charge
Serial No Details,Serial No Einzelheiten
Serial No Service Contract Expiry,Serial No Service Contract Verfall
Serial No Status,Serielle In-Status
Serial No Warranty Expiry,Serial No Scheckheftgepflegt
+Serial No created,Seriennummer erstellt
+Serial No does not belong to Item,Seriennummer gilt nicht für Artikel gehören
+Serial No must exist to transfer out.,"Seriennummer muss vorhanden sein , um heraus zu übertragen ."
+Serial No qty cannot be a fraction,Seriennummer Menge kann nicht ein Bruchteil sein
+Serial No status must be 'Available' to Deliver,"Seriennummer Status muss ""verfügbar"" sein, Deliver"
+Serial Nos do not match with qty,Seriennummernnicht mit Menge entsprechen
+Serial Number Series,Seriennummer Series
Serialized Item: ',Serialisiert Item '
+Series,Serie
Series List for this Transaction,Serien-Liste für diese Transaktion
-Server,Server
Service Address,Service Adresse
Services,Dienstleistungen
Session Expired. Logging you out,Session abgelaufen. Sie werden abgemeldet
-Session Expires in (time),Läuft in Session (Zeit)
Session Expiry,Session Verfall
Session Expiry in Hours e.g. 06:00,Session Verfall z. B. in Stunden 06.00
-Set Banner from Image,Set Banner von Image
Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,"Set Artikel gruppenweise Budgets auf diesem Gebiet. Sie können Saisonalität auch gehören, indem Sie die Distribution."
+Set Link,Link- Set
Set Login and Password if authentication is required.,"Stellen Sie Login und Passwort, wenn eine Authentifizierung erforderlich ist."
-Set New Password,Set New Password
-Set Value,Wert festlegen
-"Set a new password and ""Save""","Stellen Sie das neue Kennwort und ""Speichern"""
+Set allocated amount against each Payment Entry and click 'Allocate'.,"Set zugewiesene Betrag gegeneinander Zahlung Eintrag und klicken Sie auf "" Weisen "" ."
+Set as Default,Als Standard
+Set as Lost,Als Passwort
Set prefix for numbering series on your transactions,Nummerierung einstellen Serie Präfix für Ihre Online-Transaktionen
Set targets Item Group-wise for this Sales Person.,Set zielt Artikel gruppenweise für diesen Sales Person.
-"Set your background color, font and image (tiled)","Stellen Sie Ihre Hintergrundfarbe, Schrift und Bild (Kachel)"
"Set your outgoing mail SMTP settings here. All system generated notifications, emails will go from this mail server. If you are not sure, leave this blank to use ERPNext servers (emails will still be sent from your email id) or contact your email provider.","Stellen Sie Ihre ausgehende Mail SMTP-Einstellungen hier. Alle System generierten Meldungen werden E-Mails von diesen Mail-Server gehen. Wenn Sie sich nicht sicher sind, lassen Sie dieses Feld leer, um ERPNext Server (E-Mails werden immer noch von Ihrer E-Mail-ID gesendet werden) verwenden oder kontaktieren Sie Ihren E-Mail-Provider."
Setting Account Type helps in selecting this Account in transactions.,Einstellung Kontotyp hilft bei der Auswahl der Transaktionen in diesem Konto.
+Setting up...,Einrichten ...
Settings,Einstellungen
-Settings for About Us Page.,Einstellungen für Über uns Seite.
Settings for Accounts,Einstellungen für Konten
Settings for Buying Module,Einstellungen für den Kauf Module
-Settings for Contact Us Page,Einstellungen für Kontakt Seite
-Settings for Contact Us Page.,Einstellungen für Kontakt-Seite.
Settings for Selling Module,Einstellungen für den Verkauf Module
-Settings for the About Us Page,Einstellungen für die Über uns Seite
+Settings for Stock Module,Einstellungen für die Auf -Modul
"Settings to extract Job Applicants from a mailbox e.g. ""jobs@example.com""","Einstellungen für Bewerber aus einer Mailbox zB ""jobs@example.com"" extrahieren"
Setup,Setup
-Setup Control,Setup Control
+Setup Already Complete!!,Bereits Komplett -Setup !
+Setup Complete!,Setup Complete !
+Setup Completed,Setup ist abgeschlossen
Setup Series,Setup-Series
Setup of Shopping Cart.,Aufbau Einkaufswagen.
-Setup of fonts and background.,Setup von Schriftarten und Hintergrund.
-"Setup of top navigation bar, footer and logo.","Setup der oberen Navigationsleiste, Fußzeile und Logo."
Setup to pull emails from support email account,Richten Sie E-Mails von E-Mail-Account-Support ziehen
Share,Teilen
Share With,Anziehen
@@ -2652,7 +2448,6 @@
Shipping,Schifffahrt
Shipping Account,Liefer-Konto
Shipping Address,Versandadresse
-Shipping Address Name,Liefer-Adresse Name
Shipping Amount,Liefer-Betrag
Shipping Rule,Liefer-Regel
Shipping Rule Condition,Liefer-Rule Condition
@@ -2668,64 +2463,101 @@
Shopping Cart Shipping Rules,Einkaufswagen Versandkosten Rules
Shopping Cart Taxes and Charges Master,Einkaufswagen Steuern und Gebühren Meister
Shopping Cart Taxes and Charges Masters,Einkaufswagen Steuern und Gebühren Masters
-Short Bio,Kurzbiografie
-Short Name,Kurzer Name
Short biography for website and other publications.,Kurzbiographie für die Website und anderen Publikationen.
-Shortcut,Abkürzung
"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","Anzeigen ""Im Lager"" oder ""Nicht auf Lager"", basierend auf verfügbaren Bestand in diesem Lager."
+Show / Hide Features,Eigenschaften anzeigen / ausblenden
+Show / Hide Modules,Module anzeigen / ausblenden
Show Details,Details anzeigen
Show In Website,Zeigen Sie in der Webseite
-Show Print First,Erste Show Print
+Show Tags,Tags anzeigen
Show a slideshow at the top of the page,Zeige die Slideshow an der Spitze der Seite
Show in Website,Zeigen Sie im Website
Show rows with zero values,Zeige Zeilen mit Nullwerten
Show this slideshow at the top of the page,Zeige diese Slideshow an der Spitze der Seite
-Showing only for,Zeige nur für
Signature,Unterschrift
Signature to be appended at the end of every email,Unterschrift am Ende jeder E-Mail angehängt werden
Single,Single
-Single Post (article).,Single Post (Artikel).
Single unit of an Item.,Einzelgerät eines Elements.
-Sitemap Domain,Sitemap Domain
+Sit tight while your system is being setup. This may take a few moments.,"Sitzen fest , während Ihr System wird Setup . Dies kann einige Zeit dauern."
Slideshow,Slideshow
-Slideshow Items,Slideshow Artikel
-Slideshow Name,Slideshow Namen
-Slideshow like display for the website,Slideshow wie Display für die Website
-Small Text,Kleiner Text
-Solid background color (default light gray),Einfarbigen Hintergrund (Standard lichtgrau)
-Sorry we were unable to find what you were looking for.,"Leider waren wir nicht in der Lage zu finden, was Sie suchen."
-Sorry you are not permitted to view this page.,"Leider sind Sie nicht berechtigt, diese Seite anzuzeigen."
-Sorry! We can only allow upto 100 rows for Stock Reconciliation.,Sorry! Wir können nur bis zu 100 Zeilen für Stock Reconciliation ermöglichen.
"Sorry! You cannot change company's default currency, because there are existing transactions against it. You will need to cancel those transactions if you want to change the default currency.","Es tut uns leid! Sie können nicht ändern Unternehmens Standard-Währung, weil es bestehende Transaktionen dagegen sind. Sie müssen diese Transaktionen zu stornieren, wenn Sie die Standard-Währung ändern möchten."
-Sorry. Companies cannot be merged,Entschuldigung. Unternehmen können nicht zusammengeführt werden
-Sorry. Serial Nos. cannot be merged,Entschuldigung. Seriennummern können nicht zusammengeführt werden
-Sort By,Sortieren nach
+"Sorry, Serial Nos cannot be merged","Sorry, Seriennummernkönnen nicht zusammengeführt werden,"
+"Sorry, companies cannot be merged","Sorry, Unternehmen können nicht zusammengeführt werden"
Source,Quelle
Source Warehouse,Quelle Warehouse
Source and Target Warehouse cannot be same,Quelle und Ziel Warehouse kann nicht gleichzeitig
-Source of th,Quelle th
-"Source of the lead. If via a campaign, select ""Campaign""","Quelle der Leitung. Wenn über die Kampagne, wählen Sie ""Kampagne"""
Spartan,Spartan
-Special Page Settings,Spezielle Einstellungen Seite
+Special Characters,Sonderzeichen
+Special Characters ,
Specification Details,Ausschreibungstexte
Specify Exchange Rate to convert one currency into another,Geben Wechselkurs einer Währung in eine andere umzuwandeln
"Specify a list of Territories, for which, this Price List is valid","Geben Sie eine Liste der Gebiete, für die ist diese Preisliste gültig"
"Specify a list of Territories, for which, this Shipping Rule is valid","Geben Sie eine Liste der Gebiete, für die ist diese Regel gültig Versand"
"Specify a list of Territories, for which, this Taxes Master is valid","Geben Sie eine Liste der Gebiete, für die ist diese Steuern Meister gültig"
Specify conditions to calculate shipping amount,Geben Sie Bedingungen für die Schifffahrt zu berechnen
+"Specify the operations, operating cost and give a unique Operation no to your operations.","Geben Sie die Vorgänge , Betriebskosten und geben einen einzigartigen Betrieb nicht für Ihren Betrieb ."
Split Delivery Note into packages.,Aufgeteilt in Pakete Lieferschein.
Standard,Standard
Standard Rate,Standardpreis
-"Standard Terms and Conditions that can be added to Sales and Purchases.Examples:1. Validity of the offer.1. Payment Terms (In Advance, On Credit, part advance etc).1. What is extra (or payable by the Customer).1. Safety / usage warning.1. Warranty if any.1. Returns Policy.1. Terms of shipping, if applicable.1. Ways of addressing disputes, indemnity, liability, etc.1. Address and Contact of your Company.","1: Standard Bedingungen, können Umsatz und Purchases.Examples hinzugefügt werden. Gültigkeit der offer.1. Zahlungsbedingungen (im voraus auf Credit, einem Teil Voraus etc) .1. Was ist extra (oder zu Lasten des Kunden) .1. Sicherheit / Nutzung warning.1. Garantie, wenn any.1. Gibt Policy.1. AGB Versand, wenn applicable.1. Möglichkeiten zu erörtern, Streitigkeiten, Schadenersatz, Haftung, etc.1. Adress-und Kontaktdaten Ihres Unternehmens."
-"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.#### NoteThe tax rate you define here will be the standard tax rate for all **Items**. If there are **Items** that have different rates, they must be added in the **Item Tax** table in the **Item** master.#### Description of Columns1. Calculation Type: - This can be on **Net Total** (that is the sum of basic amount). - **On Previous Row Total / Amount** (for cumulative taxes or charges). If you select this option, the tax will be applied as a percentage of the previous row (in the tax table) amount or total. - **Actual** (as mentioned).2. Account Head: The Account ledger under which this tax will be booked3. Cost Center: If the tax / charge is an income (like shipping) or expense it needs to be booked against a Cost Center.4. Description: Description of the tax (that will be printed in invoices / quotes).5. Rate: Tax rate.6. Amount: Tax amount.7. Total: Cumulative total to this point.8. Enter Row: If based on ""Previous Row Total"" you can select the row number which will be taken as a base for this calculation (default is the previous row).9. Consider Tax or Charge for: In this section you can specify if the tax / charge is only for valuation (not a part of total) or only for total (does not add value to the item) or for both.10. Add or Deduct: Whether you want to add or deduct the tax.","Standard Steuern Vorlage, die für alle Kauf-Transaktionen angewendet werden können. Diese Vorlage kann Liste der Steuerhinterziehung und auch andere Kosten Köpfe wie ""Versand"", ""Insurance"", ""Handling"" etc. # # # # AnmerkungDie Steuersatz, den Sie hier definieren, wird die Standard-Steuersatz für alle ** Artikel ** . Wenn es ** Artikel **, die unterschiedliche Preise haben, müssen sie in der ** Artikel Tax ** Tabelle in der ** Artikel werden ** Master. # # # # Beschreibung der Columns1 aufgenommen. Berechnungsart: - Dies kann auf ** Net Total sein ** (dh die Summe der Grundbetrag ist). - ** Auf Previous Row Total / Betrag ** (für kumulative Steuern oder Abgaben). Wenn Sie diese Option wählen, wird die Steuer als Prozentsatz der vorherigen Reihe (in der Steuer-Tabelle) oder Gesamtmenge angewendet werden. - ** Tatsächliche ** (wie erwähnt) 0,2. Konto Head: Der Account Ledger unter denen diese Steuer booked3 sein wird. Kostenstelle: Wenn die Steuer / Gebühr ist ein Einkommen (wie Versand) oder Kosten es braucht, um gegen eine Cost Center.4 gebucht werden. Beschreibung: Beschreibung der Steuer (das wird in den Rechnungen / quotes gedruckt werden) .5. Rate: Tax rate.6. Betrag: Tax amount.7. Total: Kumulierte insgesamt zu dieser point.8. Geben Row: Wenn Sie auf ""Previous Row Total"" Basis können Sie die Nummer der Zeile, die als Grundlage für diese Berechnung (voreingestellt ist die vorherige Zeile) .9 ergriffen werden wählen. Betrachten Sie Steuern oder Gebühren für: In diesem Bereich können Sie festlegen, ob die Steuer / Gebühr ist nur für die Bewertung (nicht ein Teil der Gesamtsumme) oder nur für die gesamte (nicht erhöhen den Wert der Position) oder für both.10. Hinzufügen oder abziehen: Ob Sie zum Hinzufügen oder entrichtete Mehrwertsteuer abziehen wollen."
-"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.#### NoteThe tax rate you define here will be the standard tax rate for all **Items**. If there are **Items** that have different rates, they must be added in the **Item Tax** table in the **Item** master.#### Description of Columns1. Calculation Type: - This can be on **Net Total** (that is the sum of basic amount). - **On Previous Row Total / Amount** (for cumulative taxes or charges). If you select this option, the tax will be applied as a percentage of the previous row (in the tax table) amount or total. - **Actual** (as mentioned).2. Account Head: The Account ledger under which this tax will be booked3. Cost Center: If the tax / charge is an income (like shipping) or expense it needs to be booked against a Cost Center.4. Description: Description of the tax (that will be printed in invoices / quotes).5. Rate: Tax rate.6. Amount: Tax amount.7. Total: Cumulative total to this point.8. Enter Row: If based on ""Previous Row Total"" you can select the row number which will be taken as a base for this calculation (default is the previous row).9. Is this Tax included in Basic Rate?: If you check this, it means that this tax will not be shown below the item table, but will be included in the Basic Rate in your main item table. This is useful where you want give a flat price (inclusive of all taxes) price to customers.","Standard Steuern Vorlage, die für alle Verkaufsvorgänge angewendet werden können. Diese Vorlage kann Liste der Steuerhinterziehung und auch andere Aufwendungen / Erträge Köpfe wie ""Versand"", ""Insurance"", ""Handling"" etc. # # # # AnmerkungDie Steuersatz, den Sie hier definieren, wird der Steuersatz für alle ** Artikel werden **. Wenn es ** Artikel **, die unterschiedliche Preise haben, müssen sie in der ** Artikel Tax ** Tabelle in der ** Artikel werden ** Master. # # # # Beschreibung der Columns1 aufgenommen. Berechnungsart: - Dies kann auf ** Net Total sein ** (dh die Summe der Grundbetrag ist). - ** Auf Previous Row Total / Betrag ** (für kumulative Steuern oder Abgaben). Wenn Sie diese Option wählen, wird die Steuer als Prozentsatz der vorherigen Reihe (in der Steuer-Tabelle) oder Gesamtmenge angewendet werden. - ** Tatsächliche ** (wie erwähnt) 0,2. Konto Head: Der Account Ledger unter denen diese Steuer booked3 sein wird. Kostenstelle: Wenn die Steuer / Gebühr ist ein Einkommen (wie Versand) oder Kosten es braucht, um gegen eine Cost Center.4 gebucht werden. Beschreibung: Beschreibung der Steuer (das wird in den Rechnungen / quotes gedruckt werden) .5. Rate: Tax rate.6. Betrag: Tax amount.7. Total: Kumulierte insgesamt zu dieser point.8. Geben Row: Wenn Sie auf ""Previous Row Total"" Basis können Sie die Nummer der Zeile, die als Grundlage für diese Berechnung (voreingestellt ist die vorherige Zeile) .9 ergriffen werden wählen. Wird diese Steuer in Basic Rate enthalten: Wenn Sie diese Option, bedeutet dies, dass diese Steuer nicht unterhalb des Artikels Tabelle dargestellt werden, wird aber in der Basic Rate in Ihrem Hauptsache Tabelle aufgenommen. Dies ist nützlich, wenn Sie geben einen Pauschalpreis (inklusive aller Steuern) Preise für die Kunden wollen."
+"Standard Terms and Conditions that can be added to Sales and Purchases.
+
+Examples:
+
+1. Validity of the offer.
+1. Payment Terms (In Advance, On Credit, part advance etc).
+1. What is extra (or payable by the Customer).
+1. Safety / usage warning.
+1. Warranty if any.
+1. Returns Policy.
+1. Terms of shipping, if applicable.
+1. Ways of addressing disputes, indemnity, liability, etc.
+1. Address and Contact of your Company.",
+"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
+
+#### Note
+
+The tax rate you define here will be the standard tax rate for all **Items**. If there are **Items** that have different rates, they must be added in the **Item Tax** table in the **Item** master.
+
+#### Description of Columns
+
+1. Calculation Type:
+ - This can be on **Net Total** (that is the sum of basic amount).
+ - **On Previous Row Total / Amount** (for cumulative taxes or charges). If you select this option, the tax will be applied as a percentage of the previous row (in the tax table) amount or total.
+ - **Actual** (as mentioned).
+2. Account Head: The Account ledger under which this tax will be booked
+3. Cost Center: If the tax / charge is an income (like shipping) or expense it needs to be booked against a Cost Center.
+4. Description: Description of the tax (that will be printed in invoices / quotes).
+5. Rate: Tax rate.
+6. Amount: Tax amount.
+7. Total: Cumulative total to this point.
+8. Enter Row: If based on ""Previous Row Total"" you can select the row number which will be taken as a base for this calculation (default is the previous row).
+9. Consider Tax or Charge for: In this section you can specify if the tax / charge is only for valuation (not a part of total) or only for total (does not add value to the item) or for both.
+10. Add or Deduct: Whether you want to add or deduct the tax.",
+"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
+
+#### Note
+
+The tax rate you define here will be the standard tax rate for all **Items**. If there are **Items** that have different rates, they must be added in the **Item Tax** table in the **Item** master.
+
+#### Description of Columns
+
+1. Calculation Type:
+ - This can be on **Net Total** (that is the sum of basic amount).
+ - **On Previous Row Total / Amount** (for cumulative taxes or charges). If you select this option, the tax will be applied as a percentage of the previous row (in the tax table) amount or total.
+ - **Actual** (as mentioned).
+2. Account Head: The Account ledger under which this tax will be booked
+3. Cost Center: If the tax / charge is an income (like shipping) or expense it needs to be booked against a Cost Center.
+4. Description: Description of the tax (that will be printed in invoices / quotes).
+5. Rate: Tax rate.
+6. Amount: Tax amount.
+7. Total: Cumulative total to this point.
+8. Enter Row: If based on ""Previous Row Total"" you can select the row number which will be taken as a base for this calculation (default is the previous row).
+9. Is this Tax included in Basic Rate?: If you check this, it means that this tax will not be shown below the item table, but will be included in the Basic Rate in your main item table. This is useful where you want give a flat price (inclusive of all taxes) price to customers.",
+Start,Start-
Start Date,Startdatum
-Start Report For,Starten des Berichts für
Start date of current invoice's period,Startdatum der laufenden Rechnung der Zeit
-Starts on,Beginnt am
-Startup,Startup
+Starting up...,Inbetriebnahme ...
State,Zustand
-States,Staaten
Static Parameters,Statische Parameter
Status,Status
Status must be one of ,Der Status muss einer sein
@@ -2733,48 +2565,47 @@
Statutory info and other general information about your Supplier,Gesetzliche Informationen und andere allgemeine Informationen über Ihr Lieferant
Stock,Lager
Stock Adjustment Account,Auf Adjustment Konto
-Stock Adjustment Cost Center,Auf die Anpassung der Kostenstellenrechnung
Stock Ageing,Lager Ageing
Stock Analytics,Lager Analytics
Stock Balance,Bestandsliste
+Stock Entries already created for Production Order ,
Stock Entry,Lager Eintrag
Stock Entry Detail,Lager Eintrag Details
Stock Frozen Upto,Lager Bis gefroren
-Stock In Hand Account,Vorrat in der Hand Konto
Stock Ledger,Lager Ledger
Stock Ledger Entry,Lager Ledger Eintrag
Stock Level,Stock Level
Stock Qty,Lieferbar Menge
Stock Queue (FIFO),Lager Queue (FIFO)
Stock Received But Not Billed,"Auf empfangen, aber nicht Angekündigt"
+Stock Reconcilation Data,Auf Versöhnung Daten
+Stock Reconcilation Template,Auf Versöhnung Vorlage
Stock Reconciliation,Lager Versöhnung
-Stock Reconciliation file not uploaded,Lager Versöhnung Datei nicht hochgeladen
+"Stock Reconciliation can be used to update the stock on a particular date, ",
Stock Settings,Auf Einstellungen
Stock UOM,Lager UOM
Stock UOM Replace Utility,Lager UOM ersetzen Dienstprogramm
Stock Uom,Lager ME
Stock Value,Bestandswert
Stock Value Difference,Auf Wertdifferenz
+Stock transactions exist against warehouse ,
Stop,Stoppen
+Stop Birthday Reminders,Stop- Geburtstagserinnerungen
+Stop Material Request,Stopp -Material anfordern
Stop users from making Leave Applications on following days.,Stoppen Sie den Nutzer von Leave Anwendungen auf folgenden Tagen.
+Stop!,Stop!
Stopped,Gestoppt
Structure cost centers for budgeting.,Structure Kostenstellen für die Budgetierung.
Structure of books of accounts.,Struktur der Bücher von Konten.
-Style,Stil
-Style Settings,Style Einstellungen
-"Style represents the button color: Success - Green, Danger - Red, Inverse - Black, Primary - Dark Blue, Info - Light Blue, Warning - Orange","Stil repräsentiert die Farbe der Schaltfläche: Success - Grün, Gefahr - Rot, Inverse - Schwarz, Primary - Dunkelblau, Info - Light Blue, Warnung - Orange"
"Sub-currency. For e.g. ""Cent""","Sub-Währung. Für z.B. ""Cent"""
-Sub-domain provided by erpnext.com,Sub-Domain durch erpnext.com vorgesehen
Subcontract,Vergeben
-Subdomain,Subdomain
Subject,Thema
Submit,Einreichen
Submit Salary Slip,Senden Gehaltsabrechnung
Submit all salary slips for the above selected criteria,Reichen Sie alle Gehaltsabrechnungen für die oben ausgewählten Kriterien
+Submit this Production Order for further processing.,Senden Sie dieses Fertigungsauftrag für die weitere Verarbeitung .
Submitted,Eingereicht
-Submitted Record cannot be deleted,Eingereicht Datensatz kann nicht gelöscht werden
Subsidiary,Tochtergesellschaft
-Success,Erfolg
Successful: ,Erfolgreich:
Suggestion,Vorschlag
Suggestions,Vorschläge
@@ -2782,8 +2613,11 @@
Supplier,Lieferant
Supplier (Payable) Account,Lieferant (zahlbar) Konto
Supplier (vendor) name as entered in supplier master,Lieferant (Kreditor) Namen wie im Lieferantenstamm eingetragen
+Supplier Account,Lieferant Konto
Supplier Account Head,Lieferant Konto Leiter
Supplier Address,Lieferant Adresse
+Supplier Addresses And Contacts,Lieferant Adressen und Kontakte
+Supplier Addresses and Contacts,Lieferant Adressen und Kontakte
Supplier Details,Supplier Details
Supplier Intro,Lieferant Intro
Supplier Invoice Date,Lieferantenrechnung Datum
@@ -2797,59 +2631,58 @@
Supplier Shipment Date,Lieferant Warensendung Datum
Supplier Shipment No,Lieferant Versand Keine
Supplier Type,Lieferant Typ
+Supplier Type / Supplier,Lieferant Typ / Lieferant
Supplier Warehouse,Lieferant Warehouse
Supplier Warehouse mandatory subcontracted purchase receipt,Lieferant Warehouse zwingend vergeben Kaufbeleg
Supplier classification.,Lieferant Klassifizierung.
Supplier database.,Lieferanten-Datenbank.
Supplier of Goods or Services.,Lieferant von Waren oder Dienstleistungen.
Supplier warehouse where you have issued raw materials for sub - contracting,Lieferantenlager wo Sie Rohstoffe ausgegeben haben - Zulieferer
-Supplier's currency,Lieferant Währung
+Supplier-Wise Sales Analytics,HerstellerverkaufsWise Analytics
Support,Unterstützen
+Support Analtyics,Unterstützung Analtyics
Support Analytics,Unterstützung Analytics
Support Email,Unterstützung per E-Mail
-Support Email Id,Unterstützt E-Mail-Id
+Support Email Settings,Support- E-Mail -Einstellungen
Support Password,Support Passwort
Support Ticket,Support Ticket
Support queries from customers.,Support-Anfragen von Kunden.
Symbol,Symbol
-Sync Inbox,Sync Posteingang
Sync Support Mails,Sync Unterstützung Mails
Sync with Dropbox,Sync mit Dropbox
Sync with Google Drive,Sync mit Google Drive
-System,System
-System Defaults,System Defaults
+System Administration,System-Administration
+System Scheduler Errors,System Scheduler -Fehler
System Settings,Systemeinstellungen
-System User,System User
"System User (login) ID. If set, it will become default for all HR forms.","System User (login) ID. Wenn gesetzt, wird es standardmäßig für alle HR-Formulare werden."
System for managing Backups,System zur Verwaltung von Backups
System generated mails will be sent from this email id.,System generierten E-Mails werden von dieser E-Mail-ID gesendet werden.
TL-,TL-
TLB-,TLB-
-Table,Tabelle
Table for Item that will be shown in Web Site,"Tabelle für Artikel, die in Web-Site angezeigt werden"
-Tag,Anhänger
-Tag Name,Tag Name
Tags,Tags
-Tahoma,Tahoma
-Target,Ziel
Target Amount,Zielbetrag
Target Detail,Ziel Detailansicht
Target Details,Zieldetails
Target Details1,Ziel Details1
Target Distribution,Target Distribution
+Target On,Ziel Auf
Target Qty,Ziel Menge
Target Warehouse,Ziel Warehouse
Task,Aufgabe
Task Details,Task Details
+Tasks,Aufgaben
Tax,Steuer
+Tax Accounts,Steuerkonten
Tax Calculation,Steuerberechnung
-Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"MwSt. Kategorie kann nicht "Bewertungstag" oder "Bewertung und Total 'sein, da alle Artikel nicht auf Lager gehalten werden"
+Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Steuerkategorie kann nicht ""Bewertungstag "" oder "" Bewertung und Total ' als alle Einzelteile sind nicht auf Lager gehalten werden"
Tax Master,Tax Meister
Tax Rate,Tax Rate
Tax Template for Purchase,MwSt. Vorlage für Kauf
Tax Template for Sales,MwSt. Template für Vertrieb
Tax and other salary deductions.,Steuer-und sonstige Lohnabzüge.
-Tax detail table fetched from item master as a string and stored in this field.Used for Taxes and Charges,MwSt. Detailtabelle holte aus Artikelstammdaten als String und in diesem field.Used für Steuern und Abgaben
+"Tax detail table fetched from item master as a string and stored in this field.
+Used for Taxes and Charges",
Taxable,Steuerpflichtig
Taxes,Steuern
Taxes and Charges,Steuern und Abgaben
@@ -2860,18 +2693,18 @@
Taxes and Charges Deducted (Company Currency),Steuern und Gebühren Abzug (Gesellschaft Währung)
Taxes and Charges Total,Steuern und Gebühren gesamt
Taxes and Charges Total (Company Currency),Steuern und Abgaben insgesamt (Gesellschaft Währung)
-Taxes and Charges1,Steuern und Kosten1
-Team Members,Teammitglieder
-Team Members Heading,Teammitglieder Überschrift
Template for employee performance appraisals.,Vorlage für Mitarbeiter Leistungsbeurteilungen.
Template of terms or contract.,Vorlage von Begriffen oder Vertrag.
Term Details,Begriff Einzelheiten
+Terms,Bedingungen
Terms and Conditions,AGB
Terms and Conditions Content,AGB Inhalt
Terms and Conditions Details,AGB Einzelheiten
Terms and Conditions Template,AGB Template
Terms and Conditions1,Allgemeine Bedingungen1
+Terretory,Terretory
Territory,Gebiet
+Territory / Customer,Territory / Kunden
Territory Manager,Territory Manager
Territory Name,Territory Namen
Territory Target Variance (Item Group-Wise),Territory Ziel Variance (Artikel-Nr. Gruppe-Wise)
@@ -2880,59 +2713,51 @@
Test Email Id,Test Email Id
Test Runner,Test Runner
Test the Newsletter,Testen Sie den Newsletter
-Text,Text
-Text Align,Text ausrichten
-Text Editor,Text Editor
-"The ""Web Page"" that is the website home page","Die ""Web Page"", die Homepage der Website ist"
The BOM which will be replaced,"Die Stückliste, die ersetzt werden"
+The First User: You,Der erste Benutzer : Sie
"The Item that represents the Package. This Item must have ""Is Stock Item"" as ""No"" and ""Is Sales Item"" as ""Yes""","Das Element, das das Paket darstellt. Dieser Artikel muss ""Ist Stock Item"" als ""Nein"" und ""Ist Vertrieb Item"" als ""Ja"""
-The date at which current entry is made in system.,"Das Datum, an dem aktuellen Eintrag im System hergestellt wird."
-The date at which current entry will get or has actually executed.,"Das Datum, an dem aktuellen Eintrag zu erhalten oder wird tatsächlich ausgeführt."
-The date on which next invoice will be generated. It is generated on submit.,"Der Tag, an dem nächsten Rechnung generiert werden. Es basiert auf einzureichen generiert."
+The Organization,Die Organisation
+"The account head under Liability, in which Profit/Loss will be booked","Das Konto, Kopf unter Haftung , in der Gewinn / Verlust wird gebucht werden"
+"The date on which next invoice will be generated. It is generated on submit.
+",
The date on which recurring invoice will be stop,"Der Tag, an dem wiederkehrende Rechnung werden aufhören wird"
"The day of the month on which auto invoice will be generated e.g. 05, 28 etc ","Der Tag des Monats, an dem auto Rechnung zB 05, 28 usw. generiert werden"
+The day(s) on which you are applying for leave coincide with holiday(s). You need not apply for leave.,"Der Tag (e) , auf dem Sie sich bewerben für Urlaub zusammenfallen mit Urlaub (en) . Sie müssen nicht, um Urlaub ."
The first Leave Approver in the list will be set as the default Leave Approver,Die erste Leave Approver in der Liste wird als Standard-Leave Approver eingestellt werden
+The first user will become the System Manager (you can change that later).,"Der erste Benutzer wird der System-Manager (du , dass später ändern können ) ."
The gross weight of the package. Usually net weight + packaging material weight. (for print),Das Bruttogewicht des Pakets. Normalerweise Eigengewicht + Verpackungsmaterial Gewicht. (Zum Drucken)
-The name of your company / website as you want to appear on browser title bar. All pages will have this as the prefix to the title.,"Der Name Ihrer Firma / Website, wie Sie auf Titelleiste des Browsers angezeigt werden soll. Alle Seiten werden diese als Präfix für den Titel haben."
+The name of your company for which you are setting up this system.,"Der Name der Firma, für die Sie die Einrichtung dieses Systems."
The net weight of this package. (calculated automatically as sum of net weight of items),Das Nettogewicht dieses Pakets. (Automatisch als Summe der Netto-Gewicht der Sendungen berechnet)
The new BOM after replacement,Der neue BOM nach dem Austausch
The rate at which Bill Currency is converted into company's base currency,"Die Rate, mit der Bill Währung in Unternehmen Basiswährung umgewandelt wird"
-"The system provides pre-defined roles, but you can <a href='#List/Role'>add new roles</a> to set finer permissions","Das System bietet vordefinierte Rollen, aber Sie können <a href='#List/Role'> neue Rollen </ a>, um feinere Berechtigungen festlegen"
The unique id for tracking all recurring invoices. It is generated on submit.,Die eindeutige ID für Tracking alle wiederkehrenden Rechnungen. Es basiert auf einreichen generiert.
Then By (optional),Dann nach (optional)
-These properties are Link Type fields from all Documents.,Diese Eigenschaften sind Link-Typ Felder aus allen Dokumenten.
-"These properties can also be used to 'assign' a particular document, whose property matches with the User's property to a User. These can be set using the <a href='#permission-manager'>Permission Manager</a>","Diese Eigenschaften können auch verwendet werden, um 'assign' ein bestimmtes Dokument, dessen Eigenschaft übereinstimmt mit der Benutzer-Eigenschaft auf einen Benutzer werden. Dies kann mit dem <a href='#permission-manager'> Permission Manager </ a> werden"
-These properties will appear as values in forms that contain them.,"Diese Eigenschaften werden als Werte in Formen, die sie enthalten, erscheinen."
-These values will be automatically updated in transactions and also will be useful to restrict permissions for this user on transactions containing these values.,"Diese Werte werden automatisch in Transaktionen aktualisiert werden und wird auch nützlich sein, um Berechtigungen für diesen Benutzer auf Transaktionen mit diesen Werten zu beschränken."
-This Price List will be selected as default for all Customers under this Group.,Diese Preisliste wird als Standard für alle Kunden unter dieser Gruppe ausgewählt werden.
+There is nothing to edit.,Es gibt nichts zu bearbeiten.
+There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Es ist ein Fehler aufgetreten . Ein möglicher Grund könnte sein, dass Sie das Formular nicht gespeichert haben. Bitte kontaktieren Sie support@erpnext.com wenn das Problem weiterhin besteht ."
+There were errors.,Es gab Fehler .
+This Currency is disabled. Enable to use in transactions,"Diese Währung ist deaktiviert . Aktivieren, um Transaktionen in"
+This Leave Application is pending approval. Only the Leave Apporver can update status.,Dieser Urlaubsantrag ist bis zur Genehmigung . Nur das Datum Apporver können Status zu aktualisieren.
This Time Log Batch has been billed.,This Time Log Batch abgerechnet hat.
This Time Log Batch has been cancelled.,This Time Log Batch wurde abgebrochen.
This Time Log conflicts with,This Time Log Konflikte mit
-This account will be used to maintain value of available stock,Dieses Konto wird auf den Wert der verfügbaren Bestand zu halten
-This currency will get fetched in Purchase transactions of this supplier,Diese Währung wird in Kauf Transaktionen dieser Lieferanten bekommen geholt
-This currency will get fetched in Sales transactions of this customer,Diese Währung wird in Sales Transaktionen dieser Kunden erhalten geholt
-"This feature is for merging duplicate warehouses. It will replace all the links of this warehouse by ""Merge Into"" warehouse. After merging you can delete this warehouse, as stock level for this warehouse will be zero.","Diese Funktion ist für das Zusammenführen von doppelten Lagern. Es werden alle Links dieses Lager durch warehouse "Into Merge" zu ersetzen. Nach dem Zusammenführen löschen Sie dieses Warehouse, da Lagerbestände für dieses Lager wird gleich Null sein."
-This feature is only applicable to self hosted instances,Diese Funktion ist nur für selbst gehostete Instanzen
-This field will appear only if the fieldname defined here has value OR the rules are true (examples): <br>myfieldeval:doc.myfield=='My Value'<br>eval:doc.age>18,"Dieses Feld wird nur angezeigt, wenn der Feldname hier definierten Wert hat oder die Regeln wahr sind (Beispiele): <br> myfieldeval: doc.myfield == 'My Value' <br> eval: doc.age> 18"
-This goes above the slideshow.,Dies geht über die Diashow.
This is PERMANENT action and you cannot undo. Continue?,Dies ist PERMANENT Aktion und können nicht rückgängig gemacht werden. Weiter?
-This is an auto generated Material Request.,Dies ist eine automatische generierte Werkstoff anfordern.
+This is a root account and cannot be edited.,Dies ist ein Root-Account und können nicht bearbeitet werden.
+This is a root customer group and cannot be edited.,Dies ist eine Wurzel Kundengruppe und können nicht editiert werden .
+This is a root item group and cannot be edited.,Dies ist ein Stammelement -Gruppe und können nicht editiert werden .
+This is a root sales person and cannot be edited.,Dies ist ein Root- Verkäufer und können nicht editiert werden .
+This is a root territory and cannot be edited.,Dies ist ein Root- Gebiet und können nicht bearbeitet werden.
This is permanent action and you cannot undo. Continue?,Dies ist ständige Aktion und können nicht rückgängig gemacht werden. Weiter?
This is the number of the last created transaction with this prefix,Dies ist die Nummer des zuletzt erzeugte Transaktion mit diesem Präfix
-This message goes away after you create your first customer.,"Diese Meldung geht weg, nachdem Sie Ihre ersten Kunden zu schaffen."
This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,"Dieses Tool hilft Ihnen zu aktualisieren oder zu beheben die Menge und die Bewertung der Aktie im System. Es wird normalerweise verwendet, um das System abzugleichen und was tatsächlich existiert in Ihrem Lager."
This will be used for setting rule in HR module,Dies wird für die Einstellung der Regel im HR-Modul verwendet werden
Thread HTML,Themen HTML
Thursday,Donnerstag
-Time,Zeit
Time Log,Log Zeit
Time Log Batch,Zeit Log Batch
Time Log Batch Detail,Zeit Log Batch Detailansicht
Time Log Batch Details,Zeit Log Chargendetails
Time Log Batch status must be 'Submitted',Zeit Log Batch-Status muss "vorgelegt" werden
-Time Log Status must be Submitted.,Zeit Log-Status vorzulegen.
Time Log for tasks.,Log Zeit für Aufgaben.
-Time Log is not billable,Log Zeit ist nicht abrechenbar
Time Log must have status 'Submitted',Log Zeit muss Status 'Änderung'
Time Zone,Zeitzone
Time Zones,Time Zones
@@ -2940,50 +2765,40 @@
Time at which items were delivered from warehouse,"Zeit, mit dem Gegenstände wurden aus dem Lager geliefert"
Time at which materials were received,"Zeitpunkt, an dem Materialien wurden erhalten"
Title,Titel
-Title / headline of your page,Titel / Überschrift Ihrer Seite
-Title Case,Titel Case
-Title Prefix,Title Prefix
To,Auf
To Currency,Um Währung
To Date,To Date
+To Date is mandatory,To Date ist obligatorisch
+To Date should be same as From Date for Half Day leave,Bis Datum sollten gleiche wie von Datum für Halbtagesurlaubsein
To Discuss,Zu diskutieren
-To Do,To Do
To Do List,To Do List
-To PR Date,Um PR Datum
To Package No.,Um Nr. Paket
-To Reply,Um Antworten
+To Pay,To Pay
+To Produce,Um Produzieren
To Time,Um Zeit
To Value,To Value
To Warehouse,Um Warehouse
-"To add a tag, open the document and click on ""Add Tag"" on the sidebar","Um einen Tag hinzuzufügen, öffnen Sie das Dokument und klicken Sie auf ""Add Tag"" in der Seitenleiste"
+"To add child nodes, explore tree and click on the node under which you want to add more nodes.","Um geordneten Knoten hinzufügen , erkunden Baum und klicken Sie auf den Knoten , unter dem Sie mehrere Knoten hinzufügen möchten."
"To assign this issue, use the ""Assign"" button in the sidebar.","Um dieses Problem zu zuzuweisen, verwenden Sie die Schaltfläche ""Zuordnen"" in der Seitenleiste."
"To automatically create Support Tickets from your incoming mail, set your POP3 settings here. You must ideally create a separate email id for the erp system so that all emails will be synced into the system from that mail id. If you are not sure, please contact your EMail Provider.","Um automatisch Support Tickets von Ihrem Posteingang, stellen Sie Ihren POP3-Einstellungen hier. Sie müssen im Idealfall eine separate E-Mail-ID für das ERP-System, so dass alle E-Mails in das System von diesem Mail-ID synchronisiert werden. Wenn Sie nicht sicher sind, wenden Sie sich bitte EMail Provider."
+To create a Bank Account:,Um ein Bankkonto zu erstellen :
+To create a Tax Account:,Um ein Steuerkonto zu erstellen :
"To create an Account Head under a different company, select the company and save customer.","Um ein Konto Kopf unter einem anderen Unternehmen zu erstellen, wählen das Unternehmen und sparen Kunden."
+To date cannot be before from date,Bis heute kann nicht vor von aktuell sein
To enable <b>Point of Sale</b> features,Zum <b> Point of Sale </ b> Funktionen ermöglichen
-To enable more currencies go to Setup > Currency,Um weitere Währungen ermöglichen weiter zu> Währung einrichten
-"To fetch items again, click on 'Get Items' button \ or update the Quantity manually.","Um Elemente wieder zu holen, auf 'Get Items' Taste \ oder aktualisieren Sie die Menge manuell auf."
-"To format columns, give column labels in the query.","Um Spalten zu formatieren, geben Spaltenbeschriftungen in der Abfrage."
-"To further restrict permissions based on certain values in a document, use the 'Condition' settings.","Um weiter einschränken Berechtigungen für bestimmte Werte in einem Dokument basiert, verwenden Sie die 'Bedingung' Einstellungen."
+To enable <b>Point of Sale</b> view,Um <b> Point of Sale </ b> Ansicht aktivieren
To get Item Group in details table,Zu Artikelnummer Gruppe im Detail Tisch zu bekommen
-To manage multiple series please go to Setup > Manage Series,Um mehrere Reihen zu verwalten gehen Sie bitte auf Setup> Verwalten Series
-To restrict a User of a particular Role to documents that are explicitly assigned to them,"Um einen Benutzer einer bestimmten Rolle zu Dokumenten, die ihnen ausdrücklich zugeordnet beschränken"
-To restrict a User of a particular Role to documents that are only self-created.,"Um einen Benutzer einer bestimmten Rolle zu Dokumenten, die nur selbst erstellte sind zu beschränken."
-"To set reorder level, item must be Purchase Item","Um Meldebestand, muss Einzelteil Kaufsache sein"
-"To set user roles, just go to <a href='#List/Profile'>Setup > Users</a> and click on the user to assign roles.","Benutzerrollen, nur um <a gehen href='#List/Profile'> Setup> Benutzer </ a> und klicken Sie auf den Benutzer Rollen zuweisen."
+"To merge, following properties must be same for both items","Um mischen können, müssen folgende Eigenschaften für beide Produkte sein"
+"To report an issue, go to ",
+"To set this Fiscal Year as Default, click on 'Set as Default'","Zu diesem Geschäftsjahr als Standard festzulegen, klicken Sie auf "" Als Standard festlegen """
To track any installation or commissioning related work after sales,Um jegliche Installation oder Inbetriebnahme verwandte Arbeiten After Sales verfolgen
-"To track brand name in the following documents<br>Delivery Note, Enuiry, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Sales BOM, Sales Order, Serial No","Um Markennamen in den folgenden Dokumenten zu verfolgen <br> Lieferschein, Enuiry, Material anfordern, Artikel, Bestellung, Kauf Voucher, Käufer Receipt, Angebot, Sales Invoice, Sales BOM, Sales Order, Serial No"
+"To track brand name in the following documents<br>
+Delivery Note, Enuiry, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Sales BOM, Sales Order, Serial No",
To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,"Um Artikel in Vertrieb und Einkauf Dokumente auf ihrem Werknummern Basis zu verfolgen. Dies wird auch verwendet, um Details zum Thema Gewährleistung des Produktes zu verfolgen."
To track items in sales and purchase documents with batch nos<br><b>Preferred Industry: Chemicals etc</b>,Um Elemente in An-und Verkauf von Dokumenten mit Batch-nos <br> <b> Preferred Industry verfolgen: Chemicals etc </ b>
To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,"Um Objekte mit Barcode verfolgen. Sie werden in der Lage sein, um Elemente in Lieferschein und Sales Invoice durch Scannen Barcode einzusteigen."
-ToDo,ToDo
Tools,Werkzeuge
Top,Spitze
-Top Bar,Top Bar
-Top Bar Background,Top Bar Hintergrund
-Top Bar Item,Top Bar Artikel
-Top Bar Items,Top Bar Artikel
-Top Bar Text,Top Bar Text
-Top Bar text and background is same color. Please change.,Top Bar Text und Hintergrund ist die gleiche Farbe. Bitte ändern.
Total,Gesamt
Total (sum of) points distribution for all goals should be 100.,Total (Summe) Punkte Verteilung für alle Ziele sollten 100 sein.
Total Advance,Insgesamt Geleistete
@@ -3004,10 +2819,10 @@
Total Invoiced Amount,Insgesamt Rechnungsbetrag
Total Leave Days,Insgesamt Leave Tage
Total Leaves Allocated,Insgesamt Leaves Allocated
+Total Manufactured Qty can not be greater than Planned qty to manufacture,Insgesamt Hergestellt Menge darf nicht größer als Planmenge herzustellen sein
Total Operating Cost,Gesamten Betriebskosten
Total Points,Total Points
Total Raw Material Cost,Insgesamt Rohstoffkosten
-Total SMS Sent,Insgesamt SMS gesendet
Total Sanctioned Amount,Insgesamt Sanctioned Betrag
Total Score (Out of 5),Gesamtpunktzahl (von 5)
Total Tax (Company Currency),Total Tax (Gesellschaft Währung)
@@ -3021,22 +2836,22 @@
Totals,Totals
Track separate Income and Expense for product verticals or divisions.,Verfolgen separaten Erträge und Aufwendungen für die Produktentwicklung Branchen oder Geschäftsbereichen.
Track this Delivery Note against any Project,Verfolgen Sie diesen Lieferschein gegen Projekt
-Track this Sales Invoice against any Project,Verfolgen Sie diesen Sales Invoice gegen Projekt
Track this Sales Order against any Project,Verfolgen Sie diesen Kundenauftrag gegen Projekt
Transaction,Transaktion
Transaction Date,Transaction Datum
+Transaction not allowed against stopped Production Order,Transaktion nicht gegen gestoppt Fertigungsauftrag erlaubt
Transfer,Übertragen
-Transition Rules,Übergangsregeln
+Transfer Material,Transfermaterial
+Transfer Raw Materials,Übertragen Rohstoffe
+Transferred Qty,Die übertragenen Menge
Transporter Info,Transporter Info
Transporter Name,Transporter Namen
Transporter lorry number,Transporter Lkw-Zahl
Trash Reason,Trash Reason
+Tree Type,Baum- Typ
Tree of item classification,Tree of Artikelzugehörigkeit
Trial Balance,Rohbilanz
Tuesday,Dienstag
-Tweet will be shared via your user account (if specified),Tweet wird via E-Mail Account geteilt werden (falls angegeben)
-Twitter Share,Twitter
-Twitter Share via,Twitter teilen
Type,Typ
Type of document to rename.,Art des Dokuments umbenennen.
Type of employment master.,Art der Beschäftigung Master.
@@ -3048,13 +2863,10 @@
UOM Conversion Details,UOM Conversion Einzelheiten
UOM Conversion Factor,UOM Umrechnungsfaktor
UOM Conversion Factor is mandatory,UOM Umrechnungsfaktor ist obligatorisch
-UOM Details,UOM Einzelheiten
UOM Name,UOM Namen
UOM Replace Utility,UOM ersetzen Dienstprogramm
-UPPER CASE,UPPER CASE
-UPPERCASE,UPPERCASE
-URL,URL
Unable to complete request: ,Kann Anforderung abzuschließen:
+Unable to load,Kann nicht geladen werden
Under AMC,Unter AMC
Under Graduate,Unter Graduate
Under Warranty,Unter Garantie
@@ -3066,21 +2878,26 @@
Unpaid,Unbezahlte
Unread Messages,Ungelesene Nachrichten
Unscheduled,Außerplanmäßig
+Unstop,aufmachen
+Unstop Material Request,Unstop -Material anfordern
+Unstop Purchase Order,Unstop Bestellung
Unsubscribed,Unsubscribed
-Upcoming Events for Today,Die nächsten Termine für heute
Update,Aktualisieren
Update Clearance Date,Aktualisieren Restposten Datum
-Update Field,Felder aktualisieren
-Update PR,Update PR
+Update Cost,Update- Kosten
+Update Finished Goods,Aktualisieren Fertigwaren
+Update Landed Cost,Aktualisieren Landed Cost
+Update Numbering Series,Aktualisieren Nummerierung Serie
Update Series,Update Series
Update Series Number,Update Series Number
Update Stock,Aktualisieren Lager
Update Stock should be checked.,Update-Lager sollte überprüft werden.
-Update Value,Aktualisieren Wert
"Update allocated amount in the above table and then click ""Allocate"" button","Aktualisieren Zuteilungsbetrag in der obigen Tabelle und klicken Sie dann auf ""Allocate""-Taste"
Update bank payment dates with journals.,Update Bank Zahlungstermine mit Zeitschriften.
-Update is in progress. This may take some time.,Update ist im Gange. Dies kann einige Zeit dauern.
+Update clearance date of Journal Entries marked as 'Bank Vouchers',"Update- Clearance Datum der Journaleinträge als ""Bank Gutscheine 'gekennzeichnet"
Updated,Aktualisiert
+Updated Birthday Reminders,Aktualisiert Geburtstagserinnerungen
+Upload,laden
Upload Attachment,Anhang hochladen
Upload Attendance,Hochladen Teilnahme
Upload Backups to Dropbox,Backups auf Dropbox hochladen
@@ -3088,31 +2905,30 @@
Upload HTML,Hochladen HTML
Upload a .csv file with two columns: the old name and the new name. Max 500 rows.,Laden Sie eine CSV-Datei mit zwei Spalten:. Den alten Namen und der neue Name. Max 500 Zeilen.
Upload a file,Hochladen einer Datei
-Upload and Import,Upload und Import
Upload attendance from a .csv file,Fotogalerie Besuch aus einer. Csv-Datei
Upload stock balance via csv.,Hochladen Bestandsliste über csv.
+Upload your letter head and logo - you can edit them later.,Laden Sie Ihr Briefkopf und Logo - Sie können sie später zu bearbeiten.
+Uploaded File Attachments,Hochgeladen Dateianhänge
Uploading...,Uploading ...
Upper Income,Obere Income
Urgent,Dringend
Use Multi-Level BOM,Verwenden Sie Multi-Level BOM
Use SSL,Verwenden Sie SSL
+Use TLS,Verwenden Sie TLS
User,Benutzer
-User Cannot Create,Benutzer kann sich nicht erstellen
-User Cannot Search,Benutzer kann sich nicht durchsuchen
User ID,Benutzer-ID
-User Image,User Image
User Name,User Name
+User Properties,Benutzereigenschaften
User Remark,Benutzer Bemerkung
User Remark will be added to Auto Remark,Benutzer Bemerkung auf Auto Bemerkung hinzugefügt werden
User Tags,Nutzertags
-User Type,User Type
User must always select,Der Benutzer muss immer wählen
-User not allowed entry in the Warehouse,Benutzer nicht erlaubt Eintrag in der Warehouse
-User not allowed to delete.,"Benutzer nicht erlaubt, zu löschen."
-UserRole,UserRole
+User settings for Point-of-sale (POS),Benutzereinstellungen für Point-of- Sale (POS)
Username,Benutzername
+Users and Permissions,Benutzer und Berechtigungen
Users who can approve a specific employee's leave applications,"Benutzer, die Arbeit eines bestimmten Urlaubs Anwendungen genehmigen können"
-Users with this role are allowed to do / modify accounting entry before frozen date,Benutzer mit dieser Rolle tun dürfen / ändern Verbuchung vor dem gefrorenen Datum
+Users with this role are allowed to create / modify accounting entry before frozen date,Benutzer mit dieser Rolle sind erlaubt zu erstellen / Verbuchung vor gefrorenen Datum ändern
+Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Benutzer mit dieser Rolle erlaubt sind auf eingefrorenen Konten setzen und / Buchungen gegen eingefrorene Konten ändern
Utilities,Dienstprogramme
Utility,Nutzen
Valid For Territories,Gültig für Territories
@@ -3125,21 +2941,22 @@
Valuation Rate,Valuation bewerten
Valuation and Total,Bewertung und insgesamt
Value,Wert
-Value missing for,Fehlender Wert für
+Value or Qty,Wert oder Menge
Vehicle Dispatch Date,Fahrzeug Versanddatum
Vehicle No,Kein Fahrzeug
-Verdana,Verdana
Verified By,Verified By
+View,anzeigen
+View Ledger,Ansicht Ledger
+View Now,Jetzt ansehen
Visit,Besuchen
Visit report for maintenance call.,Bericht über den Besuch für die Wartung Anruf.
+Voucher #,Gutschein #
Voucher Detail No,Gutschein Detailaufnahme
Voucher ID,Gutschein ID
-Voucher Import Tool,Gutschein Import Tool
Voucher No,Gutschein Nein
Voucher Type,Gutschein Type
Voucher Type and Date,Gutschein Art und Datum
WIP Warehouse required before Submit,"WIP Warehouse erforderlich, bevor abschicken"
-Waiting for Customer,Warten auf Kunden
Walk In,Walk In
Warehouse,Lager
Warehouse Contact Info,Warehouse Kontakt Info
@@ -3148,74 +2965,57 @@
Warehouse User,Warehouse Benutzer
Warehouse Users,Warehouse-Benutzer
Warehouse and Reference,Warehouse und Referenz
+Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Warehouse kann nur über Lizenz Entry / Lieferschein / Kaufbeleg geändert werden
+Warehouse cannot be changed for Serial No.,Warehouse kann nicht für Seriennummer geändert werden
Warehouse does not belong to company.,Warehouse nicht auf Unternehmen gehören.
+Warehouse is missing in Purchase Order,Warehouse ist in der Bestellung fehlen
Warehouse where you are maintaining stock of rejected items,"Warehouse, wo Sie erhalten Bestand abgelehnt Elemente werden"
Warehouse-Wise Stock Balance,Warehouse-Wise Bestandsliste
Warehouse-wise Item Reorder,Warehouse-weise Artikel Reorder
Warehouses,Gewerberäume
Warn,Warnen
-Warning,Warnung
Warning: Leave application contains following block dates,Achtung: Leave Anwendung enthält folgende Block Termine
+Warning: Material Requested Qty is less than Minimum Order Qty,Achtung : Material Gewünschte Menge weniger als Mindestbestellmengeist
Warranty / AMC Details,Garantie / AMC Einzelheiten
Warranty / AMC Status,Garantie / AMC-Status
Warranty Expiry Date,Garantie Ablaufdatum
Warranty Period (Days),Garantiezeitraum (Tage)
Warranty Period (in days),Gewährleistungsfrist (in Tagen)
-Web Content,Web Content
-Web Page,Web Page
+Warranty expiry date and maintenance status mismatched,Garantieablaufdatum und Wartungsstatus nicht übereinstimm
Website,Webseite
Website Description,Website Beschreibung
Website Item Group,Website-Elementgruppe
Website Item Groups,Website Artikelgruppen
-Website Overall Settings,Website Overall Einstellungen
-Website Script,Website Script
Website Settings,Website-Einstellungen
-Website Slideshow,Website Slideshow
-Website Slideshow Item,Website Slideshow Artikel
-Website User,Webseite User
Website Warehouse,Website Warehouse
Wednesday,Mittwoch
Weekly,Wöchentlich
Weekly Off,Wöchentliche Off
Weight UOM,Gewicht UOM
+"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Das Gewicht wird erwähnt, \ nBitte erwähnen "" Gewicht Verpackung "" zu"
Weightage,Gewichtung
Weightage (%),Gewichtung (%)
-Welcome,Willkommen
+Welcome to ERPNext. Over the next few minutes we will help you setup your ERPNext account. Try and fill in as much information as you have even if it takes a bit longer. It will save you a lot of time later. Good Luck!,"Willkommen auf ERPNext . In den nächsten Minuten werden wir Ihnen helfen, Ihre Setup ERPNext Konto. Versuchen Sie, und füllen Sie so viele Informationen wie Sie haben , auch wenn es etwas länger dauert . Es wird Ihnen eine Menge Zeit später. Viel Glück!"
+What does it do?,Was macht sie?
"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Wenn eine der überprüften Transaktionen werden ""Eingereicht"", ein E-Mail-pop-up automatisch geöffnet, um eine E-Mail mit dem zugehörigen ""Kontakt"" in dieser Transaktion zu senden, mit der Transaktion als Anhang. Der Benutzer kann oder nicht-Mail senden."
-"When you <b>Amend</b> a document after cancel and save it, it will get a new number that is a version of the old number.","Wenn Sie <b> Amend </ b> ein Dokument nach abbrechen und speichern Sie es, es wird eine neue Nummer, die eine Version der alten Nummer erhalten."
+"When submitted, the system creates difference entries ",
Where items are stored.,Wo Elemente gespeichert werden.
Where manufacturing operations are carried out.,Wo Herstellungsvorgänge werden durchgeführt.
Widowed,Verwitwet
-Width,Breite
Will be calculated automatically when you enter the details,"Wird automatisch berechnet, wenn Sie die Daten eingeben"
-Will be fetched from Customer,Wird vom Kunden abgeholt werden
Will be updated after Sales Invoice is Submitted.,Wird aktualisiert After-Sales-Rechnung vorgelegt werden.
Will be updated when batched.,"Wird aktualisiert, wenn dosiert werden."
Will be updated when billed.,"Wird aktualisiert, wenn in Rechnung gestellt."
-Will be used in url (usually first name).,Wird in url (in der Regel zuerst Name) verwendet werden.
With Operations,Mit Operations
+With period closing entry,Mit Periodenverschiebung Eintrag
Work Details,Werk Details
Work Done,Arbeit
Work In Progress,Work In Progress
Work-in-Progress Warehouse,Work-in-Progress Warehouse
-Workflow,Workflow
-Workflow Action,Workflow-Aktion
-Workflow Action Master,Workflow-Aktion Meister
-Workflow Action Name,Workflow Aktion Name
-Workflow Document State,Workflow Document Staat
-Workflow Document States,Workflow Document Staaten
-Workflow Name,Workflow-Name
-Workflow State,Workflow-Status
-Workflow State Field,Workflow State Field
-Workflow State Name,Workflow State Name
-Workflow Transition,Workflow Transition
-Workflow Transitions,Workflow Transitions
-Workflow state represents the current state of a document.,Workflow-Status repräsentiert den aktuellen Status eines Dokuments.
Workflow will start after saving.,Workflow wird nach dem Speichern beginnen.
Working,Arbeit
Workstation,Arbeitsplatz
Workstation Name,Name der Arbeitsstation
-Write,Schreiben
Write Off Account,Write Off Konto
Write Off Amount,Write Off Betrag
Write Off Amount <=,Write Off Betrag <=
@@ -3223,240 +3023,96 @@
Write Off Cost Center,Write Off Kostenstellenrechnung
Write Off Outstanding Amount,Write Off ausstehenden Betrag
Write Off Voucher,Write Off Gutschein
-Write a Python file in the same folder where this is saved and return column and result.,"Schreiben Sie eine Python-Datei im gleichen Ordner, in dem diese gespeichert oder Rückgabebelehrung Spalte und Ergebnis."
-Write a SELECT query. Note result is not paged (all data is sent in one go).,Schreiben Sie eine SELECT-Abfrage. Hinweis Ergebnis nicht ausgelagert (alle Daten in einem Rutsch gesendet).
-Write sitemap.xml,Schreiben sitemap.xml
-Write titles and introductions to your blog.,Schreiben Sie Titel und Einführungen in Ihrem Blog.
-Writers Introduction,Writers Einführung
Wrong Template: Unable to find head row.,Falsche Vorlage: Kann Kopfzeile zu finden.
Year,Jahr
Year Closed,Jahr geschlossen
+Year End Date,Year End Datum
Year Name,Jahr Name
Year Start Date,Jahr Startdatum
+Year Start Date and Year End Date are already set in Fiscal Year: ,
+Year Start Date and Year End Date are not within Fiscal Year.,Jahr Startdatum und Enddatum Jahr nicht innerhalb des Geschäftsjahres .
+Year Start Date should not be greater than Year End Date,Jahr Startdatum sollte nicht größer als Year End Date
Year of Passing,Jahr der Übergabe
Yearly,Jährlich
Yes,Ja
Yesterday,Gestern
+You are not allowed to reply to this ticket.,"Sie sind nicht berechtigt, auf diesem Ticket antworten ."
You are not authorized to do/modify back dated entries before ,Sie sind nicht berechtigt / nicht ändern zurück datierte Einträge vor
+You are not authorized to set Frozen value,"Sie sind nicht berechtigt, Gefrorene Wert eingestellt"
+You are the Expense Approver for this record. Please Update the 'Status' and Save,Sie sind der Kosten Genehmiger für diesen Datensatz . Bitte aktualisiere den 'Status' und Sparen
+You are the Leave Approver for this record. Please Update the 'Status' and Save,Sie sind der Leave Genehmiger für diesen Datensatz . Bitte aktualisiere den 'Status' und Sparen
+You can Enter Row only if your Charge Type is 'On Previous Row Amount' or ' Previous Row Total',"Sie können Row Geben Sie nur, wenn Ihr Lade Typ ist 'On Zurück Reihe Betrag ""oder"" Zurück Reihe Total'"
You can enter any date manually,Sie können ein beliebiges Datum manuell eingeben
You can enter the minimum quantity of this item to be ordered.,Sie können die minimale Menge von diesem Artikel bestellt werden.
-You can not enter both Delivery Note No and Sales Invoice No. \ Please enter any one.,Sie können nicht sowohl Lieferschein Nein und Sales Invoice No \ Bitte geben Sie eine beliebige.
-You can set various 'properties' to Users to set default values and apply permission rules based on the value of these properties in various forms.,"Sie können verschiedene ""Eigenschaften"", um Benutzer auf Standardwerte gesetzt und gelten Erlaubnis Vorschriften über den Wert dieser Eigenschaften in verschiedenen Formen."
-You can start by selecting backup frequency and \ granting access for sync,Sie können durch Auswahl der Backup-Frequenz beginnen und \ Gewährung des Zugangs für die Synchronisation
-You can use <a href='#Form/Customize Form'>Customize Form</a> to set levels on fields.,Sie können <a href='#Form/Customize Form'> Formular anpassen </ a> auf ein Niveau auf den Feldern eingestellt.
+You can not change rate if BOM mentioned agianst any item,"Sie können Rate nicht ändern, wenn BOM agianst jeden Artikel erwähnt"
+You can not enter both Delivery Note No and Sales Invoice No. Please enter any one.,Sie können nicht sowohl Lieferschein Nein und Sales Invoice Nr. Bitte geben Sie eine beliebige .
+"You can start by selecting backup frequency and \
+ granting access for sync",
+You can submit this Stock Reconciliation.,Sie können diese Vektor Versöhnung vorzulegen.
+You can update either Quantity or Valuation Rate or both.,Sie können entweder Menge oder Bewertungs bewerten oder beides aktualisieren.
+You cannot Enter Row no. greater than or equal to current row no. for this Charge type,Sie können keine Zeile nicht eingeben . größer als oder gleich aktuelle Zeile nicht . für diesen Typ Lade
+You cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Sie können nicht abziehen , wenn Kategorie ist für ""Bewertungstag "" oder "" Bewertung und Total '"
+You cannot directly enter Amount and if your Charge Type is Actual enter your amount in Rate,Sie können nicht direkt in Betrag und wenn Ihr Ladetypist Actual geben Sie Ihren Betrag bewerten
+You cannot give more than ,
+You cannot select Charge Type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Sie können nicht als Ladetyp'On Zurück Reihe Betrag ""oder"" Auf Vorherige Row Total' für die erste Zeile auswählen"
+You cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for valuation. You can select only 'Total' option for previous row amount or previous row total,"Sie können Ladungstyp nicht als "" On Zurück Reihe Betrag "" oder "" Auf Vorherige Row Total ' für die Bewertung zu wählen. Sie können nur die Option ""Total"" für die vorherige Zeile Betrag oder vorherigen Zeile Gesamt wählen"
+You have entered duplicate items. Please rectify and try again.,Sie haben doppelte Elemente eingetragen. Bitte korrigieren und versuchen Sie es erneut .
You may need to update: ,Möglicherweise müssen Sie aktualisieren:
+You must ,
Your Customer's TAX registration numbers (if applicable) or any general information,Ihre Kunden TAX Kennzeichen (falls zutreffend) oder allgemeine Informationen
+Your Customers,Ihre Kunden
+Your ERPNext subscription will,Ihr Abonnement wird ERPNext
+Your Products or Services,Ihre Produkte oder Dienstleistungen
+Your Suppliers,Ihre Lieferanten
"Your download is being built, this may take a few moments...","Ihr Download gebaut wird, kann dies einige Zeit dauern ..."
-Your letter head content,Ihr Briefkopf Inhalt
Your sales person who will contact the customer in future,"Ihr Umsatz Person, die die Kunden in Zukunft in Verbindung setzen"
-Your sales person who will contact the lead in future,"Ihr Umsatz Person, die die Führung in der Zukunft an"
Your sales person will get a reminder on this date to contact the customer,"Ihre Vertriebsmitarbeiter erhalten eine Erinnerung an diesem Tag, um den Kunden an"
-Your sales person will get a reminder on this date to contact the lead,Ihre Vertriebsmitarbeiter erhalten eine Erinnerung an diesem Tag an die Spitze setzen
+Your setup is complete. Refreshing...,Ihre Einrichtung ist abgeschlossen. Erfrischend ...
Your support email id - must be a valid email - this is where your emails will come!,"Ihre Unterstützung email id - muss eine gültige E-Mail-sein - das ist, wo Ihre E-Mails wird kommen!"
-[Error],[Error]
-[Label]:[Field Type]/[Options]:[Width],[Label]: [Feldtyp] / [Optionen]: [Breite]
-add your own CSS (careful!),fügen Sie Ihre eigenen CSS (Vorsicht!)
-adjust,einstellen
-align-center,align-center
-align-justify,Ausrichtung zu rechtfertigen
-align-left,-links ausrichten
-align-right,align-right
-also be included in Item's rate,auch in Artikelbeschreibung inbegriffen sein
+already available in Price List,bereits in Preisliste verfügbar
and,und
-arrow-down,arrow-down
-arrow-left,Pfeil-links
-arrow-right,arrow-right
-arrow-up,arrow-up
+"and ""Is Sales Item"" is ""Yes"" and there is no other Sales BOM","und "" Ist Verkaufsartikel "" ist "" Ja"", und es gibt keinen anderen Vertriebsstückliste"
+"and create a new Account Ledger (by clicking on Add Child) of type ""Bank or Cash""","und ein neues Konto Ledger (durch Klicken auf Child ) vom Typ ""Bank oder Cash"""
+"and create a new Account Ledger (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.","und ein neues Konto Ledger (durch Klicken auf Child ) des Typs "" Tax"" und nicht den Steuersatz zu erwähnen."
+and fiscal year: ,
+are not allowed for,werden nicht berücksichtigt
+are not allowed for ,
assigned by,zugewiesen durch
-asterisk,Sternchen
-backward,rückwärts
-ban-circle,ban-Kreis
-barcode,Strichcode
-bell,Glocke
-bold,fett
-book,Buch
-bookmark,Lesezeichen
-briefcase,Aktentasche
-bullhorn,Megafon
-calendar,Kalender
-camera,Kamera
-cancel,kündigen
-cannot be 0,nicht 0 sein kann
-cannot be empty,darf nicht leer sein
+but entries can be made against Ledger,Einträge können aber gegen Ledger gemacht werden
+but is pending to be manufactured.,aber anhängigen hergestellt werden .
cannot be greater than 100,kann nicht größer sein als 100
-cannot be included in Item's rate,kann nicht in der Artikelbeschreibung enthalten sein
-"cannot have a URL, because it has child item(s)","kann nicht eine URL, weil es Kind item (s) hat"
-cannot start with,kann nicht mit starten
-certificate,Zertifikat
-check,überprüfen
-chevron-down,Chevron-down
-chevron-left,Chevron-links
-chevron-right,Chevron-Rechts
-chevron-up,Chevron-up
-circle-arrow-down,circle-arrow-down
-circle-arrow-left,Kreis-Pfeil-links
-circle-arrow-right,circle-arrow-right
-circle-arrow-up,circle-arrow-up
-cog,Zahn
comment,Kommentar
-create a Custom Field of type Link (Profile) and then use the 'Condition' settings to map that field to the Permission rule.,"erstellen ein benutzerdefiniertes Feld vom Typ Link (Profile) und dann die 'Bedingung' Einstellungen, um das Feld der Erlaubnis der Regel abzubilden."
dd-mm-yyyy,dd-mm-yyyy
dd/mm/yyyy,dd / mm / yyyy
deactivate,deaktivieren
+discount on Item Code,Rabatt auf die Artikel-Code
does not belong to BOM: ,nicht auf BOM gehören:
-does not exist,nicht vorhanden
does not have role 'Leave Approver',keine Rolle 'Leave Approver'
-does not match,stimmt nicht
-download,Download
-download-alt,Download-alt
"e.g. Bank, Cash, Credit Card","z.B. Bank, Bargeld, Kreditkarte"
"e.g. Kg, Unit, Nos, m","z.B. Kg, Einheit, Nos, m"
-edit,bearbeiten
eg. Cheque Number,zB. Scheck-Nummer
-eject,auswerfen
-english,Englisch
-envelope,Umschlag
-español,español
example: Next Day Shipping,Beispiel: Versand am nächsten Tag
-example: http://help.erpnext.com,Beispiel: http://help.erpnext.com
-exclamation-sign,Ausrufezeichen-Zeichen
-eye-close,Auge-Schließ
-eye-open,Augen öffnen
-facetime-video,FaceTime-Video
-fast-backward,Schnellrücklauf
-fast-forward,Vorlauf
-file,Datei
-film,Film
-filter,filtern
-fire,Feuer
-flag,Flagge
-folder-close,Ordner-close
-folder-open,Ordner öffnen
-font,Schriftart
-forward,vorwärts
-français,français
-fullscreen,Vollbild
-gift,Geschenk
-glass,Glas
-globe,Globus
-hand-down,Hand-down
-hand-left,Hand-links
-hand-right,Hand-Rechts
-hand-up,Hand-up
-has been entered atleast twice,wurde atleast zweimal eingegeben
+has been made after posting date,hat nach Buchungsdatum vorgenommen wurden
have a common territory,haben ein gemeinsames Territorium
-have the same Barcode,haben den gleichen Barcode
-hdd,hdd
-headphones,Kopfhörer
-heart,Herz
-home,Zuhause
-icon,icon
-in,in
-inbox,Posteingang
-indent-left,Gedankenstrich links
-indent-right,indent-Recht
-info-sign,info-Zeichen
-is a cancelled Item,ist ein gestempeltes
-is linked in,in Zusammenhang
-is not a Stock Item,ist kein Lagerartikel
+in the same UOM.,in der gleichen Verpackung .
is not allowed.,ist nicht erlaubt.
-italic,kursiv
-leaf,Blatt
lft,lft
-list,Liste
-list-alt,list-alt
-lock,sperren
-lowercase,Kleinbuchstaben
-magnet,Magnet
-map-marker,map-Marker
-minus,minus
-minus-sign,Minus-Zeichen
mm-dd-yyyy,mm-dd-yyyy
mm/dd/yyyy,mm / dd / yyyy
-move,bewegen
-music,Musik
+must be a Liability account,muss eine Haftpflichtkonto sein
must be one of,muss einer sein
-nederlands,nederlands
-not a purchase item,kein Kaufsache
-not a sales item,kein Verkaufsartikel
not a service item.,nicht ein service Produkt.
not a sub-contracted item.,keine Unteraufträge vergeben werden Artikel.
-not in,nicht in
not within Fiscal Year,nicht innerhalb Geschäftsjahr
-of,von
-of type Link,vom Typ Link-
-off,ab
-ok,Ok
-ok-circle,ok-Kreis
-ok-sign,ok-Zeichen
old_parent,old_parent
or,oder
-pause,Pause
-pencil,Bleistift
-picture,Bild
-plane,Flugzeug
-play,spielen
-play-circle,play-Kreis
-plus,plus
-plus-sign,Plus-Zeichen
-português,português
-português brasileiro,português Brasileiro
-print,drucken
-qrcode,qrcode
-question-sign,Frage-Zeichen
-random,zufällig
-reached its end of life on,erreichte Ende des Lebens auf
-refresh,erfrischen
-remove,entfernen
-remove-circle,remove-Kreis
-remove-sign,remove-Anmeldung
-repeat,wiederholen
-resize-full,resize-full
-resize-horizontal,resize-horizontal
-resize-small,resize-small
-resize-vertical,resize-vertikalen
-retweet,retweet
rgt,rgt
-road,Straße
-screenshot,Screenshot
-search,Suche
-share,Aktie
-share-alt,Aktien-alt
-shopping-cart,Shopping-cart
should be 100%,sollte 100% sein
-signal,signalisieren
-star,Stern
-star-empty,star-empty
-step-backward,Schritt-Rückwärts
-step-forward,Schritt vorwärts
-stop,stoppen
-tag,Anhänger
-tags,Tags
-"target = ""_blank""","target = ""_blank"""
-tasks,Aufgaben
-text-height,text-Höhe
-text-width,Text-width
-th,th
-th-large,th-groß
-th-list,th-Liste
-thumbs-down,Daumen runter
-thumbs-up,Daumen hoch
-time,Zeit
-tint,Tönung
+they are created automatically from the Customer and Supplier master,sie werden automatisch aus der Kunden-und Lieferantenstamm angelegt
to,auf
"to be included in Item's rate, it is required that: ","in Artikelbeschreibung inbegriffen werden, ist es erforderlich, dass:"
-trash,Müll
-upload,laden
-user,Benutzer
-user_image_show,user_image_show
-values and dates,Werte und Daten
-volume-down,Volumen-down
-volume-off,Volumen-off
-volume-up,Volumen-up
-warning-sign,Warn-Schild
+to set the given stock and valuation on this date.,", um die gegebene Lager -und Bewertungs an diesem Tag eingestellt ."
+usually as per physical inventory.,in der Regel als pro Inventur .
website page link,Website-Link
which is greater than sales order qty ,die größer ist als der Umsatz Bestellmenge
-wrench,Schraubenschlüssel
yyyy-mm-dd,yyyy-mm-dd
-zoom-in,zoom-in
-zoom-out,zoom-out
diff --git a/translations/el.csv b/erpnext/translations/el.csv
similarity index 100%
rename from translations/el.csv
rename to erpnext/translations/el.csv
diff --git a/translations/es.csv b/erpnext/translations/es.csv
similarity index 100%
rename from translations/es.csv
rename to erpnext/translations/es.csv
diff --git a/translations/fr.csv b/erpnext/translations/fr.csv
similarity index 100%
rename from translations/fr.csv
rename to erpnext/translations/fr.csv
diff --git a/translations/hi.csv b/erpnext/translations/hi.csv
similarity index 100%
rename from translations/hi.csv
rename to erpnext/translations/hi.csv
diff --git a/translations/hr.csv b/erpnext/translations/hr.csv
similarity index 100%
rename from translations/hr.csv
rename to erpnext/translations/hr.csv
diff --git a/translations/it.csv b/erpnext/translations/it.csv
similarity index 100%
rename from translations/it.csv
rename to erpnext/translations/it.csv
Binary files differ
diff --git a/translations/nl.csv b/erpnext/translations/nl.csv
similarity index 100%
rename from translations/nl.csv
rename to erpnext/translations/nl.csv
diff --git a/translations/pt-BR.csv b/erpnext/translations/pt-BR.csv
similarity index 100%
rename from translations/pt-BR.csv
rename to erpnext/translations/pt-BR.csv
diff --git a/translations/pt.csv b/erpnext/translations/pt.csv
similarity index 100%
rename from translations/pt.csv
rename to erpnext/translations/pt.csv
diff --git a/translations/sr.csv b/erpnext/translations/sr.csv
similarity index 100%
rename from translations/sr.csv
rename to erpnext/translations/sr.csv
diff --git a/translations/ta.csv b/erpnext/translations/ta.csv
similarity index 100%
rename from translations/ta.csv
rename to erpnext/translations/ta.csv
diff --git a/translations/th.csv b/erpnext/translations/th.csv
similarity index 100%
rename from translations/th.csv
rename to erpnext/translations/th.csv
diff --git a/translations/zh-cn.csv b/erpnext/translations/zh-cn.csv
similarity index 100%
rename from translations/zh-cn.csv
rename to erpnext/translations/zh-cn.csv
diff --git a/translations/zh-tw.csv b/erpnext/translations/zh-tw.csv
similarity index 100%
rename from translations/zh-tw.csv
rename to erpnext/translations/zh-tw.csv
diff --git a/utilities/README.md b/erpnext/utilities/README.md
similarity index 100%
rename from utilities/README.md
rename to erpnext/utilities/README.md
diff --git a/utilities/__init__.py b/erpnext/utilities/__init__.py
similarity index 100%
rename from utilities/__init__.py
rename to erpnext/utilities/__init__.py
diff --git a/utilities/cleanup_data.py b/erpnext/utilities/cleanup_data.py
similarity index 100%
rename from utilities/cleanup_data.py
rename to erpnext/utilities/cleanup_data.py
diff --git a/utilities/demo/__init__.py b/erpnext/utilities/demo/__init__.py
similarity index 100%
rename from utilities/demo/__init__.py
rename to erpnext/utilities/demo/__init__.py
diff --git a/utilities/demo/demo-login.css b/erpnext/utilities/demo/demo-login.css
similarity index 100%
rename from utilities/demo/demo-login.css
rename to erpnext/utilities/demo/demo-login.css
diff --git a/utilities/demo/demo-login.html b/erpnext/utilities/demo/demo-login.html
similarity index 100%
rename from utilities/demo/demo-login.html
rename to erpnext/utilities/demo/demo-login.html
diff --git a/utilities/demo/demo-login.js b/erpnext/utilities/demo/demo-login.js
similarity index 100%
rename from utilities/demo/demo-login.js
rename to erpnext/utilities/demo/demo-login.js
diff --git a/utilities/demo/demo_control_panel.py b/erpnext/utilities/demo/demo_control_panel.py
similarity index 90%
rename from utilities/demo/demo_control_panel.py
rename to erpnext/utilities/demo/demo_control_panel.py
index 694f7d1..cb80373 100644
--- a/utilities/demo/demo_control_panel.py
+++ b/erpnext/utilities/demo/demo_control_panel.py
@@ -9,7 +9,7 @@
if webnotes.form_dict.lead_email and validate_email_add(webnotes.form_dict.lead_email):
import requests
response = requests.post(conf.demo_notify_url, data={
- "cmd":"portal.utils.send_message",
+ "cmd":"erpnext.templates.utils.send_message",
"subject":"Logged into Demo",
"sender": webnotes.form_dict.lead_email,
"message": "via demo.erpnext.com"
diff --git a/utilities/demo/demo_docs/Address.csv b/erpnext/utilities/demo/demo_docs/Address.csv
similarity index 100%
rename from utilities/demo/demo_docs/Address.csv
rename to erpnext/utilities/demo/demo_docs/Address.csv
diff --git a/utilities/demo/demo_docs/BOM.csv b/erpnext/utilities/demo/demo_docs/BOM.csv
similarity index 100%
rename from utilities/demo/demo_docs/BOM.csv
rename to erpnext/utilities/demo/demo_docs/BOM.csv
diff --git a/utilities/demo/demo_docs/Contact.csv b/erpnext/utilities/demo/demo_docs/Contact.csv
similarity index 100%
rename from utilities/demo/demo_docs/Contact.csv
rename to erpnext/utilities/demo/demo_docs/Contact.csv
diff --git a/utilities/demo/demo_docs/Customer.csv b/erpnext/utilities/demo/demo_docs/Customer.csv
similarity index 100%
rename from utilities/demo/demo_docs/Customer.csv
rename to erpnext/utilities/demo/demo_docs/Customer.csv
diff --git a/utilities/demo/demo_docs/Employee.csv b/erpnext/utilities/demo/demo_docs/Employee.csv
similarity index 100%
rename from utilities/demo/demo_docs/Employee.csv
rename to erpnext/utilities/demo/demo_docs/Employee.csv
diff --git a/utilities/demo/demo_docs/Fiscal_Year.csv b/erpnext/utilities/demo/demo_docs/Fiscal_Year.csv
similarity index 100%
rename from utilities/demo/demo_docs/Fiscal_Year.csv
rename to erpnext/utilities/demo/demo_docs/Fiscal_Year.csv
diff --git a/utilities/demo/demo_docs/Item.csv b/erpnext/utilities/demo/demo_docs/Item.csv
similarity index 100%
rename from utilities/demo/demo_docs/Item.csv
rename to erpnext/utilities/demo/demo_docs/Item.csv
diff --git a/utilities/demo/demo_docs/Item_Price.csv b/erpnext/utilities/demo/demo_docs/Item_Price.csv
similarity index 100%
rename from utilities/demo/demo_docs/Item_Price.csv
rename to erpnext/utilities/demo/demo_docs/Item_Price.csv
diff --git a/utilities/demo/demo_docs/Lead.csv b/erpnext/utilities/demo/demo_docs/Lead.csv
similarity index 100%
rename from utilities/demo/demo_docs/Lead.csv
rename to erpnext/utilities/demo/demo_docs/Lead.csv
diff --git a/utilities/demo/demo_docs/Profile.csv b/erpnext/utilities/demo/demo_docs/Profile.csv
similarity index 100%
rename from utilities/demo/demo_docs/Profile.csv
rename to erpnext/utilities/demo/demo_docs/Profile.csv
diff --git a/utilities/demo/demo_docs/Salary_Structure.csv b/erpnext/utilities/demo/demo_docs/Salary_Structure.csv
similarity index 100%
rename from utilities/demo/demo_docs/Salary_Structure.csv
rename to erpnext/utilities/demo/demo_docs/Salary_Structure.csv
diff --git a/utilities/demo/demo_docs/Stock Reconcilation Template.csv b/erpnext/utilities/demo/demo_docs/Stock Reconcilation Template.csv
similarity index 100%
rename from utilities/demo/demo_docs/Stock Reconcilation Template.csv
rename to erpnext/utilities/demo/demo_docs/Stock Reconcilation Template.csv
diff --git a/utilities/demo/demo_docs/Supplier.csv b/erpnext/utilities/demo/demo_docs/Supplier.csv
similarity index 100%
rename from utilities/demo/demo_docs/Supplier.csv
rename to erpnext/utilities/demo/demo_docs/Supplier.csv
diff --git a/utilities/demo/demo_docs/bearing-block.png b/erpnext/utilities/demo/demo_docs/bearing-block.png
similarity index 100%
rename from utilities/demo/demo_docs/bearing-block.png
rename to erpnext/utilities/demo/demo_docs/bearing-block.png
Binary files differ
diff --git a/utilities/demo/demo_docs/wind-turbine.png b/erpnext/utilities/demo/demo_docs/wind-turbine.png
similarity index 100%
rename from utilities/demo/demo_docs/wind-turbine.png
rename to erpnext/utilities/demo/demo_docs/wind-turbine.png
Binary files differ
diff --git a/utilities/demo/make_demo.py b/erpnext/utilities/demo/make_demo.py
similarity index 88%
rename from utilities/demo/make_demo.py
rename to erpnext/utilities/demo/make_demo.py
index b98fd7a..f469139 100644
--- a/utilities/demo/make_demo.py
+++ b/erpnext/utilities/demo/make_demo.py
@@ -9,7 +9,7 @@
import json
webnotes.session = webnotes._dict({"user":"Administrator"})
-from core.page.data_import_tool.data_import_tool import upload
+from webnotes.core.page.data_import_tool.data_import_tool import upload
# fix price list
# fix fiscal year
@@ -100,7 +100,7 @@
def run_accounts(current_date):
if can_make("Sales Invoice"):
- from selling.doctype.sales_order.sales_order import make_sales_invoice
+ from erpnext.selling.doctype.sales_order.sales_order import make_sales_invoice
report = "Ordered Items to be Billed"
for so in list(set([r[0] for r in query_report.run(report)["result"] if r[0]!="Total"]))[:how_many("Sales Invoice")]:
si = webnotes.bean(make_sales_invoice(so))
@@ -110,7 +110,7 @@
webnotes.conn.commit()
if can_make("Purchase Invoice"):
- from stock.doctype.purchase_receipt.purchase_receipt import make_purchase_invoice
+ from erpnext.stock.doctype.purchase_receipt.purchase_receipt import make_purchase_invoice
report = "Received Items to be Billed"
for pr in list(set([r[0] for r in query_report.run(report)["result"] if r[0]!="Total"]))[:how_many("Purchase Invoice")]:
pi = webnotes.bean(make_purchase_invoice(pr))
@@ -121,7 +121,7 @@
webnotes.conn.commit()
if can_make("Payment Received"):
- from accounts.doctype.journal_voucher.journal_voucher import get_payment_entry_from_sales_invoice
+ from erpnext.accounts.doctype.journal_voucher.journal_voucher import get_payment_entry_from_sales_invoice
report = "Accounts Receivable"
for si in list(set([r[4] for r in query_report.run(report, {"report_date": current_date })["result"] if r[3]=="Sales Invoice"]))[:how_many("Payment Received")]:
jv = webnotes.bean(get_payment_entry_from_sales_invoice(si))
@@ -133,7 +133,7 @@
webnotes.conn.commit()
if can_make("Payment Made"):
- from accounts.doctype.journal_voucher.journal_voucher import get_payment_entry_from_purchase_invoice
+ from erpnext.accounts.doctype.journal_voucher.journal_voucher import get_payment_entry_from_purchase_invoice
report = "Accounts Payable"
for pi in list(set([r[4] for r in query_report.run(report, {"report_date": current_date })["result"] if r[3]=="Purchase Invoice"]))[:how_many("Payment Made")]:
jv = webnotes.bean(get_payment_entry_from_purchase_invoice(pi))
@@ -147,8 +147,8 @@
def run_stock(current_date):
# make purchase requests
if can_make("Purchase Receipt"):
- from buying.doctype.purchase_order.purchase_order import make_purchase_receipt
- from stock.stock_ledger import NegativeStockError
+ from erpnext.buying.doctype.purchase_order.purchase_order import make_purchase_receipt
+ from erpnext.stock.stock_ledger import NegativeStockError
report = "Purchase Order Items To Be Received"
for po in list(set([r[0] for r in query_report.run(report)["result"] if r[0]!="Total"]))[:how_many("Purchase Receipt")]:
pr = webnotes.bean(make_purchase_receipt(po))
@@ -162,9 +162,9 @@
# make delivery notes (if possible)
if can_make("Delivery Note"):
- from selling.doctype.sales_order.sales_order import make_delivery_note
- from stock.stock_ledger import NegativeStockError
- from stock.doctype.serial_no.serial_no import SerialNoRequiredError, SerialNoQtyError
+ from erpnext.selling.doctype.sales_order.sales_order import make_delivery_note
+ from erpnext.stock.stock_ledger import NegativeStockError
+ from erpnext.stock.doctype.serial_no.serial_no import SerialNoRequiredError, SerialNoQtyError
report = "Ordered Items To Be Delivered"
for so in list(set([r[0] for r in query_report.run(report)["result"] if r[0]!="Total"]))[:how_many("Delivery Note")]:
dn = webnotes.bean(make_delivery_note(so))
@@ -205,7 +205,7 @@
# make supplier quotations
if can_make("Supplier Quotation"):
- from stock.doctype.material_request.material_request import make_supplier_quotation
+ from erpnext.stock.doctype.material_request.material_request import make_supplier_quotation
report = "Material Requests for which Supplier Quotations are not created"
for row in query_report.run(report)["result"][:how_many("Supplier Quotation")]:
if row[0] != "Total":
@@ -218,7 +218,7 @@
# make purchase orders
if can_make("Purchase Order"):
- from stock.doctype.material_request.material_request import make_purchase_order
+ from erpnext.stock.doctype.material_request.material_request import make_purchase_order
report = "Requested Items To Be Ordered"
for row in query_report.run(report)["result"][:how_many("Purchase Order")]:
if row[0] != "Total":
@@ -230,8 +230,8 @@
webnotes.conn.commit()
def run_manufacturing(current_date):
- from stock.stock_ledger import NegativeStockError
- from stock.doctype.stock_entry.stock_entry import IncorrectValuationRateError, DuplicateEntryForProductionOrderError
+ from erpnext.stock.stock_ledger import NegativeStockError
+ from erpnext.stock.doctype.stock_entry.stock_entry import IncorrectValuationRateError, DuplicateEntryForProductionOrderError
ppt = webnotes.bean("Production Planning Tool", "Production Planning Tool")
ppt.doc.company = company
@@ -276,9 +276,9 @@
except DuplicateEntryForProductionOrderError: pass
def make_stock_entry_from_pro(pro_id, purpose, current_date):
- from manufacturing.doctype.production_order.production_order import make_stock_entry
- from stock.stock_ledger import NegativeStockError
- from stock.doctype.stock_entry.stock_entry import IncorrectValuationRateError, DuplicateEntryForProductionOrderError
+ from erpnext.manufacturing.doctype.production_order.production_order import make_stock_entry
+ from erpnext.stock.stock_ledger import NegativeStockError
+ from erpnext.stock.doctype.stock_entry.stock_entry import IncorrectValuationRateError, DuplicateEntryForProductionOrderError
try:
st = webnotes.bean(make_stock_entry(pro_id, purpose))
@@ -322,7 +322,7 @@
def make_sales_order(current_date):
q = get_random("Quotation", {"status": "Submitted"})
if q:
- from selling.doctype.quotation.quotation import make_sales_order
+ from erpnext.selling.doctype.quotation.quotation import make_sales_order
so = webnotes.bean(make_sales_order(q))
so.doc.transaction_date = current_date
so.doc.delivery_date = webnotes.utils.add_days(current_date, 10)
@@ -376,7 +376,7 @@
def complete_setup():
print "Complete Setup..."
- from setup.page.setup_wizard.setup_wizard import setup_account
+ from erpnext.setup.page.setup_wizard.setup_wizard import setup_account
setup_account({
"first_name": "Test",
"last_name": "User",
diff --git a/utilities/demo/make_erpnext_demo.py b/erpnext/utilities/demo/make_erpnext_demo.py
similarity index 100%
rename from utilities/demo/make_erpnext_demo.py
rename to erpnext/utilities/demo/make_erpnext_demo.py
diff --git a/utilities/doctype/__init__.py b/erpnext/utilities/doctype/__init__.py
similarity index 100%
rename from utilities/doctype/__init__.py
rename to erpnext/utilities/doctype/__init__.py
diff --git a/utilities/doctype/address/README.md b/erpnext/utilities/doctype/address/README.md
similarity index 100%
rename from utilities/doctype/address/README.md
rename to erpnext/utilities/doctype/address/README.md
diff --git a/utilities/doctype/address/__init__.py b/erpnext/utilities/doctype/address/__init__.py
similarity index 100%
rename from utilities/doctype/address/__init__.py
rename to erpnext/utilities/doctype/address/__init__.py
diff --git a/utilities/doctype/address/address.js b/erpnext/utilities/doctype/address/address.js
similarity index 69%
rename from utilities/doctype/address/address.js
rename to erpnext/utilities/doctype/address/address.js
index aa608ba..f56a709 100644
--- a/utilities/doctype/address/address.js
+++ b/erpnext/utilities/doctype/address/address.js
@@ -1,4 +1,4 @@
// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
-wn.require('app/controllers/js/contact_address_common.js');
\ No newline at end of file
+{% include 'controllers/js/contact_address_common.js' %};
\ No newline at end of file
diff --git a/utilities/doctype/address/address.py b/erpnext/utilities/doctype/address/address.py
similarity index 100%
rename from utilities/doctype/address/address.py
rename to erpnext/utilities/doctype/address/address.py
diff --git a/utilities/doctype/address/address.txt b/erpnext/utilities/doctype/address/address.txt
similarity index 100%
rename from utilities/doctype/address/address.txt
rename to erpnext/utilities/doctype/address/address.txt
diff --git a/utilities/doctype/address/test_address.py b/erpnext/utilities/doctype/address/test_address.py
similarity index 100%
rename from utilities/doctype/address/test_address.py
rename to erpnext/utilities/doctype/address/test_address.py
diff --git a/utilities/doctype/contact/README.md b/erpnext/utilities/doctype/contact/README.md
similarity index 100%
rename from utilities/doctype/contact/README.md
rename to erpnext/utilities/doctype/contact/README.md
diff --git a/utilities/doctype/contact/__init__.py b/erpnext/utilities/doctype/contact/__init__.py
similarity index 100%
rename from utilities/doctype/contact/__init__.py
rename to erpnext/utilities/doctype/contact/__init__.py
diff --git a/utilities/doctype/contact/contact.js b/erpnext/utilities/doctype/contact/contact.js
similarity index 89%
rename from utilities/doctype/contact/contact.js
rename to erpnext/utilities/doctype/contact/contact.js
index 81d35dd..3d3e556 100644
--- a/utilities/doctype/contact/contact.js
+++ b/erpnext/utilities/doctype/contact/contact.js
@@ -1,7 +1,7 @@
// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
-wn.require('app/controllers/js/contact_address_common.js');
+{% include 'controllers/js/contact_address_common.js' %};
cur_frm.cscript.refresh = function(doc) {
cur_frm.communication_view = new wn.views.CommunicationList({
diff --git a/utilities/doctype/contact/contact.py b/erpnext/utilities/doctype/contact/contact.py
similarity index 96%
rename from utilities/doctype/contact/contact.py
rename to erpnext/utilities/doctype/contact/contact.py
index 16f9d32..301d7fd 100644
--- a/utilities/doctype/contact/contact.py
+++ b/erpnext/utilities/doctype/contact/contact.py
@@ -5,7 +5,7 @@
import webnotes
from webnotes.utils import cstr, extract_email_id
-from utilities.transaction_base import TransactionBase
+from erpnext.utilities.transaction_base import TransactionBase
class DocType(TransactionBase):
def __init__(self, doc, doclist=[]):
diff --git a/utilities/doctype/contact/contact.txt b/erpnext/utilities/doctype/contact/contact.txt
similarity index 100%
rename from utilities/doctype/contact/contact.txt
rename to erpnext/utilities/doctype/contact/contact.txt
diff --git a/utilities/doctype/contact/test_contact.py b/erpnext/utilities/doctype/contact/test_contact.py
similarity index 100%
rename from utilities/doctype/contact/test_contact.py
rename to erpnext/utilities/doctype/contact/test_contact.py
diff --git a/utilities/doctype/note/README.md b/erpnext/utilities/doctype/note/README.md
similarity index 100%
rename from utilities/doctype/note/README.md
rename to erpnext/utilities/doctype/note/README.md
diff --git a/utilities/doctype/note/__init__.py b/erpnext/utilities/doctype/note/__init__.py
similarity index 100%
rename from utilities/doctype/note/__init__.py
rename to erpnext/utilities/doctype/note/__init__.py
diff --git a/utilities/doctype/note/note.py b/erpnext/utilities/doctype/note/note.py
similarity index 100%
rename from utilities/doctype/note/note.py
rename to erpnext/utilities/doctype/note/note.py
diff --git a/utilities/doctype/note/note.txt b/erpnext/utilities/doctype/note/note.txt
similarity index 100%
rename from utilities/doctype/note/note.txt
rename to erpnext/utilities/doctype/note/note.txt
diff --git a/utilities/doctype/note_user/README.md b/erpnext/utilities/doctype/note_user/README.md
similarity index 100%
rename from utilities/doctype/note_user/README.md
rename to erpnext/utilities/doctype/note_user/README.md
diff --git a/utilities/doctype/note_user/__init__.py b/erpnext/utilities/doctype/note_user/__init__.py
similarity index 100%
rename from utilities/doctype/note_user/__init__.py
rename to erpnext/utilities/doctype/note_user/__init__.py
diff --git a/utilities/doctype/note_user/note_user.py b/erpnext/utilities/doctype/note_user/note_user.py
similarity index 100%
rename from utilities/doctype/note_user/note_user.py
rename to erpnext/utilities/doctype/note_user/note_user.py
diff --git a/utilities/doctype/note_user/note_user.txt b/erpnext/utilities/doctype/note_user/note_user.txt
similarity index 100%
rename from utilities/doctype/note_user/note_user.txt
rename to erpnext/utilities/doctype/note_user/note_user.txt
diff --git a/utilities/doctype/rename_tool/README.md b/erpnext/utilities/doctype/rename_tool/README.md
similarity index 100%
rename from utilities/doctype/rename_tool/README.md
rename to erpnext/utilities/doctype/rename_tool/README.md
diff --git a/utilities/doctype/rename_tool/__init__.py b/erpnext/utilities/doctype/rename_tool/__init__.py
similarity index 100%
rename from utilities/doctype/rename_tool/__init__.py
rename to erpnext/utilities/doctype/rename_tool/__init__.py
diff --git a/utilities/doctype/rename_tool/rename_tool.js b/erpnext/utilities/doctype/rename_tool/rename_tool.js
similarity index 94%
rename from utilities/doctype/rename_tool/rename_tool.js
rename to erpnext/utilities/doctype/rename_tool/rename_tool.js
index c075656..90cd1e1 100644
--- a/utilities/doctype/rename_tool/rename_tool.js
+++ b/erpnext/utilities/doctype/rename_tool/rename_tool.js
@@ -3,7 +3,7 @@
cur_frm.cscript.refresh = function(doc) {
return wn.call({
- method:"utilities.doctype.rename_tool.rename_tool.get_doctypes",
+ method: "erpnext.utilities.doctype.rename_tool.rename_tool.get_doctypes",
callback: function(r) {
cur_frm.set_df_property("select_doctype", "options", r.message);
cur_frm.cscript.setup_upload();
diff --git a/utilities/doctype/rename_tool/rename_tool.py b/erpnext/utilities/doctype/rename_tool/rename_tool.py
similarity index 100%
rename from utilities/doctype/rename_tool/rename_tool.py
rename to erpnext/utilities/doctype/rename_tool/rename_tool.py
diff --git a/utilities/doctype/rename_tool/rename_tool.txt b/erpnext/utilities/doctype/rename_tool/rename_tool.txt
similarity index 100%
rename from utilities/doctype/rename_tool/rename_tool.txt
rename to erpnext/utilities/doctype/rename_tool/rename_tool.txt
diff --git a/utilities/doctype/sms_control/__init__.py b/erpnext/utilities/doctype/sms_control/__init__.py
similarity index 100%
rename from utilities/doctype/sms_control/__init__.py
rename to erpnext/utilities/doctype/sms_control/__init__.py
diff --git a/utilities/doctype/sms_control/sms_control.js b/erpnext/utilities/doctype/sms_control/sms_control.js
similarity index 100%
rename from utilities/doctype/sms_control/sms_control.js
rename to erpnext/utilities/doctype/sms_control/sms_control.js
diff --git a/utilities/doctype/sms_control/sms_control.py b/erpnext/utilities/doctype/sms_control/sms_control.py
similarity index 96%
rename from utilities/doctype/sms_control/sms_control.py
rename to erpnext/utilities/doctype/sms_control/sms_control.py
index 5a9777a..8fbb8fe 100644
--- a/utilities/doctype/sms_control/sms_control.py
+++ b/erpnext/utilities/doctype/sms_control/sms_control.py
@@ -2,9 +2,9 @@
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
-import webnotes
+import webnotes, json
-from webnotes.utils import load_json, nowdate, cstr
+from webnotes.utils import nowdate, cstr
from webnotes.model.code import get_obj
from webnotes.model.doc import Document
from webnotes import msgprint
@@ -47,14 +47,14 @@
def get_contact_number(self, arg):
"returns mobile number of the contact"
- args = load_json(arg)
+ args = json.loads(arg)
number = webnotes.conn.sql("""select mobile_no, phone from tabContact where name=%s and %s=%s""" %
('%s', args['key'], '%s'), (args['contact_name'], args['value']))
return number and (number[0][0] or number[0][1]) or ''
def send_form_sms(self, arg):
"called from client side"
- args = load_json(arg)
+ args = json.loads(arg)
self.send_sms([str(args['number'])], str(args['message']))
def send_sms(self, receiver_list, msg, sender_name = ''):
diff --git a/utilities/doctype/sms_control/sms_control.txt b/erpnext/utilities/doctype/sms_control/sms_control.txt
similarity index 100%
rename from utilities/doctype/sms_control/sms_control.txt
rename to erpnext/utilities/doctype/sms_control/sms_control.txt
diff --git a/utilities/doctype/sms_log/README.md b/erpnext/utilities/doctype/sms_log/README.md
similarity index 100%
rename from utilities/doctype/sms_log/README.md
rename to erpnext/utilities/doctype/sms_log/README.md
diff --git a/utilities/doctype/sms_log/__init__.py b/erpnext/utilities/doctype/sms_log/__init__.py
similarity index 100%
rename from utilities/doctype/sms_log/__init__.py
rename to erpnext/utilities/doctype/sms_log/__init__.py
diff --git a/utilities/doctype/sms_log/sms_log.py b/erpnext/utilities/doctype/sms_log/sms_log.py
similarity index 100%
rename from utilities/doctype/sms_log/sms_log.py
rename to erpnext/utilities/doctype/sms_log/sms_log.py
diff --git a/utilities/doctype/sms_log/sms_log.txt b/erpnext/utilities/doctype/sms_log/sms_log.txt
similarity index 100%
rename from utilities/doctype/sms_log/sms_log.txt
rename to erpnext/utilities/doctype/sms_log/sms_log.txt
diff --git a/utilities/repost_stock.py b/erpnext/utilities/repost_stock.py
similarity index 97%
rename from utilities/repost_stock.py
rename to erpnext/utilities/repost_stock.py
index 48ff25f..cb0ce10 100644
--- a/utilities/repost_stock.py
+++ b/erpnext/utilities/repost_stock.py
@@ -39,7 +39,7 @@
})
def repost_actual_qty(item_code, warehouse):
- from stock.stock_ledger import update_entries_after
+ from erpnext.stock.stock_ledger import update_entries_after
try:
update_entries_after({ "item_code": item_code, "warehouse": warehouse })
except:
@@ -116,7 +116,7 @@
def update_bin(item_code, warehouse, qty_dict=None):
- from stock.utils import get_bin
+ from erpnext.stock.utils import get_bin
bin = get_bin(item_code, warehouse)
mismatch = False
for fld, val in qty_dict.items():
diff --git a/utilities/transaction_base.py b/erpnext/utilities/transaction_base.py
similarity index 97%
rename from utilities/transaction_base.py
rename to erpnext/utilities/transaction_base.py
index 5c28d8d..eed4639 100644
--- a/utilities/transaction_base.py
+++ b/erpnext/utilities/transaction_base.py
@@ -2,12 +2,12 @@
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
-import webnotes
+import webnotes, json
from webnotes import msgprint, _
-from webnotes.utils import load_json, cstr, flt, now_datetime, cint
+from webnotes.utils import cstr, flt, now_datetime, cint
from webnotes.model.doc import addchild
-from controllers.status_updater import StatusUpdater
+from erpnext.controllers.status_updater import StatusUpdater
class TransactionBase(StatusUpdater):
def get_default_address_and_contact(self, party_field, party_name=None):
@@ -145,7 +145,7 @@
self.doc.fields.update(self.get_lead_defaults())
def get_customer_address(self, args):
- args = load_json(args)
+ args = json.loads(args)
ret = {
'customer_address' : args["address"],
'address_display' : get_address_display(args["address"]),
@@ -170,7 +170,7 @@
# -----------------------
def get_default_supplier_address(self, args):
if isinstance(args, basestring):
- args = load_json(args)
+ args = json.loads(args)
address_name = get_default_address("supplier", args["supplier"])
ret = {
@@ -184,7 +184,7 @@
# Get Supplier Address
# -----------------------
def get_supplier_address(self, args):
- args = load_json(args)
+ args = json.loads(args)
ret = {
'supplier_address' : args['address'],
'address_display' : get_address_display(args["address"]),
@@ -431,15 +431,14 @@
company_currency = webnotes.conn.get_value("Company", company, "default_currency")
if not conversion_rate:
- msgprint(_('%(conversion_rate_label)s is mandatory. Maybe Currency Exchange \
- record is not created for %(from_currency)s to %(to_currency)s') % {
+ msgprint(_('%(conversion_rate_label)s is mandatory. Maybe Currency Exchange record is not created for %(from_currency)s to %(to_currency)s') % {
"conversion_rate_label": conversion_rate_label,
"from_currency": currency,
"to_currency": company_currency
}, raise_exception=True)
def validate_item_fetch(args, item):
- from stock.utils import validate_end_of_life
+ from erpnext.stock.utils import validate_end_of_life
validate_end_of_life(item.name, item.end_of_life)
# validate company
diff --git a/patches/1311/p07_scheduler_errors_digest.py b/patches/1311/p07_scheduler_errors_digest.py
deleted file mode 100644
index 4527f18..0000000
--- a/patches/1311/p07_scheduler_errors_digest.py
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import webnotes
-
-def execute():
- webnotes.reload_doc("setup", "doctype", "email_digest")
-
- from webnotes.profile import get_system_managers
- system_managers = get_system_managers(only_name=True)
- if not system_managers:
- return
-
- # no default company
- company = webnotes.conn.sql_list("select name from `tabCompany`")
- if company:
- company = company[0]
- if not company:
- return
-
- # scheduler errors digest
- edigest = webnotes.new_bean("Email Digest")
- edigest.doc.fields.update({
- "name": "Scheduler Errors",
- "company": company,
- "frequency": "Daily",
- "enabled": 1,
- "recipient_list": "\n".join(system_managers),
- "scheduler_errors": 1
- })
- edigest.insert()
diff --git a/patches/1311/p08_email_digest_recipients.py b/patches/1311/p08_email_digest_recipients.py
deleted file mode 100644
index fad5408..0000000
--- a/patches/1311/p08_email_digest_recipients.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import webnotes
-
-def execute():
- from webnotes.utils import extract_email_id
- for name, recipients in webnotes.conn.sql("""select name, recipient_list from `tabEmail Digest`"""):
- recipients = "\n".join([extract_email_id(r) for r in recipients.split("\n")])
- webnotes.conn.set_value("Email Digest", name, "recipient_list", recipients)
\ No newline at end of file
diff --git a/patches/1312/__init__.py b/patches/1312/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/patches/1312/__init__.py
+++ /dev/null
diff --git a/patches/1312/p01_delete_old_stock_reports.py b/patches/1312/p01_delete_old_stock_reports.py
deleted file mode 100644
index e8d620b..0000000
--- a/patches/1312/p01_delete_old_stock_reports.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-def execute():
- import webnotes, os, shutil
- from webnotes.utils import get_base_path
-
- webnotes.delete_doc('Page', 'stock-ledger')
- webnotes.delete_doc('Page', 'stock-ageing')
- webnotes.delete_doc('Page', 'stock-level')
- webnotes.delete_doc('Page', 'general-ledger')
-
- for d in [["stock", "stock_ledger"], ["stock", "stock_ageing"],
- ["stock", "stock_level"], ["accounts", "general_ledger"]]:
- path = os.path.join(get_base_path(), "app", d[0], "page", d[1])
- if os.path.exists(path):
- shutil.rmtree(path)
\ No newline at end of file
diff --git a/patches/1312/p02_update_item_details_in_item_price.py b/patches/1312/p02_update_item_details_in_item_price.py
deleted file mode 100644
index c19988c..0000000
--- a/patches/1312/p02_update_item_details_in_item_price.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import webnotes
-
-def execute():
- webnotes.conn.sql("""update `tabItem Price` ip INNER JOIN `tabItem` i
- ON (ip.item_code = i.name)
- set ip.item_name = i.item_name, ip.item_description = i.description""")
\ No newline at end of file
diff --git a/portal/__init__.py b/portal/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/portal/__init__.py
+++ /dev/null
diff --git a/portal/templates/base.html b/portal/templates/base.html
deleted file mode 100644
index bc6fb97..0000000
--- a/portal/templates/base.html
+++ /dev/null
@@ -1,3 +0,0 @@
-{% extends "lib/website/templates/base.html" %}
-
-{% block footer %}{% include "app/portal/templates/includes/footer.html" %}{% endblock %}
\ No newline at end of file
diff --git a/public/build.json b/public/build.json
deleted file mode 100644
index 77ad4dd..0000000
--- a/public/build.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "public/css/all-web.css": [
- "app/public/js/startup.css",
- ],
- "public/css/all-app.css": [
- "app/public/js/startup.css"
- ],
- "public/js/all-web.min.js": [
- "app/public/js/website_utils.js"
- ],
- "public/js/all-app.min.js": [
- "app/public/js/startup.js",
- "app/public/js/conf.js",
- "app/public/js/toolbar.js",
- "app/public/js/feature_setup.js",
- "app/public/js/utils.js",
- "app/public/js/queries.js"
- ],
-}
\ No newline at end of file
diff --git a/selling/doctype/sales_order/templates/pages/orders.html b/selling/doctype/sales_order/templates/pages/orders.html
deleted file mode 100644
index f108683..0000000
--- a/selling/doctype/sales_order/templates/pages/orders.html
+++ /dev/null
@@ -1 +0,0 @@
-{% extends "app/portal/templates/sales_transactions.html" %}
\ No newline at end of file
diff --git a/setup.py b/setup.py
new file mode 100644
index 0000000..1e03f1d
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,16 @@
+from setuptools import setup, find_packages
+import os
+
+version = '4.0.0-wip'
+
+setup(
+ name='erpnext',
+ version=version,
+ description='Open Source ERP',
+ author='Web Notes Technologies',
+ author_email='info@erpnext.com',
+ packages=find_packages(),
+ zip_safe=False,
+ include_package_data=True,
+ install_requires=("webnotes",),
+)
\ No newline at end of file
diff --git a/setup/doctype/item_group/templates/__init__.py b/setup/doctype/item_group/templates/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/setup/doctype/item_group/templates/__init__.py
+++ /dev/null
diff --git a/setup/doctype/item_group/templates/generators/__init__.py b/setup/doctype/item_group/templates/generators/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/setup/doctype/item_group/templates/generators/__init__.py
+++ /dev/null
diff --git a/setup/page/setup_wizard/setup_wizard.js b/setup/page/setup_wizard/setup_wizard.js
deleted file mode 100644
index 7b4253d..0000000
--- a/setup/page/setup_wizard/setup_wizard.js
+++ /dev/null
@@ -1,505 +0,0 @@
-wn.pages['setup-wizard'].onload = function(wrapper) {
- if(sys_defaults.company) {
- wn.set_route("desktop");
- return;
- }
- $(".navbar:first").toggle(false);
- $("body").css({"padding-top":"30px"});
-
- erpnext.wiz = new wn.wiz.Wizard({
- page_name: "setup-wizard",
- parent: wrapper,
- on_complete: function(wiz) {
- var values = wiz.get_values();
- wiz.show_working();
- wn.call({
- method: "setup.page.setup_wizard.setup_wizard.setup_account",
- args: values,
- callback: function(r) {
- if(r.exc) {
- var d = msgprint(wn._("There were errors."));
- d.custom_onhide = function() {
- wn.set_route(erpnext.wiz.page_name, "0");
- }
- } else {
- wiz.show_complete();
- setTimeout(function() {
- if(user==="Administrator") {
- msgprint(wn._("Login with your new User ID") + ":" + values.email);
- setTimeout(function() {
- wn.app.logout();
- }, 2000);
- } else {
- window.location = "app.html";
- }
- }, 2000);
- }
- }
- })
- },
- title: wn._("ERPNext Setup Guide"),
- welcome_html: '<h1 class="text-muted text-center"><i class="icon-magic"></i></h1>\
- <h2 class="text-center">'+wn._('ERPNext Setup')+'</h2>\
- <p class="text-center">' +
- wn._('Welcome to ERPNext. Over the next few minutes we will help you setup your ERPNext account. Try and fill in as much information as you have even if it takes a bit longer. It will save you a lot of time later. Good Luck!') +
- '</p>',
- working_html: '<h3 class="text-muted text-center"><i class="icon-refresh icon-spin"></i></h3>\
- <h2 class="text-center">'+wn._('Setting up...')+'</h2>\
- <p class="text-center">' +
- wn._('Sit tight while your system is being setup. This may take a few moments.') +
- '</p>',
- complete_html: '<h1 class="text-muted text-center"><i class="icon-thumbs-up"></i></h1>\
- <h2 class="text-center">'+wn._('Setup Complete!')+'</h2>\
- <p class="text-center">' +
- wn._('Your setup is complete. Refreshing...') +
- '</p>',
- slides: [
- // User
- {
- title: wn._("The First User: You"),
- icon: "icon-user",
- fields: [
- {"fieldname": "first_name", "label": wn._("First Name"), "fieldtype": "Data", reqd:1},
- {"fieldname": "last_name", "label": wn._("Last Name"), "fieldtype": "Data", reqd:1},
- {"fieldname": "email", "label": wn._("Email Id"), "fieldtype": "Data", reqd:1, "description":"Your Login Id"},
- {"fieldname": "password", "label": wn._("Password"), "fieldtype": "Password", reqd:1},
- {fieldtype:"Attach Image", fieldname:"attach_profile", label:"Attach Your Profile..."},
- ],
- help: wn._('The first user will become the System Manager (you can change that later).'),
- onload: function(slide) {
- if(user!=="Administrator") {
- slide.form.fields_dict.password.$wrapper.toggle(false);
- slide.form.fields_dict.email.$wrapper.toggle(false);
- slide.form.fields_dict.first_name.set_input(wn.boot.profile.first_name);
- slide.form.fields_dict.last_name.set_input(wn.boot.profile.last_name);
-
- delete slide.form.fields_dict.email;
- delete slide.form.fields_dict.password;
- }
- }
- },
-
- // Organization
- {
- title: wn._("The Organization"),
- icon: "icon-building",
- fields: [
- {fieldname:'company_name', label: wn._('Company Name'), fieldtype:'Data', reqd:1,
- placeholder: 'e.g. "My Company LLC"'},
- {fieldname:'company_abbr', label: wn._('Company Abbreviation'), fieldtype:'Data',
- placeholder:'e.g. "MC"',reqd:1},
- {fieldname:'fy_start_date', label:'Financial Year Start Date', fieldtype:'Date',
- description:'Your financial year begins on', reqd:1},
- {fieldname:'fy_end_date', label:'Financial Year End Date', fieldtype:'Date',
- description:'Your financial year ends on', reqd:1},
- {fieldname:'company_tagline', label: wn._('What does it do?'), fieldtype:'Data',
- placeholder:'e.g. "Build tools for builders"', reqd:1},
- ],
- help: wn._('The name of your company for which you are setting up this system.'),
- onload: function(slide) {
- slide.get_input("company_name").on("change", function() {
- var parts = slide.get_input("company_name").val().split(" ");
- var abbr = $.map(parts, function(p) { return p ? p.substr(0,1) : null }).join("");
- slide.get_input("company_abbr").val(abbr.toUpperCase());
- }).val(wn.boot.control_panel.company_name || "").trigger("change");
-
- slide.get_input("fy_start_date").on("change", function() {
- var year_end_date =
- wn.datetime.add_days(wn.datetime.add_months(slide.get_input("fy_start_date").val(), 12), -1);
- slide.get_input("fy_end_date").val(year_end_date);
- });
- }
- },
-
- // Country
- {
- title: wn._("Country, Timezone and Currency"),
- icon: "icon-flag",
- fields: [
- {fieldname:'country', label: wn._('Country'), reqd:1,
- options: "", fieldtype: 'Select'},
- {fieldname:'currency', label: wn._('Default Currency'), reqd:1,
- options: "", fieldtype: 'Select'},
- {fieldname:'timezone', label: wn._('Time Zone'), reqd:1,
- options: "", fieldtype: 'Select'},
- ],
- help: wn._('Select your home country and check the timezone and currency.'),
- onload: function(slide, form) {
- wn.call({
- method:"webnotes.country_info.get_country_timezone_info",
- callback: function(data) {
- erpnext.country_info = data.message.country_info;
- erpnext.all_timezones = data.message.all_timezones;
- slide.get_input("country").empty()
- .add_options([""].concat(keys(erpnext.country_info).sort()));
- slide.get_input("currency").empty()
- .add_options(wn.utils.unique([""].concat($.map(erpnext.country_info,
- function(opts, country) { return opts.currency; }))).sort());
- slide.get_input("timezone").empty()
- .add_options([""].concat(erpnext.all_timezones));
- }
- })
-
- slide.get_input("country").on("change", function() {
- var country = slide.get_input("country").val();
- var $timezone = slide.get_input("timezone");
- $timezone.empty();
- // add country specific timezones first
- if(country){
- var timezone_list = erpnext.country_info[country].timezones || [];
- $timezone.add_options(timezone_list.sort());
- slide.get_input("currency").val(erpnext.country_info[country].currency);
- }
- // add all timezones at the end, so that user has the option to change it to any timezone
- $timezone.add_options([""].concat(erpnext.all_timezones));
-
- });
- }
- },
-
- // Logo
- {
- icon: "icon-bookmark",
- title: wn._("Logo and Letter Heads"),
- help: wn._('Upload your letter head and logo - you can edit them later.'),
- fields: [
- {fieldtype:"Attach Image", fieldname:"attach_letterhead", label:"Attach Letterhead..."},
- {fieldtype:"Attach Image", fieldname:"attach_logo", label:"Attach Logo..."},
- ],
- },
-
- // Taxes
- {
- icon: "icon-money",
- "title": wn._("Add Taxes"),
- "help": wn._("List your tax heads (e.g. VAT, Excise) (upto 3) and their standard rates. This will create a standard template, you can edit and add more later."),
- "fields": [
- {fieldtype:"Data", fieldname:"tax_1", label:"Tax 1", placeholder:"e.g. VAT"},
- {fieldtype:"Column Break"},
- {fieldtype:"Data", fieldname:"tax_rate_1", label:"Rate (%)", placeholder:"e.g. 5"},
- {fieldtype:"Section Break"},
- {fieldtype:"Data", fieldname:"tax_2", label:"Tax 2", placeholder:"e.g. Customs Duty"},
- {fieldtype:"Column Break"},
- {fieldtype:"Data", fieldname:"tax_rate_2", label:"Rate (%)", placeholder:"e.g. 5"},
- {fieldtype:"Section Break"},
- {fieldtype:"Data", fieldname:"tax_3", label:"Tax 3", placeholder:"e.g. Excise"},
- {fieldtype:"Column Break"},
- {fieldtype:"Data", fieldname:"tax_rate_3", label:"Rate (%)", placeholder:"e.g. 5"},
- ],
- },
-
- // Customers
- {
- icon: "icon-group",
- "title": wn._("Your Customers"),
- "help": wn._("List a few of your customers. They could be organizations or individuals."),
- "fields": [
- {fieldtype:"Data", fieldname:"customer_1", label:"Customer 1", placeholder:"Customer Name"},
- {fieldtype:"Column Break"},
- {fieldtype:"Data", fieldname:"customer_contact_1", label:"", placeholder:"Contact Name"},
- {fieldtype:"Section Break"},
- {fieldtype:"Data", fieldname:"customer_2", label:"Customer 2", placeholder:"Customer Name"},
- {fieldtype:"Column Break"},
- {fieldtype:"Data", fieldname:"customer_contact_2", label:"", placeholder:"Contact Name"},
- {fieldtype:"Section Break"},
- {fieldtype:"Data", fieldname:"customer_3", label:"Customer 3", placeholder:"Customer Name"},
- {fieldtype:"Column Break"},
- {fieldtype:"Data", fieldname:"customer_contact_3", label:"", placeholder:"Contact Name"},
- {fieldtype:"Section Break"},
- {fieldtype:"Data", fieldname:"customer_4", label:"Customer 4", placeholder:"Customer Name"},
- {fieldtype:"Column Break"},
- {fieldtype:"Data", fieldname:"customer_contact_4", label:"", placeholder:"Contact Name"},
- {fieldtype:"Section Break"},
- {fieldtype:"Data", fieldname:"customer_5", label:"Customer 5", placeholder:"Customer Name"},
- {fieldtype:"Column Break"},
- {fieldtype:"Data", fieldname:"customer_contact_5", label:"", placeholder:"Contact Name"},
- ],
- },
-
- // Items to Sell
- {
- icon: "icon-barcode",
- "title": wn._("Your Products or Services"),
- "help": wn._("List your products or services that you sell to your customers. Make sure to check the Item Group, Unit of Measure and other properties when you start."),
- "fields": [
- {fieldtype:"Data", fieldname:"item_1", label:"Item 1", placeholder:"A Product or Service"},
- {fieldtype:"Column Break"},
- {fieldtype:"Attach", fieldname:"item_img_1", label:"Attach Image..."},
- {fieldtype:"Section Break"},
- {fieldtype:"Column Break"},
- {fieldtype:"Select", fieldname:"item_group_1", options:["Products", "Services", "Raw Material", "Sub Assemblies"]},
- {fieldtype:"Column Break"},
- {fieldtype:"Select", fieldname:"item_uom_1", options:["Unit", "Nos", "Box", "Pair", "Kg", "Set", "Hour", "Minute"]},
- {fieldtype:"Section Break"},
- {fieldtype:"Data", fieldname:"item_2", label:"Item 2", placeholder:"A Product or Service"},
- {fieldtype:"Column Break"},
- {fieldtype:"Attach", fieldname:"item_img_2", label:"Attach Image..."},
- {fieldtype:"Section Break"},
- {fieldtype:"Column Break"},
- {fieldtype:"Select", fieldname:"item_group_2", options:["Products", "Services", "Raw Material", "Sub Assemblies"]},
- {fieldtype:"Column Break"},
- {fieldtype:"Select", fieldname:"item_uom_2", options:["Unit", "Nos", "Box", "Pair", "Kg", "Set", "Hour", "Minute"]},
- {fieldtype:"Section Break"},
- {fieldtype:"Data", fieldname:"item_3", label:"Item 3", placeholder:"A Product or Service"},
- {fieldtype:"Column Break"},
- {fieldtype:"Attach", fieldname:"item_img_3", label:"Attach Image..."},
- {fieldtype:"Section Break"},
- {fieldtype:"Column Break"},
- {fieldtype:"Select", fieldname:"item_group_3", options:["Products", "Services", "Raw Material", "Sub Assemblies"]},
- {fieldtype:"Column Break"},
- {fieldtype:"Select", fieldname:"item_uom_3", options:["Unit", "Nos", "Box", "Pair", "Kg", "Set", "Hour", "Minute"]},
- {fieldtype:"Section Break"},
- {fieldtype:"Data", fieldname:"item_4", label:"Item 4", placeholder:"A Product or Service"},
- {fieldtype:"Column Break"},
- {fieldtype:"Attach", fieldname:"item_img_4", label:"Attach Image..."},
- {fieldtype:"Section Break"},
- {fieldtype:"Column Break"},
- {fieldtype:"Select", fieldname:"item_group_4", options:["Products", "Services", "Raw Material", "Sub Assemblies"]},
- {fieldtype:"Column Break"},
- {fieldtype:"Select", fieldname:"item_uom_4", options:["Unit", "Nos", "Box", "Pair", "Kg", "Set", "Hour", "Minute"]},
- {fieldtype:"Section Break"},
- {fieldtype:"Data", fieldname:"item_5", label:"Item 5", placeholder:"A Product or Service"},
- {fieldtype:"Column Break"},
- {fieldtype:"Attach", fieldname:"item_img_5", label:"Attach Image..."},
- {fieldtype:"Section Break"},
- {fieldtype:"Column Break"},
- {fieldtype:"Select", fieldname:"item_group_5", options:["Products", "Services", "Raw Material", "Sub Assemblies"]},
- {fieldtype:"Column Break"},
- {fieldtype:"Select", fieldname:"item_uom_5", options:["Unit", "Nos", "Box", "Pair", "Kg", "Set", "Hour", "Minute"]},
- ],
- },
-
- // Suppliers
- {
- icon: "icon-group",
- "title": wn._("Your Suppliers"),
- "help": wn._("List a few of your suppliers. They could be organizations or individuals."),
- "fields": [
- {fieldtype:"Data", fieldname:"supplier_1", label:"Supplier 1", placeholder:"Supplier Name"},
- {fieldtype:"Column Break"},
- {fieldtype:"Data", fieldname:"supplier_contact_1", label:"", placeholder:"Contact Name"},
- {fieldtype:"Section Break"},
- {fieldtype:"Data", fieldname:"supplier_2", label:"Supplier 2", placeholder:"Supplier Name"},
- {fieldtype:"Column Break"},
- {fieldtype:"Data", fieldname:"supplier_contact_2", label:"", placeholder:"Contact Name"},
- {fieldtype:"Section Break"},
- {fieldtype:"Data", fieldname:"supplier_3", label:"Supplier 3", placeholder:"Supplier Name"},
- {fieldtype:"Column Break"},
- {fieldtype:"Data", fieldname:"supplier_contact_3", label:"", placeholder:"Contact Name"},
- {fieldtype:"Section Break"},
- {fieldtype:"Data", fieldname:"supplier_4", label:"Supplier 4", placeholder:"Supplier Name"},
- {fieldtype:"Column Break"},
- {fieldtype:"Data", fieldname:"supplier_contact_4", label:"", placeholder:"Contact Name"},
- {fieldtype:"Section Break"},
- {fieldtype:"Data", fieldname:"supplier_5", label:"Supplier 5", placeholder:"Supplier Name"},
- {fieldtype:"Column Break"},
- {fieldtype:"Data", fieldname:"supplier_contact_5", label:"", placeholder:"Contact Name"},
- ],
- },
-
- // Items to Buy
- {
- icon: "icon-barcode",
- "title": wn._("Products or Services You Buy"),
- "help": wn._("List a few products or services you buy from your suppliers or vendors. If these are same as your products, then do not add them."),
- "fields": [
- {fieldtype:"Data", fieldname:"item_buy_1", label:"Item 1", placeholder:"A Product or Service"},
- {fieldtype:"Column Break"},
- {fieldtype:"Section Break"},
- {fieldtype:"Column Break"},
- {fieldtype:"Select", fieldname:"item_buy_group_1", options:["Raw Material", "Consumable", "Sub Assemblies", "Services", "Products"]},
- {fieldtype:"Column Break"},
- {fieldtype:"Select", fieldname:"item_buy_uom_1", options:["Unit", "Nos", "Box", "Pair", "Kg", "Set", "Hour", "Minute"]},
- {fieldtype:"Section Break"},
- {fieldtype:"Data", fieldname:"item_buy_2", label:"Item 2", placeholder:"A Product or Service"},
- {fieldtype:"Column Break"},
- {fieldtype:"Section Break"},
- {fieldtype:"Column Break"},
- {fieldtype:"Select", fieldname:"item_buy_group_2", options:["Raw Material", "Consumable", "Sub Assemblies", "Services", "Products"]},
- {fieldtype:"Column Break"},
- {fieldtype:"Select", fieldname:"item_buy_uom_2", options:["Unit", "Nos", "Box", "Pair", "Kg", "Set", "Hour", "Minute"]},
- {fieldtype:"Section Break"},
- {fieldtype:"Data", fieldname:"item_buy_3", label:"Item 3", placeholder:"A Product or Service"},
- {fieldtype:"Column Break"},
- {fieldtype:"Section Break"},
- {fieldtype:"Column Break"},
- {fieldtype:"Select", fieldname:"item_buy_group_3", options:["Raw Material", "Consumable", "Sub Assemblies", "Services", "Products"]},
- {fieldtype:"Column Break"},
- {fieldtype:"Select", fieldname:"item_buy_uom_3", options:["Unit", "Nos", "Box", "Pair", "Kg", "Set", "Hour", "Minute"]},
- {fieldtype:"Section Break"},
- {fieldtype:"Data", fieldname:"item_buy_4", label:"Item 4", placeholder:"A Product or Service"},
- {fieldtype:"Column Break"},
- {fieldtype:"Section Break"},
- {fieldtype:"Column Break"},
- {fieldtype:"Select", fieldname:"item_buy_group_4", options:["Raw Material", "Consumable", "Sub Assemblies", "Services", "Products"]},
- {fieldtype:"Column Break"},
- {fieldtype:"Select", fieldname:"item_buy_uom_4", options:["Unit", "Nos", "Box", "Pair", "Kg", "Set", "Hour", "Minute"]},
- {fieldtype:"Section Break"},
- {fieldtype:"Data", fieldname:"item_buy_5", label:"Item 5", placeholder:"A Product or Service"},
- {fieldtype:"Column Break"},
- {fieldtype:"Section Break"},
- {fieldtype:"Column Break"},
- {fieldtype:"Select", fieldname:"item_buy_group_5", options:["Raw Material", "Consumable", "Sub Assemblies", "Services", "Products"]},
- {fieldtype:"Column Break"},
- {fieldtype:"Select", fieldname:"item_buy_uom_5", options:["Unit", "Nos", "Box", "Pair", "Kg", "Set", "Hour", "Minute"]},
- ],
- },
-
- ]
-
- })
-}
-
-wn.pages['setup-wizard'].onshow = function(wrapper) {
- if(wn.get_route()[1])
- erpnext.wiz.show(wn.get_route()[1]);
-}
-
-wn.provide("wn.wiz");
-
-wn.wiz.Wizard = Class.extend({
- init: function(opts) {
- $.extend(this, opts);
- this.slides = this.slides;
- this.slide_dict = {};
- this.show_welcome();
- },
- get_message: function(html) {
- return $(repl('<div class="panel panel-default">\
- <div class="panel-body" style="padding: 40px;">%(html)s</div>\
- </div>', {html:html}))
- },
- show_welcome: function() {
- if(this.$welcome)
- return;
- var me = this;
- this.$welcome = this.get_message(this.welcome_html +
- '<br><p class="text-center"><button class="btn btn-primary">'+wn._("Start")+'</button></p>')
- .appendTo(this.parent);
-
- this.$welcome.find(".btn").click(function() {
- me.$welcome.toggle(false);
- me.welcomed = true;
- wn.set_route(me.page_name, "0");
- })
-
- this.current_slide = {"$wrapper": this.$welcome};
- },
- show_working: function() {
- this.hide_current_slide();
- wn.set_route(this.page_name);
- this.current_slide = {"$wrapper": this.get_message(this.working_html).appendTo(this.parent)};
- },
- show_complete: function() {
- this.hide_current_slide();
- this.current_slide = {"$wrapper": this.get_message(this.complete_html).appendTo(this.parent)};
- },
- show: function(id) {
- if(!this.welcomed) {
- wn.set_route(this.page_name);
- return;
- }
- id = cint(id);
- if(this.current_slide && this.current_slide.id===id)
- return;
- if(!this.slide_dict[id]) {
- this.slide_dict[id] = new wn.wiz.WizardSlide($.extend(this.slides[id], {wiz:this, id:id}));
- this.slide_dict[id].make();
- }
-
- this.hide_current_slide();
-
- this.current_slide = this.slide_dict[id];
- this.current_slide.$wrapper.toggle(true);
- },
- hide_current_slide: function() {
- if(this.current_slide) {
- this.current_slide.$wrapper.toggle(false);
- this.current_slide = null;
- }
- },
- get_values: function() {
- var values = {};
- $.each(this.slide_dict, function(id, slide) {
- $.extend(values, slide.values)
- })
- return values;
- }
-});
-
-wn.wiz.WizardSlide = Class.extend({
- init: function(opts) {
- $.extend(this, opts);
- },
- make: function() {
- var me = this;
- this.$wrapper = $(repl('<div class="panel panel-default">\
- <div class="panel-heading"><div class="panel-title">%(main_title)s: Step %(step)s</div></div>\
- <div class="panel-body">\
- <div class="progress">\
- <div class="progress-bar" style="width: %(width)s%"></div>\
- </div>\
- <br>\
- <div class="row">\
- <div class="col-sm-8 form"></div>\
- <div class="col-sm-4 help">\
- <h3 style="margin-top: 0px"><i class="%(icon)s text-muted"></i> %(title)s</h3><br>\
- <p class="text-muted">%(help)s</p>\
- </div>\
- </div>\
- <hr>\
- <div class="footer"></div>\
- </div>\
- </div>', {help:this.help, title:this.title, main_title:this.wiz.title, step: this.id + 1,
- width: (flt(this.id + 1) / (this.wiz.slides.length+1)) * 100, icon:this.icon}))
- .appendTo(this.wiz.parent);
-
- this.body = this.$wrapper.find(".form")[0];
-
- if(this.fields) {
- this.form = new wn.ui.FieldGroup({
- fields: this.fields,
- body: this.body,
- no_submit_on_enter: true
- });
- this.form.make();
- } else {
- $(this.body).html(this.html)
- }
-
- if(this.id > 0) {
- this.$prev = $("<button class='btn btn-default'>Previous</button>")
- .click(function() {
- wn.set_route(me.wiz.page_name, me.id-1 + "");
- })
- .appendTo(this.$wrapper.find(".footer"))
- .css({"margin-right": "5px"});
- }
- if(this.id+1 < this.wiz.slides.length) {
- this.$next = $("<button class='btn btn-primary'>Next</button>")
- .click(function() {
- me.values = me.form.get_values();
- if(me.values===null)
- return;
- wn.set_route(me.wiz.page_name, me.id+1 + "");
- })
- .appendTo(this.$wrapper.find(".footer"));
- } else {
- this.$complete = $("<button class='btn btn-primary'>Complete Setup</button>")
- .click(function() {
- me.values = me.form.get_values();
- if(me.values===null)
- return;
- me.wiz.on_complete(me.wiz);
- }).appendTo(this.$wrapper.find(".footer"));
- }
-
- if(this.onload) {
- this.onload(this);
- }
-
- },
- get_input: function(fn) {
- return this.form.get_input(fn);
- }
-})
\ No newline at end of file
diff --git a/startup/bean_handlers.py b/startup/bean_handlers.py
deleted file mode 100644
index 678c8aa..0000000
--- a/startup/bean_handlers.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from home import update_feed
-from core.doctype.notification_count.notification_count import clear_doctype_notifications
-from stock.doctype.material_request.material_request import update_completed_qty
-
-def on_method(bean, method):
- if method in ("on_update", "on_submit"):
- update_feed(bean.controller, method)
-
- if method in ("on_update", "on_cancel", "on_trash"):
- clear_doctype_notifications(bean.controller, method)
-
- if bean.doc.doctype=="Stock Entry" and method in ("on_submit", "on_cancel"):
- update_completed_qty(bean.controller, method)
-
\ No newline at end of file
diff --git a/startup/open_count.py b/startup/open_count.py
deleted file mode 100644
index 38034e2..0000000
--- a/startup/open_count.py
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import webnotes
-
-for_doctype = {
- "Support Ticket": {"status":"Open"},
- "Customer Issue": {"status":"Open"},
- "Task": {"status":"Open"},
- "Lead": {"status":"Open"},
- "Contact": {"status":"Open"},
- "Opportunity": {"docstatus":0},
- "Quotation": {"docstatus":0},
- "Sales Order": {"docstatus":0},
- "Journal Voucher": {"docstatus":0},
- "Sales Invoice": {"docstatus":0},
- "Purchase Invoice": {"docstatus":0},
- "Leave Application": {"status":"Open"},
- "Expense Claim": {"approval_status":"Draft"},
- "Job Applicant": {"status":"Open"},
- "Purchase Receipt": {"docstatus":0},
- "Delivery Note": {"docstatus":0},
- "Stock Entry": {"docstatus":0},
- "Material Request": {"docstatus":0},
- "Purchase Order": {"docstatus":0},
- "Production Order": {"docstatus":0},
- "BOM": {"docstatus":0},
- "Timesheet": {"docstatus":0},
- "Time Log": {"status":"Draft"},
- "Time Log Batch": {"status":"Draft"},
-}
-
-def get_things_todo():
- """Returns a count of incomplete todos"""
- incomplete_todos = webnotes.conn.sql("""\
- SELECT COUNT(*) FROM `tabToDo`
- WHERE IFNULL(checked, 0) = 0
- AND (owner = %s or assigned_by=%s)""", (webnotes.session.user, webnotes.session.user))
- return incomplete_todos[0][0]
-
-def get_todays_events():
- """Returns a count of todays events in calendar"""
- from core.doctype.event.event import get_events
- from webnotes.utils import nowdate
- today = nowdate()
- return len(get_events(today, today))
-
-def get_unread_messages():
- "returns unread (docstatus-0 messages for a user)"
- return webnotes.conn.sql("""\
- SELECT count(*)
- FROM `tabComment`
- WHERE comment_doctype IN ('My Company', 'Message')
- AND comment_docname = %s
- AND ifnull(docstatus,0)=0
- """, webnotes.user.name)[0][0]
-
-for_module_doctypes = {
- "ToDo": "To Do",
- "Event": "Calendar",
- "Comment": "Messages"
-}
-
-for_module = {
- "To Do": get_things_todo,
- "Calendar": get_todays_events,
- "Messages": get_unread_messages
-}
diff --git a/startup/query_handlers.py b/startup/query_handlers.py
deleted file mode 100644
index 753d088..0000000
--- a/startup/query_handlers.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-
-standard_queries = {
- "Warehouse": "stock.utils.get_warehouse_list",
- "Customer": "selling.utils.get_customer_list",
-}
\ No newline at end of file
diff --git a/startup/schedule_handlers.py b/startup/schedule_handlers.py
deleted file mode 100644
index 252a091..0000000
--- a/startup/schedule_handlers.py
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-"""will be called by scheduler"""
-
-import webnotes
-from webnotes.utils import scheduler
-
-def execute_all():
- """
- * get support email
- * recurring invoice
- """
- # pull emails
- from support.doctype.support_ticket.get_support_mails import get_support_mails
- run_fn(get_support_mails)
-
- from hr.doctype.job_applicant.get_job_applications import get_job_applications
- run_fn(get_job_applications)
-
- from selling.doctype.lead.get_leads import get_leads
- run_fn(get_leads)
-
- from webnotes.utils.email_lib.bulk import flush
- run_fn(flush)
-
-def execute_daily():
- # event reminders
- from core.doctype.event.event import send_event_digest
- run_fn(send_event_digest)
-
- # clear daily event notifications
- from core.doctype.notification_count.notification_count import delete_notification_count_for
- delete_notification_count_for("Event")
-
- # run recurring invoices
- from accounts.doctype.sales_invoice.sales_invoice import manage_recurring_invoices
- run_fn(manage_recurring_invoices)
-
- # send bulk emails
- from webnotes.utils.email_lib.bulk import clear_outbox
- run_fn(clear_outbox)
-
- # daily backup
- from setup.doctype.backup_manager.backup_manager import take_backups_daily
- run_fn(take_backups_daily)
-
- # check reorder level
- from stock.utils import reorder_item
- run_fn(reorder_item)
-
- # email digest
- from setup.doctype.email_digest.email_digest import send
- run_fn(send)
-
-def execute_weekly():
- from setup.doctype.backup_manager.backup_manager import take_backups_weekly
- run_fn(take_backups_weekly)
-
-def execute_monthly():
- pass
-
-def execute_hourly():
- pass
-
-def run_fn(fn):
- try:
- fn()
- except Exception, e:
- scheduler.log(fn.func_name)
diff --git a/stock/doctype/delivery_note/templates/__init__.py b/stock/doctype/delivery_note/templates/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/stock/doctype/delivery_note/templates/__init__.py
+++ /dev/null
diff --git a/stock/doctype/delivery_note/templates/pages/__init__.py b/stock/doctype/delivery_note/templates/pages/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/stock/doctype/delivery_note/templates/pages/__init__.py
+++ /dev/null
diff --git a/stock/doctype/delivery_note/templates/pages/shipment.html b/stock/doctype/delivery_note/templates/pages/shipment.html
deleted file mode 100644
index 376e5df..0000000
--- a/stock/doctype/delivery_note/templates/pages/shipment.html
+++ /dev/null
@@ -1 +0,0 @@
-{% extends "app/portal/templates/sale.html" %}
\ No newline at end of file
diff --git a/stock/doctype/delivery_note/templates/pages/shipments.html b/stock/doctype/delivery_note/templates/pages/shipments.html
deleted file mode 100644
index f108683..0000000
--- a/stock/doctype/delivery_note/templates/pages/shipments.html
+++ /dev/null
@@ -1 +0,0 @@
-{% extends "app/portal/templates/sales_transactions.html" %}
\ No newline at end of file
diff --git a/stock/doctype/item/templates/pages/__init__.py b/stock/doctype/item/templates/pages/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/stock/doctype/item/templates/pages/__init__.py
+++ /dev/null
diff --git a/stock/report/stock_ageing/__init__.py b/stock/report/stock_ageing/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/stock/report/stock_ageing/__init__.py
+++ /dev/null
diff --git a/stock/report/stock_ageing/stock_ageing.js b/stock/report/stock_ageing/stock_ageing.js
deleted file mode 100644
index f9e84b8..0000000
--- a/stock/report/stock_ageing/stock_ageing.js
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
-// License: GNU General Public License v3. See license.txt
-
-wn.query_reports["Stock Ageing"] = {
- "filters": [
- {
- "fieldname":"company",
- "label": wn._("Company"),
- "fieldtype": "Link",
- "options": "Company",
- "default": wn.defaults.get_user_default("company"),
- "reqd": 1
- },
- {
- "fieldname":"to_date",
- "label": wn._("To Date"),
- "fieldtype": "Date",
- "default": wn.datetime.get_today(),
- "reqd": 1
- },
- {
- "fieldname":"warehouse",
- "label": wn._("Warehouse"),
- "fieldtype": "Link",
- "options": "Warehouse"
- },
- {
- "fieldname":"item_code",
- "label": wn._("Item"),
- "fieldtype": "Link",
- "options": "Item"
- },
- {
- "fieldname":"brand",
- "label": wn._("Brand"),
- "fieldtype": "Link",
- "options": "Brand"
- }
- ]
-}
\ No newline at end of file
diff --git a/stock/report/stock_ageing/stock_ageing.py b/stock/report/stock_ageing/stock_ageing.py
deleted file mode 100644
index 1a84f93..0000000
--- a/stock/report/stock_ageing/stock_ageing.py
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import webnotes
-from webnotes.utils import date_diff
-
-def execute(filters=None):
-
- columns = get_columns()
- item_details = get_fifo_queue(filters)
- to_date = filters["to_date"]
- data = []
- for item, item_dict in item_details.items():
- fifo_queue = item_dict["fifo_queue"]
- details = item_dict["details"]
- if not fifo_queue: continue
-
- average_age = get_average_age(fifo_queue, to_date)
- earliest_age = date_diff(to_date, fifo_queue[0][1])
- latest_age = date_diff(to_date, fifo_queue[-1][1])
-
- data.append([item, details.item_name, details.description, details.item_group,
- details.brand, average_age, earliest_age, latest_age, details.stock_uom])
-
- return columns, data
-
-def get_average_age(fifo_queue, to_date):
- batch_age = age_qty = total_qty = 0.0
- for batch in fifo_queue:
- batch_age = date_diff(to_date, batch[1])
- age_qty += batch_age * batch[0]
- total_qty += batch[0]
-
- return (age_qty / total_qty) if total_qty else 0.0
-
-def get_columns():
- return ["Item Code:Link/Item:100", "Item Name::100", "Description::200",
- "Item Group:Link/Item Group:100", "Brand:Link/Brand:100", "Average Age:Float:100",
- "Earliest:Int:80", "Latest:Int:80", "UOM:Link/UOM:100"]
-
-def get_fifo_queue(filters):
- item_details = {}
- for d in get_stock_ledger_entries(filters):
- item_details.setdefault(d.name, {"details": d, "fifo_queue": []})
- fifo_queue = item_details[d.name]["fifo_queue"]
- if d.actual_qty > 0:
- fifo_queue.append([d.actual_qty, d.posting_date])
- else:
- qty_to_pop = abs(d.actual_qty)
- while qty_to_pop:
- batch = fifo_queue[0] if fifo_queue else [0, None]
- if 0 < batch[0] <= qty_to_pop:
- # if batch qty > 0
- # not enough or exactly same qty in current batch, clear batch
- qty_to_pop -= batch[0]
- fifo_queue.pop(0)
- else:
- # all from current batch
- batch[0] -= qty_to_pop
- qty_to_pop = 0
-
- return item_details
-
-def get_stock_ledger_entries(filters):
- return webnotes.conn.sql("""select
- item.name, item.item_name, item_group, brand, description, item.stock_uom,
- actual_qty, posting_date
- from `tabStock Ledger Entry` sle,
- (select name, item_name, description, stock_uom, brand, item_group
- from `tabItem` {item_conditions}) item
- where item_code = item.name and
- company = %(company)s and
- posting_date <= %(to_date)s
- {sle_conditions}
- order by posting_date, posting_time, sle.name"""\
- .format(item_conditions=get_item_conditions(filters),
- sle_conditions=get_sle_conditions(filters)), filters, as_dict=True)
-
-def get_item_conditions(filters):
- conditions = []
- if filters.get("item_code"):
- conditions.append("item_code=%(item_code)s")
- if filters.get("brand"):
- conditions.append("brand=%(brand)s")
-
- return "where {}".format(" and ".join(conditions)) if conditions else ""
-
-def get_sle_conditions(filters):
- conditions = []
- if filters.get("warehouse"):
- conditions.append("warehouse=%(warehouse)s")
-
- return "and {}".format(" and ".join(conditions)) if conditions else ""
\ No newline at end of file
diff --git a/stock/report/stock_ageing/stock_ageing.txt b/stock/report/stock_ageing/stock_ageing.txt
deleted file mode 100644
index b88ebce..0000000
--- a/stock/report/stock_ageing/stock_ageing.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-[
- {
- "creation": "2013-12-02 17:09:31",
- "docstatus": 0,
- "modified": "2013-12-02 17:09:31",
- "modified_by": "Administrator",
- "owner": "Administrator"
- },
- {
- "doctype": "Report",
- "is_standard": "Yes",
- "name": "__common__",
- "ref_doctype": "Item",
- "report_name": "Stock Ageing",
- "report_type": "Script Report"
- },
- {
- "doctype": "Report",
- "name": "Stock Ageing"
- }
-]
\ No newline at end of file
diff --git a/stock/report/stock_projected_qty/__init__.py b/stock/report/stock_projected_qty/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/stock/report/stock_projected_qty/__init__.py
+++ /dev/null
diff --git a/stock/report/stock_projected_qty/stock_projected_qty.js b/stock/report/stock_projected_qty/stock_projected_qty.js
deleted file mode 100644
index 8c25e5d..0000000
--- a/stock/report/stock_projected_qty/stock_projected_qty.js
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
-// License: GNU General Public License v3. See license.txt
-
-wn.query_reports["Stock Projected Qty"] = {
- "filters": [
- {
- "fieldname":"company",
- "label": wn._("Company"),
- "fieldtype": "Link",
- "options": "Company"
- },
- {
- "fieldname":"warehouse",
- "label": wn._("Warehouse"),
- "fieldtype": "Link",
- "options": "Warehouse"
- },
- {
- "fieldname":"item_code",
- "label": wn._("Item"),
- "fieldtype": "Link",
- "options": "Item"
- },
- {
- "fieldname":"brand",
- "label": wn._("Brand"),
- "fieldtype": "Link",
- "options": "Brand"
- }
- ]
-}
\ No newline at end of file
diff --git a/stock/report/stock_projected_qty/stock_projected_qty.py b/stock/report/stock_projected_qty/stock_projected_qty.py
deleted file mode 100644
index d335ebf..0000000
--- a/stock/report/stock_projected_qty/stock_projected_qty.py
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import webnotes
-
-def execute(filters=None):
- columns = get_columns()
-
- data = webnotes.conn.sql("""select
- item.name, item.item_name, description, item_group, brand, warehouse, item.stock_uom,
- actual_qty, planned_qty, indented_qty, ordered_qty, reserved_qty,
- projected_qty, item.re_order_level, item.re_order_qty
- from `tabBin` bin,
- (select name, company from tabWarehouse
- {warehouse_conditions}) wh,
- (select name, item_name, description, stock_uom, item_group,
- brand, re_order_level, re_order_qty
- from `tabItem` {item_conditions}) item
- where item_code = item.name and warehouse = wh.name
- order by item.name, wh.name"""\
- .format(item_conditions=get_item_conditions(filters),
- warehouse_conditions=get_warehouse_conditions(filters)), filters)
-
- return columns, data
-
-def get_columns():
- return ["Item Code:Link/Item:140", "Item Name::100", "Description::200",
- "Item Group:Link/Item Group:100", "Brand:Link/Brand:100", "Warehouse:Link/Warehouse:120",
- "UOM:Link/UOM:100", "Actual Qty:Float:100", "Planned Qty:Float:100",
- "Requested Qty:Float:110", "Ordered Qty:Float:100", "Reserved Qty:Float:100",
- "Projected Qty:Float:100", "Reorder Level:Float:100", "Reorder Qty:Float:100"]
-
-def get_item_conditions(filters):
- conditions = []
- if filters.get("item_code"):
- conditions.append("name=%(item_code)s")
- if filters.get("brand"):
- conditions.append("brand=%(brand)s")
-
- return "where {}".format(" and ".join(conditions)) if conditions else ""
-
-def get_warehouse_conditions(filters):
- conditions = []
- if filters.get("company"):
- conditions.append("company=%(company)s")
- if filters.get("warehouse"):
- conditions.append("name=%(warehouse)s")
-
- return "where {}".format(" and ".join(conditions)) if conditions else ""
\ No newline at end of file
diff --git a/stock/report/stock_projected_qty/stock_projected_qty.txt b/stock/report/stock_projected_qty/stock_projected_qty.txt
deleted file mode 100644
index 1998f7a..0000000
--- a/stock/report/stock_projected_qty/stock_projected_qty.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-[
- {
- "creation": "2013-12-04 18:21:56",
- "docstatus": 0,
- "modified": "2013-12-04 18:21:56",
- "modified_by": "Administrator",
- "owner": "Administrator"
- },
- {
- "add_total_row": 1,
- "doctype": "Report",
- "is_standard": "Yes",
- "name": "__common__",
- "ref_doctype": "Item",
- "report_name": "Stock Projected Qty",
- "report_type": "Script Report"
- },
- {
- "doctype": "Report",
- "name": "Stock Projected Qty"
- }
-]
\ No newline at end of file
diff --git a/support/doctype/support_ticket/templates/__init__.py b/support/doctype/support_ticket/templates/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/support/doctype/support_ticket/templates/__init__.py
+++ /dev/null
diff --git a/support/doctype/support_ticket/templates/pages/__init__.py b/support/doctype/support_ticket/templates/pages/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/support/doctype/support_ticket/templates/pages/__init__.py
+++ /dev/null
diff --git a/test_sites/apps.txt b/test_sites/apps.txt
new file mode 100644
index 0000000..3796729
--- /dev/null
+++ b/test_sites/apps.txt
@@ -0,0 +1 @@
+erpnext
diff --git a/test_sites/test_site/site_config.json b/test_sites/test_site/site_config.json
new file mode 100644
index 0000000..d8b9376
--- /dev/null
+++ b/test_sites/test_site/site_config.json
@@ -0,0 +1,4 @@
+{
+ "db_name": "travis",
+ "db_password": "travis"
+}
diff --git a/translations/languages.json b/translations/languages.json
deleted file mode 100644
index 9bffb5c..0000000
--- a/translations/languages.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "中国（简体）": "zh-cn",
- "中國（繁體）": "zh-tw",
- "deutsch": "de",
- "ελληνικά": "el",
- "english": "en",
- "español": "es",
- "français": "fr",
- "हिंदी": "hi",
- "hrvatski": "hr",
- "italiano": "it",
- "nederlands": "nl",
- "português brasileiro": "pt-BR",
- "português": "pt",
- "српски":"sr",
- "தமிழ்": "ta",
- "ไทย": "th",
- "العربية":"ar"
-}
\ No newline at end of file
diff --git a/utilities/doctype/address/templates/__init__.py b/utilities/doctype/address/templates/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/utilities/doctype/address/templates/__init__.py
+++ /dev/null
diff --git a/utilities/doctype/address/templates/pages/__init__.py b/utilities/doctype/address/templates/pages/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/utilities/doctype/address/templates/pages/__init__.py
+++ /dev/null
