Commit Graph

18716 Commits

Author SHA1 Message Date
Anurag Mishra
88cd502841 fix: company form (#17939) 2019-06-14 11:26:29 +05:30
Saurabh
0d50523723
Merge pull request #17941 from nabinhait/salary-slip-amount-dev
fix: salary slip amount calculation based on formula
2019-06-14 11:19:31 +05:30
Rushabh Mehta
b74454e501
Merge pull request #17894 from deepeshgarg007/serial_no_batch_selector_develop
fix: Available qty not shown in item batch selector for batch
2019-06-14 10:51:34 +05:30
Nabin Hait
a2caf884fe fix: salary slip amount calculation based on formula 2019-06-13 19:44:21 +05:30
Shivam Mishra
1b5a54900c
Merge pull request #17933 from Anurag810/billing_summary_fixes
fix: column sequence and add total hours
2019-06-13 17:26:56 +05:30
Suraj Shetty
7877ef22ba Merge branch 'call-summary-dialog' of github.com:surajshetty3416/erpnext into call-summary-dialog 2019-06-13 17:13:59 +05:30
Suraj Shetty
06f8034542 refactor: Remove redundant code 2019-06-13 17:13:54 +05:30
rohitwaghchaure
da0d056a06
Merge pull request #17924 from rohitwaghchaure/cost_center_added_in_the_opening_invoice_creation
feat: added cost center in the opening invoice creation tool
2019-06-13 16:27:18 +05:30
rohitwaghchaure
95c88a5e95
Merge pull request #17932 from rohitwaghchaure/fixed_pos_not_overriding_the_taxes_develop
fix: taxes are not overriding after changing the tax template for the POS invoice
2019-06-13 16:26:11 +05:30
Shivam Mishra
4def9836e0
Merge branch 'develop' into bom-item-fix 2019-06-13 16:17:54 +05:30
Anurag Mishra
05c17a505c fix: column sequence and add total 2019-06-13 16:08:01 +05:30
Rohit Waghchaure
033ed93586 fix: taxes are not overriding after changing the taxes template 2019-06-13 15:47:42 +05:30
Mangesh-Khairnar
b2f266ad10 fix: get bom item when company is not passed 2019-06-13 14:34:40 +05:30
Faris Ansari
00578ba632 fix: Show product page even if cart is not enabled 2019-06-13 13:30:39 +05:30
Rohit Waghchaure
02ae934d5c feat: added cost center in the opening invoice creation tool 2019-06-13 12:00:30 +05:30
Deepesh Garg
0d7d4879a9
Merge pull request #17920 from Anurag810/stock_balance_report
fix: fetch item on the base of item group
2019-06-13 10:49:30 +05:30
Anurag Mishra
bbe2c4fb01 fix: fetch item on the base of item group 2019-06-12 19:09:51 +05:30
Deepesh Garg
a3c0d2768e
Merge branch 'develop' into serial_no_batch_selector_develop 2019-06-12 17:21:23 +05:30
Shivam Mishra
d9aabb83cd
Merge branch 'develop' into lms-link-fix 2019-06-12 17:21:05 +05:30
Shivam Mishra
b94b1febee refactor: topic card redirects to login 2019-06-12 17:20:33 +05:30
Rushabh Mehta
26dba8bb89
Merge pull request #17801 from deepeshgarg007/dashboards
fix: Dashboards for doctypes in accounts module
2019-06-12 17:15:58 +05:30
Suraj Shetty
16fc5189d1
Merge branch 'develop' into call-summary-dialog 2019-06-12 17:13:13 +05:30
sahil28297
deef0908d7
Merge branch 'develop' into education-test-fixes 2019-06-12 16:59:58 +05:30
Shivam Mishra
147d5d9bf2 fix: redirect to lms home if query params not set 2019-06-12 16:01:02 +05:30
Deepesh Garg
9c3d2eeb1f
Merge branch 'develop' into serial_no_batch_selector_develop 2019-06-12 15:54:44 +05:30
Shivam Mishra
3264822c1c test: fixed unknown column course_name 2019-06-12 15:43:36 +05:30
Suraj Shetty
12cd4bcd71
Merge branch 'develop' into call-summary-dialog 2019-06-12 15:43:19 +05:30
Shivam Mishra
44f98a9a4b fix: back to course button 2019-06-12 15:22:42 +05:30
Shivam Mishra
8af1e87e83 fix: card imqge not visible for courses 2019-06-12 15:16:26 +05:30
Shivam Mishra
278ef4bf73 fix: template fix for null_card 2019-06-12 14:53:00 +05:30
Shivam Mishra
a99d3a844f test: fix fixtures for program and course 2019-06-12 14:32:27 +05:30
Suraj Shetty
a7ac218584
Merge branch 'develop' into call-summary-dialog 2019-06-12 13:28:41 +05:30
Shivam Mishra
28b2da7850
Merge branch 'develop' into lms-patch-4 2019-06-12 12:51:53 +05:30
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
Suraj Shetty
2f84779667 fix: Last Communication for lead
- Remove unused code
- Remove unused import
2019-06-12 10:31:07 +05:30
deepeshgarg007
44ac3580d9 fix: Fix breaking patch on develop branch 2019-06-11 18:35:01 +05:30
Suraj Shetty
7ff124db95 fix: Show lead name when the lead calls 2019-06-11 14:21:48 +05:30
Anurag Mishra
ff99cea1c4
Merge branch 'develop' into report_trial_balance_fix 2019-06-11 14:17:54 +05:30
Suraj Shetty
28f7c3ca3f fix: Add Make contact button 2019-06-11 12:21:30 +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
Suraj Shetty
6013375fbb fix: Improve call popup UX
- Close modal after 10 secs if user is has not entered any call summary
- Show alert once the summary was saved
2019-06-11 08:03:55 +05:30
Suraj Shetty
77302b3928 fix: Save summary to right field 2019-06-11 08:01:18 +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
Shivam Mishra
9510e69910 fix (lms): null cards visible on xs 2019-06-10 10:53:25 +05:30
Suraj Shetty
13770ccf7a fix: Codacy 2019-06-10 09:52:53 +05:30
Suraj Shetty
54bb3e4b9f Merge branch 'develop' of github.com:frappe/erpnext into call-summary-dialog 2019-06-10 09:25:39 +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
Suraj Shetty
f1ffdb3c12 feat: Add call sound effects 2019-06-07 12:48:13 +05:30
Suraj Shetty
6a87e3338b fix: Call popup UI 2019-06-07 11:52:39 +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
Suraj Shetty
c8c17422f7 fix: Change call log fieldname and some cleanups 2019-06-07 10:22:50 +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
Suraj Shetty
97780613ad fix: Improve call popup UI 2019-06-06 14:48:37 +05:30
Suraj Shetty
c0a640c462 feat: Add user_id of employee to employee group 2019-06-06 14:47:40 +05:30
Shivam Mishra
6132c8527b refactor: all programs are shown on home by deafult 2019-06-06 14:19:36 +05:30
Shivam Mishra
098b8324f2 refactor: remove erpnext.com link 2019-06-06 14:14:17 +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
Shivam Mishra
624b4fd5b8 refactor: better sql 2019-06-06 11:30:56 +05:30
Suraj Shetty
87645e98ad fix: Get available employees from communication medium 2019-06-06 11:24:31 +05:30
Suraj Shetty
44c0e9d549 fix: Create call log instead of communication 2019-06-06 11:18:16 +05:30
Suraj Shetty
27234ff907 fix: Update call log doctype 2019-06-06 10:57:13 +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