Merge branch 'develop' into pos-batch-no-stock-validation
This commit is contained in:
commit
568550874d
27
.github/ISSUE_TEMPLATE/bug_report.yaml
vendored
27
.github/ISSUE_TEMPLATE/bug_report.yaml
vendored
@ -24,20 +24,6 @@ body:
|
||||
validations:
|
||||
required: true
|
||||
|
||||
- type: dropdown
|
||||
id: version
|
||||
attributes:
|
||||
label: Version
|
||||
description: Affected versions.
|
||||
multiple: true
|
||||
options:
|
||||
- v12
|
||||
- v13
|
||||
- v14
|
||||
- develop
|
||||
validations:
|
||||
required: true
|
||||
|
||||
- type: dropdown
|
||||
id: module
|
||||
attributes:
|
||||
@ -86,7 +72,7 @@ body:
|
||||
- manual install
|
||||
- FrappeCloud
|
||||
validations:
|
||||
required: true
|
||||
required: false
|
||||
|
||||
- type: textarea
|
||||
id: logs
|
||||
@ -95,12 +81,7 @@ body:
|
||||
description: Please copy and paste any relevant log output. This will be automatically formatted.
|
||||
render: shell
|
||||
|
||||
|
||||
- type: checkboxes
|
||||
id: terms
|
||||
- type: markdown
|
||||
attributes:
|
||||
label: Code of Conduct
|
||||
description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/frappe/erpnext/blob/develop/CODE_OF_CONDUCT.md)
|
||||
options:
|
||||
- label: I agree to follow this project's Code of Conduct
|
||||
required: true
|
||||
value: |
|
||||
By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/frappe/erpnext/blob/develop/CODE_OF_CONDUCT.md)
|
||||
|
29
.github/helper/install.sh
vendored
29
.github/helper/install.sh
vendored
@ -12,17 +12,30 @@ git clone https://github.com/frappe/frappe --branch "${GITHUB_BASE_REF:-${GITHUB
|
||||
bench init --skip-assets --frappe-path ~/frappe --python "$(which python)" frappe-bench
|
||||
|
||||
mkdir ~/frappe-bench/sites/test_site
|
||||
cp -r "${GITHUB_WORKSPACE}/.github/helper/site_config.json" ~/frappe-bench/sites/test_site/
|
||||
|
||||
mysql --host 127.0.0.1 --port 3306 -u root -e "SET GLOBAL character_set_server = 'utf8mb4'"
|
||||
mysql --host 127.0.0.1 --port 3306 -u root -e "SET GLOBAL collation_server = 'utf8mb4_unicode_ci'"
|
||||
if [ "$DB" == "mariadb" ];then
|
||||
cp -r "${GITHUB_WORKSPACE}/.github/helper/site_config_mariadb.json" ~/frappe-bench/sites/test_site/site_config.json
|
||||
else
|
||||
cp -r "${GITHUB_WORKSPACE}/.github/helper/site_config_postgres.json" ~/frappe-bench/sites/test_site/site_config.json
|
||||
fi
|
||||
|
||||
mysql --host 127.0.0.1 --port 3306 -u root -e "CREATE USER 'test_frappe'@'localhost' IDENTIFIED BY 'test_frappe'"
|
||||
mysql --host 127.0.0.1 --port 3306 -u root -e "CREATE DATABASE test_frappe"
|
||||
mysql --host 127.0.0.1 --port 3306 -u root -e "GRANT ALL PRIVILEGES ON \`test_frappe\`.* TO 'test_frappe'@'localhost'"
|
||||
|
||||
mysql --host 127.0.0.1 --port 3306 -u root -e "UPDATE mysql.user SET Password=PASSWORD('travis') WHERE User='root'"
|
||||
mysql --host 127.0.0.1 --port 3306 -u root -e "FLUSH PRIVILEGES"
|
||||
if [ "$DB" == "mariadb" ];then
|
||||
mysql --host 127.0.0.1 --port 3306 -u root -e "SET GLOBAL character_set_server = 'utf8mb4'"
|
||||
mysql --host 127.0.0.1 --port 3306 -u root -e "SET GLOBAL collation_server = 'utf8mb4_unicode_ci'"
|
||||
|
||||
mysql --host 127.0.0.1 --port 3306 -u root -e "CREATE USER 'test_frappe'@'localhost' IDENTIFIED BY 'test_frappe'"
|
||||
mysql --host 127.0.0.1 --port 3306 -u root -e "CREATE DATABASE test_frappe"
|
||||
mysql --host 127.0.0.1 --port 3306 -u root -e "GRANT ALL PRIVILEGES ON \`test_frappe\`.* TO 'test_frappe'@'localhost'"
|
||||
|
||||
mysql --host 127.0.0.1 --port 3306 -u root -e "UPDATE mysql.user SET Password=PASSWORD('travis') WHERE User='root'"
|
||||
mysql --host 127.0.0.1 --port 3306 -u root -e "FLUSH PRIVILEGES"
|
||||
fi
|
||||
|
||||
if [ "$DB" == "postgres" ];then
|
||||
echo "travis" | psql -h 127.0.0.1 -p 5432 -c "CREATE DATABASE test_frappe" -U postgres;
|
||||
echo "travis" | psql -h 127.0.0.1 -p 5432 -c "CREATE USER test_frappe WITH PASSWORD 'test_frappe'" -U postgres;
|
||||
fi
|
||||
|
||||
wget -O /tmp/wkhtmltox.tar.xz https://github.com/frappe/wkhtmltopdf/raw/master/wkhtmltox-0.12.3_linux-generic-amd64.tar.xz
|
||||
tar -xf /tmp/wkhtmltox.tar.xz -C /tmp
|
||||
|
@ -13,4 +13,4 @@
|
||||
"host_name": "http://test_site:8000",
|
||||
"install_apps": ["erpnext"],
|
||||
"throttle_user_limit": 100
|
||||
}
|
||||
}
|
18
.github/helper/site_config_postgres.json
vendored
Normal file
18
.github/helper/site_config_postgres.json
vendored
Normal file
@ -0,0 +1,18 @@
|
||||
{
|
||||
"db_host": "127.0.0.1",
|
||||
"db_port": 5432,
|
||||
"db_name": "test_frappe",
|
||||
"db_password": "test_frappe",
|
||||
"db_type": "postgres",
|
||||
"allow_tests": true,
|
||||
"auto_email_id": "test@example.com",
|
||||
"mail_server": "smtp.example.com",
|
||||
"mail_login": "test@example.com",
|
||||
"mail_password": "test",
|
||||
"admin_password": "admin",
|
||||
"root_login": "postgres",
|
||||
"root_password": "travis",
|
||||
"host_name": "http://test_site:8000",
|
||||
"install_apps": ["erpnext"],
|
||||
"throttle_user_limit": 100
|
||||
}
|
3
.github/workflows/patch.yml
vendored
3
.github/workflows/patch.yml
vendored
@ -80,6 +80,9 @@ jobs:
|
||||
|
||||
- name: Install
|
||||
run: bash ${GITHUB_WORKSPACE}/.github/helper/install.sh
|
||||
env:
|
||||
DB: mariadb
|
||||
TYPE: server
|
||||
|
||||
- name: Run Patch Tests
|
||||
run: |
|
||||
|
@ -1,10 +1,11 @@
|
||||
name: Server
|
||||
name: Server (Mariadb)
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
paths-ignore:
|
||||
- '**.js'
|
||||
- '**.md'
|
||||
- '**.html'
|
||||
workflow_dispatch:
|
||||
push:
|
||||
branches: [ develop ]
|
||||
@ -13,7 +14,7 @@ on:
|
||||
- '**.md'
|
||||
|
||||
concurrency:
|
||||
group: server-develop-${{ github.event.number }}
|
||||
group: server-mariadb-develop-${{ github.event.number }}
|
||||
cancel-in-progress: true
|
||||
|
||||
jobs:
|
||||
@ -92,6 +93,7 @@ jobs:
|
||||
- name: Install
|
||||
run: bash ${GITHUB_WORKSPACE}/.github/helper/install.sh
|
||||
env:
|
||||
DB: mariadb
|
||||
TYPE: server
|
||||
|
||||
- name: Run Tests
|
105
.github/workflows/server-tests-postgres.yml
vendored
Normal file
105
.github/workflows/server-tests-postgres.yml
vendored
Normal file
@ -0,0 +1,105 @@
|
||||
name: Server (Postgres)
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
paths-ignore:
|
||||
- '**.js'
|
||||
- '**.md'
|
||||
- '**.html'
|
||||
types: [opened, labelled, synchronize, reopened]
|
||||
|
||||
concurrency:
|
||||
group: server-postgres-develop-${{ github.event.number }}
|
||||
cancel-in-progress: true
|
||||
|
||||
jobs:
|
||||
test:
|
||||
if: ${{ contains(github.event.pull_request.labels.*.name, 'postgres') }}
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 60
|
||||
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
container: [1, 2, 3]
|
||||
|
||||
name: Python Unit Tests
|
||||
|
||||
services:
|
||||
postgres:
|
||||
image: postgres:13.3
|
||||
env:
|
||||
POSTGRES_PASSWORD: travis
|
||||
options: >-
|
||||
--health-cmd pg_isready
|
||||
--health-interval 10s
|
||||
--health-timeout 5s
|
||||
--health-retries 5
|
||||
ports:
|
||||
- 5432:5432
|
||||
|
||||
steps:
|
||||
|
||||
- name: Clone
|
||||
uses: actions/checkout@v2
|
||||
|
||||
- name: Setup Python
|
||||
uses: actions/setup-python@v2
|
||||
with:
|
||||
python-version: 3.7
|
||||
|
||||
- name: Setup Node
|
||||
uses: actions/setup-node@v2
|
||||
with:
|
||||
node-version: 14
|
||||
check-latest: true
|
||||
|
||||
- name: Add to Hosts
|
||||
run: echo "127.0.0.1 test_site" | sudo tee -a /etc/hosts
|
||||
|
||||
- name: Cache pip
|
||||
uses: actions/cache@v2
|
||||
with:
|
||||
path: ~/.cache/pip
|
||||
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
|
||||
restore-keys: |
|
||||
${{ runner.os }}-pip-
|
||||
${{ runner.os }}-
|
||||
|
||||
- name: Cache node modules
|
||||
uses: actions/cache@v2
|
||||
env:
|
||||
cache-name: cache-node-modules
|
||||
with:
|
||||
path: ~/.npm
|
||||
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
|
||||
restore-keys: |
|
||||
${{ runner.os }}-build-${{ env.cache-name }}-
|
||||
${{ runner.os }}-build-
|
||||
${{ runner.os }}-
|
||||
|
||||
- name: Get yarn cache directory path
|
||||
id: yarn-cache-dir-path
|
||||
run: echo "::set-output name=dir::$(yarn cache dir)"
|
||||
|
||||
- uses: actions/cache@v2
|
||||
id: yarn-cache
|
||||
with:
|
||||
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
|
||||
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
|
||||
restore-keys: |
|
||||
${{ runner.os }}-yarn-
|
||||
|
||||
|
||||
- name: Install
|
||||
run: bash ${GITHUB_WORKSPACE}/.github/helper/install.sh
|
||||
env:
|
||||
DB: postgres
|
||||
TYPE: server
|
||||
|
||||
- name: Run Tests
|
||||
run: cd ~/frappe-bench/ && bench --site test_site run-parallel-tests --app erpnext --use-orchestrator
|
||||
env:
|
||||
TYPE: server
|
||||
CI_BUILD_ID: ${{ github.run_id }}
|
||||
ORCHESTRATOR_URL: http://test-orchestrator.frappe.io
|
@ -7,7 +7,7 @@ frappe.ui.form.on("Bank Reconciliation Tool", {
|
||||
frm.set_query("bank_account", function () {
|
||||
return {
|
||||
filters: {
|
||||
company: ["in", frm.doc.company],
|
||||
company: frm.doc.company,
|
||||
'is_company_account': 1
|
||||
},
|
||||
};
|
||||
|
@ -218,6 +218,8 @@ def reconcile_vouchers(bank_transaction_name, vouchers):
|
||||
# updated clear date of all the vouchers based on the bank transaction
|
||||
vouchers = json.loads(vouchers)
|
||||
transaction = frappe.get_doc("Bank Transaction", bank_transaction_name)
|
||||
company_account = frappe.db.get_value('Bank Account', transaction.bank_account, 'account')
|
||||
|
||||
if transaction.unallocated_amount == 0:
|
||||
frappe.throw(_("This bank transaction is already fully reconciled"))
|
||||
total_amount = 0
|
||||
@ -226,7 +228,7 @@ def reconcile_vouchers(bank_transaction_name, vouchers):
|
||||
total_amount += get_paid_amount(frappe._dict({
|
||||
'payment_document': voucher['payment_doctype'],
|
||||
'payment_entry': voucher['payment_name'],
|
||||
}), transaction.currency)
|
||||
}), transaction.currency, company_account)
|
||||
|
||||
if total_amount > transaction.unallocated_amount:
|
||||
frappe.throw(_("The Sum Total of Amounts of All Selected Vouchers Should be Less than the Unallocated Amount of the Bank Transaction"))
|
||||
@ -261,7 +263,7 @@ def get_linked_payments(bank_transaction_name, document_types = None):
|
||||
return matching
|
||||
|
||||
def check_matching(bank_account, company, transaction, document_types):
|
||||
# combine all types of vocuhers
|
||||
# combine all types of vouchers
|
||||
subquery = get_queries(bank_account, company, transaction, document_types)
|
||||
filters = {
|
||||
"amount": transaction.unallocated_amount,
|
||||
@ -343,13 +345,11 @@ def get_pe_matching_query(amount_condition, account_from_to, transaction):
|
||||
def get_je_matching_query(amount_condition, transaction):
|
||||
# get matching journal entry query
|
||||
|
||||
# We have mapping at the bank level
|
||||
# So one bank could have both types of bank accounts like asset and liability
|
||||
# So cr_or_dr should be judged only on basis of withdrawal and deposit and not account type
|
||||
company_account = frappe.get_value("Bank Account", transaction.bank_account, "account")
|
||||
root_type = frappe.get_value("Account", company_account, "root_type")
|
||||
|
||||
if root_type == "Liability":
|
||||
cr_or_dr = "debit" if transaction.withdrawal > 0 else "credit"
|
||||
else:
|
||||
cr_or_dr = "credit" if transaction.withdrawal > 0 else "debit"
|
||||
cr_or_dr = "credit" if transaction.withdrawal > 0 else "debit"
|
||||
|
||||
return f"""
|
||||
|
||||
|
@ -239,7 +239,8 @@ frappe.ui.form.on("Bank Statement Import", {
|
||||
"withdrawal",
|
||||
"description",
|
||||
"reference_number",
|
||||
"bank_account"
|
||||
"bank_account",
|
||||
"currency"
|
||||
],
|
||||
},
|
||||
});
|
||||
|
@ -102,7 +102,7 @@ def get_total_allocated_amount(payment_entry):
|
||||
AND
|
||||
bt.docstatus = 1""", (payment_entry.payment_document, payment_entry.payment_entry), as_dict=True)
|
||||
|
||||
def get_paid_amount(payment_entry, currency):
|
||||
def get_paid_amount(payment_entry, currency, bank_account):
|
||||
if payment_entry.payment_document in ["Payment Entry", "Sales Invoice", "Purchase Invoice"]:
|
||||
|
||||
paid_amount_field = "paid_amount"
|
||||
@ -115,7 +115,7 @@ def get_paid_amount(payment_entry, currency):
|
||||
payment_entry.payment_entry, paid_amount_field)
|
||||
|
||||
elif payment_entry.payment_document == "Journal Entry":
|
||||
return frappe.db.get_value(payment_entry.payment_document, payment_entry.payment_entry, "total_credit")
|
||||
return frappe.db.get_value('Journal Entry Account', {'parent': payment_entry.payment_entry, 'account': bank_account}, "sum(credit_in_account_currency)")
|
||||
|
||||
elif payment_entry.payment_document == "Expense Claim":
|
||||
return frappe.db.get_value(payment_entry.payment_document, payment_entry.payment_entry, "total_amount_reimbursed")
|
||||
|
0
erpnext/accounts/doctype/ledger_merge/__init__.py
Normal file
0
erpnext/accounts/doctype/ledger_merge/__init__.py
Normal file
128
erpnext/accounts/doctype/ledger_merge/ledger_merge.js
Normal file
128
erpnext/accounts/doctype/ledger_merge/ledger_merge.js
Normal file
@ -0,0 +1,128 @@
|
||||
// Copyright (c) 2021, Wahni Green Technologies Pvt. Ltd. and contributors
|
||||
// For license information, please see license.txt
|
||||
|
||||
frappe.ui.form.on('Ledger Merge', {
|
||||
setup: function(frm) {
|
||||
frappe.realtime.on('ledger_merge_refresh', ({ ledger_merge }) => {
|
||||
if (ledger_merge !== frm.doc.name) return;
|
||||
frappe.model.clear_doc(frm.doc.doctype, frm.doc.name);
|
||||
frappe.model.with_doc(frm.doc.doctype, frm.doc.name).then(() => {
|
||||
frm.refresh();
|
||||
});
|
||||
});
|
||||
|
||||
frappe.realtime.on('ledger_merge_progress', data => {
|
||||
if (data.ledger_merge !== frm.doc.name) return;
|
||||
let message = __('Merging {0} of {1}', [data.current, data.total]);
|
||||
let percent = Math.floor((data.current * 100) / data.total);
|
||||
frm.dashboard.show_progress(__('Merge Progress'), percent, message);
|
||||
frm.page.set_indicator(__('In Progress'), 'orange');
|
||||
});
|
||||
|
||||
frm.set_query("account", function(doc) {
|
||||
if (!doc.company) frappe.throw(__('Please set Company'));
|
||||
if (!doc.root_type) frappe.throw(__('Please set Root Type'));
|
||||
return {
|
||||
filters: {
|
||||
root_type: doc.root_type,
|
||||
company: doc.company
|
||||
}
|
||||
};
|
||||
});
|
||||
|
||||
frm.set_query('account', 'merge_accounts', function(doc) {
|
||||
if (!doc.company) frappe.throw(__('Please set Company'));
|
||||
if (!doc.root_type) frappe.throw(__('Please set Root Type'));
|
||||
if (!doc.account) frappe.throw(__('Please set Account'));
|
||||
let acc = [doc.account];
|
||||
frm.doc.merge_accounts.forEach((row) => {
|
||||
acc.push(row.account);
|
||||
});
|
||||
return {
|
||||
filters: {
|
||||
is_group: doc.is_group,
|
||||
root_type: doc.root_type,
|
||||
name: ["not in", acc],
|
||||
company: doc.company
|
||||
}
|
||||
};
|
||||
});
|
||||
},
|
||||
|
||||
refresh: function(frm) {
|
||||
frm.page.hide_icon_group();
|
||||
frm.trigger('set_merge_status');
|
||||
frm.trigger('update_primary_action');
|
||||
},
|
||||
|
||||
after_save: function(frm) {
|
||||
setTimeout(() => {
|
||||
frm.trigger('update_primary_action');
|
||||
}, 500);
|
||||
},
|
||||
|
||||
update_primary_action: function(frm) {
|
||||
if (frm.is_dirty()) {
|
||||
frm.enable_save();
|
||||
return;
|
||||
}
|
||||
frm.disable_save();
|
||||
if (frm.doc.status !== 'Success') {
|
||||
if (!frm.is_new()) {
|
||||
let label = frm.doc.status === 'Pending' ? __('Start Merge') : __('Retry');
|
||||
frm.page.set_primary_action(label, () => frm.events.start_merge(frm));
|
||||
} else {
|
||||
frm.page.set_primary_action(__('Save'), () => frm.save());
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
start_merge: function(frm) {
|
||||
frm.call({
|
||||
method: 'form_start_merge',
|
||||
args: { docname: frm.doc.name },
|
||||
btn: frm.page.btn_primary
|
||||
}).then(r => {
|
||||
if (r.message === true) {
|
||||
frm.disable_save();
|
||||
}
|
||||
});
|
||||
},
|
||||
|
||||
set_merge_status: function(frm) {
|
||||
if (frm.doc.status == "Pending") return;
|
||||
let successful_records = 0;
|
||||
frm.doc.merge_accounts.forEach((row) => {
|
||||
if (row.merged) successful_records += 1;
|
||||
});
|
||||
let message_args = [successful_records, frm.doc.merge_accounts.length];
|
||||
frm.dashboard.set_headline(__('Successfully merged {0} out of {1}.', message_args));
|
||||
},
|
||||
|
||||
root_type: function(frm) {
|
||||
frm.set_value('account', '');
|
||||
frm.set_value('merge_accounts', []);
|
||||
},
|
||||
|
||||
company: function(frm) {
|
||||
frm.set_value('account', '');
|
||||
frm.set_value('merge_accounts', []);
|
||||
}
|
||||
});
|
||||
|
||||
frappe.ui.form.on('Ledger Merge Accounts', {
|
||||
merge_accounts_add: function(frm) {
|
||||
frm.trigger('update_primary_action');
|
||||
},
|
||||
|
||||
merge_accounts_remove: function(frm) {
|
||||
frm.trigger('update_primary_action');
|
||||
},
|
||||
|
||||
account: function(frm, cdt, cdn) {
|
||||
let row = frappe.get_doc(cdt, cdn);
|
||||
row.account_name = row.account;
|
||||
frm.refresh_field('merge_accounts');
|
||||
frm.trigger('update_primary_action');
|
||||
}
|
||||
});
|
130
erpnext/accounts/doctype/ledger_merge/ledger_merge.json
Normal file
130
erpnext/accounts/doctype/ledger_merge/ledger_merge.json
Normal file
@ -0,0 +1,130 @@
|
||||
{
|
||||
"actions": [],
|
||||
"autoname": "format:{account_name} merger on {creation}",
|
||||
"creation": "2021-12-09 15:38:04.556584",
|
||||
"doctype": "DocType",
|
||||
"editable_grid": 1,
|
||||
"engine": "InnoDB",
|
||||
"field_order": [
|
||||
"section_break_1",
|
||||
"root_type",
|
||||
"account",
|
||||
"account_name",
|
||||
"column_break_3",
|
||||
"company",
|
||||
"status",
|
||||
"is_group",
|
||||
"section_break_5",
|
||||
"merge_accounts"
|
||||
],
|
||||
"fields": [
|
||||
{
|
||||
"depends_on": "root_type",
|
||||
"fieldname": "account",
|
||||
"fieldtype": "Link",
|
||||
"label": "Account",
|
||||
"options": "Account",
|
||||
"reqd": 1,
|
||||
"set_only_once": 1
|
||||
},
|
||||
{
|
||||
"fieldname": "section_break_1",
|
||||
"fieldtype": "Section Break"
|
||||
},
|
||||
{
|
||||
"fieldname": "column_break_3",
|
||||
"fieldtype": "Column Break"
|
||||
},
|
||||
{
|
||||
"fieldname": "merge_accounts",
|
||||
"fieldtype": "Table",
|
||||
"label": "Accounts to Merge",
|
||||
"options": "Ledger Merge Accounts",
|
||||
"reqd": 1
|
||||
},
|
||||
{
|
||||
"depends_on": "account",
|
||||
"fieldname": "section_break_5",
|
||||
"fieldtype": "Section Break"
|
||||
},
|
||||
{
|
||||
"fieldname": "company",
|
||||
"fieldtype": "Link",
|
||||
"label": "Company",
|
||||
"options": "Company",
|
||||
"reqd": 1,
|
||||
"set_only_once": 1
|
||||
},
|
||||
{
|
||||
"fieldname": "status",
|
||||
"fieldtype": "Select",
|
||||
"in_list_view": 1,
|
||||
"label": "Status",
|
||||
"options": "Pending\nSuccess\nPartial Success\nError",
|
||||
"read_only": 1
|
||||
},
|
||||
{
|
||||
"fieldname": "root_type",
|
||||
"fieldtype": "Select",
|
||||
"label": "Root Type",
|
||||
"options": "\nAsset\nLiability\nIncome\nExpense\nEquity",
|
||||
"reqd": 1,
|
||||
"set_only_once": 1
|
||||
},
|
||||
{
|
||||
"depends_on": "account",
|
||||
"fetch_from": "account.account_name",
|
||||
"fetch_if_empty": 1,
|
||||
"fieldname": "account_name",
|
||||
"fieldtype": "Data",
|
||||
"label": "Account Name",
|
||||
"read_only": 1,
|
||||
"reqd": 1
|
||||
},
|
||||
{
|
||||
"default": "0",
|
||||
"depends_on": "account",
|
||||
"fetch_from": "account.is_group",
|
||||
"fieldname": "is_group",
|
||||
"fieldtype": "Check",
|
||||
"label": "Is Group",
|
||||
"read_only": 1
|
||||
}
|
||||
],
|
||||
"hide_toolbar": 1,
|
||||
"links": [],
|
||||
"modified": "2021-12-12 21:34:55.155146",
|
||||
"modified_by": "Administrator",
|
||||
"module": "Accounts",
|
||||
"name": "Ledger Merge",
|
||||
"naming_rule": "Expression",
|
||||
"owner": "Administrator",
|
||||
"permissions": [
|
||||
{
|
||||
"create": 1,
|
||||
"delete": 1,
|
||||
"email": 1,
|
||||
"export": 1,
|
||||
"print": 1,
|
||||
"read": 1,
|
||||
"report": 1,
|
||||
"role": "System Manager",
|
||||
"share": 1,
|
||||
"write": 1
|
||||
},
|
||||
{
|
||||
"create": 1,
|
||||
"email": 1,
|
||||
"export": 1,
|
||||
"print": 1,
|
||||
"read": 1,
|
||||
"report": 1,
|
||||
"role": "Accounts Manager",
|
||||
"share": 1,
|
||||
"write": 1
|
||||
}
|
||||
],
|
||||
"sort_field": "modified",
|
||||
"sort_order": "DESC",
|
||||
"track_changes": 1
|
||||
}
|
76
erpnext/accounts/doctype/ledger_merge/ledger_merge.py
Normal file
76
erpnext/accounts/doctype/ledger_merge/ledger_merge.py
Normal file
@ -0,0 +1,76 @@
|
||||
# Copyright (c) 2021, Wahni Green Technologies Pvt. Ltd. and contributors
|
||||
# For license information, please see license.txt
|
||||
|
||||
import frappe
|
||||
from frappe import _
|
||||
from frappe.model.document import Document
|
||||
|
||||
from erpnext.accounts.doctype.account.account import merge_account
|
||||
|
||||
|
||||
class LedgerMerge(Document):
|
||||
def start_merge(self):
|
||||
from frappe.core.page.background_jobs.background_jobs import get_info
|
||||
from frappe.utils.background_jobs import enqueue
|
||||
from frappe.utils.scheduler import is_scheduler_inactive
|
||||
|
||||
if is_scheduler_inactive() and not frappe.flags.in_test:
|
||||
frappe.throw(
|
||||
_("Scheduler is inactive. Cannot merge accounts."), title=_("Scheduler Inactive")
|
||||
)
|
||||
|
||||
enqueued_jobs = [d.get("job_name") for d in get_info()]
|
||||
|
||||
if self.name not in enqueued_jobs:
|
||||
enqueue(
|
||||
start_merge,
|
||||
queue="default",
|
||||
timeout=6000,
|
||||
event="ledger_merge",
|
||||
job_name=self.name,
|
||||
docname=self.name,
|
||||
now=frappe.conf.developer_mode or frappe.flags.in_test,
|
||||
)
|
||||
return True
|
||||
|
||||
return False
|
||||
|
||||
@frappe.whitelist()
|
||||
def form_start_merge(docname):
|
||||
return frappe.get_doc("Ledger Merge", docname).start_merge()
|
||||
|
||||
def start_merge(docname):
|
||||
ledger_merge = frappe.get_doc("Ledger Merge", docname)
|
||||
successful_merges = 0
|
||||
total = len(ledger_merge.merge_accounts)
|
||||
for row in ledger_merge.merge_accounts:
|
||||
if not row.merged:
|
||||
try:
|
||||
merge_account(
|
||||
row.account,
|
||||
ledger_merge.account,
|
||||
ledger_merge.is_group,
|
||||
ledger_merge.root_type,
|
||||
ledger_merge.company
|
||||
)
|
||||
row.db_set('merged', 1)
|
||||
frappe.db.commit()
|
||||
successful_merges += 1
|
||||
frappe.publish_realtime("ledger_merge_progress", {
|
||||
"ledger_merge": ledger_merge.name,
|
||||
"current": successful_merges,
|
||||
"total": total
|
||||
}
|
||||
)
|
||||
except Exception:
|
||||
frappe.db.rollback()
|
||||
frappe.log_error(title=ledger_merge.name)
|
||||
finally:
|
||||
if successful_merges == total:
|
||||
ledger_merge.db_set('status', 'Success')
|
||||
elif successful_merges > 0:
|
||||
ledger_merge.db_set('status', 'Partial Success')
|
||||
else:
|
||||
ledger_merge.db_set('status', 'Error')
|
||||
|
||||
frappe.publish_realtime("ledger_merge_refresh", {"ledger_merge": ledger_merge.name})
|
118
erpnext/accounts/doctype/ledger_merge/test_ledger_merge.py
Normal file
118
erpnext/accounts/doctype/ledger_merge/test_ledger_merge.py
Normal file
@ -0,0 +1,118 @@
|
||||
# Copyright (c) 2021, Wahni Green Technologies Pvt. Ltd. and Contributors
|
||||
# See license.txt
|
||||
|
||||
import unittest
|
||||
|
||||
import frappe
|
||||
|
||||
from erpnext.accounts.doctype.ledger_merge.ledger_merge import start_merge
|
||||
|
||||
|
||||
class TestLedgerMerge(unittest.TestCase):
|
||||
def test_merge_success(self):
|
||||
if not frappe.db.exists("Account", "Indirect Expenses - _TC"):
|
||||
acc = frappe.new_doc("Account")
|
||||
acc.account_name = "Indirect Expenses"
|
||||
acc.is_group = 1
|
||||
acc.parent_account = "Expenses - _TC"
|
||||
acc.company = "_Test Company"
|
||||
acc.insert()
|
||||
if not frappe.db.exists("Account", "Indirect Test Expenses - _TC"):
|
||||
acc = frappe.new_doc("Account")
|
||||
acc.account_name = "Indirect Test Expenses"
|
||||
acc.is_group = 1
|
||||
acc.parent_account = "Expenses - _TC"
|
||||
acc.company = "_Test Company"
|
||||
acc.insert()
|
||||
if not frappe.db.exists("Account", "Administrative Test Expenses - _TC"):
|
||||
acc = frappe.new_doc("Account")
|
||||
acc.account_name = "Administrative Test Expenses"
|
||||
acc.parent_account = "Indirect Test Expenses - _TC"
|
||||
acc.company = "_Test Company"
|
||||
acc.insert()
|
||||
|
||||
doc = frappe.get_doc({
|
||||
"doctype": "Ledger Merge",
|
||||
"company": "_Test Company",
|
||||
"root_type": frappe.db.get_value("Account", "Indirect Test Expenses - _TC", "root_type"),
|
||||
"account": "Indirect Expenses - _TC",
|
||||
"merge_accounts": [
|
||||
{
|
||||
"account": "Indirect Test Expenses - _TC",
|
||||
"account_name": "Indirect Expenses"
|
||||
}
|
||||
]
|
||||
}).insert(ignore_permissions=True)
|
||||
|
||||
parent = frappe.db.get_value("Account", "Administrative Test Expenses - _TC", "parent_account")
|
||||
self.assertEqual(parent, "Indirect Test Expenses - _TC")
|
||||
|
||||
start_merge(doc.name)
|
||||
|
||||
parent = frappe.db.get_value("Account", "Administrative Test Expenses - _TC", "parent_account")
|
||||
self.assertEqual(parent, "Indirect Expenses - _TC")
|
||||
|
||||
self.assertFalse(frappe.db.exists("Account", "Indirect Test Expenses - _TC"))
|
||||
|
||||
def test_partial_merge_success(self):
|
||||
if not frappe.db.exists("Account", "Indirect Income - _TC"):
|
||||
acc = frappe.new_doc("Account")
|
||||
acc.account_name = "Indirect Income"
|
||||
acc.is_group = 1
|
||||
acc.parent_account = "Income - _TC"
|
||||
acc.company = "_Test Company"
|
||||
acc.insert()
|
||||
if not frappe.db.exists("Account", "Indirect Test Income - _TC"):
|
||||
acc = frappe.new_doc("Account")
|
||||
acc.account_name = "Indirect Test Income"
|
||||
acc.is_group = 1
|
||||
acc.parent_account = "Income - _TC"
|
||||
acc.company = "_Test Company"
|
||||
acc.insert()
|
||||
if not frappe.db.exists("Account", "Administrative Test Income - _TC"):
|
||||
acc = frappe.new_doc("Account")
|
||||
acc.account_name = "Administrative Test Income"
|
||||
acc.parent_account = "Indirect Test Income - _TC"
|
||||
acc.company = "_Test Company"
|
||||
acc.insert()
|
||||
|
||||
doc = frappe.get_doc({
|
||||
"doctype": "Ledger Merge",
|
||||
"company": "_Test Company",
|
||||
"root_type": frappe.db.get_value("Account", "Indirect Income - _TC", "root_type"),
|
||||
"account": "Indirect Income - _TC",
|
||||
"merge_accounts": [
|
||||
{
|
||||
"account": "Indirect Test Income - _TC",
|
||||
"account_name": "Indirect Test Income"
|
||||
},
|
||||
{
|
||||
"account": "Administrative Test Income - _TC",
|
||||
"account_name": "Administrative Test Income"
|
||||
}
|
||||
]
|
||||
}).insert(ignore_permissions=True)
|
||||
|
||||
parent = frappe.db.get_value("Account", "Administrative Test Income - _TC", "parent_account")
|
||||
self.assertEqual(parent, "Indirect Test Income - _TC")
|
||||
|
||||
start_merge(doc.name)
|
||||
|
||||
parent = frappe.db.get_value("Account", "Administrative Test Income - _TC", "parent_account")
|
||||
self.assertEqual(parent, "Indirect Income - _TC")
|
||||
|
||||
self.assertFalse(frappe.db.exists("Account", "Indirect Test Income - _TC"))
|
||||
self.assertTrue(frappe.db.exists("Account", "Administrative Test Income - _TC"))
|
||||
|
||||
def tearDown(self):
|
||||
for entry in frappe.db.get_all("Ledger Merge"):
|
||||
frappe.delete_doc("Ledger Merge", entry.name)
|
||||
|
||||
test_accounts = [
|
||||
"Indirect Test Expenses - _TC",
|
||||
"Administrative Test Expenses - _TC",
|
||||
"Indirect Test Income - _TC",
|
||||
"Administrative Test Income - _TC"
|
||||
]
|
||||
for account in test_accounts:
|
||||
frappe.delete_doc_if_exists("Account", account)
|
@ -0,0 +1,52 @@
|
||||
{
|
||||
"actions": [],
|
||||
"allow_rename": 1,
|
||||
"creation": "2021-12-09 15:44:58.033398",
|
||||
"doctype": "DocType",
|
||||
"editable_grid": 1,
|
||||
"engine": "InnoDB",
|
||||
"field_order": [
|
||||
"account",
|
||||
"account_name",
|
||||
"merged"
|
||||
],
|
||||
"fields": [
|
||||
{
|
||||
"columns": 4,
|
||||
"fieldname": "account",
|
||||
"fieldtype": "Link",
|
||||
"in_list_view": 1,
|
||||
"label": "Account",
|
||||
"options": "Account",
|
||||
"reqd": 1
|
||||
},
|
||||
{
|
||||
"columns": 2,
|
||||
"default": "0",
|
||||
"fieldname": "merged",
|
||||
"fieldtype": "Check",
|
||||
"in_list_view": 1,
|
||||
"label": "Merged",
|
||||
"read_only": 1
|
||||
},
|
||||
{
|
||||
"columns": 4,
|
||||
"fieldname": "account_name",
|
||||
"fieldtype": "Data",
|
||||
"label": "Account Name",
|
||||
"read_only": 1,
|
||||
"reqd": 1
|
||||
}
|
||||
],
|
||||
"index_web_pages_for_search": 1,
|
||||
"istable": 1,
|
||||
"links": [],
|
||||
"modified": "2021-12-10 15:27:24.477139",
|
||||
"modified_by": "Administrator",
|
||||
"module": "Accounts",
|
||||
"name": "Ledger Merge Accounts",
|
||||
"owner": "Administrator",
|
||||
"permissions": [],
|
||||
"sort_field": "modified",
|
||||
"sort_order": "DESC"
|
||||
}
|
@ -0,0 +1,9 @@
|
||||
# Copyright (c) 2021, Wahni Green Technologies Pvt. Ltd. and contributors
|
||||
# For license information, please see license.txt
|
||||
|
||||
# import frappe
|
||||
from frappe.model.document import Document
|
||||
|
||||
|
||||
class LedgerMergeAccounts(Document):
|
||||
pass
|
@ -986,7 +986,7 @@ class TestPurchaseInvoice(unittest.TestCase):
|
||||
|
||||
pi = make_purchase_invoice(item=item.name, qty=1, rate=100, do_not_save=True)
|
||||
pi.set_posting_time = 1
|
||||
pi.posting_date = '2019-03-15'
|
||||
pi.posting_date = '2019-01-10'
|
||||
pi.items[0].enable_deferred_expense = 1
|
||||
pi.items[0].service_start_date = "2019-01-10"
|
||||
pi.items[0].service_end_date = "2019-03-15"
|
||||
@ -1236,7 +1236,7 @@ def check_gl_entries(doc, voucher_no, expected_gle, posting_date):
|
||||
def update_tax_witholding_category(company, account):
|
||||
from erpnext.accounts.utils import get_fiscal_year
|
||||
|
||||
fiscal_year = get_fiscal_year(fiscal_year='2021')
|
||||
fiscal_year = get_fiscal_year(date=nowdate())
|
||||
|
||||
if not frappe.db.get_value('Tax Withholding Rate',
|
||||
{'parent': 'TDS - 194 - Dividends - Individual', 'from_date': ('>=', fiscal_year[1]),
|
||||
|
@ -7,6 +7,7 @@ def get_data():
|
||||
'non_standard_fieldnames': {
|
||||
'Journal Entry': 'reference_name',
|
||||
'Payment Entry': 'reference_name',
|
||||
'Payment Request': 'reference_name',
|
||||
'Auto Repeat': 'reference_document'
|
||||
},
|
||||
'internal_links': {
|
||||
@ -21,7 +22,7 @@ def get_data():
|
||||
},
|
||||
{
|
||||
'label': _('Payment'),
|
||||
'items': ['Payment Entry', 'Journal Entry']
|
||||
'items': ['Payment Entry', 'Journal Entry', 'Payment Request']
|
||||
},
|
||||
{
|
||||
'label': _('Reference'),
|
||||
|
@ -184,6 +184,8 @@ class AccountsController(TransactionBase):
|
||||
frappe.throw(_("Row #{0}: Service Start Date cannot be greater than Service End Date").format(d.idx))
|
||||
elif getdate(self.posting_date) > getdate(d.service_end_date):
|
||||
frappe.throw(_("Row #{0}: Service End Date cannot be before Invoice Posting Date").format(d.idx))
|
||||
elif getdate(self.posting_date) > getdate(d.service_start_date):
|
||||
frappe.throw(_("Row #{0}: Service Start Date cannot be before Invoice Posting Date").format(d.idx))
|
||||
|
||||
def validate_invoice_documents_schedule(self):
|
||||
self.validate_payment_schedule_dates()
|
||||
|
@ -17,7 +17,9 @@
|
||||
"column_break_9",
|
||||
"create_event_on_next_contact_date_opportunity",
|
||||
"quotation_section",
|
||||
"default_valid_till"
|
||||
"default_valid_till",
|
||||
"section_break_13",
|
||||
"carry_forward_communication_and_comments"
|
||||
],
|
||||
"fields": [
|
||||
{
|
||||
@ -85,13 +87,25 @@
|
||||
"fieldname": "quotation_section",
|
||||
"fieldtype": "Section Break",
|
||||
"label": "Quotation"
|
||||
},
|
||||
{
|
||||
"fieldname": "section_break_13",
|
||||
"fieldtype": "Section Break",
|
||||
"label": "Other Settings"
|
||||
},
|
||||
{
|
||||
"default": "0",
|
||||
"description": "All the Comments and Emails will be copied from one document to another newly created document(Lead -> Opportunity -> Quotation) throughout the CRM documents.",
|
||||
"fieldname": "carry_forward_communication_and_comments",
|
||||
"fieldtype": "Check",
|
||||
"label": "Carry Forward Communication and Comments"
|
||||
}
|
||||
],
|
||||
"icon": "fa fa-cog",
|
||||
"index_web_pages_for_search": 1,
|
||||
"issingle": 1,
|
||||
"links": [],
|
||||
"modified": "2021-11-03 10:00:36.883496",
|
||||
"modified": "2021-12-20 12:51:38.894252",
|
||||
"modified_by": "Administrator",
|
||||
"module": "CRM",
|
||||
"name": "CRM Settings",
|
||||
@ -105,6 +119,26 @@
|
||||
"role": "System Manager",
|
||||
"share": 1,
|
||||
"write": 1
|
||||
},
|
||||
{
|
||||
"create": 1,
|
||||
"delete": 1,
|
||||
"email": 1,
|
||||
"print": 1,
|
||||
"read": 1,
|
||||
"role": "Sales Manager",
|
||||
"share": 1,
|
||||
"write": 1
|
||||
},
|
||||
{
|
||||
"create": 1,
|
||||
"delete": 1,
|
||||
"email": 1,
|
||||
"print": 1,
|
||||
"read": 1,
|
||||
"role": "Sales Master Manager",
|
||||
"share": 1,
|
||||
"write": 1
|
||||
}
|
||||
],
|
||||
"sort_field": "modified",
|
||||
|
@ -23,6 +23,17 @@ class TestLead(unittest.TestCase):
|
||||
customer.customer_group = "_Test Customer Group"
|
||||
customer.insert()
|
||||
|
||||
#check whether lead contact is carried forward to the customer.
|
||||
contact = frappe.db.get_value('Dynamic Link', {
|
||||
"parenttype": "Contact",
|
||||
"link_doctype": "Lead",
|
||||
"link_name": customer.lead_name,
|
||||
}, "parent")
|
||||
|
||||
if contact:
|
||||
contact_doc = frappe.get_doc("Contact", contact)
|
||||
self.assertEqual(contact_doc.has_link(customer.doctype, customer.name), True)
|
||||
|
||||
def test_make_customer_from_organization(self):
|
||||
from erpnext.crm.doctype.lead.lead import make_customer
|
||||
|
||||
|
@ -11,6 +11,7 @@ from frappe.model.mapper import get_mapped_doc
|
||||
from frappe.query_builder import DocType
|
||||
from frappe.utils import cint, cstr, flt, get_fullname
|
||||
|
||||
from erpnext.crm.utils import add_link_in_communication, copy_comments
|
||||
from erpnext.setup.utils import get_exchange_rate
|
||||
from erpnext.utilities.transaction_base import TransactionBase
|
||||
|
||||
@ -20,6 +21,11 @@ class Opportunity(TransactionBase):
|
||||
if self.opportunity_from == "Lead":
|
||||
frappe.get_doc("Lead", self.party_name).set_status(update=True)
|
||||
|
||||
if self.opportunity_from in ["Lead", "Prospect"]:
|
||||
if frappe.db.get_single_value("CRM Settings", "carry_forward_communication_and_comments"):
|
||||
copy_comments(self.opportunity_from, self.party_name, self)
|
||||
add_link_in_communication(self.opportunity_from, self.party_name, self)
|
||||
|
||||
def validate(self):
|
||||
self._prev = frappe._dict({
|
||||
"contact_date": frappe.db.get_value("Opportunity", self.name, "contact_date") if \
|
||||
|
@ -4,10 +4,12 @@
|
||||
import unittest
|
||||
|
||||
import frappe
|
||||
from frappe.utils import random_string, today
|
||||
from frappe.utils import now_datetime, random_string, today
|
||||
|
||||
from erpnext.crm.doctype.lead.lead import make_customer
|
||||
from erpnext.crm.doctype.lead.test_lead import make_lead
|
||||
from erpnext.crm.doctype.opportunity.opportunity import make_quotation
|
||||
from erpnext.crm.utils import get_linked_communication_list
|
||||
|
||||
test_records = frappe.get_test_records('Opportunity')
|
||||
|
||||
@ -28,21 +30,11 @@ class TestOpportunity(unittest.TestCase):
|
||||
self.assertEqual(doc.status, "Quotation")
|
||||
|
||||
def test_make_new_lead_if_required(self):
|
||||
new_lead_email_id = "new{}@example.com".format(random_string(5))
|
||||
args = {
|
||||
"doctype": "Opportunity",
|
||||
"contact_email": new_lead_email_id,
|
||||
"opportunity_type": "Sales",
|
||||
"with_items": 0,
|
||||
"transaction_date": today()
|
||||
}
|
||||
# new lead should be created against the new.opportunity@example.com
|
||||
opp_doc = frappe.get_doc(args).insert(ignore_permissions=True)
|
||||
opp_doc = make_opportunity_from_lead()
|
||||
|
||||
self.assertTrue(opp_doc.party_name)
|
||||
self.assertEqual(opp_doc.opportunity_from, "Lead")
|
||||
self.assertEqual(frappe.db.get_value("Lead", opp_doc.party_name, "email_id"),
|
||||
new_lead_email_id)
|
||||
self.assertEqual(frappe.db.get_value("Lead", opp_doc.party_name, "email_id"), opp_doc.contact_email)
|
||||
|
||||
# create new customer and create new contact against 'new.opportunity@example.com'
|
||||
customer = make_customer(opp_doc.party_name).insert(ignore_permissions=True)
|
||||
@ -54,18 +46,60 @@ class TestOpportunity(unittest.TestCase):
|
||||
"link_name": customer.name
|
||||
}]
|
||||
})
|
||||
contact.add_email(new_lead_email_id, is_primary=True)
|
||||
contact.add_email(opp_doc.contact_email, is_primary=True)
|
||||
contact.insert(ignore_permissions=True)
|
||||
|
||||
opp_doc = frappe.get_doc(args).insert(ignore_permissions=True)
|
||||
self.assertTrue(opp_doc.party_name)
|
||||
self.assertEqual(opp_doc.opportunity_from, "Customer")
|
||||
self.assertEqual(opp_doc.party_name, customer.name)
|
||||
|
||||
def test_opportunity_item(self):
|
||||
opportunity_doc = make_opportunity(with_items=1, rate=1100, qty=2)
|
||||
self.assertEqual(opportunity_doc.total, 2200)
|
||||
|
||||
def test_carry_forward_of_email_and_comments(self):
|
||||
frappe.db.set_value("CRM Settings", "CRM Settings", "carry_forward_communication_and_comments", 1)
|
||||
lead_doc = make_lead()
|
||||
lead_doc.add_comment('Comment', text='Test Comment 1')
|
||||
lead_doc.add_comment('Comment', text='Test Comment 2')
|
||||
create_communication(lead_doc.doctype, lead_doc.name, lead_doc.email_id)
|
||||
create_communication(lead_doc.doctype, lead_doc.name, lead_doc.email_id)
|
||||
|
||||
opp_doc = make_opportunity(opportunity_from="Lead", lead=lead_doc.name)
|
||||
opportunity_comment_count = frappe.db.count("Comment", {"reference_doctype": opp_doc.doctype, "reference_name": opp_doc.name})
|
||||
opportunity_communication_count = len(get_linked_communication_list(opp_doc.doctype, opp_doc.name))
|
||||
self.assertEqual(opportunity_comment_count, 2)
|
||||
self.assertEqual(opportunity_communication_count, 2)
|
||||
|
||||
opp_doc.add_comment('Comment', text='Test Comment 3')
|
||||
opp_doc.add_comment('Comment', text='Test Comment 4')
|
||||
create_communication(opp_doc.doctype, opp_doc.name, opp_doc.contact_email)
|
||||
create_communication(opp_doc.doctype, opp_doc.name, opp_doc.contact_email)
|
||||
|
||||
quotation_doc = make_quotation(opp_doc.name)
|
||||
quotation_doc.append('items', {
|
||||
"item_code": "_Test Item",
|
||||
"qty": 1
|
||||
})
|
||||
quotation_doc.run_method("set_missing_values")
|
||||
quotation_doc.run_method("calculate_taxes_and_totals")
|
||||
quotation_doc.save()
|
||||
|
||||
quotation_comment_count = frappe.db.count("Comment", {"reference_doctype": quotation_doc.doctype, "reference_name": quotation_doc.name, "comment_type": "Comment"})
|
||||
quotation_communication_count = len(get_linked_communication_list(quotation_doc.doctype, quotation_doc.name))
|
||||
self.assertEqual(quotation_comment_count, 4)
|
||||
self.assertEqual(quotation_communication_count, 4)
|
||||
|
||||
def make_opportunity_from_lead():
|
||||
new_lead_email_id = "new{}@example.com".format(random_string(5))
|
||||
args = {
|
||||
"doctype": "Opportunity",
|
||||
"contact_email": new_lead_email_id,
|
||||
"opportunity_type": "Sales",
|
||||
"with_items": 0,
|
||||
"transaction_date": today()
|
||||
}
|
||||
# new lead should be created against the new.opportunity@example.com
|
||||
opp_doc = frappe.get_doc(args).insert(ignore_permissions=True)
|
||||
|
||||
return opp_doc
|
||||
|
||||
def make_opportunity(**args):
|
||||
args = frappe._dict(args)
|
||||
|
||||
@ -95,3 +129,20 @@ def make_opportunity(**args):
|
||||
|
||||
opp_doc.insert()
|
||||
return opp_doc
|
||||
|
||||
def create_communication(reference_doctype, reference_name, sender, sent_or_received=None, creation=None):
|
||||
communication = frappe.get_doc({
|
||||
"doctype": "Communication",
|
||||
"communication_type": "Communication",
|
||||
"communication_medium": "Email",
|
||||
"sent_or_received": sent_or_received or "Sent",
|
||||
"email_status": "Open",
|
||||
"subject": "Test Subject",
|
||||
"sender": sender,
|
||||
"content": "Test",
|
||||
"status": "Linked",
|
||||
"reference_doctype": reference_doctype,
|
||||
"creation": creation or now_datetime(),
|
||||
"reference_name": reference_name
|
||||
})
|
||||
communication.save()
|
@ -6,6 +6,8 @@ from frappe.contacts.address_and_contact import load_address_and_contact
|
||||
from frappe.model.document import Document
|
||||
from frappe.model.mapper import get_mapped_doc
|
||||
|
||||
from erpnext.crm.utils import add_link_in_communication, copy_comments
|
||||
|
||||
|
||||
class Prospect(Document):
|
||||
def onload(self):
|
||||
@ -20,6 +22,12 @@ class Prospect(Document):
|
||||
def on_trash(self):
|
||||
self.unlink_dynamic_links()
|
||||
|
||||
def after_insert(self):
|
||||
if frappe.db.get_single_value("CRM Settings", "carry_forward_communication_and_comments"):
|
||||
for row in self.get('prospect_lead'):
|
||||
copy_comments("Lead", row.lead, self)
|
||||
add_link_in_communication("Lead", row.lead, self)
|
||||
|
||||
def update_lead_details(self):
|
||||
for row in self.get('prospect_lead'):
|
||||
lead = frappe.get_value('Lead', row.lead, ['lead_name', 'status', 'email_id', 'mobile_no'], as_dict=True)
|
||||
|
@ -21,3 +21,30 @@ def update_lead_phone_numbers(contact, method):
|
||||
lead = frappe.get_doc("Lead", contact_lead)
|
||||
lead.db_set("phone", phone)
|
||||
lead.db_set("mobile_no", mobile_no)
|
||||
|
||||
def copy_comments(doctype, docname, doc):
|
||||
comments = frappe.db.get_values("Comment", filters={"reference_doctype": doctype, "reference_name": docname, "comment_type": "Comment"}, fieldname="*")
|
||||
for comment in comments:
|
||||
comment = frappe.get_doc(comment.update({"doctype":"Comment"}))
|
||||
comment.name = None
|
||||
comment.reference_doctype = doc.doctype
|
||||
comment.reference_name = doc.name
|
||||
comment.insert()
|
||||
|
||||
def add_link_in_communication(doctype, docname, doc):
|
||||
communication_list = get_linked_communication_list(doctype, docname)
|
||||
|
||||
for communication in communication_list:
|
||||
communication_doc = frappe.get_doc("Communication", communication)
|
||||
communication_doc.add_link(doc.doctype, doc.name, autosave=True)
|
||||
|
||||
def get_linked_communication_list(doctype, docname):
|
||||
communications = frappe.get_all("Communication", filters={"reference_doctype": doctype, "reference_name": docname}, pluck='name')
|
||||
communication_links = frappe.get_all('Communication Link',
|
||||
{
|
||||
"link_doctype": doctype,
|
||||
"link_name": docname,
|
||||
"parent": ("not in", communications)
|
||||
}, pluck="parent")
|
||||
|
||||
return communications + communication_links
|
||||
|
@ -1,78 +0,0 @@
|
||||
{
|
||||
"charts": [],
|
||||
"content": "[{\"type\": \"header\", \"data\": {\"text\": \"Reports & Masters\", \"level\": 4, \"col\": 12}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Integrations Settings\", \"col\": 4}}]",
|
||||
"creation": "2020-07-31 10:38:54.021237",
|
||||
"docstatus": 0,
|
||||
"doctype": "Workspace",
|
||||
"for_user": "",
|
||||
"hide_custom": 0,
|
||||
"icon": "setting",
|
||||
"idx": 0,
|
||||
"label": "ERPNext Integrations Settings",
|
||||
"links": [
|
||||
{
|
||||
"hidden": 0,
|
||||
"is_query_report": 0,
|
||||
"label": "Integrations Settings",
|
||||
"link_count": 0,
|
||||
"onboard": 0,
|
||||
"type": "Card Break"
|
||||
},
|
||||
{
|
||||
"dependencies": "",
|
||||
"hidden": 0,
|
||||
"is_query_report": 0,
|
||||
"label": "Woocommerce Settings",
|
||||
"link_count": 0,
|
||||
"link_to": "Woocommerce Settings",
|
||||
"link_type": "DocType",
|
||||
"onboard": 0,
|
||||
"type": "Link"
|
||||
},
|
||||
{
|
||||
"dependencies": "",
|
||||
"hidden": 0,
|
||||
"is_query_report": 0,
|
||||
"label": "Amazon MWS Settings",
|
||||
"link_count": 0,
|
||||
"link_to": "Amazon MWS Settings",
|
||||
"link_type": "DocType",
|
||||
"onboard": 0,
|
||||
"type": "Link"
|
||||
},
|
||||
{
|
||||
"dependencies": "",
|
||||
"hidden": 0,
|
||||
"is_query_report": 0,
|
||||
"label": "Plaid Settings",
|
||||
"link_count": 0,
|
||||
"link_to": "Plaid Settings",
|
||||
"link_type": "DocType",
|
||||
"onboard": 0,
|
||||
"type": "Link"
|
||||
},
|
||||
{
|
||||
"dependencies": "",
|
||||
"hidden": 0,
|
||||
"is_query_report": 0,
|
||||
"label": "Exotel Settings",
|
||||
"link_count": 0,
|
||||
"link_to": "Exotel Settings",
|
||||
"link_type": "DocType",
|
||||
"onboard": 0,
|
||||
"type": "Link"
|
||||
}
|
||||
],
|
||||
"modified": "2021-11-23 04:30:33.106991",
|
||||
"modified_by": "Administrator",
|
||||
"module": "ERPNext Integrations",
|
||||
"name": "ERPNext Integrations Settings",
|
||||
"owner": "Administrator",
|
||||
"parent_page": "",
|
||||
"public": 1,
|
||||
"restrict_to_domain": "",
|
||||
"roles": [],
|
||||
"sequence_id": 11,
|
||||
"shortcuts": [],
|
||||
"title": "ERPNext Integrations Settings"
|
||||
}
|
@ -6,6 +6,15 @@ frappe.ui.form.on('Department', {
|
||||
frm.set_query("parent_department", function(){
|
||||
return {"filters": [["Department", "is_group", "=", 1]]};
|
||||
});
|
||||
|
||||
frm.set_query("payroll_cost_center", function() {
|
||||
return {
|
||||
filters: {
|
||||
"company": frm.doc.company,
|
||||
"is_group": 0
|
||||
}
|
||||
};
|
||||
});
|
||||
},
|
||||
refresh: function(frm) {
|
||||
// read-only for root department
|
||||
|
@ -47,6 +47,15 @@ frappe.ui.form.on('Employee', {
|
||||
}
|
||||
};
|
||||
});
|
||||
|
||||
frm.set_query("payroll_cost_center", function() {
|
||||
return {
|
||||
filters: {
|
||||
"company": frm.doc.company,
|
||||
"is_group": 0
|
||||
}
|
||||
};
|
||||
});
|
||||
},
|
||||
onload: function (frm) {
|
||||
frm.set_query("department", function() {
|
||||
|
@ -68,12 +68,18 @@ class Employee(NestedSet):
|
||||
self.employee_name = ' '.join(filter(lambda x: x, [self.first_name, self.middle_name, self.last_name]))
|
||||
|
||||
def validate_user_details(self):
|
||||
data = frappe.db.get_value('User',
|
||||
self.user_id, ['enabled', 'user_image'], as_dict=1)
|
||||
if data.get("user_image") and self.image == '':
|
||||
self.image = data.get("user_image")
|
||||
self.validate_for_enabled_user_id(data.get("enabled", 0))
|
||||
self.validate_duplicate_user_id()
|
||||
if self.user_id:
|
||||
data = frappe.db.get_value('User',
|
||||
self.user_id, ['enabled', 'user_image'], as_dict=1)
|
||||
|
||||
if not data:
|
||||
self.user_id = None
|
||||
return
|
||||
|
||||
if data.get("user_image") and self.image == '':
|
||||
self.image = data.get("user_image")
|
||||
self.validate_for_enabled_user_id(data.get("enabled", 0))
|
||||
self.validate_duplicate_user_id()
|
||||
|
||||
def update_nsm_model(self):
|
||||
frappe.utils.nestedset.update_nsm(self)
|
||||
|
@ -171,7 +171,7 @@ frappe.ui.form.on("Expense Claim", {
|
||||
['docstatus', '=', 1],
|
||||
['employee', '=', frm.doc.employee],
|
||||
['paid_amount', '>', 0],
|
||||
['paid_amount', '>', 'claimed_amount']
|
||||
['status', '!=', 'Claimed']
|
||||
]
|
||||
};
|
||||
});
|
||||
|
@ -10,15 +10,17 @@ from erpnext.accounts.doctype.account.test_account import create_account
|
||||
from erpnext.hr.doctype.employee.test_employee import make_employee
|
||||
from erpnext.hr.doctype.expense_claim.expense_claim import make_bank_entry
|
||||
|
||||
test_records = frappe.get_test_records('Expense Claim')
|
||||
test_dependencies = ['Employee']
|
||||
company_name = '_Test Company 4'
|
||||
company_name = '_Test Company 3'
|
||||
|
||||
|
||||
class TestExpenseClaim(unittest.TestCase):
|
||||
def tearDown(self):
|
||||
frappe.db.rollback()
|
||||
|
||||
def test_total_expense_claim_for_project(self):
|
||||
frappe.db.sql("""delete from `tabTask` where project = "_Test Project 1" """)
|
||||
frappe.db.sql("""delete from `tabProject` where name = "_Test Project 1" """)
|
||||
frappe.db.sql("""delete from `tabTask`""")
|
||||
frappe.db.sql("""delete from `tabProject`""")
|
||||
frappe.db.sql("update `tabExpense Claim` set project = '', task = ''")
|
||||
|
||||
project = frappe.get_doc({
|
||||
@ -37,12 +39,12 @@ class TestExpenseClaim(unittest.TestCase):
|
||||
task_name = task.name
|
||||
payable_account = get_payable_account(company_name)
|
||||
|
||||
make_expense_claim(payable_account, 300, 200, company_name, "Travel Expenses - _TC4", project.name, task_name)
|
||||
make_expense_claim(payable_account, 300, 200, company_name, "Travel Expenses - _TC3", project.name, task_name)
|
||||
|
||||
self.assertEqual(frappe.db.get_value("Task", task_name, "total_expense_claim"), 200)
|
||||
self.assertEqual(frappe.db.get_value("Project", project.name, "total_expense_claim"), 200)
|
||||
|
||||
expense_claim2 = make_expense_claim(payable_account, 600, 500, company_name, "Travel Expenses - _TC4", project.name, task_name)
|
||||
expense_claim2 = make_expense_claim(payable_account, 600, 500, company_name, "Travel Expenses - _TC3", project.name, task_name)
|
||||
|
||||
self.assertEqual(frappe.db.get_value("Task", task_name, "total_expense_claim"), 700)
|
||||
self.assertEqual(frappe.db.get_value("Project", project.name, "total_expense_claim"), 700)
|
||||
@ -54,7 +56,7 @@ class TestExpenseClaim(unittest.TestCase):
|
||||
|
||||
def test_expense_claim_status(self):
|
||||
payable_account = get_payable_account(company_name)
|
||||
expense_claim = make_expense_claim(payable_account, 300, 200, company_name, "Travel Expenses - _TC4")
|
||||
expense_claim = make_expense_claim(payable_account, 300, 200, company_name, "Travel Expenses - _TC3")
|
||||
|
||||
je_dict = make_bank_entry("Expense Claim", expense_claim.name)
|
||||
je = frappe.get_doc(je_dict)
|
||||
@ -73,7 +75,7 @@ class TestExpenseClaim(unittest.TestCase):
|
||||
def test_expense_claim_gl_entry(self):
|
||||
payable_account = get_payable_account(company_name)
|
||||
taxes = generate_taxes()
|
||||
expense_claim = make_expense_claim(payable_account, 300, 200, company_name, "Travel Expenses - _TC4",
|
||||
expense_claim = make_expense_claim(payable_account, 300, 200, company_name, "Travel Expenses - _TC3",
|
||||
do_not_submit=True, taxes=taxes)
|
||||
expense_claim.submit()
|
||||
|
||||
@ -84,9 +86,9 @@ class TestExpenseClaim(unittest.TestCase):
|
||||
self.assertTrue(gl_entries)
|
||||
|
||||
expected_values = dict((d[0], d) for d in [
|
||||
['Output Tax CGST - _TC4',18.0, 0.0],
|
||||
['Output Tax CGST - _TC3',18.0, 0.0],
|
||||
[payable_account, 0.0, 218.0],
|
||||
["Travel Expenses - _TC4", 200.0, 0.0]
|
||||
["Travel Expenses - _TC3", 200.0, 0.0]
|
||||
])
|
||||
|
||||
for gle in gl_entries:
|
||||
@ -102,7 +104,7 @@ class TestExpenseClaim(unittest.TestCase):
|
||||
"payable_account": payable_account,
|
||||
"approval_status": "Rejected",
|
||||
"expenses":
|
||||
[{ "expense_type": "Travel", "default_account": "Travel Expenses - _TC4", "amount": 300, "sanctioned_amount": 200 }]
|
||||
[{"expense_type": "Travel", "default_account": "Travel Expenses - _TC3", "amount": 300, "sanctioned_amount": 200}]
|
||||
})
|
||||
expense_claim.submit()
|
||||
|
||||
|
@ -1 +0,0 @@
|
||||
[]
|
@ -4,6 +4,7 @@ import frappe
|
||||
from frappe.utils import add_days, add_months, getdate, nowdate
|
||||
|
||||
import erpnext
|
||||
from erpnext.hr.doctype.employee.test_employee import make_employee
|
||||
from erpnext.hr.doctype.leave_ledger_entry.leave_ledger_entry import process_expired_allocation
|
||||
from erpnext.hr.doctype.leave_type.test_leave_type import create_leave_type
|
||||
|
||||
@ -13,16 +14,19 @@ class TestLeaveAllocation(unittest.TestCase):
|
||||
def setUpClass(cls):
|
||||
frappe.db.sql("delete from `tabLeave Period`")
|
||||
|
||||
def test_overlapping_allocation(self):
|
||||
frappe.db.sql("delete from `tabLeave Allocation`")
|
||||
emp_id = make_employee("test_emp_leave_allocation@salary.com")
|
||||
cls.employee = frappe.get_doc("Employee", emp_id)
|
||||
|
||||
employee = frappe.get_doc("Employee", frappe.db.sql_list("select name from tabEmployee limit 1")[0])
|
||||
def tearDown(self):
|
||||
frappe.db.rollback()
|
||||
|
||||
def test_overlapping_allocation(self):
|
||||
leaves = [
|
||||
{
|
||||
"doctype": "Leave Allocation",
|
||||
"__islocal": 1,
|
||||
"employee": employee.name,
|
||||
"employee_name": employee.employee_name,
|
||||
"employee": self.employee.name,
|
||||
"employee_name": self.employee.employee_name,
|
||||
"leave_type": "_Test Leave Type",
|
||||
"from_date": getdate("2015-10-01"),
|
||||
"to_date": getdate("2015-10-31"),
|
||||
@ -32,8 +36,8 @@ class TestLeaveAllocation(unittest.TestCase):
|
||||
{
|
||||
"doctype": "Leave Allocation",
|
||||
"__islocal": 1,
|
||||
"employee": employee.name,
|
||||
"employee_name": employee.employee_name,
|
||||
"employee": self.employee.name,
|
||||
"employee_name": self.employee.employee_name,
|
||||
"leave_type": "_Test Leave Type",
|
||||
"from_date": getdate("2015-09-01"),
|
||||
"to_date": getdate("2015-11-30"),
|
||||
@ -45,40 +49,36 @@ class TestLeaveAllocation(unittest.TestCase):
|
||||
self.assertRaises(frappe.ValidationError, frappe.get_doc(leaves[1]).save)
|
||||
|
||||
def test_invalid_period(self):
|
||||
employee = frappe.get_doc("Employee", frappe.db.sql_list("select name from tabEmployee limit 1")[0])
|
||||
|
||||
doc = frappe.get_doc({
|
||||
"doctype": "Leave Allocation",
|
||||
"__islocal": 1,
|
||||
"employee": employee.name,
|
||||
"employee_name": employee.employee_name,
|
||||
"employee": self.employee.name,
|
||||
"employee_name": self.employee.employee_name,
|
||||
"leave_type": "_Test Leave Type",
|
||||
"from_date": getdate("2015-09-30"),
|
||||
"to_date": getdate("2015-09-1"),
|
||||
"new_leaves_allocated": 5
|
||||
})
|
||||
|
||||
#invalid period
|
||||
# invalid period
|
||||
self.assertRaises(frappe.ValidationError, doc.save)
|
||||
|
||||
def test_allocated_leave_days_over_period(self):
|
||||
employee = frappe.get_doc("Employee", frappe.db.sql_list("select name from tabEmployee limit 1")[0])
|
||||
doc = frappe.get_doc({
|
||||
"doctype": "Leave Allocation",
|
||||
"__islocal": 1,
|
||||
"employee": employee.name,
|
||||
"employee_name": employee.employee_name,
|
||||
"employee": self.employee.name,
|
||||
"employee_name": self.employee.employee_name,
|
||||
"leave_type": "_Test Leave Type",
|
||||
"from_date": getdate("2015-09-1"),
|
||||
"to_date": getdate("2015-09-30"),
|
||||
"new_leaves_allocated": 35
|
||||
})
|
||||
#allocated leave more than period
|
||||
|
||||
# allocated leave more than period
|
||||
self.assertRaises(frappe.ValidationError, doc.save)
|
||||
|
||||
def test_carry_forward_calculation(self):
|
||||
frappe.db.sql("delete from `tabLeave Allocation`")
|
||||
frappe.db.sql("delete from `tabLeave Ledger Entry`")
|
||||
leave_type = create_leave_type(leave_type_name="_Test_CF_leave", is_carry_forward=1)
|
||||
leave_type.maximum_carry_forwarded_leaves = 10
|
||||
leave_type.max_leaves_allowed = 30
|
||||
@ -86,6 +86,8 @@ class TestLeaveAllocation(unittest.TestCase):
|
||||
|
||||
# initial leave allocation = 15
|
||||
leave_allocation = create_leave_allocation(
|
||||
employee=self.employee.name,
|
||||
employee_name=self.employee.employee_name,
|
||||
leave_type="_Test_CF_leave",
|
||||
from_date=add_months(nowdate(), -12),
|
||||
to_date=add_months(nowdate(), -1),
|
||||
@ -95,6 +97,8 @@ class TestLeaveAllocation(unittest.TestCase):
|
||||
# carry forwarded leaves considering maximum_carry_forwarded_leaves
|
||||
# new_leaves = 15, carry_forwarded = 10
|
||||
leave_allocation_1 = create_leave_allocation(
|
||||
employee=self.employee.name,
|
||||
employee_name=self.employee.employee_name,
|
||||
leave_type="_Test_CF_leave",
|
||||
carry_forward=1)
|
||||
leave_allocation_1.submit()
|
||||
@ -106,6 +110,8 @@ class TestLeaveAllocation(unittest.TestCase):
|
||||
# carry forwarded leaves considering max_leave_allowed
|
||||
# max_leave_allowed = 30, new_leaves = 25, carry_forwarded = 5
|
||||
leave_allocation_2 = create_leave_allocation(
|
||||
employee=self.employee.name,
|
||||
employee_name=self.employee.employee_name,
|
||||
leave_type="_Test_CF_leave",
|
||||
carry_forward=1,
|
||||
new_leaves_allocated=25)
|
||||
@ -114,8 +120,6 @@ class TestLeaveAllocation(unittest.TestCase):
|
||||
self.assertEqual(leave_allocation_2.unused_leaves, 5)
|
||||
|
||||
def test_carry_forward_leaves_expiry(self):
|
||||
frappe.db.sql("delete from `tabLeave Allocation`")
|
||||
frappe.db.sql("delete from `tabLeave Ledger Entry`")
|
||||
leave_type = create_leave_type(
|
||||
leave_type_name="_Test_CF_leave_expiry",
|
||||
is_carry_forward=1,
|
||||
@ -124,6 +128,8 @@ class TestLeaveAllocation(unittest.TestCase):
|
||||
|
||||
# initial leave allocation
|
||||
leave_allocation = create_leave_allocation(
|
||||
employee=self.employee.name,
|
||||
employee_name=self.employee.employee_name,
|
||||
leave_type="_Test_CF_leave_expiry",
|
||||
from_date=add_months(nowdate(), -24),
|
||||
to_date=add_months(nowdate(), -12),
|
||||
@ -131,6 +137,8 @@ class TestLeaveAllocation(unittest.TestCase):
|
||||
leave_allocation.submit()
|
||||
|
||||
leave_allocation = create_leave_allocation(
|
||||
employee=self.employee.name,
|
||||
employee_name=self.employee.employee_name,
|
||||
leave_type="_Test_CF_leave_expiry",
|
||||
from_date=add_days(nowdate(), -90),
|
||||
to_date=add_days(nowdate(), 100),
|
||||
@ -142,6 +150,8 @@ class TestLeaveAllocation(unittest.TestCase):
|
||||
|
||||
# leave allocation with carry forward of only new leaves allocated
|
||||
leave_allocation_1 = create_leave_allocation(
|
||||
employee=self.employee.name,
|
||||
employee_name=self.employee.employee_name,
|
||||
leave_type="_Test_CF_leave_expiry",
|
||||
carry_forward=1,
|
||||
from_date=add_months(nowdate(), 6),
|
||||
@ -151,9 +161,10 @@ class TestLeaveAllocation(unittest.TestCase):
|
||||
self.assertEqual(leave_allocation_1.unused_leaves, leave_allocation.new_leaves_allocated)
|
||||
|
||||
def test_creation_of_leave_ledger_entry_on_submit(self):
|
||||
frappe.db.sql("delete from `tabLeave Allocation`")
|
||||
|
||||
leave_allocation = create_leave_allocation()
|
||||
leave_allocation = create_leave_allocation(
|
||||
employee=self.employee.name,
|
||||
employee_name=self.employee.employee_name
|
||||
)
|
||||
leave_allocation.submit()
|
||||
|
||||
leave_ledger_entry = frappe.get_all('Leave Ledger Entry', fields='*', filters=dict(transaction_name=leave_allocation.name))
|
||||
@ -168,10 +179,10 @@ class TestLeaveAllocation(unittest.TestCase):
|
||||
self.assertFalse(frappe.db.exists("Leave Ledger Entry", {'transaction_name':leave_allocation.name}))
|
||||
|
||||
def test_leave_addition_after_submit(self):
|
||||
frappe.db.sql("delete from `tabLeave Allocation`")
|
||||
frappe.db.sql("delete from `tabLeave Ledger Entry`")
|
||||
|
||||
leave_allocation = create_leave_allocation()
|
||||
leave_allocation = create_leave_allocation(
|
||||
employee=self.employee.name,
|
||||
employee_name=self.employee.employee_name
|
||||
)
|
||||
leave_allocation.submit()
|
||||
self.assertTrue(leave_allocation.total_leaves_allocated, 15)
|
||||
leave_allocation.new_leaves_allocated = 40
|
||||
@ -179,44 +190,55 @@ class TestLeaveAllocation(unittest.TestCase):
|
||||
self.assertTrue(leave_allocation.total_leaves_allocated, 40)
|
||||
|
||||
def test_leave_subtraction_after_submit(self):
|
||||
frappe.db.sql("delete from `tabLeave Allocation`")
|
||||
frappe.db.sql("delete from `tabLeave Ledger Entry`")
|
||||
leave_allocation = create_leave_allocation()
|
||||
leave_allocation = create_leave_allocation(
|
||||
employee=self.employee.name,
|
||||
employee_name=self.employee.employee_name
|
||||
)
|
||||
leave_allocation.submit()
|
||||
self.assertTrue(leave_allocation.total_leaves_allocated, 15)
|
||||
leave_allocation.new_leaves_allocated = 10
|
||||
leave_allocation.submit()
|
||||
self.assertTrue(leave_allocation.total_leaves_allocated, 10)
|
||||
|
||||
def test_against_leave_application_validation_after_submit(self):
|
||||
frappe.db.sql("delete from `tabLeave Allocation`")
|
||||
frappe.db.sql("delete from `tabLeave Ledger Entry`")
|
||||
def test_validation_against_leave_application_after_submit(self):
|
||||
from erpnext.payroll.doctype.salary_slip.test_salary_slip import make_holiday_list
|
||||
|
||||
leave_allocation = create_leave_allocation()
|
||||
make_holiday_list()
|
||||
frappe.db.set_value("Company", self.employee.company, "default_holiday_list", "Salary Slip Test Holiday List")
|
||||
|
||||
leave_allocation = create_leave_allocation(
|
||||
employee=self.employee.name,
|
||||
employee_name=self.employee.employee_name
|
||||
)
|
||||
leave_allocation.submit()
|
||||
self.assertTrue(leave_allocation.total_leaves_allocated, 15)
|
||||
employee = frappe.get_doc("Employee", frappe.db.sql_list("select name from tabEmployee limit 1")[0])
|
||||
|
||||
leave_application = frappe.get_doc({
|
||||
"doctype": 'Leave Application',
|
||||
"employee": employee.name,
|
||||
"employee": self.employee.name,
|
||||
"leave_type": "_Test Leave Type",
|
||||
"from_date": add_months(nowdate(), 2),
|
||||
"to_date": add_months(add_days(nowdate(), 10), 2),
|
||||
"company": erpnext.get_default_company() or "_Test Company",
|
||||
"company": self.employee.company,
|
||||
"docstatus": 1,
|
||||
"status": "Approved",
|
||||
"leave_approver": 'test@example.com'
|
||||
})
|
||||
leave_application.submit()
|
||||
leave_allocation.new_leaves_allocated = 8
|
||||
leave_allocation.total_leaves_allocated = 8
|
||||
leave_application.reload()
|
||||
|
||||
# allocate less leaves than the ones which are already approved
|
||||
leave_allocation.new_leaves_allocated = leave_application.total_leave_days - 1
|
||||
leave_allocation.total_leaves_allocated = leave_application.total_leave_days - 1
|
||||
self.assertRaises(frappe.ValidationError, leave_allocation.submit)
|
||||
|
||||
def create_leave_allocation(**args):
|
||||
args = frappe._dict(args)
|
||||
|
||||
employee = frappe.get_doc("Employee", frappe.db.sql_list("select name from tabEmployee limit 1")[0])
|
||||
leave_allocation = frappe.get_doc({
|
||||
emp_id = make_employee("test_emp_leave_allocation@salary.com")
|
||||
employee = frappe.get_doc("Employee", emp_id)
|
||||
|
||||
return frappe.get_doc({
|
||||
"doctype": "Leave Allocation",
|
||||
"__islocal": 1,
|
||||
"employee": args.employee or employee.name,
|
||||
@ -227,6 +249,5 @@ def create_leave_allocation(**args):
|
||||
"carry_forward": args.carry_forward or 0,
|
||||
"to_date": args.to_date or add_months(nowdate(), 12)
|
||||
})
|
||||
return leave_allocation
|
||||
|
||||
test_dependencies = ["Employee", "Leave Type"]
|
||||
|
@ -56,9 +56,7 @@ class LeavePolicyAssignment(Document):
|
||||
leave_policy_detail.leave_type, leave_policy_detail.annual_allocation,
|
||||
leave_type_details, date_of_joining
|
||||
)
|
||||
|
||||
leave_allocations[leave_policy_detail.leave_type] = {"name": leave_allocation, "leaves": new_leaves_allocated}
|
||||
|
||||
leave_allocations[leave_policy_detail.leave_type] = {"name": leave_allocation, "leaves": new_leaves_allocated}
|
||||
self.db_set("leaves_allocated", 1)
|
||||
return leave_allocations
|
||||
|
||||
|
@ -240,12 +240,14 @@
|
||||
"label": "Repayment Schedule"
|
||||
},
|
||||
{
|
||||
"allow_on_submit": 1,
|
||||
"depends_on": "eval:doc.is_term_loan == 1",
|
||||
"fieldname": "repayment_schedule",
|
||||
"fieldtype": "Table",
|
||||
"label": "Repayment Schedule",
|
||||
"no_copy": 1,
|
||||
"options": "Repayment Schedule"
|
||||
"options": "Repayment Schedule",
|
||||
"read_only": 1
|
||||
},
|
||||
{
|
||||
"fieldname": "section_break_17",
|
||||
@ -363,6 +365,7 @@
|
||||
"modified_by": "Administrator",
|
||||
"module": "Loan Management",
|
||||
"name": "Loan",
|
||||
"naming_rule": "Expression (old style)",
|
||||
"owner": "Administrator",
|
||||
"permissions": [
|
||||
{
|
||||
|
@ -7,7 +7,7 @@ import math
|
||||
|
||||
import frappe
|
||||
from frappe import _
|
||||
from frappe.utils import add_months, flt, getdate, now_datetime, nowdate
|
||||
from frappe.utils import add_months, flt, get_last_day, getdate, now_datetime, nowdate
|
||||
|
||||
import erpnext
|
||||
from erpnext.controllers.accounts_controller import AccountsController
|
||||
@ -62,7 +62,7 @@ class Loan(AccountsController):
|
||||
self.rate_of_interest = frappe.db.get_value("Loan Type", self.loan_type, "rate_of_interest")
|
||||
|
||||
if self.repayment_method == "Repay Over Number of Periods":
|
||||
self.monthly_repayment_amount = get_monthly_repayment_amount(self.repayment_method, self.loan_amount, self.rate_of_interest, self.repayment_periods)
|
||||
self.monthly_repayment_amount = get_monthly_repayment_amount(self.loan_amount, self.rate_of_interest, self.repayment_periods)
|
||||
|
||||
def check_sanctioned_amount_limit(self):
|
||||
sanctioned_amount_limit = get_sanctioned_amount_limit(self.applicant_type, self.applicant, self.company)
|
||||
@ -99,7 +99,7 @@ class Loan(AccountsController):
|
||||
"total_payment": total_payment,
|
||||
"balance_loan_amount": balance_amount
|
||||
})
|
||||
next_payment_date = add_months(payment_date, 1)
|
||||
next_payment_date = add_single_month(payment_date)
|
||||
payment_date = next_payment_date
|
||||
|
||||
def set_repayment_period(self):
|
||||
@ -211,7 +211,7 @@ def validate_repayment_method(repayment_method, loan_amount, monthly_repayment_a
|
||||
if monthly_repayment_amount > loan_amount:
|
||||
frappe.throw(_("Monthly Repayment Amount cannot be greater than Loan Amount"))
|
||||
|
||||
def get_monthly_repayment_amount(repayment_method, loan_amount, rate_of_interest, repayment_periods):
|
||||
def get_monthly_repayment_amount(loan_amount, rate_of_interest, repayment_periods):
|
||||
if rate_of_interest:
|
||||
monthly_interest_rate = flt(rate_of_interest) / (12 *100)
|
||||
monthly_repayment_amount = math.ceil((loan_amount * monthly_interest_rate *
|
||||
@ -395,3 +395,9 @@ def get_shortfall_applicants():
|
||||
"value": len(applicants),
|
||||
"fieldtype": "Int"
|
||||
}
|
||||
|
||||
def add_single_month(date):
|
||||
if getdate(date) == get_last_day(date):
|
||||
return get_last_day(add_months(date, 1))
|
||||
else:
|
||||
return add_months(date, 1)
|
@ -218,6 +218,14 @@ class TestLoan(unittest.TestCase):
|
||||
self.assertEqual(flt(loan.total_principal_paid, 0), flt(repayment_entry.amount_paid -
|
||||
penalty_amount - total_interest_paid, 0))
|
||||
|
||||
# Check Repayment Entry cancel
|
||||
repayment_entry.load_from_db()
|
||||
repayment_entry.cancel()
|
||||
|
||||
loan.load_from_db()
|
||||
self.assertEqual(loan.total_principal_paid, 0)
|
||||
self.assertEqual(loan.total_principal_paid, 0)
|
||||
|
||||
def test_loan_closure(self):
|
||||
pledge = [{
|
||||
"loan_security": "Test Security 1",
|
||||
@ -295,6 +303,27 @@ class TestLoan(unittest.TestCase):
|
||||
self.assertEqual(amounts[0], 11250.00)
|
||||
self.assertEqual(amounts[1], 78303.00)
|
||||
|
||||
def test_repayment_schedule_update(self):
|
||||
loan = create_loan(self.applicant2, "Personal Loan", 200000, "Repay Over Number of Periods", 4,
|
||||
applicant_type='Customer', repayment_start_date='2021-04-30', posting_date='2021-04-01')
|
||||
|
||||
loan.submit()
|
||||
|
||||
make_loan_disbursement_entry(loan.name, loan.loan_amount, disbursement_date='2021-04-01')
|
||||
|
||||
process_loan_interest_accrual_for_term_loans(posting_date='2021-05-01')
|
||||
process_loan_interest_accrual_for_term_loans(posting_date='2021-06-01')
|
||||
|
||||
repayment_entry = create_repayment_entry(loan.name, self.applicant2, '2021-06-05', 120000)
|
||||
repayment_entry.submit()
|
||||
|
||||
loan.load_from_db()
|
||||
|
||||
self.assertEqual(flt(loan.get('repayment_schedule')[3].principal_amount, 2), 41369.83)
|
||||
self.assertEqual(flt(loan.get('repayment_schedule')[3].interest_amount, 2), 289.59)
|
||||
self.assertEqual(flt(loan.get('repayment_schedule')[3].total_payment, 2), 41659.41)
|
||||
self.assertEqual(flt(loan.get('repayment_schedule')[3].balance_loan_amount, 2), 0)
|
||||
|
||||
def test_security_shortfall(self):
|
||||
pledges = [{
|
||||
"loan_security": "Test Security 2",
|
||||
@ -938,18 +967,18 @@ def create_loan_application(company, applicant, loan_type, proposed_pledges, rep
|
||||
|
||||
|
||||
def create_loan(applicant, loan_type, loan_amount, repayment_method, repayment_periods,
|
||||
repayment_start_date=None, posting_date=None):
|
||||
applicant_type=None, repayment_start_date=None, posting_date=None):
|
||||
|
||||
loan = frappe.get_doc({
|
||||
"doctype": "Loan",
|
||||
"applicant_type": "Employee",
|
||||
"applicant_type": applicant_type or "Employee",
|
||||
"company": "_Test Company",
|
||||
"applicant": applicant,
|
||||
"loan_type": loan_type,
|
||||
"loan_amount": loan_amount,
|
||||
"repayment_method": repayment_method,
|
||||
"repayment_periods": repayment_periods,
|
||||
"repayment_start_date": nowdate(),
|
||||
"repayment_start_date": repayment_start_date or nowdate(),
|
||||
"is_term_loan": 1,
|
||||
"posting_date": posting_date or nowdate()
|
||||
})
|
||||
|
@ -80,7 +80,7 @@ class LoanApplication(Document):
|
||||
|
||||
if self.is_term_loan:
|
||||
if self.repayment_method == "Repay Over Number of Periods":
|
||||
self.repayment_amount = get_monthly_repayment_amount(self.repayment_method, self.loan_amount, self.rate_of_interest, self.repayment_periods)
|
||||
self.repayment_amount = get_monthly_repayment_amount(self.loan_amount, self.rate_of_interest, self.repayment_periods)
|
||||
|
||||
if self.repayment_method == "Repay Fixed Amount per Period":
|
||||
monthly_interest_rate = flt(self.rate_of_interest) / (12 *100)
|
||||
|
@ -176,20 +176,19 @@ def get_total_pledged_security_value(loan):
|
||||
|
||||
@frappe.whitelist()
|
||||
def get_disbursal_amount(loan, on_current_security_price=0):
|
||||
from erpnext.loan_management.doctype.loan_repayment.loan_repayment import (
|
||||
get_pending_principal_amount,
|
||||
)
|
||||
|
||||
loan_details = frappe.get_value("Loan", loan, ["loan_amount", "disbursed_amount", "total_payment",
|
||||
"total_principal_paid", "total_interest_payable", "status", "is_term_loan", "is_secured_loan",
|
||||
"maximum_loan_amount"], as_dict=1)
|
||||
"maximum_loan_amount", "written_off_amount"], as_dict=1)
|
||||
|
||||
if loan_details.is_secured_loan and frappe.get_all('Loan Security Shortfall', filters={'loan': loan,
|
||||
'status': 'Pending'}):
|
||||
return 0
|
||||
|
||||
if loan_details.status == 'Disbursed':
|
||||
pending_principal_amount = flt(loan_details.total_payment) - flt(loan_details.total_interest_payable) \
|
||||
- flt(loan_details.total_principal_paid)
|
||||
else:
|
||||
pending_principal_amount = flt(loan_details.disbursed_amount) - flt(loan_details.total_interest_payable) \
|
||||
- flt(loan_details.total_principal_paid)
|
||||
pending_principal_amount = get_pending_principal_amount(loan_details)
|
||||
|
||||
security_value = 0.0
|
||||
if loan_details.is_secured_loan and on_current_security_price:
|
||||
|
@ -74,6 +74,39 @@ class LoanInterestAccrual(AccountsController):
|
||||
})
|
||||
)
|
||||
|
||||
if self.payable_principal_amount:
|
||||
gle_map.append(
|
||||
self.get_gl_dict({
|
||||
"account": self.loan_account,
|
||||
"party_type": self.applicant_type,
|
||||
"party": self.applicant,
|
||||
"against": self.interest_income_account,
|
||||
"debit": self.payable_principal_amount,
|
||||
"debit_in_account_currency": self.interest_amount,
|
||||
"against_voucher_type": "Loan",
|
||||
"against_voucher": self.loan,
|
||||
"remarks": _("Interest accrued from {0} to {1} against loan: {2}").format(
|
||||
self.last_accrual_date, self.posting_date, self.loan),
|
||||
"cost_center": erpnext.get_default_cost_center(self.company),
|
||||
"posting_date": self.posting_date
|
||||
})
|
||||
)
|
||||
|
||||
gle_map.append(
|
||||
self.get_gl_dict({
|
||||
"account": self.interest_income_account,
|
||||
"against": self.loan_account,
|
||||
"credit": self.payable_principal_amount,
|
||||
"credit_in_account_currency": self.interest_amount,
|
||||
"against_voucher_type": "Loan",
|
||||
"against_voucher": self.loan,
|
||||
"remarks": ("Interest accrued from {0} to {1} against loan: {2}").format(
|
||||
self.last_accrual_date, self.posting_date, self.loan),
|
||||
"cost_center": erpnext.get_default_cost_center(self.company),
|
||||
"posting_date": self.posting_date
|
||||
})
|
||||
)
|
||||
|
||||
if gle_map:
|
||||
make_gl_entries(gle_map, cancel=cancel, adv_adj=adv_adj)
|
||||
|
||||
@ -82,7 +115,10 @@ class LoanInterestAccrual(AccountsController):
|
||||
# rate of interest is 13.5 then first loan interest accural will be on '01-10-2019'
|
||||
# which means interest will be accrued for 30 days which should be equal to 11095.89
|
||||
def calculate_accrual_amount_for_demand_loans(loan, posting_date, process_loan_interest, accrual_type):
|
||||
from erpnext.loan_management.doctype.loan_repayment.loan_repayment import calculate_amounts
|
||||
from erpnext.loan_management.doctype.loan_repayment.loan_repayment import (
|
||||
calculate_amounts,
|
||||
get_pending_principal_amount,
|
||||
)
|
||||
|
||||
no_of_days = get_no_of_days_for_interest_accural(loan, posting_date)
|
||||
precision = cint(frappe.db.get_default("currency_precision")) or 2
|
||||
@ -90,12 +126,7 @@ def calculate_accrual_amount_for_demand_loans(loan, posting_date, process_loan_i
|
||||
if no_of_days <= 0:
|
||||
return
|
||||
|
||||
if loan.status == 'Disbursed':
|
||||
pending_principal_amount = flt(loan.total_payment) - flt(loan.total_interest_payable) \
|
||||
- flt(loan.total_principal_paid) - flt(loan.written_off_amount)
|
||||
else:
|
||||
pending_principal_amount = flt(loan.disbursed_amount) - flt(loan.total_interest_payable) \
|
||||
- flt(loan.total_principal_paid) - flt(loan.written_off_amount)
|
||||
pending_principal_amount = get_pending_principal_amount(loan)
|
||||
|
||||
interest_per_day = get_per_day_interest(pending_principal_amount, loan.rate_of_interest, posting_date)
|
||||
payable_interest = interest_per_day * no_of_days
|
||||
@ -133,7 +164,7 @@ def make_accrual_interest_entry_for_demand_loans(posting_date, process_loan_inte
|
||||
|
||||
if not open_loans:
|
||||
open_loans = frappe.get_all("Loan",
|
||||
fields=["name", "total_payment", "total_amount_paid", "loan_account", "interest_income_account",
|
||||
fields=["name", "total_payment", "total_amount_paid", "loan_account", "interest_income_account", "loan_amount",
|
||||
"is_term_loan", "status", "disbursement_date", "disbursed_amount", "applicant_type", "applicant",
|
||||
"rate_of_interest", "total_interest_payable", "written_off_amount", "total_principal_paid", "repayment_start_date"],
|
||||
filters=query_filters)
|
||||
@ -190,7 +221,8 @@ def get_term_loans(date, term_loan=None, loan_type=None):
|
||||
AND l.is_term_loan =1
|
||||
AND rs.payment_date <= %s
|
||||
AND rs.is_accrued=0 {0}
|
||||
AND l.status = 'Disbursed'""".format(condition), (getdate(date)), as_dict=1)
|
||||
AND l.status = 'Disbursed'
|
||||
ORDER BY rs.payment_date""".format(condition), (getdate(date)), as_dict=1)
|
||||
|
||||
return term_loans
|
||||
|
||||
|
@ -35,9 +35,12 @@ class LoanRepayment(AccountsController):
|
||||
|
||||
def on_submit(self):
|
||||
self.update_paid_amount()
|
||||
self.update_repayment_schedule()
|
||||
self.make_gl_entries()
|
||||
|
||||
def on_cancel(self):
|
||||
self.check_future_accruals()
|
||||
self.update_repayment_schedule(cancel=1)
|
||||
self.mark_as_unpaid()
|
||||
self.ignore_linked_doctypes = ['GL Entry']
|
||||
self.make_gl_entries(cancel=1)
|
||||
@ -90,7 +93,7 @@ class LoanRepayment(AccountsController):
|
||||
|
||||
def book_unaccrued_interest(self):
|
||||
precision = cint(frappe.db.get_default("currency_precision")) or 2
|
||||
if self.total_interest_paid > self.interest_payable:
|
||||
if flt(self.total_interest_paid, precision) > flt(self.interest_payable, precision):
|
||||
if not self.is_term_loan:
|
||||
# get last loan interest accrual date
|
||||
last_accrual_date = get_last_accrual_date(self.against_loan)
|
||||
@ -121,7 +124,18 @@ class LoanRepayment(AccountsController):
|
||||
})
|
||||
|
||||
def update_paid_amount(self):
|
||||
loan = frappe.get_doc("Loan", self.against_loan)
|
||||
loan = frappe.get_value("Loan", self.against_loan, ['total_amount_paid', 'total_principal_paid',
|
||||
'status', 'is_secured_loan', 'total_payment', 'loan_amount', 'total_interest_payable',
|
||||
'written_off_amount'], as_dict=1)
|
||||
|
||||
loan.update({
|
||||
'total_amount_paid': loan.total_amount_paid + self.amount_paid,
|
||||
'total_principal_paid': loan.total_principal_paid + self.principal_amount_paid
|
||||
})
|
||||
|
||||
pending_principal_amount = get_pending_principal_amount(loan)
|
||||
if not loan.is_secured_loan and pending_principal_amount <= 0:
|
||||
loan.update({'status': 'Loan Closure Requested'})
|
||||
|
||||
for payment in self.repayment_details:
|
||||
frappe.db.sql(""" UPDATE `tabLoan Interest Accrual`
|
||||
@ -130,17 +144,31 @@ class LoanRepayment(AccountsController):
|
||||
WHERE name = %s""",
|
||||
(flt(payment.paid_principal_amount), flt(payment.paid_interest_amount), payment.loan_interest_accrual))
|
||||
|
||||
frappe.db.sql(""" UPDATE `tabLoan` SET total_amount_paid = %s, total_principal_paid = %s
|
||||
WHERE name = %s """, (loan.total_amount_paid + self.amount_paid,
|
||||
loan.total_principal_paid + self.principal_amount_paid, self.against_loan))
|
||||
frappe.db.sql(""" UPDATE `tabLoan`
|
||||
SET total_amount_paid = %s, total_principal_paid = %s, status = %s
|
||||
WHERE name = %s """, (loan.total_amount_paid, loan.total_principal_paid, loan.status,
|
||||
self.against_loan))
|
||||
|
||||
update_shortfall_status(self.against_loan, self.principal_amount_paid)
|
||||
|
||||
def mark_as_unpaid(self):
|
||||
loan = frappe.get_doc("Loan", self.against_loan)
|
||||
loan = frappe.get_value("Loan", self.against_loan, ['total_amount_paid', 'total_principal_paid',
|
||||
'status', 'is_secured_loan', 'total_payment', 'loan_amount', 'total_interest_payable',
|
||||
'written_off_amount'], as_dict=1)
|
||||
|
||||
no_of_repayments = len(self.repayment_details)
|
||||
|
||||
loan.update({
|
||||
'total_amount_paid': loan.total_amount_paid - self.amount_paid,
|
||||
'total_principal_paid': loan.total_principal_paid - self.principal_amount_paid
|
||||
})
|
||||
|
||||
if loan.status == 'Loan Closure Requested':
|
||||
if loan.disbursed_amount >= loan.loan_amount:
|
||||
loan['status'] = 'Disbursed'
|
||||
else:
|
||||
loan['status'] = 'Partially Disbursed'
|
||||
|
||||
for payment in self.repayment_details:
|
||||
frappe.db.sql(""" UPDATE `tabLoan Interest Accrual`
|
||||
SET paid_principal_amount = `paid_principal_amount` - %s,
|
||||
@ -154,12 +182,20 @@ class LoanRepayment(AccountsController):
|
||||
lia_doc = frappe.get_doc('Loan Interest Accrual', payment.loan_interest_accrual)
|
||||
lia_doc.cancel()
|
||||
|
||||
frappe.db.sql(""" UPDATE `tabLoan` SET total_amount_paid = %s, total_principal_paid = %s
|
||||
WHERE name = %s """, (loan.total_amount_paid - self.amount_paid,
|
||||
loan.total_principal_paid - self.principal_amount_paid, self.against_loan))
|
||||
frappe.db.sql(""" UPDATE `tabLoan`
|
||||
SET total_amount_paid = %s, total_principal_paid = %s, status = %s
|
||||
WHERE name = %s """, (loan.total_amount_paid, loan.total_principal_paid, loan.status, self.against_loan))
|
||||
|
||||
if loan.status == "Loan Closure Requested":
|
||||
frappe.db.set_value("Loan", self.against_loan, "status", "Disbursed")
|
||||
def check_future_accruals(self):
|
||||
future_accrual_date = frappe.db.get_value("Loan Interest Accrual", {"posting_date": (">", self.posting_date),
|
||||
"docstatus": 1, "loan": self.against_loan}, 'posting_date')
|
||||
|
||||
if future_accrual_date:
|
||||
frappe.throw("Cannot cancel. Interest accruals already processed till {0}".format(get_datetime(future_accrual_date)))
|
||||
|
||||
def update_repayment_schedule(self, cancel=0):
|
||||
if self.is_term_loan and self.principal_amount_paid > self.payable_principal_amount:
|
||||
regenerate_repayment_schedule(self.against_loan, cancel)
|
||||
|
||||
def allocate_amounts(self, repayment_details):
|
||||
self.set('repayment_details', [])
|
||||
@ -182,50 +218,93 @@ class LoanRepayment(AccountsController):
|
||||
|
||||
interest_paid -= self.total_penalty_paid
|
||||
|
||||
total_interest_paid = 0
|
||||
# interest_paid = self.amount_paid - self.principal_amount_paid - self.penalty_amount
|
||||
if self.is_term_loan:
|
||||
interest_paid, updated_entries = self.allocate_interest_amount(interest_paid, repayment_details)
|
||||
self.allocate_principal_amount_for_term_loans(interest_paid, repayment_details, updated_entries)
|
||||
else:
|
||||
interest_paid, updated_entries = self.allocate_interest_amount(interest_paid, repayment_details)
|
||||
self.allocate_excess_payment_for_demand_loans(interest_paid, repayment_details)
|
||||
|
||||
def allocate_interest_amount(self, interest_paid, repayment_details):
|
||||
updated_entries = {}
|
||||
self.total_interest_paid = 0
|
||||
idx = 1
|
||||
|
||||
if interest_paid > 0:
|
||||
for lia, amounts in repayment_details.get('pending_accrual_entries', []).items():
|
||||
if amounts['interest_amount'] + amounts['payable_principal_amount'] <= interest_paid:
|
||||
interest_amount = 0
|
||||
if amounts['interest_amount'] <= interest_paid:
|
||||
interest_amount = amounts['interest_amount']
|
||||
paid_principal = amounts['payable_principal_amount']
|
||||
self.principal_amount_paid += paid_principal
|
||||
interest_paid -= (interest_amount + paid_principal)
|
||||
self.total_interest_paid += interest_amount
|
||||
interest_paid -= interest_amount
|
||||
elif interest_paid:
|
||||
if interest_paid >= amounts['interest_amount']:
|
||||
interest_amount = amounts['interest_amount']
|
||||
paid_principal = interest_paid - interest_amount
|
||||
self.principal_amount_paid += paid_principal
|
||||
self.total_interest_paid += interest_amount
|
||||
interest_paid = 0
|
||||
else:
|
||||
interest_amount = interest_paid
|
||||
self.total_interest_paid += interest_amount
|
||||
interest_paid = 0
|
||||
paid_principal=0
|
||||
|
||||
total_interest_paid += interest_amount
|
||||
self.append('repayment_details', {
|
||||
'loan_interest_accrual': lia,
|
||||
'paid_interest_amount': interest_amount,
|
||||
'paid_principal_amount': paid_principal
|
||||
})
|
||||
if interest_amount:
|
||||
self.append('repayment_details', {
|
||||
'loan_interest_accrual': lia,
|
||||
'paid_interest_amount': interest_amount,
|
||||
'paid_principal_amount': 0
|
||||
})
|
||||
updated_entries[lia] = idx
|
||||
idx += 1
|
||||
|
||||
return interest_paid, updated_entries
|
||||
|
||||
def allocate_principal_amount_for_term_loans(self, interest_paid, repayment_details, updated_entries):
|
||||
if interest_paid > 0:
|
||||
for lia, amounts in repayment_details.get('pending_accrual_entries', []).items():
|
||||
paid_principal = 0
|
||||
if amounts['payable_principal_amount'] <= interest_paid:
|
||||
paid_principal = amounts['payable_principal_amount']
|
||||
self.principal_amount_paid += paid_principal
|
||||
interest_paid -= paid_principal
|
||||
elif interest_paid:
|
||||
if interest_paid >= amounts['payable_principal_amount']:
|
||||
paid_principal = amounts['payable_principal_amount']
|
||||
self.principal_amount_paid += paid_principal
|
||||
interest_paid = 0
|
||||
else:
|
||||
paid_principal = interest_paid
|
||||
self.principal_amount_paid += paid_principal
|
||||
interest_paid = 0
|
||||
|
||||
if updated_entries.get(lia):
|
||||
idx = updated_entries.get(lia)
|
||||
self.get('repayment_details')[idx-1].paid_principal_amount += paid_principal
|
||||
else:
|
||||
self.append('repayment_details', {
|
||||
'loan_interest_accrual': lia,
|
||||
'paid_interest_amount': 0,
|
||||
'paid_principal_amount': paid_principal
|
||||
})
|
||||
|
||||
if interest_paid > 0:
|
||||
self.principal_amount_paid += interest_paid
|
||||
|
||||
def allocate_excess_payment_for_demand_loans(self, interest_paid, repayment_details):
|
||||
if repayment_details['unaccrued_interest'] and interest_paid > 0:
|
||||
# no of days for which to accrue interest
|
||||
# Interest can only be accrued for an entire day and not partial
|
||||
if interest_paid > repayment_details['unaccrued_interest']:
|
||||
interest_paid -= repayment_details['unaccrued_interest']
|
||||
total_interest_paid += repayment_details['unaccrued_interest']
|
||||
self.total_interest_paid += repayment_details['unaccrued_interest']
|
||||
else:
|
||||
# get no of days for which interest can be paid
|
||||
per_day_interest = get_per_day_interest(self.pending_principal_amount,
|
||||
self.rate_of_interest, self.posting_date)
|
||||
|
||||
no_of_days = cint(interest_paid/per_day_interest)
|
||||
total_interest_paid += no_of_days * per_day_interest
|
||||
self.total_interest_paid += no_of_days * per_day_interest
|
||||
interest_paid -= no_of_days * per_day_interest
|
||||
|
||||
self.total_interest_paid = total_interest_paid
|
||||
if interest_paid > 0:
|
||||
self.principal_amount_paid += interest_paid
|
||||
|
||||
@ -361,6 +440,76 @@ def get_penalty_details(against_loan):
|
||||
else:
|
||||
return None, 0
|
||||
|
||||
def regenerate_repayment_schedule(loan, cancel=0):
|
||||
from erpnext.loan_management.doctype.loan.loan import (
|
||||
add_single_month,
|
||||
get_monthly_repayment_amount,
|
||||
)
|
||||
|
||||
loan_doc = frappe.get_doc('Loan', loan)
|
||||
next_accrual_date = None
|
||||
accrued_entries = 0
|
||||
last_repayment_amount = 0
|
||||
last_balance_amount = 0
|
||||
|
||||
for term in reversed(loan_doc.get('repayment_schedule')):
|
||||
if not term.is_accrued:
|
||||
next_accrual_date = term.payment_date
|
||||
loan_doc.remove(term)
|
||||
else:
|
||||
accrued_entries += 1
|
||||
if not last_repayment_amount:
|
||||
last_repayment_amount = term.total_payment
|
||||
if not last_balance_amount:
|
||||
last_balance_amount = term.balance_loan_amount
|
||||
|
||||
loan_doc.save()
|
||||
|
||||
balance_amount = get_pending_principal_amount(loan_doc)
|
||||
|
||||
if loan_doc.repayment_method == 'Repay Fixed Amount per Period':
|
||||
monthly_repayment_amount = flt(balance_amount/len(loan_doc.get('repayment_schedule')) - accrued_entries)
|
||||
else:
|
||||
if not cancel:
|
||||
monthly_repayment_amount = get_monthly_repayment_amount(balance_amount,
|
||||
loan_doc.rate_of_interest, loan_doc.repayment_periods - accrued_entries)
|
||||
else:
|
||||
monthly_repayment_amount = last_repayment_amount
|
||||
balance_amount = last_balance_amount
|
||||
|
||||
payment_date = next_accrual_date
|
||||
|
||||
while(balance_amount > 0):
|
||||
interest_amount = flt(balance_amount * flt(loan_doc.rate_of_interest) / (12*100))
|
||||
principal_amount = monthly_repayment_amount - interest_amount
|
||||
balance_amount = flt(balance_amount + interest_amount - monthly_repayment_amount)
|
||||
if balance_amount < 0:
|
||||
principal_amount += balance_amount
|
||||
balance_amount = 0.0
|
||||
|
||||
total_payment = principal_amount + interest_amount
|
||||
loan_doc.append("repayment_schedule", {
|
||||
"payment_date": payment_date,
|
||||
"principal_amount": principal_amount,
|
||||
"interest_amount": interest_amount,
|
||||
"total_payment": total_payment,
|
||||
"balance_loan_amount": balance_amount
|
||||
})
|
||||
next_payment_date = add_single_month(payment_date)
|
||||
payment_date = next_payment_date
|
||||
|
||||
loan_doc.save()
|
||||
|
||||
def get_pending_principal_amount(loan):
|
||||
if loan.status in ('Disbursed', 'Closed') or loan.disbursed_amount >= loan.loan_amount:
|
||||
pending_principal_amount = flt(loan.total_payment) - flt(loan.total_principal_paid) \
|
||||
- flt(loan.total_interest_payable) - flt(loan.written_off_amount)
|
||||
else:
|
||||
pending_principal_amount = flt(loan.disbursed_amount) - flt(loan.total_principal_paid) \
|
||||
- flt(loan.total_interest_payable) - flt(loan.written_off_amount)
|
||||
|
||||
return pending_principal_amount
|
||||
|
||||
# This function returns the amounts that are payable at the time of loan repayment based on posting date
|
||||
# So it pulls all the unpaid Loan Interest Accrual Entries and calculates the penalty if applicable
|
||||
|
||||
@ -408,12 +557,7 @@ def get_amounts(amounts, against_loan, posting_date):
|
||||
if due_date and not final_due_date:
|
||||
final_due_date = add_days(due_date, loan_type_details.grace_period_in_days)
|
||||
|
||||
if against_loan_doc.status in ('Disbursed', 'Closed') or against_loan_doc.disbursed_amount >= against_loan_doc.loan_amount:
|
||||
pending_principal_amount = against_loan_doc.total_payment - against_loan_doc.total_principal_paid \
|
||||
- against_loan_doc.total_interest_payable - against_loan_doc.written_off_amount
|
||||
else:
|
||||
pending_principal_amount = against_loan_doc.disbursed_amount - against_loan_doc.total_principal_paid \
|
||||
- against_loan_doc.total_interest_payable - against_loan_doc.written_off_amount
|
||||
pending_principal_amount = get_pending_principal_amount(against_loan_doc)
|
||||
|
||||
unaccrued_interest = 0
|
||||
if due_date:
|
||||
|
@ -27,6 +27,9 @@ class LoanSecurityUnpledge(Document):
|
||||
d.idx, frappe.bold(d.loan_security)))
|
||||
|
||||
def validate_unpledge_qty(self):
|
||||
from erpnext.loan_management.doctype.loan_repayment.loan_repayment import (
|
||||
get_pending_principal_amount,
|
||||
)
|
||||
from erpnext.loan_management.doctype.loan_security_shortfall.loan_security_shortfall import (
|
||||
get_ltv_ratio,
|
||||
)
|
||||
@ -43,15 +46,10 @@ class LoanSecurityUnpledge(Document):
|
||||
"valid_upto": (">=", get_datetime())
|
||||
}, as_list=1))
|
||||
|
||||
loan_details = frappe.get_value("Loan", self.loan, ['total_payment', 'total_principal_paid',
|
||||
loan_details = frappe.get_value("Loan", self.loan, ['total_payment', 'total_principal_paid', 'loan_amount',
|
||||
'total_interest_payable', 'written_off_amount', 'disbursed_amount', 'status'], as_dict=1)
|
||||
|
||||
if loan_details.status == 'Disbursed':
|
||||
pending_principal_amount = flt(loan_details.total_payment) - flt(loan_details.total_interest_payable) \
|
||||
- flt(loan_details.total_principal_paid) - flt(loan_details.written_off_amount)
|
||||
else:
|
||||
pending_principal_amount = flt(loan_details.disbursed_amount) - flt(loan_details.total_interest_payable) \
|
||||
- flt(loan_details.total_principal_paid) - flt(loan_details.written_off_amount)
|
||||
pending_principal_amount = get_pending_principal_amount(loan_details)
|
||||
|
||||
security_value = 0
|
||||
unpledge_qty_map = {}
|
||||
|
@ -409,7 +409,7 @@ def get_plan_from_razorpay_id(plan_id):
|
||||
def set_expired_status():
|
||||
frappe.db.sql("""
|
||||
UPDATE
|
||||
`tabMembership` SET `status` = 'Expired'
|
||||
`tabMembership` SET `membership_status` = 'Expired'
|
||||
WHERE
|
||||
`status` not in ('Cancelled') AND `to_date` < %s
|
||||
`membership_status` not in ('Cancelled') AND `to_date` < %s
|
||||
""", (nowdate()))
|
||||
|
@ -317,4 +317,7 @@ erpnext.patches.v14_0.rename_ongoing_status_in_sla_documents
|
||||
erpnext.patches.v14_0.migrate_crm_settings
|
||||
erpnext.patches.v13_0.rename_ksa_qr_field
|
||||
erpnext.patches.v13_0.disable_ksa_print_format_for_others # 16-12-2021
|
||||
erpnext.patches.v14_0.add_default_exit_questionnaire_notification_template
|
||||
erpnext.patches.v14_0.add_default_exit_questionnaire_notification_template
|
||||
erpnext.patches.v13_0.update_tax_category_for_rcm
|
||||
execute:frappe.delete_doc_if_exists('Workspace', 'ERPNext Integrations Settings')
|
||||
erpnext.patches.v14_0.set_payroll_cost_centers
|
@ -22,4 +22,5 @@ def execute():
|
||||
|
||||
delivery_settings = frappe.get_doc("Delivery Settings")
|
||||
delivery_settings.dispatch_template = _("Dispatch Notification")
|
||||
delivery_settings.flags.ignore_links = True
|
||||
delivery_settings.save()
|
||||
|
@ -97,6 +97,8 @@ def execute():
|
||||
'itc_central_tax': 0,
|
||||
'itc_cess_amount': 0
|
||||
})
|
||||
if not gst_accounts:
|
||||
continue
|
||||
|
||||
if d.account_head in gst_accounts.get('igst_account'):
|
||||
amount_map[d.parent]['itc_integrated_tax'] += d.amount
|
||||
|
@ -6,7 +6,7 @@ def execute():
|
||||
frappe.reload_doc("selling", "doctype", "sales_order_item")
|
||||
|
||||
for doctype in ["Sales Order", "Material Request"]:
|
||||
condition = " and child_doc.stock_qty > child_doc.produced_qty"
|
||||
condition = " and child_doc.stock_qty > child_doc.produced_qty and doc.per_delivered < 100"
|
||||
if doctype == "Material Request":
|
||||
condition = " and doc.per_ordered < 100 and doc.material_request_type = 'Manufacture'"
|
||||
|
||||
@ -15,5 +15,6 @@ def execute():
|
||||
child_doc.bom_no = item.default_bom
|
||||
WHERE
|
||||
child_doc.item_code = item.name and child_doc.docstatus < 2
|
||||
and child_doc.parent = doc.name
|
||||
and item.default_bom is not null and item.default_bom != '' {cond}
|
||||
""".format(doc = doctype, cond = condition))
|
||||
|
@ -32,4 +32,5 @@ def execute():
|
||||
hr_settings = frappe.get_doc('HR Settings')
|
||||
hr_settings.interview_reminder_template = _('Interview Reminder')
|
||||
hr_settings.feedback_reminder_notification_template = _('Interview Feedback Reminder')
|
||||
hr_settings.flags.ignore_links = True
|
||||
hr_settings.save()
|
||||
|
31
erpnext/patches/v13_0/update_tax_category_for_rcm.py
Normal file
31
erpnext/patches/v13_0/update_tax_category_for_rcm.py
Normal file
@ -0,0 +1,31 @@
|
||||
import frappe
|
||||
from frappe.custom.doctype.custom_field.custom_field import create_custom_fields
|
||||
|
||||
from erpnext.regional.india import states
|
||||
|
||||
|
||||
def execute():
|
||||
company = frappe.get_all('Company', filters = {'country': 'India'})
|
||||
if not company:
|
||||
return
|
||||
|
||||
create_custom_fields({
|
||||
'Tax Category': [
|
||||
dict(fieldname='is_inter_state', label='Is Inter State',
|
||||
fieldtype='Check', insert_after='disabled', print_hide=1),
|
||||
dict(fieldname='is_reverse_charge', label='Is Reverse Charge', fieldtype='Check',
|
||||
insert_after='is_inter_state', print_hide=1),
|
||||
dict(fieldname='tax_category_column_break', fieldtype='Column Break',
|
||||
insert_after='is_reverse_charge'),
|
||||
dict(fieldname='gst_state', label='Source State', fieldtype='Select',
|
||||
options='\n'.join(states), insert_after='company')
|
||||
]
|
||||
}, update=True)
|
||||
|
||||
tax_category = frappe.qb.DocType("Tax Category")
|
||||
|
||||
frappe.qb.update(tax_category).set(
|
||||
tax_category.is_reverse_charge, 1
|
||||
).where(
|
||||
tax_category.name.isin(['Reverse Charge Out-State', 'Reverse Charge In-State'])
|
||||
).run()
|
@ -24,4 +24,5 @@ def execute():
|
||||
|
||||
hr_settings = frappe.get_doc("HR Settings")
|
||||
hr_settings.exit_questionnaire_notification_template = template
|
||||
hr_settings.flags.ignore_links = True
|
||||
hr_settings.save()
|
||||
|
32
erpnext/patches/v14_0/set_payroll_cost_centers.py
Normal file
32
erpnext/patches/v14_0/set_payroll_cost_centers.py
Normal file
@ -0,0 +1,32 @@
|
||||
import frappe
|
||||
|
||||
|
||||
def execute():
|
||||
frappe.reload_doc('payroll', 'doctype', 'employee_cost_center')
|
||||
frappe.reload_doc('payroll', 'doctype', 'salary_structure_assignment')
|
||||
|
||||
employees = frappe.get_all("Employee", fields=["department", "payroll_cost_center", "name"])
|
||||
|
||||
employee_cost_center = {}
|
||||
for d in employees:
|
||||
cost_center = d.payroll_cost_center
|
||||
if not cost_center and d.department:
|
||||
cost_center = frappe.get_cached_value("Department", d.department, "payroll_cost_center")
|
||||
|
||||
if cost_center:
|
||||
employee_cost_center.setdefault(d.name, cost_center)
|
||||
|
||||
salary_structure_assignments = frappe.get_all("Salary Structure Assignment",
|
||||
filters = {"docstatus": ["!=", 2]},
|
||||
fields=["name", "employee"])
|
||||
|
||||
for d in salary_structure_assignments:
|
||||
cost_center = employee_cost_center.get(d.employee)
|
||||
if cost_center:
|
||||
assignment = frappe.get_doc("Salary Structure Assignment", d.name)
|
||||
if not assignment.get("payroll_cost_centers"):
|
||||
assignment.append("payroll_cost_centers", {
|
||||
"cost_center": cost_center,
|
||||
"percentage": 100
|
||||
})
|
||||
assignment.save()
|
@ -0,0 +1,43 @@
|
||||
{
|
||||
"actions": [],
|
||||
"creation": "2021-12-23 12:44:38.389283",
|
||||
"doctype": "DocType",
|
||||
"editable_grid": 1,
|
||||
"engine": "InnoDB",
|
||||
"field_order": [
|
||||
"cost_center",
|
||||
"percentage"
|
||||
],
|
||||
"fields": [
|
||||
{
|
||||
"allow_on_submit": 1,
|
||||
"fieldname": "cost_center",
|
||||
"fieldtype": "Link",
|
||||
"in_list_view": 1,
|
||||
"label": "Cost Center",
|
||||
"options": "Cost Center",
|
||||
"reqd": 1
|
||||
},
|
||||
{
|
||||
"allow_on_submit": 1,
|
||||
"fieldname": "percentage",
|
||||
"fieldtype": "Int",
|
||||
"in_list_view": 1,
|
||||
"label": "Percentage (%)",
|
||||
"non_negative": 1,
|
||||
"reqd": 1
|
||||
}
|
||||
],
|
||||
"index_web_pages_for_search": 1,
|
||||
"istable": 1,
|
||||
"links": [],
|
||||
"modified": "2021-12-23 17:39:03.410924",
|
||||
"modified_by": "Administrator",
|
||||
"module": "Payroll",
|
||||
"name": "Employee Cost Center",
|
||||
"owner": "Administrator",
|
||||
"permissions": [],
|
||||
"sort_field": "modified",
|
||||
"sort_order": "DESC",
|
||||
"states": []
|
||||
}
|
@ -0,0 +1,9 @@
|
||||
# Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and contributors
|
||||
# For license information, please see license.txt
|
||||
|
||||
# import frappe
|
||||
from frappe.model.document import Document
|
||||
|
||||
|
||||
class EmployeeCostCenter(Document):
|
||||
pass
|
@ -7,6 +7,7 @@ from dateutil.relativedelta import relativedelta
|
||||
from frappe import _
|
||||
from frappe.desk.reportview import get_filters_cond, get_match_cond
|
||||
from frappe.model.document import Document
|
||||
from frappe.query_builder.functions import Coalesce
|
||||
from frappe.utils import (
|
||||
DATE_FORMAT,
|
||||
add_days,
|
||||
@ -157,11 +158,20 @@ class PayrollEntry(Document):
|
||||
Returns list of salary slips based on selected criteria
|
||||
"""
|
||||
|
||||
ss_list = frappe.db.sql("""
|
||||
select t1.name, t1.salary_structure, t1.payroll_cost_center from `tabSalary Slip` t1
|
||||
where t1.docstatus = %s and t1.start_date >= %s and t1.end_date <= %s and t1.payroll_entry = %s
|
||||
and (t1.journal_entry is null or t1.journal_entry = "") and ifnull(salary_slip_based_on_timesheet,0) = %s
|
||||
""", (ss_status, self.start_date, self.end_date, self.name, self.salary_slip_based_on_timesheet), as_dict=as_dict)
|
||||
ss = frappe.qb.DocType("Salary Slip")
|
||||
ss_list = (
|
||||
frappe.qb.from_(ss)
|
||||
.select(ss.name, ss.salary_structure)
|
||||
.where(
|
||||
(ss.docstatus == ss_status)
|
||||
& (ss.start_date >= self.start_date)
|
||||
& (ss.end_date <= self.end_date)
|
||||
& (ss.payroll_entry == self.name)
|
||||
& ((ss.journal_entry.isnull()) | (ss.journal_entry == ""))
|
||||
& (Coalesce(ss.salary_slip_based_on_timesheet, 0) == self.salary_slip_based_on_timesheet)
|
||||
)
|
||||
).run(as_dict=as_dict)
|
||||
|
||||
return ss_list
|
||||
|
||||
@frappe.whitelist()
|
||||
@ -190,13 +200,20 @@ class PayrollEntry(Document):
|
||||
|
||||
def get_salary_components(self, component_type):
|
||||
salary_slips = self.get_sal_slip_list(ss_status = 1, as_dict = True)
|
||||
|
||||
if salary_slips:
|
||||
salary_components = frappe.db.sql("""
|
||||
select ssd.salary_component, ssd.amount, ssd.parentfield, ss.payroll_cost_center
|
||||
from `tabSalary Slip` ss, `tabSalary Detail` ssd
|
||||
where ss.name = ssd.parent and ssd.parentfield = '%s' and ss.name in (%s)
|
||||
""" % (component_type, ', '.join(['%s']*len(salary_slips))),
|
||||
tuple([d.name for d in salary_slips]), as_dict=True)
|
||||
ss = frappe.qb.DocType("Salary Slip")
|
||||
ssd = frappe.qb.DocType("Salary Detail")
|
||||
salary_components = (
|
||||
frappe.qb.from_(ss)
|
||||
.join(ssd)
|
||||
.on(ss.name == ssd.parent)
|
||||
.select(ssd.salary_component, ssd.amount, ssd.parentfield, ss.salary_structure, ss.employee)
|
||||
.where(
|
||||
(ssd.parentfield == component_type)
|
||||
& (ss.name.isin(tuple([d.name for d in salary_slips])))
|
||||
)
|
||||
).run(as_dict=True)
|
||||
|
||||
return salary_components
|
||||
|
||||
@ -204,18 +221,49 @@ class PayrollEntry(Document):
|
||||
salary_components = self.get_salary_components(component_type)
|
||||
if salary_components:
|
||||
component_dict = {}
|
||||
self.employee_cost_centers = {}
|
||||
for item in salary_components:
|
||||
employee_cost_centers = self.get_payroll_cost_centers_for_employee(item.employee, item.salary_structure)
|
||||
|
||||
add_component_to_accrual_jv_entry = True
|
||||
if component_type == "earnings":
|
||||
is_flexible_benefit, only_tax_impact = frappe.db.get_value("Salary Component", item['salary_component'], ['is_flexible_benefit', 'only_tax_impact'])
|
||||
is_flexible_benefit, only_tax_impact = \
|
||||
frappe.get_cached_value("Salary Component",item['salary_component'], ['is_flexible_benefit', 'only_tax_impact'])
|
||||
if is_flexible_benefit == 1 and only_tax_impact ==1:
|
||||
add_component_to_accrual_jv_entry = False
|
||||
|
||||
if add_component_to_accrual_jv_entry:
|
||||
component_dict[(item.salary_component, item.payroll_cost_center)] \
|
||||
= component_dict.get((item.salary_component, item.payroll_cost_center), 0) + flt(item.amount)
|
||||
for cost_center, percentage in employee_cost_centers.items():
|
||||
amount_against_cost_center = flt(item.amount) * percentage / 100
|
||||
component_dict[(item.salary_component, cost_center)] \
|
||||
= component_dict.get((item.salary_component, cost_center), 0) + amount_against_cost_center
|
||||
|
||||
account_details = self.get_account(component_dict = component_dict)
|
||||
return account_details
|
||||
|
||||
def get_payroll_cost_centers_for_employee(self, employee, salary_structure):
|
||||
if not self.employee_cost_centers.get(employee):
|
||||
ss_assignment_name = frappe.db.get_value("Salary Structure Assignment",
|
||||
{"employee": employee, "salary_structure": salary_structure, "docstatus": 1}, 'name')
|
||||
|
||||
if ss_assignment_name:
|
||||
cost_centers = dict(frappe.get_all("Employee Cost Center", {"parent": ss_assignment_name},
|
||||
["cost_center", "percentage"], as_list=1))
|
||||
if not cost_centers:
|
||||
default_cost_center, department = frappe.get_cached_value("Employee", employee, ["payroll_cost_center", "department"])
|
||||
if not default_cost_center and department:
|
||||
default_cost_center = frappe.get_cached_value("Department", department, "payroll_cost_center")
|
||||
if not default_cost_center:
|
||||
default_cost_center = self.cost_center
|
||||
|
||||
cost_centers = {
|
||||
default_cost_center: 100
|
||||
}
|
||||
|
||||
self.employee_cost_centers.setdefault(employee, cost_centers)
|
||||
|
||||
return self.employee_cost_centers.get(employee, {})
|
||||
|
||||
def get_account(self, component_dict = None):
|
||||
account_dict = {}
|
||||
for key, amount in component_dict.items():
|
||||
|
@ -120,8 +120,7 @@ class TestPayrollEntry(unittest.TestCase):
|
||||
|
||||
employee1 = make_employee("test_employee1@example.com", payroll_cost_center="_Test Cost Center - _TC",
|
||||
department="cc - _TC", company="_Test Company")
|
||||
employee2 = make_employee("test_employee2@example.com", payroll_cost_center="_Test Cost Center 2 - _TC",
|
||||
department="cc - _TC", company="_Test Company")
|
||||
employee2 = make_employee("test_employee2@example.com", department="cc - _TC", company="_Test Company")
|
||||
|
||||
if not frappe.db.exists("Account", "_Test Payroll Payable - _TC"):
|
||||
create_account(account_name="_Test Payroll Payable",
|
||||
@ -132,8 +131,26 @@ class TestPayrollEntry(unittest.TestCase):
|
||||
frappe.db.set_value("Company", "_Test Company", "default_payroll_payable_account",
|
||||
"_Test Payroll Payable - _TC")
|
||||
currency=frappe.db.get_value("Company", "_Test Company", "default_currency")
|
||||
|
||||
make_salary_structure("_Test Salary Structure 1", "Monthly", employee1, company="_Test Company", currency=currency, test_tax=False)
|
||||
make_salary_structure("_Test Salary Structure 2", "Monthly", employee2, company="_Test Company", currency=currency, test_tax=False)
|
||||
ss = make_salary_structure("_Test Salary Structure 2", "Monthly", employee2, company="_Test Company", currency=currency, test_tax=False)
|
||||
|
||||
# update cost centers in salary structure assignment for employee2
|
||||
ssa = frappe.db.get_value("Salary Structure Assignment",
|
||||
{"employee": employee2, "salary_structure": ss.name, "docstatus": 1}, 'name')
|
||||
|
||||
ssa_doc = frappe.get_doc("Salary Structure Assignment", ssa)
|
||||
ssa_doc.payroll_cost_centers = []
|
||||
ssa_doc.append("payroll_cost_centers", {
|
||||
"cost_center": "_Test Cost Center - _TC",
|
||||
"percentage": 60
|
||||
})
|
||||
ssa_doc.append("payroll_cost_centers", {
|
||||
"cost_center": "_Test Cost Center 2 - _TC",
|
||||
"percentage": 40
|
||||
})
|
||||
|
||||
ssa_doc.save()
|
||||
|
||||
dates = get_start_end_dates('Monthly', nowdate())
|
||||
if not frappe.db.get_value("Salary Slip", {"start_date": dates.start_date, "end_date": dates.end_date}):
|
||||
@ -148,10 +165,10 @@ class TestPayrollEntry(unittest.TestCase):
|
||||
""", je)
|
||||
expected_je = (
|
||||
('_Test Payroll Payable - _TC', 'Main - _TC', 0.0, 155600.0),
|
||||
('Salary - _TC', '_Test Cost Center - _TC', 78000.0, 0.0),
|
||||
('Salary - _TC', '_Test Cost Center 2 - _TC', 78000.0, 0.0),
|
||||
('Salary Deductions - _TC', '_Test Cost Center - _TC', 0.0, 200.0),
|
||||
('Salary Deductions - _TC', '_Test Cost Center 2 - _TC', 0.0, 200.0)
|
||||
('Salary - _TC', '_Test Cost Center - _TC', 124800.0, 0.0),
|
||||
('Salary - _TC', '_Test Cost Center 2 - _TC', 31200.0, 0.0),
|
||||
('Salary Deductions - _TC', '_Test Cost Center - _TC', 0.0, 320.0),
|
||||
('Salary Deductions - _TC', '_Test Cost Center 2 - _TC', 0.0, 80.0)
|
||||
)
|
||||
|
||||
self.assertEqual(je_entries, expected_je)
|
||||
|
@ -12,7 +12,6 @@
|
||||
"department",
|
||||
"designation",
|
||||
"branch",
|
||||
"payroll_cost_center",
|
||||
"column_break1",
|
||||
"status",
|
||||
"journal_entry",
|
||||
@ -462,15 +461,6 @@
|
||||
"print_hide": 1,
|
||||
"read_only": 1
|
||||
},
|
||||
{
|
||||
"fetch_from": "employee.payroll_cost_center",
|
||||
"fetch_if_empty": 1,
|
||||
"fieldname": "payroll_cost_center",
|
||||
"fieldtype": "Link",
|
||||
"label": "Payroll Cost Center",
|
||||
"options": "Cost Center",
|
||||
"read_only": 1
|
||||
},
|
||||
{
|
||||
"fieldname": "mode_of_payment",
|
||||
"fieldtype": "Select",
|
||||
@ -647,7 +637,7 @@
|
||||
"idx": 9,
|
||||
"is_submittable": 1,
|
||||
"links": [],
|
||||
"modified": "2021-10-08 11:47:47.098248",
|
||||
"modified": "2021-12-23 11:47:47.098248",
|
||||
"modified_by": "Administrator",
|
||||
"module": "Payroll",
|
||||
"name": "Salary Slip",
|
||||
|
@ -171,6 +171,7 @@ class TestSalarySlip(unittest.TestCase):
|
||||
salary_slip.end_date = month_end_date
|
||||
salary_slip.save()
|
||||
salary_slip.submit()
|
||||
salary_slip.reload()
|
||||
|
||||
no_of_days = self.get_no_of_days()
|
||||
days_in_month = no_of_days[0]
|
||||
|
@ -167,15 +167,12 @@ def make_salary_slip(source_name, target_doc = None, employee = None, as_print =
|
||||
def postprocess(source, target):
|
||||
if employee:
|
||||
employee_details = frappe.db.get_value("Employee", employee,
|
||||
["employee_name", "branch", "designation", "department", "payroll_cost_center"], as_dict=1)
|
||||
["employee_name", "branch", "designation", "department"], as_dict=1)
|
||||
target.employee = employee
|
||||
target.employee_name = employee_details.employee_name
|
||||
target.branch = employee_details.branch
|
||||
target.designation = employee_details.designation
|
||||
target.department = employee_details.department
|
||||
target.payroll_cost_center = employee_details.payroll_cost_center
|
||||
if not target.payroll_cost_center and target.department:
|
||||
target.payroll_cost_center = frappe.db.get_value("Department", target.department, "payroll_cost_center")
|
||||
|
||||
target.run_method('process_salary_structure', for_preview=for_preview)
|
||||
|
||||
|
@ -40,28 +40,29 @@ frappe.ui.form.on('Salary Structure Assignment', {
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
frm.set_query("cost_center", "payroll_cost_centers", function() {
|
||||
return {
|
||||
filters: {
|
||||
"company": frm.doc.company,
|
||||
"is_group": 0
|
||||
}
|
||||
};
|
||||
});
|
||||
},
|
||||
|
||||
employee: function(frm) {
|
||||
if(frm.doc.employee){
|
||||
if (frm.doc.employee) {
|
||||
frappe.call({
|
||||
method: "frappe.client.get_value",
|
||||
args:{
|
||||
doctype: "Employee",
|
||||
fieldname: "company",
|
||||
filters:{
|
||||
name: frm.doc.employee
|
||||
}
|
||||
},
|
||||
method: "set_payroll_cost_centers",
|
||||
doc: frm.doc,
|
||||
callback: function(data) {
|
||||
if(data.message){
|
||||
frm.set_value("company", data.message.company);
|
||||
}
|
||||
refresh_field("payroll_cost_centers");
|
||||
}
|
||||
});
|
||||
}
|
||||
else{
|
||||
frm.set_value("company", null);
|
||||
else {
|
||||
frm.set_value("payroll_cost_centers", []);
|
||||
}
|
||||
},
|
||||
|
||||
|
@ -22,7 +22,9 @@
|
||||
"base",
|
||||
"column_break_9",
|
||||
"variable",
|
||||
"amended_from"
|
||||
"amended_from",
|
||||
"section_break_17",
|
||||
"payroll_cost_centers"
|
||||
],
|
||||
"fields": [
|
||||
{
|
||||
@ -90,7 +92,8 @@
|
||||
},
|
||||
{
|
||||
"fieldname": "section_break_7",
|
||||
"fieldtype": "Section Break"
|
||||
"fieldtype": "Section Break",
|
||||
"label": "Base & Variable"
|
||||
},
|
||||
{
|
||||
"fieldname": "base",
|
||||
@ -141,14 +144,29 @@
|
||||
"fieldtype": "Link",
|
||||
"label": "Payroll Payable Account",
|
||||
"options": "Account"
|
||||
},
|
||||
{
|
||||
"collapsible": 1,
|
||||
"depends_on": "employee",
|
||||
"fieldname": "section_break_17",
|
||||
"fieldtype": "Section Break",
|
||||
"label": "Payroll Cost Centers"
|
||||
},
|
||||
{
|
||||
"allow_on_submit": 1,
|
||||
"fieldname": "payroll_cost_centers",
|
||||
"fieldtype": "Table",
|
||||
"label": "Cost Centers",
|
||||
"options": "Employee Cost Center"
|
||||
}
|
||||
],
|
||||
"is_submittable": 1,
|
||||
"links": [],
|
||||
"modified": "2021-03-31 22:44:46.267974",
|
||||
"modified": "2021-12-23 17:28:09.794444",
|
||||
"modified_by": "Administrator",
|
||||
"module": "Payroll",
|
||||
"name": "Salary Structure Assignment",
|
||||
"naming_rule": "Expression (old style)",
|
||||
"owner": "Administrator",
|
||||
"permissions": [
|
||||
{
|
||||
@ -193,6 +211,7 @@
|
||||
],
|
||||
"sort_field": "modified",
|
||||
"sort_order": "DESC",
|
||||
"states": [],
|
||||
"title_field": "employee_name",
|
||||
"track_changes": 1
|
||||
}
|
@ -5,7 +5,7 @@
|
||||
import frappe
|
||||
from frappe import _
|
||||
from frappe.model.document import Document
|
||||
from frappe.utils import getdate
|
||||
from frappe.utils import flt, getdate
|
||||
|
||||
|
||||
class DuplicateAssignment(frappe.ValidationError): pass
|
||||
@ -15,6 +15,10 @@ class SalaryStructureAssignment(Document):
|
||||
self.validate_dates()
|
||||
self.validate_income_tax_slab()
|
||||
self.set_payroll_payable_account()
|
||||
if not self.get("payroll_cost_centers"):
|
||||
self.set_payroll_cost_centers()
|
||||
|
||||
self.validate_cost_center_distribution()
|
||||
|
||||
def validate_dates(self):
|
||||
joining_date, relieving_date = frappe.db.get_value("Employee", self.employee,
|
||||
@ -51,6 +55,30 @@ class SalaryStructureAssignment(Document):
|
||||
"Company", self.company, "default_currency"), "is_group": 0})
|
||||
self.payroll_payable_account = payroll_payable_account
|
||||
|
||||
@frappe.whitelist()
|
||||
def set_payroll_cost_centers(self):
|
||||
self.payroll_cost_centers = []
|
||||
default_payroll_cost_center = self.get_payroll_cost_center()
|
||||
if default_payroll_cost_center:
|
||||
self.append("payroll_cost_centers", {
|
||||
"cost_center": default_payroll_cost_center,
|
||||
"percentage": 100
|
||||
})
|
||||
|
||||
def get_payroll_cost_center(self):
|
||||
payroll_cost_center = frappe.db.get_value("Employee", self.employee, "payroll_cost_center")
|
||||
if not payroll_cost_center and self.department:
|
||||
payroll_cost_center = frappe.db.get_value("Department", self.department, "payroll_cost_center")
|
||||
|
||||
return payroll_cost_center
|
||||
|
||||
def validate_cost_center_distribution(self):
|
||||
if self.get("payroll_cost_centers"):
|
||||
total_percentage = sum([flt(d.percentage) for d in self.get("payroll_cost_centers", [])])
|
||||
if total_percentage != 100:
|
||||
frappe.throw(_("Total percentage against cost centers should be 100"))
|
||||
|
||||
|
||||
def get_assigned_salary_structure(employee, on_date):
|
||||
if not employee or not on_date:
|
||||
return None
|
||||
@ -64,6 +92,7 @@ def get_assigned_salary_structure(employee, on_date):
|
||||
})
|
||||
return salary_structure[0][0] if salary_structure else None
|
||||
|
||||
|
||||
@frappe.whitelist()
|
||||
def get_employee_currency(employee):
|
||||
employee_currency = frappe.db.get_value('Salary Structure Assignment', {'employee': employee}, 'currency')
|
||||
|
@ -59,22 +59,16 @@ frappe.ui.form.on("Project", {
|
||||
|
||||
frm.trigger('show_dashboard');
|
||||
}
|
||||
frm.events.set_buttons(frm);
|
||||
frm.trigger("set_custom_buttons");
|
||||
},
|
||||
|
||||
set_buttons: function(frm) {
|
||||
set_custom_buttons: function(frm) {
|
||||
if (!frm.is_new()) {
|
||||
frm.add_custom_button(__('Duplicate Project with Tasks'), () => {
|
||||
frm.events.create_duplicate(frm);
|
||||
});
|
||||
}, __("Actions"));
|
||||
|
||||
frm.add_custom_button(__('Completed'), () => {
|
||||
frm.events.set_status(frm, 'Completed');
|
||||
}, __('Set Status'));
|
||||
|
||||
frm.add_custom_button(__('Cancelled'), () => {
|
||||
frm.events.set_status(frm, 'Cancelled');
|
||||
}, __('Set Status'));
|
||||
frm.trigger("set_project_status_button");
|
||||
|
||||
|
||||
if (frappe.model.can_read("Task")) {
|
||||
@ -83,7 +77,7 @@ frappe.ui.form.on("Project", {
|
||||
"project": frm.doc.name
|
||||
};
|
||||
frappe.set_route("List", "Task", "Gantt");
|
||||
});
|
||||
}, __("View"));
|
||||
|
||||
frm.add_custom_button(__("Kanban Board"), () => {
|
||||
frappe.call('erpnext.projects.doctype.project.project.create_kanban_board_if_not_exists', {
|
||||
@ -91,13 +85,35 @@ frappe.ui.form.on("Project", {
|
||||
}).then(() => {
|
||||
frappe.set_route('List', 'Task', 'Kanban', frm.doc.project_name);
|
||||
});
|
||||
});
|
||||
}, __("View"));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
},
|
||||
|
||||
set_project_status_button: function(frm) {
|
||||
frm.add_custom_button(__('Set Project Status'), () => {
|
||||
let d = new frappe.ui.Dialog({
|
||||
"title": __("Set Project Status"),
|
||||
"fields": [
|
||||
{
|
||||
"fieldname": "status",
|
||||
"fieldtype": "Select",
|
||||
"label": "Status",
|
||||
"reqd": 1,
|
||||
"options": "Completed\nCancelled",
|
||||
},
|
||||
],
|
||||
primary_action: function() {
|
||||
frm.events.set_status(frm, d.get_values().status);
|
||||
d.hide();
|
||||
},
|
||||
primary_action_label: __("Set Project Status")
|
||||
}).show();
|
||||
}, __("Actions"));
|
||||
},
|
||||
|
||||
create_duplicate: function(frm) {
|
||||
return new Promise(resolve => {
|
||||
frappe.prompt('Project Name', (data) => {
|
||||
@ -117,7 +133,9 @@ frappe.ui.form.on("Project", {
|
||||
set_status: function(frm, status) {
|
||||
frappe.confirm(__('Set Project and all Tasks to status {0}?', [status.bold()]), () => {
|
||||
frappe.xcall('erpnext.projects.doctype.project.project.set_project_status',
|
||||
{project: frm.doc.name, status: status}).then(() => { /* page will auto reload */ });
|
||||
{project: frm.doc.name, status: status}).then(() => {
|
||||
frm.reload_doc();
|
||||
});
|
||||
});
|
||||
},
|
||||
|
||||
|
@ -25,6 +25,7 @@ class TestProjectProfitability(unittest.TestCase):
|
||||
|
||||
self.timesheet = make_timesheet(emp, is_billable=1)
|
||||
self.salary_slip = make_salary_slip(self.timesheet.name)
|
||||
self.salary_slip.start_date = self.timesheet.start_date
|
||||
|
||||
holidays = self.salary_slip.get_holidays_for_employee(date, date)
|
||||
if holidays:
|
||||
@ -41,8 +42,8 @@ class TestProjectProfitability(unittest.TestCase):
|
||||
def test_project_profitability(self):
|
||||
filters = {
|
||||
'company': '_Test Company',
|
||||
'start_date': add_days(getdate(), -3),
|
||||
'end_date': getdate()
|
||||
'start_date': add_days(self.timesheet.start_date, -3),
|
||||
'end_date': self.timesheet.start_date
|
||||
}
|
||||
|
||||
report = execute(filters)
|
||||
|
@ -680,7 +680,7 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
|
||||
var item = frappe.get_doc(cdt, cdn);
|
||||
frappe.model.round_floats_in(item, ["price_list_rate", "discount_percentage"]);
|
||||
|
||||
// check if child doctype is Sales Order Item/Qutation Item and calculate the rate
|
||||
// check if child doctype is Sales Order Item/Quotation Item and calculate the rate
|
||||
if (in_list(["Quotation Item", "Sales Order Item", "Delivery Note Item", "Sales Invoice Item", "POS Invoice Item", "Purchase Invoice Item", "Purchase Order Item", "Purchase Receipt Item"]), cdt)
|
||||
this.apply_pricing_rule_on_item(item);
|
||||
else
|
||||
@ -1582,25 +1582,27 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
|
||||
|
||||
_set_values_for_item_list(children) {
|
||||
var me = this;
|
||||
var price_list_rate_changed = false;
|
||||
var items_rule_dict = {};
|
||||
|
||||
for(var i=0, l=children.length; i<l; i++) {
|
||||
var d = children[i];
|
||||
var d = children[i] ;
|
||||
let item_row = frappe.get_doc(d.doctype, d.name);
|
||||
var existing_pricing_rule = frappe.model.get_value(d.doctype, d.name, "pricing_rules");
|
||||
for(var k in d) {
|
||||
var v = d[k];
|
||||
if (["doctype", "name"].indexOf(k)===-1) {
|
||||
if(k=="price_list_rate") {
|
||||
if(flt(v) != flt(d.price_list_rate)) price_list_rate_changed = true;
|
||||
item_row['rate'] = v;
|
||||
}
|
||||
|
||||
if (k !== 'free_item_data') {
|
||||
frappe.model.set_value(d.doctype, d.name, k, v);
|
||||
item_row[k] = v;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
frappe.model.round_floats_in(item_row, ["price_list_rate", "discount_percentage"]);
|
||||
|
||||
// if pricing rule set as blank from an existing value, apply price_list
|
||||
if(!me.frm.doc.ignore_pricing_rule && existing_pricing_rule && !d.pricing_rules) {
|
||||
me.apply_price_list(frappe.get_doc(d.doctype, d.name));
|
||||
@ -1617,9 +1619,10 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
|
||||
}
|
||||
}
|
||||
|
||||
me.frm.refresh_field('items');
|
||||
me.apply_rule_on_other_items(items_rule_dict);
|
||||
|
||||
if(!price_list_rate_changed) me.calculate_taxes_and_totals();
|
||||
me.calculate_taxes_and_totals();
|
||||
}
|
||||
|
||||
apply_rule_on_other_items(args) {
|
||||
|
@ -277,8 +277,10 @@ def get_custom_fields():
|
||||
inter_state_gst_field = [
|
||||
dict(fieldname='is_inter_state', label='Is Inter State',
|
||||
fieldtype='Check', insert_after='disabled', print_hide=1),
|
||||
dict(fieldname='is_reverse_charge', label='Is Reverse Charge', fieldtype='Check',
|
||||
insert_after='is_inter_state', print_hide=1),
|
||||
dict(fieldname='tax_category_column_break', fieldtype='Column Break',
|
||||
insert_after='is_inter_state'),
|
||||
insert_after='is_reverse_charge'),
|
||||
dict(fieldname='gst_state', label='Source State', fieldtype='Select',
|
||||
options='\n'.join(states), insert_after='company')
|
||||
]
|
||||
|
@ -67,7 +67,8 @@ def validate_pan_for_india(doc, method):
|
||||
frappe.throw(_("Invalid PAN No. The input you've entered doesn't match the format of PAN."))
|
||||
|
||||
def validate_tax_category(doc, method):
|
||||
if doc.get('gst_state') and frappe.db.get_value('Tax Category', {'gst_state': doc.gst_state, 'is_inter_state': doc.is_inter_state}):
|
||||
if doc.get('gst_state') and frappe.db.get_value('Tax Category', {'gst_state': doc.gst_state, 'is_inter_state': doc.is_inter_state,
|
||||
'is_reverse_charge': doc.is_reverse_charge}):
|
||||
if doc.is_inter_state:
|
||||
frappe.throw(_("Inter State tax category for GST State {0} already exists").format(doc.gst_state))
|
||||
else:
|
||||
@ -214,7 +215,7 @@ def get_regional_address_details(party_details, doctype, company):
|
||||
|
||||
if tax_template_by_category:
|
||||
party_details['taxes_and_charges'] = tax_template_by_category
|
||||
return
|
||||
return party_details
|
||||
|
||||
if not party_details.place_of_supply: return party_details
|
||||
if not party_details.company_gstin: return party_details
|
||||
@ -264,7 +265,7 @@ def get_tax_template_based_on_category(master_doctype, company, party_details):
|
||||
|
||||
def get_tax_template(master_doctype, company, is_inter_state, state_code):
|
||||
tax_categories = frappe.get_all('Tax Category', fields = ['name', 'is_inter_state', 'gst_state'],
|
||||
filters = {'is_inter_state': is_inter_state})
|
||||
filters = {'is_inter_state': is_inter_state, 'is_reverse_charge': 0})
|
||||
|
||||
default_tax = ''
|
||||
|
||||
|
@ -196,20 +196,19 @@ class Customer(TransactionBase):
|
||||
if not lead.lead_name:
|
||||
frappe.throw(_("Please mention the Lead Name in Lead {0}").format(self.lead_name))
|
||||
|
||||
if lead.company_name:
|
||||
contact_names = frappe.get_all('Dynamic Link', filters={
|
||||
"parenttype":"Contact",
|
||||
"link_doctype":"Lead",
|
||||
"link_name":self.lead_name
|
||||
}, fields=["parent as name"])
|
||||
contact_names = frappe.get_all('Dynamic Link', filters={
|
||||
"parenttype":"Contact",
|
||||
"link_doctype":"Lead",
|
||||
"link_name":self.lead_name
|
||||
}, fields=["parent as name"])
|
||||
|
||||
for contact_name in contact_names:
|
||||
contact = frappe.get_doc('Contact', contact_name.get('name'))
|
||||
if not contact.has_link('Customer', self.name):
|
||||
contact.append('links', dict(link_doctype='Customer', link_name=self.name))
|
||||
contact.save(ignore_permissions=self.flags.ignore_permissions)
|
||||
for contact_name in contact_names:
|
||||
contact = frappe.get_doc('Contact', contact_name.get('name'))
|
||||
if not contact.has_link('Customer', self.name):
|
||||
contact.append('links', dict(link_doctype='Customer', link_name=self.name))
|
||||
contact.save(ignore_permissions=self.flags.ignore_permissions)
|
||||
|
||||
else:
|
||||
if not contact_names:
|
||||
lead.lead_name = lead.lead_name.lstrip().split(" ")
|
||||
lead.first_name = lead.lead_name[0]
|
||||
lead.last_name = " ".join(lead.lead_name[1:])
|
||||
|
@ -8,6 +8,7 @@ from frappe.model.mapper import get_mapped_doc
|
||||
from frappe.utils import flt, getdate, nowdate
|
||||
|
||||
from erpnext.controllers.selling_controller import SellingController
|
||||
from erpnext.crm.utils import add_link_in_communication, copy_comments
|
||||
|
||||
form_grid_templates = {
|
||||
"items": "templates/form_grid/item_grid.html"
|
||||
@ -34,6 +35,16 @@ class Quotation(SellingController):
|
||||
from erpnext.stock.doctype.packed_item.packed_item import make_packing_list
|
||||
make_packing_list(self)
|
||||
|
||||
def after_insert(self):
|
||||
if frappe.db.get_single_value("CRM Settings", "carry_forward_communication_and_comments"):
|
||||
if self.opportunity:
|
||||
copy_comments("Opportunity", self.opportunity, self)
|
||||
add_link_in_communication("Opportunity", self.opportunity, self)
|
||||
|
||||
elif self.quotation_to == "Lead" and self.party_name:
|
||||
copy_comments("Lead", self.party_name, self)
|
||||
add_link_in_communication("Lead", self.party_name, self)
|
||||
|
||||
def validate_valid_till(self):
|
||||
if self.valid_till and getdate(self.valid_till) < getdate(self.transaction_date):
|
||||
frappe.throw(_("Valid till date cannot be before transaction date"))
|
||||
|
@ -1178,11 +1178,13 @@
|
||||
{
|
||||
"title": "Reverse Charge In-State",
|
||||
"is_inter_state": 0,
|
||||
"is_reverse_charge": 1,
|
||||
"gst_state": ""
|
||||
},
|
||||
{
|
||||
"title": "Reverse Charge Out-State",
|
||||
"is_inter_state": 1,
|
||||
"is_reverse_charge": 1,
|
||||
"gst_state": ""
|
||||
},
|
||||
{
|
||||
|
@ -1,7 +1,6 @@
|
||||
{
|
||||
"actions": [],
|
||||
"allow_import": 1,
|
||||
"allow_rename": 1,
|
||||
"autoname": "field:serial_no",
|
||||
"creation": "2013-05-16 10:59:15",
|
||||
"description": "Distinct unit of an Item",
|
||||
@ -434,10 +433,11 @@
|
||||
"icon": "fa fa-barcode",
|
||||
"idx": 1,
|
||||
"links": [],
|
||||
"modified": "2021-01-08 14:31:15.375996",
|
||||
"modified": "2021-12-23 10:44:30.299450",
|
||||
"modified_by": "Administrator",
|
||||
"module": "Stock",
|
||||
"name": "Serial No",
|
||||
"naming_rule": "By fieldname",
|
||||
"owner": "Administrator",
|
||||
"permissions": [
|
||||
{
|
||||
@ -476,5 +476,6 @@
|
||||
"show_name_in_global_search": 1,
|
||||
"sort_field": "modified",
|
||||
"sort_order": "DESC",
|
||||
"states": [],
|
||||
"track_changes": 1
|
||||
}
|
@ -194,23 +194,6 @@ class SerialNo(StockController):
|
||||
if sle_exists:
|
||||
frappe.throw(_("Cannot delete Serial No {0}, as it is used in stock transactions").format(self.name))
|
||||
|
||||
def before_rename(self, old, new, merge=False):
|
||||
if merge:
|
||||
frappe.throw(_("Sorry, Serial Nos cannot be merged"))
|
||||
|
||||
def after_rename(self, old, new, merge=False):
|
||||
"""rename serial_no text fields"""
|
||||
for dt in frappe.db.sql("""select parent from tabDocField
|
||||
where fieldname='serial_no' and fieldtype in ('Text', 'Small Text', 'Long Text')"""):
|
||||
|
||||
for item in frappe.db.sql("""select name, serial_no from `tab%s`
|
||||
where serial_no like %s""" % (dt[0], frappe.db.escape('%' + old + '%'))):
|
||||
|
||||
serial_nos = map(lambda i: new if i.upper()==old.upper() else i, item[1].split('\n'))
|
||||
frappe.db.sql("""update `tab%s` set serial_no = %s
|
||||
where name=%s""" % (dt[0], '%s', '%s'),
|
||||
('\n'.join(list(serial_nos)), item[0]))
|
||||
|
||||
def update_serial_no_reference(self, serial_no=None):
|
||||
last_sle = self.get_last_sle(serial_no)
|
||||
self.set_purchase_details(last_sle.get("purchase_sle"))
|
||||
|
@ -35,10 +35,16 @@ from erpnext.stock.stock_ledger import NegativeStockError, get_previous_sle, get
|
||||
from erpnext.stock.utils import get_bin, get_incoming_rate
|
||||
|
||||
|
||||
class IncorrectValuationRateError(frappe.ValidationError): pass
|
||||
class DuplicateEntryForWorkOrderError(frappe.ValidationError): pass
|
||||
class OperationsNotCompleteError(frappe.ValidationError): pass
|
||||
class MaxSampleAlreadyRetainedError(frappe.ValidationError): pass
|
||||
class FinishedGoodError(frappe.ValidationError):
|
||||
pass
|
||||
class IncorrectValuationRateError(frappe.ValidationError):
|
||||
pass
|
||||
class DuplicateEntryForWorkOrderError(frappe.ValidationError):
|
||||
pass
|
||||
class OperationsNotCompleteError(frappe.ValidationError):
|
||||
pass
|
||||
class MaxSampleAlreadyRetainedError(frappe.ValidationError):
|
||||
pass
|
||||
|
||||
from erpnext.controllers.stock_controller import StockController
|
||||
|
||||
@ -701,6 +707,11 @@ class StockEntry(StockController):
|
||||
|
||||
finished_item = self.get_finished_item()
|
||||
|
||||
if not finished_item and self.purpose == "Manufacture":
|
||||
# In case of independent Manufacture entry, don't auto set
|
||||
# user must decide and set
|
||||
return
|
||||
|
||||
for d in self.items:
|
||||
if d.t_warehouse and not d.s_warehouse:
|
||||
if self.purpose=="Repack" or d.item_code == finished_item:
|
||||
@ -721,38 +732,64 @@ class StockEntry(StockController):
|
||||
return finished_item
|
||||
|
||||
def validate_finished_goods(self):
|
||||
"""validation: finished good quantity should be same as manufacturing quantity"""
|
||||
if not self.work_order: return
|
||||
"""
|
||||
1. Check if FG exists
|
||||
2. Check if Multiple FG Items are present
|
||||
3. Check FG Item and Qty against WO if present
|
||||
"""
|
||||
production_item, wo_qty, finished_items = None, 0, []
|
||||
|
||||
production_item, wo_qty = frappe.db.get_value("Work Order",
|
||||
self.work_order, ["production_item", "qty"])
|
||||
wo_details = frappe.db.get_value(
|
||||
"Work Order", self.work_order, ["production_item", "qty"]
|
||||
)
|
||||
if wo_details:
|
||||
production_item, wo_qty = wo_details
|
||||
|
||||
finished_items = []
|
||||
for d in self.get('items'):
|
||||
if d.is_finished_item:
|
||||
if not self.work_order:
|
||||
finished_items.append(d.item_code)
|
||||
continue # Independent Manufacture Entry, no WO to match against
|
||||
|
||||
if d.item_code != production_item:
|
||||
frappe.throw(_("Finished Item {0} does not match with Work Order {1}")
|
||||
.format(d.item_code, self.work_order))
|
||||
.format(d.item_code, self.work_order)
|
||||
)
|
||||
elif flt(d.transfer_qty) > flt(self.fg_completed_qty):
|
||||
frappe.throw(_("Quantity in row {0} ({1}) must be same as manufactured quantity {2}"). \
|
||||
format(d.idx, d.transfer_qty, self.fg_completed_qty))
|
||||
frappe.throw(_("Quantity in row {0} ({1}) must be same as manufactured quantity {2}")
|
||||
.format(d.idx, d.transfer_qty, self.fg_completed_qty)
|
||||
)
|
||||
|
||||
finished_items.append(d.item_code)
|
||||
|
||||
if len(set(finished_items)) > 1:
|
||||
frappe.throw(_("Multiple items cannot be marked as finished item"))
|
||||
frappe.throw(
|
||||
msg=_("Multiple items cannot be marked as finished item"),
|
||||
title=_("Note"),
|
||||
exc=FinishedGoodError
|
||||
)
|
||||
|
||||
if self.purpose == "Manufacture":
|
||||
if not finished_items:
|
||||
frappe.throw(_('Finished Good has not set in the stock entry {0}')
|
||||
.format(self.name))
|
||||
frappe.throw(
|
||||
msg=_("There must be atleast 1 Finished Good in this Stock Entry").format(self.name),
|
||||
title=_("Missing Finished Good"),
|
||||
exc=FinishedGoodError
|
||||
)
|
||||
|
||||
allowance_percentage = flt(frappe.db.get_single_value("Manufacturing Settings",
|
||||
"overproduction_percentage_for_work_order"))
|
||||
allowance_percentage = flt(
|
||||
frappe.db.get_single_value(
|
||||
"Manufacturing Settings","overproduction_percentage_for_work_order"
|
||||
)
|
||||
)
|
||||
allowed_qty = wo_qty + ((allowance_percentage/100) * wo_qty)
|
||||
|
||||
allowed_qty = wo_qty + (allowance_percentage/100 * wo_qty)
|
||||
if self.fg_completed_qty > allowed_qty:
|
||||
frappe.throw(_("For quantity {0} should not be greater than work order quantity {1}")
|
||||
.format(flt(self.fg_completed_qty), wo_qty))
|
||||
# No work order could mean independent Manufacture entry, if so skip validation
|
||||
if self.work_order and self.fg_completed_qty > allowed_qty:
|
||||
frappe.throw(
|
||||
_("For quantity {0} should not be greater than work order quantity {1}")
|
||||
.format(flt(self.fg_completed_qty), wo_qty)
|
||||
)
|
||||
|
||||
def update_stock_ledger(self):
|
||||
sl_entries = []
|
||||
|
@ -15,7 +15,10 @@ from erpnext.stock.doctype.item.test_item import (
|
||||
set_item_variant_settings,
|
||||
)
|
||||
from erpnext.stock.doctype.serial_no.serial_no import * # noqa
|
||||
from erpnext.stock.doctype.stock_entry.stock_entry import move_sample_to_retention_warehouse
|
||||
from erpnext.stock.doctype.stock_entry.stock_entry import (
|
||||
FinishedGoodError,
|
||||
move_sample_to_retention_warehouse,
|
||||
)
|
||||
from erpnext.stock.doctype.stock_entry.stock_entry_utils import make_stock_entry
|
||||
from erpnext.stock.doctype.stock_ledger_entry.stock_ledger_entry import StockFreezeError
|
||||
from erpnext.stock.doctype.stock_reconciliation.stock_reconciliation import (
|
||||
@ -929,6 +932,38 @@ class TestStockEntry(ERPNextTestCase):
|
||||
distributed_costs = [d.additional_cost for d in se.items]
|
||||
self.assertEqual([40.0, 60.0], distributed_costs)
|
||||
|
||||
def test_independent_manufacture_entry(self):
|
||||
"Test FG items and incoming rate calculation in Maniufacture Entry without WO or BOM linked."
|
||||
se = frappe.get_doc(
|
||||
doctype="Stock Entry",
|
||||
purpose="Manufacture",
|
||||
stock_entry_type="Manufacture",
|
||||
company="_Test Company",
|
||||
items=[
|
||||
frappe._dict(item_code="_Test Item", qty=1, basic_rate=200, s_warehouse="_Test Warehouse - _TC"),
|
||||
frappe._dict(item_code="_Test FG Item", qty=4, t_warehouse="_Test Warehouse 1 - _TC")
|
||||
]
|
||||
)
|
||||
# SE must have atleast one FG
|
||||
self.assertRaises(FinishedGoodError, se.save)
|
||||
|
||||
se.items[0].is_finished_item = 1
|
||||
se.items[1].is_finished_item = 1
|
||||
# SE cannot have multiple FGs
|
||||
self.assertRaises(FinishedGoodError, se.save)
|
||||
|
||||
se.items[0].is_finished_item = 0
|
||||
se.save()
|
||||
|
||||
# Check if FG cost is calculated based on RM total cost
|
||||
# RM total cost = 200, FG rate = 200/4(FG qty) = 50
|
||||
self.assertEqual(se.items[1].basic_rate, 50)
|
||||
self.assertEqual(se.value_difference, 0.0)
|
||||
self.assertEqual(se.total_incoming_value, se.total_outgoing_value)
|
||||
|
||||
# teardown
|
||||
se.delete()
|
||||
|
||||
@change_settings("Stock Settings", {"allow_negative_stock": 0})
|
||||
def test_future_negative_sle(self):
|
||||
# Initialize item, batch, warehouse, opening qty
|
||||
|
@ -150,7 +150,7 @@
|
||||
"fieldtype": "Float",
|
||||
"in_filter": 1,
|
||||
"in_list_view": 1,
|
||||
"label": "Actual Quantity",
|
||||
"label": "Qty Change",
|
||||
"oldfieldname": "actual_qty",
|
||||
"oldfieldtype": "Currency",
|
||||
"print_width": "150px",
|
||||
@ -189,7 +189,7 @@
|
||||
"fieldname": "qty_after_transaction",
|
||||
"fieldtype": "Float",
|
||||
"in_filter": 1,
|
||||
"label": "Actual Qty After Transaction",
|
||||
"label": "Qty After Transaction",
|
||||
"oldfieldname": "bin_aqat",
|
||||
"oldfieldtype": "Currency",
|
||||
"print_width": "150px",
|
||||
@ -210,7 +210,7 @@
|
||||
{
|
||||
"fieldname": "stock_value",
|
||||
"fieldtype": "Currency",
|
||||
"label": "Stock Value",
|
||||
"label": "Balance Stock Value",
|
||||
"oldfieldname": "stock_value",
|
||||
"oldfieldtype": "Currency",
|
||||
"options": "Company:company:default_currency",
|
||||
@ -219,14 +219,14 @@
|
||||
{
|
||||
"fieldname": "stock_value_difference",
|
||||
"fieldtype": "Currency",
|
||||
"label": "Stock Value Difference",
|
||||
"label": "Change in Stock Value",
|
||||
"options": "Company:company:default_currency",
|
||||
"read_only": 1
|
||||
},
|
||||
{
|
||||
"fieldname": "stock_queue",
|
||||
"fieldtype": "Text",
|
||||
"label": "Stock Queue (FIFO)",
|
||||
"label": "FIFO Stock Queue (qty, rate)",
|
||||
"oldfieldname": "fcfs_stack",
|
||||
"oldfieldtype": "Text",
|
||||
"print_hide": 1,
|
||||
@ -317,10 +317,11 @@
|
||||
"in_create": 1,
|
||||
"index_web_pages_for_search": 1,
|
||||
"links": [],
|
||||
"modified": "2021-10-08 13:42:51.857631",
|
||||
"modified": "2021-12-21 06:25:30.040801",
|
||||
"modified_by": "Administrator",
|
||||
"module": "Stock",
|
||||
"name": "Stock Ledger Entry",
|
||||
"naming_rule": "Expression (old style)",
|
||||
"owner": "Administrator",
|
||||
"permissions": [
|
||||
{
|
||||
@ -338,5 +339,6 @@
|
||||
}
|
||||
],
|
||||
"sort_field": "modified",
|
||||
"sort_order": "DESC"
|
||||
}
|
||||
"sort_order": "DESC",
|
||||
"states": []
|
||||
}
|
@ -1097,7 +1097,7 @@ def apply_price_list(args, as_doc=False):
|
||||
}
|
||||
|
||||
def apply_price_list_on_item(args):
|
||||
item_doc = frappe.get_doc("Item", args.item_code)
|
||||
item_doc = frappe.db.get_value("Item", args.item_code, ['name', 'variant_of'], as_dict=1)
|
||||
item_details = get_price_list_rate(args, item_doc)
|
||||
|
||||
item_details.update(get_pricing_rule_for_item(args, item_details.price_list_rate))
|
||||
|
@ -3,6 +3,7 @@
|
||||
|
||||
|
||||
from operator import itemgetter
|
||||
from typing import Dict, List, Tuple, Union
|
||||
|
||||
import frappe
|
||||
from frappe import _
|
||||
@ -10,19 +11,29 @@ from frappe.utils import cint, date_diff, flt
|
||||
|
||||
from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos
|
||||
|
||||
Filters = frappe._dict
|
||||
|
||||
def execute(filters=None):
|
||||
columns = get_columns(filters)
|
||||
item_details = get_fifo_queue(filters)
|
||||
def execute(filters: Filters = None) -> Tuple:
|
||||
to_date = filters["to_date"]
|
||||
_func = itemgetter(1)
|
||||
columns = get_columns(filters)
|
||||
|
||||
item_details = FIFOSlots(filters).generate()
|
||||
data = format_report_data(filters, item_details, to_date)
|
||||
|
||||
chart_data = get_chart_data(data, filters)
|
||||
|
||||
return columns, data, None, chart_data
|
||||
|
||||
def format_report_data(filters: Filters, item_details: Dict, to_date: str) -> List[Dict]:
|
||||
"Returns ordered, formatted data with ranges."
|
||||
_func = itemgetter(1)
|
||||
data = []
|
||||
|
||||
for item, item_dict in item_details.items():
|
||||
earliest_age, latest_age = 0, 0
|
||||
details = item_dict["details"]
|
||||
|
||||
fifo_queue = sorted(filter(_func, item_dict["fifo_queue"]), key=_func)
|
||||
details = item_dict["details"]
|
||||
|
||||
if not fifo_queue: continue
|
||||
|
||||
@ -31,23 +42,22 @@ def execute(filters=None):
|
||||
latest_age = date_diff(to_date, fifo_queue[-1][1])
|
||||
range1, range2, range3, above_range3 = get_range_age(filters, fifo_queue, to_date, item_dict)
|
||||
|
||||
row = [details.name, details.item_name,
|
||||
details.description, details.item_group, details.brand]
|
||||
row = [details.name, details.item_name, details.description,
|
||||
details.item_group, details.brand]
|
||||
|
||||
if filters.get("show_warehouse_wise_stock"):
|
||||
row.append(details.warehouse)
|
||||
|
||||
row.extend([item_dict.get("total_qty"), average_age,
|
||||
range1, range2, range3, above_range3,
|
||||
earliest_age, latest_age, details.stock_uom])
|
||||
earliest_age, latest_age,
|
||||
details.stock_uom])
|
||||
|
||||
data.append(row)
|
||||
|
||||
chart_data = get_chart_data(data, filters)
|
||||
return data
|
||||
|
||||
return columns, data, None, chart_data
|
||||
|
||||
def get_average_age(fifo_queue, to_date):
|
||||
def get_average_age(fifo_queue: List, to_date: str) -> float:
|
||||
batch_age = age_qty = total_qty = 0.0
|
||||
for batch in fifo_queue:
|
||||
batch_age = date_diff(to_date, batch[1])
|
||||
@ -61,7 +71,7 @@ def get_average_age(fifo_queue, to_date):
|
||||
|
||||
return flt(age_qty / total_qty, 2) if total_qty else 0.0
|
||||
|
||||
def get_range_age(filters, fifo_queue, to_date, item_dict):
|
||||
def get_range_age(filters: Filters, fifo_queue: List, to_date: str, item_dict: Dict) -> Tuple:
|
||||
range1 = range2 = range3 = above_range3 = 0.0
|
||||
|
||||
for item in fifo_queue:
|
||||
@ -79,7 +89,7 @@ def get_range_age(filters, fifo_queue, to_date, item_dict):
|
||||
|
||||
return range1, range2, range3, above_range3
|
||||
|
||||
def get_columns(filters):
|
||||
def get_columns(filters: Filters) -> List[Dict]:
|
||||
range_columns = []
|
||||
setup_ageing_columns(filters, range_columns)
|
||||
columns = [
|
||||
@ -164,106 +174,7 @@ def get_columns(filters):
|
||||
|
||||
return columns
|
||||
|
||||
def get_fifo_queue(filters, sle=None):
|
||||
item_details = {}
|
||||
transferred_item_details = {}
|
||||
serial_no_batch_purchase_details = {}
|
||||
|
||||
if sle == None:
|
||||
sle = get_stock_ledger_entries(filters)
|
||||
|
||||
for d in sle:
|
||||
key = (d.name, d.warehouse) if filters.get('show_warehouse_wise_stock') else d.name
|
||||
item_details.setdefault(key, {"details": d, "fifo_queue": []})
|
||||
fifo_queue = item_details[key]["fifo_queue"]
|
||||
|
||||
transferred_item_key = (d.voucher_no, d.name, d.warehouse)
|
||||
transferred_item_details.setdefault(transferred_item_key, [])
|
||||
|
||||
if d.voucher_type == "Stock Reconciliation":
|
||||
d.actual_qty = flt(d.qty_after_transaction) - flt(item_details[key].get("qty_after_transaction", 0))
|
||||
|
||||
serial_no_list = get_serial_nos(d.serial_no) if d.serial_no else []
|
||||
|
||||
if d.actual_qty > 0:
|
||||
if transferred_item_details.get(transferred_item_key):
|
||||
batch = transferred_item_details[transferred_item_key][0]
|
||||
fifo_queue.append(batch)
|
||||
transferred_item_details[transferred_item_key].pop(0)
|
||||
else:
|
||||
if serial_no_list:
|
||||
for serial_no in serial_no_list:
|
||||
if serial_no_batch_purchase_details.get(serial_no):
|
||||
fifo_queue.append([serial_no, serial_no_batch_purchase_details.get(serial_no)])
|
||||
else:
|
||||
serial_no_batch_purchase_details.setdefault(serial_no, d.posting_date)
|
||||
fifo_queue.append([serial_no, d.posting_date])
|
||||
else:
|
||||
fifo_queue.append([d.actual_qty, d.posting_date])
|
||||
else:
|
||||
if serial_no_list:
|
||||
fifo_queue[:] = [serial_no for serial_no in fifo_queue if serial_no[0] not in serial_no_list]
|
||||
else:
|
||||
qty_to_pop = abs(d.actual_qty)
|
||||
while qty_to_pop:
|
||||
batch = fifo_queue[0] if fifo_queue else [0, None]
|
||||
if 0 < flt(batch[0]) <= qty_to_pop:
|
||||
# if batch qty > 0
|
||||
# not enough or exactly same qty in current batch, clear batch
|
||||
qty_to_pop -= flt(batch[0])
|
||||
transferred_item_details[transferred_item_key].append(fifo_queue.pop(0))
|
||||
else:
|
||||
# all from current batch
|
||||
batch[0] = flt(batch[0]) - qty_to_pop
|
||||
transferred_item_details[transferred_item_key].append([qty_to_pop, batch[1]])
|
||||
qty_to_pop = 0
|
||||
|
||||
item_details[key]["qty_after_transaction"] = d.qty_after_transaction
|
||||
|
||||
if "total_qty" not in item_details[key]:
|
||||
item_details[key]["total_qty"] = d.actual_qty
|
||||
else:
|
||||
item_details[key]["total_qty"] += d.actual_qty
|
||||
|
||||
item_details[key]["has_serial_no"] = d.has_serial_no
|
||||
|
||||
return item_details
|
||||
|
||||
def get_stock_ledger_entries(filters):
|
||||
return frappe.db.sql("""select
|
||||
item.name, item.item_name, item_group, brand, description, item.stock_uom, item.has_serial_no,
|
||||
actual_qty, posting_date, voucher_type, voucher_no, serial_no, batch_no, qty_after_transaction, warehouse
|
||||
from `tabStock Ledger Entry` sle,
|
||||
(select name, item_name, description, stock_uom, brand, item_group, has_serial_no
|
||||
from `tabItem` {item_conditions}) item
|
||||
where item_code = item.name and
|
||||
company = %(company)s and
|
||||
posting_date <= %(to_date)s and
|
||||
is_cancelled != 1
|
||||
{sle_conditions}
|
||||
order by posting_date, posting_time, sle.creation, actual_qty""" #nosec
|
||||
.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"):
|
||||
lft, rgt = frappe.db.get_value('Warehouse', filters.get("warehouse"), ['lft', 'rgt'])
|
||||
conditions.append("""warehouse in (select wh.name from `tabWarehouse` wh
|
||||
where wh.lft >= {0} and rgt <= {1})""".format(lft, rgt))
|
||||
|
||||
return "and {}".format(" and ".join(conditions)) if conditions else ""
|
||||
|
||||
def get_chart_data(data, filters):
|
||||
def get_chart_data(data: List, filters: Filters) -> Dict:
|
||||
if not data:
|
||||
return []
|
||||
|
||||
@ -294,17 +205,201 @@ def get_chart_data(data, filters):
|
||||
"type" : "bar"
|
||||
}
|
||||
|
||||
def setup_ageing_columns(filters, range_columns):
|
||||
for i, label in enumerate(["0-{range1}".format(range1=filters["range1"]),
|
||||
"{range1}-{range2}".format(range1=cint(filters["range1"])+ 1, range2=filters["range2"]),
|
||||
"{range2}-{range3}".format(range2=cint(filters["range2"])+ 1, range3=filters["range3"]),
|
||||
"{range3}-{above}".format(range3=cint(filters["range3"])+ 1, above=_("Above"))]):
|
||||
add_column(range_columns, label="Age ("+ label +")", fieldname='range' + str(i+1))
|
||||
def setup_ageing_columns(filters: Filters, range_columns: List):
|
||||
ranges = [
|
||||
f"0 - {filters['range1']}",
|
||||
f"{cint(filters['range1']) + 1} - {cint(filters['range2'])}",
|
||||
f"{cint(filters['range2']) + 1} - {cint(filters['range3'])}",
|
||||
f"{cint(filters['range3']) + 1} - {_('Above')}"
|
||||
]
|
||||
for i, label in enumerate(ranges):
|
||||
fieldname = 'range' + str(i+1)
|
||||
add_column(range_columns, label=f"Age ({label})",fieldname=fieldname)
|
||||
|
||||
def add_column(range_columns, label, fieldname, fieldtype='Float', width=140):
|
||||
def add_column(range_columns: List, label:str, fieldname: str, fieldtype: str = 'Float', width: int = 140):
|
||||
range_columns.append(dict(
|
||||
label=label,
|
||||
fieldname=fieldname,
|
||||
fieldtype=fieldtype,
|
||||
width=width
|
||||
))
|
||||
|
||||
|
||||
class FIFOSlots:
|
||||
"Returns FIFO computed slots of inwarded stock as per date."
|
||||
|
||||
def __init__(self, filters: Dict = None , sle: List = None):
|
||||
self.item_details = {}
|
||||
self.transferred_item_details = {}
|
||||
self.serial_no_batch_purchase_details = {}
|
||||
self.filters = filters
|
||||
self.sle = sle
|
||||
|
||||
def generate(self) -> Dict:
|
||||
"""
|
||||
Returns dict of the foll.g structure:
|
||||
Key = Item A / (Item A, Warehouse A)
|
||||
Key: {
|
||||
'details' -> Dict: ** item details **,
|
||||
'fifo_queue' -> List: ** list of lists containing entries/slots for existing stock,
|
||||
consumed/updated and maintained via FIFO. **
|
||||
}
|
||||
"""
|
||||
if self.sle is None:
|
||||
self.sle = self.__get_stock_ledger_entries()
|
||||
|
||||
for d in self.sle:
|
||||
key, fifo_queue, transferred_item_key = self.__init_key_stores(d)
|
||||
|
||||
if d.voucher_type == "Stock Reconciliation":
|
||||
prev_balance_qty = self.item_details[key].get("qty_after_transaction", 0)
|
||||
d.actual_qty = flt(d.qty_after_transaction) - flt(prev_balance_qty)
|
||||
|
||||
serial_nos = get_serial_nos(d.serial_no) if d.serial_no else []
|
||||
|
||||
if d.actual_qty > 0:
|
||||
self.__compute_incoming_stock(d, fifo_queue, transferred_item_key, serial_nos)
|
||||
else:
|
||||
self.__compute_outgoing_stock(d, fifo_queue, transferred_item_key, serial_nos)
|
||||
|
||||
self.__update_balances(d, key)
|
||||
|
||||
return self.item_details
|
||||
|
||||
def __init_key_stores(self, row: Dict) -> Tuple:
|
||||
"Initialise keys and FIFO Queue."
|
||||
|
||||
key = (row.name, row.warehouse) if self.filters.get('show_warehouse_wise_stock') else row.name
|
||||
self.item_details.setdefault(key, {"details": row, "fifo_queue": []})
|
||||
fifo_queue = self.item_details[key]["fifo_queue"]
|
||||
|
||||
transferred_item_key = (row.voucher_no, row.name, row.warehouse)
|
||||
self.transferred_item_details.setdefault(transferred_item_key, [])
|
||||
|
||||
return key, fifo_queue, transferred_item_key
|
||||
|
||||
def __compute_incoming_stock(self, row: Dict, fifo_queue: List, transfer_key: Tuple, serial_nos: List):
|
||||
"Update FIFO Queue on inward stock."
|
||||
|
||||
if self.transferred_item_details.get(transfer_key):
|
||||
# inward/outward from same voucher, item & warehouse
|
||||
slot = self.transferred_item_details[transfer_key].pop(0)
|
||||
fifo_queue.append(slot)
|
||||
else:
|
||||
if not serial_nos:
|
||||
if fifo_queue and flt(fifo_queue[0][0]) < 0:
|
||||
# neutralize negative stock by adding positive stock
|
||||
fifo_queue[0][0] += flt(row.actual_qty)
|
||||
fifo_queue[0][1] = row.posting_date
|
||||
else:
|
||||
fifo_queue.append([flt(row.actual_qty), row.posting_date])
|
||||
return
|
||||
|
||||
for serial_no in serial_nos:
|
||||
if self.serial_no_batch_purchase_details.get(serial_no):
|
||||
fifo_queue.append([serial_no, self.serial_no_batch_purchase_details.get(serial_no)])
|
||||
else:
|
||||
self.serial_no_batch_purchase_details.setdefault(serial_no, row.posting_date)
|
||||
fifo_queue.append([serial_no, row.posting_date])
|
||||
|
||||
def __compute_outgoing_stock(self, row: Dict, fifo_queue: List, transfer_key: Tuple, serial_nos: List):
|
||||
"Update FIFO Queue on outward stock."
|
||||
if serial_nos:
|
||||
fifo_queue[:] = [serial_no for serial_no in fifo_queue if serial_no[0] not in serial_nos]
|
||||
return
|
||||
|
||||
qty_to_pop = abs(row.actual_qty)
|
||||
while qty_to_pop:
|
||||
slot = fifo_queue[0] if fifo_queue else [0, None]
|
||||
if 0 < flt(slot[0]) <= qty_to_pop:
|
||||
# qty to pop >= slot qty
|
||||
# if +ve and not enough or exactly same balance in current slot, consume whole slot
|
||||
qty_to_pop -= flt(slot[0])
|
||||
self.transferred_item_details[transfer_key].append(fifo_queue.pop(0))
|
||||
elif not fifo_queue:
|
||||
# negative stock, no balance but qty yet to consume
|
||||
fifo_queue.append([-(qty_to_pop), row.posting_date])
|
||||
self.transferred_item_details[transfer_key].append([row.actual_qty, row.posting_date])
|
||||
qty_to_pop = 0
|
||||
else:
|
||||
# qty to pop < slot qty, ample balance
|
||||
# consume actual_qty from first slot
|
||||
slot[0] = flt(slot[0]) - qty_to_pop
|
||||
self.transferred_item_details[transfer_key].append([qty_to_pop, slot[1]])
|
||||
qty_to_pop = 0
|
||||
|
||||
def __update_balances(self, row: Dict, key: Union[Tuple, str]):
|
||||
self.item_details[key]["qty_after_transaction"] = row.qty_after_transaction
|
||||
|
||||
if "total_qty" not in self.item_details[key]:
|
||||
self.item_details[key]["total_qty"] = row.actual_qty
|
||||
else:
|
||||
self.item_details[key]["total_qty"] += row.actual_qty
|
||||
|
||||
self.item_details[key]["has_serial_no"] = row.has_serial_no
|
||||
|
||||
def __get_stock_ledger_entries(self) -> List[Dict]:
|
||||
sle = frappe.qb.DocType("Stock Ledger Entry")
|
||||
item = self.__get_item_query() # used as derived table in sle query
|
||||
|
||||
sle_query = (
|
||||
frappe.qb.from_(sle).from_(item)
|
||||
.select(
|
||||
item.name, item.item_name, item.item_group,
|
||||
item.brand, item.description,
|
||||
item.stock_uom, item.has_serial_no,
|
||||
sle.actual_qty, sle.posting_date,
|
||||
sle.voucher_type, sle.voucher_no,
|
||||
sle.serial_no, sle.batch_no,
|
||||
sle.qty_after_transaction, sle.warehouse
|
||||
).where(
|
||||
(sle.item_code == item.name)
|
||||
& (sle.company == self.filters.get("company"))
|
||||
& (sle.posting_date <= self.filters.get("to_date"))
|
||||
& (sle.is_cancelled != 1)
|
||||
)
|
||||
)
|
||||
|
||||
if self.filters.get("warehouse"):
|
||||
sle_query = self.__get_warehouse_conditions(sle, sle_query)
|
||||
|
||||
sle_query = sle_query.orderby(
|
||||
sle.posting_date, sle.posting_time, sle.creation, sle.actual_qty
|
||||
)
|
||||
|
||||
return sle_query.run(as_dict=True)
|
||||
|
||||
def __get_item_query(self) -> str:
|
||||
item_table = frappe.qb.DocType("Item")
|
||||
|
||||
item = frappe.qb.from_("Item").select(
|
||||
"name", "item_name", "description", "stock_uom",
|
||||
"brand", "item_group", "has_serial_no"
|
||||
)
|
||||
|
||||
if self.filters.get("item_code"):
|
||||
item = item.where(item_table.item_code == self.filters.get("item_code"))
|
||||
|
||||
if self.filters.get("brand"):
|
||||
item = item.where(item_table.brand == self.filters.get("brand"))
|
||||
|
||||
return item
|
||||
|
||||
def __get_warehouse_conditions(self, sle, sle_query) -> str:
|
||||
warehouse = frappe.qb.DocType("Warehouse")
|
||||
lft, rgt = frappe.db.get_value(
|
||||
"Warehouse",
|
||||
self.filters.get("warehouse"),
|
||||
['lft', 'rgt']
|
||||
)
|
||||
|
||||
warehouse_results = (
|
||||
frappe.qb.from_(warehouse)
|
||||
.select("name").where(
|
||||
(warehouse.lft >= lft)
|
||||
& (warehouse.rgt <= rgt)
|
||||
).run()
|
||||
)
|
||||
warehouse_results = [x[0] for x in warehouse_results]
|
||||
|
||||
return sle_query.where(sle.warehouse.isin(warehouse_results))
|
||||
|
73
erpnext/stock/report/stock_ageing/stock_ageing_fifo_logic.md
Normal file
73
erpnext/stock/report/stock_ageing/stock_ageing_fifo_logic.md
Normal file
@ -0,0 +1,73 @@
|
||||
### Concept of FIFO Slots
|
||||
|
||||
Since we need to know age-wise remaining stock, we maintain all the inward entries as slots. So each time stock comes in, a slot is added for the same.
|
||||
|
||||
Eg. For Item A:
|
||||
----------------------
|
||||
Date | Qty | Queue
|
||||
----------------------
|
||||
1st | +50 | [[50, 1-12-2021]]
|
||||
2nd | +20 | [[50, 1-12-2021], [20, 2-12-2021]]
|
||||
----------------------
|
||||
|
||||
Now the queue can tell us the total stock and also how old the stock is.
|
||||
Here, the balance qty is 70.
|
||||
50 qty is (today-the 1st) days old
|
||||
20 qty is (today-the 2nd) days old
|
||||
|
||||
### Calculation of FIFO Slots
|
||||
|
||||
#### Case 1: Outward from sufficient balance qty
|
||||
----------------------
|
||||
Date | Qty | Queue
|
||||
----------------------
|
||||
1st | +50 | [[50, 1-12-2021]]
|
||||
2nd | -20 | [[30, 1-12-2021]]
|
||||
2nd | +20 | [[30, 1-12-2021], [20, 2-12-2021]]
|
||||
|
||||
Here after the first entry, while issuing 20 qty:
|
||||
- **since 20 is lesser than the balance**, **qty_to_pop (20)** is simply consumed from first slot (FIFO consumption)
|
||||
- Any inward entry after as usual will get its own slot added to the queue
|
||||
|
||||
#### Case 2: Outward from sufficient cumulative (slots) balance qty
|
||||
----------------------
|
||||
Date | Qty | Queue
|
||||
----------------------
|
||||
1st | +50 | [[50, 1-12-2021]]
|
||||
2nd | +20 | [[50, 1-12-2021], [20, 2-12-2021]]
|
||||
2nd | -60 | [[10, 2-12-2021]]
|
||||
|
||||
- Consumption happens slot wise. First slot 1 is consumed
|
||||
- Since **qty_to_pop (60) is greater than slot 1 qty (50)**, the entire slot is consumed and popped
|
||||
- Now the queue is [[20, 2-12-2021]], and **qty_to_pop=10** (remaining qty to pop)
|
||||
- It then goes ahead to the next slot and consumes 10 from it
|
||||
- Now the queue is [[10, 2-12-2021]]
|
||||
|
||||
#### Case 3: Outward from insufficient balance qty
|
||||
> This case is possible only if **Allow Negative Stock** was enabled at some point/is enabled.
|
||||
|
||||
----------------------
|
||||
Date | Qty | Queue
|
||||
----------------------
|
||||
1st | +50 | [[50, 1-12-2021]]
|
||||
2nd | -60 | [[-10, 1-12-2021]]
|
||||
|
||||
- Since **qty_to_pop (60)** is more than the balance in slot 1, the entire slot is consumed and popped
|
||||
- Now the queue is **empty**, and **qty_to_pop=10** (remaining qty to pop)
|
||||
- Since we still have more to consume, we append the balance since 60 is issued from 50 i.e. -10.
|
||||
- We register this negative value, since the stock issue has caused the balance to become negative
|
||||
|
||||
Now when stock is inwarded:
|
||||
- Instead of adding a slot we check if there are any negative balances.
|
||||
- If yes, we keep adding positive stock to it until we make the balance positive.
|
||||
- Once the balance is positive, the next inward entry will add a new slot in the queue
|
||||
|
||||
Eg:
|
||||
----------------------
|
||||
Date | Qty | Queue
|
||||
----------------------
|
||||
1st | +50 | [[50, 1-12-2021]]
|
||||
2nd | -60 | [[-10, 1-12-2021]]
|
||||
3rd | +5 | [[-5, 3-12-2021]]
|
||||
4th | +10 | [[5, 4-12-2021]]
|
||||
4th | +20 | [[5, 4-12-2021], [20, 4-12-2021]]
|
126
erpnext/stock/report/stock_ageing/test_stock_ageing.py
Normal file
126
erpnext/stock/report/stock_ageing/test_stock_ageing.py
Normal file
@ -0,0 +1,126 @@
|
||||
# Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and Contributors
|
||||
# See license.txt
|
||||
|
||||
import frappe
|
||||
|
||||
from erpnext.stock.report.stock_ageing.stock_ageing import FIFOSlots
|
||||
from erpnext.tests.utils import ERPNextTestCase
|
||||
|
||||
|
||||
class TestStockAgeing(ERPNextTestCase):
|
||||
def setUp(self) -> None:
|
||||
self.filters = frappe._dict(
|
||||
company="_Test Company",
|
||||
to_date="2021-12-10"
|
||||
)
|
||||
|
||||
def test_normal_inward_outward_queue(self):
|
||||
"Reference: Case 1 in stock_ageing_fifo_logic.md"
|
||||
sle = [
|
||||
frappe._dict(
|
||||
name="Flask Item",
|
||||
actual_qty=30, qty_after_transaction=30,
|
||||
posting_date="2021-12-01", voucher_type="Stock Entry",
|
||||
voucher_no="001",
|
||||
has_serial_no=False, serial_no=None
|
||||
),
|
||||
frappe._dict(
|
||||
name="Flask Item",
|
||||
actual_qty=20, qty_after_transaction=50,
|
||||
posting_date="2021-12-02", voucher_type="Stock Entry",
|
||||
voucher_no="002",
|
||||
has_serial_no=False, serial_no=None
|
||||
),
|
||||
frappe._dict(
|
||||
name="Flask Item",
|
||||
actual_qty=(-10), qty_after_transaction=40,
|
||||
posting_date="2021-12-03", voucher_type="Stock Entry",
|
||||
voucher_no="003",
|
||||
has_serial_no=False, serial_no=None
|
||||
)
|
||||
]
|
||||
|
||||
slots = FIFOSlots(self.filters, sle).generate()
|
||||
|
||||
self.assertTrue(slots["Flask Item"]["fifo_queue"])
|
||||
result = slots["Flask Item"]
|
||||
queue = result["fifo_queue"]
|
||||
|
||||
self.assertEqual(result["qty_after_transaction"], result["total_qty"])
|
||||
self.assertEqual(queue[0][0], 20.0)
|
||||
|
||||
def test_insufficient_balance(self):
|
||||
"Reference: Case 3 in stock_ageing_fifo_logic.md"
|
||||
sle = [
|
||||
frappe._dict(
|
||||
name="Flask Item",
|
||||
actual_qty=(-30), qty_after_transaction=(-30),
|
||||
posting_date="2021-12-01", voucher_type="Stock Entry",
|
||||
voucher_no="001",
|
||||
has_serial_no=False, serial_no=None
|
||||
),
|
||||
frappe._dict(
|
||||
name="Flask Item",
|
||||
actual_qty=20, qty_after_transaction=(-10),
|
||||
posting_date="2021-12-02", voucher_type="Stock Entry",
|
||||
voucher_no="002",
|
||||
has_serial_no=False, serial_no=None
|
||||
),
|
||||
frappe._dict(
|
||||
name="Flask Item",
|
||||
actual_qty=20, qty_after_transaction=10,
|
||||
posting_date="2021-12-03", voucher_type="Stock Entry",
|
||||
voucher_no="003",
|
||||
has_serial_no=False, serial_no=None
|
||||
),
|
||||
frappe._dict(
|
||||
name="Flask Item",
|
||||
actual_qty=10, qty_after_transaction=20,
|
||||
posting_date="2021-12-03", voucher_type="Stock Entry",
|
||||
voucher_no="004",
|
||||
has_serial_no=False, serial_no=None
|
||||
)
|
||||
]
|
||||
|
||||
slots = FIFOSlots(self.filters, sle).generate()
|
||||
|
||||
result = slots["Flask Item"]
|
||||
queue = result["fifo_queue"]
|
||||
|
||||
self.assertEqual(result["qty_after_transaction"], result["total_qty"])
|
||||
self.assertEqual(queue[0][0], 10.0)
|
||||
self.assertEqual(queue[1][0], 10.0)
|
||||
|
||||
def test_stock_reconciliation(self):
|
||||
sle = [
|
||||
frappe._dict(
|
||||
name="Flask Item",
|
||||
actual_qty=30, qty_after_transaction=30,
|
||||
posting_date="2021-12-01", voucher_type="Stock Entry",
|
||||
voucher_no="001",
|
||||
has_serial_no=False, serial_no=None
|
||||
),
|
||||
frappe._dict(
|
||||
name="Flask Item",
|
||||
actual_qty=0, qty_after_transaction=50,
|
||||
posting_date="2021-12-02", voucher_type="Stock Reconciliation",
|
||||
voucher_no="002",
|
||||
has_serial_no=False, serial_no=None
|
||||
),
|
||||
frappe._dict(
|
||||
name="Flask Item",
|
||||
actual_qty=(-10), qty_after_transaction=40,
|
||||
posting_date="2021-12-03", voucher_type="Stock Entry",
|
||||
voucher_no="003",
|
||||
has_serial_no=False, serial_no=None
|
||||
)
|
||||
]
|
||||
|
||||
slots = FIFOSlots(self.filters, sle).generate()
|
||||
|
||||
result = slots["Flask Item"]
|
||||
queue = result["fifo_queue"]
|
||||
|
||||
self.assertEqual(result["qty_after_transaction"], result["total_qty"])
|
||||
self.assertEqual(queue[0][0], 20.0)
|
||||
self.assertEqual(queue[1][0], 20.0)
|
@ -9,7 +9,7 @@ from frappe import _
|
||||
from frappe.utils import cint, date_diff, flt, getdate
|
||||
|
||||
import erpnext
|
||||
from erpnext.stock.report.stock_ageing.stock_ageing import get_average_age, get_fifo_queue
|
||||
from erpnext.stock.report.stock_ageing.stock_ageing import FIFOSlots, get_average_age
|
||||
from erpnext.stock.report.stock_ledger.stock_ledger import get_item_group_condition
|
||||
from erpnext.stock.utils import add_additional_uom_columns, is_reposting_item_valuation_in_progress
|
||||
|
||||
@ -33,7 +33,7 @@ def execute(filters=None):
|
||||
|
||||
if filters.get('show_stock_ageing_data'):
|
||||
filters['show_warehouse_wise_stock'] = True
|
||||
item_wise_fifo_queue = get_fifo_queue(filters, sle)
|
||||
item_wise_fifo_queue = FIFOSlots(filters, sle).generate()
|
||||
|
||||
# if no stock ledger entry found return
|
||||
if not sle:
|
||||
|
@ -8,7 +8,8 @@ const DIFFERNCE_FIELD_NAMES = [
|
||||
"fifo_value_diff",
|
||||
"fifo_valuation_diff",
|
||||
"valuation_diff",
|
||||
"fifo_difference_diff"
|
||||
"fifo_difference_diff",
|
||||
"diff_value_diff"
|
||||
];
|
||||
|
||||
frappe.query_reports["Stock Ledger Invariant Check"] = {
|
||||
|
@ -50,6 +50,7 @@ def get_stock_ledger_entries(filters):
|
||||
|
||||
def add_invariant_check_fields(sles):
|
||||
balance_qty = 0.0
|
||||
balance_stock_value = 0.0
|
||||
for idx, sle in enumerate(sles):
|
||||
queue = json.loads(sle.stock_queue)
|
||||
|
||||
@ -60,6 +61,7 @@ def add_invariant_check_fields(sles):
|
||||
fifo_value += qty * rate
|
||||
|
||||
balance_qty += sle.actual_qty
|
||||
balance_stock_value += sle.stock_value_difference
|
||||
if sle.voucher_type == "Stock Reconciliation" and not sle.batch_no:
|
||||
balance_qty = sle.qty_after_transaction
|
||||
|
||||
@ -70,6 +72,7 @@ def add_invariant_check_fields(sles):
|
||||
sle.stock_value / sle.qty_after_transaction if sle.qty_after_transaction else None
|
||||
)
|
||||
sle.expected_qty_after_transaction = balance_qty
|
||||
sle.stock_value_from_diff = balance_stock_value
|
||||
|
||||
# set difference fields
|
||||
sle.difference_in_qty = sle.qty_after_transaction - sle.expected_qty_after_transaction
|
||||
@ -81,6 +84,7 @@ def add_invariant_check_fields(sles):
|
||||
sle.valuation_diff = (
|
||||
sle.valuation_rate - sle.balance_value_by_qty if sle.balance_value_by_qty else None
|
||||
)
|
||||
sle.diff_value_diff = sle.stock_value_from_diff - sle.stock_value
|
||||
|
||||
if idx > 0:
|
||||
sle.fifo_stock_diff = sle.fifo_stock_value - sles[idx - 1].fifo_stock_value
|
||||
@ -191,12 +195,21 @@ def get_columns():
|
||||
"fieldtype": "Float",
|
||||
"label": "D - E",
|
||||
},
|
||||
|
||||
{
|
||||
"fieldname": "stock_value_difference",
|
||||
"fieldtype": "Float",
|
||||
"label": "(F) Stock Value Difference",
|
||||
},
|
||||
{
|
||||
"fieldname": "stock_value_from_diff",
|
||||
"fieldtype": "Float",
|
||||
"label": "Balance Stock Value using (F)",
|
||||
},
|
||||
{
|
||||
"fieldname": "diff_value_diff",
|
||||
"fieldtype": "Float",
|
||||
"label": "K - D",
|
||||
},
|
||||
{
|
||||
"fieldname": "fifo_stock_diff",
|
||||
"fieldtype": "Float",
|
||||
|
@ -9,7 +9,7 @@ import frappe
|
||||
from frappe import _
|
||||
from frappe.utils import flt
|
||||
|
||||
from erpnext.stock.report.stock_ageing.stock_ageing import get_average_age, get_fifo_queue
|
||||
from erpnext.stock.report.stock_ageing.stock_ageing import FIFOSlots, get_average_age
|
||||
from erpnext.stock.report.stock_balance.stock_balance import (
|
||||
get_item_details,
|
||||
get_item_warehouse_map,
|
||||
@ -33,7 +33,7 @@ def execute(filters=None):
|
||||
item_map = get_item_details(items, sle, filters)
|
||||
iwb_map = get_item_warehouse_map(filters, sle)
|
||||
warehouse_list = get_warehouse_list(filters)
|
||||
item_ageing = get_fifo_queue(filters)
|
||||
item_ageing = FIFOSlots(filters).generate()
|
||||
data = []
|
||||
item_balance = {}
|
||||
item_value = {}
|
||||
|
@ -86,8 +86,8 @@ def get_stock_balance(item_code, warehouse, posting_date=None, posting_time=None
|
||||
|
||||
from erpnext.stock.stock_ledger import get_previous_sle
|
||||
|
||||
if not posting_date: posting_date = nowdate()
|
||||
if not posting_time: posting_time = nowtime()
|
||||
if posting_date is None: posting_date = nowdate()
|
||||
if posting_time is None: posting_time = nowtime()
|
||||
|
||||
args = {
|
||||
"item_code": item_code,
|
||||
|
@ -98,6 +98,7 @@ class TestIssue(TestSetUp):
|
||||
issue.save()
|
||||
|
||||
self.assertEqual(issue.on_hold_since, frappe.flags.current_time)
|
||||
self.assertFalse(issue.resolution_by)
|
||||
|
||||
creation = get_datetime("2020-03-04 5:00")
|
||||
frappe.flags.current_time = get_datetime("2020-03-04 5:00")
|
||||
|
@ -476,7 +476,7 @@ def update_response_and_resolution_metrics(doc, apply_sla_for_resolution):
|
||||
priority = get_response_and_resolution_duration(doc)
|
||||
start_date_time = get_datetime(doc.get("service_level_agreement_creation") or doc.creation)
|
||||
set_response_by(doc, start_date_time, priority)
|
||||
if apply_sla_for_resolution:
|
||||
if apply_sla_for_resolution and not doc.get('on_hold_since'): # resolution_by is reset if on hold
|
||||
set_resolution_by(doc, start_date_time, priority)
|
||||
|
||||
|
||||
@ -624,9 +624,6 @@ def reset_resolution_metrics(doc):
|
||||
if doc.meta.has_field("user_resolution_time"):
|
||||
doc.user_resolution_time = None
|
||||
|
||||
if doc.meta.has_field("agreement_status"):
|
||||
doc.agreement_status = "First Response Due"
|
||||
|
||||
|
||||
# called via hooks on communication update
|
||||
def on_communication_update(doc, status):
|
||||
|
@ -242,7 +242,7 @@ Apply Now,Jetzt bewerben,
|
||||
Appointment Confirmation,Terminbestätigung,
|
||||
Appointment Duration (mins),Termindauer (Min.),
|
||||
Appointment Type,Termin-Typ,
|
||||
Appointment {0} and Sales Invoice {1} cancelled,Termin {0} und Verkaufsrechnung {1} wurden storniert,
|
||||
Appointment {0} and Sales Invoice {1} cancelled,Termin {0} und Ausgangsrechnung {1} wurden storniert,
|
||||
Appointments and Encounters,Termine und Begegnungen,
|
||||
Appointments and Patient Encounters,Termine und Patienten-Begegnungen,
|
||||
Appraisal {0} created for Employee {1} in the given date range,Bewertung {0} für Mitarbeiter {1} im angegebenen Datumsbereich erstellt,
|
||||
@ -427,7 +427,7 @@ Buying Price List,Kauf Preisliste,
|
||||
Buying Rate,Kaufrate,
|
||||
"Buying must be checked, if Applicable For is selected as {0}","Einkauf muss ausgewählt sein, wenn ""Anwenden auf"" auf {0} gesetzt wurde",
|
||||
By {0},Von {0},
|
||||
Bypass credit check at Sales Order ,Kreditprüfung im Kundenauftrag umgehen,
|
||||
Bypass credit check at Sales Order ,Kreditprüfung im Auftrag umgehen,
|
||||
C-Form records,Kontakt-Formular Datensätze,
|
||||
C-form is not applicable for Invoice: {0},Kontaktformular nicht anwendbar auf Rechnung: {0},
|
||||
CEO,CEO,
|
||||
@ -474,11 +474,11 @@ Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Kann ni
|
||||
"Cannot delete Serial No {0}, as it is used in stock transactions","Die Seriennummer {0} kann nicht gelöscht werden, da sie in Lagertransaktionen verwendet wird",
|
||||
Cannot enroll more than {0} students for this student group.,Kann nicht mehr als {0} Studenten für diese Studentengruppe einschreiben.,
|
||||
Cannot find active Leave Period,Aktive Abwesenheitszeit kann nicht gefunden werden,
|
||||
Cannot produce more Item {0} than Sales Order quantity {1},"Es können nicht mehr Artikel {0} produziert werden, als die über Kundenaufträge bestellte Stückzahl {1}",
|
||||
Cannot produce more Item {0} than Sales Order quantity {1},"Es können nicht mehr Artikel {0} produziert werden, als die über den Auftrag bestellte Stückzahl {1}",
|
||||
Cannot promote Employee with status Left,Mitarbeiter mit Status "Links" kann nicht gefördert werden,
|
||||
Cannot refer row number greater than or equal to current row number for this Charge type,"Für diese Berechnungsart kann keine Zeilennummern zugeschrieben werden, die größer oder gleich der aktuellen Zeilennummer ist",
|
||||
Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Die Berechnungsart kann für die erste Zeile nicht auf ""bezogen auf Menge der vorhergenden Zeile"" oder auf ""bezogen auf Gesamtmenge der vorhergenden Zeile"" gesetzt werden",
|
||||
Cannot set as Lost as Sales Order is made.,"Kann nicht als verloren gekennzeichnet werden, da ein Kundenauftrag dazu existiert.",
|
||||
Cannot set as Lost as Sales Order is made.,"Kann nicht als verloren gekennzeichnet werden, da ein Auftrag dazu existiert.",
|
||||
Cannot set authorization on basis of Discount for {0},Genehmigung kann nicht auf der Basis des Rabattes für {0} festgelegt werden,
|
||||
Cannot set multiple Item Defaults for a company.,Es können nicht mehrere Artikelstandards für ein Unternehmen festgelegt werden.,
|
||||
Cannot set quantity less than delivered quantity,Menge kann nicht kleiner als gelieferte Menge sein,
|
||||
@ -663,7 +663,7 @@ Create Leads,Leads erstellen,
|
||||
Create Maintenance Visit,Wartungsbesuch anlegen,
|
||||
Create Material Request,Materialanforderung erstellen,
|
||||
Create Multiple,Erstellen Sie mehrere,
|
||||
Create Opening Sales and Purchase Invoices,Erstellen Sie Eingangsverkaufs- und Einkaufsrechnungen,
|
||||
Create Opening Sales and Purchase Invoices,Erstellen Sie die eröffnungs Ein- und Ausgangsrechnungen,
|
||||
Create Payment Entries,Zahlungseinträge erstellen,
|
||||
Create Payment Entry,Zahlungseintrag erstellen,
|
||||
Create Print Format,Druckformat erstellen,
|
||||
@ -672,9 +672,9 @@ Create Purchase Orders,Bestellungen erstellen,
|
||||
Create Quotation,Angebot erstellen,
|
||||
Create Salary Slip,Gehaltsabrechnung erstellen,
|
||||
Create Salary Slips,Gehaltszettel erstellen,
|
||||
Create Sales Invoice,Verkaufsrechnung erstellen,
|
||||
Create Sales Order,Kundenauftrag anlegen,
|
||||
Create Sales Orders to help you plan your work and deliver on-time,"Erstellen Sie Kundenaufträge, um Ihre Arbeit zu planen und pünktlich zu liefern",
|
||||
Create Sales Invoice,Ausgangsrechnung erstellen,
|
||||
Create Sales Order,Auftrag anlegen,
|
||||
Create Sales Orders to help you plan your work and deliver on-time,"Erstellen Sie Aufträge, um Ihre Arbeit zu planen und pünktlich zu liefern",
|
||||
Create Sample Retention Stock Entry,Legen Sie einen Muster-Retention-Stock-Eintrag an,
|
||||
Create Student,Schüler erstellen,
|
||||
Create Student Batch,Studentenstapel erstellen,
|
||||
@ -808,7 +808,7 @@ Delivery Date,Liefertermin,
|
||||
Delivery Note,Lieferschein,
|
||||
Delivery Note {0} is not submitted,Lieferschein {0} ist nicht gebucht,
|
||||
Delivery Note {0} must not be submitted,Lieferschein {0} darf nicht gebucht sein,
|
||||
Delivery Notes {0} must be cancelled before cancelling this Sales Order,Lieferscheine {0} müssen vor Löschung dieser Kundenaufträge storniert werden,
|
||||
Delivery Notes {0} must be cancelled before cancelling this Sales Order,Lieferscheine {0} müssen vor Löschung dieser Aufträge storniert werden,
|
||||
Delivery Notes {0} updated,Lieferhinweise {0} aktualisiert,
|
||||
Delivery Status,Lieferstatus,
|
||||
Delivery Trip,Liefertrip,
|
||||
@ -981,7 +981,7 @@ Execution,Ausführung,
|
||||
Executive Search,Direktsuche,
|
||||
Expand All,Alle ausklappen,
|
||||
Expected Delivery Date,Geplanter Liefertermin,
|
||||
Expected Delivery Date should be after Sales Order Date,Voraussichtlicher Liefertermin sollte nach Kundenauftragsdatum erfolgen,
|
||||
Expected Delivery Date should be after Sales Order Date,Voraussichtlicher Liefertermin sollte nach Auftragsdatum erfolgen,
|
||||
Expected End Date,Voraussichtliches Enddatum,
|
||||
Expected Hrs,Erwartete Stunden,
|
||||
Expected Start Date,Voraussichtliches Startdatum,
|
||||
@ -1235,7 +1235,7 @@ ITC Reversed,ITC rückgängig gemacht,
|
||||
Identifying Decision Makers,Entscheidungsträger identifizieren,
|
||||
"If Auto Opt In is checked, then the customers will be automatically linked with the concerned Loyalty Program (on save)","Wenn Automatische Anmeldung aktiviert ist, werden die Kunden automatisch mit dem betreffenden Treueprogramm verknüpft (beim Speichern)",
|
||||
"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Wenn mehrere Preisregeln weiterhin gleichrangig gelten, werden die Benutzer aufgefordert, Vorrangregelungen manuell zu erstellen, um den Konflikt zu lösen.",
|
||||
"If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Wenn die ausgewählte Preisregel für "Rate" festgelegt wurde, wird die Preisliste überschrieben. Der Preisregelpreis ist der Endpreis, daher sollte kein weiterer Rabatt angewendet werden. Daher wird es in Transaktionen wie Kundenauftrag, Bestellung usw. im Feld 'Preis' und nicht im Feld 'Preislistenpreis' abgerufen.",
|
||||
"If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Wenn die ausgewählte Preisregel für "Rate" festgelegt wurde, wird die Preisliste überschrieben. Der Preisregelpreis ist der Endpreis, daher sollte kein weiterer Rabatt angewendet werden. Daher wird es in Transaktionen wie Auftrag, Bestellung usw. im Feld 'Preis' und nicht im Feld 'Preislistenpreis' abgerufen.",
|
||||
"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Wenn zwei oder mehrere Preisregeln basierend auf den oben genannten Bedingungen gefunden werden, wird eine Vorrangregelung angewandt. Priorität ist eine Zahl zwischen 0 und 20, wobei der Standardwert Null (leer) ist. Die höhere Zahl hat Vorrang, wenn es mehrere Preisregeln zu den gleichen Bedingungen gibt.",
|
||||
"If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0.","Wenn die Treuepunkte unbegrenzt ablaufen, lassen Sie die Ablaufdauer leer oder 0.",
|
||||
"If you have any questions, please get back to us.","Wenn Sie Fragen haben, wenden Sie sich bitte an uns.",
|
||||
@ -1386,7 +1386,7 @@ Item {0} must be a Sub-contracted Item,Artikel {0} muss ein unterbeauftragter Ar
|
||||
Item {0} must be a non-stock item,Artikel {0} darf kein Lagerartikel sein,
|
||||
Item {0} must be a stock Item,Artikel {0} muss ein Lagerartikel sein,
|
||||
Item {0} not found,Artikel {0} nicht gefunden,
|
||||
Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},"Artikel {0} in Tabelle ""Rohmaterialien geliefert"" des Lieferantenauftrags {1} nicht gefunden",
|
||||
Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},"Artikel {0} in Tabelle ""Rohmaterialien geliefert"" der Bestellung {1} nicht gefunden",
|
||||
Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Artikel {0}: Bestellmenge {1} kann nicht weniger als Mindestbestellmenge {2} (im Artikel definiert) sein.,
|
||||
Item: {0} does not exist in the system,Artikel: {0} ist nicht im System vorhanden,
|
||||
Items,Artikel,
|
||||
@ -1489,7 +1489,7 @@ Lower Income,Niedrigeres Einkommen,
|
||||
Loyalty Amount,Loyalitätsbetrag,
|
||||
Loyalty Point Entry,Loyalitätspunkteintrag,
|
||||
Loyalty Points,Treuepunkte,
|
||||
"Loyalty Points will be calculated from the spent done (via the Sales Invoice), based on collection factor mentioned.","Treuepunkte werden aus dem ausgegebenen Betrag (über die Verkaufsrechnung) berechnet, basierend auf dem genannten Sammelfaktor.",
|
||||
"Loyalty Points will be calculated from the spent done (via the Sales Invoice), based on collection factor mentioned.","Treuepunkte werden aus dem ausgegebenen Betrag (über die Ausgangsrechnung) berechnet, basierend auf dem genannten Sammelfaktor.",
|
||||
Loyalty Points: {0},Treuepunkte: {0},
|
||||
Loyalty Program,Treueprogramm,
|
||||
Main,Haupt,
|
||||
@ -1499,11 +1499,11 @@ Maintenance Manager,Leiter der Wartung,
|
||||
Maintenance Schedule,Wartungsplan,
|
||||
Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Wartungsplan wird nicht für alle Elemente erzeugt. Bitte klicken Sie auf ""Zeitplan generieren""",
|
||||
Maintenance Schedule {0} exists against {1},Wartungsplan {0} existiert gegen {1},
|
||||
Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Wartungsplan {0} muss vor Stornierung dieses Kundenauftrages aufgehoben werden,
|
||||
Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Wartungsplan {0} muss vor Stornierung dieses Auftrags aufgehoben werden,
|
||||
Maintenance Status has to be Cancelled or Completed to Submit,Der Wartungsstatus muss abgebrochen oder zum Senden abgeschlossen werden,
|
||||
Maintenance User,Nutzer Instandhaltung,
|
||||
Maintenance Visit,Wartungsbesuch,
|
||||
Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Wartungsbesuch {0} muss vor Stornierung dieses Kundenauftrages abgebrochen werden,
|
||||
Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Wartungsbesuch {0} muss vor Stornierung dieses Auftrags abgebrochen werden,
|
||||
Maintenance start date can not be before delivery date for Serial No {0},Startdatum der Wartung kann nicht vor dem Liefertermin für Seriennummer {0} liegen,
|
||||
Make,Erstellen,
|
||||
Make Payment,Zahlung ausführen,
|
||||
@ -1549,8 +1549,8 @@ Material Request,Materialanfrage,
|
||||
Material Request Date,Material Auftragsdatum,
|
||||
Material Request No,Materialanfragenr.,
|
||||
"Material Request not created, as quantity for Raw Materials already available.","Materialanforderung nicht angelegt, da Menge für Rohstoffe bereits vorhanden.",
|
||||
Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Materialanfrage von maximal {0} kann für Artikel {1} zum Kundenauftrag {2} gemacht werden,
|
||||
Material Request to Purchase Order,Von der Materialanfrage zum Lieferantenauftrag,
|
||||
Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Materialanfrage von maximal {0} kann für Artikel {1} zum Auftrag {2} gemacht werden,
|
||||
Material Request to Purchase Order,Von der Materialanfrage zur Bestellung,
|
||||
Material Request {0} is cancelled or stopped,Materialanfrage {0} wird storniert oder gestoppt,
|
||||
Material Request {0} submitted.,Materialanfrage {0} gesendet.,
|
||||
Material Transfer,Materialübertrag,
|
||||
@ -2224,7 +2224,7 @@ Publishing,Veröffentlichung,
|
||||
Purchase,Einkauf,
|
||||
Purchase Amount,Gesamtbetrag des Einkaufs,
|
||||
Purchase Date,Kaufdatum,
|
||||
Purchase Invoice,Einkaufsrechnung,
|
||||
Purchase Invoice,Eingangsrechnung,
|
||||
Purchase Invoice {0} is already submitted,Eingangsrechnung {0} wurde bereits übertragen,
|
||||
Purchase Manager,Einkaufsleiter,
|
||||
Purchase Master Manager,Einkaufsstammdaten-Manager,
|
||||
@ -2233,11 +2233,11 @@ Purchase Order Amount,Bestellbetrag,
|
||||
Purchase Order Amount(Company Currency),Bestellbetrag (Firmenwährung),
|
||||
Purchase Order Date,Bestelldatum,
|
||||
Purchase Order Items not received on time,Bestellpositionen nicht rechtzeitig erhalten,
|
||||
Purchase Order number required for Item {0},Lieferantenauftragsnummer ist für den Artikel {0} erforderlich,
|
||||
Purchase Order to Payment,Vom Lieferantenauftrag zur Zahlung,
|
||||
Purchase Order {0} is not submitted,Lieferantenauftrag {0} wurde nicht übertragen,
|
||||
Purchase Order number required for Item {0},Bestellnummer ist für den Artikel {0} erforderlich,
|
||||
Purchase Order to Payment,Von der Bestellung zur Zahlung,
|
||||
Purchase Order {0} is not submitted,Bestellung {0} wurde nicht übertragen,
|
||||
Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Kaufaufträge sind für {0} wegen einer Scorecard von {1} nicht erlaubt.,
|
||||
Purchase Orders given to Suppliers.,An Lieferanten erteilte Lieferantenaufträge,
|
||||
Purchase Orders given to Suppliers.,An Lieferanten erteilte Bestellungen,
|
||||
Purchase Price List,Einkaufspreisliste,
|
||||
Purchase Receipt,Kaufbeleg,
|
||||
Purchase Receipt {0} is not submitted,Kaufbeleg {0} wurde nicht übertragen,
|
||||
@ -2440,7 +2440,7 @@ Row #{0}: Duplicate entry in References {1} {2},Zeile # {0}: Eintrag in Referenz
|
||||
Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,Row # {0}: Voraussichtlicher Liefertermin kann nicht vor Bestelldatum sein,
|
||||
Row #{0}: Item added,Zeile # {0}: Element hinzugefügt,
|
||||
Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Row # {0}: Journal Entry {1} nicht Konto {2} oder bereits abgestimmt gegen einen anderen Gutschein,
|
||||
Row #{0}: Not allowed to change Supplier as Purchase Order already exists,"Zeile #{0}: Es ist nicht erlaubt den Lieferanten zu wechseln, da bereits ein Lieferantenauftrag vorhanden ist",
|
||||
Row #{0}: Not allowed to change Supplier as Purchase Order already exists,"Zeile #{0}: Es ist nicht erlaubt den Lieferanten zu wechseln, da bereits eine Bestellung vorhanden ist",
|
||||
Row #{0}: Please set reorder quantity,Zeile #{0}: Bitte Nachbestellmenge angeben,
|
||||
Row #{0}: Please specify Serial No for Item {1},Zeile #{0}: Bitte Seriennummer für Artikel {1} angeben,
|
||||
Row #{0}: Qty increased by 1,Zeile # {0}: Menge um 1 erhöht,
|
||||
@ -2483,7 +2483,7 @@ Row {0}: Hours value must be greater than zero.,Row {0}: Stunden-Wert muss grö
|
||||
Row {0}: Invalid reference {1},Zeile {0}: Ungültige Referenz {1},
|
||||
Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Zeile {0}: Gruppe / Konto stimmt nicht mit {1} / {2} in {3} {4} überein,
|
||||
Row {0}: Party Type and Party is required for Receivable / Payable account {1},Zeile {0}: Gruppen-Typ und Gruppe sind für Forderungen-/Verbindlichkeiten-Konto {1} zwingend erforderlich,
|
||||
Row {0}: Payment against Sales/Purchase Order should always be marked as advance,"Zeile {0}: ""Zahlung zu Kunden-/Lieferantenauftrag"" sollte immer als ""Vorkasse"" eingestellt werden",
|
||||
Row {0}: Payment against Sales/Purchase Order should always be marked as advance,"Zeile {0}: ""Zahlung zu Auftrag bzw. Bestellung"" sollte immer als ""Vorkasse"" eingestellt werden",
|
||||
Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Zeile {0}: Wenn es sich um eine Vorkasse-Buchung handelt, bitte ""Ist Vorkasse"" zu Konto {1} anklicken, .",
|
||||
Row {0}: Please set at Tax Exemption Reason in Sales Taxes and Charges,Zeile {0}: Bitte setzen Sie den Steuerbefreiungsgrund in den Umsatzsteuern und -gebühren,
|
||||
Row {0}: Please set the Mode of Payment in Payment Schedule,Zeile {0}: Bitte legen Sie die Zahlungsart im Zahlungsplan fest,
|
||||
@ -2518,19 +2518,19 @@ Sales,Vertrieb,
|
||||
Sales Account,Verkaufskonto,
|
||||
Sales Expenses,Vertriebskosten,
|
||||
Sales Funnel,Verkaufstrichter,
|
||||
Sales Invoice,Verkaufsrechnung,
|
||||
Sales Invoice,Ausgangsrechnung,
|
||||
Sales Invoice {0} has already been submitted,Ausgangsrechnung {0} wurde bereits übertragen,
|
||||
Sales Invoice {0} must be cancelled before cancelling this Sales Order,Ausgangsrechnung {0} muss vor Stornierung dieses Kundenauftrags abgebrochen werden,
|
||||
Sales Invoice {0} must be cancelled before cancelling this Sales Order,Ausgangsrechnung {0} muss vor Stornierung dieses Auftrags abgebrochen werden,
|
||||
Sales Manager,Vertriebsleiter,
|
||||
Sales Master Manager,Hauptvertriebsleiter,
|
||||
Sales Order,Auftragsbestätigung,
|
||||
Sales Order Item,Kundenauftrags-Artikel,
|
||||
Sales Order required for Item {0},Kundenauftrag für den Artikel {0} erforderlich,
|
||||
Sales Order to Payment,Vom Kundenauftrag zum Zahlungseinang,
|
||||
Sales Order {0} is not submitted,Kundenauftrag {0} wurde nicht übertragen,
|
||||
Sales Order {0} is not valid,Kundenauftrag {0} ist nicht gültig,
|
||||
Sales Order {0} is {1},Kundenauftrag {0} ist {1},
|
||||
Sales Orders,Kundenaufträge,
|
||||
Sales Order,Auftrag,
|
||||
Sales Order Item,Auftrags-Artikel,
|
||||
Sales Order required for Item {0},Auftrag für den Artikel {0} erforderlich,
|
||||
Sales Order to Payment,Vom Auftrag zum Zahlungseinang,
|
||||
Sales Order {0} is not submitted,Auftrag {0} wurde nicht übertragen,
|
||||
Sales Order {0} is not valid,Auftrag {0} ist nicht gültig,
|
||||
Sales Order {0} is {1},Auftrag {0} ist {1},
|
||||
Sales Orders,Aufträge,
|
||||
Sales Partner,Vertriebspartner,
|
||||
Sales Pipeline,Vertriebspipeline,
|
||||
Sales Price List,Verkaufspreisliste,
|
||||
@ -2541,7 +2541,7 @@ Sales Team,Verkaufsteam,
|
||||
Sales User,Nutzer Vertrieb,
|
||||
Sales and Returns,Verkauf und Retouren,
|
||||
Sales campaigns.,Vertriebskampagnen,
|
||||
Sales orders are not available for production,Kundenaufträge sind für die Produktion nicht verfügbar,
|
||||
Sales orders are not available for production,Aufträge sind für die Produktion nicht verfügbar,
|
||||
Salutation,Anrede,
|
||||
Same Company is entered more than once,Das selbe Unternehmen wurde mehrfach angegeben,
|
||||
Same item cannot be entered multiple times.,Das gleiche Einzelteil kann nicht mehrfach eingegeben werden.,
|
||||
@ -2650,7 +2650,7 @@ Serial No {0} not found,Seriennummer {0} wurde nicht gefunden,
|
||||
Serial No {0} not in stock,Seriennummer {0} ist nicht auf Lager,
|
||||
Serial No {0} quantity {1} cannot be a fraction,Seriennummer {0} mit Menge {1} kann nicht eine Teilmenge sein,
|
||||
Serial Nos Required for Serialized Item {0},Seriennummern sind erforderlich für den Artikel mit Seriennummer {0},
|
||||
Serial Number: {0} is already referenced in Sales Invoice: {1},Seriennummer: {0} wird bereits in der Verkaufsrechnung referenziert: {1},
|
||||
Serial Number: {0} is already referenced in Sales Invoice: {1},Seriennummer: {0} wird bereits in der Ausgangsrechnung referenziert: {1},
|
||||
Serial Numbers,Seriennummer,
|
||||
Serial Numbers in row {0} does not match with Delivery Note,Seriennummern in Zeile {0} stimmt nicht mit der Lieferschein überein,
|
||||
Serial no {0} has been already returned,Seriennr. {0} wurde bereits zurückgegeben,
|
||||
@ -3278,7 +3278,7 @@ Warning: Invalid SSL certificate on attachment {0},Warnung: Ungültiges SSL-Zert
|
||||
Warning: Invalid attachment {0},Warnung: Ungültige Anlage {0},
|
||||
Warning: Leave application contains following block dates,Achtung: Die Urlaubsverwaltung enthält die folgenden gesperrten Daten,
|
||||
Warning: Material Requested Qty is less than Minimum Order Qty,Achtung : Materialanfragemenge ist geringer als die Mindestbestellmenge,
|
||||
Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Warnung: Kundenauftrag {0} zu Kunden-Bestellung bereits vorhanden {1},
|
||||
Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Warnung: Auftrag {0} zu Kunden-Bestellung bereits vorhanden {1},
|
||||
Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Achtung: Das System erkennt keine überhöhten Rechnungen, da der Betrag für Artikel {0} in {1} gleich Null ist",
|
||||
Warranty,Garantie,
|
||||
Warranty Claim,Garantieanspruch,
|
||||
@ -3308,7 +3308,7 @@ Work Order already created for all items with BOM,Arbeitsauftrag wurde bereits f
|
||||
Work Order cannot be raised against a Item Template,Arbeitsauftrag kann nicht gegen eine Artikelbeschreibungsvorlage ausgelöst werden,
|
||||
Work Order has been {0},Arbeitsauftrag wurde {0},
|
||||
Work Order not created,Arbeitsauftrag wurde nicht erstellt,
|
||||
Work Order {0} must be cancelled before cancelling this Sales Order,Der Arbeitsauftrag {0} muss vor dem Stornieren dieses Kundenauftrags storniert werden,
|
||||
Work Order {0} must be cancelled before cancelling this Sales Order,Der Arbeitsauftrag {0} muss vor dem Stornieren dieses Auftrags storniert werden,
|
||||
Work Order {0} must be submitted,Arbeitsauftrag {0} muss eingereicht werden,
|
||||
Work Orders Created: {0},Arbeitsaufträge erstellt: {0},
|
||||
Work Summary for {0},Arbeitszusammenfassung für {0},
|
||||
@ -3382,9 +3382,9 @@ on,Am,
|
||||
{0} Student Groups created.,{0} Schülergruppen erstellt.,
|
||||
{0} Students have been enrolled,{0} Studenten wurden angemeldet,
|
||||
{0} against Bill {1} dated {2},{0} zu Rechnung {1} vom {2},
|
||||
{0} against Purchase Order {1},{0} zu Lieferantenauftrag {1},
|
||||
{0} against Sales Invoice {1},{0} zu Verkaufsrechnung {1},
|
||||
{0} against Sales Order {1},{0} zu Kundenauftrag{1},
|
||||
{0} against Purchase Order {1},{0} zu Bestellung {1},
|
||||
{0} against Sales Invoice {1},{0} zu Ausgangsrechnung {1},
|
||||
{0} against Sales Order {1},{0} zu Auftrag{1},
|
||||
{0} already allocated for Employee {1} for period {2} to {3},{0} bereits an Mitarbeiter {1} zugeteilt für den Zeitraum {2} bis {3},
|
||||
{0} applicable after {1} working days,{0} gilt nach {1} Werktagen,
|
||||
{0} asset cannot be transferred,{0} Anlagevermögen kann nicht übertragen werden,
|
||||
@ -3833,7 +3833,7 @@ Location,Ort,
|
||||
Log Type is required for check-ins falling in the shift: {0}.,Der Protokolltyp ist für Eincheckvorgänge in der Schicht erforderlich: {0}.,
|
||||
Looks like someone sent you to an incomplete URL. Please ask them to look into it.,"Sieht aus wie jemand, den Sie zu einer unvollständigen URL gesendet. Bitte fragen Sie sie, sich in sie.",
|
||||
Make Journal Entry,Buchungssatz erstellen,
|
||||
Make Purchase Invoice,Einkaufsrechnung erstellen,
|
||||
Make Purchase Invoice,Eingangsrechnung erstellen,
|
||||
Manufactured,Hergestellt,
|
||||
Mark Work From Home,Markieren Sie Work From Home,
|
||||
Master,Vorlage,
|
||||
@ -4302,7 +4302,7 @@ Row {}: Asset Naming Series is mandatory for the auto creation for item {},Zeile
|
||||
Assets not created for {0}. You will have to create asset manually.,Assets nicht für {0} erstellt. Sie müssen das Asset manuell erstellen.,
|
||||
{0} {1} has accounting entries in currency {2} for company {3}. Please select a receivable or payable account with currency {2}.,{0} {1} hat Buchhaltungseinträge in Währung {2} für Firma {3}. Bitte wählen Sie ein Debitoren- oder Kreditorenkonto mit der Währung {2} aus.,
|
||||
Invalid Account,Ungültiger Account,
|
||||
Purchase Order Required,Lieferantenauftrag erforderlich,
|
||||
Purchase Order Required,Bestellung erforderlich,
|
||||
Purchase Receipt Required,Kaufbeleg notwendig,
|
||||
Account Missing,Konto fehlt,
|
||||
Requested,Angefordert,
|
||||
@ -4889,7 +4889,7 @@ Transaction Currency,Transaktionswährung,
|
||||
Subscription Plans,Abonnementpläne,
|
||||
SWIFT Number,SWIFT-Nummer,
|
||||
Recipient Message And Payment Details,Empfänger der Nachricht und Zahlungsdetails,
|
||||
Make Sales Invoice,Verkaufsrechnung erstellen,
|
||||
Make Sales Invoice,Ausgangsrechnung erstellen,
|
||||
Mute Email,Mute Email,
|
||||
payment_url,payment_url,
|
||||
Payment Gateway Details,Payment Gateway-Details,
|
||||
@ -4988,7 +4988,7 @@ Apply Tax Withholding Amount,Steuereinbehaltungsbetrag anwenden,
|
||||
Accounting Dimensions ,Buchhaltung Dimensionen,
|
||||
Supplier Invoice Details,Lieferant Rechnungsdetails,
|
||||
Supplier Invoice Date,Lieferantenrechnungsdatum,
|
||||
Return Against Purchase Invoice,Zurück zur Einkaufsrechnung,
|
||||
Return Against Purchase Invoice,Zurück zur Eingangsrechnung,
|
||||
Select Supplier Address,Lieferantenadresse auswählen,
|
||||
Contact Person,Kontaktperson,
|
||||
Select Shipping Address,Lieferadresse auswählen,
|
||||
@ -5081,7 +5081,7 @@ Service End Date,Service-Enddatum,
|
||||
Allow Zero Valuation Rate,Nullbewertung zulassen,
|
||||
Item Tax Rate,Artikelsteuersatz,
|
||||
Tax detail table fetched from item master as a string and stored in this field.\nUsed for Taxes and Charges,Die Tabelle Steuerdetails wird aus dem Artikelstamm als Zeichenfolge entnommen und in diesem Feld gespeichert. Wird verwendet für Steuern und Abgaben,
|
||||
Purchase Order Item,Lieferantenauftrags-Artikel,
|
||||
Purchase Order Item,Bestellartikel,
|
||||
Purchase Receipt Detail,Kaufbelegdetail,
|
||||
Item Weight Details,Artikel Gewicht Details,
|
||||
Weight Per Unit,Gewicht pro Einheit,
|
||||
@ -5110,10 +5110,10 @@ Include Payment (POS),(POS) Zahlung einschließen,
|
||||
Offline POS Name,Offline-Verkaufsstellen-Name,
|
||||
Is Return (Credit Note),ist Rücklieferung (Gutschrift),
|
||||
Return Against Sales Invoice,Zurück zur Kundenrechnung,
|
||||
Update Billed Amount in Sales Order,Aktualisierung des Rechnungsbetrags im Kundenauftrag,
|
||||
Customer PO Details,Kundenauftragsdetails,
|
||||
Customer's Purchase Order,Kundenauftrag,
|
||||
Customer's Purchase Order Date,Kundenauftragsdatum,
|
||||
Update Billed Amount in Sales Order,Aktualisierung des Rechnungsbetrags im Auftrag,
|
||||
Customer PO Details,Auftragsdetails,
|
||||
Customer's Purchase Order,Bestellung des Kunden,
|
||||
Customer's Purchase Order Date,Bestelldatum des Kunden,
|
||||
Customer Address,Kundenadresse,
|
||||
Shipping Address Name,Lieferadresse Bezeichnung,
|
||||
Company Address Name,Bezeichnung der Anschrift des Unternehmens,
|
||||
@ -5483,7 +5483,7 @@ Sets 'Warehouse' in each row of the Items table.,Legt 'Warehouse' in jed
|
||||
Supply Raw Materials,Rohmaterial bereitstellen,
|
||||
Purchase Order Pricing Rule,Preisregel für Bestellungen,
|
||||
Set Reserve Warehouse,Legen Sie das Reservelager fest,
|
||||
In Words will be visible once you save the Purchase Order.,"""In Worten"" wird sichtbar, sobald Sie den Lieferantenauftrag speichern.",
|
||||
In Words will be visible once you save the Purchase Order.,"""In Worten"" wird sichtbar, sobald Sie die Bestellung speichern.",
|
||||
Advance Paid,Angezahlt,
|
||||
Tracking,Verfolgung,
|
||||
% Billed,% verrechnet,
|
||||
@ -5500,7 +5500,7 @@ Against Blanket Order,Gegen Pauschalauftrag,
|
||||
Blanket Order,Blankoauftrag,
|
||||
Blanket Order Rate,Pauschale Bestellrate,
|
||||
Returned Qty,Zurückgegebene Menge,
|
||||
Purchase Order Item Supplied,Lieferantenauftrags-Artikel geliefert,
|
||||
Purchase Order Item Supplied,Bestellartikel geliefert,
|
||||
BOM Detail No,Stückliste Detailnr.,
|
||||
Stock Uom,Lagermaßeinheit,
|
||||
Raw Material Item Code,Rohmaterial-Artikelnummer,
|
||||
@ -6011,7 +6011,7 @@ Get financial breakup of Taxes and charges data by Amazon ,Erhalten Sie finanzie
|
||||
Sync Products,Produkte synchronisieren,
|
||||
Always sync your products from Amazon MWS before synching the Orders details,"Synchronisieren Sie Ihre Produkte immer mit Amazon MWS, bevor Sie die Bestelldetails synchronisieren",
|
||||
Sync Orders,Bestellungen synchronisieren,
|
||||
Click this button to pull your Sales Order data from Amazon MWS.,"Klicken Sie auf diese Schaltfläche, um Ihre Kundenauftragsdaten von Amazon MWS abzurufen.",
|
||||
Click this button to pull your Sales Order data from Amazon MWS.,"Klicken Sie auf diese Schaltfläche, um Ihre Auftragsdaten von Amazon MWS abzurufen.",
|
||||
Enable Scheduled Sync,Aktivieren Sie die geplante Synchronisierung,
|
||||
Check this to enable a scheduled Daily synchronization routine via scheduler,"Aktivieren Sie diese Option, um eine geplante tägliche Synchronisierungsroutine über den Scheduler zu aktivieren",
|
||||
Max Retry Limit,Max. Wiederholungslimit,
|
||||
@ -6060,14 +6060,14 @@ Customer Settings,Kundeneinstellungen,
|
||||
Default Customer,Standardkunde,
|
||||
Customer Group will set to selected group while syncing customers from Shopify,Die Kundengruppe wird bei der Synchronisierung von Kunden von Shopify auf die ausgewählte Gruppe festgelegt,
|
||||
For Company,Für Unternehmen,
|
||||
Cash Account will used for Sales Invoice creation,Cash Account wird für die Erstellung von Verkaufsrechnungen verwendet,
|
||||
Cash Account will used for Sales Invoice creation,Cash Account wird für die Erstellung von Ausgangsrechnungen verwendet,
|
||||
Update Price from Shopify To ERPNext Price List,Preis von Shopify auf ERPNext Preisliste aktualisieren,
|
||||
Default Warehouse to to create Sales Order and Delivery Note,Standard Warehouse zum Erstellen von Kundenauftrag und Lieferschein,
|
||||
Sales Order Series,Kundenauftragsreihen,
|
||||
Default Warehouse to to create Sales Order and Delivery Note,Standard Lager zum Erstellen von Auftrag und Lieferschein,
|
||||
Sales Order Series,Auftragsnummernkreis,
|
||||
Import Delivery Notes from Shopify on Shipment,Lieferscheine von Shopify bei Versand importieren,
|
||||
Delivery Note Series,Lieferschein-Serie,
|
||||
Import Sales Invoice from Shopify if Payment is marked,"Verkaufsrechnung aus Shopify importieren, wenn Zahlung markiert ist",
|
||||
Sales Invoice Series,Verkaufsrechnung Serie,
|
||||
Import Sales Invoice from Shopify if Payment is marked,"Ausgangsrechnung aus Shopify importieren, wenn Zahlung markiert ist",
|
||||
Sales Invoice Series,Nummernkreis Ausgangsrechnung,
|
||||
Shopify Tax Account,Steuerkonto erstellen,
|
||||
Shopify Tax/Shipping Title,Steuern / Versand Titel,
|
||||
ERPNext Account,ERPNext Konto,
|
||||
@ -6106,13 +6106,13 @@ API consumer secret,API-Konsumentengeheimnis,
|
||||
Tax Account,Steuerkonto,
|
||||
Freight and Forwarding Account,Fracht- und Speditionskonto,
|
||||
Creation User,Erstellungsbenutzer,
|
||||
"The user that will be used to create Customers, Items and Sales Orders. This user should have the relevant permissions.","Der Benutzer, der zum Erstellen von Kunden, Artikeln und Kundenaufträgen verwendet wird. Dieser Benutzer sollte über die entsprechenden Berechtigungen verfügen.",
|
||||
"This warehouse will be used to create Sales Orders. The fallback warehouse is ""Stores"".",Dieses Lager wird zum Erstellen von Kundenaufträgen verwendet. Das Fallback-Lager ist "Stores".,
|
||||
"The user that will be used to create Customers, Items and Sales Orders. This user should have the relevant permissions.","Der Benutzer, der zum Erstellen von Kunden, Artikeln und Aufträgen verwendet wird. Dieser Benutzer sollte über die entsprechenden Berechtigungen verfügen.",
|
||||
"This warehouse will be used to create Sales Orders. The fallback warehouse is ""Stores"".",Dieses Lager wird zum Erstellen von Aufträgen verwendet. Das Fallback-Lager ist "Stores".,
|
||||
"The fallback series is ""SO-WOO-"".",Die Fallback-Serie heißt "SO-WOO-".,
|
||||
This company will be used to create Sales Orders.,Diese Firma wird zum Erstellen von Kundenaufträgen verwendet.,
|
||||
This company will be used to create Sales Orders.,Diese Firma wird zum Erstellen von Aufträgen verwendet.,
|
||||
Delivery After (Days),Lieferung nach (Tage),
|
||||
This is the default offset (days) for the Delivery Date in Sales Orders. The fallback offset is 7 days from the order placement date.,Dies ist der Standardversatz (Tage) für das Lieferdatum in Kundenaufträgen. Der Fallback-Offset beträgt 7 Tage ab Bestelldatum.,
|
||||
"This is the default UOM used for items and Sales orders. The fallback UOM is ""Nos"".","Dies ist die Standard-ME, die für Artikel und Kundenaufträge verwendet wird. Die Fallback-UOM lautet "Nos".",
|
||||
This is the default offset (days) for the Delivery Date in Sales Orders. The fallback offset is 7 days from the order placement date.,Dies ist der Standardversatz (Tage) für das Lieferdatum in Aufträgen. Der Fallback-Offset beträgt 7 Tage ab Bestelldatum.,
|
||||
"This is the default UOM used for items and Sales orders. The fallback UOM is ""Nos"".","Dies ist die Standard-ME, die für Artikel und Aufträge verwendet wird. Die Fallback-UOM lautet "Nos".",
|
||||
Endpoints,Endpunkte,
|
||||
Endpoint,Endpunkt,
|
||||
Antibiotic Name,Antibiotika-Name,
|
||||
@ -6230,8 +6230,8 @@ Appointment Reminder,Termin Erinnerung,
|
||||
Reminder Message,Erinnerungsmeldung,
|
||||
Remind Before,Vorher erinnern,
|
||||
Laboratory Settings,Laboreinstellungen,
|
||||
Create Lab Test(s) on Sales Invoice Submission,Erstellen Sie Labortests für die Übermittlung von Verkaufsrechnungen,
|
||||
Checking this will create Lab Test(s) specified in the Sales Invoice on submission.,"Wenn Sie dies aktivieren, werden Labortests erstellt, die bei der Übermittlung in der Verkaufsrechnung angegeben sind.",
|
||||
Create Lab Test(s) on Sales Invoice Submission,Erstellen Sie Labortests für die Übermittlung von Ausgangsrechnungen,
|
||||
Checking this will create Lab Test(s) specified in the Sales Invoice on submission.,"Wenn Sie dies aktivieren, werden Labortests erstellt, die bei der Übermittlung in der Ausgangsrechnung angegeben sind.",
|
||||
Create Sample Collection document for Lab Test,Erstellen Sie ein Probensammeldokument für den Labortest,
|
||||
Checking this will create a Sample Collection document every time you create a Lab Test,"Wenn Sie dies aktivieren, wird jedes Mal, wenn Sie einen Labortest erstellen, ein Probensammeldokument erstellt",
|
||||
Employee name and designation in print,Name und Bezeichnung des Mitarbeiters im Druck,
|
||||
@ -6315,7 +6315,7 @@ Therapy,Therapie,
|
||||
Get Prescribed Therapies,Holen Sie sich verschriebene Therapien,
|
||||
Appointment Datetime,Termin Datum / Uhrzeit,
|
||||
Duration (In Minutes),Dauer (in Minuten),
|
||||
Reference Sales Invoice,Referenzverkaufsrechnung,
|
||||
Reference Sales Invoice,Referenzausgangsrechnung,
|
||||
More Info,Weitere Informationen,
|
||||
Referring Practitioner,Überweisender Praktiker,
|
||||
Reminded,Erinnert,
|
||||
@ -7268,7 +7268,7 @@ Default Warehouses for Production,Standardlager für die Produktion,
|
||||
Default Work In Progress Warehouse,Standard-Fertigungslager,
|
||||
Default Finished Goods Warehouse,Standard-Fertigwarenlager,
|
||||
Default Scrap Warehouse,Standard-Schrottlager,
|
||||
Overproduction Percentage For Sales Order,Überproduktionsprozentsatz für Kundenauftrag,
|
||||
Overproduction Percentage For Sales Order,Überproduktionsprozentsatz für Auftrag,
|
||||
Overproduction Percentage For Work Order,Überproduktionsprozentsatz für Arbeitsauftrag,
|
||||
Other Settings,Weitere Einstellungen,
|
||||
Update BOM Cost Automatically,Stücklisten-Kosten automatisch aktualisieren,
|
||||
@ -7281,7 +7281,7 @@ Default Workstation,Standard-Arbeitsplatz,
|
||||
Production Plan,Produktionsplan,
|
||||
MFG-PP-.YYYY.-,MFG-PP-.YYYY.-,
|
||||
Get Items From,Holen Sie Elemente aus,
|
||||
Get Sales Orders,Kundenaufträge aufrufen,
|
||||
Get Sales Orders,Aufträge aufrufen,
|
||||
Material Request Detail,Materialanforderungsdetail,
|
||||
Get Material Request,Get-Material anfordern,
|
||||
Material Requests,Materialwünsche,
|
||||
@ -7304,8 +7304,8 @@ Quantity and Description,Menge und Beschreibung,
|
||||
material_request_item,material_request_item,
|
||||
Product Bundle Item,Produkt-Bundle-Artikel,
|
||||
Production Plan Material Request,Produktionsplan-Material anfordern,
|
||||
Production Plan Sales Order,Produktionsplan für Kundenauftrag,
|
||||
Sales Order Date,Kundenauftrags-Datum,
|
||||
Production Plan Sales Order,Produktionsplan für Auftrag,
|
||||
Sales Order Date,Auftragsdatum,
|
||||
Routing Name,Routing-Name,
|
||||
MFG-WO-.YYYY.-,MFG-WO-.YYYY.-,
|
||||
Item To Manufacture,Zu fertigender Artikel,
|
||||
@ -7482,12 +7482,12 @@ Copied From,Kopiert von,
|
||||
Start and End Dates,Start- und Enddatum,
|
||||
Actual Time (in Hours),Tatsächliche Zeit (in Stunden),
|
||||
Costing and Billing,Kalkulation und Abrechnung,
|
||||
Total Costing Amount (via Timesheets),Gesamtkalkulationsbetrag (über Arbeitszeittabellen),
|
||||
Total Expense Claim (via Expense Claims),Gesamtbetrag der Aufwandsabrechnung (über Aufwandsabrechnungen),
|
||||
Total Purchase Cost (via Purchase Invoice),Summe Einkaufskosten (über Einkaufsrechnung),
|
||||
Total Sales Amount (via Sales Order),Gesamtverkaufsbetrag (über Kundenauftrag),
|
||||
Total Billable Amount (via Timesheets),Gesamter abrechenbarer Betrag (über Arbeitszeittabellen),
|
||||
Total Billed Amount (via Sales Invoices),Gesamtabrechnungsbetrag (über Verkaufsrechnungen),
|
||||
Total Costing Amount (via Timesheets),Gesamtkalkulationsbetrag (über Zeiterfassung),
|
||||
Total Expense Claim (via Expense Claims),Gesamtbetrag der Auslagenabrechnung (über Auslagenabrechnungen),
|
||||
Total Purchase Cost (via Purchase Invoice),Summe Einkaufskosten (über Eingangsrechnung),
|
||||
Total Sales Amount (via Sales Order),Auftragssumme (über Auftrag),
|
||||
Total Billable Amount (via Timesheets),Abrechenbare Summe (über Zeiterfassung),
|
||||
Total Billed Amount (via Sales Invoices),Abgerechnete Summe (über Ausgangsrechnungen),
|
||||
Total Consumed Material Cost (via Stock Entry),Summe der verbrauchten Materialkosten (über die Bestandsbuchung),
|
||||
Gross Margin,Handelsspanne,
|
||||
Gross Margin %,Handelsspanne %,
|
||||
@ -7497,9 +7497,9 @@ Frequency To Collect Progress,"Häufigkeit, um Fortschritte zu sammeln",
|
||||
Twice Daily,Zweimal täglich,
|
||||
First Email,Erste E-Mail,
|
||||
Second Email,Zweite E-Mail,
|
||||
Time to send,Zeit zu senden,
|
||||
Day to Send,Tag zum Senden,
|
||||
Message will be sent to the users to get their status on the Project,"Es wird eine Nachricht an die Benutzer gesendet, um deren Status für das Projekt zu erhalten",
|
||||
Time to send,Sendezeit,
|
||||
Day to Send,Sendetag,
|
||||
Message will be sent to the users to get their status on the Project,"Es wird eine Nachricht an die Benutzer gesendet, um über den Projektstatus zu informieren",
|
||||
Projects Manager,Projektleiter,
|
||||
Project Template,Projektvorlage,
|
||||
Project Template Task,Projektvorlagenaufgabe,
|
||||
@ -7518,27 +7518,27 @@ Timeline,Zeitleiste,
|
||||
Expected Time (in hours),Voraussichtliche Zeit (in Stunden),
|
||||
% Progress,% Fortschritt,
|
||||
Is Milestone,Ist Meilenstein,
|
||||
Task Description,Aufgabenbeschreibung,
|
||||
Task Description,Vorgangsbeschreibung,
|
||||
Dependencies,Abhängigkeiten,
|
||||
Dependent Tasks,Abhängige Aufgaben,
|
||||
Dependent Tasks,Abhängige Vorgänge,
|
||||
Depends on Tasks,Abhängig von Vorgang,
|
||||
Actual Start Date (via Time Sheet),Das tatsächliche Startdatum (durch Zeiterfassung),
|
||||
Actual Time (in hours),Tatsächliche Zeit (in Stunden),
|
||||
Actual End Date (via Time Sheet),Das tatsächliche Enddatum (durch Zeiterfassung),
|
||||
Total Costing Amount (via Time Sheet),Gesamtkostenbetrag (über Arbeitszeitblatt),
|
||||
Total Expense Claim (via Expense Claim),Gesamtbetrag der Aufwandsabrechnung (über Aufwandsabrechnung),
|
||||
Total Billing Amount (via Time Sheet),Gesamtrechnungsbetrag (über Arbeitszeitblatt),
|
||||
Total Costing Amount (via Time Sheet),Gesamtkosten (über Zeiterfassung),
|
||||
Total Expense Claim (via Expense Claim),Summe der Auslagen (über Auslagenabrechnung),
|
||||
Total Billing Amount (via Time Sheet),Gesamtrechnungsbetrag (über Zeiterfassung),
|
||||
Review Date,Überprüfungsdatum,
|
||||
Closing Date,Abschlussdatum,
|
||||
Task Depends On,Vorgang hängt ab von,
|
||||
Task Type,Aufgabentyp,
|
||||
Task Type,Vorgangstyp,
|
||||
TS-.YYYY.-,TS-.YYYY.-,
|
||||
Employee Detail,Mitarbeiterdetails,
|
||||
Billing Details,Rechnungsdetails,
|
||||
Total Billable Hours,Insgesamt abrechenbare Stunden,
|
||||
Total Billed Hours,Insgesamt Angekündigt Stunden,
|
||||
Total Billable Hours,Summe abrechenbare Stunden,
|
||||
Total Billed Hours,Summe abgerechneter Stunden,
|
||||
Total Costing Amount,Gesamtkalkulation Betrag,
|
||||
Total Billable Amount,Insgesamt abrechenbare Betrag,
|
||||
Total Billable Amount,Summe abrechenbarer Betrag,
|
||||
Total Billed Amount,Gesamtrechnungsbetrag,
|
||||
% Amount Billed,% des Betrages berechnet,
|
||||
Hrs,Std,
|
||||
@ -7555,10 +7555,10 @@ Quality Goal,Qualitätsziel,
|
||||
Monitoring Frequency,Überwachungsfrequenz,
|
||||
Weekday,Wochentag,
|
||||
Objectives,Ziele,
|
||||
Quality Goal Objective,Qualitätsziel Ziel,
|
||||
Quality Goal Objective,Qualitätsziel,
|
||||
Objective,Zielsetzung,
|
||||
Agenda,Agenda,
|
||||
Minutes,Protokoll,
|
||||
Minutes,Protokolle,
|
||||
Quality Meeting Agenda,Qualitätstreffen Agenda,
|
||||
Quality Meeting Minutes,Qualitätssitzungsprotokoll,
|
||||
Minute,Minute,
|
||||
@ -7627,7 +7627,7 @@ Restaurant Menu Item,Restaurant-Menüpunkt,
|
||||
Restaurant Order Entry,Restaurantbestellung,
|
||||
Restaurant Table,Restaurant-Tisch,
|
||||
Click Enter To Add,Klicken Sie zum Hinzufügen auf Hinzufügen.,
|
||||
Last Sales Invoice,Letzte Verkaufsrechnung,
|
||||
Last Sales Invoice,Letzte Ausgangsrechnung,
|
||||
Current Order,Aktueller Auftrag,
|
||||
Restaurant Order Entry Item,Restaurantbestellzugangsposten,
|
||||
Served,Serviert,
|
||||
@ -7639,7 +7639,7 @@ Reservation Time,Reservierungszeit,
|
||||
Reservation End Time,Reservierungsendzeit,
|
||||
No of Seats,Anzahl der Sitze,
|
||||
Minimum Seating,Mindestbestuhlung,
|
||||
"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment. ","Verkaufskampagne verfolgen: Leads, Angebote, Kundenaufträge usw. von Kampagnen beobachten um die Kapitalverzinsung (RoI) zu messen.",
|
||||
"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment. ","Verkaufskampagne verfolgen: Leads, Angebote, Aufträge usw. von Kampagnen beobachten um die Kapitalverzinsung (RoI) zu messen.",
|
||||
SAL-CAM-.YYYY.-,SAL-CAM-.YYYY.-,
|
||||
Campaign Schedules,Kampagnenpläne,
|
||||
Buyer of Goods and Services.,Käufer von Waren und Dienstleistungen.,
|
||||
@ -7647,8 +7647,8 @@ CUST-.YYYY.-,CUST-.YYYY.-,
|
||||
Default Company Bank Account,Standard-Bankkonto des Unternehmens,
|
||||
From Lead,Von Lead,
|
||||
Account Manager,Buchhalter,
|
||||
Allow Sales Invoice Creation Without Sales Order,Ermöglichen Sie die Erstellung von Kundenrechnungen ohne Kundenauftrag,
|
||||
Allow Sales Invoice Creation Without Delivery Note,Ermöglichen Sie die Erstellung einer Verkaufsrechnung ohne Lieferschein,
|
||||
Allow Sales Invoice Creation Without Sales Order,Ermöglichen Sie die Erstellung von Kundenrechnungen ohne Auftrag,
|
||||
Allow Sales Invoice Creation Without Delivery Note,Ermöglichen Sie die Erstellung einer Ausgangsrechnung ohne Lieferschein,
|
||||
Default Price List,Standardpreisliste,
|
||||
Primary Address and Contact Detail,Primäre Adresse und Kontaktdetails,
|
||||
"Select, to make the customer searchable with these fields","Wählen Sie, um den Kunden mit diesen Feldern durchsuchbar zu machen",
|
||||
@ -7665,7 +7665,7 @@ Commission Rate,Provisionssatz,
|
||||
Sales Team Details,Verkaufsteamdetails,
|
||||
Customer POS id,Kunden-POS-ID,
|
||||
Customer Credit Limit,Kundenkreditlimit,
|
||||
Bypass Credit Limit Check at Sales Order,Kreditlimitprüfung im Kundenauftrag umgehen,
|
||||
Bypass Credit Limit Check at Sales Order,Kreditlimitprüfung im Auftrag umgehen,
|
||||
Industry Type,Wirtschaftsbranche,
|
||||
MAT-INS-.YYYY.-,MAT-INS-.YYYY.-,
|
||||
Installation Date,Datum der Installation,
|
||||
@ -7701,16 +7701,16 @@ Against Docname,Zu Dokumentenname,
|
||||
Additional Notes,Zusätzliche Bemerkungen,
|
||||
SAL-ORD-.YYYY.-,SAL-ORD-.YYYY.-,
|
||||
Skip Delivery Note,Lieferschein überspringen,
|
||||
In Words will be visible once you save the Sales Order.,"""In Worten"" wird sichtbar, sobald Sie den Kundenauftrag speichern.",
|
||||
Track this Sales Order against any Project,Diesen Kundenauftrag in jedem Projekt nachverfolgen,
|
||||
In Words will be visible once you save the Sales Order.,"""In Worten"" wird sichtbar, sobald Sie den Auftrag speichern.",
|
||||
Track this Sales Order against any Project,Diesen Auftrag in jedem Projekt nachverfolgen,
|
||||
Billing and Delivery Status,Abrechnungs- und Lieferstatus,
|
||||
Not Delivered,Nicht geliefert,
|
||||
Fully Delivered,Komplett geliefert,
|
||||
Partly Delivered,Teilweise geliefert,
|
||||
Not Applicable,Nicht andwendbar,
|
||||
% Delivered,% geliefert,
|
||||
% of materials delivered against this Sales Order,% der für diesen Kundenauftrag gelieferten Materialien,
|
||||
% of materials billed against this Sales Order,% der Materialien welche zu diesem Kundenauftrag gebucht wurden,
|
||||
% of materials delivered against this Sales Order,% der für diesen Auftrag gelieferten Materialien,
|
||||
% of materials billed against this Sales Order,% der Materialien welche zu diesem Auftrag gebucht wurden,
|
||||
Not Billed,Nicht abgerechnet,
|
||||
Fully Billed,Voll berechnet,
|
||||
Partly Billed,Teilweise abgerechnet,
|
||||
@ -7845,13 +7845,13 @@ Bank Balance,Kontostand,
|
||||
Bank Credit Balance,Bankguthaben,
|
||||
Receivables,Forderungen,
|
||||
Payables,Verbindlichkeiten,
|
||||
Sales Orders to Bill,Kundenaufträge an Rechnung,
|
||||
Sales Orders to Bill,Aufträge an Rechnung,
|
||||
Purchase Orders to Bill,Bestellungen an Rechnung,
|
||||
New Sales Orders,Neue Kundenaufträge,
|
||||
New Sales Orders,Neue Aufträge,
|
||||
New Purchase Orders,Neue Bestellungen an Lieferanten,
|
||||
Sales Orders to Deliver,Kundenaufträge zu liefern,
|
||||
Purchase Orders to Receive,Bestellungen zu empfangen,
|
||||
New Purchase Invoice,Neue Kaufrechnung,
|
||||
Sales Orders to Deliver,Auszuliefernde Aufträge,
|
||||
Purchase Orders to Receive,Anzuliefernde Bestellungen,
|
||||
New Purchase Invoice,Neue Eingangsrechnung,
|
||||
New Quotations,Neue Angebote,
|
||||
Open Quotations,Angebote öffnen,
|
||||
Open Issues,Offene Punkte,
|
||||
@ -7972,7 +7972,7 @@ MAT-DN-.YYYY.-,MAT-DN-.YYYY.-,
|
||||
Is Return,Ist Rückgabe,
|
||||
Issue Credit Note,Gutschrift ausgeben,
|
||||
Return Against Delivery Note,Zurück zum Lieferschein,
|
||||
Customer's Purchase Order No,Kundenauftragsnr.,
|
||||
Customer's Purchase Order No,Bestellnummer des Kunden,
|
||||
Billing Address Name,Name der Rechnungsadresse,
|
||||
Required only for sample item.,Nur erforderlich für Probeartikel.,
|
||||
"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Wenn eine Standardvorlage unter den Vorlagen ""Steuern und Abgaben beim Verkauf"" erstellt wurde, bitte eine Vorlage auswählen und auf die Schaltfläche unten klicken.",
|
||||
@ -7989,8 +7989,8 @@ Installation Status,Installationsstatus,
|
||||
Excise Page Number,Seitenzahl entfernen,
|
||||
Instructions,Anweisungen,
|
||||
From Warehouse,Ab Lager,
|
||||
Against Sales Order,Zu Kundenauftrag,
|
||||
Against Sales Order Item,Zu Kundenauftrags-Position,
|
||||
Against Sales Order,Zu Auftrag,
|
||||
Against Sales Order Item,Zu Auftragsposition,
|
||||
Against Sales Invoice,Zu Ausgangsrechnung,
|
||||
Against Sales Invoice Item,Zu Ausgangsrechnungs-Position,
|
||||
Available Batch Qty at From Warehouse,Verfügbare Chargenmenge im Ausgangslager,
|
||||
@ -8063,7 +8063,7 @@ Serial Number Series,Serie der Seriennummer,
|
||||
"Example: ABCD.#####\nIf 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.","Beispiel: ABCD.##### \n Wenn ""Serie"" eingestellt ist und ""Seriennummer"" in den Transaktionen nicht aufgeführt ist, dann wird eine Seriennummer automatisch auf der Grundlage dieser Serie erstellt. Wenn immer explizit Seriennummern für diesen Artikel aufgeführt werden sollen, muss das Feld leer gelassen werden.",
|
||||
Variants,Varianten,
|
||||
Has Variants,Hat Varianten,
|
||||
"If this item has variants, then it cannot be selected in sales orders etc.","Wenn dieser Artikel Varianten hat, dann kann er bei den Kundenaufträgen, etc. nicht ausgewählt werden",
|
||||
"If this item has variants, then it cannot be selected in sales orders etc.","Wenn dieser Artikel Varianten hat, dann kann er bei den Aufträgen, etc. nicht ausgewählt werden",
|
||||
Variant Based On,Variante basierend auf,
|
||||
Item Attribute,Artikelattribut,
|
||||
"Sales, Purchase, Accounting Defaults","Verkauf, Einkauf, Buchhaltungsvorgaben",
|
||||
@ -8529,7 +8529,7 @@ Open Work Orders,Arbeitsaufträge öffnen,
|
||||
Qty to Deliver,Zu liefernde Menge,
|
||||
Patient Appointment Analytics,Analyse von Patiententerminen,
|
||||
Payment Period Based On Invoice Date,Zahlungszeitraum basierend auf Rechnungsdatum,
|
||||
Pending SO Items For Purchase Request,Ausstehende Artikel aus Kundenaufträgen für Lieferantenanfrage,
|
||||
Pending SO Items For Purchase Request,Ausstehende Artikel aus Aufträgen für Lieferantenanfrage,
|
||||
Procurement Tracker,Beschaffungs-Tracker,
|
||||
Product Bundle Balance,Produkt-Bundle-Balance,
|
||||
Production Analytics,Produktions-Analysen,
|
||||
@ -8544,7 +8544,7 @@ Purchase Invoice Trends,Trendanalyse Eingangsrechnungen,
|
||||
Qty to Receive,Anzunehmende Menge,
|
||||
Received Qty Amount,Erhaltene Menge Menge,
|
||||
Billed Qty,Rechnungsmenge,
|
||||
Purchase Order Trends,Entwicklung Lieferantenaufträge,
|
||||
Purchase Order Trends,Entwicklung Bestellungen,
|
||||
Purchase Receipt Trends,Trendanalyse Kaufbelege,
|
||||
Purchase Register,Übersicht über Einkäufe,
|
||||
Quotation Trends,Trendanalyse Angebote,
|
||||
@ -8555,7 +8555,7 @@ Qty to Transfer,Zu versendende Menge,
|
||||
Salary Register,Gehalt Register,
|
||||
Sales Analytics,Vertriebsanalyse,
|
||||
Sales Invoice Trends,Ausgangsrechnung-Trendanalyse,
|
||||
Sales Order Trends,Trendanalyse Kundenaufträge,
|
||||
Sales Order Trends,Trendanalyse Aufträge,
|
||||
Sales Partner Commission Summary,Zusammenfassung der Vertriebspartnerprovision,
|
||||
Sales Partner Target Variance based on Item Group,Zielabweichung des Vertriebspartners basierend auf Artikelgruppe,
|
||||
Sales Partner Transaction Summary,Sales Partner Transaction Summary,
|
||||
@ -8706,7 +8706,7 @@ Dunning Letter,Mahnbrief,
|
||||
Reference Detail No,Referenz Detail Nr,
|
||||
Custom Remarks,Benutzerdefinierte Bemerkungen,
|
||||
Please select a Company first.,Bitte wählen Sie zuerst eine Firma aus.,
|
||||
"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice, Journal Entry or Dunning","Zeile # {0}: Der Referenzdokumenttyp muss Kundenauftrag, Verkaufsrechnung, Journaleintrag oder Mahnwesen sein",
|
||||
"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice, Journal Entry or Dunning","Zeile # {0}: Der Referenzdokumenttyp muss Auftrag, Ausgangsrechnung, Journaleintrag oder Mahnwesen sein",
|
||||
POS Closing Entry,POS Closing Entry,
|
||||
POS Opening Entry,POS-Eröffnungseintrag,
|
||||
POS Transactions,POS-Transaktionen,
|
||||
@ -8716,7 +8716,7 @@ Closing Amount,Schlussbetrag,
|
||||
POS Closing Entry Taxes,POS Closing Entry Taxes,
|
||||
POS Invoice,POS-Rechnung,
|
||||
ACC-PSINV-.YYYY.-,ACC-PSINV-.YYYY.-,
|
||||
Consolidated Sales Invoice,Konsolidierte Verkaufsrechnung,
|
||||
Consolidated Sales Invoice,Konsolidierte Ausgangsrechnung,
|
||||
Return Against POS Invoice,Gegen POS-Rechnung zurücksenden,
|
||||
Consolidated,Konsolidiert,
|
||||
POS Invoice Item,POS-Rechnungsposition,
|
||||
@ -8826,7 +8826,7 @@ Depreciation Posting Date,Buchungsdatum der Abschreibung,
|
||||
"By default, the Supplier Name is set as per the Supplier Name entered. If you want Suppliers to be named by a ","Standardmäßig wird der Lieferantenname gemäß dem eingegebenen Lieferantennamen festgelegt. Wenn Sie möchten, dass Lieferanten von a benannt werden",
|
||||
choose the 'Naming Series' option.,Wählen Sie die Option "Naming Series".,
|
||||
Configure the default Price List when creating a new Purchase transaction. Item prices will be fetched from this Price List.,Konfigurieren Sie die Standardpreisliste beim Erstellen einer neuen Kauftransaktion. Artikelpreise werden aus dieser Preisliste abgerufen.,
|
||||
"If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice or Receipt without creating a Purchase Order first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Order' checkbox in the Supplier master.","Wenn diese Option auf "Ja" konfiguriert ist, verhindert ERPNext, dass Sie eine Kaufrechnung oder einen Beleg erstellen können, ohne zuvor eine Bestellung zu erstellen. Diese Konfiguration kann für einen bestimmten Lieferanten überschrieben werden, indem das Kontrollkästchen "Erstellung von Einkaufsrechnungen ohne Bestellung zulassen" im Lieferantenstamm aktiviert wird.",
|
||||
"If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice or Receipt without creating a Purchase Order first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Order' checkbox in the Supplier master.","Wenn diese Option auf "Ja" konfiguriert ist, verhindert ERPNext, dass Sie eine Kaufrechnung oder einen Beleg erstellen können, ohne zuvor eine Bestellung zu erstellen. Diese Konfiguration kann für einen bestimmten Lieferanten überschrieben werden, indem das Kontrollkästchen "Erstellung von Eingangsrechnungen ohne Bestellung zulassen" im Lieferantenstamm aktiviert wird.",
|
||||
"If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice without creating a Purchase Receipt first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Receipt' checkbox in the Supplier master.","Wenn diese Option auf "Ja" konfiguriert ist, verhindert ERPNext, dass Sie eine Kaufrechnung erstellen können, ohne zuvor einen Kaufbeleg zu erstellen. Diese Konfiguration kann für einen bestimmten Lieferanten überschrieben werden, indem das Kontrollkästchen "Erstellung von Kaufrechnungen ohne Kaufbeleg zulassen" im Lieferantenstamm aktiviert wird.",
|
||||
Quantity & Stock,Menge & Lager,
|
||||
Call Details,Anrufdetails,
|
||||
@ -8903,7 +8903,7 @@ Set the Out Patient Consulting Charge for this Practitioner.,Legen Sie die Gebü
|
||||
"If checked, a customer will be created for every Patient. Patient Invoices will be created against this Customer. You can also select existing Customer while creating a Patient. This field is checked by default.","Wenn diese Option aktiviert ist, wird für jeden Patienten ein Kunde erstellt. Für diesen Kunden werden Patientenrechnungen erstellt. Sie können beim Erstellen eines Patienten auch einen vorhandenen Kunden auswählen. Dieses Feld ist standardmäßig aktiviert.",
|
||||
Collect Registration Fee,Registrierungsgebühr sammeln,
|
||||
"If your Healthcare facility bills registrations of Patients, you can check this and set the Registration Fee in the field below. Checking this will create new Patients with a Disabled status by default and will only be enabled after invoicing the Registration Fee.","Wenn Ihre Gesundheitseinrichtung die Registrierung von Patienten in Rechnung stellt, können Sie dies überprüfen und die Registrierungsgebühr im Feld unten festlegen. Wenn Sie dies aktivieren, werden standardmäßig neue Patienten mit dem Status "Deaktiviert" erstellt und erst nach Rechnungsstellung der Registrierungsgebühr aktiviert.",
|
||||
Checking this will automatically create a Sales Invoice whenever an appointment is booked for a Patient.,"Wenn Sie dies aktivieren, wird automatisch eine Verkaufsrechnung erstellt, wenn ein Termin für einen Patienten gebucht wird.",
|
||||
Checking this will automatically create a Sales Invoice whenever an appointment is booked for a Patient.,"Wenn Sie dies aktivieren, wird automatisch eine Ausgangsrechnung erstellt, wenn ein Termin für einen Patienten gebucht wird.",
|
||||
Healthcare Service Items,Artikel im Gesundheitswesen,
|
||||
"You can create a service item for Inpatient Visit Charge and set it here. Similarly, you can set up other Healthcare Service Items for billing in this section. Click ",Sie können ein Serviceelement für die Gebühr für stationäre Besuche erstellen und hier festlegen. Ebenso können Sie in diesem Abschnitt andere Gesundheitsposten für die Abrechnung einrichten. Klicken,
|
||||
Set up default Accounts for the Healthcare Facility,Richten Sie Standardkonten für die Gesundheitseinrichtung ein,
|
||||
@ -8958,7 +8958,7 @@ Lab Test Group Template,Labortestgruppenvorlage,
|
||||
Add New Line,Neue Zeile hinzufügen,
|
||||
Secondary UOM,Sekundäre UOM,
|
||||
"<b>Single</b>: Results which require only a single input.\n<br>\n<b>Compound</b>: Results which require multiple event inputs.\n<br>\n<b>Descriptive</b>: Tests which have multiple result components with manual result entry.\n<br>\n<b>Grouped</b>: Test templates which are a group of other test templates.\n<br>\n<b>No Result</b>: Tests with no results, can be ordered and billed but no Lab Test will be created. e.g.. Sub Tests for Grouped results","<b>Single</b> : Ergebnisse, die nur eine einzige Eingabe erfordern.<br> <b>Verbindung</b> : Ergebnisse, die mehrere Ereigniseingaben erfordern.<br> <b>Beschreibend</b> : Tests mit mehreren Ergebniskomponenten mit manueller Ergebniseingabe.<br> <b>Gruppiert</b> : <b>Testvorlagen,</b> die eine Gruppe anderer <b>Testvorlagen</b> sind.<br> <b>Kein Ergebnis</b> : Tests ohne Ergebnisse können bestellt und in Rechnung gestellt werden, es wird jedoch kein Labortest erstellt. z.B. Untertests für gruppierte Ergebnisse",
|
||||
"If unchecked, the item will not be available in Sales Invoices for billing but can be used in group test creation. ","Wenn diese Option deaktiviert ist, ist der Artikel in den Verkaufsrechnungen nicht zur Abrechnung verfügbar, kann jedoch für die Erstellung von Gruppentests verwendet werden.",
|
||||
"If unchecked, the item will not be available in Sales Invoices for billing but can be used in group test creation. ","Wenn diese Option deaktiviert ist, ist der Artikel in den Ausgangsrechnungen nicht zur Abrechnung verfügbar, kann jedoch für die Erstellung von Gruppentests verwendet werden.",
|
||||
Description ,Beschreibung,
|
||||
Descriptive Test,Beschreibender Test,
|
||||
Group Tests,Gruppentests,
|
||||
@ -9084,8 +9084,8 @@ Feedback By,Feedback von,
|
||||
Manufacturing Section,Fertigungsabteilung,
|
||||
"By default, the Customer Name is set as per the Full Name entered. If you want Customers to be named by a ","Standardmäßig wird der Kundenname gemäß dem eingegebenen vollständigen Namen festgelegt. Wenn Sie möchten, dass Kunden von a benannt werden",
|
||||
Configure the default Price List when creating a new Sales transaction. Item prices will be fetched from this Price List.,Konfigurieren Sie die Standardpreisliste beim Erstellen einer neuen Verkaufstransaktion. Artikelpreise werden aus dieser Preisliste abgerufen.,
|
||||
"If this option is configured 'Yes', ERPNext will prevent you from creating a Sales Invoice or Delivery Note without creating a Sales Order first. This configuration can be overridden for a particular Customer by enabling the 'Allow Sales Invoice Creation Without Sales Order' checkbox in the Customer master.","Wenn diese Option auf "Ja" konfiguriert ist, verhindert ERPNext, dass Sie eine Verkaufsrechnung oder einen Lieferschein erstellen, ohne zuvor einen Kundenauftrag zu erstellen. Diese Konfiguration kann für einen bestimmten Kunden überschrieben werden, indem das Kontrollkästchen "Erstellung von Verkaufsrechnungen ohne Kundenauftrag zulassen" im Kundenstamm aktiviert wird.",
|
||||
"If this option is configured 'Yes', ERPNext will prevent you from creating a Sales Invoice without creating a Delivery Note first. This configuration can be overridden for a particular Customer by enabling the 'Allow Sales Invoice Creation Without Delivery Note' checkbox in the Customer master.","Wenn diese Option auf "Ja" konfiguriert ist, verhindert ERPNext, dass Sie eine Verkaufsrechnung erstellen, ohne zuvor einen Lieferschein zu erstellen. Diese Konfiguration kann für einen bestimmten Kunden überschrieben werden, indem das Kontrollkästchen "Erstellung von Verkaufsrechnungen ohne Lieferschein zulassen" im Kundenstamm aktiviert wird.",
|
||||
"If this option is configured 'Yes', ERPNext will prevent you from creating a Sales Invoice or Delivery Note without creating a Sales Order first. This configuration can be overridden for a particular Customer by enabling the 'Allow Sales Invoice Creation Without Sales Order' checkbox in the Customer master.","Wenn diese Option auf "Ja" konfiguriert ist, verhindert ERPNext, dass Sie eine Ausgangsrechnung oder einen Lieferschein erstellen, ohne zuvor einen Auftrag zu erstellen. Diese Konfiguration kann für einen bestimmten Kunden überschrieben werden, indem das Kontrollkästchen "Erstellung von Ausgangsrechnung ohne Auftrag zulassen" im Kundenstamm aktiviert wird.",
|
||||
"If this option is configured 'Yes', ERPNext will prevent you from creating a Sales Invoice without creating a Delivery Note first. This configuration can be overridden for a particular Customer by enabling the 'Allow Sales Invoice Creation Without Delivery Note' checkbox in the Customer master.","Wenn diese Option auf "Ja" konfiguriert ist, verhindert ERPNext, dass Sie eine Ausgangsrechnung erstellen, ohne zuvor einen Lieferschein zu erstellen. Diese Konfiguration kann für einen bestimmten Kunden überschrieben werden, indem das Kontrollkästchen "Erstellung von Ausgangsrechnungen ohne Lieferschein zulassen" im Kundenstamm aktiviert wird.",
|
||||
Default Warehouse for Sales Return,Standardlager für Retouren,
|
||||
Default In Transit Warehouse,Standard im Transit Warehouse,
|
||||
Enable Perpetual Inventory For Non Stock Items,Aktivieren Sie das ewige Inventar für nicht vorrätige Artikel,
|
||||
@ -9114,7 +9114,7 @@ Set a Default Warehouse for Inventory Transactions. This will be fetched into th
|
||||
Choose between FIFO and Moving Average Valuation Methods. Click ,Wählen Sie zwischen FIFO- und Moving Average-Bewertungsmethoden. Klicken,
|
||||
to know more about them.,um mehr über sie zu erfahren.,
|
||||
Show 'Scan Barcode' field above every child table to insert Items with ease.,"Zeigen Sie das Feld "Barcode scannen" über jeder untergeordneten Tabelle an, um Elemente problemlos einzufügen.",
|
||||
"Serial numbers for stock will be set automatically based on the Items entered based on first in first out in transactions like Purchase/Sales Invoices, Delivery Notes, etc.","Seriennummern für Lagerbestände werden automatisch basierend auf den Artikeln festgelegt, die basierend auf First-In-First-Out in Transaktionen wie Kauf- / Verkaufsrechnungen, Lieferscheinen usw. eingegeben wurden.",
|
||||
"Serial numbers for stock will be set automatically based on the Items entered based on first in first out in transactions like Purchase/Sales Invoices, Delivery Notes, etc.","Seriennummern für Lagerbestände werden automatisch basierend auf den Artikeln festgelegt, die basierend auf First-In-First-Out in Transaktionen wie Ein- und Ausgangsrechnungen, Lieferscheinen usw. eingegeben wurden.",
|
||||
"If blank, parent Warehouse Account or company default will be considered in transactions","Wenn leer, wird das übergeordnete Lagerkonto oder der Firmenstandard bei Transaktionen berücksichtigt",
|
||||
Service Level Agreement Details,Details zum Service Level Agreement,
|
||||
Service Level Agreement Status,Status des Service Level Agreements,
|
||||
@ -9263,10 +9263,10 @@ Salary Payments via ECS,Gehaltszahlungen über ECS,
|
||||
Account No,Konto Nr,
|
||||
IFSC,IFSC,
|
||||
MICR,MICR,
|
||||
Sales Order Analysis,Kundenauftragsanalyse,
|
||||
Sales Order Analysis,Auftragsanalyse,
|
||||
Amount Delivered,Gelieferter Betrag,
|
||||
Delay (in Days),Verzögerung (in Tagen),
|
||||
Group by Sales Order,Nach Kundenauftrag gruppieren,
|
||||
Group by Sales Order,Nach Auftrag gruppieren,
|
||||
Sales Value,Verkaufswert,
|
||||
Stock Qty vs Serial No Count,Lagermenge vs Seriennummer,
|
||||
Serial No Count,Seriennummer nicht gezählt,
|
||||
@ -9456,8 +9456,8 @@ Total Forecast (Future Data),Gesamtprognose (zukünftige Daten),
|
||||
Based On Document,Basierend auf Dokument,
|
||||
Based On Data ( in years ),Basierend auf Daten (in Jahren),
|
||||
Smoothing Constant,Glättungskonstante,
|
||||
Please fill the Sales Orders table,Bitte füllen Sie die Tabelle Kundenaufträge aus,
|
||||
Sales Orders Required,Kundenaufträge erforderlich,
|
||||
Please fill the Sales Orders table,Bitte füllen Sie die Tabelle Aufträge aus,
|
||||
Sales Orders Required,Aufträge erforderlich,
|
||||
Please fill the Material Requests table,Bitte füllen Sie die Materialanforderungstabelle aus,
|
||||
Material Requests Required,Materialanforderungen erforderlich,
|
||||
Items to Manufacture are required to pull the Raw Materials associated with it.,"Zu fertigende Gegenstände sind erforderlich, um die damit verbundenen Rohstoffe zu ziehen.",
|
||||
@ -9486,7 +9486,7 @@ To date can not be greater than employee's relieving date.,Bisher kann das Entla
|
||||
Payroll date can not be greater than employee's relieving date.,Das Abrechnungsdatum darf nicht größer sein als das Entlastungsdatum des Mitarbeiters.,
|
||||
Row #{0}: Please enter the result value for {1},Zeile # {0}: Bitte geben Sie den Ergebniswert für {1} ein,
|
||||
Mandatory Results,Obligatorische Ergebnisse,
|
||||
Sales Invoice or Patient Encounter is required to create Lab Tests,Für die Erstellung von Labortests ist eine Verkaufsrechnung oder eine Patientenbegegnung erforderlich,
|
||||
Sales Invoice or Patient Encounter is required to create Lab Tests,Für die Erstellung von Labortests ist eine Ausgangsrechnung oder eine Patientenbegegnung erforderlich,
|
||||
Insufficient Data,Unzureichende Daten,
|
||||
Lab Test(s) {0} created successfully,Labortest (e) {0} erfolgreich erstellt,
|
||||
Test :,Prüfung :,
|
||||
@ -9634,16 +9634,16 @@ Time Between Operations (Mins),Zeit zwischen Operationen (Minuten),
|
||||
Default: 10 mins,Standard: 10 Minuten,
|
||||
Overproduction for Sales and Work Order,Überproduktion für Kunden- und Arbeitsauftrag,
|
||||
"Update BOM cost automatically via scheduler, based on the latest Valuation Rate/Price List Rate/Last Purchase Rate of raw materials","Aktualisieren Sie die Stücklistenkosten automatisch über den Planer, basierend auf der neuesten Bewertungsrate / Preislistenrate / letzten Kaufrate der Rohstoffe",
|
||||
Purchase Order already created for all Sales Order items,Bestellung bereits für alle Kundenauftragspositionen angelegt,
|
||||
Purchase Order already created for all Sales Order items,Bestellung bereits für alle Auftragspositionen angelegt,
|
||||
Select Items,Gegenstände auswählen,
|
||||
Against Default Supplier,Gegen Standardlieferanten,
|
||||
Auto close Opportunity after the no. of days mentioned above,Gelegenheit zum automatischen Schließen nach der Nr. der oben genannten Tage,
|
||||
Is Sales Order Required for Sales Invoice & Delivery Note Creation?,Ist ein Kundenauftrag für die Erstellung von Kundenrechnungen und Lieferscheinen erforderlich?,
|
||||
Is Delivery Note Required for Sales Invoice Creation?,Ist für die Erstellung der Verkaufsrechnung ein Lieferschein erforderlich?,
|
||||
Is Sales Order Required for Sales Invoice & Delivery Note Creation?,Ist ein Auftrag für die Erstellung von Kundenrechnungen und Lieferscheinen erforderlich?,
|
||||
Is Delivery Note Required for Sales Invoice Creation?,Ist für die Erstellung der Ausgangsrechnung ein Lieferschein erforderlich?,
|
||||
How often should Project and Company be updated based on Sales Transactions?,Wie oft sollten Projekt und Unternehmen basierend auf Verkaufstransaktionen aktualisiert werden?,
|
||||
Allow User to Edit Price List Rate in Transactions,Benutzer darf Preisliste in Transaktionen bearbeiten,
|
||||
Allow Item to Be Added Multiple Times in a Transaction,"Zulassen, dass ein Element in einer Transaktion mehrmals hinzugefügt wird",
|
||||
Allow Multiple Sales Orders Against a Customer's Purchase Order,Erlauben Sie mehrere Kundenaufträge für die Bestellung eines Kunden,
|
||||
Allow Multiple Sales Orders Against a Customer's Purchase Order,Erlauben Sie mehrere Aufträge für die Bestellung eines Kunden,
|
||||
Validate Selling Price for Item Against Purchase Rate or Valuation Rate,Überprüfen Sie den Verkaufspreis für den Artikel anhand der Kauf- oder Bewertungsrate,
|
||||
Hide Customer's Tax ID from Sales Transactions,Steuer-ID des Kunden vor Verkaufstransaktionen ausblenden,
|
||||
"The 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.","Der Prozentsatz, den Sie mehr gegen die bestellte Menge erhalten oder liefern dürfen. Wenn Sie beispielsweise 100 Einheiten bestellt haben und Ihre Zulage 10% beträgt, können Sie 110 Einheiten erhalten.",
|
||||
@ -9653,8 +9653,8 @@ Automatically Set Serial Nos Based on FIFO,Seriennummern basierend auf FIFO auto
|
||||
Set Qty in Transactions Based on Serial No Input,Stellen Sie die Menge in Transaktionen basierend auf Seriennummer ohne Eingabe ein,
|
||||
Raise Material Request When Stock Reaches Re-order Level,"Erhöhen Sie die Materialanforderung, wenn der Lagerbestand die Nachbestellmenge erreicht",
|
||||
Notify by Email on Creation of Automatic Material Request,Benachrichtigen Sie per E-Mail über die Erstellung einer automatischen Materialanforderung,
|
||||
Allow Material Transfer from Delivery Note to Sales Invoice,Materialübertragung vom Lieferschein zur Verkaufsrechnung zulassen,
|
||||
Allow Material Transfer from Purchase Receipt to Purchase Invoice,Materialübertragung vom Kaufbeleg zur Kaufrechnung zulassen,
|
||||
Allow Material Transfer from Delivery Note to Sales Invoice,Materialübertragung vom Lieferschein zur Ausgangsrechnung zulassen,
|
||||
Allow Material Transfer from Purchase Receipt to Purchase Invoice,Materialübertragung vom Kaufbeleg zur Eingangsrechnung zulassen,
|
||||
Freeze Stocks Older Than (Days),Aktien einfrieren älter als (Tage),
|
||||
Role Allowed to Edit Frozen Stock,Rolle darf eingefrorenes Material bearbeiten,
|
||||
The unallocated amount of Payment Entry {0} is greater than the Bank Transaction's unallocated amount,Der nicht zugewiesene Betrag der Zahlungseingabe {0} ist größer als der nicht zugewiesene Betrag der Banküberweisung,
|
||||
@ -9694,7 +9694,7 @@ You had {} errors while creating opening invoices. Check {} for more details,Bei
|
||||
Error Occured,Fehler aufgetreten,
|
||||
Opening Invoice Creation In Progress,Öffnen der Rechnungserstellung läuft,
|
||||
Creating {} out of {} {},{} Aus {} {} erstellen,
|
||||
(Serial No: {0}) cannot be consumed as it's reserverd to fullfill Sales Order {1}.,"(Seriennummer: {0}) kann nicht verwendet werden, da es zum Ausfüllen des Kundenauftrags {1} reserviert ist.",
|
||||
(Serial No: {0}) cannot be consumed as it's reserverd to fullfill Sales Order {1}.,"(Seriennummer: {0}) kann nicht verwendet werden, da es zum Ausfüllen des Auftrags {1} reserviert ist.",
|
||||
Item {0} {1},Gegenstand {0} {1},
|
||||
Last Stock Transaction for item {0} under warehouse {1} was on {2}.,Die letzte Lagertransaktion für Artikel {0} unter Lager {1} war am {2}.,
|
||||
Stock Transactions for Item {0} under warehouse {1} cannot be posted before this time.,Lagertransaktionen für Artikel {0} unter Lager {1} können nicht vor diesem Zeitpunkt gebucht werden.,
|
||||
@ -9822,8 +9822,8 @@ Invalid Parent Account,Ungültiges übergeordnetes Konto,
|
||||
"If you {0} {1} worth item {2}, the scheme {3} will be applied on the item.","Wenn Sie {0} {1} Gegenstand {2} wert sind, wird das Schema {3} auf den Gegenstand angewendet.",
|
||||
"As the field {0} is enabled, the field {1} is mandatory.","Da das Feld {0} aktiviert ist, ist das Feld {1} obligatorisch.",
|
||||
"As the field {0} is enabled, the value of the field {1} should be more than 1.","Wenn das Feld {0} aktiviert ist, sollte der Wert des Feldes {1} größer als 1 sein.",
|
||||
Cannot deliver Serial No {0} of item {1} as it is reserved to fullfill Sales Order {2},"Die Seriennummer {0} von Artikel {1} kann nicht geliefert werden, da sie für die Erfüllung des Kundenauftrags {2} reserviert ist.",
|
||||
"Sales Order {0} has reservation for the item {1}, you can only deliver reserved {1} against {0}.","Kundenauftrag {0} hat eine Reservierung für den Artikel {1}, Sie können reservierte {1} nur gegen {0} liefern.",
|
||||
Cannot deliver Serial No {0} of item {1} as it is reserved to fullfill Sales Order {2},"Die Seriennummer {0} von Artikel {1} kann nicht geliefert werden, da sie für die Erfüllung des Auftrags {2} reserviert ist.",
|
||||
"Sales Order {0} has reservation for the item {1}, you can only deliver reserved {1} against {0}.","Auftrag {0} hat eine Reservierung für den Artikel {1}, Sie können reservierte {1} nur gegen {0} liefern.",
|
||||
{0} Serial No {1} cannot be delivered,{0} Seriennummer {1} kann nicht zugestellt werden,
|
||||
Row {0}: Subcontracted Item is mandatory for the raw material {1},Zeile {0}: Unterauftragsartikel sind für den Rohstoff {1} obligatorisch.,
|
||||
"As there are sufficient raw materials, Material Request is not required for Warehouse {0}.","Da genügend Rohstoffe vorhanden sind, ist für Warehouse {0} keine Materialanforderung erforderlich.",
|
||||
|
Can't render this file because it is too large.
|
Loading…
Reference in New Issue
Block a user