Commit Graph

2650 Commits

Author SHA1 Message Date
Nabin Hait
ba70e7e8bc
Payroll based on attendance (#21258)
* feat: Payroll based on attendance and leave

* test: salary slip based 0n attendance

* feat: Payroll based on attendance

* fix: Codacy issues

Co-authored-by: Anurag Mishra <mishranaman123@gmail.com>
2020-04-26 20:17:48 +05:30
Deepesh Garg
d78cf97250
feat: Allow tax withholding category selection at invoice level (#20870)
* feat: Allow tax withholding category selection at invoice level

* fix: Linitng fixes

* feat: TDS calculation using common PAN

* fix: Add provision to deduct Lower TDS in purchase invoice

* fix: Consider only ref docs company while computing TDS

* fix: Default permission fixes

* fix: Add validation for dates in fiscal year

* fix: Undefined variable
2020-04-26 20:08:52 +05:30
Nabin Hait
58ee6c1e08
feat: Income tax slab (#21399)
* Feat: Multiple tax as per new taxation rule

* patch:for multiple tax slab, fix: payroll and exemption validation

* Test: Fixture

* feat: income tax slab with other charges and tax exempted deduction components

* fix: added missing init file

* fix: Patch fixed

* fix: Patch fixed

* fix: test fixes

* fix: validate duplicate exemption declaration

* fix: payment entry test case

Co-authored-by: Anurag Mishra <mishranaman123@gmail.com>
2020-04-26 17:45:57 +05:30
Saqib Ansari
2fea073539 fix: query logic 2020-04-26 17:30:23 +05:30
Saqib Ansari
22d2970339 fix: query 2020-04-24 13:47:44 +05:30
Saqib Ansari
0f2c64cfef fix: travis 2020-04-23 19:19:09 +05:30
Rucha Mahabal
78d7ed521f
Merge branch 'develop' into email-camp-end-date 2020-04-23 16:00:27 +05:30
Saqib
63084c6292
Merge branch 'develop' into quo-status-fix 2020-04-23 15:30:31 +05:30
Anupam K
0f7bac26e6 setting end date in email campaign 2020-04-23 15:29:12 +05:30
Saqib Ansari
1e4c28e99d fix: quotation have expired status even if sales order exists 2020-04-23 15:28:47 +05:30
Anupam K
39911b40f0 setting end date in email campaign 2020-04-23 14:14:49 +05:30
Deepesh Garg
b1e68bd022
fix: Rename bank account type doctypes (#21179)
* fix: Rename bank account type doctypes

Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
2020-04-23 12:19:30 +05:30
rohitwaghchaure
6fa6caf46c
fix: patch and validation message to fix target warehouse issue (#21371) 2020-04-23 09:46:29 +05:30
Sahil Khan
f03efdc6b1 fix(patch): reload 'Import Supplier Invoice' doc 2020-04-20 14:18:28 +05:30
Saqib
b61d2411b1
Merge branch 'develop' into rename-bank-reco 2020-04-20 12:21:22 +05:30
Saqib Ansari
9de76de621 fix: patch 2020-04-20 12:19:27 +05:30
marination
8890b6044d fix: Patch fix, Travis fix and cleanup
- Added UOM column in Report
- Removed mandatory on `valid_till`
- Added list view indicator for Expired status in Supplier Quotation
- Sorted Labels in Chart and syntax cleanup
- Made labels Translatable
- Fixed patch
2020-04-15 12:31:12 +05:30
marination
1bab1539b1 Merge branch 'develop' of https://github.com/frappe/erpnext into quoted-item-report 2020-04-15 12:16:31 +05:30
Rucha Mahabal
11121f4905 fix: patch for Healthcare Refactoring 2020-04-15 11:53:39 +05:30
marination
8179804405 refactor: Quoted Item Comparison Report
- Refactored Report View
- Added Chart
- Added 'valid_till' date in Supplier Quotation
- Added patch to set valid_till and daily job to set expiry status
2020-04-14 23:05:11 +05:30
Deepesh Garg
78c0841d64
Merge pull request #21249 from Thunderbottom/blanket-order-patch-fix
chore: force reload doctype before running patch
2020-04-13 18:59:31 +05:30
Rucha Mahabal
79bc819f92 fix: Healthcare Patch 2020-04-13 18:51:04 +05:30
Chinmay D. Pai
de8554d0dc
chore: force reload doctype before running patch
fixes Unknown column 'against_blanket_order' in 'field list'

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-04-13 16:03:22 +05:30
Rucha Mahabal
41520f9fca
Merge branch 'develop' into healthcare_refactor 2020-04-09 19:16:31 +05:30
Mangesh-Khairnar
49816b0c5f
fix(MWS): add new regions to marketplace (#21196)
* fix(MWS): add marketplace region for uae

* fix: rename the fields for mws integrations

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-08 12:57:14 +05:30
rohitwaghchaure
47c8ddb29b
Merge pull request #20962 from marination/pick-list-enhance
fix: Pick List Enhancements
2020-04-08 12:09:10 +05:30
Raffael Meyer
385a92d3f2
fix(patch): set_task_status (#21130)
* fix(patch): set_task_status

* remove unnecessary loop, use tabs

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-08 09:24:34 +05:30
Nabin Hait
b95a794e51
Merge branch 'develop' into healthcare_refactor 2020-04-08 09:08:21 +05:30
Raffael Meyer
9aae0c27c2
feat(regional): a central place for regional address templates (#19862)
* feat: a central place for regional address templates

* set up address templates during install

* why don't the tests run?

* fix: remove unused variables, fix cwd

* fix: .get() dicts contents

* fix: choose the right default

* fix: fieldname is template, not html

* fix: import unittest

* fix: remove unnecessary code

* fix: ensure country exists

* fix: ensure country exists

* feat: test updating an existing template

* fix(regional): DuplicateEntryError in test_update_address_template

* refactor and set 'is_default'

* fix codacy

* fix: patch gst_fixes

* fix: patch update_address_template_for_india

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-08 08:56:57 +05:30
rohitwaghchaure
36459c052f
Merge branch 'develop' into pick-list-enhance 2020-04-07 18:04:39 +05:30
Nabin Hait
c9f08bed2b fix: set batch qty in batch master and test cases 2020-04-07 17:33:10 +05:30
Rohan Bansal
40611080da fix(patch): Fix edge cases for Batch 2020-04-07 17:33:10 +05:30
Rohan Bansal
56827a372c fix(patch): Reload Batch doctype before update query 2020-04-07 17:33:10 +05:30
Rohan Bansal
658ed14e40 feat(batch): Add total quantity and dashboard to Batch 2020-04-07 17:33:10 +05:30
Rucha Mahabal
9d0ff961bc fix: patch and tests 2020-04-07 16:43:22 +05:30
Rucha Mahabal
21f5680914 fix: merge conflicts 2020-04-07 16:42:50 +05:30
rohitwaghchaure
d313a239de
Merge pull request #21065 from marination/bin-requested-qty
fix: Updated Bin Requested Qty logic
2020-04-07 14:50:19 +05:30
Marica
048de30cb5
Merge branch 'develop' into pick-list-enhance 2020-04-07 14:05:05 +05:30
marination
39f9dd03a7 fix: Use reload_doc in patch 2020-04-07 14:03:50 +05:30
Rucha Mahabal
0f23a304bc fix: added patch for refactored changes 2020-04-06 19:00:17 +05:30
Saqib Ansari
b2a84fe478 chore: rename bank reconciliation to bank clearance 2020-04-06 16:32:33 +05:30
marination
642f19d704 fix: Patch fix 2020-04-06 16:01:50 +05:30
Marica
e58d1b1b9f
Merge branch 'develop' into bin-requested-qty 2020-04-06 15:54:51 +05:30
Deepesh Garg
8853850fd8
Merge branch 'develop' into item_tax_template_fix 2020-04-06 13:13:37 +05:30
Deepesh Garg
6c8efdef09 fix: User permissions in GSTR 3B report 2020-04-04 20:05:17 +05:30
Marica
66c4a08703
fix: Update Received Qty in Material Request as per Stock UOM (#21054)
* fix: Update Received Qty in Material Request as per Stock UOM

* fix: Process each PR only once

* fix: minor suggested changes

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-03 10:07:06 +05:30
Deepesh Garg
007548b79c
fix: Bank Account patch (#21124) 2020-03-31 10:07:51 +05:30
marination
815c36a4eb fix: Updated Bin Requested Qty logic 2020-03-26 15:46:27 +05:30
Deepesh Garg
bdcfab3a0f fix: Update patch and bank form cleanup 2020-03-25 21:32:10 +05:30
marination
e1f499ae1b fix: Pick List Enhancements 2020-03-17 11:47:11 +05:30
Deepesh Garg
0b7acc0fd6 fix: Create Item tax template only for specific account types 2020-03-13 11:51:14 +05:30
Nabin Hait
2bd6ac56c6
Merge branch 'develop' into develop 2020-02-26 13:21:38 +05:30
Deepesh Garg
d1d0a50a70
feat: Loan management and accounting (#19035)
* fix: Create Loan Management module

* fix: Move loan doctype for hr module to loan management

* fix: Add loan dashboard

* fix: Move loan application form hr module to loan management

* fix: Move Loan Type from hr to loan management

* fix: Move salary slip loan from hr to loan management

* fix: Create loan security pledge doctype

* fix: Create loan security type doctype

* fix: Create Loan security doctype

* fix: Add customer in loan_common.js

* fix: Import patch for loan

* fix: Add security pledging in loan doctype

* fix: Add loan application pledge doctype

* fix: Add logic for security pledgeing in loan

* fix: Add logic for security pledging in loan application

* fix: Rename Loan security doctype to Loan Security Pledge

* fix: Add doctype for loan security

* fix: Fixes in loan and loan application

* fix: Add doctypes for loan repayment

* fix: Fixes in loan and loan application

* fix: Move loan repayment report from HR module to loan management

* fix: Create doctype for loan security price

* fix: Create doctype for loan security shortfall

* fix: Make fields in Loan shortfall readonly

* fix: Make loan type submittable

* fix: Add daily job for loan security revaluation in hooks.py

* fix: Add loan management module

* fix: Doctype for loan disbursement Entry

* fix: GL entry fix for loan disbursement

* fix: Add company currency options in Loan related doctypes

* fix: Changes in Loan Doctypes

* fix: Allow miltiple loan securities in Loan Security Pledge

* fix: Add proposed pledges in Loan Application

* fix: Add test cases for loan

* fix: Interest Accrual Entry for loans

* fix: Remove loan from journal entry

* fix: Update triggers in loan_common.js

* fix: Accrual Entries for loan Interest

* fix: Proposed Pledges for loan application

* fix: Update items in loan management module

* fix: Allow multiple disbursements against a loan

* fix: Add loan security code in loan security master

* fix: Allow multiple securities in a single pledge

* fix: Spelling and label fixes

* fix: Replace date in loan security price with datetime

* fix: Add dashboard to loan master

* fix: Move Repayment Schedule from HR to Loan Management

* fix: Add back jobs for loan accrual entries

* fix: Multiple fixes in loan

* fix: Multiple fixes in loan application

* fix: Loan Reapayment for term loans

* fix: Interest Accural Entries for term loans

* fix: Changes in Loan Doctypes

* fix: Add test case for term loan repayment

* fix: Add custom button to update loan security price and trigger shortfall

* fix: Usability fixes in Loan management

* fix: Multiple usablity and doctype fixes

* fix: Muliple bug and usability fixes in loan

* fix: Test case fixes for loan repayment from Salary

* fix: Codacy fixes

* fix: Test Case fixes

* fix: Minor fix in validate_repayment_method

* fix: Test case and codacy fixes

* fix: Provide consistent naming series to loan doctypes

* fix: Loan Application fix

* fix: Loan Application Dashboard

* fix: Add doctypes to process loan interest accural and loan security price

* fix: Provision to make loan topup

* fix: Pledge and unpledge statuses and doctype for loan securit unpledge

* fix: Multiple fixes in Loan Cycle

* fix: Add missing dashboards to loan doctypes

* fix: Add Loan Manager role to loan doctypes

* fix: Loan Process fixes

* fix: Loan Security Unpledge fixes

* fix: UX, List and dashboards fixes

* fix: Minor fixes

* fix: Minor fixes

* fix: Status on additional loan security

* fix: Codacy fixes

* fix: Multiple fixes in loan

* fix: Rename Process Loan Security Price to Process Loan Security Shortfall

* fix: Loan Repayment and Closure report

* fix: Loan Security Status report and minor fixes

* fix: Multiple UX fixes

* fix: Test Case fixes and UX fixes

* fix: Currency symbol fixes in Salary Slip Loan

* fix: Make loan account details read only

* fix: Changes in loan security price updation

* fix: Sanctioned Loan Amount doctype

* fix: Updates in process loan interest accrual

* fix: Pass loan doc instead of loan name

* fix: Fixes in process loan interest accrual

* fix: Add missing semicolon

* fix: Test case

* fix: Test case

* fix: Sandbox method to get proposed pledges

* fix: Sandbox method

* fix: Nonetype fix in loan sanction limit

* fix: GL entry fixes

* fix: Update maximum loan amount on loan security pledging

* fix: Round  off loan amounts

* fix: Loan Security unpledging

* fix: Interest amount for loan closure

* fix: Due date for loan repayments

* fix: API fixes for loan disbursement method

* fix: Disable quick entry for sanctioned loan amount

* fix: Add misssing translations for validations and codecleanup

* fix: Translation fixes and code cleanup

* fix: Test Cases

* fix: Loan Interest Accrual test case
2020-02-26 10:44:24 +05:30
Deepesh Garg
0a6314ab92
Merge pull request #20659 from deepeshgarg007/plaid_fix_develop
fix: Plaid fixes and enhancements
2020-02-18 18:09:01 +05:30
Deepesh Garg
16445305d5 fix: Styling and minor fixes 2020-02-18 18:04:09 +05:30
racitup
f2fb963986 Ignore codacy SQL injection warning (internal code only) and add copyright notice 2020-02-18 17:52:07 +05:30
racitup
719678957a fix: Bank Reconciliation Bank Account and Bank Account No field names 2020-02-18 17:49:45 +05:30
Deepesh Garg
15ff6a594b
feat: Inter warehouse stock transfer on valuation rate with taxation (#20083)
* fix: Validation for target warehouse

* feat: Get items on valuation rate in delivery note on Internal transfers

* fix: Create Inter company purchase receipt from delivery note

* feat: Inter company stock transfer on valuation rate with taxation

* fix: Add from warehouse in purchase invoice

* fix: Use get_value instead of get_cached_value

* fix: Get incoming rate instead of valuation rate

* fix: GL entry for from warehouse in purchase receipt

* fix: GL Entries fixes in purchase invoice

* fix: Address and tax fetching fixes

* fix: Add test case for stock transfer via purchase receipt

* fix: Code cleanup, added validations and test cases

* fix: Validation for supplier warehouse

* fix: Test Cases

* fix: Change validation condition

* fix: Address fixes while creating Purchase Receipt from delivery note

* fix: Set taxes while creating Purchase Receipt from Delivery Note

* fix: Update set_missing_value function

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-02-18 12:28:41 +05:30
P-Froggy
4cc929cabb Move SWIFT-number and branch-code from bank account to bank
The bank's SWIFT-Number and branch-code should be a field in bank DocType, not in bank account DocType.
2020-02-18 00:38:46 +01:00
Rucha Mahabal
cf3c8174f6
Merge branch 'develop' into fix_regional_data 2020-02-10 00:40:21 +05:30
Rucha Mahabal
8334a3a1fd fix: patch for creating irs_1099 custom field (United States) 2020-02-10 00:34:09 +05:30
sahil28297
32d643ed3c fix(patch): reload tax category (#20308) 2020-01-15 18:57:54 +05:30
sahil28297
596a072d5f fix(patch): do not append taxes to template if account name is not set (#20312) 2020-01-15 18:56:36 +05:30
Deepesh Garg
2d151a7b85 fix: Remove patch to set automatic tax fetching from item tax template (#20234) 2020-01-13 15:09:27 +05:30
Suraj Shetty
000ac0068b
Merge branch 'develop' into rename-doc-fix 2020-01-09 13:46:08 +05:30
sahil28297
88737e38f2 fix(item_tax_template): fetch parent account if not set (#20198) 2020-01-07 11:30:22 +05:30
Rohan
b73b347697 feat: add job applicant's email in job offer (#20153) 2019-12-31 17:09:02 +05:30
Deepesh Garg
b914cf0a9d
Merge pull request #19815 from Mangesh-Khairnar/publish-item
feat(marketplace): allow user to un-publish item
2019-12-28 17:52:49 +05:30
Rohan
901fe4785c fix: employee preferred email patch (#20116) 2019-12-27 17:07:35 +05:30
Mangesh-Khairnar
c7ce597b7f
fix: return when Hub Tracked Item is empty 2019-12-27 14:48:14 +05:30
Deepesh Garg
467dba1954 fix: Patch incorrect GST category in invoices (#20084)
* fix: Patch to set GST category for unregistered invoice

* fix: Move patch up in line
2019-12-27 12:58:19 +05:30
Mangesh-Khairnar
cca6fb2794
Merge branch 'develop' into publish-item 2019-12-27 12:55:28 +05:30
rohitwaghchaure
4d806033af
Merge pull request #19335 from PawanMeh/feat_19334
feat(regional): Italian Localization and Passive invoicing cycle
2019-12-27 12:48:46 +05:30
Nabin Hait
8f3fea63b1
Merge branch 'develop' into publish-item 2019-12-27 12:19:02 +05:30
deepeshgarg007
8857d87c5b fix: Travis 2019-12-26 17:34:02 +05:30
Saqib
7519436260
Merge pull request #19876 from rohitwaghchaure/provision_to_select_custom_fields_in_pos
feat: provision to select the custom fields in the online POS
2019-12-26 13:40:43 +05:30
Rohit Waghchaure
2c13a0533b code cleanup 2019-12-26 12:14:32 +05:30
hello@openetech.com
7021402a45 [feat] #19334 2019-12-26 12:13:27 +05:30
Rohit Waghchaure
682273a00b feat: provision to select the custom fields in the online POS 2019-12-26 11:59:19 +05:30
Mangesh-Khairnar
d19bd8f0dd
Merge branch 'develop' into publish-item 2019-12-25 22:10:33 +05:30
Parth J. Kharwar
8c4cf12c93 Setting preferred driver email in delivery trip (#19832)
* fix: add driver's preferred contact email in delivery trip

* fix: modify driver's preferred email patch and blank field checks

* fix: patch file fix

* fix: patch changes to improve speed

* fix: removal of conflicts

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2019-12-25 15:14:52 +05:30
Mangesh-Khairnar
0143f7c59d patch: set published in hub track item 2019-12-24 17:45:57 +05:30
Rohan
ff98a52834
Merge branch 'develop' into v12-lead-address-contact 2019-12-24 11:21:08 +05:30
Rohit Waghchaure
0dba4345f3 fix: patch 2019-12-20 17:04:39 +05:30
Gavin D'souza
1e4ea466d3 style: update/standardize rename_doc usage 2019-12-19 19:07:29 +05:30
deepeshgarg007
94ff8058ac fix: Add missing import 2019-12-14 21:25:30 +05:30
Deepesh Garg
6e2c13f4c8 feat(regional): Auto state wise taxation for GST India (#19469)
* feat(regional): Auto state wise taxation for GST India

* fix: Update gst category on addition of GSTIN

* fix: Codacy and travis fixes

* fix: Travis

* fix(test): Update GST category only if GSTIN field available

* fix: Test Cases

* fix: Do not skip accounts if place of supply is not present

* fix: Auto GST taxation for SEZ Party types

* fix: Automatic taxation for multi state

* fix: Codacy and travis fixes

* fix: Auto GST template selection in Sales Order

* fix: Move inter state check and source state to tax category

* fix: Remove unique check from tax template

* fix: Remove unique check from tax template

* fix: Address fetching logic in Sales

* fix: fecth tax template on company address change

* fix: fetch company gstin on address change

* fix: company_gstin set value fix

* fix: Mutiple fixes and code refactor

* fix: Add missing semicolon

* fix: Company address fetching in sales invoice

* fix: Remove print statement

* fix: Import functools

* fix: Naming fixes and code cleanup

* fix: Iteritems compatibility for python 3
2019-12-10 15:55:05 +05:30
Nabin Hait
6f68f2d020
feat: Cost center for each expenses in expense claim and allowed deferred expense (#19807)
* refactor: Expense Claim Cost Center

* refactor: Expense Claim Cost Center

* refactor: Expense Claim Cost Center

* fix: copy cost center from other row

* patch: set cost center in children based on parent

* fix: test cases for expense claim
2019-12-10 08:40:10 +05:30
Nabin Hait
da4847e46d
patch: Set against_blanket_order value in existing SO/PO (#19810)
* patch: Set against_blanket_order value in existing SO/PO

* Update set_against_blanket_order_in_sales_and_purchase_order.py
2019-12-09 18:27:50 +05:30
Rohan
05222270e1
Merge branch 'develop' into v12-lead-address-contact 2019-12-06 14:25:30 +05:30
sahil28297
eb9c3e1c5b fix(patch): set proper tax_type and proper account (#19794) 2019-12-04 12:01:31 +05:30
rohitwaghchaure
ce32f9a361
Merge branch 'develop' into capacity_planning_for_workstataion_feature 2019-12-02 11:29:06 +05:30
Rohit Waghchaure
8b599f2bc9 fix: capacity planning back 2019-11-29 14:09:30 +05:30
Rohan Bansal
69e3868a9d patch: set title for old leads 2019-11-28 12:23:19 +05:30
Rucha Mahabal
58928e8eae
Merge branch 'develop' into setup_wizard 2019-11-27 11:55:53 +05:30
Rucha Mahabal
195893db0e fix: conditionally run old patch for Setup Progress 2019-11-26 15:22:05 +05:30
rohitwaghchaure
b5991e9264
Merge pull request #19683 from rohitwaghchaure/bom_ux_fixes_version_12
fix: BOM UX
2019-11-26 13:15:40 +05:30
Rohit Waghchaure
9326fb78f2 fix: BOM UX 2019-11-25 18:56:18 +05:30
Saqib
1919af2ff1 Fixed Asset Refactor Review fixes (#19666)
* fix: fixed asset item creation ux fixes

* fix: auto creation of asset ux fixes

* fix: [LCV] incorrect condition when checking assets linked with PR

* fix: bulk update assets

* refac: remove company level cwip enabling
* cwip can be enabled only on category level

* fix: #19649
2019-11-22 16:32:34 +05:30
Deepesh Garg
24cde55e28 fix: Patch for updating price or product discount field (#19642)
* fix: Patch for updating price or product discount field

* fix: Update pactch

* Update update_price_or_product_discount.py
2019-11-22 11:57:42 +05:30
Saqib
d995609ffa Fixed asset refactor (#19369)
* refactor: Asset Movement with multiple assets using table

* refactor: Create Asset Movement from Asset List & Linking PR/PI with Asset

* feat: Auto create asset on Purchase checkbox

* refactor: LCV for asset created via PR/PI

* refactor: get asset category accounts from item master

* refactor: Purchase Receipt for asset purchasing

* refactor: Purchase Invoice for asset purchasing

* fix: post-refactor delete fixes

* refactor: moved asset validation from pr/pi on asset submission

* fix: Asset Category should be defined for auto purchasing assets

* fix: undo serial_no_update removal (for non asset item) from LCV

* fix: remove duplicate calls from item.js

* fix: args position of all occurrence of get_asset_category_account()

* fix: test cases

* fix: landed cost voucher validations

* refactor: test case for auto creation of asset

* fix: removed invalid assertions

* fix: patch errors on travis

* fix: codacy fixes

* fix: PI Items not fetching details from item

* fix: asset movement from list view having default purpose 'Receipt'

* chore: msgprint for selecting item code first while creating asset manually

* fix: alert messages

* minor: asset movement fixes

* fix: lcv was made against submitted assets

* minor: ux fixes

* refac: move specific asset validation to SINV

* chore: remove make_purchase_invoice from asset form
* make asset movement on asset submission
* add PR & PI queries based on item code

* refac: not allow last movement cancellation
* move asset movement creation on asset submission
* asset movement naming series
* add tests

* fix: code review changes

* chore: remove unecessary asset movement updation

* refac: setting latest location while making asset movements
* Added extra validations

* fix: form dashboard make lcv button

* fix: auto asset movement creation validation

* fix: allow lcv against other items after removing submitted assets

* chore: remove unwanted condition

* fix: mismatch debit credit on  purchase of asset with valuation tax

* chore: toggle required field based on movement type

* chore: fix lcv error message

* fix: travis failing

* fix: travis failing test

* fix: wrong conditions after merge

* fix: cannot cancel assets

* fix: travis failing* fix change in deletion of assets

* fix: codacy

* fix: process cancellation of assets

* refac: cancellation of pr only deletes auto created assets

* fix: incorrect query
2019-11-18 11:46:55 +05:30
rohitwaghchaure
6424416886 fix: sales order item shwoing incorrect produced qty (#19584) 2019-11-15 14:18:45 +05:30
Deepesh Garg
d69d0e3046 fix(patch): skip leave ledger entry creation for denied leaves (#19579) 2019-11-14 13:05:13 +05:30
Mangesh-Khairnar
fc3b924d4d fix: skip leave ledger entry creation for denied leaves (#19556)
* fix: skip leave ledger entry creation for denied leave application

* patch: remove incorrect leave ledger entries

* fix: create reverse ledger entry before setting status to cancel
2019-11-14 12:02:10 +05:30
Saqib
73616d6b33 fix: duplication while bulk creation of item tax template (#19570) 2019-11-14 10:09:44 +05:30
marination
9ffa9d4a64 fix(patch): Enable CWIP Accounting 2019-11-13 19:10:20 +05:30
Marica
d00c59830e feat: Disable CWIP Accounting checkbox added in Company and Asset Category (#19262)
* feat: Disable CWIP Accounting checkbox added in Company and Asset Category

Asset Settings is removed completely
Disable CWIP Accounting checkbox will give priority to Asset Category

* fix: Changed checkbox name to 'Enable Capital Work in Progress Accounting'

- checkbox will be disabled by default
- Enabling it in Company will globally enable it
- When globally disabled , it's value on the asset category will be considered

* chore: Added patch to set pre-existing CWIP checkbox value into new checkbox

* fix(test): Asset

* fix: Asset Test and Patch

* fix(test): Opening Invoice Creation Tool

* Update asset.py

* fix: Patch and other fixes
2019-11-12 19:17:43 +05:30
Nabin Hait
32936024a0 patch: set default for add taxes from item tax template 2019-11-11 15:44:27 +05:30
Deepesh Garg
7a23057eab feat: Enhancement in landed cost voucher (#19252)
* feat: Enhancement in landed cost voucher

* fix: Make GL entries based on ledgers in Landed cost voucher

* fix: Patch to update expense account in Landed Cost Voucher and Stock Entry

* fix: Ability to select expense account in Stock Entry

* fix: Renaming and test case fixes

* fix: Test Cases

* fix: Additional cost in Stock Entry

* fix: Changed filters and test case fixes

* fix: Upadte filters in stokc entry expense account filter

* fix: company filter
2019-11-08 12:52:54 +05:30
Deepesh Garg
7aef9f3b43 fix: Accounting Dimension custom fields should be admin owned (#19525)
* fix: Accounting Dimension custom fileds should be admin owned

* fix: Update query

* fix: Travis
2019-11-08 12:42:38 +05:30
Saurabh
28c6a0aeb1 fix: reload global defaults (#19517) 2019-11-07 14:16:26 +05:30
Marica
52d888de42 fix[minor]: Payment Entry status patch (#19519) 2019-11-07 13:01:45 +05:30
Marica
1beed7db72 fix: Added 'status' field in Payment Entry (#19507) 2019-11-06 18:12:29 +05:30
Gavin D'souza
5a31e22892 chore: frappe.rename_doc update 2019-11-06 17:03:12 +05:30
rohitwaghchaure
6bd6039496
Revert "fix: patch, item tax template showing 'Untitled' in the name" 2019-10-30 17:37:22 +05:30
Rohit Waghchaure
b051fa37df fix: patch, item tax template showing 'Untitled' in the name 2019-10-29 14:56:03 +05:30
Suraj Shetty
8f67ef8a75 fix: Add patch to replace accounting with accounts in home_settings 2019-10-25 18:55:57 +05:30
Aditya Hase
7bdc612013 chore: Update module name (#19404) 2019-10-24 18:01:58 +05:30
sahil28297
39d9cbc43d fix(patch): use db_insert instead of save to escape validations (#19279) 2019-10-11 10:43:50 +05:30
sahil28297
2caf32d421 fix(patch): Reload Leave Type (#19240) 2019-10-04 16:24:53 +05:30
prssanna
1f512b36c5 fix(patch): set app_type as private 2019-09-30 14:57:21 +05:30
Rucha Mahabal
34326470b8 fix: produced_qty field hidden and not updated in sales order item (#19037)
* fix: produced_qty field hidden and not updated in sales order item

* fix: added patch for old sales orders

* fix: produced_qty for sales order item linked to multiple work orders

* fix: comment

* fix: function for updating produced_qty in SO Item

* fix: remove frappe.db.commit
2019-09-30 12:15:39 +05:30
gavin
fed5788c50 fix: patch fix (#19147) 2019-09-24 19:15:29 +05:30
Mangesh-Khairnar
a44e8afe71 feat: add bank account in payroll entry (#19021)
* fix(journal-entry): change fieldname from bank account no to bank account

* fix: add payroll entry in bank dashboard

* fix: fetch account from bank account

* fix: minor changes

* patch: check for bank account no column before updating

* fix: use rename field function
2019-09-20 18:19:47 +05:30
Suraj Shetty
627a3dcd6d feat: Default energy point rules (#19003)
* feat: Add default energy point rules during install

* fix: Add completed_by field to task doctype

* fix: Rule data

* fix: Add default rules for opportunity

* fix: Add a patch to create default energy point rules

* fix: Default success action message

* fix: Use .items() instead of .iteritems()

* fix: Add "create_default_energy_points" patch entry

* fix: Reload Energy Point Rule to fix patch

* fix: Import frappe
2019-09-17 15:54:41 +05:30
Chinmay Pai
b3c732daf5 refactor(plaid): move configuration from site_config to doctype (#18712)
* feat(plaid): move plaid from site_config to doctype

plaid requires accessing site_config and cloud users cannot access
site_config and hence, plaid integration doesn't work on the cloud.
Moving all the configuration from site_config to the Plaid Settings
doctype fixes this issue.

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>

* feat(plaid): make changes to plaid_settings and add patch

* remove all references for get()-ing plaid variables from frappe.conf
  and replace them with values from doctype
* add patch to move all existing plaid settings variable values from
  frappe.conf to plaid_settings doctype

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>

* fix(plaid): use get_single_value for Plaid Settings

Co-Authored-By: Himanshu <himanshuwarekar@yahoo.com>

* chore: reload plaid_settings before running patch

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>

* chore: remove useless semicolon

fuck codacy

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2019-09-13 15:48:08 +05:30
Faris Ansari
e352fb754b
fix: Reload doctype in variants patch (#18962) 2019-09-08 21:25:33 +05:30
Faris Ansari
594918bd3a
fix: Include Item variant patch in patches.txt (#18961) 2019-09-08 13:13:05 +05:30
Nabin Hait
4ce38059ac feat: Company wise credit limit 2019-09-06 14:33:10 +05:30
Nabin Hait
ac2b5ed84f fix: credit limit patch 2019-09-05 16:57:26 +05:30
Nabin Hait
b03fa8a441
Merge branch 'develop' into feat-customer-credit-limit 2019-09-05 12:34:34 +05:30
Nabin Hait
7834a0182b
Update move_credit_limit_to_customer_credit_limit.py 2019-09-05 12:22:48 +05:30
sahil28297
1e0b0da7ad fix(patch): add company in filters to get proper parent account (#18905) 2019-09-05 12:21:44 +05:30
Mangesh-Khairnar
cf901da25d test: create customer credit limit on change 2019-09-02 23:18:36 +05:30
Mangesh-Khairnar
86720deeae fix: bypass credit limit check 2019-09-01 10:15:23 +05:30
Mangesh-Khairnar
dbc69da409 fix: minor fixes 2019-08-31 14:28:02 +05:30
Mangesh-Khairnar
e3bb247868 fix: check column in credit limit 2019-08-31 13:16:14 +05:30
Mangesh-Khairnar
89433b4bea fix: get credit limit 2019-08-30 22:57:51 +05:30
Mangesh-Khairnar
b3e5d11e1d fix: multiple fixes 2019-08-30 18:18:48 +05:30
Mangesh-Khairnar
dcd5be0d07 patch: move credit limit in customer to child table 2019-08-29 20:53:51 +05:30
Shivam Mishra
0aeccbf4b2
feat: added dashboard fixtures (#18812)
* feat: add dashboard charts fixture

* fix: remove return statement

* feat: added patch for creating default dashboards

* chore: renamed dashboard charts

* feat: add add_dashboard function to install fixtures

* fix: reload doctype issue in patches

* fix (travis): reloaded dashboard chart source

* fix (travis): reloaded dashboard chart source

* fix (travis): reloaded dashboard doctype

* fix (travis): reloaded dashboard chart link doctype
2019-08-28 11:39:45 +05:30
Mangesh-Khairnar
d94a389dd3 chore: remove unwanted code (#18645) 2019-08-23 16:31:09 +05:30
Mangesh-Khairnar
5cdda19494 fix: ledger entries after expiry 2019-08-20 14:45:57 +05:30
Mangesh-Khairnar
dab5b1f319 Merge branch 'develop' of https://github.com/frappe/erpnext into leave-management 2019-08-13 13:33:26 +05:30
sahil28297
214815eb62 fix(patch): force reload child docs (#18672) 2019-08-12 11:49:21 +05:30
Mangesh-Khairnar
e173d54054 Merge branch 'develop' of https://github.com/frappe/erpnext into leave-management 2019-08-09 13:37:51 +05:30
Mangesh-Khairnar
261d132f3a fix: calculate earned leaves based on annual allocation 2019-08-09 13:18:52 +05:30
Mangesh-Khairnar
bafc89f439 refactor: convert raw sql to orm 2019-08-08 17:43:23 +05:30
Mangesh-Khairnar
5cbe6160ca feat: consider carry forwarded leaves on creation of encashment 2019-08-08 17:06:15 +05:30
Mangesh-Khairnar
8fb600162e fix: remove all leaves via scheduler 2019-07-31 19:31:26 +05:30
deepeshgarg007
6a43f6718a fix: Reload doc in patch 2019-07-28 10:30:32 +05:30
deepeshgarg007
dda6b5cd53 fix: Add accounting dimensions to subscription and opening invoice tool 2019-07-26 09:14:42 +05:30
deepeshgarg007
703fc08467 fix: Patch 2019-07-26 09:14:42 +05:30
Mangesh-Khairnar
fd1d4c2927 chore: split expire allocation 2019-07-22 18:05:27 +05:30
Mangesh-Khairnar
08c02287dd fix: expiry allocaton after creating all the transactions 2019-07-22 17:47:03 +05:30
Mangesh-Khairnar
cbc22e6369 Merge branch 'develop' of https://github.com/frappe/erpnext into leave-management 2019-07-22 13:57:04 +05:30
Anurag Mishra
305da799a4 Handling case for Material Request type 'Manufacture' v12 (#18365)
* fix: status for 'material request type == Manufacture'

* Patch: for setting status

* fix: list view status
2019-07-22 11:35:16 +05:30
Govind S Menokee
ce42c53c1c
Merge branch 'develop' into batch_bom_operations 2019-07-17 22:40:02 +05:30
Govind S Menokee
51b7b6f5d0 feat: remove explicit commit call 2019-07-17 22:38:30 +05:30
Rucha Mahabal
65a627cb5b fix: module changes for Auto Repeat from Desk to Automation (#18356) 2019-07-17 13:50:32 +05:30
Deepesh Garg
902e5ab744
Merge branch 'develop' into ac_dim_usability_fixes 2019-07-16 16:17:07 +05:30
Govind S Menokee
2ab9947647
Merge branch 'develop' into batch_bom_operations 2019-07-16 02:12:24 +05:30
Govind S Menokee
90fc3aff72 feat: add patch for default batch_size for old records 2019-07-16 01:48:35 +05:30
Nabin Hait
868766ddf0
refactor: Refactored over delivery/receipt/billing fields (#17788)
* refact: Refactored over delivery/receipt/billing fields

* fix: test case
2019-07-15 18:02:58 +05:30
deepeshgarg007
1cc46c06b0 Merge branch develop into ac_dim_usability_fixes 2019-07-15 15:34:40 +05:30
Mangesh-Khairnar
1ac9a8e82e fix(bin): update requested qty in bin (#18297) 2019-07-15 14:08:47 +05:30
deepeshgarg007
a85db66146 fix: Usability fixes in accounting dimensions 2019-07-14 18:15:19 +05:30
Jamsheer
5073ac4dcb fix: Patient History (Patient Medical Record) (#17972)
* Page - Patient History

* Healthcare Utils - get patient vitals

* Healthcare Utils - render doc as html for patient history page

* Page - Patient History -  prcatitioner image in time line

* Page - Patient History in menu

* fix - page medical history

* fix: page patient_history broken img, minor fixes

* fix: patient_history page, add pagination, show doc if fetched

* fix: Patient Medical Record to Patient History

* fix: patient history page - set route options

* fix: update to code standards

* fix: remove Eidt button form patient history

* fix: css update to code standards

* fix: Remove page medical_record
2019-07-12 12:28:34 +05:30
Rushabh Mehta
af88e15e92 fix(patch): set_priority_for_support.py (#18255) 2019-07-11 17:14:29 +05:30
Suraj Shetty
c6c6b05522 fix: update_due_date_in_gle patch (#18248) 2019-07-11 10:42:37 +05:30
Rushabh Mehta
8309fcfbbc BREAKING CHANGE: Remove anti-pattern "Project Task" (#18059)
* BREAKING CHANGE: Remove anti-pattern "Project Task"

* fix(tests): remove `tasks` from project/test_records.json

* fix(tests)

* fix(test): test_employee_onboarding.py

* fix(tests): test_expense_claim.py

* fix(refactor): cleanup project.py validate/update

* fix(refactor): cleanup project.py validate/update

* fix(test): test_expense_claim

* fix(test): test_expense_claim

* fix(test): test_expense_claim, try Test Company 4

* Update project.py
2019-07-08 10:39:30 +05:30
rohitwaghchaure
d86f027ce0 fix: default supplier was not set from the patch in item defaults for multi company instance (#18178) 2019-07-08 10:29:26 +05:30
Mangesh-Khairnar
48d61fb072
Merge branch 'develop' into handle_large_outstanding_invoices_code_refactored 2019-07-07 20:17:07 +05:30
Mangesh-Khairnar
ee01ba5879
fix: linting 2019-07-05 15:21:45 +05:30
Rohit Waghchaure
0f065d5de1 Added due date in the gl entry 2019-07-05 14:54:15 +05:30
karthikeyan5
7fc6021ca5 feat(setup): adding selling buying filter in terms and conditions 2019-07-04 22:46:16 +05:30
Mangesh-Khairnar
29734dae18 patch: reloads newly created docs in v12 (#18148) 2019-07-04 12:50:16 +05:30
rohitwaghchaure
ca9d13cc9b
Merge pull request #18135 from rohitwaghchaure/all_default_values_not_moved_to_item_default_table_develop
fix: as limit 100 was set in the query therefore not all item's default value moved to the Item Default table
2019-07-04 00:48:57 +05:30
Mangesh-Khairnar
8d19faa598 Merge branch 'develop' of https://github.com/frappe/erpnext into leave-management 2019-07-03 11:44:00 +05:30
Nabin Hait
34c551d9a5
fix: Missing commits from hotfix branch (#17997)
* fix: merge conflict

* fix: restored missing set_gst_state_and_state_number function

* fix: style linting as per codacy

* fix: Fixes related to customer/lead merging

* fix: merge conflict

* fix: Fixes related to customer/lead merging

* fix: Assign isue/opportunity to user

* fix: Assign isue/opportunity to user

* fix: Replaced Invoice type by GST Category

* fix: merge conflict

* fix: merge conflict

* fix: test cases

* fix: test cases
2019-07-03 10:34:31 +05:30
Rohit Waghchaure
09b44345df fix: as limit 100 was set in the query therefore not all item's default value moved to the Item Default table 2019-07-02 15:18:02 +05:30
Himanshu Warekar
bc0bc6677e fix: use db sql to delete property setter 2019-06-28 19:41:29 +05:30
Himanshu Warekar
c163b0de3d Merge branch 'develop' of https://github.com/frappe/erpnext into issue-fix 2019-06-28 19:08:08 +05:30
Himanshu Warekar
5cec89d1ab fix: remove frm call for priority change 2019-06-28 19:07:13 +05:30
Karthikeyan S
e6236094a6 fix(item): fix patch for barcode childtable migration in item (#18069)
* fix(item): fix patch for barcode childtable migration in item

(cherry picked from commit b2c43ee2d91599038f7bdf2038bbc4c4e7b36285)

* fix(item): fixing broken patch item_barcode_childtable_migrate

(cherry picked from commit beca677276e0b5b143cd6d1d08efa8529663f60c)
2019-06-28 12:46:42 +05:30
Himanshu Warekar
5ebdf76669 Merge branch 'sla_fix' of https://github.com/hrwx/erpnext into sla_fix 2019-06-27 01:29:25 +05:30
Himanshu Warekar
24b9d1e5a6 fix: patch fixes 2019-06-27 01:29:00 +05:30
Himanshu
9323c3ae29
Merge branch 'develop' into sla_fix 2019-06-26 12:54:08 +05:30
Deepesh Garg
ea0574679f fix: Removed submitted status from Quotation (#18055)
* fix: Change in list view and status updater

* fix: Change status in doctype

* fix: Patch for submitted status
2019-06-26 11:05:51 +05:30
Himanshu Warekar
99d46844d5 fix: minor patch fix 2019-06-25 16:25:51 +05:30
Himanshu Warekar
54ece39aef fix: review changes 2019-06-24 15:18:56 +05:30
Himanshu Warekar
bbe84ac0ef feat: change apply_to to entity 2019-06-20 10:53:34 +05:30
Himanshu Warekar
41bf0c6855 feat: filter sla based on customer in issue 2019-06-20 10:00:11 +05:30
Himanshu Warekar
36d6e570c4 patch: try catch to handle TableMissingError 2019-06-19 14:43:21 +05:30
Mangesh-Khairnar
439313e524 Merge branch 'develop' of https://github.com/frappe/erpnext into leave-management 2019-06-19 13:10:53 +05:30
Mangesh-Khairnar
12a2b21465 fix: track status for pending leaves 2019-06-19 13:00:52 +05:30
Himanshu Warekar
f4f7e781c5 debug: travis 2019-06-19 12:01:59 +05:30
Himanshu Warekar
e48ca44bf5 patch: fix typo 2019-06-18 20:02:00 +05:30
Himanshu Warekar
7881e838c6 patch: refactor patch for travis test 2019-06-18 19:35:50 +05:30
Himanshu Warekar
befd393dcb fix: patch 2019-06-18 12:51:12 +05:30