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

18705 Commits

Author SHA1 Message Date
Shivam Mishra
8df7e1c215 fix: templates for cards 2019-06-12 12:50:38 +05:30
Shivam Mishra
147cd1035e
Merge branch 'develop' into lms-patch-3 2019-06-12 12:44:12 +05:30
Shivam Mishra
d9e68c9f69 refactor: remove course name field from ProgramCourse 2019-06-12 12:43:22 +05:30
Shivam Mishra
490d2e0357
Merge branch 'develop' into lms-acad-fixes 2019-06-12 12:40:30 +05:30
Shivam Mishra
a9508862b2 refactor: doctype settings for lms 2019-06-12 12:39:12 +05:30
Saurabh
ccbf646a4d
Merge pull request #17904 from deepeshgarg007/patch_fix 
fix(patch): Fix breaking patch on develop branch
 2019-06-12 12:33:38 +05:30
Kenneth Sequeira
add002bb0f fix: Make Travel Request Document Submittable (#17874) 
* make travel request submittable

* add patch

* remove patch
 2019-06-12 12:25:48 +05:30
deepeshgarg007
44ac3580d9 fix: Fix breaking patch on develop branch 2019-06-11 18:35:01 +05:30
Anurag Mishra
ff99cea1c4
Merge branch 'develop' into report_trial_balance_fix 2019-06-11 14:17:54 +05:30
rohitwaghchaure
ba715feb7f
Merge pull request #17899 from rohitwaghchaure/general_ledger_group_by_voucher_consolidated_issue_develop 
fix: debit and credit showing in the same row if the group by is set as group by voucher (consolidated)
 2019-06-11 11:39:48 +05:30
Anurag Mishra
0ef811d92d
Merge branch 'develop' into report_trial_balance_fix 2019-06-11 11:14:02 +05:30
Anurag Mishra
acae7a903b fix: requested changes 2019-06-11 11:12:28 +05:30
Rohit Waghchaure
ef5dd87928 fix: debit and credit showing in the same row if the group by is set as group by voucher (consolidated) 2019-06-10 18:34:18 +05:30
rohitwaghchaure
3199f695aa
Merge pull request #17897 from rohitwaghchaure/fixed_print_format_for_ar_for_120_days_develop 
fix: accounts receivable for PDC not showing 120 days column
 2019-06-10 18:16:59 +05:30
Rohit Waghchaure
5f41a3333b fix: accounts receivable for PDC not showing 120 days column 2019-06-10 18:15:43 +05:30
deepeshgarg007
9297829804 fix: Codacy 2019-06-10 17:50:52 +05:30
deepeshgarg007
30f7e7be87 fix: Available qty not shown in item batch selector for batch 2019-06-10 17:46:16 +05:30
Deepesh Garg
ebeafa55ca fix: Total Amount fix in journal entry (#17880) 2019-06-10 17:42:52 +05:30
sahil28297
3720126ee9 fix(patch): escape illegal characters to avoid SQL syntax error (#17890) 2019-06-10 17:39:42 +05:30
Deepesh Garg
b9102bba48 fix: GSTR-1 Report fixes (#17885) 2019-06-10 17:39:23 +05:30
rohitwaghchaure
dde4f93137
Merge pull request #17881 from rohitwaghchaure/cogs_only_for_material_issue_in_ste_develop 
fix: set COGS for material issue only
 2019-06-10 16:57:23 +05:30
Himanshu Warekar
874326dc7b patch: set apply_to as customer 2019-06-10 12:33:30 +05:30
Himanshu Warekar
a18ba9c718 Merge develop into sla_fix 2019-06-10 12:32:45 +05:30
Himanshu Warekar
0b36d324ee fix: display depends for apply_to in sla 2019-06-10 11:36:51 +05:30
Himanshu Warekar
65e0ae2171 test: new test cases for sla 2019-06-10 11:24:24 +05:30
Shivam Mishra
9510e69910 fix (lms): null cards visible on xs 2019-06-10 10:53:25 +05:30
Himanshu Warekar
88becdd869 test: test cases for sla with apply_to 2019-06-09 19:33:55 +05:30
Himanshu Warekar
0674d16fee feat: sla based on customer/group/territory 2019-06-07 15:28:42 +05:30
Rohit Waghchaure
9a792c2eed stock_entry: set COGS for material issue only 2019-06-07 15:20:36 +05:30
Shivam Mishra
449f261128 feat: show signup dialog for Guest 2019-06-07 13:34:59 +05:30
Shivam Mishra
8d1117cbee fix: link typo 2019-06-07 13:34:51 +05:30
Shivam Mishra
04d61717bc fix: lms card hero image no visible 2019-06-07 13:34:41 +05:30
rohitwaghchaure
74d45f40a8
Merge pull request #17876 from rohitwaghchaure/salary_slip_update_component_row_error_develop 
fix: Not able to save salary slip
 2019-06-07 12:58:25 +05:30
Rohit Waghchaure
72264697be fix: Not able to save salary slip 2019-06-07 11:46:27 +05:30
rohitwaghchaure
74f502cfa6
Merge pull request #17830 from rohitwaghchaure/multiple_manufacturer_part_no_for_items 
feat: provision to set multiple manufacturer against the item
 2019-06-07 10:24:53 +05:30
Rohit Waghchaure
3cf24366a9 feat: provision to set multiple manufacturer in the item master 2019-06-06 19:53:32 +05:30
Himanshu
c4366c9357
Merge branch 'develop' into qmsystem 2019-06-06 19:04:48 +05:30
Anurag Mishra
fd19678bc7 fix: show cost center in print fromat of report trial balance 2019-06-06 18:37:10 +05:30
Anurag Mishra
4ca393d14c
fix: renamed report BOM item scraps into BOM Explorer (#17869) 2019-06-06 18:05:08 +05:30
Anurag Mishra
4992fc98dd
Merge branch 'develop' into qmsystem 2019-06-06 17:25:39 +05:30
Shivam Mishra
d49b5e4736 fix: sql query case fix 2019-06-06 17:19:53 +05:30
Himanshu
b57b4a7199
Merge branch 'develop' into qmsystem 2019-06-06 16:42:53 +05:30
Shivam Mishra
76fe1b1e9f
Merge pull request #17674 from scmmishra/lms-refactor 
refactor: lms
 2019-06-06 16:32:17 +05:30
Shivam Mishra
2a0483dee3 refactor: styling cards and article 2019-06-06 16:02:38 +05:30
Himanshu
d0d5380cb1
Merge branch 'develop' into qmsystem 2019-06-06 15:37:04 +05:30
Shivam Mishra
6132c8527b refactor: all programs are shown on home by deafult 2019-06-06 14:19:36 +05:30
Himanshu Warekar
db1d1197ea feat: add fixtures 2019-06-06 14:17:07 +05:30
Shivam Mishra
098b8324f2 refactor: remove erpnext.com link 2019-06-06 14:14:17 +05:30
Himanshu Warekar
ab97cd4db1 feat: dashboards 2019-06-06 14:13:10 +05:30
Shivam Mishra
b31276572b refactor: styling changes 2019-06-06 14:03:01 +05:30
Shivam Mishra
09cd46fa0b fix: minor bugs 2019-06-06 14:02:49 +05:30
Himanshu Warekar
b114d9f621 test: fix test case 2019-06-06 12:14:19 +05:30
Prasann Shah
829172c267 [Add] GSTIN filters in hsn wise summary and itemised reports 2019-06-06 12:08:09 +05:30
Himanshu Warekar
b318b83bb7 patch: fixes 2019-06-06 12:03:37 +05:30
Himanshu Warekar
7acdcac124 patch: fixes 2019-06-06 11:56:38 +05:30
Himanshu Warekar
cbbe2814a6 patch: add priority in service level and agreement 2019-06-06 11:49:15 +05:30
Shivam Mishra
624b4fd5b8 refactor: better sql 2019-06-06 11:30:56 +05:30
Himanshu Warekar
b9c24a01da patch: reload_doc before inserting values 2019-06-06 11:15:33 +05:30
Himanshu Warekar
e175dd8249 patch: set priorities for issue 2019-06-06 10:58:42 +05:30
Himanshu Warekar
e119a713fd Merge develop into sla_fix 2019-06-06 10:46:36 +05:30
Saurabh
6179130a54
Merge pull request #17861 from frappe/clarkejj-patch-1 
fix: Update demo.html
 2019-06-06 10:37:48 +05:30
Aditya Hase
29e77ccc00 fix(error-report): Do not send error reports to support@erpnext.com 2019-06-05 23:29:45 +05:30
John Clarke
8cb92e066d
Update demo.html 
fix typo nit in page
 2019-06-05 10:49:47 -06:00
Nabin Hait
68eaaa068b
fix: Removed unwanted total row from financial statement and general ledger print (#17860) 2019-06-05 20:29:24 +05:30
Mangesh-Khairnar
2bd211cc05 fix(attendance): fetch employee name (#17857) 2019-06-05 20:24:15 +05:30
Deepesh Garg
448af7bd46 fix: NoneType fixes in Lab test (#17858) 2019-06-05 20:23:23 +05:30
Shivam Mishra
f121b51951 fix: import _ in porgram.py 2019-06-05 19:43:51 +05:30
Shivam Mishra
d69892abfa feat: added topic page 2019-06-05 19:42:30 +05:30
Shivam Mishra
2c0e9929fe chore: remove old lms files 2019-06-05 18:30:40 +05:30
Shivam Mishra
c5964b1cf0 fix: minor ui fixes 2019-06-05 18:16:09 +05:30
Shivam Mishra
9cad9439a1 fix: travis fixes for education setup 2019-06-05 17:52:21 +05:30
Shivam Mishra
7597baab95 refactor: minor fixes 2019-06-05 17:49:42 +05:30
Shivam Mishra
bd499fcf27 chore: added session check for profile page 2019-06-05 17:38:12 +05:30
Shivam Mishra
16b4129ede feat: added student profile page 2019-06-05 17:29:48 +05:30
Rohan
bd9abc15b5 fix(projects): Remove hardcode of expected end date for new Tasks (#17717) 2019-06-05 14:17:29 +05:30
Himanshu Warekar
b903da6bfd fix: remove priorities list 2019-06-05 13:42:03 +05:30
Shivam Mishra
6593263df8 feat: added navigation 2019-06-05 13:34:44 +05:30
Nabin Hait
3f97fac8e1
feat: Salary rounding based on settings on salary component (#17852) 2019-06-05 13:20:08 +05:30
Shivam Mishra
570161b978 feat: added course progress apis 2019-06-05 13:08:53 +05:30
Aditya Hase
811bed32c1 fix(naming): Limit number of docs to be renamed to 50000 per doctype (#17827) 
If total docs to be renamed goes over 100000 then the total number of
writes exceed 200000 and check_transaction_status (database.py)
raises a Validation Error

This causes failure in the job being executed currently and every single job
triggered afterwards.
 2019-06-05 10:26:26 +05:30
Himanshu
4cb1a1e2e3 fix: set task weight from onboarding template (#17840) 2019-06-05 10:26:01 +05:30
Mangesh-Khairnar
da2e009990 fix(payment-order): filter already created payment entries (#17843) 2019-06-05 10:22:05 +05:30
deepeshgarg007
a87c545907 fix: Remove support analytics report 2019-06-05 09:07:42 +05:30
deepeshgarg007
1831844fcf fix: Dashboard for cost center 2019-06-03 21:53:58 +05:30
Himanshu Warekar
68ed272bfa feat: show priorities listed in sla in issue 2019-06-03 18:59:55 +05:30
Rohit Waghchaure
8309582cca fix: report Payment Period Based On Invoice Date not working 2019-06-03 18:23:54 +05:30
Rushabh Mehta
6744febedd
Merge pull request #17769 from deepeshgarg007/dimensions 
feat: Configurable Accounting Dimensions
 2019-06-03 17:00:58 +05:30
Shivam Mishra
6d4c666476 feat: added topic progress api 2019-06-03 14:41:05 +05:30
Shivam Mishra
8ddb63adae feat: added auto course enrollment for enrolled programs 2019-06-03 14:40:52 +05:30
Nabin Hait
49133c5620
Merge pull request #17835 from deepeshgarg007/serial-no-devlop 
fix: Serial no filtering issue for delivered items
 2019-06-03 14:24:56 +05:30
Nabin Hait
37fdeee367
Merge pull request #17805 from nabinhait/discount-rounding-adjustment-dev 
fix: Rounding adjustment while additional discount amount is applied on grand total
 2019-06-03 13:09:04 +05:30
deepeshgarg007
545fef9934 fix: Pass delivery document no as empty string 2019-06-03 13:06:37 +05:30
Shivam Mishra
d1a252190b refactor: refactored quiz api and added quiz.js 2019-06-03 12:57:38 +05:30
deepeshgarg007
853a561f11 fix: Serial no filtering issue for delivered items 2019-06-03 12:11:54 +05:30
Himanshu Warekar
9f458e3413 fix: codacy 2019-06-02 20:47:23 +05:30
Himanshu Warekar
4a7a380f0c fix: codacy 2019-06-02 19:46:44 +05:30
deepeshgarg007
290847df46 fix: Fixes in accounting doctype dashboards 2019-06-02 19:35:18 +05:30
deepeshgarg007
6d313c72e1 fix: Remove diemnsion from value list if present 2019-06-01 23:26:42 +05:30
deepeshgarg007
e19abb162a fix: Resolve merge conflicts in purchase_receipt_item 2019-06-01 23:26:09 +05:30
deepeshgarg007
55b894bfef Merge branch develop into dimensions 2019-06-01 23:13:36 +05:30