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

21423 Commits

Author SHA1 Message Date
Raffael Meyer
f669f30c08 add missing equity accounts 2020-03-06 16:17:06 +01:00
Raffael Meyer
7b7513ab2b adjust groups 2020-03-06 12:32:49 +01:00
Saqib
b978d79573
fix: show uom in print formats instead of stock uom (#20843) 
Co-authored-by: Saqib Ansari <saqibansari@Saqibs-MacBook-Pro.local>
 2020-03-06 11:03:46 +05:30
Marica
fc96c1a2d6
fix: update_child_qty_rate() missing argument (#20838) 2020-03-06 10:57:59 +05:30
Shivam Mishra
0310366d5a fix (cleanup): remove incomplete dependencies data 2020-03-05 11:28:40 +05:30
Chinmay D. Pai
612e58dca8
fix: use ERPNext in welcome email when default company is not set 
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
 2020-03-05 10:08:43 +05:30
Deepesh Garg
6dc335d898
Merge pull request #20824 from scmmishra/report-options 
feat: update profit and loss for new report summary API
 2020-03-04 16:07:31 +05:30
Deepesh Garg
a75cf35bb7
Merge pull request #20755 from lokesh-indictrans/develop 
fix: user is not able to do 'Set as Lost' for Quotation (#20603)
 2020-03-04 11:56:52 +05:30
Deepesh Garg
6d604a151b
fix: Validation message 2020-03-04 11:55:10 +05:30
Deepesh Garg
a245a3a47f fix: HSN code no visible in GST itemised sales register 2020-03-04 10:23:49 +05:30
Lokesh Waingankar
d398c73bc5 fix: Removed html tags in pop up message (#20603) 2020-03-03 19:07:51 +05:30
Lokesh Waingankar
6795422204 Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2020-03-03 12:12:56 +05:30
Shivam Mishra
1f151c1032 refactor: update restrict to domain data 2020-03-02 19:37:12 +05:30
Anurag Mishra
cf04b3c680
fix: added standard filters (#20807) 2020-03-02 19:25:01 +05:30
Deepesh Garg
12aa35aa43
fix: Label and UX fixes in AP/AP reports (#20803) 2020-03-02 19:10:29 +05:30
Priyanka Gangar
ca05c83796
fix: fetch sales person name (#20805) 
* fix: fetch sales person name

* Update sales_person.js

Co-authored-by: pinka0925 <44537026+pinka0925@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-03-02 19:06:06 +05:30
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
Lokesh Waingankar
38242bc21f Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2020-03-02 17:45:59 +05:30
Shivam Mishra
3f59af3ef1 feat: added base config for domains 2020-03-02 17:25:18 +05:30
Shivam Mishra
8a8e8d6c5c feat: added base pages for desk 2020-03-02 16:56:31 +05:30
Frappe PR Bot
eb2f79b16e
feat: Updated translation (#20784) 2020-03-02 16:52:42 +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
e9ac3e0d64
feat: link serial no to batch no (#20778) 
* feat: link serial no to batch no

* fix: test cases
 2020-03-02 15:02:58 +05:30
Saqib
7b8c3dee3d
fix: reconciled entries showing in bank reco (#20787) 2020-03-02 15:01:06 +05:30
Deepesh Garg
09188e4a21 fix: Remove fetch from loan_application.json 2020-03-01 22:16:27 +05:30
Deepesh Garg
0c7b60aa99
Merge pull request #20768 from marination/buying-dashboard 
chore: Rearranged Buying Module Dashboard
 2020-02-29 17:33:51 +05:30
radhikag
86ecaa59ca fix : Student Admission accepting end date less than start date. #20625 2020-02-29 12:47:03 +05:30
Deepesh Garg
2090d113e5
Merge pull request #20781 from deepeshgarg007/loan_shortfall_enhance 
fix: Add loan to value ratio in loan security type
 2020-02-29 09:01:27 +05:30
Deepesh Garg
eee7f77d47 fix: Add loan to value ratio in loan security type 2020-02-29 08:58:15 +05:30
marination
24f4683999 chore: Rearranged Buying Module Dashboard 2020-02-28 12:58:41 +05:30
Deepesh Garg
5707c9a731
fix: Item Wise report query fix (#20760) 2020-02-28 12:28:54 +05:30
Karthikeyan S
0db423ed5f
fix(auto attendance): bug in marking absent (#20759) 
This bug was introduces in the commit bd6e8b9cec

i.e. The mark_absent function was renamed to mark_attendance, but there is a miss match in the order of the parameters.
 2020-02-28 12:27:21 +05:30
Saqib
8cf841ce60
fix: wrong calculation of depreciation eliminated for a period (#20502) 2020-02-27 19:09:34 +05:30
Lokesh Waingankar
b252f5851d Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2020-02-27 19:09:14 +05:30
Lokesh Waingankar
efb6482ef6 fix: user is not able to do 'Set as Lost' for Quotation (#20689) 2020-02-27 19:08:58 +05:30
Shivam Mishra
d20e36f3fd
feat: ignore permission when deleting linked emails (#20751) 
* feat: ignore permission when deleting linked emails

* fix: uncommented important snippet
 2020-02-27 19:07:58 +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
Anurag Mishra
d42a4a6234
fix: deductions calculation based on gross pay (#20727) 
* fix: deductions calculation based on gross pay

* test: salary structure deduction based on gross pay

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-02-27 18:31:18 +05:30
rohitwaghchaure
b5a670cdb9
fix: serial no material transfer performance issue (#20747) 2020-02-27 18:18:10 +05:30
Deepesh Garg
d8d453d7d4
Merge pull request #20748 from deepeshgarg007/bank_reco_jv 
fix: Journal Entry not being fetched in Bank Reconciliation
 2020-02-27 16:18:27 +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
Lokesh Waingankar
2866617c82
fix: 'Last Purchase Rate' taking wrong on BOM (#20689) 
* fix: 'Last Purchase Rate' taking wrong on BOM. #20228

* fix: Added condition for None purchase order and purchase receipt (#20689)

* fix: fetch last purchase rate

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-02-27 13:21:14 +05:30
Saqib
dd374ff77b
fix: only update items if rate or qty changed (#20742) 2020-02-27 12:51:31 +05:30
Rohan
d40a5d92c2
fix: sort Issues chronologically (#20741) 2020-02-26 18:54:14 +05:30
Marica
62ba320f5b
fix: Lock stock ledger entries that are being reposted. (#20737) 
- If stock ledger entries are being reposted, don't let any other transaction apply itself on the same.
 2020-02-26 18:51:13 +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
Deepesh Garg
c88a7f8317 fix: User permission for Loan repayment doctype 2020-02-26 16:49:58 +05:30
Anurag Mishra
773e7debb9
fix: validated leave allocation (#20636) 
* fix: validated leave allocation

* fix: changes requested

* Update erpnext/hr/doctype/leave_encashment/leave_encashment.py

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

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-02-26 14:50:57 +05:30
Deepesh Garg
9f4b46050f
Merge pull request #20732 from deepeshgarg007/loan_security_pledge_api 
fix: API fix for loan security pledge creation
 2020-02-26 12:59:13 +05:30
Deepesh Garg
b5c5bdd671 fix: API fix for loan security pledge creation 2020-02-26 12:57:05 +05:30
rohitwaghchaure
aa3ba41e83
fix: same free item not working for pricing rule (#20712) 2020-02-26 12:51:46 +05:30
abhijitkumbharInd
ba8840727a
Create a new item on Material Request showing error Item None not found. #20608 (#20731) 2020-02-26 12:48:36 +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
abhijitkumbharInd
12bc43e495
fix: Education | Quiz accepting duplicate question #20622 (#20708) 2020-02-26 12:04:41 +05:30
sharmatripti
08fa7590ef
fix: Employee field should be filtered based on department on doctype Instructor (#20705) 
* Fix: Filtered Employee based on Department on Instructor doctype (#20598)

* Fix: Syntax error (#20598)

* Fix: Syntax error (#20598)

* Fix: Syntax error (#20598)

* Fix: Syntax error (#20598)

* fix :  Filtered Employee based on Department on Instructor doctype (#20704)
 2020-02-26 12:02:37 +05:30
RJPvT
10aab65338
fix: smaller then instead of bigger then :-( dumb mistake vdevelop #20693 (#20702) 2020-02-26 11:59:10 +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
rohitwaghchaure
7229f694ea
fix: rate and amount in material request copying from sales order (#20717) 2020-02-26 11:28:08 +05:30
Mangesh-Khairnar
99d89d6cb8
fix(HR): show correct closing leave balance (#20723) 2020-02-26 11:26:07 +05:30
rohitwaghchaure
1e6788b028
fix: reorder material request not created if doctype has custom mandatory field (#20719) 2020-02-26 11:25:34 +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
7f2ad5dd82
Merge pull request #20714 from rohitwaghchaure/account_dashboard_not_working_issue 
fix: account dashboard not working
 2020-02-26 10:18:03 +05:30
Andy Zhu
75d9d79fac
fix: missing assign item's expense_account 
As in dict object "ret", missing assign item's expense_account will cause it then fetches the default stock_adjustment_account in 'Company'.
 2020-02-26 10:49:48 +13:00
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
Rohit Waghchaure
ebdf80ddb5 fix: account dashboard not working 2020-02-24 18:45:47 +05:30
Deepesh Garg
735ec98b61
Merge pull request #20623 from jprashant09/develop 
fix: Future date of birth accepted at Sibling Detail section in Studen…
 2020-02-24 18:30:27 +05:30
Deepesh Garg
aaea4e60b6
fix: Validation condition 2020-02-23 20:59:05 +05:30
Deepesh Garg
dee42de0fd
Merge pull request #20596 from PratikM34/develop 
fix: restricted duplicate topics on Course doctype (#20594)
 2020-02-23 20:56:43 +05:30
Deepesh Garg
cd416bbaa6
Merge pull request #20617 from jsukrut/develop 
fix: restricted duplicate courses on Program Enrollment doctype (#20611)
 2020-02-23 20:51:08 +05:30
Himanshu
83acff9680
Merge branch 'develop' into opportunity-fix 2020-02-21 19:47:41 +05:30
Deepesh Garg
6e53afd947
fix: Travis (#20688) 
* fix: Travis

* fix: Update test records

Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
 2020-02-20 23:33:35 +05:30
prssanna
3218730a16 fix: set query on change in opportunity_from value 2020-02-20 16:14:44 +05:30
Mangesh-Khairnar
1db8ea317d
Merge pull request #20687 from Anurag810/additional_salary_fixes_v13 
fix: Additional salary can be created only for active employee
 2020-02-20 16:07:35 +05:30
Anurag Mishra
3f0c01199d fix: Additional salary can be created only for active employee 2020-02-20 15:40:37 +05:30
Rohan
a29c87cfda
feat: remove unused route creation variable (#20558) 2020-02-20 13:28:03 +05:30
Mangesh-Khairnar
5d5f5b4f8e
fix(HR): skip earned leaves check for max leaves set to zero or less (#20535) 
* fix: skip earned leaves check for max leaves set to zero or less

* test: earned leaves creation
 2020-02-20 13:25:55 +05:30
Deepesh Garg
a871d30a7d
Merge pull request #20607 from khushalti/develop 
fix: validation on max group strength student group form
 2020-02-20 13:23:04 +05:30
Deepesh Garg
a0021969ad
fix: Validation message 2020-02-20 13:22:28 +05:30
Deepesh Garg
2c1da897c5
Merge pull request #20450 from Anurag810/fleet-management 
fix: odometer value was not syncing properly
 2020-02-20 13:19:54 +05:30
Rohan
395b2b15b2
fix: apply url encoding to project names (#20642) 2020-02-20 12:59:32 +05:30
Mangesh-Khairnar
6f6e3a940b
fix: return null for attribute (#20674) 2020-02-20 12:58:54 +05:30
Rucha Mahabal
6071313965
fix: document creation via onboarding slide (#20644) 
* fix: defaults not set in doc created via Onboarding Slide

* fix: default company not set in Supplier
 2020-02-20 12:57:21 +05:30
Anurag Mishra
51cf0eb159
fix: changed field type which was affecting filters (#20671) 2020-02-20 12:52:56 +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
Mangesh-Khairnar
2d7e024f00
fix: use system language to translate strings (#20673) 2020-02-20 12:24:29 +05:30
Saqib
56837bc09d
fix: check for available stock in product bundle's website warehouse (#20681) 2020-02-20 12:23:08 +05:30
Deepesh Garg
cc56b690eb
Merge pull request #20582 from alyf-de/fix_datev 
fix(regional): update DATEV Export to DATEV-Format v7.0
 2020-02-19 19:36:45 +05:30
Deepesh Garg
6870161292
Merge pull request #20669 from Alchez/dev-priority-issue 
fix: show priority in Issue list view
 2020-02-19 19:28:23 +05:30
Deepesh Garg
23aa5c6332
Merge pull request #20643 from abhijitkumbharInd/develop 
fix: HSN/SAC Error while creating a new item and not selecting the fi…
 2020-02-19 19:23:10 +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
40546d8af9
Merge pull request #20663 from marination/stock-settings-query 
fix: Set Query on warehouse fields in Stock Settings
 2020-02-19 18:57:24 +05:30
Anurag Mishra
1a11cb5a07 test: syncing of odometer value 2020-02-19 16:46:00 +05:30
Rohan Bansal
e5b59c781f fix: show priority in Issue list view 2020-02-19 13:13:24 +05:30
marination
120f75026f fix: Server side validation for Warehouses 2020-02-19 11:17:58 +05:30
Deepesh Garg
5632712d00
Merge pull request #20634 from scmmishra/tree-fix-qms-dev 
fix: filters for quality_procedure tree
 2020-02-19 09:41:18 +05:30