Nabin Hait
504a5f3a3a
fix: reload income_tax_slab_other_charges in patch ( #21447 )
...
* fix: reload income_tax_slab_other_charges in patch
* fix: reload lower_deduction_certificate in patch
2020-04-28 11:16:04 +05:30
Rucha Mahabal
7bbe3dd8a0
fix: Patch for updating Appointment Reminder method in Scheduled Job Type ( #21431 )
2020-04-27 10:51:46 +05:30
rohitwaghchaure
4d754eadc8
Merge branch 'develop' into quo-status-fix
2020-04-27 00:22:43 +05:30
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
Rucha Mahabal
11121f4905
fix: patch for Healthcare Refactoring
2020-04-15 11:53:39 +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
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
