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 |
|
Mangesh-Khairnar
|
f8bf57c956
|
fix: remove transaction section head
|
2019-06-13 18:09:23 +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
|
ae7e13a58f
|
Merge pull request #17927 from Mangesh-Khairnar/bom-item-fix
fix: Check fields before making BOM items
|
2019-06-13 16:18:12 +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 |
|
sahil28297
|
7007931438
|
Merge pull request #17913 from scmmishra/lms-link-fix
refactor: topic card redirects to login
|
2019-06-12 20:09:22 +05:30 |
|
Mangesh-Khairnar
|
0a3ed374cd
|
test: validate tax based expense claim gl entries
|
2019-06-12 20:03:22 +05:30 |
|
Anurag Mishra
|
bbe2c4fb01
|
fix: fetch item on the base of item group
|
2019-06-12 19:09:51 +05:30 |
|
Mangesh-Khairnar
|
a1d354e147
|
feat: add grand total field
|
2019-06-12 18:18:38 +05:30 |
|
Rohan Bansal
|
ddea50fa22
|
fix(stock): Remove hardcoded validation for Item
|
2019-06-12 17:59:23 +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
|
3fd51ccd38
|
Merge pull request #17908 from scmmishra/education-test-fixes
test: fix fixtures for program and course
|
2019-06-12 17:01:27 +05:30 |
|
sahil28297
|
deef0908d7
|
Merge branch 'develop' into education-test-fixes
|
2019-06-12 16:59:58 +05:30 |
|
Shivam Mishra
|
5e62142ff4
|
Merge pull request #17911 from scmmishra/lms-redirect-fixes
fix: redirect to lms home if query params not set
|
2019-06-12 16:05:34 +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
|
8d95c846e4
|
Merge pull request #17910 from scmmishra/lms-patch-5
fix: template issue in LMS
|
2019-06-12 15:24:40 +05:30 |
|
Shivam Mishra
|
1c9280c73f
|
Merge branch 'develop' into lms-patch-5
|
2019-06-12 15:24:15 +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 |
|
Anurag Mishra
|
e4fca91792
|
Merge pull request #17909 from scmmishra/lms-template-fix
fix: template fix for null_card
|
2019-06-12 14:56:25 +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
|
6a2de27941
|
Merge pull request #17907 from scmmishra/lms-patch-4
fix: templates for cards
|
2019-06-12 12:53:39 +05:30 |
|
Mangesh-Khairnar
|
444313bdfc
|
feat: change the claim amount in expenses to amount
|
2019-06-12 12:52:02 +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
|
baeaca6dd4
|
Merge pull request #17906 from scmmishra/lms-patch-3
refactor: remove course name field from ProgramCourse
|
2019-06-12 12:44:23 +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
|
5047c00476
|
Merge pull request #17905 from scmmishra/lms-acad-fixes
refactor: doctype settings for lms
|
2019-06-12 12:40:50 +05:30 |
|
Shivam Mishra
|
490d2e0357
|
Merge branch 'develop' into lms-acad-fixes
|
2019-06-12 12:40:30 +05:30 |
|