Merge remote-tracking branch 'origin/sa-vat-report' into sa-vat-report
This commit is contained in:
commit
4571fb6635
@ -147,11 +147,14 @@
|
|||||||
"Chart": true,
|
"Chart": true,
|
||||||
"Cypress": true,
|
"Cypress": true,
|
||||||
"cy": true,
|
"cy": true,
|
||||||
|
"describe": true,
|
||||||
|
"expect": true,
|
||||||
"it": true,
|
"it": true,
|
||||||
"context": true,
|
"context": true,
|
||||||
"before": true,
|
"before": true,
|
||||||
"beforeEach": true,
|
"beforeEach": true,
|
||||||
"onScan": true,
|
"onScan": true,
|
||||||
"extend_cscript": true
|
"extend_cscript": true,
|
||||||
|
"localforage": true,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
2
.github/helper/install.sh
vendored
2
.github/helper/install.sh
vendored
@ -42,6 +42,6 @@ sed -i 's/socketio:/# socketio:/g' Procfile
|
|||||||
sed -i 's/redis_socketio:/# redis_socketio:/g' Procfile
|
sed -i 's/redis_socketio:/# redis_socketio:/g' Procfile
|
||||||
|
|
||||||
bench get-app erpnext "${GITHUB_WORKSPACE}"
|
bench get-app erpnext "${GITHUB_WORKSPACE}"
|
||||||
bench start &
|
bench start &> bench_run_logs.txt &
|
||||||
bench --site test_site reinstall --yes
|
bench --site test_site reinstall --yes
|
||||||
bench build --app frappe
|
bench build --app frappe
|
||||||
|
@ -98,8 +98,6 @@ rules:
|
|||||||
languages: [python]
|
languages: [python]
|
||||||
severity: WARNING
|
severity: WARNING
|
||||||
paths:
|
paths:
|
||||||
exclude:
|
|
||||||
- test_*.py
|
|
||||||
include:
|
include:
|
||||||
- "*/**/doctype/*"
|
- "*/**/doctype/*"
|
||||||
|
|
||||||
|
15
.github/helper/semgrep_rules/security.yml
vendored
15
.github/helper/semgrep_rules/security.yml
vendored
@ -8,18 +8,3 @@ rules:
|
|||||||
dynamic content. Avoid it or use safe_eval().
|
dynamic content. Avoid it or use safe_eval().
|
||||||
languages: [python]
|
languages: [python]
|
||||||
severity: ERROR
|
severity: ERROR
|
||||||
|
|
||||||
- id: frappe-sqli-format-strings
|
|
||||||
patterns:
|
|
||||||
- pattern-inside: |
|
|
||||||
@frappe.whitelist()
|
|
||||||
def $FUNC(...):
|
|
||||||
...
|
|
||||||
- pattern-either:
|
|
||||||
- pattern: frappe.db.sql("..." % ...)
|
|
||||||
- pattern: frappe.db.sql(f"...", ...)
|
|
||||||
- pattern: frappe.db.sql("...".format(...), ...)
|
|
||||||
message: |
|
|
||||||
Detected use of raw string formatting for SQL queries. This can lead to sql injection vulnerabilities. Refer security guidelines - https://github.com/frappe/erpnext/wiki/Code-Security-Guidelines
|
|
||||||
languages: [python]
|
|
||||||
severity: WARNING
|
|
||||||
|
4
.github/stale.yml
vendored
4
.github/stale.yml
vendored
@ -1,11 +1,11 @@
|
|||||||
# Configuration for probot-stale - https://github.com/probot/stale
|
# Configuration for probot-stale - https://github.com/probot/stale
|
||||||
|
|
||||||
# Number of days of inactivity before an Issue or Pull Request becomes stale
|
# Number of days of inactivity before an Issue or Pull Request becomes stale
|
||||||
daysUntilStale: 30
|
daysUntilStale: 15
|
||||||
|
|
||||||
# Number of days of inactivity before a stale Issue or Pull Request is closed.
|
# Number of days of inactivity before a stale Issue or Pull Request is closed.
|
||||||
# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
|
# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
|
||||||
daysUntilClose: 7
|
daysUntilClose: 3
|
||||||
|
|
||||||
# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
|
# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
|
||||||
exemptLabels:
|
exemptLabels:
|
||||||
|
23
.github/workflows/backport.yml
vendored
23
.github/workflows/backport.yml
vendored
@ -1,16 +1,25 @@
|
|||||||
name: Backport
|
name: Backport
|
||||||
on:
|
on:
|
||||||
pull_request:
|
pull_request_target:
|
||||||
types:
|
types:
|
||||||
- closed
|
- closed
|
||||||
- labeled
|
- labeled
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
backport:
|
main:
|
||||||
runs-on: ubuntu-18.04
|
runs-on: ubuntu-latest
|
||||||
name: Backport
|
|
||||||
steps:
|
steps:
|
||||||
- name: Backport
|
- name: Checkout Actions
|
||||||
uses: tibdex/backport@v1
|
uses: actions/checkout@v2
|
||||||
with:
|
with:
|
||||||
github_token: ${{ secrets.GITHUB_TOKEN }}
|
repository: "ankush/backport"
|
||||||
|
path: ./actions
|
||||||
|
ref: develop
|
||||||
|
- name: Install Actions
|
||||||
|
run: npm install --production --prefix ./actions
|
||||||
|
- name: Run backport
|
||||||
|
uses: ./actions/backport
|
||||||
|
with:
|
||||||
|
token: ${{secrets.BACKPORT_BOT_TOKEN}}
|
||||||
|
labelsToAdd: "backport"
|
||||||
|
title: "{{originalTitle}}"
|
||||||
|
32
.github/workflows/semgrep.yml
vendored
32
.github/workflows/semgrep.yml
vendored
@ -1,34 +1,18 @@
|
|||||||
name: Semgrep
|
name: Semgrep
|
||||||
|
|
||||||
on:
|
on:
|
||||||
pull_request:
|
pull_request: { }
|
||||||
branches:
|
|
||||||
- develop
|
|
||||||
- version-13-hotfix
|
|
||||||
- version-13-pre-release
|
|
||||||
jobs:
|
jobs:
|
||||||
semgrep:
|
semgrep:
|
||||||
name: Frappe Linter
|
name: Frappe Linter
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
- name: Setup python3
|
- uses: returntocorp/semgrep-action@v1
|
||||||
uses: actions/setup-python@v2
|
env:
|
||||||
|
SEMGREP_TIMEOUT: 120
|
||||||
with:
|
with:
|
||||||
python-version: 3.8
|
config: >-
|
||||||
|
r/python.lang.correctness
|
||||||
- name: Setup semgrep
|
.github/helper/semgrep_rules
|
||||||
run: |
|
|
||||||
python -m pip install -q semgrep
|
|
||||||
git fetch origin $GITHUB_BASE_REF:$GITHUB_BASE_REF -q
|
|
||||||
|
|
||||||
- name: Semgrep errors
|
|
||||||
run: |
|
|
||||||
files=$(git diff --name-only --diff-filter=d $GITHUB_BASE_REF)
|
|
||||||
[[ -d .github/helper/semgrep_rules ]] && semgrep --severity ERROR --config=.github/helper/semgrep_rules --quiet --error $files
|
|
||||||
semgrep --config="r/python.lang.correctness" --quiet --error $files
|
|
||||||
|
|
||||||
- name: Semgrep warnings
|
|
||||||
run: |
|
|
||||||
files=$(git diff --name-only --diff-filter=d $GITHUB_BASE_REF)
|
|
||||||
[[ -d .github/helper/semgrep_rules ]] && semgrep --severity WARNING --severity INFO --config=.github/helper/semgrep_rules --quiet $files
|
|
||||||
|
108
.github/workflows/ui-tests.yml
vendored
Normal file
108
.github/workflows/ui-tests.yml
vendored
Normal file
@ -0,0 +1,108 @@
|
|||||||
|
name: UI
|
||||||
|
|
||||||
|
on:
|
||||||
|
pull_request:
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
test:
|
||||||
|
runs-on: ubuntu-18.04
|
||||||
|
|
||||||
|
strategy:
|
||||||
|
fail-fast: false
|
||||||
|
|
||||||
|
name: UI Tests (Cypress)
|
||||||
|
|
||||||
|
services:
|
||||||
|
mysql:
|
||||||
|
image: mariadb:10.3
|
||||||
|
env:
|
||||||
|
MYSQL_ALLOW_EMPTY_PASSWORD: YES
|
||||||
|
ports:
|
||||||
|
- 3306:3306
|
||||||
|
options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: Clone
|
||||||
|
uses: actions/checkout@v2
|
||||||
|
|
||||||
|
- name: Setup Python
|
||||||
|
uses: actions/setup-python@v2
|
||||||
|
with:
|
||||||
|
python-version: 3.7
|
||||||
|
|
||||||
|
- 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: Cache cypress binary
|
||||||
|
uses: actions/cache@v2
|
||||||
|
with:
|
||||||
|
path: ~/.cache
|
||||||
|
key: ${{ runner.os }}-cypress-
|
||||||
|
restore-keys: |
|
||||||
|
${{ runner.os }}-cypress-
|
||||||
|
${{ runner.os }}-
|
||||||
|
|
||||||
|
- name: Install
|
||||||
|
run: bash ${GITHUB_WORKSPACE}/.github/helper/install.sh
|
||||||
|
env:
|
||||||
|
DB: mariadb
|
||||||
|
TYPE: ui
|
||||||
|
|
||||||
|
- name: Site Setup
|
||||||
|
run: cd ~/frappe-bench/ && bench --site test_site execute erpnext.setup.utils.before_tests
|
||||||
|
|
||||||
|
- name: cypress pre-requisites
|
||||||
|
run: cd ~/frappe-bench/apps/frappe && yarn add cypress-file-upload@^5 --no-lockfile
|
||||||
|
|
||||||
|
|
||||||
|
- name: Build Assets
|
||||||
|
run: cd ~/frappe-bench/ && bench build
|
||||||
|
|
||||||
|
- name: UI Tests
|
||||||
|
run: cd ~/frappe-bench/ && bench --site test_site run-ui-tests erpnext --headless
|
||||||
|
env:
|
||||||
|
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
|
||||||
|
|
||||||
|
- name: Show bench console if tests failed
|
||||||
|
if: ${{ failure() }}
|
||||||
|
run: cat ~/frappe-bench/bench_run_logs.txt
|
1
.gitignore
vendored
1
.gitignore
vendored
@ -16,3 +16,4 @@ __pycache__
|
|||||||
.idea/
|
.idea/
|
||||||
.vscode/
|
.vscode/
|
||||||
node_modules/
|
node_modules/
|
||||||
|
.backportrc.json
|
41
CODEOWNERS
41
CODEOWNERS
@ -3,16 +3,33 @@
|
|||||||
# These owners will be the default owners for everything in
|
# These owners will be the default owners for everything in
|
||||||
# the repo. Unless a later match takes precedence,
|
# the repo. Unless a later match takes precedence,
|
||||||
|
|
||||||
manufacturing/ @rohitwaghchaure @marination
|
erpnext/accounts/ @nextchamp-saqib @deepeshgarg007
|
||||||
accounts/ @deepeshgarg007 @nextchamp-saqib
|
erpnext/assets/ @nextchamp-saqib @deepeshgarg007
|
||||||
loan_management/ @deepeshgarg007 @rohitwaghchaure
|
erpnext/erpnext_integrations/ @nextchamp-saqib
|
||||||
pos* @nextchamp-saqib @rohitwaghchaure
|
erpnext/loan_management/ @nextchamp-saqib @deepeshgarg007
|
||||||
assets/ @nextchamp-saqib @deepeshgarg007
|
erpnext/regional @nextchamp-saqib @deepeshgarg007
|
||||||
stock/ @marination @rohitwaghchaure
|
erpnext/selling @nextchamp-saqib @deepeshgarg007
|
||||||
buying/ @marination @deepeshgarg007
|
erpnext/support/ @nextchamp-saqib @deepeshgarg007
|
||||||
hr/ @Anurag810 @rohitwaghchaure
|
pos* @nextchamp-saqib
|
||||||
projects/ @hrwX @nextchamp-saqib
|
|
||||||
support/ @hrwX @marination
|
erpnext/buying/ @marination @rohitwaghchaure @ankush
|
||||||
healthcare/ @ruchamahabal @marination
|
erpnext/e_commerce/ @marination
|
||||||
erpnext_integrations/ @Mangesh-Khairnar @nextchamp-saqib
|
erpnext/maintenance/ @marination @rohitwaghchaure
|
||||||
|
erpnext/manufacturing/ @marination @rohitwaghchaure @ankush
|
||||||
|
erpnext/portal/ @marination
|
||||||
|
erpnext/quality_management/ @marination @rohitwaghchaure
|
||||||
|
erpnext/shopping_cart/ @marination
|
||||||
|
erpnext/stock/ @marination @rohitwaghchaure @ankush
|
||||||
|
|
||||||
|
erpnext/crm/ @ruchamahabal @pateljannat
|
||||||
|
erpnext/education/ @ruchamahabal @pateljannat
|
||||||
|
erpnext/healthcare/ @ruchamahabal @pateljannat @chillaranand
|
||||||
|
erpnext/hr/ @ruchamahabal @pateljannat
|
||||||
|
erpnext/non_profit/ @ruchamahabal
|
||||||
|
erpnext/payroll @ruchamahabal @pateljannat
|
||||||
|
erpnext/projects/ @ruchamahabal @pateljannat
|
||||||
|
|
||||||
|
erpnext/controllers @deepeshgarg007 @nextchamp-saqib @rohitwaghchaure @marination
|
||||||
|
|
||||||
|
.github/ @surajshetty3416 @ankush
|
||||||
requirements.txt @gavindsouza
|
requirements.txt @gavindsouza
|
||||||
|
11
cypress.json
Normal file
11
cypress.json
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
{
|
||||||
|
"baseUrl": "http://test_site:8000/",
|
||||||
|
"projectId": "da59y9",
|
||||||
|
"adminPassword": "admin",
|
||||||
|
"defaultCommandTimeout": 20000,
|
||||||
|
"pageLoadTimeout": 15000,
|
||||||
|
"retries": {
|
||||||
|
"runMode": 2,
|
||||||
|
"openMode": 2
|
||||||
|
}
|
||||||
|
}
|
5
cypress/fixtures/example.json
Normal file
5
cypress/fixtures/example.json
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
{
|
||||||
|
"name": "Using fixtures to represent data",
|
||||||
|
"email": "hello@cypress.io",
|
||||||
|
"body": "Fixtures are a great way to mock data for responses to routes"
|
||||||
|
}
|
13
cypress/integration/test_customer.js
Normal file
13
cypress/integration/test_customer.js
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
|
||||||
|
context('Customer', () => {
|
||||||
|
before(() => {
|
||||||
|
cy.login();
|
||||||
|
});
|
||||||
|
it('Check Customer Group', () => {
|
||||||
|
cy.visit(`app/customer/`);
|
||||||
|
cy.get('.primary-action').click();
|
||||||
|
cy.wait(500);
|
||||||
|
cy.get('.custom-actions > .btn').click();
|
||||||
|
cy.get_field('customer_group', 'Link').should('have.value', 'All Customer Groups');
|
||||||
|
});
|
||||||
|
});
|
44
cypress/integration/test_item.js
Normal file
44
cypress/integration/test_item.js
Normal file
@ -0,0 +1,44 @@
|
|||||||
|
describe("Test Item Dashboard", () => {
|
||||||
|
before(() => {
|
||||||
|
cy.login();
|
||||||
|
cy.visit("/app/item");
|
||||||
|
cy.insert_doc(
|
||||||
|
"Item",
|
||||||
|
{
|
||||||
|
item_code: "e2e_test_item",
|
||||||
|
item_group: "All Item Groups",
|
||||||
|
opening_stock: 42,
|
||||||
|
valuation_rate: 100,
|
||||||
|
},
|
||||||
|
true
|
||||||
|
);
|
||||||
|
cy.go_to_doc("item", "e2e_test_item");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("should show dashboard with correct data on first load", () => {
|
||||||
|
cy.get(".stock-levels").contains("Stock Levels").should("be.visible");
|
||||||
|
cy.get(".stock-levels").contains("e2e_test_item").should("exist");
|
||||||
|
|
||||||
|
// reserved and available qty
|
||||||
|
cy.get(".stock-levels .inline-graph-count")
|
||||||
|
.eq(0)
|
||||||
|
.contains("0")
|
||||||
|
.should("exist");
|
||||||
|
cy.get(".stock-levels .inline-graph-count")
|
||||||
|
.eq(1)
|
||||||
|
.contains("42")
|
||||||
|
.should("exist");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("should persist on field change", () => {
|
||||||
|
cy.get('input[data-fieldname="disabled"]').check();
|
||||||
|
cy.wait(500);
|
||||||
|
cy.get(".stock-levels").contains("Stock Levels").should("be.visible");
|
||||||
|
cy.get(".stock-levels").should("have.length", 1);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("should persist on reload", () => {
|
||||||
|
cy.reload();
|
||||||
|
cy.get(".stock-levels").contains("Stock Levels").should("be.visible");
|
||||||
|
});
|
||||||
|
});
|
17
cypress/plugins/index.js
Normal file
17
cypress/plugins/index.js
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
// ***********************************************************
|
||||||
|
// This example plugins/index.js can be used to load plugins
|
||||||
|
//
|
||||||
|
// You can change the location of this file or turn off loading
|
||||||
|
// the plugins file with the 'pluginsFile' configuration option.
|
||||||
|
//
|
||||||
|
// You can read more here:
|
||||||
|
// https://on.cypress.io/plugins-guide
|
||||||
|
// ***********************************************************
|
||||||
|
|
||||||
|
// This function is called when a project is opened or re-opened (e.g. due to
|
||||||
|
// the project's config changing)
|
||||||
|
|
||||||
|
module.exports = () => {
|
||||||
|
// `on` is used to hook into various events Cypress emits
|
||||||
|
// `config` is the resolved Cypress config
|
||||||
|
};
|
31
cypress/support/commands.js
Normal file
31
cypress/support/commands.js
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
// ***********************************************
|
||||||
|
// This example commands.js shows you how to
|
||||||
|
// create various custom commands and overwrite
|
||||||
|
// existing commands.
|
||||||
|
//
|
||||||
|
// For more comprehensive examples of custom
|
||||||
|
// commands please read more here:
|
||||||
|
// https://on.cypress.io/custom-commands
|
||||||
|
// ***********************************************
|
||||||
|
//
|
||||||
|
//
|
||||||
|
// -- This is a parent command --
|
||||||
|
// Cypress.Commands.add("login", (email, password) => { ... });
|
||||||
|
//
|
||||||
|
//
|
||||||
|
// -- This is a child command --
|
||||||
|
// Cypress.Commands.add("drag", { prevSubject: 'element'}, (subject, options) => { ... });
|
||||||
|
//
|
||||||
|
//
|
||||||
|
// -- This is a dual command --
|
||||||
|
// Cypress.Commands.add("dismiss", { prevSubject: 'optional'}, (subject, options) => { ... });
|
||||||
|
//
|
||||||
|
//
|
||||||
|
// -- This is will overwrite an existing command --
|
||||||
|
// Cypress.Commands.overwrite("visit", (originalFn, url, options) => { ... });
|
||||||
|
|
||||||
|
const slug = (name) => name.toLowerCase().replace(" ", "-");
|
||||||
|
|
||||||
|
Cypress.Commands.add("go_to_doc", (doctype, name) => {
|
||||||
|
cy.visit(`/app/${slug(doctype)}/${encodeURIComponent(name)}`);
|
||||||
|
});
|
26
cypress/support/index.js
Normal file
26
cypress/support/index.js
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
// ***********************************************************
|
||||||
|
// This example support/index.js is processed and
|
||||||
|
// loaded automatically before your test files.
|
||||||
|
//
|
||||||
|
// This is a great place to put global configuration and
|
||||||
|
// behavior that modifies Cypress.
|
||||||
|
//
|
||||||
|
// You can change the location of this file or turn off
|
||||||
|
// automatically serving support files with the
|
||||||
|
// 'supportFile' configuration option.
|
||||||
|
//
|
||||||
|
// You can read more here:
|
||||||
|
// https://on.cypress.io/configuration
|
||||||
|
// ***********************************************************
|
||||||
|
|
||||||
|
// Import commands.js using ES2015 syntax:
|
||||||
|
import './commands';
|
||||||
|
import '../../../frappe/cypress/support/commands' // eslint-disable-line
|
||||||
|
|
||||||
|
|
||||||
|
// Alternatively you can use CommonJS syntax:
|
||||||
|
// require('./commands')
|
||||||
|
|
||||||
|
Cypress.Cookies.defaults({
|
||||||
|
preserve: 'sid'
|
||||||
|
});
|
12
cypress/tsconfig.json
Normal file
12
cypress/tsconfig.json
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
{
|
||||||
|
"compilerOptions": {
|
||||||
|
"allowJs": true,
|
||||||
|
"baseUrl": "../node_modules",
|
||||||
|
"types": [
|
||||||
|
"cypress"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"include": [
|
||||||
|
"**/*.*"
|
||||||
|
]
|
||||||
|
}
|
@ -5,7 +5,7 @@ import frappe
|
|||||||
from erpnext.hooks import regional_overrides
|
from erpnext.hooks import regional_overrides
|
||||||
from frappe.utils import getdate
|
from frappe.utils import getdate
|
||||||
|
|
||||||
__version__ = '13.6.0'
|
__version__ = '13.7.1'
|
||||||
|
|
||||||
def get_default_company(user=None):
|
def get_default_company(user=None):
|
||||||
'''Get default company for user'''
|
'''Get default company for user'''
|
||||||
|
@ -301,9 +301,13 @@ def process_deferred_accounting(posting_date=None):
|
|||||||
start_date = add_months(today(), -1)
|
start_date = add_months(today(), -1)
|
||||||
end_date = add_days(today(), -1)
|
end_date = add_days(today(), -1)
|
||||||
|
|
||||||
|
companies = frappe.get_all('Company')
|
||||||
|
|
||||||
|
for company in companies:
|
||||||
for record_type in ('Income', 'Expense'):
|
for record_type in ('Income', 'Expense'):
|
||||||
doc = frappe.get_doc(dict(
|
doc = frappe.get_doc(dict(
|
||||||
doctype='Process Deferred Accounting',
|
doctype='Process Deferred Accounting',
|
||||||
|
company=company.name,
|
||||||
posting_date=posting_date,
|
posting_date=posting_date,
|
||||||
start_date=start_date,
|
start_date=start_date,
|
||||||
end_date=end_date,
|
end_date=end_date,
|
||||||
|
@ -51,7 +51,7 @@ class BankStatementImport(DataImport):
|
|||||||
self.import_file, self.google_sheets_url
|
self.import_file, self.google_sheets_url
|
||||||
)
|
)
|
||||||
|
|
||||||
if 'Bank Account' not in json.dumps(preview):
|
if 'Bank Account' not in json.dumps(preview['columns']):
|
||||||
frappe.throw(_("Please add the Bank Account column"))
|
frappe.throw(_("Please add the Bank Account column"))
|
||||||
|
|
||||||
from frappe.core.page.background_jobs.background_jobs import get_info
|
from frappe.core.page.background_jobs.background_jobs import get_info
|
||||||
|
@ -13,7 +13,8 @@ from erpnext.accounts.doctype.account.chart_of_accounts.chart_of_accounts import
|
|||||||
from frappe.utils.xlsxutils import read_xlsx_file_from_attached_file, read_xls_file_from_attached_file
|
from frappe.utils.xlsxutils import read_xlsx_file_from_attached_file, read_xls_file_from_attached_file
|
||||||
|
|
||||||
class ChartofAccountsImporter(Document):
|
class ChartofAccountsImporter(Document):
|
||||||
pass
|
def validate(self):
|
||||||
|
validate_accounts(self.import_file)
|
||||||
|
|
||||||
@frappe.whitelist()
|
@frappe.whitelist()
|
||||||
def validate_company(company):
|
def validate_company(company):
|
||||||
@ -301,28 +302,27 @@ def validate_accounts(file_name):
|
|||||||
if account["parent_account"] and accounts_dict.get(account["parent_account"]):
|
if account["parent_account"] and accounts_dict.get(account["parent_account"]):
|
||||||
accounts_dict[account["parent_account"]]["is_group"] = 1
|
accounts_dict[account["parent_account"]]["is_group"] = 1
|
||||||
|
|
||||||
message = validate_root(accounts_dict)
|
validate_root(accounts_dict)
|
||||||
if message: return message
|
|
||||||
message = validate_account_types(accounts_dict)
|
validate_account_types(accounts_dict)
|
||||||
if message: return message
|
|
||||||
|
|
||||||
return [True, len(accounts)]
|
return [True, len(accounts)]
|
||||||
|
|
||||||
def validate_root(accounts):
|
def validate_root(accounts):
|
||||||
roots = [accounts[d] for d in accounts if not accounts[d].get('parent_account')]
|
roots = [accounts[d] for d in accounts if not accounts[d].get('parent_account')]
|
||||||
if len(roots) < 4:
|
if len(roots) < 4:
|
||||||
return _("Number of root accounts cannot be less than 4")
|
frappe.throw(_("Number of root accounts cannot be less than 4"))
|
||||||
|
|
||||||
error_messages = []
|
error_messages = []
|
||||||
|
|
||||||
for account in roots:
|
for account in roots:
|
||||||
if not account.get("root_type") and account.get("account_name"):
|
if not account.get("root_type") and account.get("account_name"):
|
||||||
error_messages.append("Please enter Root Type for account- {0}".format(account.get("account_name")))
|
error_messages.append(_("Please enter Root Type for account- {0}").format(account.get("account_name")))
|
||||||
elif account.get("root_type") not in get_root_types() and account.get("account_name"):
|
elif account.get("root_type") not in get_root_types() and account.get("account_name"):
|
||||||
error_messages.append("Root Type for {0} must be one of the Asset, Liability, Income, Expense and Equity".format(account.get("account_name")))
|
error_messages.append(_("Root Type for {0} must be one of the Asset, Liability, Income, Expense and Equity").format(account.get("account_name")))
|
||||||
|
|
||||||
if error_messages:
|
if error_messages:
|
||||||
return "<br>".join(error_messages)
|
frappe.throw("<br>".join(error_messages))
|
||||||
|
|
||||||
def get_root_types():
|
def get_root_types():
|
||||||
return ('Asset', 'Liability', 'Expense', 'Income', 'Equity')
|
return ('Asset', 'Liability', 'Expense', 'Income', 'Equity')
|
||||||
@ -356,7 +356,7 @@ def validate_account_types(accounts):
|
|||||||
|
|
||||||
missing = list(set(account_types_for_ledger) - set(account_types))
|
missing = list(set(account_types_for_ledger) - set(account_types))
|
||||||
if missing:
|
if missing:
|
||||||
return _("Please identify/create Account (Ledger) for type - {0}").format(' , '.join(missing))
|
frappe.throw(_("Please identify/create Account (Ledger) for type - {0}").format(' , '.join(missing)))
|
||||||
|
|
||||||
account_types_for_group = ["Bank", "Cash", "Stock"]
|
account_types_for_group = ["Bank", "Cash", "Stock"]
|
||||||
# fix logic bug
|
# fix logic bug
|
||||||
@ -364,7 +364,7 @@ def validate_account_types(accounts):
|
|||||||
|
|
||||||
missing = list(set(account_types_for_group) - set(account_groups))
|
missing = list(set(account_types_for_group) - set(account_groups))
|
||||||
if missing:
|
if missing:
|
||||||
return _("Please identify/create Account (Group) for type - {0}").format(' , '.join(missing))
|
frappe.throw(_("Please identify/create Account (Group) for type - {0}").format(' , '.join(missing)))
|
||||||
|
|
||||||
def unset_existing_data(company):
|
def unset_existing_data(company):
|
||||||
linked = frappe.db.sql('''select fieldname from tabDocField
|
linked = frappe.db.sql('''select fieldname from tabDocField
|
||||||
|
@ -25,7 +25,7 @@ class Dunning(AccountsController):
|
|||||||
|
|
||||||
def validate_amount(self):
|
def validate_amount(self):
|
||||||
amounts = calculate_interest_and_amount(
|
amounts = calculate_interest_and_amount(
|
||||||
self.posting_date, self.outstanding_amount, self.rate_of_interest, self.dunning_fee, self.overdue_days)
|
self.outstanding_amount, self.rate_of_interest, self.dunning_fee, self.overdue_days)
|
||||||
if self.interest_amount != amounts.get('interest_amount'):
|
if self.interest_amount != amounts.get('interest_amount'):
|
||||||
self.interest_amount = flt(amounts.get('interest_amount'), self.precision('interest_amount'))
|
self.interest_amount = flt(amounts.get('interest_amount'), self.precision('interest_amount'))
|
||||||
if self.dunning_amount != amounts.get('dunning_amount'):
|
if self.dunning_amount != amounts.get('dunning_amount'):
|
||||||
@ -91,13 +91,13 @@ def resolve_dunning(doc, state):
|
|||||||
for dunning in dunnings:
|
for dunning in dunnings:
|
||||||
frappe.db.set_value("Dunning", dunning.name, "status", 'Resolved')
|
frappe.db.set_value("Dunning", dunning.name, "status", 'Resolved')
|
||||||
|
|
||||||
def calculate_interest_and_amount(posting_date, outstanding_amount, rate_of_interest, dunning_fee, overdue_days):
|
def calculate_interest_and_amount(outstanding_amount, rate_of_interest, dunning_fee, overdue_days):
|
||||||
interest_amount = 0
|
interest_amount = 0
|
||||||
grand_total = 0
|
grand_total = flt(outstanding_amount) + flt(dunning_fee)
|
||||||
if rate_of_interest:
|
if rate_of_interest:
|
||||||
interest_per_year = flt(outstanding_amount) * flt(rate_of_interest) / 100
|
interest_per_year = flt(outstanding_amount) * flt(rate_of_interest) / 100
|
||||||
interest_amount = (interest_per_year * cint(overdue_days)) / 365
|
interest_amount = (interest_per_year * cint(overdue_days)) / 365
|
||||||
grand_total = flt(outstanding_amount) + flt(interest_amount) + flt(dunning_fee)
|
grand_total += flt(interest_amount)
|
||||||
dunning_amount = flt(interest_amount) + flt(dunning_fee)
|
dunning_amount = flt(interest_amount) + flt(dunning_fee)
|
||||||
return {
|
return {
|
||||||
'interest_amount': interest_amount,
|
'interest_amount': interest_amount,
|
||||||
|
@ -16,6 +16,7 @@ class TestDunning(unittest.TestCase):
|
|||||||
@classmethod
|
@classmethod
|
||||||
def setUpClass(self):
|
def setUpClass(self):
|
||||||
create_dunning_type()
|
create_dunning_type()
|
||||||
|
create_dunning_type_with_zero_interest_rate()
|
||||||
unlink_payment_on_cancel_of_invoice()
|
unlink_payment_on_cancel_of_invoice()
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
@ -25,11 +26,19 @@ class TestDunning(unittest.TestCase):
|
|||||||
def test_dunning(self):
|
def test_dunning(self):
|
||||||
dunning = create_dunning()
|
dunning = create_dunning()
|
||||||
amounts = calculate_interest_and_amount(
|
amounts = calculate_interest_and_amount(
|
||||||
dunning.posting_date, dunning.outstanding_amount, dunning.rate_of_interest, dunning.dunning_fee, dunning.overdue_days)
|
dunning.outstanding_amount, dunning.rate_of_interest, dunning.dunning_fee, dunning.overdue_days)
|
||||||
self.assertEqual(round(amounts.get('interest_amount'), 2), 0.44)
|
self.assertEqual(round(amounts.get('interest_amount'), 2), 0.44)
|
||||||
self.assertEqual(round(amounts.get('dunning_amount'), 2), 20.44)
|
self.assertEqual(round(amounts.get('dunning_amount'), 2), 20.44)
|
||||||
self.assertEqual(round(amounts.get('grand_total'), 2), 120.44)
|
self.assertEqual(round(amounts.get('grand_total'), 2), 120.44)
|
||||||
|
|
||||||
|
def test_dunning_with_zero_interest_rate(self):
|
||||||
|
dunning = create_dunning_with_zero_interest_rate()
|
||||||
|
amounts = calculate_interest_and_amount(
|
||||||
|
dunning.outstanding_amount, dunning.rate_of_interest, dunning.dunning_fee, dunning.overdue_days)
|
||||||
|
self.assertEqual(round(amounts.get('interest_amount'), 2), 0)
|
||||||
|
self.assertEqual(round(amounts.get('dunning_amount'), 2), 20)
|
||||||
|
self.assertEqual(round(amounts.get('grand_total'), 2), 120)
|
||||||
|
|
||||||
def test_gl_entries(self):
|
def test_gl_entries(self):
|
||||||
dunning = create_dunning()
|
dunning = create_dunning()
|
||||||
dunning.submit()
|
dunning.submit()
|
||||||
@ -83,6 +92,27 @@ def create_dunning():
|
|||||||
dunning.save()
|
dunning.save()
|
||||||
return dunning
|
return dunning
|
||||||
|
|
||||||
|
def create_dunning_with_zero_interest_rate():
|
||||||
|
posting_date = add_days(today(), -20)
|
||||||
|
due_date = add_days(today(), -15)
|
||||||
|
sales_invoice = create_sales_invoice_against_cost_center(
|
||||||
|
posting_date=posting_date, due_date=due_date, status='Overdue')
|
||||||
|
dunning_type = frappe.get_doc("Dunning Type", 'First Notice with 0% Rate of Interest')
|
||||||
|
dunning = frappe.new_doc("Dunning")
|
||||||
|
dunning.sales_invoice = sales_invoice.name
|
||||||
|
dunning.customer_name = sales_invoice.customer_name
|
||||||
|
dunning.outstanding_amount = sales_invoice.outstanding_amount
|
||||||
|
dunning.debit_to = sales_invoice.debit_to
|
||||||
|
dunning.currency = sales_invoice.currency
|
||||||
|
dunning.company = sales_invoice.company
|
||||||
|
dunning.posting_date = nowdate()
|
||||||
|
dunning.due_date = sales_invoice.due_date
|
||||||
|
dunning.dunning_type = 'First Notice with 0% Rate of Interest'
|
||||||
|
dunning.rate_of_interest = dunning_type.rate_of_interest
|
||||||
|
dunning.dunning_fee = dunning_type.dunning_fee
|
||||||
|
dunning.save()
|
||||||
|
return dunning
|
||||||
|
|
||||||
def create_dunning_type():
|
def create_dunning_type():
|
||||||
dunning_type = frappe.new_doc("Dunning Type")
|
dunning_type = frappe.new_doc("Dunning Type")
|
||||||
dunning_type.dunning_type = 'First Notice'
|
dunning_type.dunning_type = 'First Notice'
|
||||||
@ -98,3 +128,19 @@ def create_dunning_type():
|
|||||||
}
|
}
|
||||||
)
|
)
|
||||||
dunning_type.save()
|
dunning_type.save()
|
||||||
|
|
||||||
|
def create_dunning_type_with_zero_interest_rate():
|
||||||
|
dunning_type = frappe.new_doc("Dunning Type")
|
||||||
|
dunning_type.dunning_type = 'First Notice with 0% Rate of Interest'
|
||||||
|
dunning_type.start_day = 10
|
||||||
|
dunning_type.end_day = 20
|
||||||
|
dunning_type.dunning_fee = 20
|
||||||
|
dunning_type.rate_of_interest = 0
|
||||||
|
dunning_type.append(
|
||||||
|
"dunning_letter_text", {
|
||||||
|
'language': 'en',
|
||||||
|
'body_text': 'We have still not received payment for our invoice ',
|
||||||
|
'closing_text': 'We kindly request that you pay the outstanding amount immediately, and late fees.'
|
||||||
|
}
|
||||||
|
)
|
||||||
|
dunning_type.save()
|
||||||
|
@ -667,6 +667,7 @@
|
|||||||
{
|
{
|
||||||
"fieldname": "base_paid_amount_after_tax",
|
"fieldname": "base_paid_amount_after_tax",
|
||||||
"fieldtype": "Currency",
|
"fieldtype": "Currency",
|
||||||
|
"hidden": 1,
|
||||||
"label": "Paid Amount After Tax (Company Currency)",
|
"label": "Paid Amount After Tax (Company Currency)",
|
||||||
"options": "Company:company:default_currency",
|
"options": "Company:company:default_currency",
|
||||||
"read_only": 1
|
"read_only": 1
|
||||||
@ -693,21 +694,25 @@
|
|||||||
"depends_on": "eval:doc.received_amount && doc.payment_type != 'Internal Transfer'",
|
"depends_on": "eval:doc.received_amount && doc.payment_type != 'Internal Transfer'",
|
||||||
"fieldname": "received_amount_after_tax",
|
"fieldname": "received_amount_after_tax",
|
||||||
"fieldtype": "Currency",
|
"fieldtype": "Currency",
|
||||||
|
"hidden": 1,
|
||||||
"label": "Received Amount After Tax",
|
"label": "Received Amount After Tax",
|
||||||
"options": "paid_to_account_currency"
|
"options": "paid_to_account_currency",
|
||||||
|
"read_only": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"depends_on": "doc.received_amount",
|
"depends_on": "doc.received_amount",
|
||||||
"fieldname": "base_received_amount_after_tax",
|
"fieldname": "base_received_amount_after_tax",
|
||||||
"fieldtype": "Currency",
|
"fieldtype": "Currency",
|
||||||
|
"hidden": 1,
|
||||||
"label": "Received Amount After Tax (Company Currency)",
|
"label": "Received Amount After Tax (Company Currency)",
|
||||||
"options": "Company:company:default_currency"
|
"options": "Company:company:default_currency",
|
||||||
|
"read_only": 1
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"index_web_pages_for_search": 1,
|
"index_web_pages_for_search": 1,
|
||||||
"is_submittable": 1,
|
"is_submittable": 1,
|
||||||
"links": [],
|
"links": [],
|
||||||
"modified": "2021-06-22 20:37:06.154206",
|
"modified": "2021-07-09 08:58:15.008761",
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "Accounts",
|
"module": "Accounts",
|
||||||
"name": "Payment Entry",
|
"name": "Payment Entry",
|
||||||
|
@ -183,6 +183,13 @@ class PaymentEntry(AccountsController):
|
|||||||
d.reference_name, self.party_account_currency)
|
d.reference_name, self.party_account_currency)
|
||||||
|
|
||||||
for field, value in iteritems(ref_details):
|
for field, value in iteritems(ref_details):
|
||||||
|
if d.exchange_gain_loss:
|
||||||
|
# for cases where gain/loss is booked into invoice
|
||||||
|
# exchange_gain_loss is calculated from invoice & populated
|
||||||
|
# and row.exchange_rate is already set to payment entry's exchange rate
|
||||||
|
# refer -> `update_reference_in_payment_entry()` in utils.py
|
||||||
|
continue
|
||||||
|
|
||||||
if field == 'exchange_rate' or not d.get(field) or force:
|
if field == 'exchange_rate' or not d.get(field) or force:
|
||||||
d.db_set(field, value)
|
d.db_set(field, value)
|
||||||
|
|
||||||
@ -404,9 +411,15 @@ class PaymentEntry(AccountsController):
|
|||||||
if not self.advance_tax_account:
|
if not self.advance_tax_account:
|
||||||
frappe.throw(_("Advance TDS account is mandatory for advance TDS deduction"))
|
frappe.throw(_("Advance TDS account is mandatory for advance TDS deduction"))
|
||||||
|
|
||||||
reference_doclist = []
|
|
||||||
net_total = self.paid_amount
|
net_total = self.paid_amount
|
||||||
included_in_paid_amount = 0
|
|
||||||
|
for reference in self.get("references"):
|
||||||
|
net_total_for_tds = 0
|
||||||
|
if reference.reference_doctype == 'Purchase Order':
|
||||||
|
net_total_for_tds += flt(frappe.db.get_value('Purchase Order', reference.reference_name, 'net_total'))
|
||||||
|
|
||||||
|
if net_total_for_tds:
|
||||||
|
net_total = net_total_for_tds
|
||||||
|
|
||||||
# Adding args as purchase invoice to get TDS amount
|
# Adding args as purchase invoice to get TDS amount
|
||||||
args = frappe._dict({
|
args = frappe._dict({
|
||||||
@ -423,7 +436,7 @@ class PaymentEntry(AccountsController):
|
|||||||
return
|
return
|
||||||
|
|
||||||
tax_withholding_details.update({
|
tax_withholding_details.update({
|
||||||
'included_in_paid_amount': included_in_paid_amount,
|
'add_deduct_tax': 'Add',
|
||||||
'cost_center': self.cost_center or erpnext.get_default_cost_center(self.company)
|
'cost_center': self.cost_center or erpnext.get_default_cost_center(self.company)
|
||||||
})
|
})
|
||||||
|
|
||||||
@ -512,16 +525,19 @@ class PaymentEntry(AccountsController):
|
|||||||
self.unallocated_amount = 0
|
self.unallocated_amount = 0
|
||||||
if self.party:
|
if self.party:
|
||||||
total_deductions = sum(flt(d.amount) for d in self.get("deductions"))
|
total_deductions = sum(flt(d.amount) for d in self.get("deductions"))
|
||||||
|
included_taxes = self.get_included_taxes()
|
||||||
if self.payment_type == "Receive" \
|
if self.payment_type == "Receive" \
|
||||||
and self.base_total_allocated_amount < self.base_received_amount_after_tax + total_deductions \
|
and self.base_total_allocated_amount < self.base_received_amount + total_deductions \
|
||||||
and self.total_allocated_amount < self.paid_amount_after_tax + (total_deductions / self.source_exchange_rate):
|
and self.total_allocated_amount < self.paid_amount + (total_deductions / self.source_exchange_rate):
|
||||||
self.unallocated_amount = (self.received_amount_after_tax + total_deductions -
|
self.unallocated_amount = (self.received_amount + total_deductions -
|
||||||
self.base_total_allocated_amount) / self.source_exchange_rate
|
self.base_total_allocated_amount) / self.source_exchange_rate
|
||||||
|
self.unallocated_amount -= included_taxes
|
||||||
elif self.payment_type == "Pay" \
|
elif self.payment_type == "Pay" \
|
||||||
and self.base_total_allocated_amount < (self.base_paid_amount_after_tax - total_deductions) \
|
and self.base_total_allocated_amount < (self.base_paid_amount - total_deductions) \
|
||||||
and self.total_allocated_amount < self.received_amount_after_tax + (total_deductions / self.target_exchange_rate):
|
and self.total_allocated_amount < self.received_amount + (total_deductions / self.target_exchange_rate):
|
||||||
self.unallocated_amount = (self.base_paid_amount_after_tax - (total_deductions +
|
self.unallocated_amount = (self.base_paid_amount - (total_deductions +
|
||||||
self.base_total_allocated_amount)) / self.target_exchange_rate
|
self.base_total_allocated_amount)) / self.target_exchange_rate
|
||||||
|
self.unallocated_amount -= included_taxes
|
||||||
|
|
||||||
def set_difference_amount(self):
|
def set_difference_amount(self):
|
||||||
base_unallocated_amount = flt(self.unallocated_amount) * (flt(self.source_exchange_rate)
|
base_unallocated_amount = flt(self.unallocated_amount) * (flt(self.source_exchange_rate)
|
||||||
@ -530,17 +546,29 @@ class PaymentEntry(AccountsController):
|
|||||||
base_party_amount = flt(self.base_total_allocated_amount) + flt(base_unallocated_amount)
|
base_party_amount = flt(self.base_total_allocated_amount) + flt(base_unallocated_amount)
|
||||||
|
|
||||||
if self.payment_type == "Receive":
|
if self.payment_type == "Receive":
|
||||||
self.difference_amount = base_party_amount - self.base_received_amount_after_tax
|
self.difference_amount = base_party_amount - self.base_received_amount
|
||||||
elif self.payment_type == "Pay":
|
elif self.payment_type == "Pay":
|
||||||
self.difference_amount = self.base_paid_amount_after_tax - base_party_amount
|
self.difference_amount = self.base_paid_amount - base_party_amount
|
||||||
else:
|
else:
|
||||||
self.difference_amount = self.base_paid_amount_after_tax - flt(self.base_received_amount_after_tax)
|
self.difference_amount = self.base_paid_amount - flt(self.base_received_amount)
|
||||||
|
|
||||||
total_deductions = sum(flt(d.amount) for d in self.get("deductions"))
|
total_deductions = sum(flt(d.amount) for d in self.get("deductions"))
|
||||||
|
included_taxes = self.get_included_taxes()
|
||||||
|
|
||||||
self.difference_amount = flt(self.difference_amount - total_deductions,
|
self.difference_amount = flt(self.difference_amount - total_deductions - included_taxes,
|
||||||
self.precision("difference_amount"))
|
self.precision("difference_amount"))
|
||||||
|
|
||||||
|
def get_included_taxes(self):
|
||||||
|
included_taxes = 0
|
||||||
|
for tax in self.get('taxes'):
|
||||||
|
if tax.included_in_paid_amount:
|
||||||
|
if tax.add_deduct_tax == 'Add':
|
||||||
|
included_taxes += tax.base_tax_amount
|
||||||
|
else:
|
||||||
|
included_taxes -= tax.base_tax_amount
|
||||||
|
|
||||||
|
return included_taxes
|
||||||
|
|
||||||
# Paid amount is auto allocated in the reference document by default.
|
# Paid amount is auto allocated in the reference document by default.
|
||||||
# Clear the reference document which doesn't have allocated amount on validate so that form can be loaded fast
|
# Clear the reference document which doesn't have allocated amount on validate so that form can be loaded fast
|
||||||
def clear_unallocated_reference_document_rows(self):
|
def clear_unallocated_reference_document_rows(self):
|
||||||
@ -664,8 +692,8 @@ class PaymentEntry(AccountsController):
|
|||||||
gl_entries.append(gle)
|
gl_entries.append(gle)
|
||||||
|
|
||||||
if self.unallocated_amount:
|
if self.unallocated_amount:
|
||||||
base_unallocated_amount = self.unallocated_amount * \
|
exchange_rate = self.get_exchange_rate()
|
||||||
(self.source_exchange_rate if self.payment_type=="Receive" else self.target_exchange_rate)
|
base_unallocated_amount = (self.unallocated_amount * exchange_rate)
|
||||||
|
|
||||||
gle = party_gl_dict.copy()
|
gle = party_gl_dict.copy()
|
||||||
|
|
||||||
@ -683,8 +711,8 @@ class PaymentEntry(AccountsController):
|
|||||||
"account": self.paid_from,
|
"account": self.paid_from,
|
||||||
"account_currency": self.paid_from_account_currency,
|
"account_currency": self.paid_from_account_currency,
|
||||||
"against": self.party if self.payment_type=="Pay" else self.paid_to,
|
"against": self.party if self.payment_type=="Pay" else self.paid_to,
|
||||||
"credit_in_account_currency": self.paid_amount_after_tax,
|
"credit_in_account_currency": self.paid_amount,
|
||||||
"credit": self.base_paid_amount_after_tax,
|
"credit": self.base_paid_amount,
|
||||||
"cost_center": self.cost_center
|
"cost_center": self.cost_center
|
||||||
}, item=self)
|
}, item=self)
|
||||||
)
|
)
|
||||||
@ -694,8 +722,8 @@ class PaymentEntry(AccountsController):
|
|||||||
"account": self.paid_to,
|
"account": self.paid_to,
|
||||||
"account_currency": self.paid_to_account_currency,
|
"account_currency": self.paid_to_account_currency,
|
||||||
"against": self.party if self.payment_type=="Receive" else self.paid_from,
|
"against": self.party if self.payment_type=="Receive" else self.paid_from,
|
||||||
"debit_in_account_currency": self.received_amount_after_tax,
|
"debit_in_account_currency": self.received_amount,
|
||||||
"debit": self.base_received_amount_after_tax,
|
"debit": self.base_received_amount,
|
||||||
"cost_center": self.cost_center
|
"cost_center": self.cost_center
|
||||||
}, item=self)
|
}, item=self)
|
||||||
)
|
)
|
||||||
@ -708,34 +736,41 @@ class PaymentEntry(AccountsController):
|
|||||||
|
|
||||||
if self.payment_type in ('Pay', 'Internal Transfer'):
|
if self.payment_type in ('Pay', 'Internal Transfer'):
|
||||||
dr_or_cr = "debit" if d.add_deduct_tax == "Add" else "credit"
|
dr_or_cr = "debit" if d.add_deduct_tax == "Add" else "credit"
|
||||||
|
against = self.party or self.paid_from
|
||||||
elif self.payment_type == 'Receive':
|
elif self.payment_type == 'Receive':
|
||||||
dr_or_cr = "credit" if d.add_deduct_tax == "Add" else "debit"
|
dr_or_cr = "credit" if d.add_deduct_tax == "Add" else "debit"
|
||||||
|
against = self.party or self.paid_to
|
||||||
|
|
||||||
payment_or_advance_account = self.get_party_account_for_taxes()
|
payment_or_advance_account = self.get_party_account_for_taxes()
|
||||||
|
tax_amount = d.tax_amount
|
||||||
|
base_tax_amount = d.base_tax_amount
|
||||||
|
|
||||||
|
if self.advance_tax_account:
|
||||||
|
tax_amount = -1 * tax_amount
|
||||||
|
base_tax_amount = -1 * base_tax_amount
|
||||||
|
|
||||||
gl_entries.append(
|
gl_entries.append(
|
||||||
self.get_gl_dict({
|
self.get_gl_dict({
|
||||||
"account": d.account_head,
|
"account": d.account_head,
|
||||||
"against": self.party if self.payment_type=="Receive" else self.paid_from,
|
"against": against,
|
||||||
dr_or_cr: d.base_tax_amount,
|
dr_or_cr: tax_amount,
|
||||||
dr_or_cr + "_in_account_currency": d.base_tax_amount
|
dr_or_cr + "_in_account_currency": base_tax_amount
|
||||||
if account_currency==self.company_currency
|
if account_currency==self.company_currency
|
||||||
else d.tax_amount,
|
else d.tax_amount,
|
||||||
"cost_center": d.cost_center
|
"cost_center": d.cost_center
|
||||||
}, account_currency, item=d))
|
}, account_currency, item=d))
|
||||||
|
|
||||||
#Intentionally use -1 to get net values in party account
|
#Intentionally use -1 to get net values in party account
|
||||||
|
if not d.included_in_paid_amount or self.advance_tax_account:
|
||||||
gl_entries.append(
|
gl_entries.append(
|
||||||
self.get_gl_dict({
|
self.get_gl_dict({
|
||||||
"account": payment_or_advance_account,
|
"account": payment_or_advance_account,
|
||||||
"against": self.party if self.payment_type=="Receive" else self.paid_from,
|
"against": against,
|
||||||
dr_or_cr: -1 * d.base_tax_amount,
|
dr_or_cr: -1 * tax_amount,
|
||||||
dr_or_cr + "_in_account_currency": -1*d.base_tax_amount
|
dr_or_cr + "_in_account_currency": -1 * base_tax_amount
|
||||||
if account_currency==self.company_currency
|
if account_currency==self.company_currency
|
||||||
else d.tax_amount,
|
else d.tax_amount,
|
||||||
"cost_center": self.cost_center,
|
"cost_center": self.cost_center,
|
||||||
"party_type": self.party_type,
|
|
||||||
"party": self.party
|
|
||||||
}, account_currency, item=d))
|
}, account_currency, item=d))
|
||||||
|
|
||||||
def add_deductions_gl_entries(self, gl_entries):
|
def add_deductions_gl_entries(self, gl_entries):
|
||||||
@ -760,9 +795,9 @@ class PaymentEntry(AccountsController):
|
|||||||
if self.advance_tax_account:
|
if self.advance_tax_account:
|
||||||
return self.advance_tax_account
|
return self.advance_tax_account
|
||||||
elif self.payment_type == 'Receive':
|
elif self.payment_type == 'Receive':
|
||||||
return self.paid_from
|
|
||||||
elif self.payment_type in ('Pay', 'Internal Transfer'):
|
|
||||||
return self.paid_to
|
return self.paid_to
|
||||||
|
elif self.payment_type in ('Pay', 'Internal Transfer'):
|
||||||
|
return self.paid_from
|
||||||
|
|
||||||
def update_advance_paid(self):
|
def update_advance_paid(self):
|
||||||
if self.payment_type in ("Receive", "Pay") and self.party:
|
if self.payment_type in ("Receive", "Pay") and self.party:
|
||||||
@ -807,9 +842,16 @@ class PaymentEntry(AccountsController):
|
|||||||
if account_details:
|
if account_details:
|
||||||
row.update(account_details)
|
row.update(account_details)
|
||||||
|
|
||||||
|
if not row.get('amount'):
|
||||||
|
# if no difference amount
|
||||||
|
return
|
||||||
|
|
||||||
self.append('deductions', row)
|
self.append('deductions', row)
|
||||||
self.set_unallocated_amount()
|
self.set_unallocated_amount()
|
||||||
|
|
||||||
|
def get_exchange_rate(self):
|
||||||
|
return self.source_exchange_rate if self.payment_type=="Receive" else self.target_exchange_rate
|
||||||
|
|
||||||
def initialize_taxes(self):
|
def initialize_taxes(self):
|
||||||
for tax in self.get("taxes"):
|
for tax in self.get("taxes"):
|
||||||
validate_taxes_and_charges(tax)
|
validate_taxes_and_charges(tax)
|
||||||
@ -1318,9 +1360,9 @@ def get_reference_details(reference_doctype, reference_name, party_account_curre
|
|||||||
|
|
||||||
return frappe._dict({
|
return frappe._dict({
|
||||||
"due_date": ref_doc.get("due_date"),
|
"due_date": ref_doc.get("due_date"),
|
||||||
"total_amount": total_amount,
|
"total_amount": flt(total_amount),
|
||||||
"outstanding_amount": outstanding_amount,
|
"outstanding_amount": flt(outstanding_amount),
|
||||||
"exchange_rate": exchange_rate,
|
"exchange_rate": flt(exchange_rate),
|
||||||
"bill_no": bill_no
|
"bill_no": bill_no
|
||||||
})
|
})
|
||||||
|
|
||||||
@ -1634,12 +1676,6 @@ def set_paid_amount_and_received_amount(dt, party_account_currency, bank, outsta
|
|||||||
if dt == "Employee Advance":
|
if dt == "Employee Advance":
|
||||||
paid_amount = received_amount * doc.get('exchange_rate', 1)
|
paid_amount = received_amount * doc.get('exchange_rate', 1)
|
||||||
|
|
||||||
if dt == "Purchase Order" and doc.apply_tds:
|
|
||||||
if party_account_currency == bank.account_currency:
|
|
||||||
paid_amount = received_amount = doc.base_net_total
|
|
||||||
else:
|
|
||||||
paid_amount = received_amount = doc.base_net_total * doc.get('exchange_rate', 1)
|
|
||||||
|
|
||||||
return paid_amount, received_amount
|
return paid_amount, received_amount
|
||||||
|
|
||||||
def apply_early_payment_discount(paid_amount, received_amount, doc):
|
def apply_early_payment_discount(paid_amount, received_amount, doc):
|
||||||
|
@ -589,9 +589,9 @@ class TestPaymentEntry(unittest.TestCase):
|
|||||||
party_account_balance = get_balance_on(account=pe.paid_from, cost_center=pe.cost_center)
|
party_account_balance = get_balance_on(account=pe.paid_from, cost_center=pe.cost_center)
|
||||||
|
|
||||||
self.assertEqual(pe.cost_center, si.cost_center)
|
self.assertEqual(pe.cost_center, si.cost_center)
|
||||||
self.assertEqual(expected_account_balance, account_balance)
|
self.assertEqual(flt(expected_account_balance), account_balance)
|
||||||
self.assertEqual(expected_party_balance, party_balance)
|
self.assertEqual(flt(expected_party_balance), party_balance)
|
||||||
self.assertEqual(expected_party_account_balance, party_account_balance)
|
self.assertEqual(flt(expected_party_account_balance), party_account_balance)
|
||||||
|
|
||||||
def create_payment_terms_template():
|
def create_payment_terms_template():
|
||||||
|
|
||||||
|
@ -14,7 +14,8 @@
|
|||||||
"total_amount",
|
"total_amount",
|
||||||
"outstanding_amount",
|
"outstanding_amount",
|
||||||
"allocated_amount",
|
"allocated_amount",
|
||||||
"exchange_rate"
|
"exchange_rate",
|
||||||
|
"exchange_gain_loss"
|
||||||
],
|
],
|
||||||
"fields": [
|
"fields": [
|
||||||
{
|
{
|
||||||
@ -90,12 +91,19 @@
|
|||||||
"fieldtype": "Link",
|
"fieldtype": "Link",
|
||||||
"label": "Payment Term",
|
"label": "Payment Term",
|
||||||
"options": "Payment Term"
|
"options": "Payment Term"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "exchange_gain_loss",
|
||||||
|
"fieldtype": "Currency",
|
||||||
|
"label": "Exchange Gain/Loss",
|
||||||
|
"options": "Company:company:default_currency",
|
||||||
|
"read_only": 1
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"index_web_pages_for_search": 1,
|
"index_web_pages_for_search": 1,
|
||||||
"istable": 1,
|
"istable": 1,
|
||||||
"links": [],
|
"links": [],
|
||||||
"modified": "2021-02-10 11:25:47.144392",
|
"modified": "2021-04-21 13:30:11.605388",
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "Accounts",
|
"module": "Accounts",
|
||||||
"name": "Payment Entry Reference",
|
"name": "Payment Entry Reference",
|
||||||
|
@ -207,10 +207,9 @@ def fetch_customers(customer_collection, collection_name, primary_mandatory):
|
|||||||
@frappe.whitelist()
|
@frappe.whitelist()
|
||||||
def get_customer_emails(customer_name, primary_mandatory, billing_and_primary=True):
|
def get_customer_emails(customer_name, primary_mandatory, billing_and_primary=True):
|
||||||
billing_email = frappe.db.sql("""
|
billing_email = frappe.db.sql("""
|
||||||
SELECT c.email_id FROM `tabContact` AS c JOIN `tabDynamic Link` AS l ON c.name=l.parent \
|
SELECT c.email_id FROM `tabContact` AS c JOIN `tabDynamic Link` AS l ON c.name=l.parent
|
||||||
WHERE l.link_doctype='Customer' and l.link_name='""" + customer_name + """' and \
|
WHERE l.link_doctype='Customer' and l.link_name=%s and c.is_billing_contact=1
|
||||||
c.is_billing_contact=1 \
|
order by c.creation desc""", customer_name)
|
||||||
order by c.creation desc""")
|
|
||||||
|
|
||||||
if len(billing_email) == 0 or (billing_email[0][0] is None):
|
if len(billing_email) == 0 or (billing_email[0][0] is None):
|
||||||
if billing_and_primary:
|
if billing_and_primary:
|
||||||
|
@ -451,6 +451,7 @@ class PurchaseInvoice(BuyingController):
|
|||||||
self.get_asset_gl_entry(gl_entries)
|
self.get_asset_gl_entry(gl_entries)
|
||||||
|
|
||||||
self.make_tax_gl_entries(gl_entries)
|
self.make_tax_gl_entries(gl_entries)
|
||||||
|
self.make_exchange_gain_loss_gl_entries(gl_entries)
|
||||||
self.make_internal_transfer_gl_entries(gl_entries)
|
self.make_internal_transfer_gl_entries(gl_entries)
|
||||||
|
|
||||||
self.allocate_advance_taxes(gl_entries)
|
self.allocate_advance_taxes(gl_entries)
|
||||||
|
@ -231,25 +231,25 @@ class TestPurchaseInvoice(unittest.TestCase):
|
|||||||
self.assertEqual(expected_values[gle.account][2], gle.credit)
|
self.assertEqual(expected_values[gle.account][2], gle.credit)
|
||||||
|
|
||||||
def test_purchase_invoice_with_exchange_rate_difference(self):
|
def test_purchase_invoice_with_exchange_rate_difference(self):
|
||||||
pr = make_purchase_receipt(currency = "USD", conversion_rate = 70)
|
from erpnext.stock.doctype.purchase_receipt.purchase_receipt import make_purchase_invoice as create_purchase_invoice
|
||||||
pi = make_purchase_invoice(currency = "USD", conversion_rate = 80, do_not_save = "True")
|
|
||||||
|
|
||||||
pi.items[0].purchase_receipt = pr.name
|
pr = make_purchase_receipt(company="_Test Company with perpetual inventory", warehouse='Stores - TCP1',
|
||||||
pi.items[0].pr_detail = pr.items[0].name
|
currency = "USD", conversion_rate = 70)
|
||||||
|
|
||||||
|
pi = create_purchase_invoice(pr.name)
|
||||||
|
pi.conversion_rate = 80
|
||||||
|
|
||||||
pi.insert()
|
pi.insert()
|
||||||
pi.submit()
|
pi.submit()
|
||||||
|
|
||||||
# fetching the latest GL Entry with 'Exchange Gain/Loss - _TC' account
|
# Get exchnage gain and loss account
|
||||||
gl_entries = frappe.get_all('GL Entry', filters = {'account': 'Exchange Gain/Loss - _TC'})
|
exchange_gain_loss_account = frappe.db.get_value('Company', pi.company, 'exchange_gain_loss_account')
|
||||||
voucher_no = frappe.get_value('GL Entry', gl_entries[0]['name'], 'voucher_no')
|
|
||||||
|
|
||||||
self.assertEqual(pi.name, voucher_no)
|
# fetching the latest GL Entry with exchange gain and loss account account
|
||||||
|
amount = frappe.db.get_value('GL Entry', {'account': exchange_gain_loss_account, 'voucher_no': pi.name}, 'debit')
|
||||||
exchange_gain_loss_amount = frappe.get_value('GL Entry', gl_entries[0]['name'], 'debit')
|
|
||||||
discrepancy_caused_by_exchange_rate_diff = abs(pi.items[0].base_net_amount - pr.items[0].base_net_amount)
|
discrepancy_caused_by_exchange_rate_diff = abs(pi.items[0].base_net_amount - pr.items[0].base_net_amount)
|
||||||
|
|
||||||
self.assertEqual(exchange_gain_loss_amount, discrepancy_caused_by_exchange_rate_diff)
|
self.assertEqual(discrepancy_caused_by_exchange_rate_diff, amount)
|
||||||
|
|
||||||
def test_purchase_invoice_change_naming_series(self):
|
def test_purchase_invoice_change_naming_series(self):
|
||||||
pi = frappe.copy_doc(test_records[1])
|
pi = frappe.copy_doc(test_records[1])
|
||||||
@ -974,6 +974,120 @@ class TestPurchaseInvoice(unittest.TestCase):
|
|||||||
acc_settings.submit_journal_entriessubmit_journal_entries = 0
|
acc_settings.submit_journal_entriessubmit_journal_entries = 0
|
||||||
acc_settings.save()
|
acc_settings.save()
|
||||||
|
|
||||||
|
def test_gain_loss_with_advance_entry(self):
|
||||||
|
unlink_enabled = frappe.db.get_value(
|
||||||
|
"Accounts Settings", "Accounts Settings",
|
||||||
|
"unlink_payment_on_cancel_of_invoice")
|
||||||
|
|
||||||
|
frappe.db.set_value(
|
||||||
|
"Accounts Settings", "Accounts Settings",
|
||||||
|
"unlink_payment_on_cancel_of_invoice", 1)
|
||||||
|
|
||||||
|
original_account = frappe.db.get_value("Company", "_Test Company", "exchange_gain_loss_account")
|
||||||
|
frappe.db.set_value("Company", "_Test Company", "exchange_gain_loss_account", "Exchange Gain/Loss - _TC")
|
||||||
|
|
||||||
|
pay = frappe.get_doc({
|
||||||
|
'doctype': 'Payment Entry',
|
||||||
|
'company': '_Test Company',
|
||||||
|
'payment_type': 'Pay',
|
||||||
|
'party_type': 'Supplier',
|
||||||
|
'party': '_Test Supplier USD',
|
||||||
|
'paid_to': '_Test Payable USD - _TC',
|
||||||
|
'paid_from': 'Cash - _TC',
|
||||||
|
'paid_amount': 70000,
|
||||||
|
'target_exchange_rate': 70,
|
||||||
|
'received_amount': 1000,
|
||||||
|
})
|
||||||
|
pay.insert()
|
||||||
|
pay.submit()
|
||||||
|
|
||||||
|
pi = make_purchase_invoice(supplier='_Test Supplier USD', currency="USD",
|
||||||
|
conversion_rate=75, rate=500, do_not_save=1, qty=1)
|
||||||
|
pi.cost_center = "_Test Cost Center - _TC"
|
||||||
|
pi.advances = []
|
||||||
|
pi.append("advances", {
|
||||||
|
"reference_type": "Payment Entry",
|
||||||
|
"reference_name": pay.name,
|
||||||
|
"advance_amount": 1000,
|
||||||
|
"remarks": pay.remarks,
|
||||||
|
"allocated_amount": 500,
|
||||||
|
"ref_exchange_rate": 70
|
||||||
|
})
|
||||||
|
pi.save()
|
||||||
|
pi.submit()
|
||||||
|
|
||||||
|
expected_gle = [
|
||||||
|
["_Test Account Cost for Goods Sold - _TC", 37500.0],
|
||||||
|
["_Test Payable USD - _TC", -40000.0],
|
||||||
|
["Exchange Gain/Loss - _TC", 2500.0]
|
||||||
|
]
|
||||||
|
|
||||||
|
gl_entries = frappe.db.sql("""
|
||||||
|
select account, sum(debit - credit) as balance from `tabGL Entry`
|
||||||
|
where voucher_no=%s
|
||||||
|
group by account
|
||||||
|
order by account asc""", (pi.name), as_dict=1)
|
||||||
|
|
||||||
|
for i, gle in enumerate(gl_entries):
|
||||||
|
self.assertEqual(expected_gle[i][0], gle.account)
|
||||||
|
self.assertEqual(expected_gle[i][1], gle.balance)
|
||||||
|
|
||||||
|
pi_2 = make_purchase_invoice(supplier='_Test Supplier USD', currency="USD",
|
||||||
|
conversion_rate=73, rate=500, do_not_save=1, qty=1)
|
||||||
|
pi_2.cost_center = "_Test Cost Center - _TC"
|
||||||
|
pi_2.advances = []
|
||||||
|
pi_2.append("advances", {
|
||||||
|
"reference_type": "Payment Entry",
|
||||||
|
"reference_name": pay.name,
|
||||||
|
"advance_amount": 500,
|
||||||
|
"remarks": pay.remarks,
|
||||||
|
"allocated_amount": 500,
|
||||||
|
"ref_exchange_rate": 70
|
||||||
|
})
|
||||||
|
pi_2.save()
|
||||||
|
pi_2.submit()
|
||||||
|
|
||||||
|
expected_gle = [
|
||||||
|
["_Test Account Cost for Goods Sold - _TC", 36500.0],
|
||||||
|
["_Test Payable USD - _TC", -38000.0],
|
||||||
|
["Exchange Gain/Loss - _TC", 1500.0]
|
||||||
|
]
|
||||||
|
|
||||||
|
gl_entries = frappe.db.sql("""
|
||||||
|
select account, sum(debit - credit) as balance from `tabGL Entry`
|
||||||
|
where voucher_no=%s
|
||||||
|
group by account order by account asc""", (pi_2.name), as_dict=1)
|
||||||
|
|
||||||
|
for i, gle in enumerate(gl_entries):
|
||||||
|
self.assertEqual(expected_gle[i][0], gle.account)
|
||||||
|
self.assertEqual(expected_gle[i][1], gle.balance)
|
||||||
|
|
||||||
|
expected_gle = [
|
||||||
|
["_Test Payable USD - _TC", 70000.0],
|
||||||
|
["Cash - _TC", -70000.0]
|
||||||
|
]
|
||||||
|
|
||||||
|
gl_entries = frappe.db.sql("""
|
||||||
|
select account, sum(debit - credit) as balance from `tabGL Entry`
|
||||||
|
where voucher_no=%s and is_cancelled=0
|
||||||
|
group by account order by account asc""", (pay.name), as_dict=1)
|
||||||
|
|
||||||
|
for i, gle in enumerate(gl_entries):
|
||||||
|
self.assertEqual(expected_gle[i][0], gle.account)
|
||||||
|
self.assertEqual(expected_gle[i][1], gle.balance)
|
||||||
|
|
||||||
|
pi.reload()
|
||||||
|
pi.cancel()
|
||||||
|
|
||||||
|
pi_2.reload()
|
||||||
|
pi_2.cancel()
|
||||||
|
|
||||||
|
pay.reload()
|
||||||
|
pay.cancel()
|
||||||
|
|
||||||
|
frappe.db.set_value("Accounts Settings", "Accounts Settings", "unlink_payment_on_cancel_of_invoice", unlink_enabled)
|
||||||
|
frappe.db.set_value("Company", "_Test Company", "exchange_gain_loss_account", original_account)
|
||||||
|
|
||||||
def test_purchase_invoice_advance_taxes(self):
|
def test_purchase_invoice_advance_taxes(self):
|
||||||
from erpnext.buying.doctype.purchase_order.test_purchase_order import create_purchase_order
|
from erpnext.buying.doctype.purchase_order.test_purchase_order import create_purchase_order
|
||||||
from erpnext.accounts.doctype.payment_entry.payment_entry import get_payment_entry
|
from erpnext.accounts.doctype.payment_entry.payment_entry import get_payment_entry
|
||||||
@ -1031,21 +1145,21 @@ class TestPurchaseInvoice(unittest.TestCase):
|
|||||||
# Check GLE for Purchase Invoice
|
# Check GLE for Purchase Invoice
|
||||||
# Zero net effect on final TDS Payable on invoice
|
# Zero net effect on final TDS Payable on invoice
|
||||||
expected_gle = [
|
expected_gle = [
|
||||||
['_Test Account Cost for Goods Sold - _TC', 30000, 0],
|
['_Test Account Cost for Goods Sold - _TC', 30000],
|
||||||
['_Test Account Excise Duty - _TC', 0, 3000],
|
['_Test Account Excise Duty - _TC', -3000],
|
||||||
['Creditors - _TC', 0, 27000],
|
['Creditors - _TC', -27000],
|
||||||
['TDS Payable - _TC', 3000, 3000]
|
['TDS Payable - _TC', 0]
|
||||||
]
|
]
|
||||||
|
|
||||||
gl_entries = frappe.db.sql("""select account, debit, credit
|
gl_entries = frappe.db.sql("""select account, sum(debit - credit) as amount
|
||||||
from `tabGL Entry`
|
from `tabGL Entry`
|
||||||
where voucher_type='Purchase Invoice' and voucher_no=%s
|
where voucher_type='Purchase Invoice' and voucher_no=%s
|
||||||
|
group by account
|
||||||
order by account asc""", (purchase_invoice.name), as_dict=1)
|
order by account asc""", (purchase_invoice.name), as_dict=1)
|
||||||
|
|
||||||
for i, gle in enumerate(gl_entries):
|
for i, gle in enumerate(gl_entries):
|
||||||
self.assertEqual(expected_gle[i][0], gle.account)
|
self.assertEqual(expected_gle[i][0], gle.account)
|
||||||
self.assertEqual(expected_gle[i][1], gle.debit)
|
self.assertEqual(expected_gle[i][1], gle.amount)
|
||||||
self.assertEqual(expected_gle[i][2], gle.credit)
|
|
||||||
|
|
||||||
def update_tax_witholding_category(company, account, date):
|
def update_tax_witholding_category(company, account, date):
|
||||||
from erpnext.accounts.utils import get_fiscal_year
|
from erpnext.accounts.utils import get_fiscal_year
|
||||||
|
@ -1,235 +1,127 @@
|
|||||||
{
|
{
|
||||||
"allow_copy": 0,
|
"actions": [],
|
||||||
"allow_import": 0,
|
|
||||||
"allow_rename": 0,
|
|
||||||
"beta": 0,
|
|
||||||
"creation": "2013-03-08 15:36:46",
|
"creation": "2013-03-08 15:36:46",
|
||||||
"custom": 0,
|
|
||||||
"docstatus": 0,
|
|
||||||
"doctype": "DocType",
|
"doctype": "DocType",
|
||||||
"document_type": "Document",
|
"document_type": "Document",
|
||||||
"editable_grid": 1,
|
"editable_grid": 1,
|
||||||
|
"engine": "InnoDB",
|
||||||
|
"field_order": [
|
||||||
|
"reference_type",
|
||||||
|
"reference_name",
|
||||||
|
"remarks",
|
||||||
|
"reference_row",
|
||||||
|
"col_break1",
|
||||||
|
"advance_amount",
|
||||||
|
"allocated_amount",
|
||||||
|
"exchange_gain_loss",
|
||||||
|
"ref_exchange_rate"
|
||||||
|
],
|
||||||
"fields": [
|
"fields": [
|
||||||
{
|
{
|
||||||
"allow_on_submit": 0,
|
|
||||||
"bold": 0,
|
|
||||||
"collapsible": 0,
|
|
||||||
"columns": 0,
|
|
||||||
"fieldname": "reference_type",
|
"fieldname": "reference_type",
|
||||||
"fieldtype": "Link",
|
"fieldtype": "Link",
|
||||||
"hidden": 0,
|
|
||||||
"ignore_user_permissions": 0,
|
|
||||||
"ignore_xss_filter": 0,
|
|
||||||
"in_filter": 0,
|
|
||||||
"in_list_view": 0,
|
|
||||||
"label": "Reference Type",
|
"label": "Reference Type",
|
||||||
"length": 0,
|
|
||||||
"no_copy": 1,
|
"no_copy": 1,
|
||||||
"oldfieldname": "journal_voucher",
|
"oldfieldname": "journal_voucher",
|
||||||
"oldfieldtype": "Link",
|
"oldfieldtype": "Link",
|
||||||
"options": "DocType",
|
"options": "DocType",
|
||||||
"permlevel": 0,
|
|
||||||
"print_hide": 0,
|
|
||||||
"print_hide_if_no_value": 0,
|
|
||||||
"print_width": "180px",
|
"print_width": "180px",
|
||||||
"read_only": 1,
|
"read_only": 1,
|
||||||
"report_hide": 0,
|
|
||||||
"reqd": 0,
|
|
||||||
"search_index": 0,
|
|
||||||
"set_only_once": 0,
|
|
||||||
"unique": 0,
|
|
||||||
"width": "180px"
|
"width": "180px"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"allow_on_submit": 0,
|
|
||||||
"bold": 0,
|
|
||||||
"collapsible": 0,
|
|
||||||
"columns": 3,
|
"columns": 3,
|
||||||
"fieldname": "reference_name",
|
"fieldname": "reference_name",
|
||||||
"fieldtype": "Dynamic Link",
|
"fieldtype": "Dynamic Link",
|
||||||
"hidden": 0,
|
|
||||||
"ignore_user_permissions": 0,
|
|
||||||
"ignore_xss_filter": 0,
|
|
||||||
"in_filter": 0,
|
|
||||||
"in_list_view": 1,
|
"in_list_view": 1,
|
||||||
"label": "Reference Name",
|
"label": "Reference Name",
|
||||||
"length": 0,
|
|
||||||
"no_copy": 1,
|
"no_copy": 1,
|
||||||
"options": "reference_type",
|
"options": "reference_type",
|
||||||
"permlevel": 0,
|
"read_only": 1
|
||||||
"precision": "",
|
|
||||||
"print_hide": 0,
|
|
||||||
"print_hide_if_no_value": 0,
|
|
||||||
"read_only": 1,
|
|
||||||
"report_hide": 0,
|
|
||||||
"reqd": 0,
|
|
||||||
"search_index": 0,
|
|
||||||
"set_only_once": 0,
|
|
||||||
"unique": 0
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"allow_on_submit": 0,
|
|
||||||
"bold": 0,
|
|
||||||
"collapsible": 0,
|
|
||||||
"columns": 3,
|
"columns": 3,
|
||||||
"fieldname": "remarks",
|
"fieldname": "remarks",
|
||||||
"fieldtype": "Text",
|
"fieldtype": "Text",
|
||||||
"hidden": 0,
|
|
||||||
"ignore_user_permissions": 0,
|
|
||||||
"ignore_xss_filter": 0,
|
|
||||||
"in_filter": 0,
|
|
||||||
"in_list_view": 1,
|
"in_list_view": 1,
|
||||||
"label": "Remarks",
|
"label": "Remarks",
|
||||||
"length": 0,
|
|
||||||
"no_copy": 1,
|
"no_copy": 1,
|
||||||
"oldfieldname": "remarks",
|
"oldfieldname": "remarks",
|
||||||
"oldfieldtype": "Small Text",
|
"oldfieldtype": "Small Text",
|
||||||
"permlevel": 0,
|
|
||||||
"print_hide": 0,
|
|
||||||
"print_hide_if_no_value": 0,
|
|
||||||
"print_width": "150px",
|
"print_width": "150px",
|
||||||
"read_only": 1,
|
"read_only": 1,
|
||||||
"report_hide": 0,
|
|
||||||
"reqd": 0,
|
|
||||||
"search_index": 0,
|
|
||||||
"set_only_once": 0,
|
|
||||||
"unique": 0,
|
|
||||||
"width": "150px"
|
"width": "150px"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"allow_on_submit": 0,
|
|
||||||
"bold": 0,
|
|
||||||
"collapsible": 0,
|
|
||||||
"columns": 0,
|
|
||||||
"fieldname": "reference_row",
|
"fieldname": "reference_row",
|
||||||
"fieldtype": "Data",
|
"fieldtype": "Data",
|
||||||
"hidden": 1,
|
"hidden": 1,
|
||||||
"ignore_user_permissions": 0,
|
|
||||||
"ignore_xss_filter": 0,
|
|
||||||
"in_filter": 0,
|
|
||||||
"in_list_view": 0,
|
|
||||||
"label": "Reference Row",
|
"label": "Reference Row",
|
||||||
"length": 0,
|
|
||||||
"no_copy": 1,
|
"no_copy": 1,
|
||||||
"oldfieldname": "jv_detail_no",
|
"oldfieldname": "jv_detail_no",
|
||||||
"oldfieldtype": "Date",
|
"oldfieldtype": "Date",
|
||||||
"permlevel": 0,
|
|
||||||
"print_hide": 1,
|
"print_hide": 1,
|
||||||
"print_hide_if_no_value": 0,
|
|
||||||
"print_width": "80px",
|
"print_width": "80px",
|
||||||
"read_only": 1,
|
"read_only": 1,
|
||||||
"report_hide": 0,
|
|
||||||
"reqd": 0,
|
|
||||||
"search_index": 0,
|
|
||||||
"set_only_once": 0,
|
|
||||||
"unique": 0,
|
|
||||||
"width": "80px"
|
"width": "80px"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"allow_on_submit": 0,
|
|
||||||
"bold": 0,
|
|
||||||
"collapsible": 0,
|
|
||||||
"columns": 0,
|
|
||||||
"fieldname": "col_break1",
|
"fieldname": "col_break1",
|
||||||
"fieldtype": "Column Break",
|
"fieldtype": "Column Break"
|
||||||
"hidden": 0,
|
|
||||||
"ignore_user_permissions": 0,
|
|
||||||
"ignore_xss_filter": 0,
|
|
||||||
"in_filter": 0,
|
|
||||||
"in_list_view": 0,
|
|
||||||
"length": 0,
|
|
||||||
"no_copy": 0,
|
|
||||||
"permlevel": 0,
|
|
||||||
"print_hide": 0,
|
|
||||||
"print_hide_if_no_value": 0,
|
|
||||||
"read_only": 0,
|
|
||||||
"report_hide": 0,
|
|
||||||
"reqd": 0,
|
|
||||||
"search_index": 0,
|
|
||||||
"set_only_once": 0,
|
|
||||||
"unique": 0
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"allow_on_submit": 0,
|
|
||||||
"bold": 0,
|
|
||||||
"collapsible": 0,
|
|
||||||
"columns": 2,
|
"columns": 2,
|
||||||
"fieldname": "advance_amount",
|
"fieldname": "advance_amount",
|
||||||
"fieldtype": "Currency",
|
"fieldtype": "Currency",
|
||||||
"hidden": 0,
|
|
||||||
"ignore_user_permissions": 0,
|
|
||||||
"ignore_xss_filter": 0,
|
|
||||||
"in_filter": 0,
|
|
||||||
"in_list_view": 1,
|
"in_list_view": 1,
|
||||||
"label": "Advance Amount",
|
"label": "Advance Amount",
|
||||||
"length": 0,
|
|
||||||
"no_copy": 1,
|
"no_copy": 1,
|
||||||
"oldfieldname": "advance_amount",
|
"oldfieldname": "advance_amount",
|
||||||
"oldfieldtype": "Currency",
|
"oldfieldtype": "Currency",
|
||||||
"options": "party_account_currency",
|
"options": "party_account_currency",
|
||||||
"permlevel": 0,
|
|
||||||
"print_hide": 0,
|
|
||||||
"print_hide_if_no_value": 0,
|
|
||||||
"print_width": "100px",
|
"print_width": "100px",
|
||||||
"read_only": 1,
|
"read_only": 1,
|
||||||
"report_hide": 0,
|
|
||||||
"reqd": 0,
|
|
||||||
"search_index": 0,
|
|
||||||
"set_only_once": 0,
|
|
||||||
"unique": 0,
|
|
||||||
"width": "100px"
|
"width": "100px"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"allow_on_submit": 0,
|
|
||||||
"bold": 0,
|
|
||||||
"collapsible": 0,
|
|
||||||
"columns": 2,
|
"columns": 2,
|
||||||
"fieldname": "allocated_amount",
|
"fieldname": "allocated_amount",
|
||||||
"fieldtype": "Currency",
|
"fieldtype": "Currency",
|
||||||
"hidden": 0,
|
|
||||||
"ignore_user_permissions": 0,
|
|
||||||
"ignore_xss_filter": 0,
|
|
||||||
"in_filter": 0,
|
|
||||||
"in_list_view": 1,
|
"in_list_view": 1,
|
||||||
"label": "Allocated Amount",
|
"label": "Allocated Amount",
|
||||||
"length": 0,
|
|
||||||
"no_copy": 1,
|
"no_copy": 1,
|
||||||
"oldfieldname": "allocated_amount",
|
"oldfieldname": "allocated_amount",
|
||||||
"oldfieldtype": "Currency",
|
"oldfieldtype": "Currency",
|
||||||
"options": "party_account_currency",
|
"options": "party_account_currency",
|
||||||
"permlevel": 0,
|
|
||||||
"print_hide": 0,
|
|
||||||
"print_hide_if_no_value": 0,
|
|
||||||
"print_width": "100px",
|
"print_width": "100px",
|
||||||
"read_only": 0,
|
|
||||||
"report_hide": 0,
|
|
||||||
"reqd": 0,
|
|
||||||
"search_index": 0,
|
|
||||||
"set_only_once": 0,
|
|
||||||
"unique": 0,
|
|
||||||
"width": "100px"
|
"width": "100px"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "exchange_gain_loss",
|
||||||
|
"fieldtype": "Currency",
|
||||||
|
"label": "Exchange Gain/Loss",
|
||||||
|
"options": "Company:company:default_currency",
|
||||||
|
"read_only": 1
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "ref_exchange_rate",
|
||||||
|
"fieldtype": "Float",
|
||||||
|
"label": "Reference Exchange Rate",
|
||||||
|
"non_negative": 1,
|
||||||
|
"read_only": 1
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"hide_heading": 0,
|
|
||||||
"hide_toolbar": 0,
|
|
||||||
"idx": 1,
|
"idx": 1,
|
||||||
"image_view": 0,
|
"index_web_pages_for_search": 1,
|
||||||
"in_create": 0,
|
|
||||||
|
|
||||||
"is_submittable": 0,
|
|
||||||
"issingle": 0,
|
|
||||||
"istable": 1,
|
"istable": 1,
|
||||||
"max_attachments": 0,
|
"links": [],
|
||||||
"menu_index": 0,
|
"modified": "2021-04-20 16:26:53.820530",
|
||||||
"modified": "2016-08-26 02:30:54.407138",
|
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "Accounts",
|
"module": "Accounts",
|
||||||
"name": "Purchase Invoice Advance",
|
"name": "Purchase Invoice Advance",
|
||||||
"owner": "Administrator",
|
"owner": "Administrator",
|
||||||
"permissions": [],
|
"permissions": [],
|
||||||
"quick_entry": 1,
|
"quick_entry": 1,
|
||||||
"read_only": 0,
|
"sort_field": "modified",
|
||||||
"read_only_onload": 0,
|
"sort_order": "DESC"
|
||||||
"sort_order": "DESC",
|
|
||||||
"track_seen": 0
|
|
||||||
}
|
}
|
@ -48,6 +48,8 @@
|
|||||||
"shipping_address",
|
"shipping_address",
|
||||||
"company_address",
|
"company_address",
|
||||||
"company_address_display",
|
"company_address_display",
|
||||||
|
"dispatch_address_name",
|
||||||
|
"dispatch_address",
|
||||||
"currency_and_price_list",
|
"currency_and_price_list",
|
||||||
"currency",
|
"currency",
|
||||||
"conversion_rate",
|
"conversion_rate",
|
||||||
@ -1966,6 +1968,21 @@
|
|||||||
"fieldname": "disable_rounded_total",
|
"fieldname": "disable_rounded_total",
|
||||||
"fieldtype": "Check",
|
"fieldtype": "Check",
|
||||||
"label": "Disable Rounded Total"
|
"label": "Disable Rounded Total"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"allow_on_submit": 1,
|
||||||
|
"fieldname": "dispatch_address_name",
|
||||||
|
"fieldtype": "Link",
|
||||||
|
"label": "Dispatch Address Name",
|
||||||
|
"options": "Address",
|
||||||
|
"print_hide": 1
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"allow_on_submit": 1,
|
||||||
|
"fieldname": "dispatch_address",
|
||||||
|
"fieldtype": "Small Text",
|
||||||
|
"label": "Dispatch Address",
|
||||||
|
"read_only": 1
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"icon": "fa fa-file-text",
|
"icon": "fa fa-file-text",
|
||||||
@ -1978,7 +1995,7 @@
|
|||||||
"link_fieldname": "consolidated_invoice"
|
"link_fieldname": "consolidated_invoice"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"modified": "2021-05-20 22:48:33.988881",
|
"modified": "2021-07-08 14:03:55.502522",
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "Accounts",
|
"module": "Accounts",
|
||||||
"name": "Sales Invoice",
|
"name": "Sales Invoice",
|
||||||
|
@ -13,7 +13,7 @@ from erpnext.accounts.utils import get_account_currency
|
|||||||
from erpnext.stock.doctype.delivery_note.delivery_note import update_billed_amount_based_on_so
|
from erpnext.stock.doctype.delivery_note.delivery_note import update_billed_amount_based_on_so
|
||||||
from erpnext.projects.doctype.timesheet.timesheet import get_projectwise_timesheet_data
|
from erpnext.projects.doctype.timesheet.timesheet import get_projectwise_timesheet_data
|
||||||
from erpnext.assets.doctype.asset.depreciation \
|
from erpnext.assets.doctype.asset.depreciation \
|
||||||
import get_disposal_account_and_cost_center, get_gl_entries_on_asset_disposal
|
import get_disposal_account_and_cost_center, get_gl_entries_on_asset_disposal, get_gl_entries_on_asset_regain
|
||||||
from erpnext.stock.doctype.batch.batch import set_batch_nos
|
from erpnext.stock.doctype.batch.batch import set_batch_nos
|
||||||
from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos, get_delivery_note_serial_no
|
from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos, get_delivery_note_serial_no
|
||||||
from erpnext.setup.doctype.company.company import update_company_current_month_sales
|
from erpnext.setup.doctype.company.company import update_company_current_month_sales
|
||||||
@ -149,7 +149,7 @@ class SalesInvoice(SellingController):
|
|||||||
if self.update_stock:
|
if self.update_stock:
|
||||||
frappe.throw(_("'Update Stock' cannot be checked for fixed asset sale"))
|
frappe.throw(_("'Update Stock' cannot be checked for fixed asset sale"))
|
||||||
|
|
||||||
elif asset.status in ("Scrapped", "Cancelled", "Sold"):
|
elif asset.status in ("Scrapped", "Cancelled") or (asset.status == "Sold" and not self.is_return):
|
||||||
frappe.throw(_("Row #{0}: Asset {1} cannot be submitted, it is already {2}").format(d.idx, d.asset, asset.status))
|
frappe.throw(_("Row #{0}: Asset {1} cannot be submitted, it is already {2}").format(d.idx, d.asset, asset.status))
|
||||||
|
|
||||||
def validate_item_cost_centers(self):
|
def validate_item_cost_centers(self):
|
||||||
@ -840,6 +840,7 @@ class SalesInvoice(SellingController):
|
|||||||
self.make_customer_gl_entry(gl_entries)
|
self.make_customer_gl_entry(gl_entries)
|
||||||
|
|
||||||
self.make_tax_gl_entries(gl_entries)
|
self.make_tax_gl_entries(gl_entries)
|
||||||
|
self.make_exchange_gain_loss_gl_entries(gl_entries)
|
||||||
self.make_internal_transfer_gl_entries(gl_entries)
|
self.make_internal_transfer_gl_entries(gl_entries)
|
||||||
|
|
||||||
self.allocate_advance_taxes(gl_entries)
|
self.allocate_advance_taxes(gl_entries)
|
||||||
@ -917,22 +918,33 @@ class SalesInvoice(SellingController):
|
|||||||
for item in self.get("items"):
|
for item in self.get("items"):
|
||||||
if flt(item.base_net_amount, item.precision("base_net_amount")):
|
if flt(item.base_net_amount, item.precision("base_net_amount")):
|
||||||
if item.is_fixed_asset:
|
if item.is_fixed_asset:
|
||||||
|
if item.get('asset'):
|
||||||
asset = frappe.get_doc("Asset", item.asset)
|
asset = frappe.get_doc("Asset", item.asset)
|
||||||
|
else:
|
||||||
|
frappe.throw(_(
|
||||||
|
"Row #{0}: You must select an Asset for Item {1}.").format(item.idx, item.item_name),
|
||||||
|
title=_("Missing Asset")
|
||||||
|
)
|
||||||
if (len(asset.finance_books) > 1 and not item.finance_book
|
if (len(asset.finance_books) > 1 and not item.finance_book
|
||||||
and asset.finance_books[0].finance_book):
|
and asset.finance_books[0].finance_book):
|
||||||
frappe.throw(_("Select finance book for the item {0} at row {1}")
|
frappe.throw(_("Select finance book for the item {0} at row {1}")
|
||||||
.format(item.item_code, item.idx))
|
.format(item.item_code, item.idx))
|
||||||
|
|
||||||
|
if self.is_return:
|
||||||
|
fixed_asset_gl_entries = get_gl_entries_on_asset_regain(asset,
|
||||||
|
item.base_net_amount, item.finance_book)
|
||||||
|
asset.db_set("disposal_date", None)
|
||||||
|
else:
|
||||||
fixed_asset_gl_entries = get_gl_entries_on_asset_disposal(asset,
|
fixed_asset_gl_entries = get_gl_entries_on_asset_disposal(asset,
|
||||||
item.base_net_amount, item.finance_book)
|
item.base_net_amount, item.finance_book)
|
||||||
|
asset.db_set("disposal_date", self.posting_date)
|
||||||
|
|
||||||
for gle in fixed_asset_gl_entries:
|
for gle in fixed_asset_gl_entries:
|
||||||
gle["against"] = self.customer
|
gle["against"] = self.customer
|
||||||
gl_entries.append(self.get_gl_dict(gle, item=item))
|
gl_entries.append(self.get_gl_dict(gle, item=item))
|
||||||
|
|
||||||
asset.db_set("disposal_date", self.posting_date)
|
self.set_asset_status(asset)
|
||||||
asset.set_status("Sold" if self.docstatus==1 else None)
|
|
||||||
else:
|
else:
|
||||||
# Do not book income for transfer within same company
|
# Do not book income for transfer within same company
|
||||||
if not self.is_internal_transfer():
|
if not self.is_internal_transfer():
|
||||||
@ -958,6 +970,12 @@ class SalesInvoice(SellingController):
|
|||||||
erpnext.is_perpetual_inventory_enabled(self.company):
|
erpnext.is_perpetual_inventory_enabled(self.company):
|
||||||
gl_entries += super(SalesInvoice, self).get_gl_entries()
|
gl_entries += super(SalesInvoice, self).get_gl_entries()
|
||||||
|
|
||||||
|
def set_asset_status(self, asset):
|
||||||
|
if self.is_return:
|
||||||
|
asset.set_status()
|
||||||
|
else:
|
||||||
|
asset.set_status("Sold" if self.docstatus==1 else None)
|
||||||
|
|
||||||
def make_loyalty_point_redemption_gle(self, gl_entries):
|
def make_loyalty_point_redemption_gle(self, gl_entries):
|
||||||
if cint(self.redeem_loyalty_points):
|
if cint(self.redeem_loyalty_points):
|
||||||
gl_entries.append(
|
gl_entries.append(
|
||||||
|
@ -10,6 +10,7 @@ from frappe.model.dynamic_links import get_dynamic_link_map
|
|||||||
from erpnext.stock.doctype.stock_entry.test_stock_entry import make_stock_entry, get_qty_after_transaction
|
from erpnext.stock.doctype.stock_entry.test_stock_entry import make_stock_entry, get_qty_after_transaction
|
||||||
from erpnext.accounts.doctype.purchase_invoice.test_purchase_invoice import unlink_payment_on_cancel_of_invoice
|
from erpnext.accounts.doctype.purchase_invoice.test_purchase_invoice import unlink_payment_on_cancel_of_invoice
|
||||||
from erpnext.accounts.doctype.pos_profile.test_pos_profile import make_pos_profile
|
from erpnext.accounts.doctype.pos_profile.test_pos_profile import make_pos_profile
|
||||||
|
from erpnext.assets.doctype.asset.test_asset import create_asset, create_asset_data
|
||||||
from erpnext.exceptions import InvalidAccountCurrency, InvalidCurrency
|
from erpnext.exceptions import InvalidAccountCurrency, InvalidCurrency
|
||||||
from erpnext.stock.doctype.serial_no.serial_no import SerialNoWarehouseError
|
from erpnext.stock.doctype.serial_no.serial_no import SerialNoWarehouseError
|
||||||
from frappe.model.naming import make_autoname
|
from frappe.model.naming import make_autoname
|
||||||
@ -1069,6 +1070,36 @@ class TestSalesInvoice(unittest.TestCase):
|
|||||||
self.assertFalse(si1.outstanding_amount)
|
self.assertFalse(si1.outstanding_amount)
|
||||||
self.assertEqual(frappe.db.get_value("Sales Invoice", si.name, "outstanding_amount"), 1500)
|
self.assertEqual(frappe.db.get_value("Sales Invoice", si.name, "outstanding_amount"), 1500)
|
||||||
|
|
||||||
|
def test_gle_made_when_asset_is_returned(self):
|
||||||
|
create_asset_data()
|
||||||
|
asset = create_asset(item_code="Macbook Pro")
|
||||||
|
|
||||||
|
si = create_sales_invoice(item_code="Macbook Pro", asset=asset.name, qty=1, rate=90000)
|
||||||
|
return_si = create_sales_invoice(is_return=1, return_against=si.name, item_code="Macbook Pro", asset=asset.name, qty=-1, rate=90000)
|
||||||
|
|
||||||
|
disposal_account = frappe.get_cached_value("Company", "_Test Company", "disposal_account")
|
||||||
|
|
||||||
|
# Asset value is 100,000 but it was sold for 90,000, so there should be a loss of 10,000
|
||||||
|
loss_for_si = frappe.get_all(
|
||||||
|
"GL Entry",
|
||||||
|
filters = {
|
||||||
|
"voucher_no": si.name,
|
||||||
|
"account": disposal_account
|
||||||
|
},
|
||||||
|
fields = ["credit", "debit"]
|
||||||
|
)[0]
|
||||||
|
|
||||||
|
loss_for_return_si = frappe.get_all(
|
||||||
|
"GL Entry",
|
||||||
|
filters = {
|
||||||
|
"voucher_no": return_si.name,
|
||||||
|
"account": disposal_account
|
||||||
|
},
|
||||||
|
fields = ["credit", "debit"]
|
||||||
|
)[0]
|
||||||
|
|
||||||
|
self.assertEqual(loss_for_si['credit'], loss_for_return_si['debit'])
|
||||||
|
self.assertEqual(loss_for_si['debit'], loss_for_return_si['credit'])
|
||||||
|
|
||||||
def test_discount_on_net_total(self):
|
def test_discount_on_net_total(self):
|
||||||
si = frappe.copy_doc(test_records[2])
|
si = frappe.copy_doc(test_records[2])
|
||||||
@ -1908,6 +1939,8 @@ class TestSalesInvoice(unittest.TestCase):
|
|||||||
self.assertEqual(data['billLists'][0]['sgstValue'], 5400)
|
self.assertEqual(data['billLists'][0]['sgstValue'], 5400)
|
||||||
self.assertEqual(data['billLists'][0]['vehicleNo'], 'KA12KA1234')
|
self.assertEqual(data['billLists'][0]['vehicleNo'], 'KA12KA1234')
|
||||||
self.assertEqual(data['billLists'][0]['itemList'][0]['taxableAmount'], 60000)
|
self.assertEqual(data['billLists'][0]['itemList'][0]['taxableAmount'], 60000)
|
||||||
|
self.assertEqual(data['billLists'][0]['actualFromStateCode'],7)
|
||||||
|
self.assertEqual(data['billLists'][0]['fromStateCode'],27)
|
||||||
|
|
||||||
def test_einvoice_submission_without_irn(self):
|
def test_einvoice_submission_without_irn(self):
|
||||||
# init
|
# init
|
||||||
@ -2061,6 +2094,30 @@ def make_test_address_for_ewaybill():
|
|||||||
|
|
||||||
address.save()
|
address.save()
|
||||||
|
|
||||||
|
if not frappe.db.exists('Address', '_Test Dispatch-Address for Eway bill-Shipping'):
|
||||||
|
address = frappe.get_doc({
|
||||||
|
"address_line1": "_Test Dispatch Address Line 1",
|
||||||
|
"address_title": "_Test Dispatch-Address for Eway bill",
|
||||||
|
"address_type": "Shipping",
|
||||||
|
"city": "_Test City",
|
||||||
|
"state": "Test State",
|
||||||
|
"country": "India",
|
||||||
|
"doctype": "Address",
|
||||||
|
"is_primary_address": 0,
|
||||||
|
"phone": "+910000000000",
|
||||||
|
"gstin": "07AAACC1206D1ZI",
|
||||||
|
"gst_state": "Delhi",
|
||||||
|
"gst_state_number": "07",
|
||||||
|
"pincode": "1100101"
|
||||||
|
}).insert()
|
||||||
|
|
||||||
|
address.append("links", {
|
||||||
|
"link_doctype": "Company",
|
||||||
|
"link_name": "_Test Company"
|
||||||
|
})
|
||||||
|
|
||||||
|
address.save()
|
||||||
|
|
||||||
def make_test_transporter_for_ewaybill():
|
def make_test_transporter_for_ewaybill():
|
||||||
if not frappe.db.exists('Supplier', '_Test Transporter'):
|
if not frappe.db.exists('Supplier', '_Test Transporter'):
|
||||||
frappe.get_doc({
|
frappe.get_doc({
|
||||||
@ -2087,9 +2144,9 @@ def make_sales_invoice_for_ewaybill():
|
|||||||
if not gst_account:
|
if not gst_account:
|
||||||
gst_settings.append("gst_accounts", {
|
gst_settings.append("gst_accounts", {
|
||||||
"company": "_Test Company",
|
"company": "_Test Company",
|
||||||
"cgst_account": "CGST - _TC",
|
"cgst_account": "Output Tax CGST - _TC",
|
||||||
"sgst_account": "SGST - _TC",
|
"sgst_account": "Output Tax SGST - _TC",
|
||||||
"igst_account": "IGST - _TC",
|
"igst_account": "Output Tax IGST - _TC",
|
||||||
})
|
})
|
||||||
|
|
||||||
gst_settings.save()
|
gst_settings.save()
|
||||||
@ -2099,6 +2156,7 @@ def make_sales_invoice_for_ewaybill():
|
|||||||
si.distance = 2000
|
si.distance = 2000
|
||||||
si.company_address = "_Test Address for Eway bill-Billing"
|
si.company_address = "_Test Address for Eway bill-Billing"
|
||||||
si.customer_address = "_Test Customer-Address for Eway bill-Shipping"
|
si.customer_address = "_Test Customer-Address for Eway bill-Shipping"
|
||||||
|
si.dispatch_address_name = "_Test Dispatch-Address for Eway bill-Shipping"
|
||||||
si.vehicle_no = "KA12KA1234"
|
si.vehicle_no = "KA12KA1234"
|
||||||
si.gst_category = "Registered Regular"
|
si.gst_category = "Registered Regular"
|
||||||
si.mode_of_transport = 'Road'
|
si.mode_of_transport = 'Road'
|
||||||
@ -2106,7 +2164,7 @@ def make_sales_invoice_for_ewaybill():
|
|||||||
|
|
||||||
si.append("taxes", {
|
si.append("taxes", {
|
||||||
"charge_type": "On Net Total",
|
"charge_type": "On Net Total",
|
||||||
"account_head": "CGST - _TC",
|
"account_head": "Output Tax CGST - _TC",
|
||||||
"cost_center": "Main - _TC",
|
"cost_center": "Main - _TC",
|
||||||
"description": "CGST @ 9.0",
|
"description": "CGST @ 9.0",
|
||||||
"rate": 9
|
"rate": 9
|
||||||
@ -2114,7 +2172,7 @@ def make_sales_invoice_for_ewaybill():
|
|||||||
|
|
||||||
si.append("taxes", {
|
si.append("taxes", {
|
||||||
"charge_type": "On Net Total",
|
"charge_type": "On Net Total",
|
||||||
"account_head": "SGST - _TC",
|
"account_head": "Output Tax SGST - _TC",
|
||||||
"cost_center": "Main - _TC",
|
"cost_center": "Main - _TC",
|
||||||
"description": "SGST @ 9.0",
|
"description": "SGST @ 9.0",
|
||||||
"rate": 9
|
"rate": 9
|
||||||
@ -2164,6 +2222,7 @@ def create_sales_invoice(**args):
|
|||||||
"rate": args.rate if args.get("rate") is not None else 100,
|
"rate": args.rate if args.get("rate") is not None else 100,
|
||||||
"income_account": args.income_account or "Sales - _TC",
|
"income_account": args.income_account or "Sales - _TC",
|
||||||
"expense_account": args.expense_account or "Cost of Goods Sold - _TC",
|
"expense_account": args.expense_account or "Cost of Goods Sold - _TC",
|
||||||
|
"asset": args.asset or None,
|
||||||
"cost_center": args.cost_center or "_Test Cost Center - _TC",
|
"cost_center": args.cost_center or "_Test Cost Center - _TC",
|
||||||
"serial_no": args.serial_no,
|
"serial_no": args.serial_no,
|
||||||
"conversion_factor": 1
|
"conversion_factor": 1
|
||||||
|
@ -1,235 +1,128 @@
|
|||||||
{
|
{
|
||||||
"allow_copy": 0,
|
"actions": [],
|
||||||
"allow_import": 0,
|
|
||||||
"allow_rename": 0,
|
|
||||||
"beta": 0,
|
|
||||||
"creation": "2013-02-22 01:27:41",
|
"creation": "2013-02-22 01:27:41",
|
||||||
"custom": 0,
|
|
||||||
"docstatus": 0,
|
|
||||||
"doctype": "DocType",
|
"doctype": "DocType",
|
||||||
"document_type": "Document",
|
"document_type": "Document",
|
||||||
"editable_grid": 1,
|
"editable_grid": 1,
|
||||||
|
"engine": "InnoDB",
|
||||||
|
"field_order": [
|
||||||
|
"reference_type",
|
||||||
|
"reference_name",
|
||||||
|
"remarks",
|
||||||
|
"reference_row",
|
||||||
|
"col_break1",
|
||||||
|
"advance_amount",
|
||||||
|
"allocated_amount",
|
||||||
|
"exchange_gain_loss",
|
||||||
|
"ref_exchange_rate"
|
||||||
|
],
|
||||||
"fields": [
|
"fields": [
|
||||||
{
|
{
|
||||||
"allow_on_submit": 0,
|
|
||||||
"bold": 0,
|
|
||||||
"collapsible": 0,
|
|
||||||
"columns": 0,
|
|
||||||
"fieldname": "reference_type",
|
"fieldname": "reference_type",
|
||||||
"fieldtype": "Link",
|
"fieldtype": "Link",
|
||||||
"hidden": 0,
|
|
||||||
"ignore_user_permissions": 0,
|
|
||||||
"ignore_xss_filter": 0,
|
|
||||||
"in_filter": 0,
|
|
||||||
"in_list_view": 0,
|
|
||||||
"label": "Reference Type",
|
"label": "Reference Type",
|
||||||
"length": 0,
|
|
||||||
"no_copy": 1,
|
"no_copy": 1,
|
||||||
"oldfieldname": "journal_voucher",
|
"oldfieldname": "journal_voucher",
|
||||||
"oldfieldtype": "Link",
|
"oldfieldtype": "Link",
|
||||||
"options": "DocType",
|
"options": "DocType",
|
||||||
"permlevel": 0,
|
|
||||||
"print_hide": 0,
|
|
||||||
"print_hide_if_no_value": 0,
|
|
||||||
"print_width": "250px",
|
"print_width": "250px",
|
||||||
"read_only": 1,
|
"read_only": 1,
|
||||||
"report_hide": 0,
|
|
||||||
"reqd": 0,
|
|
||||||
"search_index": 0,
|
|
||||||
"set_only_once": 0,
|
|
||||||
"unique": 0,
|
|
||||||
"width": "250px"
|
"width": "250px"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"allow_on_submit": 0,
|
|
||||||
"bold": 0,
|
|
||||||
"collapsible": 0,
|
|
||||||
"columns": 3,
|
"columns": 3,
|
||||||
"fieldname": "reference_name",
|
"fieldname": "reference_name",
|
||||||
"fieldtype": "Dynamic Link",
|
"fieldtype": "Dynamic Link",
|
||||||
"hidden": 0,
|
|
||||||
"ignore_user_permissions": 0,
|
|
||||||
"ignore_xss_filter": 0,
|
|
||||||
"in_filter": 0,
|
|
||||||
"in_list_view": 1,
|
"in_list_view": 1,
|
||||||
"label": "Reference Name",
|
"label": "Reference Name",
|
||||||
"length": 0,
|
|
||||||
"no_copy": 1,
|
"no_copy": 1,
|
||||||
"options": "reference_type",
|
"options": "reference_type",
|
||||||
"permlevel": 0,
|
|
||||||
"precision": "",
|
|
||||||
"print_hide": 1,
|
"print_hide": 1,
|
||||||
"print_hide_if_no_value": 0,
|
"read_only": 1
|
||||||
"read_only": 1,
|
|
||||||
"report_hide": 0,
|
|
||||||
"reqd": 0,
|
|
||||||
"search_index": 0,
|
|
||||||
"set_only_once": 0,
|
|
||||||
"unique": 0
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"allow_on_submit": 0,
|
|
||||||
"bold": 0,
|
|
||||||
"collapsible": 0,
|
|
||||||
"columns": 3,
|
"columns": 3,
|
||||||
"fieldname": "remarks",
|
"fieldname": "remarks",
|
||||||
"fieldtype": "Text",
|
"fieldtype": "Text",
|
||||||
"hidden": 0,
|
|
||||||
"ignore_user_permissions": 0,
|
|
||||||
"ignore_xss_filter": 0,
|
|
||||||
"in_filter": 0,
|
|
||||||
"in_list_view": 1,
|
"in_list_view": 1,
|
||||||
"label": "Remarks",
|
"label": "Remarks",
|
||||||
"length": 0,
|
|
||||||
"no_copy": 1,
|
"no_copy": 1,
|
||||||
"oldfieldname": "remarks",
|
"oldfieldname": "remarks",
|
||||||
"oldfieldtype": "Small Text",
|
"oldfieldtype": "Small Text",
|
||||||
"permlevel": 0,
|
|
||||||
"print_hide": 0,
|
|
||||||
"print_hide_if_no_value": 0,
|
|
||||||
"print_width": "150px",
|
"print_width": "150px",
|
||||||
"read_only": 1,
|
"read_only": 1,
|
||||||
"report_hide": 0,
|
|
||||||
"reqd": 0,
|
|
||||||
"search_index": 0,
|
|
||||||
"set_only_once": 0,
|
|
||||||
"unique": 0,
|
|
||||||
"width": "150px"
|
"width": "150px"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"allow_on_submit": 0,
|
|
||||||
"bold": 0,
|
|
||||||
"collapsible": 0,
|
|
||||||
"columns": 0,
|
|
||||||
"fieldname": "reference_row",
|
"fieldname": "reference_row",
|
||||||
"fieldtype": "Data",
|
"fieldtype": "Data",
|
||||||
"hidden": 1,
|
"hidden": 1,
|
||||||
"ignore_user_permissions": 0,
|
|
||||||
"ignore_xss_filter": 0,
|
|
||||||
"in_filter": 0,
|
|
||||||
"in_list_view": 0,
|
|
||||||
"label": "Reference Row",
|
"label": "Reference Row",
|
||||||
"length": 0,
|
|
||||||
"no_copy": 1,
|
"no_copy": 1,
|
||||||
"oldfieldname": "jv_detail_no",
|
"oldfieldname": "jv_detail_no",
|
||||||
"oldfieldtype": "Data",
|
"oldfieldtype": "Data",
|
||||||
"permlevel": 0,
|
|
||||||
"print_hide": 1,
|
"print_hide": 1,
|
||||||
"print_hide_if_no_value": 0,
|
|
||||||
"print_width": "120px",
|
"print_width": "120px",
|
||||||
"read_only": 1,
|
"read_only": 1,
|
||||||
"report_hide": 0,
|
|
||||||
"reqd": 0,
|
|
||||||
"search_index": 0,
|
|
||||||
"set_only_once": 0,
|
|
||||||
"unique": 0,
|
|
||||||
"width": "120px"
|
"width": "120px"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"allow_on_submit": 0,
|
|
||||||
"bold": 0,
|
|
||||||
"collapsible": 0,
|
|
||||||
"columns": 0,
|
|
||||||
"fieldname": "col_break1",
|
"fieldname": "col_break1",
|
||||||
"fieldtype": "Column Break",
|
"fieldtype": "Column Break"
|
||||||
"hidden": 0,
|
|
||||||
"ignore_user_permissions": 0,
|
|
||||||
"ignore_xss_filter": 0,
|
|
||||||
"in_filter": 0,
|
|
||||||
"in_list_view": 0,
|
|
||||||
"length": 0,
|
|
||||||
"no_copy": 0,
|
|
||||||
"permlevel": 0,
|
|
||||||
"print_hide": 0,
|
|
||||||
"print_hide_if_no_value": 0,
|
|
||||||
"read_only": 0,
|
|
||||||
"report_hide": 0,
|
|
||||||
"reqd": 0,
|
|
||||||
"search_index": 0,
|
|
||||||
"set_only_once": 0,
|
|
||||||
"unique": 0
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"allow_on_submit": 0,
|
|
||||||
"bold": 0,
|
|
||||||
"collapsible": 0,
|
|
||||||
"columns": 2,
|
"columns": 2,
|
||||||
"fieldname": "advance_amount",
|
"fieldname": "advance_amount",
|
||||||
"fieldtype": "Currency",
|
"fieldtype": "Currency",
|
||||||
"hidden": 0,
|
|
||||||
"ignore_user_permissions": 0,
|
|
||||||
"ignore_xss_filter": 0,
|
|
||||||
"in_filter": 0,
|
|
||||||
"in_list_view": 1,
|
"in_list_view": 1,
|
||||||
"label": "Advance amount",
|
"label": "Advance amount",
|
||||||
"length": 0,
|
|
||||||
"no_copy": 1,
|
"no_copy": 1,
|
||||||
"oldfieldname": "advance_amount",
|
"oldfieldname": "advance_amount",
|
||||||
"oldfieldtype": "Currency",
|
"oldfieldtype": "Currency",
|
||||||
"options": "party_account_currency",
|
"options": "party_account_currency",
|
||||||
"permlevel": 0,
|
|
||||||
"print_hide": 0,
|
|
||||||
"print_hide_if_no_value": 0,
|
|
||||||
"print_width": "120px",
|
"print_width": "120px",
|
||||||
"read_only": 1,
|
"read_only": 1,
|
||||||
"report_hide": 0,
|
|
||||||
"reqd": 0,
|
|
||||||
"search_index": 0,
|
|
||||||
"set_only_once": 0,
|
|
||||||
"unique": 0,
|
|
||||||
"width": "120px"
|
"width": "120px"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"allow_on_submit": 0,
|
|
||||||
"bold": 0,
|
|
||||||
"collapsible": 0,
|
|
||||||
"columns": 2,
|
"columns": 2,
|
||||||
"fieldname": "allocated_amount",
|
"fieldname": "allocated_amount",
|
||||||
"fieldtype": "Currency",
|
"fieldtype": "Currency",
|
||||||
"hidden": 0,
|
|
||||||
"ignore_user_permissions": 0,
|
|
||||||
"ignore_xss_filter": 0,
|
|
||||||
"in_filter": 0,
|
|
||||||
"in_list_view": 1,
|
"in_list_view": 1,
|
||||||
"label": "Allocated amount",
|
"label": "Allocated amount",
|
||||||
"length": 0,
|
|
||||||
"no_copy": 1,
|
"no_copy": 1,
|
||||||
"oldfieldname": "allocated_amount",
|
"oldfieldname": "allocated_amount",
|
||||||
"oldfieldtype": "Currency",
|
"oldfieldtype": "Currency",
|
||||||
"options": "party_account_currency",
|
"options": "party_account_currency",
|
||||||
"permlevel": 0,
|
|
||||||
"print_hide": 0,
|
|
||||||
"print_hide_if_no_value": 0,
|
|
||||||
"print_width": "120px",
|
"print_width": "120px",
|
||||||
"read_only": 0,
|
|
||||||
"report_hide": 0,
|
|
||||||
"reqd": 0,
|
|
||||||
"search_index": 0,
|
|
||||||
"set_only_once": 0,
|
|
||||||
"unique": 0,
|
|
||||||
"width": "120px"
|
"width": "120px"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "exchange_gain_loss",
|
||||||
|
"fieldtype": "Currency",
|
||||||
|
"label": "Exchange Gain/Loss",
|
||||||
|
"options": "Company:company:default_currency",
|
||||||
|
"read_only": 1
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "ref_exchange_rate",
|
||||||
|
"fieldtype": "Float",
|
||||||
|
"label": "Reference Exchange Rate",
|
||||||
|
"non_negative": 1,
|
||||||
|
"read_only": 1
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"hide_heading": 0,
|
|
||||||
"hide_toolbar": 0,
|
|
||||||
"idx": 1,
|
"idx": 1,
|
||||||
"image_view": 0,
|
"index_web_pages_for_search": 1,
|
||||||
"in_create": 0,
|
|
||||||
|
|
||||||
"is_submittable": 0,
|
|
||||||
"issingle": 0,
|
|
||||||
"istable": 1,
|
"istable": 1,
|
||||||
"max_attachments": 0,
|
"links": [],
|
||||||
"menu_index": 0,
|
"modified": "2021-06-04 20:25:49.832052",
|
||||||
"modified": "2016-08-26 02:36:10.718057",
|
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "Accounts",
|
"module": "Accounts",
|
||||||
"name": "Sales Invoice Advance",
|
"name": "Sales Invoice Advance",
|
||||||
"owner": "Administrator",
|
"owner": "Administrator",
|
||||||
"permissions": [],
|
"permissions": [],
|
||||||
"quick_entry": 1,
|
"quick_entry": 1,
|
||||||
"read_only": 0,
|
"sort_field": "modified",
|
||||||
"read_only_onload": 0,
|
"sort_order": "DESC"
|
||||||
"sort_order": "DESC",
|
|
||||||
"track_seen": 0
|
|
||||||
}
|
}
|
@ -743,7 +743,6 @@
|
|||||||
"fieldname": "asset",
|
"fieldname": "asset",
|
||||||
"fieldtype": "Link",
|
"fieldtype": "Link",
|
||||||
"label": "Asset",
|
"label": "Asset",
|
||||||
"no_copy": 1,
|
|
||||||
"options": "Asset"
|
"options": "Asset"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -826,7 +825,7 @@
|
|||||||
"idx": 1,
|
"idx": 1,
|
||||||
"istable": 1,
|
"istable": 1,
|
||||||
"links": [],
|
"links": [],
|
||||||
"modified": "2021-02-23 01:05:22.123527",
|
"modified": "2021-06-21 23:03:11.599901",
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "Accounts",
|
"module": "Accounts",
|
||||||
"name": "Sales Invoice Item",
|
"name": "Sales Invoice Item",
|
||||||
|
@ -0,0 +1,34 @@
|
|||||||
|
{
|
||||||
|
"actions": [],
|
||||||
|
"autoname": "account",
|
||||||
|
"creation": "2021-07-08 22:04:24.634967",
|
||||||
|
"doctype": "DocType",
|
||||||
|
"editable_grid": 1,
|
||||||
|
"engine": "InnoDB",
|
||||||
|
"field_order": [
|
||||||
|
"account"
|
||||||
|
],
|
||||||
|
"fields": [
|
||||||
|
{
|
||||||
|
"allow_in_quick_entry": 1,
|
||||||
|
"fieldname": "account",
|
||||||
|
"fieldtype": "Link",
|
||||||
|
"in_list_view": 1,
|
||||||
|
"in_preview": 1,
|
||||||
|
"label": "Account",
|
||||||
|
"options": "Account"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"index_web_pages_for_search": 1,
|
||||||
|
"istable": 1,
|
||||||
|
"links": [],
|
||||||
|
"modified": "2021-07-08 22:35:33.202911",
|
||||||
|
"modified_by": "Administrator",
|
||||||
|
"module": "Accounts",
|
||||||
|
"name": "South Africa VAT Account",
|
||||||
|
"owner": "Administrator",
|
||||||
|
"permissions": [],
|
||||||
|
"sort_field": "modified",
|
||||||
|
"sort_order": "DESC",
|
||||||
|
"track_changes": 1
|
||||||
|
}
|
@ -0,0 +1,8 @@
|
|||||||
|
# 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 SouthAfricaVATAccount(Document):
|
||||||
|
pass
|
@ -1,24 +1,6 @@
|
|||||||
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
|
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
|
||||||
// License: GNU General Public License v3. See license.txt
|
// License: GNU General Public License v3. See license.txt
|
||||||
|
|
||||||
cur_frm.add_fetch("customer", "customer_group", "customer_group" );
|
|
||||||
cur_frm.add_fetch("supplier", "supplier_group_name", "supplier_group" );
|
|
||||||
|
|
||||||
frappe.ui.form.on("Tax Rule", "tax_type", function(frm) {
|
|
||||||
frm.toggle_reqd("sales_tax_template", frm.doc.tax_type=="Sales");
|
|
||||||
frm.toggle_reqd("purchase_tax_template", frm.doc.tax_type=="Purchase");
|
|
||||||
})
|
|
||||||
|
|
||||||
frappe.ui.form.on("Tax Rule", "onload", function(frm) {
|
|
||||||
if(frm.doc.__islocal) {
|
|
||||||
frm.set_value("use_for_shopping_cart", 1);
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
frappe.ui.form.on("Tax Rule", "refresh", function(frm) {
|
|
||||||
frappe.ui.form.trigger("Tax Rule", "tax_type");
|
|
||||||
})
|
|
||||||
|
|
||||||
frappe.ui.form.on("Tax Rule", "customer", function(frm) {
|
frappe.ui.form.on("Tax Rule", "customer", function(frm) {
|
||||||
if(frm.doc.customer) {
|
if(frm.doc.customer) {
|
||||||
frappe.call({
|
frappe.call({
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -50,7 +50,7 @@ class TestTaxRule(unittest.TestCase):
|
|||||||
tax_rule1 = make_tax_rule(customer_group= "All Customer Groups",
|
tax_rule1 = make_tax_rule(customer_group= "All Customer Groups",
|
||||||
sales_tax_template = "_Test Sales Taxes and Charges Template - _TC", priority = 1, from_date = "2015-01-01")
|
sales_tax_template = "_Test Sales Taxes and Charges Template - _TC", priority = 1, from_date = "2015-01-01")
|
||||||
tax_rule1.save()
|
tax_rule1.save()
|
||||||
self.assertEqual(get_tax_template("2015-01-01", {"customer_group" : "Commercial", "use_for_shopping_cart":0}),
|
self.assertEqual(get_tax_template("2015-01-01", {"customer_group" : "Commercial", "use_for_shopping_cart":1}),
|
||||||
"_Test Sales Taxes and Charges Template - _TC")
|
"_Test Sales Taxes and Charges Template - _TC")
|
||||||
|
|
||||||
def test_conflict_with_overlapping_dates(self):
|
def test_conflict_with_overlapping_dates(self):
|
||||||
|
@ -542,6 +542,7 @@ def get_dashboard_info(party_type, party, loyalty_program=None):
|
|||||||
select company, sum(debit_in_account_currency) - sum(credit_in_account_currency)
|
select company, sum(debit_in_account_currency) - sum(credit_in_account_currency)
|
||||||
from `tabGL Entry`
|
from `tabGL Entry`
|
||||||
where party_type = %s and party=%s
|
where party_type = %s and party=%s
|
||||||
|
and is_cancelled = 0
|
||||||
group by company""", (party_type, party)))
|
group by company""", (party_type, party)))
|
||||||
|
|
||||||
for d in companies:
|
for d in companies:
|
||||||
|
@ -397,6 +397,7 @@ def get_chart_data(filters, columns, data):
|
|||||||
{'name': 'Budget', 'chartType': 'bar', 'values': budget_values},
|
{'name': 'Budget', 'chartType': 'bar', 'values': budget_values},
|
||||||
{'name': 'Actual Expense', 'chartType': 'bar', 'values': actual_values}
|
{'name': 'Actual Expense', 'chartType': 'bar', 'values': actual_values}
|
||||||
]
|
]
|
||||||
}
|
},
|
||||||
|
'type' : 'bar'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -380,7 +380,7 @@ def set_gl_entries_by_account(from_date, to_date, root_lft, root_rgt, filters, g
|
|||||||
gl_entries = frappe.db.sql("""select gl.posting_date, gl.account, gl.debit, gl.credit, gl.is_opening, gl.company,
|
gl_entries = frappe.db.sql("""select gl.posting_date, gl.account, gl.debit, gl.credit, gl.is_opening, gl.company,
|
||||||
gl.fiscal_year, gl.debit_in_account_currency, gl.credit_in_account_currency, gl.account_currency,
|
gl.fiscal_year, gl.debit_in_account_currency, gl.credit_in_account_currency, gl.account_currency,
|
||||||
acc.account_name, acc.account_number
|
acc.account_name, acc.account_number
|
||||||
from `tabGL Entry` gl, `tabAccount` acc where acc.name = gl.account and gl.company = %(company)s
|
from `tabGL Entry` gl, `tabAccount` acc where acc.name = gl.account and gl.company = %(company)s and gl.is_cancelled = 0
|
||||||
{additional_conditions} and gl.posting_date <= %(to_date)s and acc.lft >= %(lft)s and acc.rgt <= %(rgt)s
|
{additional_conditions} and gl.posting_date <= %(to_date)s and acc.lft >= %(lft)s and acc.rgt <= %(rgt)s
|
||||||
order by gl.account, gl.posting_date""".format(additional_conditions=additional_conditions),
|
order by gl.account, gl.posting_date""".format(additional_conditions=additional_conditions),
|
||||||
{
|
{
|
||||||
|
@ -49,16 +49,17 @@ def validate_filters(filters, account_details):
|
|||||||
if not filters.get("from_date") and not filters.get("to_date"):
|
if not filters.get("from_date") and not filters.get("to_date"):
|
||||||
frappe.throw(_("{0} and {1} are mandatory").format(frappe.bold(_("From Date")), frappe.bold(_("To Date"))))
|
frappe.throw(_("{0} and {1} are mandatory").format(frappe.bold(_("From Date")), frappe.bold(_("To Date"))))
|
||||||
|
|
||||||
|
if filters.get('account'):
|
||||||
|
filters.account = frappe.parse_json(filters.get('account'))
|
||||||
for account in filters.account:
|
for account in filters.account:
|
||||||
if not account_details.get(account):
|
if not account_details.get(account):
|
||||||
frappe.throw(_("Account {0} does not exists").format(account))
|
frappe.throw(_("Account {0} does not exists").format(account))
|
||||||
|
|
||||||
if filters.get('account'):
|
if (filters.get("account") and filters.get("group_by") == _('Group by Account')):
|
||||||
filters.account = frappe.parse_json(filters.get('account'))
|
filters.account = frappe.parse_json(filters.get('account'))
|
||||||
|
for account in filters.account:
|
||||||
if (filters.get("account") and filters.get("group_by") == _('Group by Account')
|
if account_details[account].is_group == 0:
|
||||||
and account_details[filters.account].is_group == 0):
|
frappe.throw(_("Can not filter based on Child Account, if grouped by Account"))
|
||||||
frappe.throw(_("Can not filter based on Account, if grouped by Account"))
|
|
||||||
|
|
||||||
if (filters.get("voucher_no")
|
if (filters.get("voucher_no")
|
||||||
and filters.get("group_by") in [_('Group by Voucher')]):
|
and filters.get("group_by") in [_('Group by Voucher')]):
|
||||||
|
@ -75,7 +75,8 @@ def get_invoice_and_tds_amount(supplier, account, company, from_date, to_date, f
|
|||||||
select voucher_no, credit
|
select voucher_no, credit
|
||||||
from `tabGL Entry`
|
from `tabGL Entry`
|
||||||
where party in (%s) and credit > 0
|
where party in (%s) and credit > 0
|
||||||
and company=%s and posting_date between %s and %s
|
and company=%s and is_cancelled = 0
|
||||||
|
and posting_date between %s and %s
|
||||||
""", (supplier, company, from_date, to_date), as_dict=1)
|
""", (supplier, company, from_date, to_date), as_dict=1)
|
||||||
|
|
||||||
supplier_credit_amount = flt(sum(d.credit for d in entries))
|
supplier_credit_amount = flt(sum(d.credit for d in entries))
|
||||||
|
@ -472,7 +472,8 @@ def update_reference_in_payment_entry(d, payment_entry, do_not_save=False):
|
|||||||
"total_amount": d.grand_total,
|
"total_amount": d.grand_total,
|
||||||
"outstanding_amount": d.outstanding_amount,
|
"outstanding_amount": d.outstanding_amount,
|
||||||
"allocated_amount": d.allocated_amount,
|
"allocated_amount": d.allocated_amount,
|
||||||
"exchange_rate": d.exchange_rate
|
"exchange_rate": d.exchange_rate if not d.exchange_gain_loss else payment_entry.get_exchange_rate(),
|
||||||
|
"exchange_gain_loss": d.exchange_gain_loss # only populated from invoice in case of advance allocation
|
||||||
}
|
}
|
||||||
|
|
||||||
if d.voucher_detail_no:
|
if d.voucher_detail_no:
|
||||||
@ -498,12 +499,15 @@ def update_reference_in_payment_entry(d, payment_entry, do_not_save=False):
|
|||||||
payment_entry.set_amounts()
|
payment_entry.set_amounts()
|
||||||
|
|
||||||
if d.difference_amount and d.difference_account:
|
if d.difference_amount and d.difference_account:
|
||||||
payment_entry.set_gain_or_loss(account_details={
|
account_details = {
|
||||||
'account': d.difference_account,
|
'account': d.difference_account,
|
||||||
'cost_center': payment_entry.cost_center or frappe.get_cached_value('Company',
|
'cost_center': payment_entry.cost_center or frappe.get_cached_value('Company',
|
||||||
payment_entry.company, "cost_center"),
|
payment_entry.company, "cost_center")
|
||||||
'amount': d.difference_amount
|
}
|
||||||
})
|
if d.difference_amount:
|
||||||
|
account_details['amount'] = d.difference_amount
|
||||||
|
|
||||||
|
payment_entry.set_gain_or_loss(account_details=account_details)
|
||||||
|
|
||||||
if not do_not_save:
|
if not do_not_save:
|
||||||
payment_entry.save(ignore_permissions=True)
|
payment_entry.save(ignore_permissions=True)
|
||||||
@ -784,7 +788,7 @@ def get_children(doctype, parent, company, is_root=False):
|
|||||||
return acc
|
return acc
|
||||||
|
|
||||||
def create_payment_gateway_account(gateway, payment_channel="Email"):
|
def create_payment_gateway_account(gateway, payment_channel="Email"):
|
||||||
from erpnext.setup.setup_wizard.operations.company_setup import create_bank_account
|
from erpnext.setup.setup_wizard.operations.install_fixtures import create_bank_account
|
||||||
|
|
||||||
company = frappe.db.get_value("Global Defaults", None, "default_company")
|
company = frappe.db.get_value("Global Defaults", None, "default_company")
|
||||||
if not company:
|
if not company:
|
||||||
|
@ -82,24 +82,46 @@ frappe.ui.form.on('Asset', {
|
|||||||
if (in_list(["Submitted", "Partially Depreciated", "Fully Depreciated"], frm.doc.status)) {
|
if (in_list(["Submitted", "Partially Depreciated", "Fully Depreciated"], frm.doc.status)) {
|
||||||
frm.add_custom_button("Transfer Asset", function() {
|
frm.add_custom_button("Transfer Asset", function() {
|
||||||
erpnext.asset.transfer_asset(frm);
|
erpnext.asset.transfer_asset(frm);
|
||||||
});
|
}, __("Manage"));
|
||||||
|
|
||||||
frm.add_custom_button("Scrap Asset", function() {
|
frm.add_custom_button("Scrap Asset", function() {
|
||||||
erpnext.asset.scrap_asset(frm);
|
erpnext.asset.scrap_asset(frm);
|
||||||
});
|
}, __("Manage"));
|
||||||
|
|
||||||
frm.add_custom_button("Sell Asset", function() {
|
frm.add_custom_button("Sell Asset", function() {
|
||||||
frm.trigger("make_sales_invoice");
|
frm.trigger("make_sales_invoice");
|
||||||
});
|
}, __("Manage"));
|
||||||
|
|
||||||
} else if (frm.doc.status=='Scrapped') {
|
} else if (frm.doc.status=='Scrapped') {
|
||||||
frm.add_custom_button("Restore Asset", function() {
|
frm.add_custom_button("Restore Asset", function() {
|
||||||
erpnext.asset.restore_asset(frm);
|
erpnext.asset.restore_asset(frm);
|
||||||
});
|
}, __("Manage"));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (frm.doc.maintenance_required && !frm.doc.maintenance_schedule) {
|
||||||
|
frm.add_custom_button(__("Maintain Asset"), function() {
|
||||||
|
frm.trigger("create_asset_maintenance");
|
||||||
|
}, __("Manage"));
|
||||||
|
}
|
||||||
|
|
||||||
|
frm.add_custom_button(__("Repair Asset"), function() {
|
||||||
|
frm.trigger("create_asset_repair");
|
||||||
|
}, __("Manage"));
|
||||||
|
|
||||||
|
if (frm.doc.status != 'Fully Depreciated') {
|
||||||
|
frm.add_custom_button(__("Adjust Asset Value"), function() {
|
||||||
|
frm.trigger("create_asset_adjustment");
|
||||||
|
}, __("Manage"));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!frm.doc.calculate_depreciation) {
|
||||||
|
frm.add_custom_button(__("Create Depreciation Entry"), function() {
|
||||||
|
frm.trigger("make_journal_entry");
|
||||||
|
}, __("Manage"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (frm.doc.purchase_receipt || !frm.doc.is_existing_asset) {
|
if (frm.doc.purchase_receipt || !frm.doc.is_existing_asset) {
|
||||||
frm.add_custom_button("General Ledger", function() {
|
frm.add_custom_button("View General Ledger", function() {
|
||||||
frappe.route_options = {
|
frappe.route_options = {
|
||||||
"voucher_no": frm.doc.name,
|
"voucher_no": frm.doc.name,
|
||||||
"from_date": frm.doc.available_for_use_date,
|
"from_date": frm.doc.available_for_use_date,
|
||||||
@ -107,27 +129,9 @@ frappe.ui.form.on('Asset', {
|
|||||||
"company": frm.doc.company
|
"company": frm.doc.company
|
||||||
};
|
};
|
||||||
frappe.set_route("query-report", "General Ledger");
|
frappe.set_route("query-report", "General Ledger");
|
||||||
});
|
}, __("Manage"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (frm.doc.maintenance_required && !frm.doc.maintenance_schedule) {
|
|
||||||
frm.add_custom_button(__("Asset Maintenance"), function() {
|
|
||||||
frm.trigger("create_asset_maintenance");
|
|
||||||
}, __('Create'));
|
|
||||||
}
|
|
||||||
if (frm.doc.status != 'Fully Depreciated') {
|
|
||||||
frm.add_custom_button(__("Asset Value Adjustment"), function() {
|
|
||||||
frm.trigger("create_asset_adjustment");
|
|
||||||
}, __('Create'));
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!frm.doc.calculate_depreciation) {
|
|
||||||
frm.add_custom_button(__("Depreciation Entry"), function() {
|
|
||||||
frm.trigger("make_journal_entry");
|
|
||||||
}, __('Create'));
|
|
||||||
}
|
|
||||||
|
|
||||||
frm.page.set_inner_btn_group_as_primary(__('Create'));
|
|
||||||
frm.trigger("setup_chart");
|
frm.trigger("setup_chart");
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -304,6 +308,20 @@ frappe.ui.form.on('Asset', {
|
|||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
|
||||||
|
create_asset_repair: function(frm) {
|
||||||
|
frappe.call({
|
||||||
|
args: {
|
||||||
|
"asset": frm.doc.name,
|
||||||
|
"asset_name": frm.doc.asset_name
|
||||||
|
},
|
||||||
|
method: "erpnext.assets.doctype.asset.asset.create_asset_repair",
|
||||||
|
callback: function(r) {
|
||||||
|
var doclist = frappe.model.sync(r.message);
|
||||||
|
frappe.set_route("Form", doclist[0].doctype, doclist[0].name);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
},
|
||||||
|
|
||||||
create_asset_adjustment: function(frm) {
|
create_asset_adjustment: function(frm) {
|
||||||
frappe.call({
|
frappe.call({
|
||||||
args: {
|
args: {
|
||||||
|
@ -502,7 +502,7 @@
|
|||||||
"link_fieldname": "asset"
|
"link_fieldname": "asset"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"modified": "2021-01-22 12:38:59.091510",
|
"modified": "2021-06-24 14:58:51.097908",
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "Assets",
|
"module": "Assets",
|
||||||
"name": "Asset",
|
"name": "Asset",
|
||||||
|
@ -168,15 +168,22 @@ class Asset(AccountsController):
|
|||||||
d.precision("rate_of_depreciation"))
|
d.precision("rate_of_depreciation"))
|
||||||
|
|
||||||
def make_depreciation_schedule(self):
|
def make_depreciation_schedule(self):
|
||||||
if 'Manual' not in [d.depreciation_method for d in self.finance_books]:
|
if 'Manual' not in [d.depreciation_method for d in self.finance_books] and not self.schedules:
|
||||||
self.schedules = []
|
self.schedules = []
|
||||||
|
|
||||||
if self.get("schedules") or not self.available_for_use_date:
|
if not self.available_for_use_date:
|
||||||
return
|
return
|
||||||
|
|
||||||
for d in self.get('finance_books'):
|
for d in self.get('finance_books'):
|
||||||
self.validate_asset_finance_books(d)
|
self.validate_asset_finance_books(d)
|
||||||
|
|
||||||
|
start = self.clear_depreciation_schedule()
|
||||||
|
|
||||||
|
# value_after_depreciation - current Asset value
|
||||||
|
if d.value_after_depreciation:
|
||||||
|
value_after_depreciation = (flt(d.value_after_depreciation) -
|
||||||
|
flt(self.opening_accumulated_depreciation))
|
||||||
|
else:
|
||||||
value_after_depreciation = (flt(self.gross_purchase_amount) -
|
value_after_depreciation = (flt(self.gross_purchase_amount) -
|
||||||
flt(self.opening_accumulated_depreciation))
|
flt(self.opening_accumulated_depreciation))
|
||||||
|
|
||||||
@ -191,7 +198,7 @@ class Asset(AccountsController):
|
|||||||
number_of_pending_depreciations += 1
|
number_of_pending_depreciations += 1
|
||||||
|
|
||||||
skip_row = False
|
skip_row = False
|
||||||
for n in range(number_of_pending_depreciations):
|
for n in range(start, number_of_pending_depreciations):
|
||||||
# If depreciation is already completed (for double declining balance)
|
# If depreciation is already completed (for double declining balance)
|
||||||
if skip_row: continue
|
if skip_row: continue
|
||||||
|
|
||||||
@ -216,11 +223,13 @@ class Asset(AccountsController):
|
|||||||
|
|
||||||
# For last row
|
# For last row
|
||||||
elif has_pro_rata and n == cint(number_of_pending_depreciations) - 1:
|
elif has_pro_rata and n == cint(number_of_pending_depreciations) - 1:
|
||||||
to_date = add_months(self.available_for_use_date,
|
if not self.flags.increase_in_asset_life:
|
||||||
|
# In case of increase_in_asset_life, the self.to_date is already set on asset_repair submission
|
||||||
|
self.to_date = add_months(self.available_for_use_date,
|
||||||
n * cint(d.frequency_of_depreciation))
|
n * cint(d.frequency_of_depreciation))
|
||||||
|
|
||||||
depreciation_amount, days, months = self.get_pro_rata_amt(d,
|
depreciation_amount, days, months = self.get_pro_rata_amt(d,
|
||||||
depreciation_amount, schedule_date, to_date)
|
depreciation_amount, schedule_date, self.to_date)
|
||||||
|
|
||||||
monthly_schedule_date = add_months(schedule_date, 1)
|
monthly_schedule_date = add_months(schedule_date, 1)
|
||||||
|
|
||||||
@ -284,10 +293,23 @@ class Asset(AccountsController):
|
|||||||
"finance_book_id": d.idx
|
"finance_book_id": d.idx
|
||||||
})
|
})
|
||||||
|
|
||||||
|
# used when depreciation schedule needs to be modified due to increase in asset life
|
||||||
|
def clear_depreciation_schedule(self):
|
||||||
|
start = 0
|
||||||
|
for n in range(len(self.schedules)):
|
||||||
|
if not self.schedules[n].journal_entry:
|
||||||
|
del self.schedules[n:]
|
||||||
|
start = n
|
||||||
|
break
|
||||||
|
return start
|
||||||
|
|
||||||
|
|
||||||
|
# if it returns True, depreciation_amount will not be equal for the first and last rows
|
||||||
def check_is_pro_rata(self, row):
|
def check_is_pro_rata(self, row):
|
||||||
has_pro_rata = False
|
has_pro_rata = False
|
||||||
|
|
||||||
days = date_diff(row.depreciation_start_date, self.available_for_use_date) + 1
|
days = date_diff(row.depreciation_start_date, self.available_for_use_date) + 1
|
||||||
|
|
||||||
|
# if frequency_of_depreciation is 12 months, total_days = 365
|
||||||
total_days = get_total_days(row.depreciation_start_date, row.frequency_of_depreciation)
|
total_days = get_total_days(row.depreciation_start_date, row.frequency_of_depreciation)
|
||||||
|
|
||||||
if days < total_days:
|
if days < total_days:
|
||||||
@ -346,11 +368,12 @@ class Asset(AccountsController):
|
|||||||
if d.finance_book_id not in finance_books:
|
if d.finance_book_id not in finance_books:
|
||||||
accumulated_depreciation = flt(self.opening_accumulated_depreciation)
|
accumulated_depreciation = flt(self.opening_accumulated_depreciation)
|
||||||
value_after_depreciation = flt(self.get_value_after_depreciation(d.finance_book_id))
|
value_after_depreciation = flt(self.get_value_after_depreciation(d.finance_book_id))
|
||||||
finance_books.append(d.finance_book_id)
|
finance_books.append(int(d.finance_book_id))
|
||||||
|
|
||||||
depreciation_amount = flt(d.depreciation_amount, d.precision("depreciation_amount"))
|
depreciation_amount = flt(d.depreciation_amount, d.precision("depreciation_amount"))
|
||||||
value_after_depreciation -= flt(depreciation_amount)
|
value_after_depreciation -= flt(depreciation_amount)
|
||||||
|
|
||||||
|
# for the last row, if depreciation method = Straight Line
|
||||||
if straight_line_idx and i == max(straight_line_idx) - 1:
|
if straight_line_idx and i == max(straight_line_idx) - 1:
|
||||||
book = self.get('finance_books')[cint(d.finance_book_id) - 1]
|
book = self.get('finance_books')[cint(d.finance_book_id) - 1]
|
||||||
depreciation_amount += flt(value_after_depreciation -
|
depreciation_amount += flt(value_after_depreciation -
|
||||||
@ -625,9 +648,18 @@ def create_asset_maintenance(asset, item_code, item_name, asset_category, compan
|
|||||||
})
|
})
|
||||||
return asset_maintenance
|
return asset_maintenance
|
||||||
|
|
||||||
|
@frappe.whitelist()
|
||||||
|
def create_asset_repair(asset, asset_name):
|
||||||
|
asset_repair = frappe.new_doc("Asset Repair")
|
||||||
|
asset_repair.update({
|
||||||
|
"asset": asset,
|
||||||
|
"asset_name": asset_name
|
||||||
|
})
|
||||||
|
return asset_repair
|
||||||
|
|
||||||
@frappe.whitelist()
|
@frappe.whitelist()
|
||||||
def create_asset_adjustment(asset, asset_category, company):
|
def create_asset_adjustment(asset, asset_category, company):
|
||||||
asset_maintenance = frappe.new_doc("Asset Value Adjustment")
|
asset_maintenance = frappe.get_doc("Asset Value Adjustment")
|
||||||
asset_maintenance.update({
|
asset_maintenance.update({
|
||||||
"asset": asset,
|
"asset": asset,
|
||||||
"company": company,
|
"company": company,
|
||||||
@ -757,8 +789,15 @@ def get_depreciation_amount(asset, depreciable_value, row):
|
|||||||
depreciation_left = flt(row.total_number_of_depreciations) - flt(asset.number_of_depreciations_booked)
|
depreciation_left = flt(row.total_number_of_depreciations) - flt(asset.number_of_depreciations_booked)
|
||||||
|
|
||||||
if row.depreciation_method in ("Straight Line", "Manual"):
|
if row.depreciation_method in ("Straight Line", "Manual"):
|
||||||
|
# if the Depreciation Schedule is being prepared for the first time
|
||||||
|
if not asset.flags.increase_in_asset_life:
|
||||||
depreciation_amount = (flt(row.value_after_depreciation) -
|
depreciation_amount = (flt(row.value_after_depreciation) -
|
||||||
flt(row.expected_value_after_useful_life)) / depreciation_left
|
flt(row.expected_value_after_useful_life)) / depreciation_left
|
||||||
|
|
||||||
|
# if the Depreciation Schedule is being modified after Asset Repair
|
||||||
|
else:
|
||||||
|
depreciation_amount = (flt(row.value_after_depreciation) -
|
||||||
|
flt(row.expected_value_after_useful_life)) / (date_diff(asset.to_date, asset.available_for_use_date) / 365)
|
||||||
else:
|
else:
|
||||||
depreciation_amount = flt(depreciable_value * (flt(row.rate_of_depreciation) / 100))
|
depreciation_amount = flt(depreciable_value * (flt(row.rate_of_depreciation) / 100))
|
||||||
|
|
||||||
|
@ -176,22 +176,34 @@ def restore_asset(asset_name):
|
|||||||
|
|
||||||
asset.set_status()
|
asset.set_status()
|
||||||
|
|
||||||
@frappe.whitelist()
|
def get_gl_entries_on_asset_regain(asset, selling_amount=0, finance_book=None):
|
||||||
|
fixed_asset_account, asset, depreciation_cost_center, accumulated_depr_account, accumulated_depr_amount, disposal_account, value_after_depreciation = \
|
||||||
|
get_asset_details(asset, finance_book)
|
||||||
|
|
||||||
|
gl_entries = [
|
||||||
|
{
|
||||||
|
"account": fixed_asset_account,
|
||||||
|
"debit_in_account_currency": asset.gross_purchase_amount,
|
||||||
|
"debit": asset.gross_purchase_amount,
|
||||||
|
"cost_center": depreciation_cost_center
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"account": accumulated_depr_account,
|
||||||
|
"credit_in_account_currency": accumulated_depr_amount,
|
||||||
|
"credit": accumulated_depr_amount,
|
||||||
|
"cost_center": depreciation_cost_center
|
||||||
|
}
|
||||||
|
]
|
||||||
|
|
||||||
|
profit_amount = abs(flt(value_after_depreciation)) - abs(flt(selling_amount))
|
||||||
|
if profit_amount:
|
||||||
|
get_profit_gl_entries(profit_amount, gl_entries, disposal_account, depreciation_cost_center)
|
||||||
|
|
||||||
|
return gl_entries
|
||||||
|
|
||||||
def get_gl_entries_on_asset_disposal(asset, selling_amount=0, finance_book=None):
|
def get_gl_entries_on_asset_disposal(asset, selling_amount=0, finance_book=None):
|
||||||
fixed_asset_account, accumulated_depr_account, depr_expense_account = get_depreciation_accounts(asset)
|
fixed_asset_account, asset, depreciation_cost_center, accumulated_depr_account, accumulated_depr_amount, disposal_account, value_after_depreciation = \
|
||||||
disposal_account, depreciation_cost_center = get_disposal_account_and_cost_center(asset.company)
|
get_asset_details(asset, finance_book)
|
||||||
depreciation_cost_center = asset.cost_center or depreciation_cost_center
|
|
||||||
|
|
||||||
idx = 1
|
|
||||||
if finance_book:
|
|
||||||
for d in asset.finance_books:
|
|
||||||
if d.finance_book == finance_book:
|
|
||||||
idx = d.idx
|
|
||||||
break
|
|
||||||
|
|
||||||
value_after_depreciation = (asset.finance_books[idx - 1].value_after_depreciation
|
|
||||||
if asset.calculate_depreciation else asset.value_after_depreciation)
|
|
||||||
accumulated_depr_amount = flt(asset.gross_purchase_amount) - flt(value_after_depreciation)
|
|
||||||
|
|
||||||
gl_entries = [
|
gl_entries = [
|
||||||
{
|
{
|
||||||
@ -210,6 +222,29 @@ def get_gl_entries_on_asset_disposal(asset, selling_amount=0, finance_book=None)
|
|||||||
|
|
||||||
profit_amount = flt(selling_amount) - flt(value_after_depreciation)
|
profit_amount = flt(selling_amount) - flt(value_after_depreciation)
|
||||||
if profit_amount:
|
if profit_amount:
|
||||||
|
get_profit_gl_entries(profit_amount, gl_entries, disposal_account, depreciation_cost_center)
|
||||||
|
|
||||||
|
return gl_entries
|
||||||
|
|
||||||
|
def get_asset_details(asset, finance_book=None):
|
||||||
|
fixed_asset_account, accumulated_depr_account, depr_expense_account = get_depreciation_accounts(asset)
|
||||||
|
disposal_account, depreciation_cost_center = get_disposal_account_and_cost_center(asset.company)
|
||||||
|
depreciation_cost_center = asset.cost_center or depreciation_cost_center
|
||||||
|
|
||||||
|
idx = 1
|
||||||
|
if finance_book:
|
||||||
|
for d in asset.finance_books:
|
||||||
|
if d.finance_book == finance_book:
|
||||||
|
idx = d.idx
|
||||||
|
break
|
||||||
|
|
||||||
|
value_after_depreciation = (asset.finance_books[idx - 1].value_after_depreciation
|
||||||
|
if asset.calculate_depreciation else asset.value_after_depreciation)
|
||||||
|
accumulated_depr_amount = flt(asset.gross_purchase_amount) - flt(value_after_depreciation)
|
||||||
|
|
||||||
|
return fixed_asset_account, asset, depreciation_cost_center, accumulated_depr_account, accumulated_depr_amount, disposal_account, value_after_depreciation
|
||||||
|
|
||||||
|
def get_profit_gl_entries(profit_amount, gl_entries, disposal_account, depreciation_cost_center):
|
||||||
debit_or_credit = "debit" if profit_amount < 0 else "credit"
|
debit_or_credit = "debit" if profit_amount < 0 else "credit"
|
||||||
gl_entries.append({
|
gl_entries.append({
|
||||||
"account": disposal_account,
|
"account": disposal_account,
|
||||||
@ -218,8 +253,6 @@ def get_gl_entries_on_asset_disposal(asset, selling_amount=0, finance_book=None)
|
|||||||
debit_or_credit + "_in_account_currency": abs(profit_amount)
|
debit_or_credit + "_in_account_currency": abs(profit_amount)
|
||||||
})
|
})
|
||||||
|
|
||||||
return gl_entries
|
|
||||||
|
|
||||||
@frappe.whitelist()
|
@frappe.whitelist()
|
||||||
def get_disposal_account_and_cost_center(company):
|
def get_disposal_account_and_cost_center(company):
|
||||||
disposal_account, depreciation_cost_center = frappe.get_cached_value('Company', company,
|
disposal_account, depreciation_cost_center = frappe.get_cached_value('Company', company,
|
||||||
|
@ -125,7 +125,6 @@ class TestAsset(unittest.TestCase):
|
|||||||
"frequency_of_depreciation": 12,
|
"frequency_of_depreciation": 12,
|
||||||
"depreciation_start_date": "2030-12-31"
|
"depreciation_start_date": "2030-12-31"
|
||||||
})
|
})
|
||||||
asset.insert()
|
|
||||||
self.assertEqual(asset.status, "Draft")
|
self.assertEqual(asset.status, "Draft")
|
||||||
asset.save()
|
asset.save()
|
||||||
expected_schedules = [
|
expected_schedules = [
|
||||||
@ -154,9 +153,8 @@ class TestAsset(unittest.TestCase):
|
|||||||
"frequency_of_depreciation": 12,
|
"frequency_of_depreciation": 12,
|
||||||
"depreciation_start_date": '2030-12-31'
|
"depreciation_start_date": '2030-12-31'
|
||||||
})
|
})
|
||||||
asset.insert()
|
|
||||||
self.assertEqual(asset.status, "Draft")
|
|
||||||
asset.save()
|
asset.save()
|
||||||
|
self.assertEqual(asset.status, "Draft")
|
||||||
|
|
||||||
expected_schedules = [
|
expected_schedules = [
|
||||||
['2030-12-31', 66667.00, 66667.00],
|
['2030-12-31', 66667.00, 66667.00],
|
||||||
@ -185,7 +183,7 @@ class TestAsset(unittest.TestCase):
|
|||||||
"frequency_of_depreciation": 12,
|
"frequency_of_depreciation": 12,
|
||||||
"depreciation_start_date": "2030-12-31"
|
"depreciation_start_date": "2030-12-31"
|
||||||
})
|
})
|
||||||
asset.insert()
|
asset.save()
|
||||||
self.assertEqual(asset.status, "Draft")
|
self.assertEqual(asset.status, "Draft")
|
||||||
|
|
||||||
expected_schedules = [
|
expected_schedules = [
|
||||||
@ -216,7 +214,6 @@ class TestAsset(unittest.TestCase):
|
|||||||
"depreciation_start_date": "2030-12-31"
|
"depreciation_start_date": "2030-12-31"
|
||||||
})
|
})
|
||||||
|
|
||||||
asset.insert()
|
|
||||||
asset.save()
|
asset.save()
|
||||||
|
|
||||||
expected_schedules = [
|
expected_schedules = [
|
||||||
@ -247,7 +244,6 @@ class TestAsset(unittest.TestCase):
|
|||||||
"frequency_of_depreciation": 10,
|
"frequency_of_depreciation": 10,
|
||||||
"depreciation_start_date": "2020-12-31"
|
"depreciation_start_date": "2020-12-31"
|
||||||
})
|
})
|
||||||
asset.insert()
|
|
||||||
asset.submit()
|
asset.submit()
|
||||||
asset.load_from_db()
|
asset.load_from_db()
|
||||||
self.assertEqual(asset.status, "Submitted")
|
self.assertEqual(asset.status, "Submitted")
|
||||||
@ -350,7 +346,6 @@ class TestAsset(unittest.TestCase):
|
|||||||
"frequency_of_depreciation": 10,
|
"frequency_of_depreciation": 10,
|
||||||
"depreciation_start_date": "2020-12-31"
|
"depreciation_start_date": "2020-12-31"
|
||||||
})
|
})
|
||||||
asset.insert()
|
|
||||||
asset.submit()
|
asset.submit()
|
||||||
post_depreciation_entries(date="2021-01-01")
|
post_depreciation_entries(date="2021-01-01")
|
||||||
|
|
||||||
@ -380,7 +375,6 @@ class TestAsset(unittest.TestCase):
|
|||||||
"total_number_of_depreciations": 10,
|
"total_number_of_depreciations": 10,
|
||||||
"frequency_of_depreciation": 1
|
"frequency_of_depreciation": 1
|
||||||
})
|
})
|
||||||
asset.insert()
|
|
||||||
asset.submit()
|
asset.submit()
|
||||||
|
|
||||||
post_depreciation_entries(date=add_months('2020-01-01', 4))
|
post_depreciation_entries(date=add_months('2020-01-01', 4))
|
||||||
@ -424,7 +418,6 @@ class TestAsset(unittest.TestCase):
|
|||||||
"frequency_of_depreciation": 10,
|
"frequency_of_depreciation": 10,
|
||||||
"depreciation_start_date": "2020-12-31"
|
"depreciation_start_date": "2020-12-31"
|
||||||
})
|
})
|
||||||
asset.insert()
|
|
||||||
asset.submit()
|
asset.submit()
|
||||||
post_depreciation_entries(date="2021-01-01")
|
post_depreciation_entries(date="2021-01-01")
|
||||||
|
|
||||||
@ -468,7 +461,7 @@ class TestAsset(unittest.TestCase):
|
|||||||
"total_number_of_depreciations": 3,
|
"total_number_of_depreciations": 3,
|
||||||
"frequency_of_depreciation": 10
|
"frequency_of_depreciation": 10
|
||||||
})
|
})
|
||||||
asset.insert()
|
asset.save()
|
||||||
accumulated_depreciation_after_full_schedule = \
|
accumulated_depreciation_after_full_schedule = \
|
||||||
max(d.accumulated_depreciation_amount for d in asset.get("schedules"))
|
max(d.accumulated_depreciation_amount for d in asset.get("schedules"))
|
||||||
|
|
||||||
@ -699,7 +692,7 @@ def create_asset(**args):
|
|||||||
"item_code": args.item_code or "Macbook Pro",
|
"item_code": args.item_code or "Macbook Pro",
|
||||||
"company": args.company or"_Test Company",
|
"company": args.company or"_Test Company",
|
||||||
"purchase_date": "2015-01-01",
|
"purchase_date": "2015-01-01",
|
||||||
"calculate_depreciation": 0,
|
"calculate_depreciation": args.calculate_depreciation or 0,
|
||||||
"gross_purchase_amount": 100000,
|
"gross_purchase_amount": 100000,
|
||||||
"purchase_receipt_amount": 100000,
|
"purchase_receipt_amount": 100000,
|
||||||
"expected_value_after_useful_life": 10000,
|
"expected_value_after_useful_life": 10000,
|
||||||
@ -707,7 +700,14 @@ def create_asset(**args):
|
|||||||
"available_for_use_date": "2020-06-06",
|
"available_for_use_date": "2020-06-06",
|
||||||
"location": "Test Location",
|
"location": "Test Location",
|
||||||
"asset_owner": "Company",
|
"asset_owner": "Company",
|
||||||
"is_existing_asset": args.is_existing_asset or 0
|
"is_existing_asset": 1
|
||||||
|
})
|
||||||
|
|
||||||
|
if asset.calculate_depreciation:
|
||||||
|
asset.append("finance_books", {
|
||||||
|
"depreciation_method": "Straight Line",
|
||||||
|
"frequency_of_depreciation": 12,
|
||||||
|
"total_number_of_depreciations": 5
|
||||||
})
|
})
|
||||||
|
|
||||||
try:
|
try:
|
||||||
|
@ -67,7 +67,6 @@
|
|||||||
{
|
{
|
||||||
"fieldname": "value_after_depreciation",
|
"fieldname": "value_after_depreciation",
|
||||||
"fieldtype": "Currency",
|
"fieldtype": "Currency",
|
||||||
"hidden": 1,
|
|
||||||
"label": "Value After Depreciation",
|
"label": "Value After Depreciation",
|
||||||
"no_copy": 1,
|
"no_copy": 1,
|
||||||
"options": "Company:company:default_currency",
|
"options": "Company:company:default_currency",
|
||||||
@ -85,7 +84,7 @@
|
|||||||
"index_web_pages_for_search": 1,
|
"index_web_pages_for_search": 1,
|
||||||
"istable": 1,
|
"istable": 1,
|
||||||
"links": [],
|
"links": [],
|
||||||
"modified": "2020-11-05 16:30:09.213479",
|
"modified": "2021-06-17 12:59:05.743683",
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "Assets",
|
"module": "Assets",
|
||||||
"name": "Asset Finance Book",
|
"name": "Asset Finance Book",
|
||||||
|
@ -2,6 +2,45 @@
|
|||||||
// For license information, please see license.txt
|
// For license information, please see license.txt
|
||||||
|
|
||||||
frappe.ui.form.on('Asset Repair', {
|
frappe.ui.form.on('Asset Repair', {
|
||||||
|
setup: function(frm) {
|
||||||
|
frm.fields_dict.cost_center.get_query = function(doc) {
|
||||||
|
return {
|
||||||
|
filters: {
|
||||||
|
'is_group': 0,
|
||||||
|
'company': doc.company
|
||||||
|
}
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
frm.fields_dict.project.get_query = function(doc) {
|
||||||
|
return {
|
||||||
|
filters: {
|
||||||
|
'company': doc.company
|
||||||
|
}
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
frm.fields_dict.warehouse.get_query = function(doc) {
|
||||||
|
return {
|
||||||
|
filters: {
|
||||||
|
'is_group': 0,
|
||||||
|
'company': doc.company
|
||||||
|
}
|
||||||
|
};
|
||||||
|
};
|
||||||
|
},
|
||||||
|
|
||||||
|
refresh: function(frm) {
|
||||||
|
if (frm.doc.docstatus) {
|
||||||
|
frm.add_custom_button("View General Ledger", function() {
|
||||||
|
frappe.route_options = {
|
||||||
|
"voucher_no": frm.doc.name
|
||||||
|
};
|
||||||
|
frappe.set_route("query-report", "General Ledger");
|
||||||
|
});
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
repair_status: (frm) => {
|
repair_status: (frm) => {
|
||||||
if (frm.doc.completion_date && frm.doc.repair_status == "Completed") {
|
if (frm.doc.completion_date && frm.doc.repair_status == "Completed") {
|
||||||
frappe.call ({
|
frappe.call ({
|
||||||
@ -17,5 +56,16 @@ frappe.ui.form.on('Asset Repair', {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (frm.doc.repair_status == "Completed") {
|
||||||
|
frm.set_value('completion_date', frappe.datetime.now_datetime());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
frappe.ui.form.on('Asset Repair Consumed Item', {
|
||||||
|
consumed_quantity: function(frm, cdt, cdn) {
|
||||||
|
var row = locals[cdt][cdn];
|
||||||
|
frappe.model.set_value(cdt, cdn, 'total_value', row.consumed_quantity * row.valuation_rate);
|
||||||
|
},
|
||||||
|
});
|
@ -7,38 +7,43 @@
|
|||||||
"editable_grid": 1,
|
"editable_grid": 1,
|
||||||
"engine": "InnoDB",
|
"engine": "InnoDB",
|
||||||
"field_order": [
|
"field_order": [
|
||||||
"naming_series",
|
"asset",
|
||||||
"asset_name",
|
"company",
|
||||||
"column_break_2",
|
"column_break_2",
|
||||||
"item_code",
|
"asset_name",
|
||||||
"item_name",
|
"naming_series",
|
||||||
"section_break_5",
|
"section_break_5",
|
||||||
"failure_date",
|
"failure_date",
|
||||||
"assign_to",
|
"repair_status",
|
||||||
"assign_to_name",
|
|
||||||
"column_break_6",
|
"column_break_6",
|
||||||
"completion_date",
|
"completion_date",
|
||||||
"repair_status",
|
"accounting_dimensions_section",
|
||||||
|
"cost_center",
|
||||||
|
"column_break_14",
|
||||||
|
"project",
|
||||||
|
"accounting_details",
|
||||||
"repair_cost",
|
"repair_cost",
|
||||||
|
"capitalize_repair_cost",
|
||||||
|
"stock_consumption",
|
||||||
|
"column_break_8",
|
||||||
|
"purchase_invoice",
|
||||||
|
"stock_consumption_details_section",
|
||||||
|
"warehouse",
|
||||||
|
"stock_items",
|
||||||
|
"total_repair_cost",
|
||||||
|
"stock_entry",
|
||||||
|
"asset_depreciation_details_section",
|
||||||
|
"increase_in_asset_life",
|
||||||
"section_break_9",
|
"section_break_9",
|
||||||
"description",
|
"description",
|
||||||
"column_break_9",
|
"column_break_9",
|
||||||
"actions_performed",
|
"actions_performed",
|
||||||
"section_break_17",
|
"section_break_23",
|
||||||
"downtime",
|
"downtime",
|
||||||
"column_break_19",
|
"column_break_19",
|
||||||
"amended_from"
|
"amended_from"
|
||||||
],
|
],
|
||||||
"fields": [
|
"fields": [
|
||||||
{
|
|
||||||
"columns": 1,
|
|
||||||
"fieldname": "asset_name",
|
|
||||||
"fieldtype": "Link",
|
|
||||||
"in_list_view": 1,
|
|
||||||
"label": "Asset",
|
|
||||||
"options": "Asset",
|
|
||||||
"reqd": 1
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"fieldname": "naming_series",
|
"fieldname": "naming_series",
|
||||||
"fieldtype": "Select",
|
"fieldtype": "Select",
|
||||||
@ -50,18 +55,6 @@
|
|||||||
"fieldname": "column_break_2",
|
"fieldname": "column_break_2",
|
||||||
"fieldtype": "Column Break"
|
"fieldtype": "Column Break"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"fetch_from": "asset_name.item_code",
|
|
||||||
"fieldname": "item_code",
|
|
||||||
"fieldtype": "Read Only",
|
|
||||||
"label": "Item Code"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fetch_from": "asset_name.item_name",
|
|
||||||
"fieldname": "item_name",
|
|
||||||
"fieldtype": "Read Only",
|
|
||||||
"label": "Item Name"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"fieldname": "section_break_5",
|
"fieldname": "section_break_5",
|
||||||
"fieldtype": "Section Break",
|
"fieldtype": "Section Break",
|
||||||
@ -74,33 +67,20 @@
|
|||||||
"label": "Failure Date",
|
"label": "Failure Date",
|
||||||
"reqd": 1
|
"reqd": 1
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"allow_on_submit": 1,
|
|
||||||
"fieldname": "assign_to",
|
|
||||||
"fieldtype": "Link",
|
|
||||||
"label": "Assign To",
|
|
||||||
"options": "User"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"allow_on_submit": 1,
|
|
||||||
"fetch_from": "assign_to.full_name",
|
|
||||||
"fieldname": "assign_to_name",
|
|
||||||
"fieldtype": "Read Only",
|
|
||||||
"label": "Assign To Name"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"fieldname": "column_break_6",
|
"fieldname": "column_break_6",
|
||||||
"fieldtype": "Column Break"
|
"fieldtype": "Column Break"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"allow_on_submit": 1,
|
"depends_on": "eval:!doc.__islocal",
|
||||||
"fieldname": "completion_date",
|
"fieldname": "completion_date",
|
||||||
"fieldtype": "Datetime",
|
"fieldtype": "Datetime",
|
||||||
"label": "Completion Date"
|
"label": "Completion Date",
|
||||||
|
"no_copy": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"allow_on_submit": 1,
|
|
||||||
"default": "Pending",
|
"default": "Pending",
|
||||||
|
"depends_on": "eval:!doc.__islocal",
|
||||||
"fieldname": "repair_status",
|
"fieldname": "repair_status",
|
||||||
"fieldtype": "Select",
|
"fieldtype": "Select",
|
||||||
"label": "Repair Status",
|
"label": "Repair Status",
|
||||||
@ -116,25 +96,18 @@
|
|||||||
{
|
{
|
||||||
"fieldname": "description",
|
"fieldname": "description",
|
||||||
"fieldtype": "Long Text",
|
"fieldtype": "Long Text",
|
||||||
"label": "Error Description",
|
"label": "Error Description"
|
||||||
"reqd": 1
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "column_break_9",
|
"fieldname": "column_break_9",
|
||||||
"fieldtype": "Column Break"
|
"fieldtype": "Column Break"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"allow_on_submit": 1,
|
|
||||||
"fieldname": "actions_performed",
|
"fieldname": "actions_performed",
|
||||||
"fieldtype": "Long Text",
|
"fieldtype": "Long Text",
|
||||||
"label": "Actions performed"
|
"label": "Actions performed"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "section_break_17",
|
|
||||||
"fieldtype": "Section Break"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"allow_on_submit": 1,
|
|
||||||
"fieldname": "downtime",
|
"fieldname": "downtime",
|
||||||
"fieldtype": "Data",
|
"fieldtype": "Data",
|
||||||
"in_list_view": 1,
|
"in_list_view": 1,
|
||||||
@ -146,7 +119,7 @@
|
|||||||
"fieldtype": "Column Break"
|
"fieldtype": "Column Break"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"allow_on_submit": 1,
|
"default": "0",
|
||||||
"fieldname": "repair_cost",
|
"fieldname": "repair_cost",
|
||||||
"fieldtype": "Currency",
|
"fieldtype": "Currency",
|
||||||
"label": "Repair Cost"
|
"label": "Repair Cost"
|
||||||
@ -159,12 +132,139 @@
|
|||||||
"options": "Asset Repair",
|
"options": "Asset Repair",
|
||||||
"print_hide": 1,
|
"print_hide": 1,
|
||||||
"read_only": 1
|
"read_only": 1
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"columns": 1,
|
||||||
|
"fieldname": "asset",
|
||||||
|
"fieldtype": "Link",
|
||||||
|
"in_list_view": 1,
|
||||||
|
"label": "Asset",
|
||||||
|
"options": "Asset",
|
||||||
|
"reqd": 1
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fetch_from": "asset.asset_name",
|
||||||
|
"fieldname": "asset_name",
|
||||||
|
"fieldtype": "Read Only",
|
||||||
|
"label": "Asset Name"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "column_break_8",
|
||||||
|
"fieldtype": "Column Break"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"default": "0",
|
||||||
|
"depends_on": "eval:!doc.__islocal",
|
||||||
|
"fieldname": "capitalize_repair_cost",
|
||||||
|
"fieldtype": "Check",
|
||||||
|
"label": "Capitalize Repair Cost"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "accounting_details",
|
||||||
|
"fieldtype": "Section Break",
|
||||||
|
"label": "Accounting Details"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "stock_items",
|
||||||
|
"fieldtype": "Table",
|
||||||
|
"label": "Stock Items",
|
||||||
|
"mandatory_depends_on": "stock_consumption",
|
||||||
|
"options": "Asset Repair Consumed Item"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "section_break_23",
|
||||||
|
"fieldtype": "Section Break"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"collapsible": 1,
|
||||||
|
"fieldname": "accounting_dimensions_section",
|
||||||
|
"fieldtype": "Section Break",
|
||||||
|
"label": "Accounting Dimensions"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "cost_center",
|
||||||
|
"fieldtype": "Link",
|
||||||
|
"label": "Cost Center",
|
||||||
|
"options": "Cost Center"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "project",
|
||||||
|
"fieldtype": "Link",
|
||||||
|
"label": "Project",
|
||||||
|
"options": "Project"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "column_break_14",
|
||||||
|
"fieldtype": "Column Break"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"default": "0",
|
||||||
|
"depends_on": "eval:!doc.__islocal",
|
||||||
|
"fieldname": "stock_consumption",
|
||||||
|
"fieldtype": "Check",
|
||||||
|
"label": "Stock Consumed During Repair"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"depends_on": "stock_consumption",
|
||||||
|
"fieldname": "stock_consumption_details_section",
|
||||||
|
"fieldtype": "Section Break",
|
||||||
|
"label": "Stock Consumption Details"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"depends_on": "eval: doc.stock_consumption && doc.total_repair_cost > 0",
|
||||||
|
"description": "Sum of Repair Cost and Value of Consumed Stock Items.",
|
||||||
|
"fieldname": "total_repair_cost",
|
||||||
|
"fieldtype": "Currency",
|
||||||
|
"label": "Total Repair Cost",
|
||||||
|
"read_only": 1
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"depends_on": "stock_consumption",
|
||||||
|
"fieldname": "warehouse",
|
||||||
|
"fieldtype": "Link",
|
||||||
|
"label": "Warehouse",
|
||||||
|
"options": "Warehouse"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"depends_on": "capitalize_repair_cost",
|
||||||
|
"fieldname": "asset_depreciation_details_section",
|
||||||
|
"fieldtype": "Section Break",
|
||||||
|
"label": "Asset Depreciation Details"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "increase_in_asset_life",
|
||||||
|
"fieldtype": "Int",
|
||||||
|
"label": "Increase In Asset Life(Months)",
|
||||||
|
"no_copy": 1
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"depends_on": "eval:!doc.__islocal",
|
||||||
|
"fieldname": "purchase_invoice",
|
||||||
|
"fieldtype": "Link",
|
||||||
|
"label": "Purchase Invoice",
|
||||||
|
"mandatory_depends_on": "eval: doc.repair_status == 'Completed' && doc.repair_cost > 0",
|
||||||
|
"no_copy": 1,
|
||||||
|
"options": "Purchase Invoice"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fetch_from": "asset.company",
|
||||||
|
"fieldname": "company",
|
||||||
|
"fieldtype": "Link",
|
||||||
|
"label": "Company",
|
||||||
|
"options": "Company"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "stock_entry",
|
||||||
|
"fieldtype": "Link",
|
||||||
|
"label": "Stock Entry",
|
||||||
|
"options": "Stock Entry",
|
||||||
|
"read_only": 1
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"index_web_pages_for_search": 1,
|
"index_web_pages_for_search": 1,
|
||||||
"is_submittable": 1,
|
"is_submittable": 1,
|
||||||
"links": [],
|
"links": [],
|
||||||
"modified": "2021-01-22 15:08:12.495850",
|
"modified": "2021-06-25 13:14:38.307723",
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "Assets",
|
"module": "Assets",
|
||||||
"name": "Asset Repair",
|
"name": "Asset Repair",
|
||||||
@ -203,6 +303,7 @@
|
|||||||
],
|
],
|
||||||
"sort_field": "modified",
|
"sort_field": "modified",
|
||||||
"sort_order": "DESC",
|
"sort_order": "DESC",
|
||||||
|
"title_field": "asset_name",
|
||||||
"track_changes": 1,
|
"track_changes": 1,
|
||||||
"track_seen": 1
|
"track_seen": 1
|
||||||
}
|
}
|
@ -5,14 +5,250 @@
|
|||||||
from __future__ import unicode_literals
|
from __future__ import unicode_literals
|
||||||
import frappe
|
import frappe
|
||||||
from frappe import _
|
from frappe import _
|
||||||
from frappe.utils import time_diff_in_hours
|
from frappe.utils import time_diff_in_hours, getdate, add_months, flt, cint
|
||||||
from frappe.model.document import Document
|
from erpnext.accounts.general_ledger import make_gl_entries
|
||||||
|
from erpnext.assets.doctype.asset.asset import get_asset_account
|
||||||
|
from erpnext.controllers.accounts_controller import AccountsController
|
||||||
|
|
||||||
class AssetRepair(Document):
|
class AssetRepair(AccountsController):
|
||||||
def validate(self):
|
def validate(self):
|
||||||
if self.repair_status == "Completed" and not self.completion_date:
|
self.asset_doc = frappe.get_doc('Asset', self.asset)
|
||||||
frappe.throw(_("Please select Completion Date for Completed Repair"))
|
self.update_status()
|
||||||
|
|
||||||
|
if self.get('stock_items'):
|
||||||
|
self.set_total_value()
|
||||||
|
self.calculate_total_repair_cost()
|
||||||
|
|
||||||
|
def update_status(self):
|
||||||
|
if self.repair_status == 'Pending':
|
||||||
|
frappe.db.set_value('Asset', self.asset, 'status', 'Out of Order')
|
||||||
|
else:
|
||||||
|
self.asset_doc.set_status()
|
||||||
|
|
||||||
|
def set_total_value(self):
|
||||||
|
for item in self.get('stock_items'):
|
||||||
|
item.total_value = flt(item.valuation_rate) * flt(item.consumed_quantity)
|
||||||
|
|
||||||
|
def calculate_total_repair_cost(self):
|
||||||
|
self.total_repair_cost = flt(self.repair_cost)
|
||||||
|
|
||||||
|
total_value_of_stock_consumed = self.get_total_value_of_stock_consumed()
|
||||||
|
self.total_repair_cost += total_value_of_stock_consumed
|
||||||
|
|
||||||
|
def before_submit(self):
|
||||||
|
self.check_repair_status()
|
||||||
|
|
||||||
|
if self.get('stock_consumption') or self.get('capitalize_repair_cost'):
|
||||||
|
self.increase_asset_value()
|
||||||
|
if self.get('stock_consumption'):
|
||||||
|
self.check_for_stock_items_and_warehouse()
|
||||||
|
self.decrease_stock_quantity()
|
||||||
|
if self.get('capitalize_repair_cost'):
|
||||||
|
self.make_gl_entries()
|
||||||
|
if frappe.db.get_value('Asset', self.asset, 'calculate_depreciation') and self.increase_in_asset_life:
|
||||||
|
self.modify_depreciation_schedule()
|
||||||
|
|
||||||
|
self.asset_doc.flags.ignore_validate_update_after_submit = True
|
||||||
|
self.asset_doc.prepare_depreciation_data()
|
||||||
|
self.asset_doc.save()
|
||||||
|
|
||||||
|
def before_cancel(self):
|
||||||
|
self.asset_doc = frappe.get_doc('Asset', self.asset)
|
||||||
|
|
||||||
|
if self.get('stock_consumption') or self.get('capitalize_repair_cost'):
|
||||||
|
self.decrease_asset_value()
|
||||||
|
if self.get('stock_consumption'):
|
||||||
|
self.increase_stock_quantity()
|
||||||
|
if self.get('capitalize_repair_cost'):
|
||||||
|
self.ignore_linked_doctypes = ('GL Entry', 'Stock Ledger Entry')
|
||||||
|
self.make_gl_entries(cancel=True)
|
||||||
|
if frappe.db.get_value('Asset', self.asset, 'calculate_depreciation') and self.increase_in_asset_life:
|
||||||
|
self.revert_depreciation_schedule_on_cancellation()
|
||||||
|
|
||||||
|
self.asset_doc.flags.ignore_validate_update_after_submit = True
|
||||||
|
self.asset_doc.prepare_depreciation_data()
|
||||||
|
self.asset_doc.save()
|
||||||
|
|
||||||
|
def check_repair_status(self):
|
||||||
|
if self.repair_status == "Pending":
|
||||||
|
frappe.throw(_("Please update Repair Status."))
|
||||||
|
|
||||||
|
def check_for_stock_items_and_warehouse(self):
|
||||||
|
if not self.get('stock_items'):
|
||||||
|
frappe.throw(_("Please enter Stock Items consumed during the Repair."), title=_("Missing Items"))
|
||||||
|
if not self.warehouse:
|
||||||
|
frappe.throw(_("Please enter Warehouse from which Stock Items consumed during the Repair were taken."), title=_("Missing Warehouse"))
|
||||||
|
|
||||||
|
def increase_asset_value(self):
|
||||||
|
total_value_of_stock_consumed = self.get_total_value_of_stock_consumed()
|
||||||
|
|
||||||
|
if self.asset_doc.calculate_depreciation:
|
||||||
|
for row in self.asset_doc.finance_books:
|
||||||
|
row.value_after_depreciation += total_value_of_stock_consumed
|
||||||
|
|
||||||
|
if self.capitalize_repair_cost:
|
||||||
|
row.value_after_depreciation += self.repair_cost
|
||||||
|
|
||||||
|
def decrease_asset_value(self):
|
||||||
|
total_value_of_stock_consumed = self.get_total_value_of_stock_consumed()
|
||||||
|
|
||||||
|
if self.asset_doc.calculate_depreciation:
|
||||||
|
for row in self.asset_doc.finance_books:
|
||||||
|
row.value_after_depreciation -= total_value_of_stock_consumed
|
||||||
|
|
||||||
|
if self.capitalize_repair_cost:
|
||||||
|
row.value_after_depreciation -= self.repair_cost
|
||||||
|
|
||||||
|
def get_total_value_of_stock_consumed(self):
|
||||||
|
total_value_of_stock_consumed = 0
|
||||||
|
if self.get('stock_consumption'):
|
||||||
|
for item in self.get('stock_items'):
|
||||||
|
total_value_of_stock_consumed += item.total_value
|
||||||
|
|
||||||
|
return total_value_of_stock_consumed
|
||||||
|
|
||||||
|
def decrease_stock_quantity(self):
|
||||||
|
stock_entry = frappe.get_doc({
|
||||||
|
"doctype": "Stock Entry",
|
||||||
|
"stock_entry_type": "Material Issue",
|
||||||
|
"company": self.company
|
||||||
|
})
|
||||||
|
|
||||||
|
for stock_item in self.get('stock_items'):
|
||||||
|
stock_entry.append('items', {
|
||||||
|
"s_warehouse": self.warehouse,
|
||||||
|
"item_code": stock_item.item,
|
||||||
|
"qty": stock_item.consumed_quantity,
|
||||||
|
"basic_rate": stock_item.valuation_rate
|
||||||
|
})
|
||||||
|
|
||||||
|
stock_entry.insert()
|
||||||
|
stock_entry.submit()
|
||||||
|
|
||||||
|
self.db_set('stock_entry', stock_entry.name)
|
||||||
|
|
||||||
|
def increase_stock_quantity(self):
|
||||||
|
stock_entry = frappe.get_doc('Stock Entry', self.stock_entry)
|
||||||
|
stock_entry.flags.ignore_links = True
|
||||||
|
stock_entry.cancel()
|
||||||
|
|
||||||
|
def make_gl_entries(self, cancel=False):
|
||||||
|
if flt(self.repair_cost) > 0:
|
||||||
|
gl_entries = self.get_gl_entries()
|
||||||
|
make_gl_entries(gl_entries, cancel)
|
||||||
|
|
||||||
|
def get_gl_entries(self):
|
||||||
|
gl_entries = []
|
||||||
|
repair_and_maintenance_account = frappe.db.get_value('Company', self.company, 'repair_and_maintenance_account')
|
||||||
|
fixed_asset_account = get_asset_account("fixed_asset_account", asset=self.asset, company=self.company)
|
||||||
|
expense_account = frappe.get_doc('Purchase Invoice', self.purchase_invoice).items[0].expense_account
|
||||||
|
|
||||||
|
gl_entries.append(
|
||||||
|
self.get_gl_dict({
|
||||||
|
"account": expense_account,
|
||||||
|
"credit": self.repair_cost,
|
||||||
|
"credit_in_account_currency": self.repair_cost,
|
||||||
|
"against": repair_and_maintenance_account,
|
||||||
|
"voucher_type": self.doctype,
|
||||||
|
"voucher_no": self.name,
|
||||||
|
"cost_center": self.cost_center,
|
||||||
|
"posting_date": getdate(),
|
||||||
|
"company": self.company
|
||||||
|
}, item=self)
|
||||||
|
)
|
||||||
|
|
||||||
|
if self.get('stock_consumption'):
|
||||||
|
# creating GL Entries for each row in Stock Items based on the Stock Entry created for it
|
||||||
|
stock_entry = frappe.get_doc('Stock Entry', self.stock_entry)
|
||||||
|
for item in stock_entry.items:
|
||||||
|
gl_entries.append(
|
||||||
|
self.get_gl_dict({
|
||||||
|
"account": item.expense_account,
|
||||||
|
"credit": item.amount,
|
||||||
|
"credit_in_account_currency": item.amount,
|
||||||
|
"against": repair_and_maintenance_account,
|
||||||
|
"voucher_type": self.doctype,
|
||||||
|
"voucher_no": self.name,
|
||||||
|
"cost_center": self.cost_center,
|
||||||
|
"posting_date": getdate(),
|
||||||
|
"company": self.company
|
||||||
|
}, item=self)
|
||||||
|
)
|
||||||
|
|
||||||
|
gl_entries.append(
|
||||||
|
self.get_gl_dict({
|
||||||
|
"account": fixed_asset_account,
|
||||||
|
"debit": self.total_repair_cost,
|
||||||
|
"debit_in_account_currency": self.total_repair_cost,
|
||||||
|
"against": expense_account,
|
||||||
|
"voucher_type": self.doctype,
|
||||||
|
"voucher_no": self.name,
|
||||||
|
"cost_center": self.cost_center,
|
||||||
|
"posting_date": getdate(),
|
||||||
|
"against_voucher_type": "Purchase Invoice",
|
||||||
|
"against_voucher": self.purchase_invoice,
|
||||||
|
"company": self.company
|
||||||
|
}, item=self)
|
||||||
|
)
|
||||||
|
|
||||||
|
return gl_entries
|
||||||
|
|
||||||
|
def modify_depreciation_schedule(self):
|
||||||
|
for row in self.asset_doc.finance_books:
|
||||||
|
row.total_number_of_depreciations += self.increase_in_asset_life/row.frequency_of_depreciation
|
||||||
|
|
||||||
|
self.asset_doc.flags.increase_in_asset_life = False
|
||||||
|
extra_months = self.increase_in_asset_life % row.frequency_of_depreciation
|
||||||
|
if extra_months != 0:
|
||||||
|
self.calculate_last_schedule_date(self.asset_doc, row, extra_months)
|
||||||
|
|
||||||
|
# to help modify depreciation schedule when increase_in_asset_life is not a multiple of frequency_of_depreciation
|
||||||
|
def calculate_last_schedule_date(self, asset, row, extra_months):
|
||||||
|
asset.flags.increase_in_asset_life = True
|
||||||
|
number_of_pending_depreciations = cint(row.total_number_of_depreciations) - \
|
||||||
|
cint(asset.number_of_depreciations_booked)
|
||||||
|
|
||||||
|
# the Schedule Date in the final row of the old Depreciation Schedule
|
||||||
|
last_schedule_date = asset.schedules[len(asset.schedules)-1].schedule_date
|
||||||
|
|
||||||
|
# the Schedule Date in the final row of the new Depreciation Schedule
|
||||||
|
asset.to_date = add_months(last_schedule_date, extra_months)
|
||||||
|
|
||||||
|
# the latest possible date at which the depreciation can occur, without increasing the Total Number of Depreciations
|
||||||
|
# if depreciations happen yearly and the Depreciation Posting Date is 01-01-2020, this could be 01-01-2021, 01-01-2022...
|
||||||
|
schedule_date = add_months(row.depreciation_start_date,
|
||||||
|
number_of_pending_depreciations * cint(row.frequency_of_depreciation))
|
||||||
|
|
||||||
|
if asset.to_date > schedule_date:
|
||||||
|
row.total_number_of_depreciations += 1
|
||||||
|
|
||||||
|
def revert_depreciation_schedule_on_cancellation(self):
|
||||||
|
for row in self.asset_doc.finance_books:
|
||||||
|
row.total_number_of_depreciations -= self.increase_in_asset_life/row.frequency_of_depreciation
|
||||||
|
|
||||||
|
self.asset_doc.flags.increase_in_asset_life = False
|
||||||
|
extra_months = self.increase_in_asset_life % row.frequency_of_depreciation
|
||||||
|
if extra_months != 0:
|
||||||
|
self.calculate_last_schedule_date_before_modification(self.asset_doc, row, extra_months)
|
||||||
|
|
||||||
|
def calculate_last_schedule_date_before_modification(self, asset, row, extra_months):
|
||||||
|
asset.flags.increase_in_asset_life = True
|
||||||
|
number_of_pending_depreciations = cint(row.total_number_of_depreciations) - \
|
||||||
|
cint(asset.number_of_depreciations_booked)
|
||||||
|
|
||||||
|
# the Schedule Date in the final row of the modified Depreciation Schedule
|
||||||
|
last_schedule_date = asset.schedules[len(asset.schedules)-1].schedule_date
|
||||||
|
|
||||||
|
# the Schedule Date in the final row of the original Depreciation Schedule
|
||||||
|
asset.to_date = add_months(last_schedule_date, -extra_months)
|
||||||
|
|
||||||
|
# the latest possible date at which the depreciation can occur, without decreasing the Total Number of Depreciations
|
||||||
|
# if depreciations happen yearly and the Depreciation Posting Date is 01-01-2020, this could be 01-01-2021, 01-01-2022...
|
||||||
|
schedule_date = add_months(row.depreciation_start_date,
|
||||||
|
(number_of_pending_depreciations - 1) * cint(row.frequency_of_depreciation))
|
||||||
|
|
||||||
|
if asset.to_date < schedule_date:
|
||||||
|
row.total_number_of_depreciations -= 1
|
||||||
|
|
||||||
@frappe.whitelist()
|
@frappe.whitelist()
|
||||||
def get_downtime(failure_date, completion_date):
|
def get_downtime(failure_date, completion_date):
|
||||||
|
@ -2,8 +2,167 @@
|
|||||||
# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors
|
# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors
|
||||||
# See license.txt
|
# See license.txt
|
||||||
from __future__ import unicode_literals
|
from __future__ import unicode_literals
|
||||||
|
import frappe
|
||||||
|
from frappe.utils import nowdate, flt
|
||||||
import unittest
|
import unittest
|
||||||
|
from erpnext.assets.doctype.asset.test_asset import create_asset_data, create_asset, set_depreciation_settings_in_company
|
||||||
|
|
||||||
class TestAssetRepair(unittest.TestCase):
|
class TestAssetRepair(unittest.TestCase):
|
||||||
pass
|
def setUp(self):
|
||||||
|
set_depreciation_settings_in_company()
|
||||||
|
create_asset_data()
|
||||||
|
frappe.db.sql("delete from `tabTax Rule`")
|
||||||
|
|
||||||
|
def test_update_status(self):
|
||||||
|
asset = create_asset()
|
||||||
|
initial_status = asset.status
|
||||||
|
asset_repair = create_asset_repair(asset = asset)
|
||||||
|
|
||||||
|
if asset_repair.repair_status == "Pending":
|
||||||
|
asset.reload()
|
||||||
|
self.assertEqual(asset.status, "Out of Order")
|
||||||
|
|
||||||
|
asset_repair.repair_status = "Completed"
|
||||||
|
asset_repair.save()
|
||||||
|
asset_status = frappe.db.get_value("Asset", asset_repair.asset, "status")
|
||||||
|
self.assertEqual(asset_status, initial_status)
|
||||||
|
|
||||||
|
def test_stock_item_total_value(self):
|
||||||
|
asset_repair = create_asset_repair(stock_consumption = 1)
|
||||||
|
|
||||||
|
for item in asset_repair.stock_items:
|
||||||
|
total_value = flt(item.valuation_rate) * flt(item.consumed_quantity)
|
||||||
|
self.assertEqual(item.total_value, total_value)
|
||||||
|
|
||||||
|
def test_total_repair_cost(self):
|
||||||
|
asset_repair = create_asset_repair(stock_consumption = 1)
|
||||||
|
|
||||||
|
total_repair_cost = asset_repair.repair_cost
|
||||||
|
self.assertEqual(total_repair_cost, asset_repair.repair_cost)
|
||||||
|
for item in asset_repair.stock_items:
|
||||||
|
total_repair_cost += item.total_value
|
||||||
|
|
||||||
|
self.assertEqual(total_repair_cost, asset_repair.total_repair_cost)
|
||||||
|
|
||||||
|
def test_repair_status_after_submit(self):
|
||||||
|
asset_repair = create_asset_repair(submit = 1)
|
||||||
|
self.assertNotEqual(asset_repair.repair_status, "Pending")
|
||||||
|
|
||||||
|
def test_stock_items(self):
|
||||||
|
asset_repair = create_asset_repair(stock_consumption = 1)
|
||||||
|
self.assertTrue(asset_repair.stock_consumption)
|
||||||
|
self.assertTrue(asset_repair.stock_items)
|
||||||
|
|
||||||
|
def test_warehouse(self):
|
||||||
|
asset_repair = create_asset_repair(stock_consumption = 1)
|
||||||
|
self.assertTrue(asset_repair.stock_consumption)
|
||||||
|
self.assertTrue(asset_repair.warehouse)
|
||||||
|
|
||||||
|
def test_decrease_stock_quantity(self):
|
||||||
|
asset_repair = create_asset_repair(stock_consumption = 1, submit = 1)
|
||||||
|
stock_entry = frappe.get_last_doc('Stock Entry')
|
||||||
|
|
||||||
|
self.assertEqual(stock_entry.stock_entry_type, "Material Issue")
|
||||||
|
self.assertEqual(stock_entry.items[0].s_warehouse, asset_repair.warehouse)
|
||||||
|
self.assertEqual(stock_entry.items[0].item_code, asset_repair.stock_items[0].item)
|
||||||
|
self.assertEqual(stock_entry.items[0].qty, asset_repair.stock_items[0].consumed_quantity)
|
||||||
|
|
||||||
|
def test_increase_in_asset_value_due_to_stock_consumption(self):
|
||||||
|
asset = create_asset(calculate_depreciation = 1)
|
||||||
|
initial_asset_value = get_asset_value(asset)
|
||||||
|
asset_repair = create_asset_repair(asset= asset, stock_consumption = 1, submit = 1)
|
||||||
|
asset.reload()
|
||||||
|
|
||||||
|
increase_in_asset_value = get_asset_value(asset) - initial_asset_value
|
||||||
|
self.assertEqual(asset_repair.stock_items[0].total_value, increase_in_asset_value)
|
||||||
|
|
||||||
|
def test_increase_in_asset_value_due_to_repair_cost_capitalisation(self):
|
||||||
|
asset = create_asset(calculate_depreciation = 1)
|
||||||
|
initial_asset_value = get_asset_value(asset)
|
||||||
|
asset_repair = create_asset_repair(asset= asset, capitalize_repair_cost = 1, submit = 1)
|
||||||
|
asset.reload()
|
||||||
|
|
||||||
|
increase_in_asset_value = get_asset_value(asset) - initial_asset_value
|
||||||
|
self.assertEqual(asset_repair.repair_cost, increase_in_asset_value)
|
||||||
|
|
||||||
|
def test_purchase_invoice(self):
|
||||||
|
asset_repair = create_asset_repair(capitalize_repair_cost = 1, submit = 1)
|
||||||
|
self.assertTrue(asset_repair.purchase_invoice)
|
||||||
|
|
||||||
|
def test_gl_entries(self):
|
||||||
|
asset_repair = create_asset_repair(capitalize_repair_cost = 1, submit = 1)
|
||||||
|
gl_entry = frappe.get_last_doc('GL Entry')
|
||||||
|
self.assertEqual(asset_repair.name, gl_entry.voucher_no)
|
||||||
|
|
||||||
|
def test_increase_in_asset_life(self):
|
||||||
|
asset = create_asset(calculate_depreciation = 1)
|
||||||
|
initial_num_of_depreciations = num_of_depreciations(asset)
|
||||||
|
create_asset_repair(asset= asset, capitalize_repair_cost = 1, submit = 1)
|
||||||
|
asset.reload()
|
||||||
|
|
||||||
|
self.assertEqual((initial_num_of_depreciations + 1), num_of_depreciations(asset))
|
||||||
|
self.assertEqual(asset.schedules[-1].accumulated_depreciation_amount, asset.finance_books[0].value_after_depreciation)
|
||||||
|
|
||||||
|
def get_asset_value(asset):
|
||||||
|
return asset.finance_books[0].value_after_depreciation
|
||||||
|
|
||||||
|
def num_of_depreciations(asset):
|
||||||
|
return asset.finance_books[0].total_number_of_depreciations
|
||||||
|
|
||||||
|
def create_asset_repair(**args):
|
||||||
|
from erpnext.stock.doctype.warehouse.test_warehouse import create_warehouse
|
||||||
|
from erpnext.accounts.doctype.purchase_invoice.test_purchase_invoice import make_purchase_invoice
|
||||||
|
|
||||||
|
args = frappe._dict(args)
|
||||||
|
|
||||||
|
if args.asset:
|
||||||
|
asset = args.asset
|
||||||
|
else:
|
||||||
|
asset = create_asset(is_existing_asset = 1)
|
||||||
|
asset_repair = frappe.new_doc("Asset Repair")
|
||||||
|
asset_repair.update({
|
||||||
|
"asset": asset.name,
|
||||||
|
"asset_name": asset.asset_name,
|
||||||
|
"failure_date": nowdate(),
|
||||||
|
"description": "Test Description",
|
||||||
|
"repair_cost": 0,
|
||||||
|
"company": asset.company
|
||||||
|
})
|
||||||
|
|
||||||
|
if args.stock_consumption:
|
||||||
|
asset_repair.stock_consumption = 1
|
||||||
|
asset_repair.warehouse = create_warehouse("Test Warehouse", company = asset.company)
|
||||||
|
asset_repair.append("stock_items", {
|
||||||
|
"item": args.item or args.item_code or "_Test Item",
|
||||||
|
"valuation_rate": args.rate if args.get("rate") is not None else 100,
|
||||||
|
"consumed_quantity": args.qty or 1
|
||||||
|
})
|
||||||
|
|
||||||
|
asset_repair.insert(ignore_if_duplicate=True)
|
||||||
|
|
||||||
|
if args.submit:
|
||||||
|
asset_repair.repair_status = "Completed"
|
||||||
|
asset_repair.cost_center = "_Test Cost Center - _TC"
|
||||||
|
|
||||||
|
if args.stock_consumption:
|
||||||
|
stock_entry = frappe.get_doc({
|
||||||
|
"doctype": "Stock Entry",
|
||||||
|
"stock_entry_type": "Material Receipt",
|
||||||
|
"company": asset.company
|
||||||
|
})
|
||||||
|
stock_entry.append('items', {
|
||||||
|
"t_warehouse": asset_repair.warehouse,
|
||||||
|
"item_code": asset_repair.stock_items[0].item,
|
||||||
|
"qty": asset_repair.stock_items[0].consumed_quantity
|
||||||
|
})
|
||||||
|
stock_entry.submit()
|
||||||
|
|
||||||
|
if args.capitalize_repair_cost:
|
||||||
|
asset_repair.capitalize_repair_cost = 1
|
||||||
|
asset_repair.repair_cost = 1000
|
||||||
|
if asset.calculate_depreciation:
|
||||||
|
asset_repair.increase_in_asset_life = 12
|
||||||
|
asset_repair.purchase_invoice = make_purchase_invoice().name
|
||||||
|
|
||||||
|
asset_repair.submit()
|
||||||
|
return asset_repair
|
@ -0,0 +1,55 @@
|
|||||||
|
{
|
||||||
|
"actions": [],
|
||||||
|
"creation": "2021-05-12 02:41:54.161024",
|
||||||
|
"doctype": "DocType",
|
||||||
|
"editable_grid": 1,
|
||||||
|
"engine": "InnoDB",
|
||||||
|
"field_order": [
|
||||||
|
"item",
|
||||||
|
"valuation_rate",
|
||||||
|
"consumed_quantity",
|
||||||
|
"total_value"
|
||||||
|
],
|
||||||
|
"fields": [
|
||||||
|
{
|
||||||
|
"fieldname": "item",
|
||||||
|
"fieldtype": "Link",
|
||||||
|
"in_list_view": 1,
|
||||||
|
"label": "Item",
|
||||||
|
"options": "Item"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fetch_from": "item.valuation_rate",
|
||||||
|
"fieldname": "valuation_rate",
|
||||||
|
"fieldtype": "Currency",
|
||||||
|
"in_list_view": 1,
|
||||||
|
"label": "Valuation Rate",
|
||||||
|
"read_only": 1
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "consumed_quantity",
|
||||||
|
"fieldtype": "Data",
|
||||||
|
"in_list_view": 1,
|
||||||
|
"label": "Consumed Quantity"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "total_value",
|
||||||
|
"fieldtype": "Currency",
|
||||||
|
"in_list_view": 1,
|
||||||
|
"label": "Total Value",
|
||||||
|
"read_only": 1
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"index_web_pages_for_search": 1,
|
||||||
|
"istable": 1,
|
||||||
|
"links": [],
|
||||||
|
"modified": "2021-05-12 03:19:55.006300",
|
||||||
|
"modified_by": "Administrator",
|
||||||
|
"module": "Assets",
|
||||||
|
"name": "Asset Repair Consumed Item",
|
||||||
|
"owner": "Administrator",
|
||||||
|
"permissions": [],
|
||||||
|
"sort_field": "modified",
|
||||||
|
"sort_order": "DESC",
|
||||||
|
"track_changes": 1
|
||||||
|
}
|
@ -0,0 +1,8 @@
|
|||||||
|
# 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 AssetRepairConsumedItem(Document):
|
||||||
|
pass
|
@ -97,6 +97,9 @@
|
|||||||
"is_fixed_asset",
|
"is_fixed_asset",
|
||||||
"item_tax_rate",
|
"item_tax_rate",
|
||||||
"section_break_72",
|
"section_break_72",
|
||||||
|
"production_plan",
|
||||||
|
"production_plan_item",
|
||||||
|
"production_plan_sub_assembly_item",
|
||||||
"page_break"
|
"page_break"
|
||||||
],
|
],
|
||||||
"fields": [
|
"fields": [
|
||||||
@ -803,13 +806,37 @@
|
|||||||
"options": "Company:company:default_currency",
|
"options": "Company:company:default_currency",
|
||||||
"print_hide": 1,
|
"print_hide": 1,
|
||||||
"read_only": 1
|
"read_only": 1
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "production_plan",
|
||||||
|
"fieldtype": "Link",
|
||||||
|
"label": "Production Plan",
|
||||||
|
"options": "Production Plan",
|
||||||
|
"print_hide": 1,
|
||||||
|
"read_only": 1
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "production_plan_item",
|
||||||
|
"fieldtype": "Data",
|
||||||
|
"hidden": 1,
|
||||||
|
"label": "Production Plan Item",
|
||||||
|
"no_copy": 1,
|
||||||
|
"read_only": 1
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "production_plan_sub_assembly_item",
|
||||||
|
"fieldtype": "Data",
|
||||||
|
"hidden": 1,
|
||||||
|
"label": "Production Plan Sub Assembly Item",
|
||||||
|
"no_copy": 1,
|
||||||
|
"read_only": 1
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"idx": 1,
|
"idx": 1,
|
||||||
"index_web_pages_for_search": 1,
|
"index_web_pages_for_search": 1,
|
||||||
"istable": 1,
|
"istable": 1,
|
||||||
"links": [],
|
"links": [],
|
||||||
"modified": "2021-03-22 11:46:12.357435",
|
"modified": "2021-06-28 19:22:22.715365",
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "Buying",
|
"module": "Buying",
|
||||||
"name": "Purchase Order Item",
|
"name": "Purchase Order Item",
|
||||||
|
@ -60,10 +60,23 @@ frappe.ui.form.on("Supplier", {
|
|||||||
erpnext.utils.make_pricing_rule(frm.doc.doctype, frm.doc.name);
|
erpnext.utils.make_pricing_rule(frm.doc.doctype, frm.doc.name);
|
||||||
}, __('Create'));
|
}, __('Create'));
|
||||||
|
|
||||||
|
frm.add_custom_button(__('Get Supplier Group Details'), function () {
|
||||||
|
frm.trigger("get_supplier_group_details");
|
||||||
|
}, __('Actions'));
|
||||||
|
|
||||||
// indicators
|
// indicators
|
||||||
erpnext.utils.set_party_dashboard_indicators(frm);
|
erpnext.utils.set_party_dashboard_indicators(frm);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
get_supplier_group_details: function(frm) {
|
||||||
|
frappe.call({
|
||||||
|
method: "get_supplier_group_details",
|
||||||
|
doc: frm.doc,
|
||||||
|
callback: function() {
|
||||||
|
frm.refresh();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
},
|
||||||
|
|
||||||
is_internal_supplier: function(frm) {
|
is_internal_supplier: function(frm) {
|
||||||
if (frm.doc.is_internal_supplier == 1) {
|
if (frm.doc.is_internal_supplier == 1) {
|
||||||
|
@ -51,6 +51,23 @@ class Supplier(TransactionBase):
|
|||||||
validate_party_accounts(self)
|
validate_party_accounts(self)
|
||||||
self.validate_internal_supplier()
|
self.validate_internal_supplier()
|
||||||
|
|
||||||
|
@frappe.whitelist()
|
||||||
|
def get_supplier_group_details(self):
|
||||||
|
doc = frappe.get_doc('Supplier Group', self.supplier_group)
|
||||||
|
self.payment_terms = ""
|
||||||
|
self.accounts = []
|
||||||
|
|
||||||
|
if doc.accounts:
|
||||||
|
for account in doc.accounts:
|
||||||
|
child = self.append('accounts')
|
||||||
|
child.company = account.company
|
||||||
|
child.account = account.account
|
||||||
|
|
||||||
|
if doc.payment_terms:
|
||||||
|
self.payment_terms = doc.payment_terms
|
||||||
|
|
||||||
|
self.save()
|
||||||
|
|
||||||
def validate_internal_supplier(self):
|
def validate_internal_supplier(self):
|
||||||
internal_supplier = frappe.db.get_value("Supplier",
|
internal_supplier = frappe.db.get_value("Supplier",
|
||||||
{"is_internal_supplier": 1, "represents_company": self.represents_company, "name": ("!=", self.name)}, "name")
|
{"is_internal_supplier": 1, "represents_company": self.represents_company, "name": ("!=", self.name)}, "name")
|
||||||
|
@ -13,6 +13,30 @@ test_records = frappe.get_test_records('Supplier')
|
|||||||
|
|
||||||
|
|
||||||
class TestSupplier(unittest.TestCase):
|
class TestSupplier(unittest.TestCase):
|
||||||
|
def test_get_supplier_group_details(self):
|
||||||
|
doc = frappe.new_doc("Supplier Group")
|
||||||
|
doc.supplier_group_name = "_Testing Supplier Group"
|
||||||
|
doc.payment_terms = "_Test Payment Term Template 3"
|
||||||
|
doc.accounts = []
|
||||||
|
test_account_details = {
|
||||||
|
"company": "_Test Company",
|
||||||
|
"account": "Creditors - _TC",
|
||||||
|
}
|
||||||
|
doc.append("accounts", test_account_details)
|
||||||
|
doc.save()
|
||||||
|
s_doc = frappe.new_doc("Supplier")
|
||||||
|
s_doc.supplier_name = "Testing Supplier"
|
||||||
|
s_doc.supplier_group = "_Testing Supplier Group"
|
||||||
|
s_doc.payment_terms = ""
|
||||||
|
s_doc.accounts = []
|
||||||
|
s_doc.insert()
|
||||||
|
s_doc.get_supplier_group_details()
|
||||||
|
self.assertEqual(s_doc.payment_terms, "_Test Payment Term Template 3")
|
||||||
|
self.assertEqual(s_doc.accounts[0].company, "_Test Company")
|
||||||
|
self.assertEqual(s_doc.accounts[0].account, "Creditors - _TC")
|
||||||
|
s_doc.delete()
|
||||||
|
doc.delete()
|
||||||
|
|
||||||
def test_supplier_default_payment_terms(self):
|
def test_supplier_default_payment_terms(self):
|
||||||
# Payment Term based on Days after invoice date
|
# Payment Term based on Days after invoice date
|
||||||
frappe.db.set_value(
|
frappe.db.set_value(
|
||||||
|
69
erpnext/change_log/v13/v13_7_0.md
Normal file
69
erpnext/change_log/v13/v13_7_0.md
Normal file
@ -0,0 +1,69 @@
|
|||||||
|
# Version 13.7.0 Release Notes
|
||||||
|
|
||||||
|
### Features & Enhancements
|
||||||
|
- Optionally allow rejected quality inspection on submission ([#26133](https://github.com/frappe/erpnext/pull/26133))
|
||||||
|
- Bootstrapped GST Setup for India ([#25415](https://github.com/frappe/erpnext/pull/25415))
|
||||||
|
- Fetching details from supplier/customer groups ([#26454](https://github.com/frappe/erpnext/pull/26454))
|
||||||
|
- Provision to make subcontracted purchase order from the production plan ([#26240](https://github.com/frappe/erpnext/pull/26240))
|
||||||
|
- Optimized code for reposting item valuation ([#26432](https://github.com/frappe/erpnext/pull/26432))
|
||||||
|
|
||||||
|
### Fixes
|
||||||
|
- Auto process deferred accounting for multi-company setup ([#26277](https://github.com/frappe/erpnext/pull/26277))
|
||||||
|
- Error while fetching item taxes ([#26218](https://github.com/frappe/erpnext/pull/26218))
|
||||||
|
- Validation check for batch for stock reconciliation type in stock entry(bp #26370 ) ([#26488](https://github.com/frappe/erpnext/pull/26488))
|
||||||
|
- Error popup for COA errors ([#26358](https://github.com/frappe/erpnext/pull/26358))
|
||||||
|
- Precision for expected values in payment entry test ([#26394](https://github.com/frappe/erpnext/pull/26394))
|
||||||
|
- Bank statement import ([#26287](https://github.com/frappe/erpnext/pull/26287))
|
||||||
|
- LMS progress issue ([#26253](https://github.com/frappe/erpnext/pull/26253))
|
||||||
|
- Paging buttons not working on item group portal page ([#26497](https://github.com/frappe/erpnext/pull/26497))
|
||||||
|
- Omit item discount amount for e-invoicing ([#26353](https://github.com/frappe/erpnext/pull/26353))
|
||||||
|
- Validate LCV for Invoices without Update Stock ([#26333](https://github.com/frappe/erpnext/pull/26333))
|
||||||
|
- Remove cancelled entries in consolidated financial statements ([#26331](https://github.com/frappe/erpnext/pull/26331))
|
||||||
|
- Fetching employee in payroll entry ([#26271](https://github.com/frappe/erpnext/pull/26271))
|
||||||
|
- To fetch the correct field in Tax Rule ([#25927](https://github.com/frappe/erpnext/pull/25927))
|
||||||
|
- Order and time of operations in multilevel BOM work order ([#25886](https://github.com/frappe/erpnext/pull/25886))
|
||||||
|
- Fixed Budget Variance Graph color from all black to default ([#26368](https://github.com/frappe/erpnext/pull/26368))
|
||||||
|
- TDS computation summary shows cancelled invoices (#26456) ([#26486](https://github.com/frappe/erpnext/pull/26486))
|
||||||
|
- Do not consider cancelled entries in party dashboard ([#26231](https://github.com/frappe/erpnext/pull/26231))
|
||||||
|
- Add validation for 'for_qty' else throws errors ([#25829](https://github.com/frappe/erpnext/pull/25829))
|
||||||
|
- Move the rename abbreviation job to long queue (#26434) ([#26462](https://github.com/frappe/erpnext/pull/26462))
|
||||||
|
- Query for Training Event ([#26388](https://github.com/frappe/erpnext/pull/26388))
|
||||||
|
- Item group portal issues (backport) ([#26493](https://github.com/frappe/erpnext/pull/26493))
|
||||||
|
- When lead is created with mobile_no, mobile_no value gets lost ([#26298](https://github.com/frappe/erpnext/pull/26298))
|
||||||
|
- WIP needs to be set before submit on skip_transfer (bp #26499) ([#26507](https://github.com/frappe/erpnext/pull/26507))
|
||||||
|
- Incorrect valuation rate in stock reconciliation ([#26259](https://github.com/frappe/erpnext/pull/26259))
|
||||||
|
- Precision rate for packed items in internal transfers ([#26046](https://github.com/frappe/erpnext/pull/26046))
|
||||||
|
- Changed profitability analysis report width ([#26165](https://github.com/frappe/erpnext/pull/26165))
|
||||||
|
- Unable to download GSTR-1 json ([#26468](https://github.com/frappe/erpnext/pull/26468))
|
||||||
|
- Unallocated amount in Payment Entry after taxes ([#26472](https://github.com/frappe/erpnext/pull/26472))
|
||||||
|
- Include Stock Reco logic in `update_qty_in_future_sle` ([#26158](https://github.com/frappe/erpnext/pull/26158))
|
||||||
|
- Update cost not working in the draft BOM ([#26279](https://github.com/frappe/erpnext/pull/26279))
|
||||||
|
- Cancellation of Loan Security Pledges ([#26252](https://github.com/frappe/erpnext/pull/26252))
|
||||||
|
- fix(e-invoicing): allow export invoice even if no taxes applied (#26363) ([#26405](https://github.com/frappe/erpnext/pull/26405))
|
||||||
|
- Delete accounts (an empty file) ([#25323](https://github.com/frappe/erpnext/pull/25323))
|
||||||
|
- Errors on parallel requests creation of company for India ([#26470](https://github.com/frappe/erpnext/pull/26470))
|
||||||
|
- Incorrect bom no added for non-variant items on variant boms ([#26320](https://github.com/frappe/erpnext/pull/26320))
|
||||||
|
- Incorrect discount amount on amended document ([#26466](https://github.com/frappe/erpnext/pull/26466))
|
||||||
|
- Added a message to enable appointment booking if disabled ([#26334](https://github.com/frappe/erpnext/pull/26334))
|
||||||
|
- fix(pos): taxes amount in pos item cart ([#26411](https://github.com/frappe/erpnext/pull/26411))
|
||||||
|
- Track changes on batch ([#26382](https://github.com/frappe/erpnext/pull/26382))
|
||||||
|
- Stock entry with putaway rule not working ([#26350](https://github.com/frappe/erpnext/pull/26350))
|
||||||
|
- Only "Tax" type accounts should be shown for selection in GST Settings ([#26300](https://github.com/frappe/erpnext/pull/26300))
|
||||||
|
- Added permission for employee to book appointment ([#26255](https://github.com/frappe/erpnext/pull/26255))
|
||||||
|
- Allow to make job card without employee ([#26312](https://github.com/frappe/erpnext/pull/26312))
|
||||||
|
- Project Portal Enhancements ([#26290](https://github.com/frappe/erpnext/pull/26290))
|
||||||
|
- BOM stock report not working ([#26332](https://github.com/frappe/erpnext/pull/26332))
|
||||||
|
- Order Items by weightage in the web items query ([#26284](https://github.com/frappe/erpnext/pull/26284))
|
||||||
|
- Removed values out of sync validation from stock transactions ([#26226](https://github.com/frappe/erpnext/pull/26226))
|
||||||
|
- Payroll-entry minor fix ([#26349](https://github.com/frappe/erpnext/pull/26349))
|
||||||
|
- Allow user to change the To Date in the blanket order even after submit of order ([#26241](https://github.com/frappe/erpnext/pull/26241))
|
||||||
|
- Value fetching for custom field in POS ([#26367](https://github.com/frappe/erpnext/pull/26367))
|
||||||
|
- Iteration through accounts only when accounts exist ([#26391](https://github.com/frappe/erpnext/pull/26391))
|
||||||
|
- Employee Inactive status implications ([#26244](https://github.com/frappe/erpnext/pull/26244))
|
||||||
|
- Multi-currency issue ([#26458](https://github.com/frappe/erpnext/pull/26458))
|
||||||
|
- FG item not fetched in manufacture entry ([#26509](https://github.com/frappe/erpnext/pull/26509))
|
||||||
|
- Set query for training events ([#26303](https://github.com/frappe/erpnext/pull/26303))
|
||||||
|
- Fetch batch items in stock reconciliation ([#26213](https://github.com/frappe/erpnext/pull/26213))
|
||||||
|
- Employee selection not working in payroll entry ([#26278](https://github.com/frappe/erpnext/pull/26278))
|
||||||
|
- POS item cart dom updates (#26459) ([#26461](https://github.com/frappe/erpnext/pull/26461))
|
||||||
|
- dunning calculation of grand total when rate of interest is 0% ([#26285](https://github.com/frappe/erpnext/pull/26285))
|
@ -124,6 +124,8 @@ class AccountsController(TransactionBase):
|
|||||||
if cint(self.allocate_advances_automatically) and not cint(self.get(pos_check_field)):
|
if cint(self.allocate_advances_automatically) and not cint(self.get(pos_check_field)):
|
||||||
self.set_advances()
|
self.set_advances()
|
||||||
|
|
||||||
|
self.set_advance_gain_or_loss()
|
||||||
|
|
||||||
if self.is_return:
|
if self.is_return:
|
||||||
self.validate_qty()
|
self.validate_qty()
|
||||||
else:
|
else:
|
||||||
@ -584,15 +586,18 @@ class AccountsController(TransactionBase):
|
|||||||
allocated_amount = min(amount - advance_allocated, d.amount)
|
allocated_amount = min(amount - advance_allocated, d.amount)
|
||||||
advance_allocated += flt(allocated_amount)
|
advance_allocated += flt(allocated_amount)
|
||||||
|
|
||||||
self.append("advances", {
|
advance_row = {
|
||||||
"doctype": self.doctype + " Advance",
|
"doctype": self.doctype + " Advance",
|
||||||
"reference_type": d.reference_type,
|
"reference_type": d.reference_type,
|
||||||
"reference_name": d.reference_name,
|
"reference_name": d.reference_name,
|
||||||
"reference_row": d.reference_row,
|
"reference_row": d.reference_row,
|
||||||
"remarks": d.remarks,
|
"remarks": d.remarks,
|
||||||
"advance_amount": flt(d.amount),
|
"advance_amount": flt(d.amount),
|
||||||
"allocated_amount": allocated_amount
|
"allocated_amount": allocated_amount,
|
||||||
})
|
"ref_exchange_rate": flt(d.exchange_rate) # exchange_rate of advance entry
|
||||||
|
}
|
||||||
|
|
||||||
|
self.append("advances", advance_row)
|
||||||
|
|
||||||
def get_advance_entries(self, include_unallocated=True):
|
def get_advance_entries(self, include_unallocated=True):
|
||||||
if self.doctype == "Sales Invoice":
|
if self.doctype == "Sales Invoice":
|
||||||
@ -650,6 +655,66 @@ class AccountsController(TransactionBase):
|
|||||||
"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.")
|
"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.")
|
||||||
.format(d.reference_name, d.against_order))
|
.format(d.reference_name, d.against_order))
|
||||||
|
|
||||||
|
def set_advance_gain_or_loss(self):
|
||||||
|
if not self.get("advances"):
|
||||||
|
return
|
||||||
|
|
||||||
|
for d in self.get("advances"):
|
||||||
|
advance_exchange_rate = d.ref_exchange_rate
|
||||||
|
if (d.allocated_amount and self.conversion_rate != 1
|
||||||
|
and self.conversion_rate != advance_exchange_rate):
|
||||||
|
|
||||||
|
base_allocated_amount_in_ref_rate = advance_exchange_rate * d.allocated_amount
|
||||||
|
base_allocated_amount_in_inv_rate = self.conversion_rate * d.allocated_amount
|
||||||
|
difference = base_allocated_amount_in_ref_rate - base_allocated_amount_in_inv_rate
|
||||||
|
|
||||||
|
d.exchange_gain_loss = difference
|
||||||
|
|
||||||
|
def make_exchange_gain_loss_gl_entries(self, gl_entries):
|
||||||
|
if self.get('doctype') in ['Purchase Invoice', 'Sales Invoice']:
|
||||||
|
for d in self.get("advances"):
|
||||||
|
if d.exchange_gain_loss:
|
||||||
|
party = self.supplier if self.get('doctype') == 'Purchase Invoice' else self.customer
|
||||||
|
party_account = self.credit_to if self.get('doctype') == 'Purchase Invoice' else self.debit_to
|
||||||
|
party_type = "Supplier" if self.get('doctype') == 'Purchase Invoice' else "Customer"
|
||||||
|
|
||||||
|
gain_loss_account = frappe.db.get_value('Company', self.company, 'exchange_gain_loss_account')
|
||||||
|
account_currency = get_account_currency(gain_loss_account)
|
||||||
|
if account_currency != self.company_currency:
|
||||||
|
frappe.throw(_("Currency for {0} must be {1}").format(d.account, self.company_currency))
|
||||||
|
|
||||||
|
# for purchase
|
||||||
|
dr_or_cr = 'debit' if d.exchange_gain_loss > 0 else 'credit'
|
||||||
|
# just reverse for sales?
|
||||||
|
dr_or_cr = 'debit' if dr_or_cr == 'credit' else 'credit'
|
||||||
|
|
||||||
|
gl_entries.append(
|
||||||
|
self.get_gl_dict({
|
||||||
|
"account": gain_loss_account,
|
||||||
|
"account_currency": account_currency,
|
||||||
|
"against": party,
|
||||||
|
dr_or_cr + "_in_account_currency": abs(d.exchange_gain_loss),
|
||||||
|
dr_or_cr: abs(d.exchange_gain_loss),
|
||||||
|
"cost_center": self.cost_center,
|
||||||
|
"project": self.project
|
||||||
|
}, item=d)
|
||||||
|
)
|
||||||
|
|
||||||
|
dr_or_cr = 'debit' if dr_or_cr == 'credit' else 'credit'
|
||||||
|
|
||||||
|
gl_entries.append(
|
||||||
|
self.get_gl_dict({
|
||||||
|
"account": party_account,
|
||||||
|
"party_type": party_type,
|
||||||
|
"party": party,
|
||||||
|
"against": gain_loss_account,
|
||||||
|
dr_or_cr + "_in_account_currency": flt(abs(d.exchange_gain_loss) / self.conversion_rate),
|
||||||
|
dr_or_cr: abs(d.exchange_gain_loss),
|
||||||
|
"cost_center": self.cost_center,
|
||||||
|
"project": self.project
|
||||||
|
}, self.party_account_currency, item=self)
|
||||||
|
)
|
||||||
|
|
||||||
def update_against_document_in_jv(self):
|
def update_against_document_in_jv(self):
|
||||||
"""
|
"""
|
||||||
Links invoice and advance voucher:
|
Links invoice and advance voucher:
|
||||||
@ -690,7 +755,9 @@ class AccountsController(TransactionBase):
|
|||||||
if self.party_account_currency != self.company_currency else 1),
|
if self.party_account_currency != self.company_currency else 1),
|
||||||
'grand_total': (self.base_grand_total
|
'grand_total': (self.base_grand_total
|
||||||
if self.party_account_currency == self.company_currency else self.grand_total),
|
if self.party_account_currency == self.company_currency else self.grand_total),
|
||||||
'outstanding_amount': self.outstanding_amount
|
'outstanding_amount': self.outstanding_amount,
|
||||||
|
'difference_account': frappe.db.get_value('Company', self.company, 'exchange_gain_loss_account'),
|
||||||
|
'exchange_gain_loss': flt(d.get('exchange_gain_loss'))
|
||||||
})
|
})
|
||||||
lst.append(args)
|
lst.append(args)
|
||||||
|
|
||||||
@ -751,11 +818,11 @@ class AccountsController(TransactionBase):
|
|||||||
account_currency = get_account_currency(tax.account_head)
|
account_currency = get_account_currency(tax.account_head)
|
||||||
|
|
||||||
if self.doctype == "Purchase Invoice":
|
if self.doctype == "Purchase Invoice":
|
||||||
dr_or_cr = "credit" if tax.add_deduct_tax == "Add" else "debit"
|
|
||||||
rev_dr_cr = "debit" if tax.add_deduct_tax == "Add" else "credit"
|
|
||||||
else:
|
|
||||||
dr_or_cr = "debit" if tax.add_deduct_tax == "Add" else "credit"
|
dr_or_cr = "debit" if tax.add_deduct_tax == "Add" else "credit"
|
||||||
rev_dr_cr = "credit" if tax.add_deduct_tax == "Add" else "debit"
|
rev_dr_cr = "credit" if tax.add_deduct_tax == "Add" else "debit"
|
||||||
|
else:
|
||||||
|
dr_or_cr = "credit" if tax.add_deduct_tax == "Add" else "debit"
|
||||||
|
rev_dr_cr = "debit" if tax.add_deduct_tax == "Add" else "credit"
|
||||||
|
|
||||||
party = self.supplier if self.doctype == "Purchase Invoice" else self.customer
|
party = self.supplier if self.doctype == "Purchase Invoice" else self.customer
|
||||||
unallocated_amount = tax.tax_amount - tax.allocated_amount
|
unallocated_amount = tax.tax_amount - tax.allocated_amount
|
||||||
@ -1289,6 +1356,8 @@ def get_advance_payment_entries(party_type, party, party_account, order_doctype,
|
|||||||
party_account_field = "paid_from" if party_type == "Customer" else "paid_to"
|
party_account_field = "paid_from" if party_type == "Customer" else "paid_to"
|
||||||
currency_field = "paid_from_account_currency" if party_type == "Customer" else "paid_to_account_currency"
|
currency_field = "paid_from_account_currency" if party_type == "Customer" else "paid_to_account_currency"
|
||||||
payment_type = "Receive" if party_type == "Customer" else "Pay"
|
payment_type = "Receive" if party_type == "Customer" else "Pay"
|
||||||
|
exchange_rate_field = "source_exchange_rate" if payment_type == "Receive" else "target_exchange_rate"
|
||||||
|
|
||||||
payment_entries_against_order, unallocated_payment_entries = [], []
|
payment_entries_against_order, unallocated_payment_entries = [], []
|
||||||
limit_cond = "limit %s" % limit if limit else ""
|
limit_cond = "limit %s" % limit if limit else ""
|
||||||
|
|
||||||
@ -1305,27 +1374,28 @@ def get_advance_payment_entries(party_type, party, party_account, order_doctype,
|
|||||||
"Payment Entry" as reference_type, t1.name as reference_name,
|
"Payment Entry" as reference_type, t1.name as reference_name,
|
||||||
t1.remarks, t2.allocated_amount as amount, t2.name as reference_row,
|
t1.remarks, t2.allocated_amount as amount, t2.name as reference_row,
|
||||||
t2.reference_name as against_order, t1.posting_date,
|
t2.reference_name as against_order, t1.posting_date,
|
||||||
t1.{0} as currency
|
t1.{0} as currency, t1.{4} as exchange_rate
|
||||||
from `tabPayment Entry` t1, `tabPayment Entry Reference` t2
|
from `tabPayment Entry` t1, `tabPayment Entry Reference` t2
|
||||||
where
|
where
|
||||||
t1.name = t2.parent and t1.{1} = %s and t1.payment_type = %s
|
t1.name = t2.parent and t1.{1} = %s and t1.payment_type = %s
|
||||||
and t1.party_type = %s and t1.party = %s and t1.docstatus = 1
|
and t1.party_type = %s and t1.party = %s and t1.docstatus = 1
|
||||||
and t2.reference_doctype = %s {2}
|
and t2.reference_doctype = %s {2}
|
||||||
order by t1.posting_date {3}
|
order by t1.posting_date {3}
|
||||||
""".format(currency_field, party_account_field, reference_condition, limit_cond),
|
""".format(currency_field, party_account_field, reference_condition, limit_cond, exchange_rate_field),
|
||||||
[party_account, payment_type, party_type, party,
|
[party_account, payment_type, party_type, party,
|
||||||
order_doctype] + order_list, as_dict=1)
|
order_doctype] + order_list, as_dict=1)
|
||||||
|
|
||||||
if include_unallocated:
|
if include_unallocated:
|
||||||
unallocated_payment_entries = frappe.db.sql("""
|
unallocated_payment_entries = frappe.db.sql("""
|
||||||
select "Payment Entry" as reference_type, name as reference_name,
|
select "Payment Entry" as reference_type, name as reference_name,
|
||||||
remarks, unallocated_amount as amount
|
remarks, unallocated_amount as amount, {2} as exchange_rate
|
||||||
from `tabPayment Entry`
|
from `tabPayment Entry`
|
||||||
where
|
where
|
||||||
{0} = %s and party_type = %s and party = %s and payment_type = %s
|
{0} = %s and party_type = %s and party = %s and payment_type = %s
|
||||||
and docstatus = 1 and unallocated_amount > 0
|
and docstatus = 1 and unallocated_amount > 0
|
||||||
order by posting_date {1}
|
order by posting_date {1}
|
||||||
""".format(party_account_field, limit_cond), (party_account, party_type, party, payment_type), as_dict=1)
|
""".format(party_account_field, limit_cond, exchange_rate_field),
|
||||||
|
(party_account, party_type, party, payment_type), as_dict=1)
|
||||||
|
|
||||||
return list(payment_entries_against_order) + list(unallocated_payment_entries)
|
return list(payment_entries_against_order) + list(unallocated_payment_entries)
|
||||||
|
|
||||||
|
@ -356,42 +356,68 @@ class StockController(AccountsController):
|
|||||||
}, update_modified)
|
}, update_modified)
|
||||||
|
|
||||||
def validate_inspection(self):
|
def validate_inspection(self):
|
||||||
'''Checks if quality inspection is set for Items that require inspection.
|
"""Checks if quality inspection is set/ is valid for Items that require inspection."""
|
||||||
On submit, throw an exception'''
|
inspection_fieldname_map = {
|
||||||
inspection_required_fieldname = None
|
"Purchase Receipt": "inspection_required_before_purchase",
|
||||||
if self.doctype in ["Purchase Receipt", "Purchase Invoice"]:
|
"Purchase Invoice": "inspection_required_before_purchase",
|
||||||
inspection_required_fieldname = "inspection_required_before_purchase"
|
"Sales Invoice": "inspection_required_before_delivery",
|
||||||
elif self.doctype in ["Delivery Note", "Sales Invoice"]:
|
"Delivery Note": "inspection_required_before_delivery"
|
||||||
inspection_required_fieldname = "inspection_required_before_delivery"
|
}
|
||||||
|
inspection_required_fieldname = inspection_fieldname_map.get(self.doctype)
|
||||||
|
|
||||||
|
# return if inspection is not required on document level
|
||||||
if ((not inspection_required_fieldname and self.doctype != "Stock Entry") or
|
if ((not inspection_required_fieldname and self.doctype != "Stock Entry") or
|
||||||
(self.doctype == "Stock Entry" and not self.inspection_required) or
|
(self.doctype == "Stock Entry" and not self.inspection_required) or
|
||||||
(self.doctype in ["Sales Invoice", "Purchase Invoice"] and not self.update_stock)):
|
(self.doctype in ["Sales Invoice", "Purchase Invoice"] and not self.update_stock)):
|
||||||
return
|
return
|
||||||
|
|
||||||
for d in self.get('items'):
|
for row in self.get('items'):
|
||||||
qa_required = False
|
qi_required = False
|
||||||
if (inspection_required_fieldname and not d.quality_inspection and
|
if (inspection_required_fieldname and frappe.db.get_value("Item", row.item_code, inspection_required_fieldname)):
|
||||||
frappe.db.get_value("Item", d.item_code, inspection_required_fieldname)):
|
qi_required = True
|
||||||
qa_required = True
|
elif self.doctype == "Stock Entry" and row.t_warehouse:
|
||||||
elif self.doctype == "Stock Entry" and not d.quality_inspection and d.t_warehouse:
|
qi_required = True # inward stock needs inspection
|
||||||
qa_required = True
|
|
||||||
if self.docstatus == 1 and d.quality_inspection:
|
|
||||||
qa_doc = frappe.get_doc("Quality Inspection", d.quality_inspection)
|
|
||||||
if qa_doc.docstatus == 0:
|
|
||||||
link = frappe.utils.get_link_to_form('Quality Inspection', d.quality_inspection)
|
|
||||||
frappe.throw(_("Quality Inspection: {0} is not submitted for the item: {1} in row {2}").format(link, d.item_code, d.idx), QualityInspectionNotSubmittedError)
|
|
||||||
|
|
||||||
if qa_doc.status != 'Accepted':
|
if qi_required: # validate row only if inspection is required on item level
|
||||||
frappe.throw(_("Row {0}: Quality Inspection rejected for item {1}")
|
self.validate_qi_presence(row)
|
||||||
.format(d.idx, d.item_code), QualityInspectionRejectedError)
|
if self.docstatus == 1:
|
||||||
elif qa_required :
|
self.validate_qi_submission(row)
|
||||||
action = frappe.get_doc('Stock Settings').action_if_quality_inspection_is_not_submitted
|
self.validate_qi_rejection(row)
|
||||||
if self.docstatus==1 and action == 'Stop':
|
|
||||||
frappe.throw(_("Quality Inspection required for Item {0} to submit").format(frappe.bold(d.item_code)),
|
def validate_qi_presence(self, row):
|
||||||
exc=QualityInspectionRequiredError)
|
"""Check if QI is present on row level. Warn on save and stop on submit if missing."""
|
||||||
|
if not row.quality_inspection:
|
||||||
|
msg = f"Row #{row.idx}: Quality Inspection is required for Item {frappe.bold(row.item_code)}"
|
||||||
|
if self.docstatus == 1:
|
||||||
|
frappe.throw(_(msg), title=_("Inspection Required"), exc=QualityInspectionRequiredError)
|
||||||
else:
|
else:
|
||||||
frappe.msgprint(_("Create Quality Inspection for Item {0}").format(frappe.bold(d.item_code)))
|
frappe.msgprint(_(msg), title=_("Inspection Required"), indicator="blue")
|
||||||
|
|
||||||
|
def validate_qi_submission(self, row):
|
||||||
|
"""Check if QI is submitted on row level, during submission"""
|
||||||
|
action = frappe.db.get_single_value("Stock Settings", "action_if_quality_inspection_is_not_submitted")
|
||||||
|
qa_docstatus = frappe.db.get_value("Quality Inspection", row.quality_inspection, "docstatus")
|
||||||
|
|
||||||
|
if not qa_docstatus == 1:
|
||||||
|
link = frappe.utils.get_link_to_form('Quality Inspection', row.quality_inspection)
|
||||||
|
msg = f"Row #{row.idx}: Quality Inspection {link} is not submitted for the item: {row.item_code}"
|
||||||
|
if action == "Stop":
|
||||||
|
frappe.throw(_(msg), title=_("Inspection Submission"), exc=QualityInspectionNotSubmittedError)
|
||||||
|
else:
|
||||||
|
frappe.msgprint(_(msg), alert=True, indicator="orange")
|
||||||
|
|
||||||
|
def validate_qi_rejection(self, row):
|
||||||
|
"""Check if QI is rejected on row level, during submission"""
|
||||||
|
action = frappe.db.get_single_value("Stock Settings", "action_if_quality_inspection_is_rejected")
|
||||||
|
qa_status = frappe.db.get_value("Quality Inspection", row.quality_inspection, "status")
|
||||||
|
|
||||||
|
if qa_status == "Rejected":
|
||||||
|
link = frappe.utils.get_link_to_form('Quality Inspection', row.quality_inspection)
|
||||||
|
msg = f"Row #{row.idx}: Quality Inspection {link} was rejected for item {row.item_code}"
|
||||||
|
if action == "Stop":
|
||||||
|
frappe.throw(_(msg), title=_("Inspection Rejected"), exc=QualityInspectionRejectedError)
|
||||||
|
else:
|
||||||
|
frappe.msgprint(_(msg), alert=True, indicator="orange")
|
||||||
|
|
||||||
def update_blanket_order(self):
|
def update_blanket_order(self):
|
||||||
blanket_orders = list(set([d.blanket_order for d in self.items if d.blanket_order]))
|
blanket_orders = list(set([d.blanket_order for d in self.items if d.blanket_order]))
|
||||||
|
@ -102,7 +102,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"links": [],
|
"links": [],
|
||||||
"modified": "2020-01-28 16:16:45.447213",
|
"modified": "2021-06-30 13:09:14.228756",
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "CRM",
|
"module": "CRM",
|
||||||
"name": "Appointment",
|
"name": "Appointment",
|
||||||
@ -153,6 +153,18 @@
|
|||||||
"role": "Sales User",
|
"role": "Sales User",
|
||||||
"share": 1,
|
"share": 1,
|
||||||
"write": 1
|
"write": 1
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"create": 1,
|
||||||
|
"delete": 1,
|
||||||
|
"email": 1,
|
||||||
|
"export": 1,
|
||||||
|
"print": 1,
|
||||||
|
"read": 1,
|
||||||
|
"report": 1,
|
||||||
|
"role": "Employee",
|
||||||
|
"share": 1,
|
||||||
|
"write": 1
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"quick_entry": 1,
|
"quick_entry": 1,
|
||||||
|
@ -168,12 +168,13 @@ class Lead(SellingController):
|
|||||||
if self.phone:
|
if self.phone:
|
||||||
contact.append("phone_nos", {
|
contact.append("phone_nos", {
|
||||||
"phone": self.phone,
|
"phone": self.phone,
|
||||||
"is_primary": 1
|
"is_primary_phone": 1
|
||||||
})
|
})
|
||||||
|
|
||||||
if self.mobile_no:
|
if self.mobile_no:
|
||||||
contact.append("phone_nos", {
|
contact.append("phone_nos", {
|
||||||
"phone": self.mobile_no
|
"phone": self.mobile_no,
|
||||||
|
"is_primary_mobile_no":1
|
||||||
})
|
})
|
||||||
|
|
||||||
contact.insert(ignore_permissions=True)
|
contact.insert(ignore_permissions=True)
|
||||||
|
@ -355,11 +355,11 @@ def get_or_create_course_enrollment(course, program):
|
|||||||
student = get_current_student()
|
student = get_current_student()
|
||||||
course_enrollment = get_enrollment("course", course, student.name)
|
course_enrollment = get_enrollment("course", course, student.name)
|
||||||
if not course_enrollment:
|
if not course_enrollment:
|
||||||
program_enrollment = get_enrollment('program', program, student.name)
|
program_enrollment = get_enrollment('program', program.name, student.name)
|
||||||
if not program_enrollment:
|
if not program_enrollment:
|
||||||
frappe.throw(_("You are not enrolled in program {0}").format(program))
|
frappe.throw(_("You are not enrolled in program {0}").format(program))
|
||||||
return
|
return
|
||||||
return student.enroll_in_course(course_name=course, program_enrollment=get_enrollment('program', program, student.name))
|
return student.enroll_in_course(course_name=course, program_enrollment=get_enrollment('program', program.name, student.name))
|
||||||
else:
|
else:
|
||||||
return frappe.get_doc('Course Enrollment', course_enrollment)
|
return frappe.get_doc('Course Enrollment', course_enrollment)
|
||||||
|
|
||||||
|
@ -7,16 +7,21 @@ import frappe
|
|||||||
import unittest
|
import unittest
|
||||||
from erpnext.erpnext_integrations.doctype.mpesa_settings.mpesa_settings import process_balance_info, verify_transaction
|
from erpnext.erpnext_integrations.doctype.mpesa_settings.mpesa_settings import process_balance_info, verify_transaction
|
||||||
from erpnext.accounts.doctype.pos_invoice.test_pos_invoice import create_pos_invoice
|
from erpnext.accounts.doctype.pos_invoice.test_pos_invoice import create_pos_invoice
|
||||||
|
from erpnext.erpnext_integrations.utils import create_mode_of_payment
|
||||||
|
|
||||||
class TestMpesaSettings(unittest.TestCase):
|
class TestMpesaSettings(unittest.TestCase):
|
||||||
|
def setUp(self):
|
||||||
|
# create payment gateway in setup
|
||||||
|
create_mpesa_settings(payment_gateway_name="_Test")
|
||||||
|
create_mpesa_settings(payment_gateway_name="_Account Balance")
|
||||||
|
create_mpesa_settings(payment_gateway_name="Payment")
|
||||||
|
|
||||||
def tearDown(self):
|
def tearDown(self):
|
||||||
frappe.db.sql('delete from `tabMpesa Settings`')
|
frappe.db.sql('delete from `tabMpesa Settings`')
|
||||||
frappe.db.sql('delete from `tabIntegration Request` where integration_request_service = "Mpesa"')
|
frappe.db.sql('delete from `tabIntegration Request` where integration_request_service = "Mpesa"')
|
||||||
|
|
||||||
def test_creation_of_payment_gateway(self):
|
def test_creation_of_payment_gateway(self):
|
||||||
create_mpesa_settings(payment_gateway_name="_Test")
|
mode_of_payment = create_mode_of_payment('Mpesa-_Test', payment_type="Phone")
|
||||||
|
|
||||||
mode_of_payment = frappe.get_doc("Mode of Payment", "Mpesa-_Test")
|
|
||||||
self.assertTrue(frappe.db.exists("Payment Gateway Account", {'payment_gateway': "Mpesa-_Test"}))
|
self.assertTrue(frappe.db.exists("Payment Gateway Account", {'payment_gateway': "Mpesa-_Test"}))
|
||||||
self.assertTrue(mode_of_payment.name)
|
self.assertTrue(mode_of_payment.name)
|
||||||
self.assertEqual(mode_of_payment.type, "Phone")
|
self.assertEqual(mode_of_payment.type, "Phone")
|
||||||
@ -47,7 +52,6 @@ class TestMpesaSettings(unittest.TestCase):
|
|||||||
integration_request.delete()
|
integration_request.delete()
|
||||||
|
|
||||||
def test_processing_of_callback_payload(self):
|
def test_processing_of_callback_payload(self):
|
||||||
create_mpesa_settings(payment_gateway_name="Payment")
|
|
||||||
mpesa_account = frappe.db.get_value("Payment Gateway Account", {"payment_gateway": 'Mpesa-Payment'}, "payment_account")
|
mpesa_account = frappe.db.get_value("Payment Gateway Account", {"payment_gateway": 'Mpesa-Payment'}, "payment_account")
|
||||||
frappe.db.set_value("Account", mpesa_account, "account_currency", "KES")
|
frappe.db.set_value("Account", mpesa_account, "account_currency", "KES")
|
||||||
frappe.db.set_value("Customer", "_Test Customer", "default_currency", "KES")
|
frappe.db.set_value("Customer", "_Test Customer", "default_currency", "KES")
|
||||||
@ -90,7 +94,6 @@ class TestMpesaSettings(unittest.TestCase):
|
|||||||
pos_invoice.delete()
|
pos_invoice.delete()
|
||||||
|
|
||||||
def test_processing_of_multiple_callback_payload(self):
|
def test_processing_of_multiple_callback_payload(self):
|
||||||
create_mpesa_settings(payment_gateway_name="Payment")
|
|
||||||
mpesa_account = frappe.db.get_value("Payment Gateway Account", {"payment_gateway": 'Mpesa-Payment'}, "payment_account")
|
mpesa_account = frappe.db.get_value("Payment Gateway Account", {"payment_gateway": 'Mpesa-Payment'}, "payment_account")
|
||||||
frappe.db.set_value("Account", mpesa_account, "account_currency", "KES")
|
frappe.db.set_value("Account", mpesa_account, "account_currency", "KES")
|
||||||
frappe.db.set_value("Mpesa Settings", "Payment", "transaction_limit", "500")
|
frappe.db.set_value("Mpesa Settings", "Payment", "transaction_limit", "500")
|
||||||
@ -141,7 +144,6 @@ class TestMpesaSettings(unittest.TestCase):
|
|||||||
pos_invoice.delete()
|
pos_invoice.delete()
|
||||||
|
|
||||||
def test_processing_of_only_one_succes_callback_payload(self):
|
def test_processing_of_only_one_succes_callback_payload(self):
|
||||||
create_mpesa_settings(payment_gateway_name="Payment")
|
|
||||||
mpesa_account = frappe.db.get_value("Payment Gateway Account", {"payment_gateway": 'Mpesa-Payment'}, "payment_account")
|
mpesa_account = frappe.db.get_value("Payment Gateway Account", {"payment_gateway": 'Mpesa-Payment'}, "payment_account")
|
||||||
frappe.db.set_value("Account", mpesa_account, "account_currency", "KES")
|
frappe.db.set_value("Account", mpesa_account, "account_currency", "KES")
|
||||||
frappe.db.set_value("Mpesa Settings", "Payment", "transaction_limit", "500")
|
frappe.db.set_value("Mpesa Settings", "Payment", "transaction_limit", "500")
|
||||||
@ -202,6 +204,7 @@ def create_mpesa_settings(payment_gateway_name="Express"):
|
|||||||
|
|
||||||
doc = frappe.get_doc(dict( #nosec
|
doc = frappe.get_doc(dict( #nosec
|
||||||
doctype="Mpesa Settings",
|
doctype="Mpesa Settings",
|
||||||
|
sandbox=1,
|
||||||
payment_gateway_name=payment_gateway_name,
|
payment_gateway_name=payment_gateway_name,
|
||||||
consumer_key="5sMu9LVI1oS3oBGPJfh3JyvLHwZOdTKn",
|
consumer_key="5sMu9LVI1oS3oBGPJfh3JyvLHwZOdTKn",
|
||||||
consumer_secret="VI1oS3oBGPJfh3JyvLHw",
|
consumer_secret="VI1oS3oBGPJfh3JyvLHw",
|
||||||
|
@ -52,7 +52,8 @@ def create_mode_of_payment(gateway, payment_type="General"):
|
|||||||
"payment_gateway": gateway
|
"payment_gateway": gateway
|
||||||
}, ['payment_account'])
|
}, ['payment_account'])
|
||||||
|
|
||||||
if not frappe.db.exists("Mode of Payment", gateway) and payment_gateway_account:
|
mode_of_payment = frappe.db.exists("Mode of Payment", gateway)
|
||||||
|
if not mode_of_payment and payment_gateway_account:
|
||||||
mode_of_payment = frappe.get_doc({
|
mode_of_payment = frappe.get_doc({
|
||||||
"doctype": "Mode of Payment",
|
"doctype": "Mode of Payment",
|
||||||
"mode_of_payment": gateway,
|
"mode_of_payment": gateway,
|
||||||
@ -66,6 +67,10 @@ def create_mode_of_payment(gateway, payment_type="General"):
|
|||||||
})
|
})
|
||||||
mode_of_payment.insert(ignore_permissions=True)
|
mode_of_payment.insert(ignore_permissions=True)
|
||||||
|
|
||||||
|
return mode_of_payment
|
||||||
|
elif mode_of_payment:
|
||||||
|
return frappe.get_doc("Mode of Payment", mode_of_payment)
|
||||||
|
|
||||||
def get_tracking_url(carrier, tracking_number):
|
def get_tracking_url(carrier, tracking_number):
|
||||||
# Return the formatted Tracking URL.
|
# Return the formatted Tracking URL.
|
||||||
tracking_url = ''
|
tracking_url = ''
|
||||||
|
@ -25,7 +25,8 @@ doctype_js = {
|
|||||||
"Address": "public/js/address.js",
|
"Address": "public/js/address.js",
|
||||||
"Communication": "public/js/communication.js",
|
"Communication": "public/js/communication.js",
|
||||||
"Event": "public/js/event.js",
|
"Event": "public/js/event.js",
|
||||||
"Newsletter": "public/js/newsletter.js"
|
"Newsletter": "public/js/newsletter.js",
|
||||||
|
"Contact": "public/js/contact.js"
|
||||||
}
|
}
|
||||||
|
|
||||||
override_doctype_class = {
|
override_doctype_class = {
|
||||||
@ -158,6 +159,7 @@ website_route_rules = [
|
|||||||
"parents": [{"label": _("Material Request"), "route": "material-requests"}]
|
"parents": [{"label": _("Material Request"), "route": "material-requests"}]
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
{"from_route": "/project", "to_route": "Project"}
|
||||||
]
|
]
|
||||||
|
|
||||||
standard_portal_menu_items = [
|
standard_portal_menu_items = [
|
||||||
@ -244,7 +246,10 @@ doc_events = {
|
|||||||
"erpnext.portal.utils.set_default_role"]
|
"erpnext.portal.utils.set_default_role"]
|
||||||
},
|
},
|
||||||
"Communication": {
|
"Communication": {
|
||||||
"on_update": "erpnext.support.doctype.service_level_agreement.service_level_agreement.update_hold_time"
|
"on_update": [
|
||||||
|
"erpnext.support.doctype.service_level_agreement.service_level_agreement.update_hold_time",
|
||||||
|
"erpnext.support.doctype.issue.issue.set_first_response_time"
|
||||||
|
]
|
||||||
},
|
},
|
||||||
("Sales Taxes and Charges Template", 'Price List'): {
|
("Sales Taxes and Charges Template", 'Price List'): {
|
||||||
"on_update": "erpnext.shopping_cart.doctype.shopping_cart_settings.shopping_cart_settings.validate_cart_settings"
|
"on_update": "erpnext.shopping_cart.doctype.shopping_cart_settings.shopping_cart_settings.validate_cart_settings"
|
||||||
|
@ -72,7 +72,8 @@ class TestExpenseClaim(unittest.TestCase):
|
|||||||
def test_expense_claim_gl_entry(self):
|
def test_expense_claim_gl_entry(self):
|
||||||
payable_account = get_payable_account(company_name)
|
payable_account = get_payable_account(company_name)
|
||||||
taxes = generate_taxes()
|
taxes = generate_taxes()
|
||||||
expense_claim = make_expense_claim(payable_account, 300, 200, company_name, "Travel Expenses - _TC4", do_not_submit=True, taxes=taxes)
|
expense_claim = make_expense_claim(payable_account, 300, 200, company_name, "Travel Expenses - _TC4",
|
||||||
|
do_not_submit=True, taxes=taxes)
|
||||||
expense_claim.submit()
|
expense_claim.submit()
|
||||||
|
|
||||||
gl_entries = frappe.db.sql("""select account, debit, credit
|
gl_entries = frappe.db.sql("""select account, debit, credit
|
||||||
@ -82,7 +83,7 @@ class TestExpenseClaim(unittest.TestCase):
|
|||||||
self.assertTrue(gl_entries)
|
self.assertTrue(gl_entries)
|
||||||
|
|
||||||
expected_values = dict((d[0], d) for d in [
|
expected_values = dict((d[0], d) for d in [
|
||||||
['CGST - _TC4',18.0, 0.0],
|
['Output Tax CGST - _TC4',18.0, 0.0],
|
||||||
[payable_account, 0.0, 218.0],
|
[payable_account, 0.0, 218.0],
|
||||||
["Travel Expenses - _TC4", 200.0, 0.0]
|
["Travel Expenses - _TC4", 200.0, 0.0]
|
||||||
])
|
])
|
||||||
@ -145,7 +146,7 @@ def generate_taxes():
|
|||||||
parent_account = frappe.db.get_value('Account',
|
parent_account = frappe.db.get_value('Account',
|
||||||
{'company': company_name, 'is_group':1, 'account_type': 'Tax'},
|
{'company': company_name, 'is_group':1, 'account_type': 'Tax'},
|
||||||
'name')
|
'name')
|
||||||
account = create_account(company=company_name, account_name="CGST", account_type="Tax", parent_account=parent_account)
|
account = create_account(company=company_name, account_name="Output Tax CGST", account_type="Tax", parent_account=parent_account)
|
||||||
return {'taxes':[{
|
return {'taxes':[{
|
||||||
"account_head": account,
|
"account_head": account,
|
||||||
"rate": 0,
|
"rate": 0,
|
||||||
|
@ -20,11 +20,10 @@ frappe.ui.form.on('Training Event', {
|
|||||||
frappe.set_route("List", "Training Feedback");
|
frappe.set_route("List", "Training Feedback");
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
frm.events.set_employee_query(frm);
|
||||||
});
|
},
|
||||||
|
|
||||||
frappe.ui.form.on("Training Event Employee", {
|
set_employee_query: function(frm) {
|
||||||
employee: function (frm) {
|
|
||||||
let emp = [];
|
let emp = [];
|
||||||
for (let d in frm.doc.employees) {
|
for (let d in frm.doc.employees) {
|
||||||
if (frm.doc.employees[d].employee) {
|
if (frm.doc.employees[d].employee) {
|
||||||
@ -34,9 +33,17 @@ frappe.ui.form.on("Training Event Employee", {
|
|||||||
frm.set_query("employee", "employees", function () {
|
frm.set_query("employee", "employees", function () {
|
||||||
return {
|
return {
|
||||||
filters: {
|
filters: {
|
||||||
name: ["NOT IN", emp]
|
name: ["NOT IN", emp],
|
||||||
|
status: "Active"
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
frappe.ui.form.on("Training Event Employee", {
|
||||||
|
employee: function(frm) {
|
||||||
|
frm.events.set_employee_query(frm);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
@ -19,6 +19,7 @@
|
|||||||
"fieldtype": "Link",
|
"fieldtype": "Link",
|
||||||
"in_list_view": 1,
|
"in_list_view": 1,
|
||||||
"label": "Employee",
|
"label": "Employee",
|
||||||
|
"no_copy": 1,
|
||||||
"options": "Employee"
|
"options": "Employee"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -68,7 +69,7 @@
|
|||||||
"index_web_pages_for_search": 1,
|
"index_web_pages_for_search": 1,
|
||||||
"istable": 1,
|
"istable": 1,
|
||||||
"links": [],
|
"links": [],
|
||||||
"modified": "2021-05-21 12:41:59.336237",
|
"modified": "2021-07-02 17:20:27.630176",
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "HR",
|
"module": "HR",
|
||||||
"name": "Training Event Employee",
|
"name": "Training Event Employee",
|
||||||
|
@ -28,7 +28,8 @@ frappe.ui.form.on('Loan', {
|
|||||||
frm.set_query("loan_type", function () {
|
frm.set_query("loan_type", function () {
|
||||||
return {
|
return {
|
||||||
"filters": {
|
"filters": {
|
||||||
"docstatus": 1
|
"docstatus": 1,
|
||||||
|
"company": frm.doc.company
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
@ -14,11 +14,18 @@ frappe.ui.form.on('Loan Application', {
|
|||||||
refresh: function(frm) {
|
refresh: function(frm) {
|
||||||
frm.trigger("toggle_fields");
|
frm.trigger("toggle_fields");
|
||||||
frm.trigger("add_toolbar_buttons");
|
frm.trigger("add_toolbar_buttons");
|
||||||
|
frm.set_query("loan_type", () => {
|
||||||
|
return {
|
||||||
|
filters: {
|
||||||
|
company: frm.doc.company
|
||||||
|
}
|
||||||
|
};
|
||||||
|
});
|
||||||
},
|
},
|
||||||
repayment_method: function(frm) {
|
repayment_method: function(frm) {
|
||||||
frm.doc.repayment_amount = frm.doc.repayment_periods = ""
|
frm.doc.repayment_amount = frm.doc.repayment_periods = "";
|
||||||
frm.trigger("toggle_fields")
|
frm.trigger("toggle_fields");
|
||||||
frm.trigger("toggle_required")
|
frm.trigger("toggle_required");
|
||||||
},
|
},
|
||||||
toggle_fields: function(frm) {
|
toggle_fields: function(frm) {
|
||||||
frm.toggle_enable("repayment_amount", frm.doc.repayment_method=="Repay Fixed Amount per Period")
|
frm.toggle_enable("repayment_amount", frm.doc.repayment_method=="Repay Fixed Amount per Period")
|
||||||
|
@ -35,7 +35,9 @@
|
|||||||
"no_copy": 1,
|
"no_copy": 1,
|
||||||
"options": "Loan Security Pledge",
|
"options": "Loan Security Pledge",
|
||||||
"print_hide": 1,
|
"print_hide": 1,
|
||||||
"read_only": 1
|
"read_only": 1,
|
||||||
|
"show_days": 1,
|
||||||
|
"show_seconds": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fetch_from": "loan_application.applicant",
|
"fetch_from": "loan_application.applicant",
|
||||||
@ -45,47 +47,63 @@
|
|||||||
"in_standard_filter": 1,
|
"in_standard_filter": 1,
|
||||||
"label": "Applicant",
|
"label": "Applicant",
|
||||||
"options": "applicant_type",
|
"options": "applicant_type",
|
||||||
"reqd": 1
|
"reqd": 1,
|
||||||
|
"show_days": 1,
|
||||||
|
"show_seconds": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "loan_security_details_section",
|
"fieldname": "loan_security_details_section",
|
||||||
"fieldtype": "Section Break",
|
"fieldtype": "Section Break",
|
||||||
"label": "Loan Security Details"
|
"label": "Loan Security Details",
|
||||||
|
"show_days": 1,
|
||||||
|
"show_seconds": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "column_break_3",
|
"fieldname": "column_break_3",
|
||||||
"fieldtype": "Column Break"
|
"fieldtype": "Column Break",
|
||||||
|
"show_days": 1,
|
||||||
|
"show_seconds": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "loan",
|
"fieldname": "loan",
|
||||||
"fieldtype": "Link",
|
"fieldtype": "Link",
|
||||||
"label": "Loan",
|
"label": "Loan",
|
||||||
"options": "Loan"
|
"options": "Loan",
|
||||||
|
"show_days": 1,
|
||||||
|
"show_seconds": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "loan_application",
|
"fieldname": "loan_application",
|
||||||
"fieldtype": "Link",
|
"fieldtype": "Link",
|
||||||
"label": "Loan Application",
|
"label": "Loan Application",
|
||||||
"options": "Loan Application"
|
"options": "Loan Application",
|
||||||
|
"show_days": 1,
|
||||||
|
"show_seconds": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "total_security_value",
|
"fieldname": "total_security_value",
|
||||||
"fieldtype": "Currency",
|
"fieldtype": "Currency",
|
||||||
"label": "Total Security Value",
|
"label": "Total Security Value",
|
||||||
"options": "Company:company:default_currency",
|
"options": "Company:company:default_currency",
|
||||||
"read_only": 1
|
"read_only": 1,
|
||||||
|
"show_days": 1,
|
||||||
|
"show_seconds": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "maximum_loan_value",
|
"fieldname": "maximum_loan_value",
|
||||||
"fieldtype": "Currency",
|
"fieldtype": "Currency",
|
||||||
"label": "Maximum Loan Value",
|
"label": "Maximum Loan Value",
|
||||||
"options": "Company:company:default_currency",
|
"options": "Company:company:default_currency",
|
||||||
"read_only": 1
|
"read_only": 1,
|
||||||
|
"show_days": 1,
|
||||||
|
"show_seconds": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "loan_details_section",
|
"fieldname": "loan_details_section",
|
||||||
"fieldtype": "Section Break",
|
"fieldtype": "Section Break",
|
||||||
"label": "Loan Details"
|
"label": "Loan Details",
|
||||||
|
"show_days": 1,
|
||||||
|
"show_seconds": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"default": "Requested",
|
"default": "Requested",
|
||||||
@ -94,37 +112,49 @@
|
|||||||
"in_list_view": 1,
|
"in_list_view": 1,
|
||||||
"in_standard_filter": 1,
|
"in_standard_filter": 1,
|
||||||
"label": "Status",
|
"label": "Status",
|
||||||
"options": "Requested\nUnpledged\nPledged\nPartially Pledged",
|
"options": "Requested\nUnpledged\nPledged\nPartially Pledged\nCancelled",
|
||||||
"read_only": 1
|
"read_only": 1,
|
||||||
|
"show_days": 1,
|
||||||
|
"show_seconds": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "pledge_time",
|
"fieldname": "pledge_time",
|
||||||
"fieldtype": "Datetime",
|
"fieldtype": "Datetime",
|
||||||
"label": "Pledge Time",
|
"label": "Pledge Time",
|
||||||
"read_only": 1
|
"read_only": 1,
|
||||||
|
"show_days": 1,
|
||||||
|
"show_seconds": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "securities",
|
"fieldname": "securities",
|
||||||
"fieldtype": "Table",
|
"fieldtype": "Table",
|
||||||
"label": "Securities",
|
"label": "Securities",
|
||||||
"options": "Pledge",
|
"options": "Pledge",
|
||||||
"reqd": 1
|
"reqd": 1,
|
||||||
|
"show_days": 1,
|
||||||
|
"show_seconds": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "column_break_11",
|
"fieldname": "column_break_11",
|
||||||
"fieldtype": "Column Break"
|
"fieldtype": "Column Break",
|
||||||
|
"show_days": 1,
|
||||||
|
"show_seconds": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "section_break_10",
|
"fieldname": "section_break_10",
|
||||||
"fieldtype": "Section Break",
|
"fieldtype": "Section Break",
|
||||||
"label": "Totals"
|
"label": "Totals",
|
||||||
|
"show_days": 1,
|
||||||
|
"show_seconds": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "company",
|
"fieldname": "company",
|
||||||
"fieldtype": "Link",
|
"fieldtype": "Link",
|
||||||
"label": "Company",
|
"label": "Company",
|
||||||
"options": "Company",
|
"options": "Company",
|
||||||
"reqd": 1
|
"reqd": 1,
|
||||||
|
"show_days": 1,
|
||||||
|
"show_seconds": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fetch_from": "loan.applicant_type",
|
"fetch_from": "loan.applicant_type",
|
||||||
@ -132,35 +162,45 @@
|
|||||||
"fieldtype": "Select",
|
"fieldtype": "Select",
|
||||||
"label": "Applicant Type",
|
"label": "Applicant Type",
|
||||||
"options": "Employee\nMember\nCustomer",
|
"options": "Employee\nMember\nCustomer",
|
||||||
"reqd": 1
|
"reqd": 1,
|
||||||
|
"show_days": 1,
|
||||||
|
"show_seconds": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"collapsible": 1,
|
"collapsible": 1,
|
||||||
"fieldname": "more_information_section",
|
"fieldname": "more_information_section",
|
||||||
"fieldtype": "Section Break",
|
"fieldtype": "Section Break",
|
||||||
"label": "More Information"
|
"label": "More Information",
|
||||||
|
"show_days": 1,
|
||||||
|
"show_seconds": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"allow_on_submit": 1,
|
"allow_on_submit": 1,
|
||||||
"fieldname": "reference_no",
|
"fieldname": "reference_no",
|
||||||
"fieldtype": "Data",
|
"fieldtype": "Data",
|
||||||
"label": "Reference No"
|
"label": "Reference No",
|
||||||
|
"show_days": 1,
|
||||||
|
"show_seconds": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "column_break_18",
|
"fieldname": "column_break_18",
|
||||||
"fieldtype": "Column Break"
|
"fieldtype": "Column Break",
|
||||||
|
"show_days": 1,
|
||||||
|
"show_seconds": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"allow_on_submit": 1,
|
"allow_on_submit": 1,
|
||||||
"fieldname": "description",
|
"fieldname": "description",
|
||||||
"fieldtype": "Text",
|
"fieldtype": "Text",
|
||||||
"label": "Description"
|
"label": "Description",
|
||||||
|
"show_days": 1,
|
||||||
|
"show_seconds": 1
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"index_web_pages_for_search": 1,
|
"index_web_pages_for_search": 1,
|
||||||
"is_submittable": 1,
|
"is_submittable": 1,
|
||||||
"links": [],
|
"links": [],
|
||||||
"modified": "2021-04-19 18:23:16.953305",
|
"modified": "2021-06-29 17:15:16.082256",
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "Loan Management",
|
"module": "Loan Management",
|
||||||
"name": "Loan Security Pledge",
|
"name": "Loan Security Pledge",
|
||||||
|
@ -23,6 +23,12 @@ class LoanSecurityPledge(Document):
|
|||||||
update_shortfall_status(self.loan, self.total_security_value)
|
update_shortfall_status(self.loan, self.total_security_value)
|
||||||
update_loan(self.loan, self.maximum_loan_value)
|
update_loan(self.loan, self.maximum_loan_value)
|
||||||
|
|
||||||
|
def on_cancel(self):
|
||||||
|
if self.loan:
|
||||||
|
self.db_set("status", "Cancelled")
|
||||||
|
self.db_set("pledge_time", None)
|
||||||
|
update_loan(self.loan, self.maximum_loan_value, cancel=1)
|
||||||
|
|
||||||
def validate_duplicate_securities(self):
|
def validate_duplicate_securities(self):
|
||||||
security_list = []
|
security_list = []
|
||||||
for security in self.securities:
|
for security in self.securities:
|
||||||
@ -36,7 +42,7 @@ class LoanSecurityPledge(Document):
|
|||||||
existing_pledge = ''
|
existing_pledge = ''
|
||||||
|
|
||||||
if self.loan:
|
if self.loan:
|
||||||
existing_pledge = frappe.db.get_value('Loan Security Pledge', {'loan': self.loan}, ['name'])
|
existing_pledge = frappe.db.get_value('Loan Security Pledge', {'loan': self.loan, 'docstatus': 1}, ['name'])
|
||||||
|
|
||||||
if existing_pledge:
|
if existing_pledge:
|
||||||
loan_security_type = frappe.db.get_value('Pledge', {'parent': existing_pledge}, ['loan_security_type'])
|
loan_security_type = frappe.db.get_value('Pledge', {'parent': existing_pledge}, ['loan_security_type'])
|
||||||
@ -77,8 +83,12 @@ class LoanSecurityPledge(Document):
|
|||||||
self.total_security_value = total_security_value
|
self.total_security_value = total_security_value
|
||||||
self.maximum_loan_value = maximum_loan_value
|
self.maximum_loan_value = maximum_loan_value
|
||||||
|
|
||||||
def update_loan(loan, maximum_value_against_pledge):
|
def update_loan(loan, maximum_value_against_pledge, cancel=0):
|
||||||
maximum_loan_value = frappe.db.get_value('Loan', {'name': loan}, ['maximum_loan_amount'])
|
maximum_loan_value = frappe.db.get_value('Loan', {'name': loan}, ['maximum_loan_amount'])
|
||||||
|
|
||||||
|
if cancel:
|
||||||
|
frappe.db.sql(""" UPDATE `tabLoan` SET maximum_loan_amount=%s
|
||||||
|
WHERE name=%s""", (maximum_loan_value - maximum_value_against_pledge, loan))
|
||||||
|
else:
|
||||||
frappe.db.sql(""" UPDATE `tabLoan` SET maximum_loan_amount=%s, is_secured_loan=1
|
frappe.db.sql(""" UPDATE `tabLoan` SET maximum_loan_amount=%s, is_secured_loan=1
|
||||||
WHERE name=%s""", (maximum_loan_value + maximum_value_against_pledge, loan))
|
WHERE name=%s""", (maximum_loan_value + maximum_value_against_pledge, loan))
|
||||||
|
@ -13,7 +13,7 @@ frappe.ui.form.on('Blanket Order', {
|
|||||||
|
|
||||||
refresh: function(frm) {
|
refresh: function(frm) {
|
||||||
erpnext.hide_company();
|
erpnext.hide_company();
|
||||||
if (frm.doc.customer && frm.doc.docstatus === 1) {
|
if (frm.doc.customer && frm.doc.docstatus === 1 && frm.doc.to_date > frappe.datetime.get_today()) {
|
||||||
frm.add_custom_button(__("Sales Order"), function() {
|
frm.add_custom_button(__("Sales Order"), function() {
|
||||||
frappe.model.open_mapped_doc({
|
frappe.model.open_mapped_doc({
|
||||||
method: "erpnext.manufacturing.doctype.blanket_order.blanket_order.make_order",
|
method: "erpnext.manufacturing.doctype.blanket_order.blanket_order.make_order",
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
{
|
{
|
||||||
|
"actions": [],
|
||||||
"autoname": "naming_series:",
|
"autoname": "naming_series:",
|
||||||
"creation": "2018-05-24 07:18:08.256060",
|
"creation": "2018-05-24 07:18:08.256060",
|
||||||
"doctype": "DocType",
|
"doctype": "DocType",
|
||||||
@ -79,6 +80,7 @@
|
|||||||
"reqd": 1
|
"reqd": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
"allow_on_submit": 1,
|
||||||
"fieldname": "to_date",
|
"fieldname": "to_date",
|
||||||
"fieldtype": "Date",
|
"fieldtype": "Date",
|
||||||
"label": "To Date",
|
"label": "To Date",
|
||||||
@ -129,8 +131,10 @@
|
|||||||
"label": "Terms and Conditions Details"
|
"label": "Terms and Conditions Details"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
"index_web_pages_for_search": 1,
|
||||||
"is_submittable": 1,
|
"is_submittable": 1,
|
||||||
"modified": "2019-11-18 19:37:37.151686",
|
"links": [],
|
||||||
|
"modified": "2021-06-29 00:30:30.621636",
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "Manufacturing",
|
"module": "Manufacturing",
|
||||||
"name": "Blanket Order",
|
"name": "Blanket Order",
|
||||||
|
@ -83,7 +83,7 @@ frappe.ui.form.on("BOM", {
|
|||||||
|
|
||||||
if (!frm.doc.__islocal && frm.doc.docstatus<2) {
|
if (!frm.doc.__islocal && frm.doc.docstatus<2) {
|
||||||
frm.add_custom_button(__("Update Cost"), function() {
|
frm.add_custom_button(__("Update Cost"), function() {
|
||||||
frm.events.update_cost(frm);
|
frm.events.update_cost(frm, true);
|
||||||
});
|
});
|
||||||
frm.add_custom_button(__("Browse BOM"), function() {
|
frm.add_custom_button(__("Browse BOM"), function() {
|
||||||
frappe.route_options = {
|
frappe.route_options = {
|
||||||
@ -318,13 +318,14 @@ frappe.ui.form.on("BOM", {
|
|||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
|
||||||
update_cost: function(frm) {
|
update_cost: function(frm, save_doc=false) {
|
||||||
return frappe.call({
|
return frappe.call({
|
||||||
doc: frm.doc,
|
doc: frm.doc,
|
||||||
method: "update_cost",
|
method: "update_cost",
|
||||||
freeze: true,
|
freeze: true,
|
||||||
args: {
|
args: {
|
||||||
update_parent: true,
|
update_parent: true,
|
||||||
|
save: save_doc,
|
||||||
from_child_bom: false
|
from_child_bom: false
|
||||||
},
|
},
|
||||||
callback: function(r) {
|
callback: function(r) {
|
||||||
|
@ -36,6 +36,9 @@
|
|||||||
"materials_section",
|
"materials_section",
|
||||||
"inspection_required",
|
"inspection_required",
|
||||||
"quality_inspection_template",
|
"quality_inspection_template",
|
||||||
|
"column_break_31",
|
||||||
|
"bom_level",
|
||||||
|
"section_break_33",
|
||||||
"items",
|
"items",
|
||||||
"scrap_section",
|
"scrap_section",
|
||||||
"scrap_items",
|
"scrap_items",
|
||||||
@ -513,6 +516,22 @@
|
|||||||
"no_copy": 1,
|
"no_copy": 1,
|
||||||
"print_hide": 1,
|
"print_hide": 1,
|
||||||
"read_only": 1
|
"read_only": 1
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "column_break_31",
|
||||||
|
"fieldtype": "Column Break"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"default": "0",
|
||||||
|
"fieldname": "bom_level",
|
||||||
|
"fieldtype": "Int",
|
||||||
|
"label": "BOM Level",
|
||||||
|
"read_only": 1
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "section_break_33",
|
||||||
|
"fieldtype": "Section Break",
|
||||||
|
"hide_border": 1
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"icon": "fa fa-sitemap",
|
"icon": "fa fa-sitemap",
|
||||||
@ -520,7 +539,7 @@
|
|||||||
"image_field": "image",
|
"image_field": "image",
|
||||||
"is_submittable": 1,
|
"is_submittable": 1,
|
||||||
"links": [],
|
"links": [],
|
||||||
"modified": "2021-03-16 12:25:09.081968",
|
"modified": "2021-05-16 12:25:09.081968",
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "Manufacturing",
|
"module": "Manufacturing",
|
||||||
"name": "BOM",
|
"name": "BOM",
|
||||||
|
@ -154,6 +154,7 @@ class BOM(WebsiteGenerator):
|
|||||||
self.calculate_cost()
|
self.calculate_cost()
|
||||||
self.update_stock_qty()
|
self.update_stock_qty()
|
||||||
self.update_cost(update_parent=False, from_child_bom=True, update_hour_rate = False, save=False)
|
self.update_cost(update_parent=False, from_child_bom=True, update_hour_rate = False, save=False)
|
||||||
|
self.set_bom_level()
|
||||||
|
|
||||||
def get_context(self, context):
|
def get_context(self, context):
|
||||||
context.parents = [{'name': 'boms', 'title': _('All BOMs') }]
|
context.parents = [{'name': 'boms', 'title': _('All BOMs') }]
|
||||||
@ -329,7 +330,7 @@ class BOM(WebsiteGenerator):
|
|||||||
frappe.get_doc("BOM", bom).update_cost(from_child_bom=True)
|
frappe.get_doc("BOM", bom).update_cost(from_child_bom=True)
|
||||||
|
|
||||||
if not from_child_bom:
|
if not from_child_bom:
|
||||||
frappe.msgprint(_("Cost Updated"))
|
frappe.msgprint(_("Cost Updated"), alert=True)
|
||||||
|
|
||||||
def update_parent_cost(self):
|
def update_parent_cost(self):
|
||||||
if self.total_cost:
|
if self.total_cost:
|
||||||
@ -676,6 +677,19 @@ class BOM(WebsiteGenerator):
|
|||||||
"""Get a complete tree representation preserving order of child items."""
|
"""Get a complete tree representation preserving order of child items."""
|
||||||
return BOMTree(self.name)
|
return BOMTree(self.name)
|
||||||
|
|
||||||
|
def set_bom_level(self, update=False):
|
||||||
|
levels = []
|
||||||
|
|
||||||
|
self.bom_level = 0
|
||||||
|
for row in self.items:
|
||||||
|
if row.bom_no:
|
||||||
|
levels.append(frappe.get_cached_value("BOM", row.bom_no, "bom_level") or 0)
|
||||||
|
|
||||||
|
if levels:
|
||||||
|
self.bom_level = max(levels) + 1
|
||||||
|
|
||||||
|
if update:
|
||||||
|
self.db_set("bom_level", self.bom_level)
|
||||||
|
|
||||||
def get_bom_item_rate(args, bom_doc):
|
def get_bom_item_rate(args, bom_doc):
|
||||||
if bom_doc.rm_cost_as_per == 'Valuation Rate':
|
if bom_doc.rm_cost_as_per == 'Valuation Rate':
|
||||||
@ -699,7 +713,8 @@ def get_bom_item_rate(args, bom_doc):
|
|||||||
"conversion_rate": 1, # Passed conversion rate as 1 purposefully, as conversion rate is applied at the end of the function
|
"conversion_rate": 1, # Passed conversion rate as 1 purposefully, as conversion rate is applied at the end of the function
|
||||||
"conversion_factor": args.get("conversion_factor") or 1,
|
"conversion_factor": args.get("conversion_factor") or 1,
|
||||||
"plc_conversion_rate": 1,
|
"plc_conversion_rate": 1,
|
||||||
"ignore_party": True
|
"ignore_party": True,
|
||||||
|
"ignore_conversion_rate": True
|
||||||
})
|
})
|
||||||
item_doc = frappe.get_cached_doc("Item", args.get("item_code"))
|
item_doc = frappe.get_cached_doc("Item", args.get("item_code"))
|
||||||
out = frappe._dict()
|
out = frappe._dict()
|
||||||
@ -759,7 +774,7 @@ def get_bom_items_as_dict(bom, company, qty=1, fetch_exploded=1, fetch_scrap_ite
|
|||||||
item.image,
|
item.image,
|
||||||
bom.project,
|
bom.project,
|
||||||
bom_item.rate,
|
bom_item.rate,
|
||||||
bom_item.amount,
|
sum(bom_item.{qty_field}/ifnull(bom.quantity, 1)) * bom_item.rate * %(qty)s as amount,
|
||||||
item.stock_uom,
|
item.stock_uom,
|
||||||
item.item_group,
|
item.item_group,
|
||||||
item.allow_alternative_item,
|
item.allow_alternative_item,
|
||||||
@ -860,7 +875,7 @@ def get_children(doctype, parent=None, is_root=False, **filters):
|
|||||||
frappe.form_dict.parent = parent
|
frappe.form_dict.parent = parent
|
||||||
|
|
||||||
if frappe.form_dict.parent:
|
if frappe.form_dict.parent:
|
||||||
bom_doc = frappe.get_doc("BOM", frappe.form_dict.parent)
|
bom_doc = frappe.get_cached_doc("BOM", frappe.form_dict.parent)
|
||||||
frappe.has_permission("BOM", doc=bom_doc, throw=True)
|
frappe.has_permission("BOM", doc=bom_doc, throw=True)
|
||||||
|
|
||||||
bom_items = frappe.get_all('BOM Item',
|
bom_items = frappe.get_all('BOM Item',
|
||||||
@ -871,7 +886,7 @@ def get_children(doctype, parent=None, is_root=False, **filters):
|
|||||||
item_names = tuple(d.get('item_code') for d in bom_items)
|
item_names = tuple(d.get('item_code') for d in bom_items)
|
||||||
|
|
||||||
items = frappe.get_list('Item',
|
items = frappe.get_list('Item',
|
||||||
fields=['image', 'description', 'name', 'stock_uom', 'item_name'],
|
fields=['image', 'description', 'name', 'stock_uom', 'item_name', 'is_sub_contracted_item'],
|
||||||
filters=[['name', 'in', item_names]]) # to get only required item dicts
|
filters=[['name', 'in', item_names]]) # to get only required item dicts
|
||||||
|
|
||||||
for bom_item in bom_items:
|
for bom_item in bom_items:
|
||||||
@ -884,6 +899,7 @@ def get_children(doctype, parent=None, is_root=False, **filters):
|
|||||||
|
|
||||||
bom_item.parent_bom_qty = bom_doc.quantity
|
bom_item.parent_bom_qty = bom_doc.quantity
|
||||||
bom_item.expandable = 0 if bom_item.value in ('', None) else 1
|
bom_item.expandable = 0 if bom_item.value in ('', None) else 1
|
||||||
|
bom_item.image = frappe.db.escape(bom_item.image)
|
||||||
|
|
||||||
return bom_items
|
return bom_items
|
||||||
|
|
||||||
@ -1100,6 +1116,8 @@ def make_variant_bom(source_name, bom_no, item, variant_items, target_doc=None):
|
|||||||
},
|
},
|
||||||
'BOM Item': {
|
'BOM Item': {
|
||||||
'doctype': 'BOM Item',
|
'doctype': 'BOM Item',
|
||||||
|
# stop get_mapped_doc copying parent bom_no to children
|
||||||
|
'field_no_map': ['bom_no'],
|
||||||
'condition': lambda doc: doc.has_variants == 0
|
'condition': lambda doc: doc.has_variants == 0
|
||||||
},
|
},
|
||||||
}, target_doc, postprocess)
|
}, target_doc, postprocess)
|
||||||
|
@ -1,8 +1,13 @@
|
|||||||
<div style="padding: 15px;">
|
<div style="padding: 15px;">
|
||||||
|
<div class="row mb-5">
|
||||||
|
<div class="col-md-5" style="max-height: 500px">
|
||||||
{% if data.image %}
|
{% if data.image %}
|
||||||
|
<div class="border image-field " style="overflow: hidden;border-color:#e6e6e6">
|
||||||
<img class="responsive" src={{ data.image }}>
|
<img class="responsive" src={{ data.image }}>
|
||||||
<hr style="margin: 15px -15px;">
|
</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
</div>
|
||||||
|
<div class="col-md-7 h-500">
|
||||||
<h4>
|
<h4>
|
||||||
{{ __("Description") }}
|
{{ __("Description") }}
|
||||||
</h4>
|
</h4>
|
||||||
@ -10,6 +15,19 @@
|
|||||||
{{ data.description }}
|
{{ data.description }}
|
||||||
</div>
|
</div>
|
||||||
<hr style="margin: 15px -15px;">
|
<hr style="margin: 15px -15px;">
|
||||||
|
<p>
|
||||||
|
{% if data.value %}
|
||||||
|
<a style="margin-right: 7px; margin-bottom: 7px" class="btn btn-default btn-xs" href="#Form/BOM/{{ data.value }}">
|
||||||
|
{{ __("Open BOM {0}", [data.value.bold()]) }}</a>
|
||||||
|
{% endif %}
|
||||||
|
{% if data.item_code %}
|
||||||
|
<a class="btn btn-default btn-xs" href="#Form/Item/{{ data.item_code }}">
|
||||||
|
{{ __("Open Item {0}", [data.item_code.bold()]) }}</a>
|
||||||
|
{% endif %}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<hr style="margin: 15px -15px;">
|
||||||
<p>
|
<p>
|
||||||
{% if data.value %}
|
{% if data.value %}
|
||||||
<a style="margin-right: 7px; margin-bottom: 7px" class="btn btn-default btn-xs" href="/app/Form/BOM/{{ data.value }}">
|
<a style="margin-right: 7px; margin-bottom: 7px" class="btn btn-default btn-xs" href="/app/Form/BOM/{{ data.value }}">
|
||||||
|
@ -64,7 +64,7 @@ frappe.treeview_settings["BOM"] = {
|
|||||||
if(node.is_root && node.data.value!="BOM") {
|
if(node.is_root && node.data.value!="BOM") {
|
||||||
frappe.model.with_doc("BOM", node.data.value, function() {
|
frappe.model.with_doc("BOM", node.data.value, function() {
|
||||||
var bom = frappe.model.get_doc("BOM", node.data.value);
|
var bom = frappe.model.get_doc("BOM", node.data.value);
|
||||||
node.data.image = bom.image || "";
|
node.data.image = escape(bom.image) || "";
|
||||||
node.data.description = bom.description || "";
|
node.data.description = bom.description || "";
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -8,6 +8,7 @@ import frappe
|
|||||||
from frappe.utils import cstr, flt
|
from frappe.utils import cstr, flt
|
||||||
from frappe.test_runner import make_test_records
|
from frappe.test_runner import make_test_records
|
||||||
from erpnext.stock.doctype.stock_reconciliation.test_stock_reconciliation import create_stock_reconciliation
|
from erpnext.stock.doctype.stock_reconciliation.test_stock_reconciliation import create_stock_reconciliation
|
||||||
|
from erpnext.manufacturing.doctype.bom.bom import make_variant_bom
|
||||||
from erpnext.manufacturing.doctype.bom_update_tool.bom_update_tool import update_cost
|
from erpnext.manufacturing.doctype.bom_update_tool.bom_update_tool import update_cost
|
||||||
from erpnext.stock.doctype.item.test_item import make_item
|
from erpnext.stock.doctype.item.test_item import make_item
|
||||||
from erpnext.buying.doctype.purchase_order.test_purchase_order import create_purchase_order
|
from erpnext.buying.doctype.purchase_order.test_purchase_order import create_purchase_order
|
||||||
@ -248,6 +249,37 @@ class TestBOM(unittest.TestCase):
|
|||||||
for reqd_item, created_item in zip(reqd_order, created_order):
|
for reqd_item, created_item in zip(reqd_order, created_order):
|
||||||
self.assertEqual(reqd_item, created_item.item_code)
|
self.assertEqual(reqd_item, created_item.item_code)
|
||||||
|
|
||||||
|
def test_generated_variant_bom(self):
|
||||||
|
from erpnext.controllers.item_variant import create_variant
|
||||||
|
|
||||||
|
template_item = make_item(
|
||||||
|
"_TestTemplateItem", {"has_variants": 1, "attributes": [{"attribute": "Test Size"},]}
|
||||||
|
)
|
||||||
|
variant = create_variant(template_item.item_code, {"Test Size": "Large"})
|
||||||
|
variant.insert(ignore_if_duplicate=True)
|
||||||
|
|
||||||
|
bom_tree = {
|
||||||
|
template_item.item_code: {
|
||||||
|
"SubAssembly1": {"ChildPart1": {}, "ChildPart2": {},},
|
||||||
|
"ChildPart5": {},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
template_bom = create_nested_bom(bom_tree, prefix="")
|
||||||
|
variant_bom = make_variant_bom(
|
||||||
|
template_bom.name, template_bom.name, variant.item_code, variant_items=[]
|
||||||
|
)
|
||||||
|
variant_bom.save()
|
||||||
|
|
||||||
|
reqd_order = template_bom.get_tree_representation().level_order_traversal()
|
||||||
|
created_order = variant_bom.get_tree_representation().level_order_traversal()
|
||||||
|
|
||||||
|
self.assertEqual(len(reqd_order), len(created_order))
|
||||||
|
|
||||||
|
for reqd_item, created_item in zip(reqd_order, created_order):
|
||||||
|
self.assertEqual(reqd_item.item_code, created_item.item_code)
|
||||||
|
self.assertEqual(reqd_item.qty, created_item.qty)
|
||||||
|
self.assertEqual(reqd_item.exploded_qty, created_item.exploded_qty)
|
||||||
|
|
||||||
|
|
||||||
def get_default_bom(item_code="_Test FG Item 2"):
|
def get_default_bom(item_code="_Test FG Item 2"):
|
||||||
return frappe.db.get_value("BOM", {"item": item_code, "is_active": 1, "is_default": 1})
|
return frappe.db.get_value("BOM", {"item": item_code, "is_active": 1, "is_default": 1})
|
||||||
|
@ -192,15 +192,20 @@ class JobCard(Document):
|
|||||||
"completed_qty": args.get("completed_qty") or 0.0
|
"completed_qty": args.get("completed_qty") or 0.0
|
||||||
})
|
})
|
||||||
elif args.get("start_time"):
|
elif args.get("start_time"):
|
||||||
for name in employees:
|
new_args = {
|
||||||
self.append("time_logs", {
|
|
||||||
"from_time": get_datetime(args.get("start_time")),
|
"from_time": get_datetime(args.get("start_time")),
|
||||||
"employee": name.get('employee'),
|
|
||||||
"operation": args.get("sub_operation"),
|
"operation": args.get("sub_operation"),
|
||||||
"completed_qty": 0.0
|
"completed_qty": 0.0
|
||||||
})
|
}
|
||||||
|
|
||||||
if not self.employee:
|
if employees:
|
||||||
|
for name in employees:
|
||||||
|
new_args.employee = name.get('employee')
|
||||||
|
self.add_start_time_log(new_args)
|
||||||
|
else:
|
||||||
|
self.add_start_time_log(new_args)
|
||||||
|
|
||||||
|
if not self.employee and employees:
|
||||||
self.set_employees(employees)
|
self.set_employees(employees)
|
||||||
|
|
||||||
if self.status == "On Hold":
|
if self.status == "On Hold":
|
||||||
@ -208,6 +213,9 @@ class JobCard(Document):
|
|||||||
|
|
||||||
self.save()
|
self.save()
|
||||||
|
|
||||||
|
def add_start_time_log(self, args):
|
||||||
|
self.append("time_logs", args)
|
||||||
|
|
||||||
def set_employees(self, employees):
|
def set_employees(self, employees):
|
||||||
for name in employees:
|
for name in employees:
|
||||||
self.append('employee', {
|
self.append('employee', {
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
frappe.ui.form.on('Production Plan', {
|
frappe.ui.form.on('Production Plan', {
|
||||||
setup: function(frm) {
|
setup: function(frm) {
|
||||||
frm.custom_make_buttons = {
|
frm.custom_make_buttons = {
|
||||||
'Work Order': 'Work Order',
|
'Work Order': 'Work Order / Subcontract PO',
|
||||||
'Material Request': 'Material Request',
|
'Material Request': 'Material Request',
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -68,17 +68,13 @@ frappe.ui.form.on('Production Plan', {
|
|||||||
frm.trigger("show_progress");
|
frm.trigger("show_progress");
|
||||||
|
|
||||||
if (frm.doc.status !== "Completed") {
|
if (frm.doc.status !== "Completed") {
|
||||||
if (frm.doc.po_items && frm.doc.status !== "Closed") {
|
frm.add_custom_button(__("Work Order Tree"), ()=> {
|
||||||
frm.add_custom_button(__("Work Order"), ()=> {
|
frappe.set_route('Tree', 'Work Order', {production_plan: frm.doc.name});
|
||||||
frm.trigger("make_work_order");
|
}, __('View'));
|
||||||
}, __('Create'));
|
|
||||||
}
|
|
||||||
|
|
||||||
if (frm.doc.mr_items && !in_list(['Material Requested', 'Closed'], frm.doc.status)) {
|
frm.add_custom_button(__("Production Plan Summary"), ()=> {
|
||||||
frm.add_custom_button(__("Material Request"), ()=> {
|
frappe.set_route('query-report', 'Production Plan Summary', {production_plan: frm.doc.name});
|
||||||
frm.trigger("make_material_request");
|
}, __('View'));
|
||||||
}, __('Create'));
|
|
||||||
}
|
|
||||||
|
|
||||||
if (frm.doc.status === "Closed") {
|
if (frm.doc.status === "Closed") {
|
||||||
frm.add_custom_button(__("Re-open"), function() {
|
frm.add_custom_button(__("Re-open"), function() {
|
||||||
@ -89,6 +85,18 @@ frappe.ui.form.on('Production Plan', {
|
|||||||
frm.events.close_open_production_plan(frm, true);
|
frm.events.close_open_production_plan(frm, true);
|
||||||
}, __("Status"));
|
}, __("Status"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (frm.doc.po_items && frm.doc.status !== "Closed") {
|
||||||
|
frm.add_custom_button(__("Work Order / Subcontract PO"), ()=> {
|
||||||
|
frm.trigger("make_work_order");
|
||||||
|
}, __('Create'));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (frm.doc.mr_items && !in_list(['Material Requested', 'Closed'], frm.doc.status)) {
|
||||||
|
frm.add_custom_button(__("Material Request"), ()=> {
|
||||||
|
frm.trigger("make_material_request");
|
||||||
|
}, __('Create'));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -233,6 +241,17 @@ frappe.ui.form.on('Production Plan', {
|
|||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
|
get_sub_assembly_items: function(frm) {
|
||||||
|
frappe.call({
|
||||||
|
method: "get_sub_assembly_items",
|
||||||
|
freeze: true,
|
||||||
|
doc: frm.doc,
|
||||||
|
callback: function() {
|
||||||
|
refresh_field("sub_assembly_items");
|
||||||
|
}
|
||||||
|
});
|
||||||
|
},
|
||||||
|
|
||||||
get_items_for_mr: function(frm) {
|
get_items_for_mr: function(frm) {
|
||||||
if (!frm.doc.for_warehouse) {
|
if (!frm.doc.for_warehouse) {
|
||||||
frappe.throw(__("Select warehouse for material requests"));
|
frappe.throw(__("Select warehouse for material requests"));
|
||||||
|
@ -32,6 +32,9 @@
|
|||||||
"po_items",
|
"po_items",
|
||||||
"section_break_25",
|
"section_break_25",
|
||||||
"prod_plan_references",
|
"prod_plan_references",
|
||||||
|
"section_break_24",
|
||||||
|
"get_sub_assembly_items",
|
||||||
|
"sub_assembly_items",
|
||||||
"material_request_planning",
|
"material_request_planning",
|
||||||
"include_non_stock_items",
|
"include_non_stock_items",
|
||||||
"include_subcontracted_items",
|
"include_subcontracted_items",
|
||||||
@ -187,7 +190,7 @@
|
|||||||
"depends_on": "get_items_from",
|
"depends_on": "get_items_from",
|
||||||
"fieldname": "get_items",
|
"fieldname": "get_items",
|
||||||
"fieldtype": "Button",
|
"fieldtype": "Button",
|
||||||
"label": "Get Items For Work Order"
|
"label": "Get Finished Goods for Manufacture"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "po_items",
|
"fieldname": "po_items",
|
||||||
@ -199,7 +202,7 @@
|
|||||||
{
|
{
|
||||||
"fieldname": "material_request_planning",
|
"fieldname": "material_request_planning",
|
||||||
"fieldtype": "Section Break",
|
"fieldtype": "Section Break",
|
||||||
"label": "Material Request Planning"
|
"label": "Material Requirement Planning"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"default": "1",
|
"default": "1",
|
||||||
@ -237,12 +240,13 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "section_break_27",
|
"fieldname": "section_break_27",
|
||||||
"fieldtype": "Section Break"
|
"fieldtype": "Section Break",
|
||||||
|
"hide_border": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "mr_items",
|
"fieldname": "mr_items",
|
||||||
"fieldtype": "Table",
|
"fieldtype": "Table",
|
||||||
"label": "Material Request Plan Item",
|
"label": "Raw Materials",
|
||||||
"no_copy": 1,
|
"no_copy": 1,
|
||||||
"options": "Material Request Plan Item"
|
"options": "Material Request Plan Item"
|
||||||
},
|
},
|
||||||
@ -337,13 +341,30 @@
|
|||||||
"hidden": 1,
|
"hidden": 1,
|
||||||
"label": "Production Plan Item Reference",
|
"label": "Production Plan Item Reference",
|
||||||
"options": "Production Plan Item Reference"
|
"options": "Production Plan Item Reference"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "section_break_24",
|
||||||
|
"fieldtype": "Section Break",
|
||||||
|
"hide_border": 1
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "sub_assembly_items",
|
||||||
|
"fieldtype": "Table",
|
||||||
|
"label": "Sub Assembly Items",
|
||||||
|
"no_copy": 1,
|
||||||
|
"options": "Production Plan Sub Assembly Item"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "get_sub_assembly_items",
|
||||||
|
"fieldtype": "Button",
|
||||||
|
"label": "Get Sub Assembly Items"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"icon": "fa fa-calendar",
|
"icon": "fa fa-calendar",
|
||||||
"index_web_pages_for_search": 1,
|
"index_web_pages_for_search": 1,
|
||||||
"is_submittable": 1,
|
"is_submittable": 1,
|
||||||
"links": [],
|
"links": [],
|
||||||
"modified": "2021-05-24 16:59:03.643211",
|
"modified": "2021-06-28 20:00:33.905114",
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "Manufacturing",
|
"module": "Manufacturing",
|
||||||
"name": "Production Plan",
|
"name": "Production Plan",
|
||||||
|
@ -5,10 +5,11 @@
|
|||||||
from __future__ import unicode_literals
|
from __future__ import unicode_literals
|
||||||
import frappe, json, copy
|
import frappe, json, copy
|
||||||
from frappe import msgprint, _
|
from frappe import msgprint, _
|
||||||
from six import string_types, iteritems
|
from six import iteritems
|
||||||
|
|
||||||
from frappe.model.document import Document
|
from frappe.model.document import Document
|
||||||
from frappe.utils import cstr, flt, cint, nowdate, add_days, comma_and, now_datetime, ceil
|
from frappe.utils import (flt, cint, nowdate, add_days, comma_and, now_datetime,
|
||||||
|
ceil, get_link_to_form, getdate)
|
||||||
from frappe.utils.csvutils import build_csv_response
|
from frappe.utils.csvutils import build_csv_response
|
||||||
from erpnext.manufacturing.doctype.bom.bom import validate_bom_no, get_children
|
from erpnext.manufacturing.doctype.bom.bom import validate_bom_no, get_children
|
||||||
from erpnext.manufacturing.doctype.work_order.work_order import get_item_details
|
from erpnext.manufacturing.doctype.work_order.work_order import get_item_details
|
||||||
@ -349,50 +350,89 @@ class ProductionPlan(Document):
|
|||||||
|
|
||||||
@frappe.whitelist()
|
@frappe.whitelist()
|
||||||
def make_work_order(self):
|
def make_work_order(self):
|
||||||
wo_list = []
|
wo_list, po_list = [], []
|
||||||
|
subcontracted_po = {}
|
||||||
|
|
||||||
self.validate_data()
|
self.validate_data()
|
||||||
|
self.make_work_order_for_finished_goods(wo_list)
|
||||||
|
self.make_work_order_for_subassembly_items(wo_list, subcontracted_po)
|
||||||
|
self.make_subcontracted_purchase_order(subcontracted_po, po_list)
|
||||||
|
self.show_list_created_message('Work Order', wo_list)
|
||||||
|
self.show_list_created_message('Purchase Order', po_list)
|
||||||
|
|
||||||
|
def make_work_order_for_finished_goods(self, wo_list):
|
||||||
items_data = self.get_production_items()
|
items_data = self.get_production_items()
|
||||||
|
|
||||||
for key, item in items_data.items():
|
for key, item in items_data.items():
|
||||||
|
if self.sub_assembly_items:
|
||||||
|
item['use_multi_level_bom'] = 0
|
||||||
|
|
||||||
work_order = self.create_work_order(item)
|
work_order = self.create_work_order(item)
|
||||||
if work_order:
|
if work_order:
|
||||||
wo_list.append(work_order)
|
wo_list.append(work_order)
|
||||||
|
|
||||||
if item.get("make_work_order_for_sub_assembly_items"):
|
def make_work_order_for_subassembly_items(self, wo_list, subcontracted_po):
|
||||||
work_orders = self.make_work_order_for_sub_assembly_items(item)
|
for row in self.sub_assembly_items:
|
||||||
wo_list.extend(work_orders)
|
if row.type_of_manufacturing == 'Subcontract':
|
||||||
|
subcontracted_po.setdefault(row.supplier, []).append(row)
|
||||||
|
continue
|
||||||
|
|
||||||
|
args = {}
|
||||||
|
self.prepare_args_for_sub_assembly_items(row, args)
|
||||||
|
work_order = self.create_work_order(args)
|
||||||
|
if work_order:
|
||||||
|
wo_list.append(work_order)
|
||||||
|
|
||||||
|
def make_subcontracted_purchase_order(self, subcontracted_po, purchase_orders):
|
||||||
|
if not subcontracted_po:
|
||||||
|
return
|
||||||
|
|
||||||
|
for supplier, po_list in subcontracted_po.items():
|
||||||
|
po = frappe.new_doc('Purchase Order')
|
||||||
|
po.supplier = supplier
|
||||||
|
po.schedule_date = getdate(po_list[0].schedule_date) if po_list[0].schedule_date else nowdate()
|
||||||
|
po.is_subcontracted_item = 'Yes'
|
||||||
|
for row in po_list:
|
||||||
|
args = {
|
||||||
|
'item_code': row.production_item,
|
||||||
|
'warehouse': row.fg_warehouse,
|
||||||
|
'production_plan_sub_assembly_item': row.name,
|
||||||
|
'bom': row.bom_no,
|
||||||
|
'production_plan': self.name
|
||||||
|
}
|
||||||
|
|
||||||
|
for field in ['schedule_date', 'qty', 'uom', 'stock_uom', 'item_name',
|
||||||
|
'description', 'production_plan_item']:
|
||||||
|
args[field] = row.get(field)
|
||||||
|
|
||||||
|
po.append('items', args)
|
||||||
|
|
||||||
|
po.set_missing_values()
|
||||||
|
po.flags.ignore_mandatory = True
|
||||||
|
po.flags.ignore_validate = True
|
||||||
|
po.insert()
|
||||||
|
purchase_orders.append(po.name)
|
||||||
|
|
||||||
|
def show_list_created_message(self, doctype, doc_list=None):
|
||||||
|
if not doc_list:
|
||||||
|
return
|
||||||
|
|
||||||
frappe.flags.mute_messages = False
|
frappe.flags.mute_messages = False
|
||||||
|
if doc_list:
|
||||||
|
doc_list = [get_link_to_form(doctype, p) for p in doc_list]
|
||||||
|
msgprint(_("{0} created").format(comma_and(doc_list)))
|
||||||
|
|
||||||
if wo_list:
|
def prepare_args_for_sub_assembly_items(self, row, args):
|
||||||
wo_list = ["""<a href="/app/Form/Work Order/%s" target="_blank">%s</a>""" % \
|
for field in ["production_item", "item_name", "qty", "fg_warehouse",
|
||||||
(p, p) for p in wo_list]
|
"description", "bom_no", "stock_uom", "bom_level", "production_plan_item"]:
|
||||||
msgprint(_("{0} created").format(comma_and(wo_list)))
|
args[field] = row.get(field)
|
||||||
else :
|
|
||||||
msgprint(_("No Work Orders created"))
|
|
||||||
|
|
||||||
def make_work_order_for_sub_assembly_items(self, item):
|
args.update({
|
||||||
work_orders = []
|
"use_multi_level_bom": 0,
|
||||||
bom_data = {}
|
"production_plan": self.name,
|
||||||
|
"production_plan_sub_assembly_item": row.name
|
||||||
get_sub_assembly_items(item.get("bom_no"), bom_data, item.get("qty"))
|
|
||||||
|
|
||||||
for key, data in bom_data.items():
|
|
||||||
data.update({
|
|
||||||
'qty': data.get("stock_qty"),
|
|
||||||
'production_plan': self.name,
|
|
||||||
'use_multi_level_bom': item.get("use_multi_level_bom"),
|
|
||||||
'company': self.company,
|
|
||||||
'fg_warehouse': item.get("fg_warehouse"),
|
|
||||||
'update_consumed_material_cost_in_project': 0
|
|
||||||
})
|
})
|
||||||
|
|
||||||
work_order = self.create_work_order(data)
|
|
||||||
if work_order:
|
|
||||||
work_orders.append(work_order)
|
|
||||||
|
|
||||||
return work_orders
|
|
||||||
|
|
||||||
def create_work_order(self, item):
|
def create_work_order(self, item):
|
||||||
from erpnext.manufacturing.doctype.work_order.work_order import OverProductionError, get_default_warehouse
|
from erpnext.manufacturing.doctype.work_order.work_order import OverProductionError, get_default_warehouse
|
||||||
warehouse = get_default_warehouse()
|
warehouse = get_default_warehouse()
|
||||||
@ -476,9 +516,32 @@ class ProductionPlan(Document):
|
|||||||
else :
|
else :
|
||||||
msgprint(_("No material request created"))
|
msgprint(_("No material request created"))
|
||||||
|
|
||||||
|
@frappe.whitelist()
|
||||||
|
def get_sub_assembly_items(self, manufacturing_type=None):
|
||||||
|
self.sub_assembly_items = []
|
||||||
|
for row in self.po_items:
|
||||||
|
bom_data = []
|
||||||
|
get_sub_assembly_items(row.bom_no, bom_data, row.planned_qty)
|
||||||
|
self.set_sub_assembly_items_based_on_level(row, bom_data, manufacturing_type)
|
||||||
|
|
||||||
|
self.save()
|
||||||
|
|
||||||
|
def set_sub_assembly_items_based_on_level(self, row, bom_data, manufacturing_type=None):
|
||||||
|
bom_data = sorted(bom_data, key = lambda i: i.bom_level)
|
||||||
|
|
||||||
|
for data in bom_data:
|
||||||
|
data.qty = data.stock_qty
|
||||||
|
data.production_plan_item = row.name
|
||||||
|
data.fg_warehouse = row.warehouse
|
||||||
|
data.schedule_date = row.planned_start_date
|
||||||
|
data.type_of_manufacturing = manufacturing_type or ("Subcontract" if data.is_sub_contracted_item
|
||||||
|
else "In House")
|
||||||
|
|
||||||
|
self.append("sub_assembly_items", data)
|
||||||
|
|
||||||
@frappe.whitelist()
|
@frappe.whitelist()
|
||||||
def download_raw_materials(doc, warehouses=None):
|
def download_raw_materials(doc, warehouses=None):
|
||||||
if isinstance(doc, string_types):
|
if isinstance(doc, str):
|
||||||
doc = frappe._dict(json.loads(doc))
|
doc = frappe._dict(json.loads(doc))
|
||||||
|
|
||||||
item_list = [['Item Code', 'Description', 'Stock UOM', 'Warehouse', 'Required Qty as per BOM',
|
item_list = [['Item Code', 'Description', 'Stock UOM', 'Warehouse', 'Required Qty as per BOM',
|
||||||
@ -660,7 +723,7 @@ def get_sales_orders(self):
|
|||||||
|
|
||||||
@frappe.whitelist()
|
@frappe.whitelist()
|
||||||
def get_bin_details(row, company, for_warehouse=None, all_warehouse=False):
|
def get_bin_details(row, company, for_warehouse=None, all_warehouse=False):
|
||||||
if isinstance(row, string_types):
|
if isinstance(row, str):
|
||||||
row = frappe._dict(json.loads(row))
|
row = frappe._dict(json.loads(row))
|
||||||
|
|
||||||
company = frappe.db.escape(company)
|
company = frappe.db.escape(company)
|
||||||
@ -684,8 +747,10 @@ def get_bin_details(row, company, for_warehouse=None, all_warehouse=False):
|
|||||||
group by item_code, warehouse
|
group by item_code, warehouse
|
||||||
""".format(conditions=conditions), { "item_code": row['item_code'] }, as_dict=1)
|
""".format(conditions=conditions), { "item_code": row['item_code'] }, as_dict=1)
|
||||||
|
|
||||||
def get_warehouse_list(warehouses, warehouse_list=[]):
|
def get_warehouse_list(warehouses):
|
||||||
if isinstance(warehouses, string_types):
|
warehouse_list = []
|
||||||
|
|
||||||
|
if isinstance(warehouses, str):
|
||||||
warehouses = json.loads(warehouses)
|
warehouses = json.loads(warehouses)
|
||||||
|
|
||||||
for row in warehouses:
|
for row in warehouses:
|
||||||
@ -695,23 +760,19 @@ def get_warehouse_list(warehouses, warehouse_list=[]):
|
|||||||
else:
|
else:
|
||||||
warehouse_list.append(row.get("warehouse"))
|
warehouse_list.append(row.get("warehouse"))
|
||||||
|
|
||||||
|
return warehouse_list
|
||||||
|
|
||||||
@frappe.whitelist()
|
@frappe.whitelist()
|
||||||
def get_items_for_material_requests(doc, warehouses=None, get_parent_warehouse_data=None):
|
def get_items_for_material_requests(doc, warehouses=None, get_parent_warehouse_data=None):
|
||||||
if isinstance(doc, string_types):
|
if isinstance(doc, str):
|
||||||
doc = frappe._dict(json.loads(doc))
|
doc = frappe._dict(json.loads(doc))
|
||||||
|
|
||||||
warehouse_list = []
|
|
||||||
if warehouses:
|
if warehouses:
|
||||||
get_warehouse_list(warehouses, warehouse_list)
|
warehouses = list(set(get_warehouse_list(warehouses)))
|
||||||
|
|
||||||
if warehouse_list:
|
|
||||||
warehouses = list(set(warehouse_list))
|
|
||||||
|
|
||||||
if doc.get("for_warehouse") and not get_parent_warehouse_data and doc.get("for_warehouse") in warehouses:
|
if doc.get("for_warehouse") and not get_parent_warehouse_data and doc.get("for_warehouse") in warehouses:
|
||||||
warehouses.remove(doc.get("for_warehouse"))
|
warehouses.remove(doc.get("for_warehouse"))
|
||||||
|
|
||||||
warehouse_list = None
|
|
||||||
|
|
||||||
doc['mr_items'] = []
|
doc['mr_items'] = []
|
||||||
|
|
||||||
po_items = doc.get('po_items') if doc.get('po_items') else doc.get('items')
|
po_items = doc.get('po_items') if doc.get('po_items') else doc.get('items')
|
||||||
@ -726,6 +787,9 @@ def get_items_for_material_requests(doc, warehouses=None, get_parent_warehouse_d
|
|||||||
|
|
||||||
so_item_details = frappe._dict()
|
so_item_details = frappe._dict()
|
||||||
for data in po_items:
|
for data in po_items:
|
||||||
|
if not data.get("include_exploded_items") and doc.get("sub_assembly_items"):
|
||||||
|
data["include_exploded_items"] = 1
|
||||||
|
|
||||||
planned_qty = data.get('required_qty') or data.get('planned_qty')
|
planned_qty = data.get('required_qty') or data.get('planned_qty')
|
||||||
ignore_existing_ordered_qty = data.get('ignore_existing_ordered_qty') or ignore_existing_ordered_qty
|
ignore_existing_ordered_qty = data.get('ignore_existing_ordered_qty') or ignore_existing_ordered_qty
|
||||||
warehouse = doc.get('for_warehouse')
|
warehouse = doc.get('for_warehouse')
|
||||||
@ -857,23 +921,28 @@ def get_item_data(item_code):
|
|||||||
# "description": item_details.get("description")
|
# "description": item_details.get("description")
|
||||||
}
|
}
|
||||||
|
|
||||||
def get_sub_assembly_items(bom_no, bom_data, to_produce_qty):
|
def get_sub_assembly_items(bom_no, bom_data, to_produce_qty, indent=0):
|
||||||
data = get_children('BOM', parent = bom_no)
|
data = get_children('BOM', parent = bom_no)
|
||||||
for d in data:
|
for d in data:
|
||||||
if d.expandable:
|
if d.expandable:
|
||||||
key = (d.name, d.value)
|
parent_item_code = frappe.get_cached_value("BOM", bom_no, "item")
|
||||||
if key not in bom_data:
|
bom_level = (frappe.get_cached_value("BOM", d.value, "bom_level")
|
||||||
bom_data.setdefault(key, {
|
if d.value else 0)
|
||||||
'stock_qty': 0,
|
|
||||||
|
stock_qty = (d.stock_qty / d.parent_bom_qty) * flt(to_produce_qty)
|
||||||
|
bom_data.append(frappe._dict({
|
||||||
|
'parent_item_code': parent_item_code,
|
||||||
'description': d.description,
|
'description': d.description,
|
||||||
'production_item': d.item_code,
|
'production_item': d.item_code,
|
||||||
'item_name': d.item_name,
|
'item_name': d.item_name,
|
||||||
'stock_uom': d.stock_uom,
|
'stock_uom': d.stock_uom,
|
||||||
'uom': d.stock_uom,
|
'uom': d.stock_uom,
|
||||||
'bom_no': d.value
|
'bom_no': d.value,
|
||||||
})
|
'is_sub_contracted_item': d.is_sub_contracted_item,
|
||||||
|
'bom_level': bom_level,
|
||||||
|
'indent': indent,
|
||||||
|
'stock_qty': stock_qty
|
||||||
|
}))
|
||||||
|
|
||||||
bom_item = bom_data.get(key)
|
if d.value:
|
||||||
bom_item["stock_qty"] += (d.stock_qty / d.parent_bom_qty) * flt(to_produce_qty)
|
get_sub_assembly_items(d.value, bom_data, stock_qty, indent=indent+1)
|
||||||
|
|
||||||
get_sub_assembly_items(bom_item.get("bom_no"), bom_data, bom_item["stock_qty"])
|
|
||||||
|
@ -9,5 +9,9 @@ def get_data():
|
|||||||
'label': _('Transactions'),
|
'label': _('Transactions'),
|
||||||
'items': ['Work Order', 'Material Request']
|
'items': ['Work Order', 'Material Request']
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
'label': _('Subcontract'),
|
||||||
|
'items': ['Purchase Order']
|
||||||
|
},
|
||||||
]
|
]
|
||||||
}
|
}
|
@ -10,7 +10,7 @@ from erpnext.stock.doctype.item.test_item import create_item
|
|||||||
from erpnext.manufacturing.doctype.production_plan.production_plan import get_sales_orders
|
from erpnext.manufacturing.doctype.production_plan.production_plan import get_sales_orders
|
||||||
from erpnext.stock.doctype.stock_reconciliation.test_stock_reconciliation import create_stock_reconciliation
|
from erpnext.stock.doctype.stock_reconciliation.test_stock_reconciliation import create_stock_reconciliation
|
||||||
from erpnext.selling.doctype.sales_order.test_sales_order import make_sales_order
|
from erpnext.selling.doctype.sales_order.test_sales_order import make_sales_order
|
||||||
from erpnext.manufacturing.doctype.production_plan.production_plan import get_items_for_material_requests
|
from erpnext.manufacturing.doctype.production_plan.production_plan import get_items_for_material_requests, get_warehouse_list
|
||||||
|
|
||||||
class TestProductionPlan(unittest.TestCase):
|
class TestProductionPlan(unittest.TestCase):
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
@ -236,10 +236,10 @@ class TestProductionPlan(unittest.TestCase):
|
|||||||
pln.append("po_items", {
|
pln.append("po_items", {
|
||||||
"item_code": item_code,
|
"item_code": item_code,
|
||||||
"bom_no": frappe.db.get_value('BOM', {'item': "Test BOM 1"}),
|
"bom_no": frappe.db.get_value('BOM', {'item': "Test BOM 1"}),
|
||||||
"planned_qty": 3,
|
"planned_qty": 3
|
||||||
"make_work_order_for_sub_assembly_items": 1
|
|
||||||
})
|
})
|
||||||
|
|
||||||
|
pln.get_sub_assembly_items('In House')
|
||||||
pln.submit()
|
pln.submit()
|
||||||
pln.make_work_order()
|
pln.make_work_order()
|
||||||
|
|
||||||
@ -251,6 +251,27 @@ class TestProductionPlan(unittest.TestCase):
|
|||||||
pln.cancel()
|
pln.cancel()
|
||||||
frappe.delete_doc("Production Plan", pln.name)
|
frappe.delete_doc("Production Plan", pln.name)
|
||||||
|
|
||||||
|
def test_get_warehouse_list_group(self):
|
||||||
|
"""Check if required warehouses are returned"""
|
||||||
|
warehouse_json = '[{\"warehouse\":\"_Test Warehouse Group - _TC\"}]'
|
||||||
|
|
||||||
|
warehouses = set(get_warehouse_list(warehouse_json))
|
||||||
|
expected_warehouses = {"_Test Warehouse Group-C1 - _TC", "_Test Warehouse Group-C2 - _TC"}
|
||||||
|
|
||||||
|
missing_warehouse = expected_warehouses - warehouses
|
||||||
|
|
||||||
|
self.assertTrue(len(missing_warehouse) == 0,
|
||||||
|
msg=f"Following warehouses were expected {', '.join(missing_warehouse)}")
|
||||||
|
|
||||||
|
def test_get_warehouse_list_single(self):
|
||||||
|
warehouse_json = '[{\"warehouse\":\"_Test Scrap Warehouse - _TC\"}]'
|
||||||
|
|
||||||
|
warehouses = set(get_warehouse_list(warehouse_json))
|
||||||
|
expected_warehouses = {"_Test Scrap Warehouse - _TC", }
|
||||||
|
|
||||||
|
self.assertEqual(warehouses, expected_warehouses)
|
||||||
|
|
||||||
|
|
||||||
def create_production_plan(**args):
|
def create_production_plan(**args):
|
||||||
args = frappe._dict(args)
|
args = frappe._dict(args)
|
||||||
|
|
||||||
|
@ -9,18 +9,17 @@
|
|||||||
"include_exploded_items",
|
"include_exploded_items",
|
||||||
"item_code",
|
"item_code",
|
||||||
"bom_no",
|
"bom_no",
|
||||||
"planned_qty",
|
|
||||||
"column_break_6",
|
"column_break_6",
|
||||||
"make_work_order_for_sub_assembly_items",
|
"planned_qty",
|
||||||
"warehouse",
|
"warehouse",
|
||||||
"planned_start_date",
|
"planned_start_date",
|
||||||
"section_break_9",
|
"section_break_9",
|
||||||
"pending_qty",
|
"pending_qty",
|
||||||
"ordered_qty",
|
"ordered_qty",
|
||||||
"produced_qty",
|
|
||||||
"column_break_17",
|
"column_break_17",
|
||||||
"description",
|
"description",
|
||||||
"stock_uom",
|
"stock_uom",
|
||||||
|
"produced_qty",
|
||||||
"reference_section",
|
"reference_section",
|
||||||
"sales_order",
|
"sales_order",
|
||||||
"sales_order_item",
|
"sales_order_item",
|
||||||
@ -32,11 +31,10 @@
|
|||||||
],
|
],
|
||||||
"fields": [
|
"fields": [
|
||||||
{
|
{
|
||||||
"columns": 2,
|
"columns": 1,
|
||||||
"default": "0",
|
"default": "1",
|
||||||
"fieldname": "include_exploded_items",
|
"fieldname": "include_exploded_items",
|
||||||
"fieldtype": "Check",
|
"fieldtype": "Check",
|
||||||
"in_list_view": 1,
|
|
||||||
"label": "Include Exploded Items"
|
"label": "Include Exploded Items"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -80,13 +78,6 @@
|
|||||||
"fieldname": "column_break_6",
|
"fieldname": "column_break_6",
|
||||||
"fieldtype": "Column Break"
|
"fieldtype": "Column Break"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"default": "0",
|
|
||||||
"description": "If enabled, system will create the work order for the exploded items against which BOM is available.",
|
|
||||||
"fieldname": "make_work_order_for_sub_assembly_items",
|
|
||||||
"fieldtype": "Check",
|
|
||||||
"label": "Make Work Order for Sub Assembly Items"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"fieldname": "warehouse",
|
"fieldname": "warehouse",
|
||||||
"fieldtype": "Link",
|
"fieldtype": "Link",
|
||||||
@ -218,7 +209,7 @@
|
|||||||
"idx": 1,
|
"idx": 1,
|
||||||
"istable": 1,
|
"istable": 1,
|
||||||
"links": [],
|
"links": [],
|
||||||
"modified": "2021-04-28 19:14:57.772123",
|
"modified": "2021-06-28 18:31:06.822168",
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "Manufacturing",
|
"module": "Manufacturing",
|
||||||
"name": "Production Plan Item",
|
"name": "Production Plan Item",
|
||||||
|
@ -0,0 +1,202 @@
|
|||||||
|
{
|
||||||
|
"actions": [],
|
||||||
|
"creation": "2020-12-27 16:08:36.127199",
|
||||||
|
"doctype": "DocType",
|
||||||
|
"editable_grid": 1,
|
||||||
|
"engine": "InnoDB",
|
||||||
|
"field_order": [
|
||||||
|
"production_item",
|
||||||
|
"item_name",
|
||||||
|
"fg_warehouse",
|
||||||
|
"parent_item_code",
|
||||||
|
"schedule_date",
|
||||||
|
"column_break_3",
|
||||||
|
"qty",
|
||||||
|
"bom_no",
|
||||||
|
"bom_level",
|
||||||
|
"type_of_manufacturing",
|
||||||
|
"supplier",
|
||||||
|
"work_order_details_section",
|
||||||
|
"work_order",
|
||||||
|
"purchase_order",
|
||||||
|
"production_plan_item",
|
||||||
|
"column_break_7",
|
||||||
|
"produced_qty",
|
||||||
|
"received_qty",
|
||||||
|
"indent",
|
||||||
|
"section_break_19",
|
||||||
|
"uom",
|
||||||
|
"stock_uom",
|
||||||
|
"column_break_22",
|
||||||
|
"description"
|
||||||
|
],
|
||||||
|
"fields": [
|
||||||
|
{
|
||||||
|
"fetch_from": "sub_assembly_item_code.item_name",
|
||||||
|
"fieldname": "item_name",
|
||||||
|
"fieldtype": "Data",
|
||||||
|
"label": "Item Name",
|
||||||
|
"read_only": 1
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "column_break_3",
|
||||||
|
"fieldtype": "Column Break"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"depends_on": "eval:doc.type_of_manufacturing == \"In House\"",
|
||||||
|
"fieldname": "work_order_details_section",
|
||||||
|
"fieldtype": "Section Break",
|
||||||
|
"label": "Reference"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "work_order",
|
||||||
|
"fieldtype": "Link",
|
||||||
|
"label": "Work Order",
|
||||||
|
"options": "Work Order",
|
||||||
|
"read_only": 1
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "column_break_7",
|
||||||
|
"fieldtype": "Column Break"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"columns": 1,
|
||||||
|
"fieldname": "qty",
|
||||||
|
"fieldtype": "Float",
|
||||||
|
"in_list_view": 1,
|
||||||
|
"label": "Required Qty",
|
||||||
|
"read_only": 1
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "purchase_order",
|
||||||
|
"fieldtype": "Link",
|
||||||
|
"label": "Purchase Order",
|
||||||
|
"options": "Purchase Order",
|
||||||
|
"read_only": 1
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "received_qty",
|
||||||
|
"fieldtype": "Float",
|
||||||
|
"label": "Received Qty"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "bom_no",
|
||||||
|
"fieldtype": "Link",
|
||||||
|
"in_list_view": 1,
|
||||||
|
"label": "Bom No",
|
||||||
|
"options": "BOM"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "production_plan_item",
|
||||||
|
"fieldtype": "Data",
|
||||||
|
"hidden": 1,
|
||||||
|
"label": "Production Plan Item",
|
||||||
|
"read_only": 1
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "parent_item_code",
|
||||||
|
"fieldtype": "Link",
|
||||||
|
"label": "Finished Good",
|
||||||
|
"options": "Item",
|
||||||
|
"read_only": 1
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"columns": 1,
|
||||||
|
"fetch_from": "bom_no.bom_level",
|
||||||
|
"fieldname": "bom_level",
|
||||||
|
"fieldtype": "Int",
|
||||||
|
"in_list_view": 1,
|
||||||
|
"label": "Level (BOM)",
|
||||||
|
"read_only": 1
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"collapsible": 1,
|
||||||
|
"fieldname": "section_break_19",
|
||||||
|
"fieldtype": "Section Break",
|
||||||
|
"label": "Item Details"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "uom",
|
||||||
|
"fieldtype": "Link",
|
||||||
|
"label": "UOM",
|
||||||
|
"options": "UOM",
|
||||||
|
"read_only": 1
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "stock_uom",
|
||||||
|
"fieldtype": "Link",
|
||||||
|
"label": "Stock UOM",
|
||||||
|
"options": "UOM",
|
||||||
|
"read_only": 1
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "column_break_22",
|
||||||
|
"fieldtype": "Column Break"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "description",
|
||||||
|
"fieldtype": "Small Text",
|
||||||
|
"label": "description",
|
||||||
|
"read_only": 1
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "production_item",
|
||||||
|
"fieldtype": "Link",
|
||||||
|
"in_list_view": 1,
|
||||||
|
"label": "Sub Assembly Item Code",
|
||||||
|
"options": "Item",
|
||||||
|
"read_only": 1
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "indent",
|
||||||
|
"fieldtype": "Int",
|
||||||
|
"label": "Indent"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "fg_warehouse",
|
||||||
|
"fieldtype": "Link",
|
||||||
|
"label": "Target Warehouse",
|
||||||
|
"options": "Warehouse"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "produced_qty",
|
||||||
|
"fieldtype": "Data",
|
||||||
|
"label": "Produced Quantity",
|
||||||
|
"read_only": 1
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"default": "In House",
|
||||||
|
"fieldname": "type_of_manufacturing",
|
||||||
|
"fieldtype": "Select",
|
||||||
|
"in_list_view": 1,
|
||||||
|
"label": "Manufacturing Type",
|
||||||
|
"options": "In House\nSubcontract"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "supplier",
|
||||||
|
"fieldtype": "Link",
|
||||||
|
"label": "Supplier",
|
||||||
|
"mandatory_depends_on": "eval:doc.type_of_manufacturing == 'Subcontract'",
|
||||||
|
"options": "Supplier"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "schedule_date",
|
||||||
|
"fieldtype": "Datetime",
|
||||||
|
"in_list_view": 1,
|
||||||
|
"label": "Schedule Date"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"index_web_pages_for_search": 1,
|
||||||
|
"istable": 1,
|
||||||
|
"links": [],
|
||||||
|
"modified": "2021-06-28 20:10:56.296410",
|
||||||
|
"modified_by": "Administrator",
|
||||||
|
"module": "Manufacturing",
|
||||||
|
"name": "Production Plan Sub Assembly Item",
|
||||||
|
"owner": "Administrator",
|
||||||
|
"permissions": [],
|
||||||
|
"quick_entry": 1,
|
||||||
|
"sort_field": "modified",
|
||||||
|
"sort_order": "DESC",
|
||||||
|
"track_changes": 1
|
||||||
|
}
|
@ -0,0 +1,10 @@
|
|||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
# Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and contributors
|
||||||
|
# For license information, please see license.txt
|
||||||
|
|
||||||
|
from __future__ import unicode_literals
|
||||||
|
# import frappe
|
||||||
|
from frappe.model.document import Document
|
||||||
|
|
||||||
|
class ProductionPlanSubAssemblyItem(Document):
|
||||||
|
pass
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user