Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
30,151 Commits 3 Branches 0 Tags 1 GiB
1663f66e6d
Commit Graph

3680 Commits

Author SHA1 Message Date
Deepesh Garg
cd96be9993
fix: Excel support and UX fixes for chart of accounts importer (#20703) 
* fix: Excel support and UX fixes for chart of accounts importer

* fix: Linting Errors

* fix: Blank chart preview

* fix: Added template types for download

* fix: Description on template selection

* fix: Linting fixes

* fix: Move logic for download template to dialog
 2020-03-02 18:57:21 +05:30
Deepesh Garg
cc2771baa7
fix: Total amount not displayed in Journal Entry (#20794) 
* fix: Total amount not displayed in Journal Entry

* fix: Update paid_to_received field

* fix: set total amount

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-03-02 18:09:19 +05:30
Saurabh
19df2ffbd8
[bug][fix]: set status to object instead of variable (#20790) 2020-03-02 17:50:05 +05:30
Marica
ed25ec7ee5
chore: Item Price and Product Bundle Form cleanup (#20772) 
* chore: Item Price and Product Bundle Form cleanup

* fix: Trailing comma
 2020-03-02 15:51:14 +05:30
Saqib
ff52d16fb3
chore: control reposting of future gl entries with flags (#20774) 2020-03-02 15:19:18 +05:30
Saqib
7b8c3dee3d
fix: reconciled entries showing in bank reco (#20787) 2020-03-02 15:01:06 +05:30
Saqib
fb35a54bee
perf: improve gl entry submission (#20676) 
* perf: improve gl entry submission

* perf: add indexes

* fix: replace **kwargs with *args

* fix: syntax error

* fix: remove cypress

* fix: travis

* chore: remove purchase invoice from status updater

* fix: set_staus args

Co-Authored-By: Nabin Hait <nabinhait@gmail.com>

* fix: only update status for invoices & fees

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-02-27 18:32:19 +05:30
Deepesh Garg
f444f451ac fix: Remove debug statement 2020-02-27 16:04:01 +05:30
Deepesh Garg
50b3472eba fix: Journal Entry not being fetched in Bank Reconciliation 2020-02-27 16:01:47 +05:30
Deepesh Garg
fe18b92b61
fix: Mandatory bank account error fix (#20733) 
* fix: Mandatory bank account error fix

* fix: SQL condition
 2020-02-26 17:17:02 +05:30
rohitwaghchaure
aa3ba41e83
fix: same free item not working for pricing rule (#20712) 2020-02-26 12:51:46 +05:30
Deepesh Garg
5a2f22258a
Merge pull request #20592 from byugandhara/develop 
fix: Changes done to get valid customer and employee list on payment entry form(#20498)
 2020-02-26 12:17:47 +05:30
Saqib
3957ac1408
perf: search for customer's return invoices then filter out gl_entries (#20709) 
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-02-26 11:36:55 +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
0ebace5da2
fix: Update paid amount for pos return (#20543) 
* fix: Paid amount updation for pos return

* fix: Remove console

* fix: Styling

* fix: get  default mode of payment from POS profile

* fix: Add test cases

* fix: Codacy
 2020-02-25 13:21:16 +05:30
Saqib
ca7f53b4ea
chore: SINV set_status remove redundant function calls (#20660) 
* chore: SINV set_status remove redundant function calls

* Update erpnext/accounts/doctype/sales_invoice/sales_invoice.py

Co-Authored-By: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2020-02-20 12:32:05 +05:30
Saqib
cfe2db6d77
fix: mandatory on hold comment for purchase invoice (#20666) 2020-02-20 12:29:44 +05:30
Deepesh Garg
ad246a4415
Merge pull request #19856 from alyf-de/skr03_gnucash 
feat(accounts): add german CoA "SKR03" (GnuCash)
 2020-02-19 19:21:51 +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
547a0bb909 fix: attempt at pymysql InternalError 1054 about clearance_date in field list when removing payments from bank transactions 2020-02-18 17:49:57 +05:30
racitup
719678957a fix: Bank Reconciliation Bank Account and Bank Account No field names 2020-02-18 17:49:45 +05:30
racitup
1548e20b78 fix: KeyError about bank_account_no due to non-existent field: #20343 2020-02-18 17:49:08 +05:30
racitup
7cda218af3 fix: pymysql.err.InternalError about t2.bank_account_no due to removal of field from Journal Entry Account table: #20343 2020-02-18 17:48:54 +05:30
rohitwaghchaure
0abc181360
Merge pull request #20638 from nextchamp-saqib/pos-mode-of-pay-fix 
fix: disabled mode of payments fetches in sales invoices
 2020-02-18 12:38:06 +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
thefalconx33
23e728612f fix: disabled mode of payments fetches in sales invoices 2020-02-17 14:15:20 +05:30
Yugandhara
ad645afeb2 fix: Changes done to get valid customer and employee list on payment entry form 2020-02-15 10:56:41 +05:30
Raffael Meyer
0fac1f9429 Add groups for account types "Bank" and "Cash" 2020-02-12 13:59:48 +01:00
Raffael Meyer
cad404c355 Merge branch 'develop' into skr03_gnucash 2020-02-12 13:58:53 +01:00
Deepesh Garg
c688f9f584
Merge pull request #20559 from rohitwaghchaure/added_indexing_on_columns_to_fix_performance_issue_develop 
fix: added indexing on columns to fix performace issue
 2020-02-11 10:12:49 +05:30
Rohit Waghchaure
50886f02c3 fix: added indexing on columns to fix performace issue 2020-02-10 15:56:56 +05:30
rohitwaghchaure
7d2c8cffb0
fix: pricing rule not working on item groups (#20547) 
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
 2020-02-09 21:23:53 +05:30
Pranav Nachnekar
6c14a08631
fix: disallow quick entry for doctypes with tree view (#20452) 2020-02-03 17:05:26 +05:30
Deepesh Garg
9e1fbaf59e
fix: Label and UX fixes while creating payment entry against customer (#20465) 
* fix: Label and UX fixes while creating payment entry against customer

* fix: filter
 2020-02-03 15:58:50 +05:30
Saqib
4fca6cae34
feat: add tax category in pos profile (#20413) 
* feat: add tax category in pos profile

* fix: review fixes
 2020-02-03 15:53:27 +05:30
Deepesh Garg
cce3ac9f79 fix: Move E-Way bill button under create 2020-02-02 21:25:58 +05:30
Faris Ansari
8e131c7cad
fix: Remove translated strings from test 2020-01-30 13:03:05 +05:30
Raffael Meyer
e21cd5e7f1 fix: account number for "Kasse" 2020-01-29 23:39:55 +01:00
Raffael Meyer
3716434218 fix: add missing account types 2020-01-29 22:21:19 +01:00
Suraj Shetty
da2c69e836 fix(translations): Incorrect syntax 2020-01-29 15:34:06 +05:30
Suraj Shetty
2f67647f7b Merge branch 'develop' of https://github.com/frappe/erpnext into fix-incorrect-translations 2020-01-29 15:06:50 +05:30
Suraj Shetty
48e9bc3fc9 fix: Incorrect translation syntax 2020-01-29 15:06:18 +05:30
Pranav Nachnekar
3fb48ebf61 fix: discounting not applied on sales invoice created by subscriptions (#20431) 2020-01-28 12:52:13 +05:30
Marica
4e7625bd8f fix: Column 'project' in where clause is ambiguous (#20438) 
* fix: Column 'project' in where clause is ambiguous

* fix: Fixed alias in query
 2020-01-28 12:43:38 +05:30
Saqib
9cb02bf2e1 fix: incorrect status for fraction of outstanding amount (#20369) 2020-01-27 14:22:43 +05:30
Rohit Waghchaure
8996b7d8a4 delete the auto created batch 2020-01-23 17:44:19 +05:30
Rohit Waghchaure
4f4dbf1996 fix: unlink references from batch on cacnellation of stock transactions 2020-01-23 12:45:45 +05:30
rohitwaghchaure
5056c8bcb4 fix: not able to import chart of account if parent account is missing (#20368) 2020-01-21 15:32:26 +05:30
Saqib
eea0ffcb38 fix: account not added to child company (#20361) 2020-01-21 15:25:51 +05:30