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

22146 Commits

Author SHA1 Message Date
rohitwaghchaure
9de26f6648
fix: list index out of range (#21613) 2020-05-07 12:06:47 +05:30
Shivam Mishra
41616d4dd8 feat: add name to fixture 2020-05-06 20:21:05 +05:30
Deepesh Garg
9513171d3f
Merge pull request #21624 from deepeshgarg007/reversse_gl_fix 
fix(minor): Reverse GL fix
 2020-05-06 18:19:19 +05:30
Deepesh Garg
b821f22b7c fix(minor): Reverse GL fix 2020-05-06 18:12:23 +05:30
Prssanna Desai
d50502ca40
fix: fix get_employee_details query (#21623) 2020-05-06 17:36:48 +05:30
Anurag Mishra
2596c8bbe7
fix: upload attendance (#21620) 2020-05-06 17:06:53 +05:30
Shivam Mishra
8cdcb965c5 feat: added dashboard fixtures for health care 2020-05-06 15:19:22 +05:30
Shivam Mishra
28436d2bc1 feat: added dashboard fixtures for accounts 2020-05-06 15:19:10 +05:30
Shivam Mishra
b2103f5470 feat: remove old fixtures 2020-05-06 15:18:43 +05:30
Deepesh Garg
88e6f72cad
Merge branch 'develop' into sales-report-total-row 2020-05-06 10:48:21 +05:30
Deepesh Garg
3e0c51879e
fix: Set Purchase Receipt and Delivery Note detail patch (#21607) 
* fix: Set Purchase Receipt and Delievry Note detail patch

* fix: Reload purchase receipt item
 2020-05-06 10:46:13 +05:30
Anupam K
d078883cd4 fixing callback urls 2020-05-06 01:13:51 +05:30
Nabin Hait
a4567a446f fix: Test for payroll entry 2020-05-05 18:36:12 +05:30
Nabin Hait
07fe4e1933
Update add_default_dashboards.py 2020-05-05 18:27:13 +05:30
Deepesh Garg
0ff0522500
Merge pull request #21605 from deepeshgarg007/loan_security_unpledge_fixes 
fix: Loan security unpledge fixes
 2020-05-05 17:04:22 +05:30
Deepesh Garg
af27c5142f fix: Loan securiyt unpledge fixes 2020-05-05 16:54:48 +05:30
Rohit Waghchaure
6e95d248e3 fix: work order operation completed qty 2020-05-05 16:35:45 +05:30
rohitwaghchaure
54a6c64b0f
fix: against voucher no not all records showing in case of Group By Voucher (consolidated) (#21592) 2020-05-05 16:17:15 +05:30
Saqib
d76f167e96
fix: handle make_gl_entry in case of cwip enable after puchasing (#21529) 
* fix: handle make_gl_entry in case of cwip enable after puchasing

* fix: invalid variable assignment

* fix: make gl entries if cwip has been booked even if cwip is disabled
* add tests

* fix: conditions

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-05-05 16:14:45 +05:30
Saqib
fff00cee3a
chore: fix error message (#21593) 
* chore: fix error message

* chore: add row idx
 2020-05-05 16:14:17 +05:30
Saqib
d46696fa03
fix: cannot make payment entry against shareholder (#21597) 2020-05-05 16:10:47 +05:30
Anurag Mishra
ddcc4fa9b9
Feat: Monthly attendance sheet Enhancements and UI/UX Improvements (#21331) 
* refactor: Employee attendance sheet redesign

* feat: Added weekly off status in monthly Attendance sheet

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-05-05 16:08:05 +05:30
Rucha Mahabal
98229db3ae
feat: Default Dashboard for Healthcare Workspace (#21414) 
* feat: Default Dashboard for Healthcare Workspace

* fix: patch

* Update add_healthcare_dashboard.py

* fix: failing patch test

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2020-05-05 16:02:16 +05:30
Nabin Hait
672b74d89c fix: Patch and tests 2020-05-05 15:58:52 +05:30
Nabin Hait
5a1a765ebf
Update test_leave_encashment.py 2020-05-05 15:37:17 +05:30
Nabin Hait
9be11455a5
Merge branch 'develop' into refactor-addiional-salary 2020-05-05 14:43:07 +05:30
Marica
5e3d8050aa
fix: Handle rows with same item code from Purchase Receipt to Invoice. (#20724) 
* fix: Handle rows with same item code from Purchase Receipt to Invoice.

* fix: Added patch, fixed tests, fixed delivery note behaviour

* chore: Added comments amd fixed typo

* fix: Added patch to patches.txt

* fix: Patch fix and simplification, json timestamp updation.

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-05-05 14:37:39 +05:30
rohitwaghchaure
5210761e57
fix: heatmap not working for customer and supplier (#21578) 
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-05-05 12:12:33 +05:30
Suraj Shetty
8e08698c15
test: Fix wrong test for search function (#21588) 2020-05-05 12:06:58 +05:30
Saqib Ansari
52cc6ad456 fix: test 2020-05-04 20:24:00 +05:30
sahil28297
232396494b
fix(patch): reload GSTR 3B report 2020-05-04 19:20:55 +05:30
Anurag Mishra
94719e7e81 fix: tests 2020-05-04 18:54:06 +05:30
Anurag Mishra
09572d9892 patch: to link additional salary with salary slip and leave encashment, incentive with additional salary 2020-05-04 17:07:15 +05:30
Anurag Mishra
e15f0da011 fix: conflicts 2020-05-04 13:56:07 +05:30
Anurag Mishra
57f49ae312
Merge branch 'develop' into refactor-addiional-salary 2020-05-04 13:55:17 +05:30
Deepesh Garg
781bf78ce5
Merge pull request #21580 from deepeshgarg007/due_date_loan 
fix: Use grace period in days for calculation of due date
 2020-05-04 13:49:20 +05:30
Deepesh Garg
2a0de58f3d fix: Use grace period in days for calculation of due date 2020-05-04 13:45:43 +05:30
Nabin Hait
312341555f
Merge branch 'develop' into refactor-addiional-salary 2020-05-04 12:42:20 +05:30
Anurag Mishra
f453a1c13f Fix: requested Changes 2020-05-04 12:36:01 +05:30
Faris Ansari
c6325c2f34
Merge pull request #21550 from frappe/new-translations 2020-05-04 12:28:29 +05:30
Andy Zhu
f7a0b8b5b6
fix: fieldname update for 'Credit' and 'Debit' (#21405) 
* fix: fieldname update for 'Credit' and 'Debit'

'credit' updated to 'credit_in_account_currency'
'debit' updated to 'debit_in_account_currency'

* Update journal_entry.py

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-05-04 12:09:28 +05:30
Mangesh-Khairnar
c4c7d15d54
fix: pre-process both the existing and new products (#21526) 
* fix: pre-process both the existing and new products

* fix: delete hub tracked item on unpublish

Co-authored-by: Marica <maricadsouza221197@gmail.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-05-04 11:25:06 +05:30
Deepesh Garg
095b5586a2
fix: Accounting Dimensions in Period Closing Voucher (#21564) 2020-05-04 11:12:14 +05:30
Rucha Mahabal
0243981f31
fix: handle exception if sending Appointment Confirmation message fails (#21569) 2020-05-04 11:08:44 +05:30
Deepesh Garg
c33c309da3
Merge pull request #21571 from surajshetty3416/fix-console 
refactor: Folio no validation
 2020-05-04 09:03:14 +05:30
Deepesh Garg
6df581f78b
Merge pull request #21375 from marination/commonify-warehouse-autofill 
chore: Commonify auto-filling warehouses in child tables
 2020-05-03 20:33:45 +05:30
Suraj Shetty
9a8512d01d fix: NameError due to invalid variable 2020-05-03 20:17:47 +05:30
Suraj Shetty
9fffe254fc refactor: Folio no validation 2020-05-03 19:10:02 +05:30
rohitwaghchaure
268df35d80
Merge pull request #21516 from marination/stock-balance-cleanup 
chore: Added company filter and minor cleanup in Stock Balance Report
 2020-05-03 16:31:34 +05:30
Saqib Ansari
ab9bb08c4b fix: test 2020-05-03 14:53:13 +05:30
Saqib
d84a55313a
chore: add validation for gross purchase amount (#21534) 
* chore: add validation for gross purchase amount

* fix: tests

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-05-03 13:20:24 +05:30
Suraj Shetty
a5f1fe5bba Merge branch 'develop' of https://github.com/frappe/erpnext into new-translations 2020-05-03 12:39:12 +05:30
Mangesh-Khairnar
2f7861a9b8
feat: Process deferred accounting entry (#19658) 
* feat: process deferred accounting

* feat: maintain entry for deferred accounting

* feat: add check for automatic deferred accounting entry

* feat: add build conditions for company and account

* fix: create record for automatic processing of deferred accounting

* feat: add custom naming series

* fix: change the deferred revenue creation via hooks

* fix: add client side  validations

* test: creation of gl entries on submission of process deferred accounting

* fix: add multiple validations

* patch(accounts-settings): set automatically process deferred accounting entry

* fix: On cancel function for deferred entry

* fix: Send email per process instead of per invoice

* fix: Test cases

* fix: Label

* fix: Process deferred accounting fixes

* fix: Error flag

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: deepeshgarg007 <deepeshgarg6@gmail.com>
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2020-05-02 20:09:33 +05:30
Saqib Ansari
826b39559d fix: review fixes 2020-05-02 19:50:45 +05:30
Saqib Ansari
971170c590 fix: incorrect total in sales analytics for customer/item group 2020-05-02 19:39:03 +05:30
Deepesh Garg
cea4eeaa53 fix: Reverse GL Entry on cancel fix 2020-05-02 18:05:33 +05:30
Marica
1c8cbd07b8
fix: variable referenced before assignment (#21560) 2020-05-02 17:55:15 +05:30
Nabin Hait
ddf90b29f2
Update salary_slip.py 2020-05-01 22:34:28 +05:30
Nabin Hait
a67fb31f67
Merge branch 'develop' into refactor-addiional-salary 2020-05-01 19:04:20 +05:30
Nabin Hait
fdacc50e78
Update salary_detail.json 2020-05-01 19:04:00 +05:30
Nabin Hait
a1ffc44f0c fix: removed unwanted comma from json 2020-05-01 18:55:57 +05:30
Deepesh Garg
f7966f444d
Merge pull request #21404 from abhishekbalam/develop 
feat(Accounts): Journal Entry Templates v1
 2020-05-01 18:42:54 +05:30
Deepesh Garg
978de8779c fix: Add multi currency check and proper account filters 2020-05-01 18:38:13 +05:30
Nabin Hait
da17f9cb05
feat: Run MRP at parent level in the production plan (#21545) 
* enhance: provision to make material request from other location

* fix: source warehouse for material transfer from production plan

Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
 2020-05-01 18:16:25 +05:30
Saqib
39805918d4
fix: accounts payable shows advance amount of other company (#21548) 2020-05-01 18:15:13 +05:30
Vishal Dhayagude
2e082affc7
fix(HR): Leave application company field made read-only and filter in Monthly attendance sheet (#20912) 
* fix(HR): Leave application company field made Readonly

* fix: in monthly report attandance employee filter based on company

* fix: minor typo

* fix: Fetch company from employee

* Update monthly_attendance_sheet.py

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-05-01 18:11:43 +05:30
Suraj Shetty
119f2f07a5
Merge branch 'develop' into new-translations 2020-05-01 17:59:58 +05:30
Deepesh Garg
0f8150f8de
Merge pull request #21546 from deepeshgarg007/loan_closure_fixes 
fix: Loan Closure without loan interest accrual
 2020-05-01 15:49:56 +05:30
Deepesh Garg
662838adb3
fix: Party Type filter in payment entry list view (#21541) 2020-05-01 15:00:55 +05:30
Deepesh Garg
db83c29079
Merge branch 'develop' into develop 2020-05-01 14:20:53 +05:30
Deepesh Garg
1b35873743
Merge branch 'develop' into loan_closure_fixes 2020-05-01 14:18:36 +05:30
Deepesh Garg
1a1b06cf59
Merge pull request #21539 from deepeshgarg007/trvis_child_table_validation_fix 
fix: Travis (develop)
 2020-05-01 14:17:46 +05:30
Deepesh Garg
032814b86a fix: Patch test 2020-05-01 13:26:26 +05:30
Deepesh Garg
998364d636
fix: Update timestamp 2020-05-01 12:04:13 +05:30
Deepesh Garg
6cce75a230
Revert "fix: Update in field type" 2020-05-01 12:03:18 +05:30
Deepesh Garg
e2de2923e2
Merge pull request #21420 from wojosc/patch-8 
fix: Update in field type
 2020-05-01 11:38:23 +05:30
Deepesh Garg
779815a035 fix: Loan Repayment Test 2020-05-01 11:04:12 +05:30
rohitwaghchaure
be16e5cccc
fix: 'NoneType' object is not iterable (#21537) 2020-05-01 10:50:17 +05:30
rohitwaghchaure
52005d1ea3
Merge pull request #21501 from nextchamp-saqib/validate-paid-inv-msg 
chore: validate and warn payment against paid invoices
 2020-05-01 10:37:23 +05:30
Deepesh Garg
2dbd228eab fix: Check is child table for POS profile user 2020-05-01 09:50:56 +05:30
rohitwaghchaure
260bf54c99
Merge pull request #21171 from nextchamp-saqib/rename-bank-reco 
chore: rename bank reconciliation to bank clearance
 2020-05-01 09:33:52 +05:30
Deepesh Garg
1a497b3442 Merge branch 'develop' of https://github.com/frappe/erpnext into loan_closure_fixes 2020-05-01 09:24:10 +05:30
marination
3568dc75be fix: Make Company the first filter 2020-05-01 00:01:37 +05:30
Shivam Mishra
d76c5e83ca fix: elif block error 2020-04-30 22:39:03 +05:30
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
Saqib
dac51ea1cf
Merge branch 'develop' into validate-paid-inv-msg 2020-04-30 20:08:18 +05:30
Marica
66e99d5767
Merge branch 'develop' into razorpay-subscription 2020-04-30 20:07:05 +05:30
Saqib Ansari
dfa60e0ed8 chore: calculate total row month-wise in sales analytics 2020-04-30 20:06:30 +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
Saqib Ansari
10d9974e77 chore: add total row in sales analytics report 2020-04-30 16:28:52 +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
marination
89c41d8384 chore: Added company filter and minor cleanup in Stock Balance Report 2020-04-30 13:56:49 +05:30
Saqib Ansari
c604109287 chore: handle credit note validation 2020-04-30 13:23:59 +05:30
Deepesh Garg
758f0f0780
Merge branch 'develop' into patch-8 2020-04-30 11:37:27 +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