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

22096 Commits

Author SHA1 Message Date
Abhishek Balam
996b306cda fix territory count 2020-06-12 11:38:07 +05:30
Abhishek Balam
72450d2af3 add revenue if within date range 2020-06-12 11:07:57 +05:30
Abhishek Balam
f596b5950e indent to tabs 2020-06-12 11:07:28 +05:30
Abhishek Balam
411b125906 new parent updating logic, made requested changes 2020-05-12 15:25:35 +05:30
Abhishek Balam
87776c335b code improvements 2020-05-11 15:18:40 +05:30
Abhishek Balam
500dff63e7 fix: adjusted width of colums to see full column names, also fixes #21556 2020-05-10 14:53:59 +05:30
Abhishek Balam
5ec5584319 In treeview, bold only for root territory, looks cleaner 2020-05-10 00:24:43 +05:30
Abhishek Balam
7cbc902d90 removed validation for root node in territory, codacy recommended changed 2020-05-09 22:35:28 +05:30
Abhishek Balam
b59f2780eb fix: renamed view types, added default 2020-05-09 22:09:02 +05:30
Abhishek Balam
d543830a59 feat(Selling): Added Territory wise treeview to 'Customer Acquistion and Loyalty' report 2020-05-09 21:56:53 +05:30
Deepesh Garg
58f02e7c10
Merge pull request #21639 from deepeshgarg007/loan_unpledge_uutility_fix 
fix: Loan Security Unpledge fixes
 2020-05-07 15:45:32 +05:30
Deepesh Garg
dd340c15de fix: Loan Security Unpledge fixes 2020-05-07 15:35:54 +05:30
sahil28297
c759e17900
fix(item): patch to rename duplicate item_code values to name (#21622) 
Co-authored-by: Mangesh-Khairnar <mkhairnar10@gmail.com>
 2020-05-07 12:12:13 +05:30
rohitwaghchaure
9de26f6648
fix: list index out of range (#21613) 2020-05-07 12:06:47 +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
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
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
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
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