Commit Graph

21968 Commits

Author SHA1 Message Date
Deepesh Garg
61363d2ced fix: Initialize interest_paid as zero 2020-04-30 22:22:44 +05:30
Deepesh Garg
4226191ec7 fix: Loan Closure without loan interest accrual 2020-04-30 22:11:57 +05:30
Marica
66e99d5767
Merge branch 'develop' into razorpay-subscription 2020-04-30 20:07:05 +05:30
Rucha Mahabal
f65fb1fcf8
fix: Move Video Doctype from Education module to Core (#21234)
* fix: move Video Doctype from Education module to Core

* fix: patch to retain Permissions

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2020-04-30 19:47:18 +05:30
Saqib
4422ffdb22
chore: asset accounts should have company currency (#21524) 2020-04-30 18:39:13 +05:30
Raffael Meyer
3484a79ccf
Update datev_settings.json (#21482) 2020-04-30 16:27:11 +05:30
Michelle Alva
95b186268c
fix: only check for payment_account on bank entry (#21445)
* fix: only check for payment_account on bank entry

Since all the fields (company, start and end date are mandatory before form submission, there is no need to check for them again after submission.

* fix: cur_frm to frm

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-30 16:24:51 +05:30
Saqib
a8779872ee
feat: force cost center renaming from cost center form (#21503) 2020-04-30 11:28:43 +05:30
Saqib
090e6093f2
fix: list index out of range error (#21467)
* fix: list index out of range error

* fix: condititon
2020-04-30 11:04:44 +05:30
Nabin Hait
b8d633cb4a
fix: Desk links for Income Tax Slab and Employee Other Income (#21510) 2020-04-30 11:03:49 +05:30
Nabin Hait
62394d7762
fix: Tax calcualtion based on slab (#21496)
Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
2020-04-30 11:02:53 +05:30
Nabin Hait
691f69c731
fix: Consider any kind of exemptions only if tax exemptions are allowed on tax slab (#21474) 2020-04-30 11:02:28 +05:30
Saqib
078c95c438
fix: print heading field shown in gst section for india region (#21499) 2020-04-30 10:57:38 +05:30
Deepesh Garg
2a9c5badc6
feat: Immutable ledger (#18740)
* fix: Reverse GL entry on cancellation of document

* fix: Removed set posting time field for multiple docs

* fix: Stop future reposting and reverse entry for purchase receipt and delivery note

* fix: Change is_cancelled field from select to check

* Revert "fix: Removed set posting time field for multiple docs"

This reverts commit 81fb808db7da69ab1e58ba226c0cd0b77e5b90c8.

* fix: Multiple fixes in GL Entry

* fix: Remove future reporting from doctypes

* fix: Canceled entry filters in Stock Ledger and General Ledger Report

* fix: Remove print statement

* fix: Validation for back dated entries

* fix: Codacy fixes

* fix: Add ignore links to multiple doctypes

* fix: Codacy Fixes

* fix: Ignore GL Entry and Stock Ledger entry while cancel

* fix: Test case fixes

* fix: Patch

* fix: Codacy

* fix: Budget Test Cases

* fix: Patch

* fix: Patch

* fix: Multiple test cases

* fix: changes in make_reverse_entry function

* fix: Update patch

* fix: Test Cases

* fix: Test Case fixes

* fix: Move patch upward in patches.txt

* fix: Budget Test Cases

* fix: Test Case and codacy

* fix: Patch

* fix: Minor label and UX fixes

* fix: Move freezing date check

* fix: Test Cases

* fix: Test cases

* fix: Test Cases

* fix: Test Case

* fix: Remove update_gl_entries_after function

* fix: Remove update_gl_entries_after function

* fix: Test Cases

* fix: Fiscal Year wise backdated entry

* fix: Update entries only for current SLE

* fix: Remove is_cancelled

* fix: Test Cases

* fix: Test cases

* fix: Test Cases

* fix: Uncomment account and stock balance sync logic

* fix: Stock balance and Account balance out of sync fixes

* fix: Test Cases

* fix: Test cases for POS, Stock Reco and Purchase Receipt

* fix: Stock Reco tests

* fix: Test stock reco precision

* fix: Test stock reco for fifo precision

* fix: Test stock reco for fifo precision

* fix: Stock Entry test case

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-30 10:38:58 +05:30
rohitwaghchaure
c9a6f37199
Merge pull request #21471 from Alchez/dev-update-lead-contact
fix: update lead if contact details are changed (develop)
2020-04-30 03:15:44 +05:30
Deepesh Garg
fb992159b5
Merge pull request #21512 from deepeshgarg007/get_period_api
fix: get_period_list API change fixes
2020-04-29 22:20:06 +05:30
Deepesh Garg
8113294d6e fix: Remove print 2020-04-29 22:16:47 +05:30
Deepesh Garg
0a6450115f fix: get_period_list API change fixes 2020-04-29 22:14:45 +05:30
rohitwaghchaure
38f7cb487a
Merge pull request #21508 from ruchamahabal/fix-healthcare
fix: Healthcare Fixes
2020-04-29 22:13:55 +05:30
Rucha Mahabal
298c7e5be5 fix: exercise type 2020-04-29 19:23:16 +05:30
Rucha Mahabal
b4b3872ff2 feat: add create Sales Invoice option from Therapy Session 2020-04-29 17:34:36 +05:30
Rucha Mahabal
706f6b0030 fix: mark form as dirty when editing or deleting exercise card 2020-04-29 14:19:27 +05:30
Rucha Mahabal
7a0f425674 feat: create medical record for therapy sessions 2020-04-29 13:47:14 +05:30
Deepesh Garg
91e94587b6 fix: Autoname for loan security 2020-04-29 13:43:26 +05:30
Rohan Bansal
7835bf91e4 fix: AttributeError 2020-04-29 13:10:53 +05:30
Rucha Mahabal
708bceba6e fix: change Patient Medical Record subject fieldtype to Text Editor 2020-04-29 13:06:52 +05:30
Deepesh Garg
0d8f66dafa
Merge pull request #21493 from deepeshgarg007/item_wise_sale_purchase
fix: Group by filter fix in item wise sales and purchase register
2020-04-29 12:36:08 +05:30
Deepesh Garg
3d8dadaab6 fix: Group by filter fix in item wise sales and purchase register 2020-04-29 12:05:56 +05:30
Anurag Mishra
33793d4e0d
fix: Permission issue Employee Tax exemption (#21490) 2020-04-29 11:48:41 +05:30
Shivam Mishra
357d11adbe
Merge branch 'develop' into razorpay-subscription 2020-04-29 11:17:44 +05:30
Rucha Mahabal
9bf733d82e fix: reload procedure doc on completion 2020-04-29 11:16:34 +05:30
Deepesh Garg
e006a76f8d
Merge pull request #21486 from rohitwaghchaure/not-able-to-make-payment-request-against-fees
fix: payment request not able to make against fees
2020-04-29 09:36:37 +05:30
rohitwaghchaure
e8ca145ec1
Merge pull request #21483 from alyf-de/bank_account_dashboards
feat: add Bank Account to dashboards
2020-04-29 05:06:30 +05:30
rohitwaghchaure
20fa73ff9c
Merge pull request #21388 from marination/stock-entry-form-cleanup
chore: Stock Entry Form Cleanup
2020-04-29 03:13:12 +05:30
Rohit Waghchaure
50b4106d1d fix: payment request not able to make against fees 2020-04-29 02:27:47 +05:30
Raffael Meyer
49bb8ccd2e feat: add Bank Account to dashboards 2020-04-28 18:56:47 +02:00
marination
6c871d6bcf fix: Removed Finished Product and Finished Qty columns from Stock Ledger Report 2020-04-28 21:28:53 +05:30
Deepesh Garg
2b73dbeae0
Merge pull request #21476 from deepeshgarg007/duplicate_code
fix: Remove duplicate code from accounting dimension
2020-04-28 20:25:31 +05:30
Deepesh Garg
8705df6283 fix: Remove duplicate code from accounting dimension 2020-04-28 20:19:26 +05:30
Shivam Mishra
525138c42a
Merge branch 'develop' into razorpay-subscription 2020-04-28 19:06:02 +05:30
Rohan Bansal
76825ab2bd fix: update lead if contact details are changed 2020-04-28 16:13:53 +05:30
Shivam Mishra
d445ffc458 feat: whitelist api 2020-04-28 16:04:31 +05:30
Shivam Mishra
7b836e9a92 refactor: update susbcription values all the time 2020-04-28 15:43:04 +05:30
Deepesh Garg
dcef7a96ef
Merge pull request #21463 from deepeshgarg007/allow_loan_security_rename
fix: Allow rename for Loan Security
2020-04-28 14:31:56 +05:30
Deepesh Garg
7b14721e2f fix: Allow rename for Loan Security 2020-04-28 14:25:36 +05:30
Deepesh Garg
428978762b
Merge pull request #21461 from deepeshgarg007/consolidate_statement_fix
fix: Report summary fix in consolidated financial statement for report type Profit and Loss
2020-04-28 13:30:12 +05:30
Deepesh Garg
fa2eecc5fc fix: Report summary fix in consolidated financial statement for report type Profit and Loss 2020-04-28 13:12:22 +05:30
rohitwaghchaure
28a4880b48
fix: added validation to not allow to select expired batch (#21455) 2020-04-28 13:01:43 +05:30
Marica
299e217668
fix: Blanket Order in SO/PO child tables (#21442) 2020-04-28 13:00:04 +05:30
rohitwaghchaure
daf37e7570
fix: better validation message for the expense claim and set default cost center in the expenses table (#21454) 2020-04-28 12:48:22 +05:30